diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8990656018..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: android
-
-# Work in progress. Repo should be used for initial checkout https://github.com/osmandapp/OsmAnd-manifest/blob/master/android_build.xml
-
-android:
-  components:
-    - tools
-    - platform-tools
-
-    # The BuildTools version used by your project
-    - build-tools-27.0.3
-    - android-27
-
-script: ./gradlew test
diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle
index 42b45a78f0..0b57c98947 100644
--- a/OsmAnd-java/build.gradle
+++ b/OsmAnd-java/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-    
+apply plugin: 'maven-publish'
     
 configurations {
 	android
@@ -77,6 +77,14 @@ artifacts {
 	android androidJar
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+			artifactId "osmand-base"
+            from components.java
+        }
+    }
+}
 
 dependencies {
 	testImplementation 'junit:junit:4.12'
diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_action_additional_option.png b/OsmAnd-telegram/res/drawable-hdpi/ic_action_additional_option.png
new file mode 100644
index 0000000000..c825caeeb3
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-hdpi/ic_action_additional_option.png differ
diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_action_additional_option.png b/OsmAnd-telegram/res/drawable-mdpi/ic_action_additional_option.png
new file mode 100644
index 0000000000..d7df7ace35
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-mdpi/ic_action_additional_option.png differ
diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_action_additional_option.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_additional_option.png
new file mode 100644
index 0000000000..ba244c0a10
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_additional_option.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_additional_option.png b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_additional_option.png
new file mode 100644
index 0000000000..0043a874e8
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_additional_option.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxxhdpi/ic_action_additional_option.png b/OsmAnd-telegram/res/drawable-xxxhdpi/ic_action_additional_option.png
new file mode 100644
index 0000000000..9b7c6fa3f4
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxxhdpi/ic_action_additional_option.png differ
diff --git a/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml b/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml
index e063c5ee3d..a3a9f4a177 100644
--- a/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml
+++ b/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml
@@ -5,6 +5,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:fitsSystemWindows="true"
 	android:orientation="vertical">
 
 	<android.support.design.widget.AppBarLayout
@@ -103,6 +104,35 @@
 
 			<include layout="@layout/list_item_divider"/>
 
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="?attr/card_bg_color"
+				android:orientation="vertical">
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:layout_width="match_parent"
+					android:layout_height="@dimen/list_header_height"
+					android:ellipsize="end"
+					android:gravity="center_vertical"
+					android:maxLines="1"
+					android:paddingLeft="@dimen/content_padding_standard"
+					android:paddingRight="@dimen/content_padding_standard"
+					android:text="@string/privacy"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="@dimen/list_item_title_text_size"
+					app:typeface="@string/font_roboto_medium"/>
+
+				<LinearLayout
+					android:id="@+id/proxy_settings_container"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical"/>
+
+			</LinearLayout>
+
+			<include layout="@layout/list_item_divider"/>
+
 			<LinearLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/OsmAnd-telegram/res/layout/fragment_proxy_settings_dialog.xml b/OsmAnd-telegram/res/layout/fragment_proxy_settings_dialog.xml
new file mode 100644
index 0000000000..fef50ebba8
--- /dev/null
+++ b/OsmAnd-telegram/res/layout/fragment_proxy_settings_dialog.xml
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:fitsSystemWindows="true"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical">
+
+		<android.support.design.widget.AppBarLayout
+			android:id="@+id/app_bar_layout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="?attr/card_bg_color">
+
+			<android.support.v7.widget.Toolbar
+				android:id="@+id/toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/action_bar_height">
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:ellipsize="end"
+					android:gravity="center_vertical"
+					android:maxLines="1"
+					android:text="@string/proxy_settings"
+					android:textColor="@color/app_bar_title_light"
+					android:textSize="@dimen/title_text_size"
+					app:typeface="@string/font_roboto_mono_bold" />
+
+			</android.support.v7.widget.Toolbar>
+
+			<View
+				android:layout_width="wrap_content"
+				android:layout_height="1dp"
+				android:layout_marginStart="@dimen/content_padding_standard"
+				android:layout_marginLeft="@dimen/content_padding_standard"
+				android:background="?attr/card_divider_color" />
+
+			<LinearLayout
+				android:id="@+id/enable_proxy_btn"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="?attr/selectableItemBackground"
+				android:minHeight="50dp"
+				android:orientation="horizontal"
+				tools:background="@color/card_bg_light">
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/title"
+					android:layout_width="0dp"
+					android:layout_height="match_parent"
+					android:layout_weight="1"
+					android:gravity="center_vertical"
+					android:paddingLeft="@dimen/content_padding_standard"
+					android:paddingRight="@dimen/content_padding_standard"
+					android:text="@string/shared_string_enable"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="@dimen/list_item_title_text_size"
+					app:typeface="@string/font_roboto_regular" />
+
+				<Switch
+					android:id="@+id/switcher"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:background="@null"
+					android:clickable="false"
+					android:focusable="false"
+					android:paddingLeft="@dimen/content_padding_standard"
+					android:paddingRight="@dimen/content_padding_standard" />
+
+			</LinearLayout>
+
+		</android.support.design.widget.AppBarLayout>
+
+		<ScrollView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical"
+				android:paddingBottom="@dimen/list_view_bottom_padding_big">
+
+				<include layout="@layout/list_item_divider" />
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="?attr/card_bg_color"
+					android:orientation="vertical">
+
+					<net.osmand.telegram.ui.views.TextViewEx
+						android:layout_width="match_parent"
+						android:layout_height="@dimen/list_header_height"
+						android:ellipsize="end"
+						android:gravity="center_vertical"
+						android:maxLines="1"
+						android:paddingLeft="@dimen/content_padding_standard"
+						android:paddingRight="@dimen/content_padding_standard"
+						android:text="@string/proxy_type"
+						android:textColor="?android:textColorPrimary"
+						android:textSize="@dimen/list_item_title_text_size"
+						app:typeface="@string/font_roboto_medium" />
+
+					<LinearLayout
+						android:id="@+id/proxy_type_container"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:orientation="vertical" />
+
+				</LinearLayout>
+
+				<include layout="@layout/list_item_divider" />
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="?attr/card_bg_color"
+					android:orientation="vertical">
+
+					<net.osmand.telegram.ui.views.TextViewEx
+						android:layout_width="match_parent"
+						android:layout_height="@dimen/list_header_height"
+						android:ellipsize="end"
+						android:gravity="center_vertical"
+						android:maxLines="1"
+						android:paddingLeft="@dimen/content_padding_standard"
+						android:paddingRight="@dimen/content_padding_standard"
+						android:text="@string/shared_string_connection"
+						android:textColor="?android:textColorPrimary"
+						android:textSize="@dimen/list_item_title_text_size"
+						app:typeface="@string/font_roboto_medium" />
+
+					<LinearLayout
+						android:id="@+id/connection_container"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:orientation="vertical"
+						android:paddingLeft="@dimen/content_padding_standard"
+						android:paddingRight="@dimen/content_padding_standard"
+						android:paddingBottom="@dimen/content_padding_standard">
+
+						<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+							android:layout_width="match_parent"
+							android:layout_height="@dimen/list_item_height"
+							android:layout_marginBottom="@dimen/content_padding_standard"
+							app:hasClearButton="true"
+							app:labelText="@string/proxy_server">
+
+							<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+								android:id="@+id/server_edit_text"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:inputType="text" />
+
+						</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+						<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+							android:layout_width="match_parent"
+							android:layout_height="@dimen/list_item_height"
+							app:hasClearButton="true"
+							app:labelText="@string/proxy_port">
+
+							<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+								android:id="@+id/port_edit_text"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:inputType="numberDecimal" />
+
+						</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:id="@+id/proxy_sosks5_container"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical">
+
+					<include layout="@layout/list_item_divider" />
+
+					<LinearLayout
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:background="?attr/card_bg_color"
+						android:orientation="vertical">
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:layout_width="match_parent"
+							android:layout_height="@dimen/list_header_height"
+							android:ellipsize="end"
+							android:gravity="center_vertical"
+							android:maxLines="1"
+							android:paddingLeft="@dimen/content_padding_standard"
+							android:paddingRight="@dimen/content_padding_standard"
+							android:text="@string/proxy_credentials"
+							android:textColor="?android:textColorPrimary"
+							android:textSize="@dimen/list_item_title_text_size"
+							app:typeface="@string/font_roboto_medium" />
+
+						<LinearLayout
+							android:id="@+id/credentials_container"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:orientation="vertical"
+							android:paddingLeft="@dimen/content_padding_standard"
+							android:paddingRight="@dimen/content_padding_standard"
+							android:paddingBottom="@dimen/content_padding_standard">
+
+							<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+								android:layout_width="match_parent"
+								android:layout_height="@dimen/list_item_height"
+								android:layout_marginBottom="@dimen/content_padding_standard"
+								app:hasClearButton="true"
+								app:labelText="@string/proxy_username">
+
+								<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+									android:id="@+id/username_text"
+									android:layout_width="match_parent"
+									android:layout_height="wrap_content"
+									android:inputType="text" />
+
+							</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+							<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+								android:layout_width="match_parent"
+								android:layout_height="@dimen/list_item_height"
+								app:hasClearButton="true"
+								app:labelText="@string/proxy_password">
+
+								<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+									android:id="@+id/password_text"
+									android:layout_width="match_parent"
+									android:layout_height="wrap_content"
+									android:inputType="textPassword" />
+
+							</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+						</LinearLayout>
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:id="@+id/proxy_mtproto_container"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical">
+
+					<include layout="@layout/list_item_divider" />
+
+					<LinearLayout
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:background="?attr/card_bg_color"
+						android:orientation="vertical">
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:layout_width="match_parent"
+							android:layout_height="@dimen/list_header_height"
+							android:ellipsize="end"
+							android:gravity="center_vertical"
+							android:maxLines="1"
+							android:paddingLeft="@dimen/content_padding_standard"
+							android:paddingRight="@dimen/content_padding_standard"
+							android:text="@string/proxy_credentials"
+							android:textColor="?android:textColorPrimary"
+							android:textSize="@dimen/list_item_title_text_size"
+							app:typeface="@string/font_roboto_medium" />
+
+						<LinearLayout
+							android:id="@+id/mtproto_container"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:orientation="vertical"
+							android:paddingLeft="@dimen/content_padding_standard"
+							android:paddingRight="@dimen/content_padding_standard"
+							android:paddingBottom="@dimen/content_padding_standard">
+
+							<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+								android:layout_width="match_parent"
+								android:layout_height="@dimen/list_item_height"
+								android:layout_marginBottom="@dimen/content_padding_standard"
+								app:hasClearButton="true"
+								app:labelText="@string/proxy_key">
+
+								<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+									android:id="@+id/key_text"
+									android:layout_width="match_parent"
+									android:layout_height="wrap_content"
+									android:inputType="text" />
+
+							</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+						</LinearLayout>
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+				<include layout="@layout/card_bottom_divider" />
+
+			</LinearLayout>
+
+		</ScrollView>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/save_button_Container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:orientation="vertical">
+
+		<android.support.v7.widget.AppCompatImageView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:scaleType="fitXY"
+			android:src="?attr/bottom_nav_shadow" />
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/proxy_save_button_height"
+			android:layout_gravity="bottom"
+			android:background="?attr/card_bg_color"
+			android:orientation="vertical"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingTop="@dimen/image_button_padding"
+			android:paddingRight="@dimen/content_padding_standard"
+			android:paddingBottom="@dimen/image_button_padding">
+
+			<include layout="@layout/primary_btn" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/layout/fragment_search_dialog.xml b/OsmAnd-telegram/res/layout/fragment_search_dialog.xml
index 54f9bd41dc..322bfbf14e 100644
--- a/OsmAnd-telegram/res/layout/fragment_search_dialog.xml
+++ b/OsmAnd-telegram/res/layout/fragment_search_dialog.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:fitsSystemWindows="true"
 	android:orientation="vertical">
 
 	<android.support.design.widget.AppBarLayout
diff --git a/OsmAnd-telegram/res/layout/item_with_descr_and_right_switch.xml b/OsmAnd-telegram/res/layout/item_with_descr_and_right_switch.xml
index 4969b003ed..9f716ffc61 100644
--- a/OsmAnd-telegram/res/layout/item_with_descr_and_right_switch.xml
+++ b/OsmAnd-telegram/res/layout/item_with_descr_and_right_switch.xml
@@ -50,6 +50,18 @@
 
 	</LinearLayout>
 
+	<ImageView
+		android:id="@+id/icon_right"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:background="?attr/selectableItemBackground"
+		android:paddingLeft="@dimen/image_button_padding"
+		android:paddingRight="@dimen/image_button_padding"
+		android:visibility="gone"
+		tools:src="@drawable/ic_action_additional_option"
+		tools:tint="@color/icon_light"
+		tools:visibility="visible" />
+
 	<Switch
 		android:id="@+id/switcher"
 		android:layout_width="wrap_content"
diff --git a/OsmAnd-telegram/res/values-be/strings.xml b/OsmAnd-telegram/res/values-be/strings.xml
index 4566f11c92..b2ea517155 100644
--- a/OsmAnd-telegram/res/values-be/strings.xml
+++ b/OsmAnd-telegram/res/values-be/strings.xml
@@ -217,4 +217,22 @@
     <string name="search_contacts_descr">Шукаць ва ўсіх вашых групах і кантактах.</string>
     <string name="type_contact_or_group_name">Увядзіце назву групы альбо кантакта</string>
     <string name="shared_string_search">Пошук</string>
+    <string name="direction">Накірунак</string>
+    <string name="precision">Дакладнасць</string>
+    <string name="altitude">Вышыня над узроўнем мора</string>
+    <string name="proxy_key">Ключ</string>
+    <string name="proxy_password">Пароль</string>
+    <string name="proxy_username">Імя карыстальніка</string>
+    <string name="proxy_credentials">Пасведчанні</string>
+    <string name="proxy_port">Порт</string>
+    <string name="proxy_server">Сервер</string>
+    <string name="shared_string_connection">Злучэнне</string>
+    <string name="shared_string_enable">Уключыць</string>
+    <string name="proxy_type">Тып проксі</string>
+    <string name="proxy_connected">Злучана</string>
+    <string name="proxy_disconnected">Адлучана</string>
+    <string name="proxy_settings">Налады проксі</string>
+    <string name="proxy">Проксі</string>
+    <string name="privacy">Прыватнасць</string>
+    <string name="bearing">Накірунак</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-ca/strings.xml b/OsmAnd-telegram/res/values-ca/strings.xml
index a2399368b0..8573e5317e 100644
--- a/OsmAnd-telegram/res/values-ca/strings.xml
+++ b/OsmAnd-telegram/res/values-ca/strings.xml
@@ -221,4 +221,18 @@
     <string name="precision">Precisió</string>
     <string name="altitude">Altitud</string>
     <string name="bearing">Trajectòria</string>
+    <string name="proxy_key">Clau</string>
+    <string name="proxy_password">Contrasenya</string>
+    <string name="proxy_username">Nom d\'usuari</string>
+    <string name="proxy_credentials">Credencials</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_server">Servidor</string>
+    <string name="shared_string_connection">Connexió</string>
+    <string name="shared_string_enable">Activa</string>
+    <string name="proxy_type">Tipus de servidor intermediari</string>
+    <string name="proxy_connected">Connectat</string>
+    <string name="proxy_disconnected">Desconnectat</string>
+    <string name="proxy_settings">Configuració del servidor intermediari</string>
+    <string name="proxy">Servidor intermediari</string>
+    <string name="privacy">Privacitat</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-da/strings.xml b/OsmAnd-telegram/res/values-da/strings.xml
index ca4b742713..53deaa098f 100644
--- a/OsmAnd-telegram/res/values-da/strings.xml
+++ b/OsmAnd-telegram/res/values-da/strings.xml
@@ -19,7 +19,7 @@
     <string name="add_device">Tilføj enhed</string>
     <string name="share_location_as">Del placering som</string>
     <string name="live_now_description">Kontakter og grupper som der deles placering med.</string>
-    <string name="logout_from_osmand_telegram_descr">"Bekræft logge ud af OsmAnd Tracker, så kan der ikke deles  placering eller se placeringen af andre\?"</string>
+    <string name="logout_from_osmand_telegram_descr">"Bekræft log af OsmAnd Tracker,  der kan ikke deles  placering eller se placering af andre\?"</string>
     <string name="logout_from_osmand_telegram">Log ud af OsmAnd Telegram\?</string>
     <string name="shared_string_name">Navn</string>
     <string name="by_distance">Efter afstand</string>
@@ -38,7 +38,7 @@
     <string name="shared_string_group">Gruppe</string>
     <string name="logout_no_internet_msg">Opret forbindelse til Internettet for at logge ud af Telegram.</string>
     <string name="shared_string_close">Luk</string>
-    <string name="disconnect_from_telegram_desc">"Sådan tilbagekaldes adgang til placeringsdeling. Åbn Telegram, gå til Settings - Privacy and Security - Sessions og afslut OsmAnd Telegram session. "</string>
+    <string name="disconnect_from_telegram_desc">Sådan tilbagekaldes adgang til placeringsdeling. Åbn Telegram, gå til Settings - Privacy and Security - Sessions og afslut OsmAnd Telegram session.</string>
     <string name="disconnect_from_telegram">Sådan afbrydes OsmAnd Tracker fra Telegram</string>
     <string name="logout_help_desc">Sådan afbrydes OsmAnd Tracker fra Telegram</string>
     <string name="connected_account">Tilsluttet konto</string>
@@ -220,4 +220,19 @@
     <string name="direction">Retning</string>
     <string name="altitude">Højde</string>
     <string name="bearing">Kurs</string>
+    <string name="proxy_key">Nøgle</string>
+    <string name="proxy_password">Adgangskode</string>
+    <string name="proxy_username">Brugernavn</string>
+    <string name="proxy_credentials">Legitimationsoplysninger</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_server">Server</string>
+    <string name="shared_string_connection">Forbindelse</string>
+    <string name="shared_string_enable">Aktiver</string>
+    <string name="proxy_type">Proxytype</string>
+    <string name="proxy_connected">Forbundet</string>
+    <string name="proxy_disconnected">Afbrudt</string>
+    <string name="proxy_settings">Proxy-indstillinger</string>
+    <string name="proxy">Proxy</string>
+    <string name="privacy">Privatliv</string>
+    <string name="precision">Præcision</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-de/strings.xml b/OsmAnd-telegram/res/values-de/strings.xml
index 82bcd0b557..bc919c5996 100644
--- a/OsmAnd-telegram/res/values-de/strings.xml
+++ b/OsmAnd-telegram/res/values-de/strings.xml
@@ -145,7 +145,7 @@
     <string name="turn_off_location_sharing">Standortfreigabe ausschalten</string>
     <string name="shared_string_bot">Bot</string>
     <string name="set_visible_time_for_all">Für alle sichtbare Zeit einstellen</string>
-    <string name="set_time_description">Zeit einstellen, zu der Ihren Kontakten und Gruppen Ihr Standorts in Echtzeit angezeigt wird.</string>
+    <string name="set_time_description">Stellen Sie die Zeit ein, zu der Ihren ausgewählten Kontakten und Gruppen Ihr Standort in Echtzeit angezeigt wird.</string>
     <string name="location_sharing_description">Kontakte und Gruppen wählen, denen Sie Ihren Standort freigeben möchten.</string>
     <string name="start_location_sharing">Standort freigeben</string>
     <string name="location_service_no_gps_available">Wählen Sie einen der Standortanbieter aus, um Ihren Standort freizugeben.</string>
@@ -221,4 +221,18 @@
     <string name="precision">Genauigkeit</string>
     <string name="altitude">Höhe</string>
     <string name="bearing">Peilung</string>
+    <string name="proxy_key">Schlüssel</string>
+    <string name="proxy_password">Passwort</string>
+    <string name="proxy_username">Benutzername</string>
+    <string name="proxy_credentials">Anmeldeinformationen</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_server">Server</string>
+    <string name="shared_string_connection">Verbindung</string>
+    <string name="shared_string_enable">Aktivieren</string>
+    <string name="proxy_type">Proxy-Typ</string>
+    <string name="proxy_connected">Verbunden</string>
+    <string name="proxy_disconnected">Getrennt</string>
+    <string name="proxy_settings">Proxy-Einstellungen</string>
+    <string name="proxy">Proxy</string>
+    <string name="privacy">Datenschutz</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-es-rUS/strings.xml b/OsmAnd-telegram/res/values-es-rUS/strings.xml
index 1f382cf468..25bbb46249 100644
--- a/OsmAnd-telegram/res/values-es-rUS/strings.xml
+++ b/OsmAnd-telegram/res/values-es-rUS/strings.xml
@@ -220,4 +220,18 @@
     <string name="precision">Precisión</string>
     <string name="altitude">Altitud</string>
     <string name="bearing">Rumbo</string>
+    <string name="proxy_key">Clave</string>
+    <string name="proxy_password">Contraseña</string>
+    <string name="proxy_username">Nombre de usuario</string>
+    <string name="proxy_credentials">Credenciales</string>
+    <string name="proxy_port">Puerto</string>
+    <string name="proxy_server">Servidor</string>
+    <string name="shared_string_connection">Conexión</string>
+    <string name="shared_string_enable">Activar</string>
+    <string name="proxy_type">Tipo de proxy</string>
+    <string name="proxy_connected">Conectado</string>
+    <string name="proxy_disconnected">Desconectado</string>
+    <string name="proxy_settings">Ajustes del proxy</string>
+    <string name="proxy">Proxy</string>
+    <string name="privacy">Privacidad</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-eu/strings.xml b/OsmAnd-telegram/res/values-eu/strings.xml
new file mode 100644
index 0000000000..68942a11d2
--- /dev/null
+++ b/OsmAnd-telegram/res/values-eu/strings.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="direction">Norabidea</string>
+    <string name="precision">Zehaztasuna</string>
+    <string name="altitude">Altitudea</string>
+    <string name="bearing">Orientazioa</string>
+    <string name="search_contacts">Bilatu kontaktuak</string>
+    <string name="type_contact_or_group_name">Idatzi kontaktu edo talde izena</string>
+    <string name="shared_string_search">Bilatu</string>
+    <string name="shared_string_ok">ADOS</string>
+    <string name="disable_monitoring">Desgaitu kontrola</string>
+    <string name="location_recording_enabled">Kokapen grabaketa gaituta</string>
+    <string name="timeline_description">Gaitu kontrola zure kokapen guztiak historian gordetzeko.</string>
+    <string name="app_name_short_online">Online Aztarnaria</string>
+    <string name="app_name_short">OsmAnd Aztarnaria</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="privacy_policy_use_telegram">Telegram (mezularitza aplikazioa) jendearekin konektatzeko eta komunikatzeko erabiltzen da.</string>
+    <string name="shared_string_accept">Onartu</string>
+    <string name="telegram_privacy_policy">Telegram Pribatutasun Politika</string>
+    <string name="osmand_privacy_policy">OsmAnd Pribatutasun Politika</string>
+    <string name="how_it_works">Zelan dabil</string>
+    <string name="shared_string_appearance">Itxura</string>
+    <string name="show_gps_points">Erakutsi GPS puntuak</string>
+    <string name="shared_string_update">Eguneratu</string>
+    <string name="shared_string_date">Data</string>
+    <string name="gps_points">GPs puntuak</string>
+    <string name="shared_string_sent">Bidalita</string>
+    <string name="open_in_osmand">Erakutsi OsmAnd-en</string>
+    <string name="end_date">Bukaera data</string>
+    <string name="start_date">Hasiera data</string>
+    <string name="shared_string_map">Mapa</string>
+    <string name="shared_string_text">Testua</string>
+    <string name="map_and_text">Mapa eta testua</string>
+    <string name="last_update_from_telegram">Azken eguneraketa Telegram-etik</string>
+    <string name="shared_string_add">Gehitu</string>
+    <string name="error_adding_new_device">Ezin izan da gailu berri bat gehitu</string>
+    <string name="device_name_is_too_long">Gailuaren izena luzeegia</string>
+    <string name="device_name_cannot_be_empty">Gailuaren izena ezin da hutsik egon</string>
+    <string name="device_name">Gailuaren izena</string>
+    <string name="shared_string_hide">Ezkutatu</string>
+    <string name="sending_location_messages">Kokapena bidaltzen</string>
+    <string name="initializing">Abiarazten</string>
+    <string name="searching_for_gps">Kokalekua…</string>
+    <string name="connecting_to_the_internet">Internetera konektatzen</string>
+    <string name="go_to_settings">Ezarpenetara joan</string>
+    <string name="shared_string_later">Gero</string>
+    <string name="re_send_location">Birbidali kokapena</string>
+    <string name="shared_string_status">Egoera</string>
+    <string name="no_gps_connection">GPS konexiorik ez</string>
+    <string name="no_internet_connection">Internet konexiorik ez</string>
+    <string name="shared_string_disable">Desgaitu</string>
+    <string name="shared_string_save">Gorde</string>
+    <string name="add_device">Gehitu gailua</string>
+    <string name="share_location_as">Partekatu kokapena honela</string>
+    <string name="shared_string_name">Izena</string>
+    <string name="shared_string_sort">Ordenatu</string>
+    <string name="shared_string_sort_by">Ordenatu honen arabera</string>
+    <string name="choose_osmand">Aukeratu erabili nahi duzun OsmAnd bertsioa</string>
+    <string name="disable_all_sharing">Desgaitu partekatze guztiak</string>
+    <string name="turn_off_all">Desaktibatu guztia</string>
+    <string name="shared_string_exit">Irten</string>
+    <string name="time_ago">lehenago</string>
+    <string name="shared_string_group">Taldea</string>
+    <string name="shared_string_close">Itxi</string>
+    <string name="connected_account">Konektatutako kontua</string>
+    <string name="shared_string_account">Kontua</string>
+    <string name="location_history">Kokapen historia</string>
+    <string name="send_my_location">Bidali nire kokapena</string>
+    <string name="gps_and_location">Posizioa</string>
+    <string name="open_osmand">Ireki OsmAnd</string>
+    <string name="shared_string_live">Zuzenean</string>
+    <string name="shared_string_bot">Bot</string>
+    <string name="get_telegram_description_continue">Mesedez instalatu Telegram eta konfiguratu kontu bat.</string>
+    <string name="shared_string_all">Guztia</string>
+    <string name="enter_phone_number">Sartu telefono zenbakia</string>
+    <string name="shared_string_install">Instalatu</string>
+    <string name="shared_string_share">Partekatu</string>
+    <string name="shared_string_back">Atzera</string>
+    <string name="start_location_sharing">Partekatu kokapena</string>
+    <string name="show_on_map">Erakutsi mapan</string>
+    <string name="app_name">OsmAnd Telegram</string>
+    <string name="phone_number_title">Telefono zenbakia</string>
+    <string name="phone_number_descr">Telefono zenbakia formatu internazionalean</string>
+    <string name="shared_string_password">Pasahitza</string>
+    <string name="enter_code">Sartu kodea</string>
+    <string name="authentication_code">Authentication kodea</string>
+    <string name="enter_password">Sartu pasahitza</string>
+    <string name="password_descr">Telegram pasahitza</string>
+    <string name="shared_string_login">Saioa hasi</string>
+    <string name="shared_string_logout">Saioa itxi</string>
+    <string name="initialization">Abiarazten</string>
+    <string name="logging_out">Saioa ixten</string>
+    <string name="closing">Ixten</string>
+    <string name="gps_network_not_enabled">Aktibatu \"Kokapena\"\?</string>
+    <string name="not_logged_in">Ez duzu saioa hasi</string>
+    <string name="shared_string_continue">Jarraitu</string>
+    <string name="shared_string_cancel">Utzi</string>
+    <string name="shared_string_settings">Ezarpenak</string>
+    <string name="gps_not_available">Mesedez aktibatu \"Kokapena\" sistemaren ezarpenetan</string>
+    <string name="osmand_service">Atzeko plano modua</string>
+    <string name="shared_string_distance">Distantzia</string>
+    <string name="share_location">Partekatu kokapena</string>
+    <string name="sharing_location">Partekatzen kokapena</string>
+    <string name="process_service">OsmAnd Telegram zebitzua</string>
+    <string name="osmand_logo">OsmAnd logoa</string>
+    <string name="install_osmand_dialog_message">OsmAnd doako edo ordainpeko bertsioa instalatu behar duzu lehenik</string>
+    <string name="install_osmand">Instalatu OsmAnd</string>
+    <string name="show_users_on_map">Erakutsi erabiltzaileak mapan</string>
+    <string name="active_chats">Aktibatu txata</string>
+    <string name="shared_string_authorization">Baimena</string>
+    <string name="shared_string_welcome">Ongi etorri</string>
+    <string name="yard">yd</string>
+    <string name="foot">oin</string>
+    <string name="mile">mi</string>
+    <string name="km">km</string>
+    <string name="m">m</string>
+    <string name="nm">nmi</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="nm_h">nmi/h</string>
+    <string name="m_s">m/s</string>
+    <string name="km_h">km/h</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="si_kmh">Kilometro orduko</string>
+    <string name="si_mph">Milia orduko</string>
+    <string name="si_m_s">Metro segunduko</string>
+    <string name="si_min_km">Minutu kilometroko</string>
+    <string name="si_min_m">Minutu miliaro</string>
+    <string name="si_nm_h">Milia nautikoa orduro (knot)</string>
+    <string name="si_mi_feet">Miliak/Oin</string>
+    <string name="si_mi_yard">Miliak/yardak</string>
+    <string name="si_km_m">Kilometroak/metroak</string>
+    <string name="si_nm">Milia nautikoak</string>
+    <string name="si_mi_meters">Miliak/metroak</string>
+    <string name="shared_string_hour_short">o</string>
+    <string name="shared_string_minute_short">min</string>
+    <string name="shared_string_second_short">seg</string>
+    <string name="my_location">Nire kokapena</string>
+    <string name="live_now">Zuzenean orain</string>
+    <string name="timeline">Denbora-eskala</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-he/strings.xml b/OsmAnd-telegram/res/values-he/strings.xml
index 2f0a092be0..113303b6a5 100644
--- a/OsmAnd-telegram/res/values-he/strings.xml
+++ b/OsmAnd-telegram/res/values-he/strings.xml
@@ -220,4 +220,18 @@
     <string name="precision">דיוק</string>
     <string name="altitude">גובה</string>
     <string name="bearing">תכווין</string>
+    <string name="proxy_key">מפתח</string>
+    <string name="proxy_password">ססמה</string>
+    <string name="proxy_username">שם משתמש</string>
+    <string name="proxy_credentials">פרטי גישה</string>
+    <string name="proxy_port">פתחה</string>
+    <string name="proxy_server">שרת</string>
+    <string name="shared_string_connection">חיבור</string>
+    <string name="shared_string_enable">הפעלה</string>
+    <string name="proxy_type">סוג מתווך</string>
+    <string name="proxy_connected">מחובר</string>
+    <string name="proxy_disconnected">מנותק</string>
+    <string name="proxy_settings">הגדרות מתווך</string>
+    <string name="proxy">מתווך</string>
+    <string name="privacy">פרטיות</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-nb/strings.xml b/OsmAnd-telegram/res/values-nb/strings.xml
index 8c05b8cdf7..80c7dd64b1 100644
--- a/OsmAnd-telegram/res/values-nb/strings.xml
+++ b/OsmAnd-telegram/res/values-nb/strings.xml
@@ -187,7 +187,7 @@
     <string name="start_date">Startdato</string>
     <string name="timeline">Tidslinje</string>
     <string name="shared_string_telegram">Telegram</string>
-    <string name="privacy_policy_telegram_client">OsmAnd-sporeren er én av kundene som bruker Telegram. Dine kontakter kan bruke enhver annen Telegram-klient.</string>
+    <string name="privacy_policy_telegram_client">OsmAnd-sporeren er én av klientene som bruker Telegram. Dine kontakter kan bruke enhver annen Telegram-klient.</string>
     <string name="privacy_policy_agree">Ved å klikke \"Fortsett\" samtykker du til vilkårene i Telegram-personvernspraksisen, og OsmAnd-personvernspraksisen.</string>
     <string name="shared_string_accept">Godta</string>
     <string name="telegram_privacy_policy">Telegram-personvernspraksis</string>
@@ -221,4 +221,18 @@
     <string name="precision">Nøyaktighet</string>
     <string name="altitude">Høyde</string>
     <string name="bearing">Kurs</string>
+    <string name="proxy_key">Nøkkel</string>
+    <string name="proxy_password">Passord</string>
+    <string name="proxy_username">Brukernavn</string>
+    <string name="proxy_credentials">Identitetsdetaljer</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_server">Tjener</string>
+    <string name="shared_string_connection">Forbindelse</string>
+    <string name="shared_string_enable">Skru på</string>
+    <string name="proxy_type">Mellomtjenertype</string>
+    <string name="proxy_connected">Tilkoblet</string>
+    <string name="proxy_disconnected">Frakoblet</string>
+    <string name="proxy_settings">Mellomtjener-innstillinger</string>
+    <string name="proxy">Mellomtjener</string>
+    <string name="privacy">Personvern</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-pl/strings.xml b/OsmAnd-telegram/res/values-pl/strings.xml
index 1742317041..ac76ae2ca1 100644
--- a/OsmAnd-telegram/res/values-pl/strings.xml
+++ b/OsmAnd-telegram/res/values-pl/strings.xml
@@ -222,4 +222,19 @@
     <string name="direction">Kierunek</string>
     <string name="precision">Precyzja</string>
     <string name="altitude">Wysokość</string>
+    <string name="proxy_key">Klucz</string>
+    <string name="proxy_password">Hasło</string>
+    <string name="proxy_username">Nazwa użytkownika</string>
+    <string name="proxy_credentials">Poświadczenia</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_server">Serwer</string>
+    <string name="shared_string_connection">Połączenia</string>
+    <string name="shared_string_enable">Włącz</string>
+    <string name="proxy_type">Typ serwera proxy</string>
+    <string name="proxy_connected">Podłączony</string>
+    <string name="proxy_disconnected">Odłączony</string>
+    <string name="proxy_settings">Ustawienia proxy</string>
+    <string name="proxy">Serwer proxy</string>
+    <string name="privacy">Prywatność</string>
+    <string name="bearing">Kierunek</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-pt-rBR/strings.xml b/OsmAnd-telegram/res/values-pt-rBR/strings.xml
index d1b3c20a6b..a9e4e34f68 100644
--- a/OsmAnd-telegram/res/values-pt-rBR/strings.xml
+++ b/OsmAnd-telegram/res/values-pt-rBR/strings.xml
@@ -217,4 +217,22 @@
     <string name="search_contacts_descr">Pesquise em todos os seus grupos e contatos.</string>
     <string name="type_contact_or_group_name">Digite o nome do contato ou do grupo</string>
     <string name="shared_string_search">Pesquisar</string>
+    <string name="direction">Direção</string>
+    <string name="precision">Precisão</string>
+    <string name="altitude">Altitude</string>
+    <string name="bearing">Rolamento</string>
+    <string name="proxy_key">Chave</string>
+    <string name="proxy_password">Senha</string>
+    <string name="proxy_username">Nome de usuário</string>
+    <string name="proxy_credentials">Credenciais</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_server">Servidor</string>
+    <string name="shared_string_connection">Conexão</string>
+    <string name="shared_string_enable">Ativar</string>
+    <string name="proxy_type">Tipo de proxy</string>
+    <string name="proxy_connected">Conectado</string>
+    <string name="proxy_disconnected">Desconectado</string>
+    <string name="proxy_settings">Configurações de proxy</string>
+    <string name="proxy">Proxy</string>
+    <string name="privacy">Privacidade</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-sc/strings.xml b/OsmAnd-telegram/res/values-sc/strings.xml
index 3d10e54872..cbe2ef47a2 100644
--- a/OsmAnd-telegram/res/values-sc/strings.xml
+++ b/OsmAnd-telegram/res/values-sc/strings.xml
@@ -218,4 +218,20 @@
     <string name="shared_string_search">Chirca</string>
     <string name="precision">Pretzisione</string>
     <string name="altitude">Artària</string>
+    <string name="direction">Diretzione</string>
+    <string name="proxy_key">Crae servidore</string>
+    <string name="proxy_password">Crae de intrada</string>
+    <string name="proxy_username">Nùmene impreadore</string>
+    <string name="proxy_credentials">Credentziales</string>
+    <string name="proxy_port">Ghenna</string>
+    <string name="proxy_server">Servidore</string>
+    <string name="shared_string_connection">Connessione</string>
+    <string name="shared_string_enable">Abìlita</string>
+    <string name="proxy_type">Casta de servidore intermediàriu</string>
+    <string name="proxy_connected">Connessu</string>
+    <string name="proxy_disconnected">Disconnessu</string>
+    <string name="proxy_settings">Impostatziones de su servidore intermediàriu</string>
+    <string name="proxy">Servidore intermediàriu (proxy)</string>
+    <string name="privacy">Privadesa</string>
+    <string name="bearing">Andamentu</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-zh-rTW/strings.xml b/OsmAnd-telegram/res/values-zh-rTW/strings.xml
index eb8fd80bb6..a02096a7df 100644
--- a/OsmAnd-telegram/res/values-zh-rTW/strings.xml
+++ b/OsmAnd-telegram/res/values-zh-rTW/strings.xml
@@ -222,4 +222,18 @@
     <string name="precision">精確</string>
     <string name="altitude">高度</string>
     <string name="bearing">方位</string>
+    <string name="proxy_key">金鑰</string>
+    <string name="proxy_password">密碼</string>
+    <string name="proxy_username">使用者名稱</string>
+    <string name="proxy_credentials">憑證</string>
+    <string name="proxy_port">連接埠</string>
+    <string name="proxy_server">伺服器</string>
+    <string name="shared_string_connection">連線</string>
+    <string name="shared_string_enable">啟用</string>
+    <string name="proxy_type">代理伺服器類型</string>
+    <string name="proxy_connected">已連線</string>
+    <string name="proxy_disconnected">已斷線</string>
+    <string name="proxy_settings">代理伺服器設定</string>
+    <string name="proxy">代理伺服器</string>
+    <string name="privacy">隱私</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml
index 29448998fb..97f34a64b3 100644
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@@ -44,6 +44,7 @@
 	<dimen name="list_item_baseline_to_top_height_big">28dp</dimen>
 
 	<dimen name="list_view_bottom_padding">52dp</dimen>
+	<dimen name="list_view_bottom_padding_big">140dp</dimen>
 
 	<dimen name="card_divider_bottom_margin">6dp</dimen>
 
@@ -73,6 +74,8 @@
 	
 	<dimen name="list_popup_window_height">300dp</dimen>
 
+	<dimen name="proxy_save_button_height">60dp</dimen>
+
 	<!-- Text sizes -->
 
 	<dimen name="dialog_title_text_size">22sp</dimen>
diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index 3712668b0a..59a0e6d26a 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="proxy_key">Key</string>
+    <string name="proxy_password">Password</string>
+    <string name="proxy_username">Username</string>
+    <string name="proxy_credentials">Credentials</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_server">Server</string>
+    <string name="shared_string_connection">Connection</string>
+    <string name="shared_string_enable">Enable</string>
+    <string name="proxy_type">Proxy type</string>
+    <string name="proxy_connected">Connected</string>
+    <string name="proxy_disconnected">Disconnected</string>
+    <string name="proxy_settings">Proxy Settings</string>
+    <string name="proxy">Proxy</string>
+    <string name="privacy">Privacy</string>
     <string name="direction">Direction</string>
     <string name="precision">Precision</string>
     <string name="altitude">Altitude</string>
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt b/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
index bbe431bbf8..34bbd5bda3 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
@@ -85,6 +85,9 @@ private const val MONITORING_ENABLED = "monitoring_enabled"
 
 private const val SHOW_GPS_POINTS = "show_gps_points"
 
+private const val PROXY_ENABLED = "proxy_enabled"
+private const val PROXY_PREFERENCES_KEY = "proxy_preferences"
+
 private const val SHARING_INITIALIZATION_TIME = 60 * 2L // 2 minutes
 private const val WAITING_TDLIB_TIME = 30 // 2 seconds
 
@@ -103,6 +106,9 @@ class TelegramSettings(private val app: TelegramApplication) {
 	var currentSharingMode = ""
 		private set
 
+	var currentProxyPref: ProxyPref = ProxySOCKS5Pref(-1, "", -1, "", "")
+		private set
+
 	var metricsConstants = MetricsConstants.KILOMETERS_AND_METERS
 	var speedConstants = SpeedConstants.KILOMETERS_PER_HOUR
 
@@ -124,9 +130,12 @@ class TelegramSettings(private val app: TelegramApplication) {
 
 	var showGpsPoints = false
 
+	var proxyEnabled = false
+
 	init {
 		updatePrefs()
 		read()
+		applyProxyPref()
 	}
 
 	fun hasAnyChatToShareLocation() = shareChatsInfo.isNotEmpty()
@@ -202,6 +211,30 @@ class TelegramSettings(private val app: TelegramApplication) {
 		currentSharingMode = sharingMode
 	}
 
+	fun updateCurrentProxyPref(proxyPref: ProxyPref, proxyEnabled: Boolean) {
+		this.proxyEnabled = proxyEnabled
+		currentProxyPref = proxyPref
+		applyProxyPref()
+	}
+
+	fun updateProxySetting(enable: Boolean) {
+		this.proxyEnabled = enable
+		if (enable) {
+			app.telegramHelper.enableProxy(currentProxyPref.id)
+		} else {
+			app.telegramHelper.disableProxy()
+		}
+	}
+
+	fun applyProxyPref() {
+		val proxyId = currentProxyPref.id
+		if (proxyId != -1) {
+			app.telegramHelper.editProxyPref(currentProxyPref, proxyEnabled)
+		} else {
+			app.telegramHelper.addProxyPref(currentProxyPref, proxyEnabled)
+		}
+	}
+
 	fun prepareForSharingNewMessages() {
 		shareChatsInfo.forEach { (_, shareInfo) ->
 			prepareForSharingNewMessages(shareInfo)
@@ -536,6 +569,8 @@ class TelegramSettings(private val app: TelegramApplication) {
 
 		edit.putBoolean(SHOW_GPS_POINTS, showGpsPoints)
 
+		edit.putBoolean(PROXY_ENABLED, proxyEnabled)
+
 		val jArray = convertShareChatsInfoToJson()
 		if (jArray != null) {
 			edit.putString(SHARE_CHATS_INFO_KEY, jArray.toString())
@@ -546,6 +581,11 @@ class TelegramSettings(private val app: TelegramApplication) {
 			edit.putString(SHARE_DEVICES_KEY, jsonObject.toString())
 		}
 
+		val jsonObjectProxy = convertProxyPrefToJson()
+		if (jsonObjectProxy != null) {
+			edit.putString(PROXY_PREFERENCES_KEY, jsonObjectProxy.toString())
+		}
+
 		edit.apply()
 	}
 
@@ -597,7 +637,14 @@ class TelegramSettings(private val app: TelegramApplication) {
 
 		monitoringEnabled = prefs.getBoolean(MONITORING_ENABLED,false)
 
-		showGpsPoints = prefs.getBoolean(SHOW_GPS_POINTS,false)
+		showGpsPoints = prefs.getBoolean(SHOW_GPS_POINTS, false)
+
+		proxyEnabled = prefs.getBoolean(PROXY_ENABLED, false)
+		try {
+			parseProxyPreferences(JSONObject(prefs.getString(PROXY_PREFERENCES_KEY, "")))
+		} catch (e: JSONException) {
+			e.printStackTrace()
+		}
 	}
 
 	private fun convertShareDevicesToJson():JSONObject?{
@@ -621,6 +668,27 @@ class TelegramSettings(private val app: TelegramApplication) {
 		}
 	}
 
+	private fun convertProxyPrefToJson(): JSONObject? {
+		return try {
+			val proxyPref = currentProxyPref
+			JSONObject().apply {
+				put(ProxyPref.PROXY_ID, proxyPref.id)
+				put(ProxyPref.TYPE_ID, proxyPref.type)
+				put(ProxyPref.SERVER_ID, proxyPref.server)
+				put(ProxyPref.PORT_ID, proxyPref.port)
+				if (proxyPref is ProxyMTProtoPref) {
+					put(ProxyMTProtoPref.KEY_ID, proxyPref.key)
+				} else if (proxyPref is ProxySOCKS5Pref) {
+					put(ProxySOCKS5Pref.LOGIN_ID, proxyPref.login)
+					put(ProxySOCKS5Pref.PASSWORD_ID, proxyPref.password)
+				}
+			}
+		} catch (e: JSONException) {
+			e.printStackTrace()
+			null
+		}
+	}
+
 	private fun convertShareChatsInfoToJson(): JSONArray? {
 		return try {
 			val jArray = JSONArray()
@@ -678,6 +746,28 @@ class TelegramSettings(private val app: TelegramApplication) {
 		}
 	}
 
+	private fun parseProxyPreferences(jsonObject: JSONObject) {
+		val proxyId = jsonObject.optInt(ProxyPref.PROXY_ID)
+		val typeString = jsonObject.optString(ProxyPref.TYPE_ID)
+		val server = jsonObject.optString(ProxyPref.SERVER_ID)
+		val port = jsonObject.optInt(ProxyPref.PORT_ID)
+		val proxyPref = when {
+			ProxyType.valueOf(typeString) == ProxyType.MTPROTO -> {
+				val key = jsonObject.optString(ProxyMTProtoPref.KEY_ID)
+				ProxyMTProtoPref(proxyId, server, port, key)
+			}
+			ProxyType.valueOf(typeString) == ProxyType.SOCKS5 -> {
+				val login = jsonObject.optString(ProxySOCKS5Pref.LOGIN_ID)
+				val password = jsonObject.optString(ProxySOCKS5Pref.PASSWORD_ID)
+				ProxySOCKS5Pref(proxyId, server, port, login, password)
+			}
+			else -> null
+		}
+		if (proxyPref != null) {
+			currentProxyPref = proxyPref
+		}
+	}
+
 	private fun parseShareDevices(json: String) {
 		shareDevices = OsmandApiUtils.parseJsonContents(json).toHashSet()
 	}
@@ -926,6 +1016,45 @@ class TelegramSettings(private val app: TelegramApplication) {
 		}
 	}
 
+	enum class ProxyType {
+		MTPROTO, SOCKS5
+	}
+
+	abstract class ProxyPref(
+		var id: Int,
+		var type: ProxyType,
+		open var server: String,
+		open var port: Int
+	) {
+		companion object {
+			internal const val PROXY_ID = "proxyId"
+			internal const val TYPE_ID = "type"
+			internal const val SERVER_ID = "serverId"
+			internal const val PORT_ID = "portId"
+		}
+	}
+
+	class ProxyMTProtoPref(id: Int, server: String, port: Int, var key: String) :
+		ProxyPref(id, ProxyType.MTPROTO, server, port) {
+		companion object {
+			internal const val KEY_ID = "key"
+		}
+	}
+
+	class ProxySOCKS5Pref(
+		id: Int,
+		server: String,
+		port: Int,
+		var login: String,
+		var password: String
+	) :
+		ProxyPref(id, ProxyType.SOCKS5, server, port) {
+		companion object {
+			internal const val LOGIN_ID = "login"
+			internal const val PASSWORD_ID = "password"
+		}
+	}
+
 	class SharingStatus {
 
 		var title: String = ""
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
index 8b5a47f399..63659c5c56 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
@@ -683,6 +683,80 @@ class TelegramHelper private constructor() {
 		}
 	}
 
+	fun disableProxy() {
+		client?.send(TdApi.DisableProxy()) { obj ->
+			when (obj.constructor) {
+				TdApi.Error.CONSTRUCTOR -> {
+					val error = obj as TdApi.Error
+					if (error.code != IGNORED_ERROR_CODE) {
+						listener?.onTelegramError(error.code, error.message)
+					}
+				}
+				TdApi.Ok.CONSTRUCTOR -> {
+				}
+			}
+		}
+	}
+
+	fun enableProxy(proxyId: Int) {
+		client?.send(TdApi.EnableProxy(proxyId)) { obj ->
+			when (obj.constructor) {
+				TdApi.Error.CONSTRUCTOR -> {
+					val error = obj as TdApi.Error
+					if (error.code != IGNORED_ERROR_CODE) {
+						listener?.onTelegramError(error.code, error.message)
+					}
+				}
+				TdApi.Ok.CONSTRUCTOR -> {
+				}
+			}
+		}
+	}
+
+	fun addProxyPref(proxyPref: TelegramSettings.ProxyPref, enable: Boolean) {
+		val proxyType: TdApi.ProxyType? = when (proxyPref) {
+			is TelegramSettings.ProxyMTProtoPref -> TdApi.ProxyTypeMtproto(proxyPref.key)
+			is TelegramSettings.ProxySOCKS5Pref -> TdApi.ProxyTypeSocks5(proxyPref.login, proxyPref.password)
+			else -> null
+		}
+		client?.send(TdApi.AddProxy(proxyPref.server, proxyPref.port, enable, proxyType)) { obj ->
+			when (obj.constructor) {
+				TdApi.Error.CONSTRUCTOR -> {
+					val error = obj as TdApi.Error
+					if (error.code != IGNORED_ERROR_CODE) {
+						listener?.onTelegramError(error.code, error.message)
+					}
+				}
+				TdApi.Proxy.CONSTRUCTOR -> {
+					val proxy = (obj as TdApi.Proxy)
+					proxyPref.id = proxy.id
+				}
+			}
+		}
+	}
+
+	fun editProxyPref(proxyPref: TelegramSettings.ProxyPref, enable: Boolean) {
+		val proxyType: TdApi.ProxyType? = when (proxyPref) {
+			is TelegramSettings.ProxyMTProtoPref -> TdApi.ProxyTypeMtproto(proxyPref.key)
+			is TelegramSettings.ProxySOCKS5Pref -> TdApi.ProxyTypeSocks5(proxyPref.login, proxyPref.password)
+			else -> null
+		}
+		client?.send(TdApi.EditProxy(proxyPref.id, proxyPref.server, proxyPref.port, enable, proxyType)) { obj ->
+			when (obj.constructor) {
+				TdApi.Error.CONSTRUCTOR -> {
+					val error = obj as TdApi.Error
+					if (error.code != IGNORED_ERROR_CODE) {
+						listener?.onTelegramError(error.code, error.message)
+					}
+				}
+				TdApi.Proxy.CONSTRUCTOR -> {
+					val proxy = (obj as TdApi.Proxy)
+					proxyPref.id = proxy.id
+				}
+			}
+		}
+	}
+
 	fun createPrivateChatWithUser(
 		userId: Int,
 		shareInfo: TelegramSettings.ShareChatInfo,
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index d0a28d1d48..f5de2e8e2e 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -217,17 +217,23 @@ class LoginDialogFragment : BaseDialogFragment() {
 				welcomeImage?.visibility = View.GONE
 			}
 
-			val continueButton = view?.findViewById<Button>(R.id.welcome_continue_button)
-			continueButton?.setOnClickListener {
-				showWelcomeDialog = false
-				if (!privacyPolicyAgreed) {
-					loginDialogActiveType = LoginDialogType.PRIVACY_POLICY
-					showProgress = false
-				} else if (loginDialogActiveType == null) {
-					loginDialogActiveType = LoginDialogType.ENTER_PHONE_NUMBER
-					showProgress = true
+			view?.findViewById<Button>(R.id.welcome_continue_button)?.apply {
+				val params = layoutParams as ViewGroup.MarginLayoutParams
+				val bottomMargin = AndroidUtils.getNavBarHeight(context) + resources.getDimensionPixelSize(R.dimen.dialog_button_bottom_padding)
+				params.apply {
+					setMargins(leftMargin, topMargin, rightMargin, bottomMargin)
+				}
+				setOnClickListener {
+					showWelcomeDialog = false
+					if (!privacyPolicyAgreed) {
+						loginDialogActiveType = LoginDialogType.PRIVACY_POLICY
+						showProgress = false
+					} else if (loginDialogActiveType == null) {
+						loginDialogActiveType = LoginDialogType.ENTER_PHONE_NUMBER
+						showProgress = true
+					}
+					buildDialog(view)
 				}
-				buildDialog(view)
 			}
 			view?.findViewById<View>(R.id.login_layout)?.visibility = View.GONE
 			view?.findViewById<View>(R.id.welcome_layout)?.visibility = View.VISIBLE
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/ProxySettingsDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/ProxySettingsDialogFragment.kt
new file mode 100644
index 0000000000..1587845f9f
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/ProxySettingsDialogFragment.kt
@@ -0,0 +1,217 @@
+package net.osmand.telegram.ui
+
+import android.os.Build
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentManager
+import android.support.v4.content.ContextCompat
+import android.support.v7.widget.Toolbar
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.*
+import net.osmand.telegram.R
+import net.osmand.telegram.TelegramSettings.ProxyType
+import net.osmand.telegram.TelegramSettings.ProxyPref
+import net.osmand.telegram.TelegramSettings.ProxyMTProtoPref
+import net.osmand.telegram.TelegramSettings.ProxySOCKS5Pref
+
+class ProxySettingsDialogFragment : BaseDialogFragment() {
+
+	private val uiUtils get() = app.uiUtils
+
+	private lateinit var mainView: View
+	private lateinit var proxyEnableSwitcher: Switch
+	private lateinit var saveButtonContainer: LinearLayout
+
+	private lateinit var selectedProxyType: ProxyType
+
+	private lateinit var serverEditText: EditText
+	private lateinit var portEditText: EditText
+
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		parent: ViewGroup?,
+		savedInstanceState: Bundle?
+	): View {
+		mainView = inflater.inflate(R.layout.fragment_proxy_settings_dialog, parent)
+
+		val window = dialog.window
+		if (window != null) {
+			window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+			if (Build.VERSION.SDK_INT >= 21) {
+				window.statusBarColor = ContextCompat.getColor(app, R.color.card_bg_light)
+			}
+		}
+		mainView.findViewById<Toolbar>(R.id.toolbar).apply {
+			navigationIcon = uiUtils.getThemedIcon(R.drawable.ic_arrow_back)
+			setNavigationOnClickListener { dismiss() }
+		}
+
+		selectedProxyType = settings.currentProxyPref.type
+
+		mainView.findViewById<ViewGroup>(R.id.enable_proxy_btn).apply {
+			val title = findViewById<TextView>(R.id.title).apply {
+				text = if (settings.proxyEnabled) getText(R.string.shared_string_disable) else getText(
+						R.string.shared_string_enable
+					)
+			}
+			proxyEnableSwitcher = findViewById<Switch>(R.id.switcher).apply {
+				isChecked = settings.proxyEnabled
+			}
+			setOnClickListener {
+				val checked = !proxyEnableSwitcher.isChecked
+				proxyEnableSwitcher.isChecked = checked
+				title.text = if (checked) getText(R.string.shared_string_disable) else getText(R.string.shared_string_enable)
+				updateSaveButtonVisibility(true)
+			}
+		}
+
+		val container = mainView.findViewById<ViewGroup>(R.id.proxy_type_container)
+		ProxyType.values().forEach {
+			addItemToContainer(inflater, container, it)
+		}
+
+		serverEditText = mainView.findViewById<EditText>(R.id.server_edit_text).apply {
+			val server = settings.currentProxyPref.server
+			setText(server)
+			setSelection(server.length)
+			addTextChangedListener(object :
+				TextWatcher {
+				override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+				override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+
+				override fun afterTextChanged(s: Editable) {
+					updateSaveButtonVisibility(s.isNotEmpty() && portEditText.text.isNotEmpty())
+				}
+			})
+		}
+		portEditText = mainView.findViewById<EditText>(R.id.port_edit_text).apply {
+			val port = settings.currentProxyPref.port
+			setText(if (port != -1) port.toString() else "")
+			addTextChangedListener(object :
+				TextWatcher {
+				override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+				override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+
+				override fun afterTextChanged(s: Editable) {
+					updateSaveButtonVisibility(s.isNotEmpty() && serverEditText.text.isNotEmpty())
+				}
+			})
+		}
+		saveButtonContainer = mainView.findViewById<LinearLayout>(R.id.save_button_Container).apply {
+				findViewById<TextView>(R.id.primary_btn).apply {
+					text = getString(R.string.shared_string_save)
+					setOnClickListener {
+						saveChanges()
+						targetFragment?.also { target ->
+							target.onActivityResult(targetRequestCode, PROXY_PREFERENCES_UPDATED_REQUEST_CODE, null)
+						}
+						dismiss()
+					}
+				}
+			}
+
+		updateSelectedProxyType()
+		updateEditingMode()
+		updateProxyPrefInfo()
+		updateSaveButtonVisibility(false)
+
+		return mainView
+	}
+
+	private fun updateSaveButtonVisibility(visible: Boolean) {
+		saveButtonContainer.visibility = if (visible) View.VISIBLE else View.GONE
+	}
+
+	private fun saveChanges() {
+		val proxyPref = getSelectedProxyPref()
+		settings.updateCurrentProxyPref(proxyPref, proxyEnableSwitcher.isChecked)
+	}
+
+	private fun updateProxyPrefInfo() {
+		val proxyPref = settings.currentProxyPref
+		if (proxyPref is ProxyMTProtoPref) {
+			mainView.findViewById<TextView>(R.id.key_text).text = proxyPref.key
+		} else if (proxyPref is ProxySOCKS5Pref) {
+			mainView.findViewById<TextView>(R.id.username_text).text = proxyPref.login
+			mainView.findViewById<TextView>(R.id.password_text).text = proxyPref.password
+		}
+	}
+
+	private fun getSelectedProxyPref(): ProxyPref {
+		val server = serverEditText.text.toString()
+		val port = portEditText.text.toString().toIntOrNull() ?: -1
+		return when (selectedProxyType) {
+			ProxyType.MTPROTO -> {
+				val key = mainView.findViewById<TextView>(R.id.key_text).text.toString()
+				ProxyMTProtoPref(settings.currentProxyPref.id, server, port, key)
+			}
+			ProxyType.SOCKS5 -> {
+				val username = mainView.findViewById<TextView>(R.id.username_text).text.toString()
+				val password = mainView.findViewById<TextView>(R.id.password_text).text.toString()
+				ProxySOCKS5Pref(settings.currentProxyPref.id, server, port, username, password)
+			}
+		}
+	}
+
+	private fun updateSelectedProxyType() {
+		view?.findViewById<ViewGroup>(R.id.proxy_type_container)?.apply {
+			for (i in 0 until childCount) {
+				getChildAt(i).apply {
+					findViewById<RadioButton>(R.id.radio_button).isChecked = tag == selectedProxyType
+				}
+			}
+		}
+	}
+
+	private fun updateEditingMode() {
+		mainView.findViewById<LinearLayout>(R.id.proxy_sosks5_container)?.visibility =
+			if (selectedProxyType == ProxyType.SOCKS5) View.VISIBLE else View.GONE
+		mainView.findViewById<LinearLayout>(R.id.proxy_mtproto_container)?.visibility =
+			if (selectedProxyType == ProxyType.MTPROTO) View.VISIBLE else View.GONE
+	}
+
+	private fun addItemToContainer(
+		inflater: LayoutInflater,
+		container: ViewGroup,
+		proxyTypeTag: ProxyType
+	) {
+		inflater.inflate(R.layout.item_with_rb_and_btn, container, false).apply {
+			findViewById<TextView>(R.id.title).text = proxyTypeTag.name
+			findViewById<View>(R.id.primary_btn).visibility = View.GONE
+			findViewById<View>(R.id.icon).visibility = View.GONE
+			findViewById<RadioButton>(R.id.radio_button).isChecked = selectedProxyType == proxyTypeTag
+
+			setOnClickListener {
+				selectedProxyType = proxyTypeTag
+				updateSelectedProxyType()
+				updateEditingMode()
+				updateSaveButtonVisibility(selectedProxyType != settings.currentProxyPref.type && portEditText.text.isNotEmpty() && serverEditText.text.isNotEmpty())
+			}
+			this.tag = proxyTypeTag
+			container.addView(this)
+		}
+	}
+
+	companion object {
+
+		private const val TAG = "ProxySettingsDialogFragment"
+		const val PROXY_PREFERENCES_UPDATED_REQUEST_CODE = 6
+
+		fun showInstance(fm: FragmentManager, target: Fragment): Boolean {
+			return try {
+				ProxySettingsDialogFragment().apply {
+					setTargetFragment(target, PROXY_PREFERENCES_UPDATED_REQUEST_CODE)
+					show(fm, TAG)
+				}
+				true
+			} catch (e: RuntimeException) {
+				false
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
index 0b286ab115..96be94938c 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
@@ -2,9 +2,11 @@ package net.osmand.telegram.ui
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
+import android.support.v4.content.ContextCompat
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.Toolbar
@@ -64,14 +66,14 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 	): View {
 		val mainView = inflater.inflate(R.layout.fragment_search_dialog, parent)
 
-		val appBarLayout = mainView.findViewById<View>(R.id.app_bar_layout)
-		AndroidUtils.addStatusBarPadding19v(context!!, appBarLayout)
-
 		mainView.findViewById<Toolbar>(R.id.toolbar).apply {
 			navigationIcon = uiUtils.getThemedIcon(R.drawable.ic_arrow_back)
 			setNavigationOnClickListener { dismiss() }
 		}
-
+		val window = dialog.window
+		if (window != null && Build.VERSION.SDK_INT >= 21) {
+			window.statusBarColor = ContextCompat.getColor(app, R.color.card_bg_light)
+		}
 		searchEditText = mainView.findViewById<EditText>(R.id.searchEditText).apply {
 			addTextChangedListener(object : TextWatcher {
 
@@ -104,7 +106,11 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 			addOnScrollListener(object : RecyclerView.OnScrollListener() {
 				override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
 					super.onScrollStateChanged(recyclerView, newState)
-					locationUiUpdateAllowed = newState == RecyclerView.SCROLL_STATE_IDLE
+					val scrolling = newState != RecyclerView.SCROLL_STATE_IDLE
+					locationUiUpdateAllowed = !scrolling
+					if (scrolling) {
+						hideKeyboard()
+					}
 				}
 			})
 		}
@@ -127,6 +133,13 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 		return mainView
 	}
 
+	private fun hideKeyboard() {
+		val mainActivity = activity
+		if (mainActivity != null && searchEditText.hasFocus()) {
+			AndroidUtils.hideSoftKeyboard(mainActivity, searchEditText)
+		}
+	}
+
 	private fun clearSearchedItems() {
 		searchedChatsIds.clear()
 		searchedPublicChatsIds.clear()
@@ -200,7 +213,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 
 	private fun updateLocationUi() {
 		if (locationUiUpdateAllowed) {
-			app.runInUIThread { updateList() }
+			app.runInUIThread { adapter.notifyDataSetChanged() }
 		}
 	}
 
@@ -211,9 +224,28 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 		val users: MutableList<TdApi.User> = mutableListOf()
 		val currentUserId = telegramHelper.getCurrentUserId()
 
-		searchedChatsIds.forEach {
+		selectedChats.forEach {
 			val chat = telegramHelper.getChat(it)
 			if (chat != null) {
+				if (!telegramHelper.isChannel(chat) && telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) {
+					items.add(chat)
+				}
+			} else {
+				telegramHelper.requestChat(it)
+			}
+		}
+		selectedUsers.forEach {
+			val user = telegramHelper.getUser(it.toInt())
+			if (user != null) {
+				if (user.id != currentUserId)
+					items.add(user)
+			} else {
+				telegramHelper.requestUser(it.toInt())
+			}
+		}
+		searchedChatsIds.forEach {
+			val chat = telegramHelper.getChat(it)
+			if (chat != null && !selectedChats.contains(it)) {
 				if (!telegramHelper.isChannel(chat) && telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) {
 					chats.add(chat)
 				}
@@ -225,7 +257,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 
 		searchedContactsIds.forEach { userId ->
 			val user = telegramHelper.getUser(userId)
-			if (user != null) {
+			if (user != null && !selectedUsers.contains(userId.toLong())) {
 				if (user.id != currentUserId && !chats.any { telegramHelper.getUserIdFromChatType(it.type) == user.id })
 					users.add(user)
 			} else {
@@ -236,9 +268,8 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 
 		searchedPublicChatsIds.forEach {
 			val chat = telegramHelper.getChat(it)
-			if (chat != null) {
-				if (!telegramHelper.isChannel(chat) && !chats.contains(chat)
-					&& telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) {
+			if (chat != null && !selectedChats.contains(it) && !searchedChatsIds.contains(it)) {
+				if (!telegramHelper.isChannel(chat) && telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) {
 					publicChats.add(chat)
 				}
 			} else {
@@ -370,6 +401,9 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 						} else {
 							selectedUsers.remove(itemId)
 						}
+						if (!(searchedChatsIds.contains(itemId) || searchedPublicChatsIds.contains(itemId) || searchedContactsIds.contains(itemId.toInt()))) {
+							updateList()
+						}
 					}
 					switchButtonsVisibility(selectedChats.isNotEmpty() || selectedUsers.isNotEmpty())
 				}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
index cb4ca435c2..71b5fe9a29 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
@@ -5,6 +5,7 @@ import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.FragmentManager
+import android.support.v4.content.ContextCompat
 import android.support.v7.widget.ListPopupWindow
 import android.support.v7.widget.Toolbar
 import android.text.SpannableStringBuilder
@@ -39,14 +40,14 @@ class SettingsDialogFragment : BaseDialogFragment() {
 	): View {
 		val mainView = inflater.inflate(R.layout.fragement_settings_dialog, parent)
 
-		val appBarLayout = mainView.findViewById<View>(R.id.app_bar_layout)
-		AndroidUtils.addStatusBarPadding19v(context!!, appBarLayout)
-
 		mainView.findViewById<Toolbar>(R.id.toolbar).apply {
 			navigationIcon = uiUtils.getThemedIcon(R.drawable.ic_arrow_back)
 			setNavigationOnClickListener { dismiss() }
 		}
-
+		val window = dialog.window
+		if (window != null && Build.VERSION.SDK_INT >= 21) {
+			window.statusBarColor = ContextCompat.getColor(app, R.color.card_bg_light)
+		}
 		var container = mainView.findViewById<ViewGroup>(R.id.gps_and_loc_container)
 		for (pref in settings.gpsAndLocPrefs) {
 			inflater.inflate(R.layout.item_with_desc_and_right_value, container, false).apply {
@@ -91,6 +92,32 @@ class SettingsDialogFragment : BaseDialogFragment() {
 			container.addView(this)
 		}
 
+		container = mainView.findViewById<ViewGroup>(R.id.proxy_settings_container)
+		inflater.inflate(R.layout.item_with_descr_and_right_switch, container, false).apply {
+			findViewById<ImageView>(R.id.icon).setImageDrawable(uiUtils.getThemedIcon(R.drawable.ic_action_proxy))
+			findViewById<ImageView>(R.id.icon_right).apply {
+				visibility = View.VISIBLE
+				setImageDrawable(uiUtils.getThemedIcon(R.drawable.ic_action_additional_option))
+				setOnClickListener {
+					activity?.supportFragmentManager?.also { ProxySettingsDialogFragment.showInstance(it, this@SettingsDialogFragment) }
+				}
+			}
+			findViewById<TextView>(R.id.title).text = getText(R.string.proxy)
+			val description = findViewById<TextView>(R.id.description).apply {
+				text = if (settings.proxyEnabled) getText(R.string.proxy_connected) else getText(R.string.proxy_disconnected)
+			}
+			val switcher = findViewById<Switch>(R.id.switcher).apply {
+				isChecked = app.settings.proxyEnabled
+			}
+			setOnClickListener {
+				val checked = !app.settings.proxyEnabled
+				switcher.isChecked = checked
+				settings.updateProxySetting(checked)
+				description.text = if (checked) getText(R.string.proxy_connected) else getText(R.string.proxy_disconnected)
+			}
+			container.addView(this)
+		}
+
 		shareAsDescription = mainView.findViewById<TextView>(R.id.share_as_description).apply {
 			text = getText(R.string.share_location_as_description)
 			setOnClickListener {
@@ -213,6 +240,12 @@ class SettingsDialogFragment : BaseDialogFragment() {
 					}
 				}
 			}
+			ProxySettingsDialogFragment.PROXY_PREFERENCES_UPDATED_REQUEST_CODE -> {
+				view?.findViewById<ViewGroup>(R.id.proxy_settings_container)?.apply {
+					findViewById<TextView>(R.id.description)?.text = if (settings.proxyEnabled) getText(R.string.proxy_connected) else getText(R.string.proxy_disconnected)
+					findViewById<Switch>(R.id.switcher)?.isChecked = app.settings.proxyEnabled
+				}
+			}
 		}
 	}
 
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
index 858278976a..2b0a0c1313 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
@@ -106,6 +106,27 @@ object AndroidUtils {
 		}
 	}
 
+	fun getNavBarHeight(ctx: Context): Int {
+		if (!hasNavBar(ctx)) {
+			return 0
+		}
+		val landscape = ctx.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+		val isSmartphone = ctx.resources.configuration.smallestScreenWidthDp < 600
+		if (isSmartphone && landscape) {
+			return 0
+		}
+		val name = if (landscape) "navigation_bar_height_landscape" else "navigation_bar_height"
+		val id = ctx.resources.getIdentifier(name, "dimen", "android")
+		return if (id > 0) {
+			ctx.resources.getDimensionPixelSize(id)
+		} else 0
+	}
+
+	fun hasNavBar(ctx: Context): Boolean {
+		val id = ctx.resources.getIdentifier("config_showNavigationBar", "bool", "android")
+		return id > 0 && ctx.resources.getBoolean(id)
+	}
+
 	fun enterToTransparentFullScreen(activity: Activity) {
 		if (Build.VERSION.SDK_INT >= 23) {
 			val window = activity.window
diff --git a/OsmAnd/assets/bundled_assets.xml b/OsmAnd/assets/bundled_assets.xml
index 3cb6693083..8992fc57eb 100644
--- a/OsmAnd/assets/bundled_assets.xml
+++ b/OsmAnd/assets/bundled_assets.xml
@@ -43,6 +43,7 @@
 	<asset source="voice/sl/sl_tts.js" destination="voice/sl-tts/sl_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/sv/sv_tts.js" destination="voice/sv-tts/sv_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/sw/sw_tts.js" destination="voice/sw-tts/sw_tts.js" mode="overwriteOnlyIfExists" />
+	<asset source="voice/tr/tr_tts.js" destination="voice/tr-tts/tr_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/uk/uk_tts.js" destination="voice/uk-tts/uk_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/zh/zh_tts.js" destination="voice/zh-tts/zh_tts.js" mode="alwaysOverwriteOrCopy" />
 	<asset source="voice/zh-hk/zh-hk_tts.js" destination="voice/zh-hk-tts/zh-hk_tts.js" mode="overwriteOnlyIfExists" />
diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml
index be266d95a0..0db6b49abd 100644
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@@ -31,6 +31,7 @@
     <string name="osm_live_annual_price">€7,99</string>
     <string name="osm_live_annual_monthly_price">€2,66</string>
     <string name="twitter_address">https://twitter.com/osmandapp</string>
+    <string name="reddit_address">https://www.reddit.com/r/OsmAnd</string>
     <string name="facebook_address">https://www.facebook.com/osmandapp</string>
     <string name="vk_address">https://vk.com/osmandapp</string>
     <string name="default_changeset_add">Add</string>
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png
new file mode 100644
index 0000000000..c1ba05be3b
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_day.png
new file mode 100644
index 0000000000..afcbe664e3
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_day.png differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_night.png
new file mode 100644
index 0000000000..64e08635fe
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_night.png differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_day.png
new file mode 100644
index 0000000000..8483e55c10
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_day.png differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_night.png
new file mode 100644
index 0000000000..b98df82372
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_night.png differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_day.png
new file mode 100644
index 0000000000..77ce6c000e
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_day.png differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_night.png
new file mode 100644
index 0000000000..9a9809fe58
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_night.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png
new file mode 100644
index 0000000000..1e329f8110
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_day.png
new file mode 100644
index 0000000000..ea2978a25c
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_day.png differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_night.png
new file mode 100644
index 0000000000..2e97b76de6
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_night.png differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_day.png
new file mode 100644
index 0000000000..bbdc955ccb
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_day.png differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_night.png
new file mode 100644
index 0000000000..6694986694
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_night.png differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_day.png
new file mode 100644
index 0000000000..6c9d74675f
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_day.png differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_night.png
new file mode 100644
index 0000000000..50a630a8b5
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_night.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png
new file mode 100644
index 0000000000..ad49ad0f0d
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_day.png
new file mode 100644
index 0000000000..fe264228da
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_day.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_night.png
new file mode 100644
index 0000000000..de8b7bb08d
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_night.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_day.png
new file mode 100644
index 0000000000..089004d130
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_day.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_night.png
new file mode 100644
index 0000000000..be12ce8613
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_night.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_day.png
new file mode 100644
index 0000000000..c1c520d139
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_day.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_night.png
new file mode 100644
index 0000000000..ee30b4647c
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_night.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png
new file mode 100644
index 0000000000..c3c416f6d1
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_day.png
new file mode 100644
index 0000000000..dee3f6d6a9
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_day.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_night.png
new file mode 100644
index 0000000000..85e481a7ff
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_night.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_day.png
new file mode 100644
index 0000000000..e533b2dfd1
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_day.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_night.png
new file mode 100644
index 0000000000..af70a72659
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_night.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_day.png
new file mode 100644
index 0000000000..1f17c3bf08
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_day.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_night.png
new file mode 100644
index 0000000000..e4724a0655
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_night.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png
new file mode 100644
index 0000000000..05dfda08ca
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_day.png
new file mode 100644
index 0000000000..f025fa2645
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_day.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_night.png
new file mode 100644
index 0000000000..45ba510072
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_night.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_day.png
new file mode 100644
index 0000000000..dac2533957
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_day.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_night.png
new file mode 100644
index 0000000000..06f13e7a91
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_night.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_day.png
new file mode 100644
index 0000000000..1b4769ef3c
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_day.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_night.png
new file mode 100644
index 0000000000..92f1db61dc
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_night.png differ
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-b+be+Latn/strings.xml
similarity index 99%
rename from OsmAnd/res/values-be-rBY/strings.xml
rename to OsmAnd/res/values-b+be+Latn/strings.xml
index 62d4b63973..77f40914e1 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-b+be+Latn/strings.xml
@@ -3021,4 +3021,4 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="rendering_attr_undefined_name">Niavyznačana</string>
     <string name="routing_attr_avoid_sett_name">Pazbiahać brukavanych daroh</string>
     <string name="routing_attr_avoid_sett_description">Pazbiahać brukavanych daroh</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index 38a8abb373..f61fff3348 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -3348,8 +3348,8 @@
     <string name="poi_climbing_toprope_no">Вяроўка з вяршыні: не</string>
     <string name="poi_climbing_trad_yes">Традыцыйны: так</string>
     <string name="poi_climbing_trad_no">Традыцыйны: не</string>
-    <string name="poi_climbing_multipitch_yes">Мультыпітч: так</string>
-    <string name="poi_climbing_multipitch_no">Мультыпітч: так</string>
+    <string name="poi_climbing_multipitch_yes">Шматзонныя маршруты: так</string>
+    <string name="poi_climbing_multipitch_no">Шматзонныя маршруты: не</string>
     <string name="poi_climbing_ice_yes">Ледзяны: так</string>
     <string name="poi_climbing_ice_no">Ледзяны: не</string>
     <string name="poi_climbing_mixed_yes">Змешаны: так</string>
@@ -3578,4 +3578,7 @@
     <string name="poi_flare">Газавы факел</string>
     <string name="poi_change_delete">Выдалены аб’ект</string>
     <string name="poi_health_specialty_radiotherapy_yes">Радыятэрапія</string>
+    <string name="poi_climbing_crag_filter">Месца для скалалажання</string>
+    <string name="poi_rescue_box">Выратавальная скрыня</string>
+    <string name="poi_climbing_crag">Так</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index a2d6c55296..998efcb5d6 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -464,7 +464,7 @@
     <string name="oclock">гадзін</string>
     <string name="towards">у кірунку</string>
     <string name="accuracy">Дакладнасць</string>
-    <string name="altitude">Вышыня</string>
+    <string name="altitude">Вышыня над узроўнем мора</string>
     <string name="no_info">Інфармацыя адсутнічае</string>
     <string name="direction_style_sidewise">Па накірункам свету (8 сектараў)</string>
     <string name="direction_style_clockwise">Па стрэлцы гадзінніка (12 сектараў)</string>
@@ -1538,7 +1538,7 @@
     <string name="rendering_value__name">Прадвызначана</string>
     <string name="rendering_value_highContrastRoads_name">Высокая кантрастнасць дарог</string>
     <string name="specified_directiory_not_writeable">Немагчыма стварыць мапы ў вызначаным каталозе</string>
-    <string name="copying_osmand_file_failed">Скапіяваць файлы не атрымалася</string>
+    <string name="copying_osmand_file_failed">Перамясціць файлы не атрымалася</string>
     <string name="storage_directory_internal_app">Унутраная памяць дадатка</string>
     <string name="storage_directory_manual">Вызначана ўласнаручна</string>
     <string name="storage_directory_default">Унутраная памяць</string>
@@ -1546,7 +1546,7 @@
     <string name="storage_directory_external">Вонкавы носьбіт інфармацыі</string>
     <string name="storage_directory">Захоўванне мапы</string>
     <string name="storage_directory_multiuser">Агульнае сховішча</string>
-    <string name="application_dir_change_warning3">Скапіяваць файлы даных OsmAnd у новае месца\?</string>
+    <string name="application_dir_change_warning3">Перамясціць файлы даных OsmAnd у новае месца\?</string>
     <string name="rendering_attr_hideHouseNumbers_name">Нумары дамоў</string>
     <string name="routing_attr_avoid_borders_description">Пазбягаць перасячэння нацыянальных межаў</string>
     <string name="routing_attr_height_name">Абмежаванне па вышыні</string>
@@ -3033,4 +3033,16 @@
 \n
 \n</string>
     <string name="send_log">Адправіць журнал</string>
+    <string name="files_moved">Перамешчана %1$d файлаў (%2$s).</string>
+    <string name="files_copied">Скапіявана %1$d файлаў (%2$s).</string>
+    <string name="files_failed">Не атрымалася скапіяваць %1$d файлаў (%2$s).</string>
+    <string name="files_present">%1$d файлаў (%2$s) знаходзіцца ў папярэднім месцы \'%3$s\'.</string>
+    <string name="move_maps">Перамясціць мапы</string>
+    <string name="dont_move_maps">Не перамяшчаць</string>
+    <string name="public_transport_ped_route_title">Маршрут пешшу складае %1$s, дайсці можна хутчэй, чым рухацца на грамадскім транспарце</string>
+    <string name="public_transport_no_route_title">На жаль, OsmAnd не змог знайсці маршрут па вашых наладах.</string>
+    <string name="public_transport_try_ped">Паспрабуйце пешаходную навігацыю.</string>
+    <string name="public_transport_try_change_settings">Паспрабуйце змяніць налады.</string>
+    <string name="public_transport_calc_pedestrian">Падлічыць пешаходны маршрут</string>
+    <string name="public_transport_type">Тып транспарту</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 3ffd67fb1a..611ca18fa7 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -709,7 +709,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
     <string name="poi_filter_public_transport">Transport públic</string>
     <string name="poi_filter_emergency">Emergències</string>
     <string name="poi_filter_restaurants">Restaurants</string>
-    <string name="osm_editing_plugin_description">"Amb aquest connector d\'OsmAnd es pot fer contribucions a OSM com la creació o modificació de PDIs d\'OSM,  obrir o comentar anotacions OSM o contribuir amb fitxers GPX registrats. OSM és un projecte de cartografia global, de domini públic i gestionat per una comunitat. Per més detalls dirigiu-vos a  https://openstreetmap.org. La participació activa és d\'agrair i aquestes contribucions es poden directament des OsmAnd, si heu indicat les vostres credencials personals d\'OSM a l\'aplicació."</string>
+    <string name="osm_editing_plugin_description">"Amb aquest connector d\'OsmAnd es poden fer contribucions a OSM com la creació o modificació de PDIs d\'OSM,  obrir o comentar anotacions OSM o contribuir amb fitxers GPX enregistrats. OSM és un projecte gestionat per una comunitat, de domini públic i de cartografia global,. Per més detalls dirigiu-vos a  https://openstreetmap.org. La participació activa s\'agraeix i aquestes contribucions es poden fer directament des OsmAnd, si heu indicat les vostres credencials personals d\'OSM a l\'aplicació."</string>
     <string name="tts_language_not_supported">La llengua seleccionada no està suportada per el motor de TTS (text a veu) d\'Android instal·lat. Voleu buscar altres motors TTS a la botiga d\'aplicacions? Altrament s\'usarà la llengua del TTS per defecte.</string>
     <string name="send_location_way_choose_title">Comparteix l\'ubicació usant</string>
     <string name="old_map_index_is_not_supported">Format de mapa «{0}» obsolet, no s\'admet</string>
@@ -1551,9 +1551,9 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="index_name_netherlands">Europa - Països Baixos</string>
     <string name="rendering_value__name">Per defecte</string>
     <string name="rendering_value_highContrastRoads_name">Vies més contrastades</string>
-    <string name="application_dir_change_warning3">Voleu copiar els fitxers de dades OsmAnd a la nova destinació?</string>
+    <string name="application_dir_change_warning3">Voleu moure els fitxers de dades OsmAnd a la nova destinació\?</string>
     <string name="specified_directiory_not_writeable">Creació de mapes al directori indicat fallida</string>
-    <string name="copying_osmand_file_failed">Error en copiar fitxers</string>
+    <string name="copying_osmand_file_failed">Error en moure els fitxers</string>
     <string name="storage_directory_external">Emmagatzematge exterior</string>
     <string name="storage_directory_multiuser">Emmagatzematge multiusuari</string>
     <string name="storage_directory_internal_app">Memòria interna de l\'aplicació</string>
@@ -3021,7 +3021,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="quick_action_day_night_mode">Mode %s</string>
     <string name="shared_string_degrees">Graus</string>
     <string name="shared_string_milliradians">Mil·liradiants</string>
-    <string name="angular_measeurement">Unitats de mesura angular</string>
+    <string name="angular_measeurement">Unitat angular</string>
     <string name="angular_measeurement_descr">Canvia la unitat de mesura de l\'azimut.</string>
     <string name="routing_attr_avoid_sett_name">Evita els empedrats i els llambordins</string>
     <string name="routing_attr_avoid_sett_description">Evita els empedrats i els llambordins</string>
@@ -3046,4 +3046,16 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \n• Mostra l\'azimut en la mesura de la distància
 \n</string>
     <string name="send_log">Envia el registre</string>
+    <string name="files_moved">S\'han mogut %1$d arxius (%2$s).</string>
+    <string name="files_copied">S\'han copiat %1$d arxius (%2$s).</string>
+    <string name="files_failed">No ha pogut copiar %1$d arxius (%2$s).</string>
+    <string name="files_present">Ja hi ha %1$d arxius (%2$s) a la localització prèvia \'%3$s\'.</string>
+    <string name="move_maps">Mou els mapes</string>
+    <string name="dont_move_maps">No moguis</string>
+    <string name="public_transport_ped_route_title">La ruta a peu triga aproximadament %1$s i podria ser més ràpida utilitzant transport públic</string>
+    <string name="public_transport_no_route_title">Per desgràcia, OsmAnd no ha pogut trobar una ruta adient amb els vostres paràmetres.</string>
+    <string name="public_transport_try_ped">Proveu la navegació per vianants.</string>
+    <string name="public_transport_try_change_settings">Proveu a canviar els paràmetres.</string>
+    <string name="public_transport_calc_pedestrian">Calcula la ruta per vianants</string>
+    <string name="public_transport_type">Tipus de transport</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 352f18b277..52ca6042dc 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -662,7 +662,7 @@
 \nVšechny tyto mapy mohou být použity jako hlavní (základní) mapa na obrazovce OsmAnd nebo jako překryvná popř. podkladová mapa k jiné základní mapě (např. standardní OsmAnd off-line mapě). Pro zlepšení viditelnosti podkladových map je možné vypnout některé objekty z vektorových map OsmAnd, přes menu \'Nastavení mapy\'.
 \n
 \nDlaždicové mapy můžete získat přímo z on-line zdrojů nebo si je můžete připravit pro off-line použití (zkopírovat ručně do datového adresáře OsmAnd) jako SQLite databázi, která může být vytvořena mnoha programy pro přípravu map.</string>
-    <string name="osmand_background_plugin_description">Zobrazení nastavení pro zapnutí záznamu trasy a navigace na pozadí s pravidelným probouzením GPS zařízení (s vypnutou obrazovkou).</string>
+    <string name="osmand_background_plugin_description">Zobrazí nastavení pro zapnutí záznamu trasy a navigace na pozadí s pravidelným probouzením GPS zařízení (s vypnutou obrazovkou).</string>
     <string name="osmand_accessibility_description">Tento modul zobrazí nastavení pro speciální funkce ulehčení přístupu přímo v OsmAnd. Například je možné měnit rychlost TTS hlasu, použít trackball na přibližování nebo například použít hlasové předčítání pro oznamování polohy.</string>
     <string name="osmand_development_plugin_description">Tento modul zobrazí nastavení vývojových a ladících funkcí, jako jsou simulace navigace, informace o rychlosti vykreslování nebo hlasová oznámení. Tato nastavení jsou určené pro vývojáře a nejsou potřebné pro běžné použití.</string>
     <string name="plugins_screen">Správce modulů</string>
@@ -2873,7 +2873,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="points_of_interests">Body zájmu (POI)</string>
     <string name="waiting_for_route_calculation">Vypočítávání trasy…</string>
     <string name="app_mode_public_transport">Veřejná doprava</string>
-    <string name="avoid_roads_descr">Vyberte cestu na mapě nebo ze seznamu níže, které se chcete během navigace vyhnout:</string>
+    <string name="avoid_roads_descr">Vyberte na mapě nebo ze seznamu níže cestu, které se chcete během navigace vyhnout:</string>
     <string name="show_along_the_route">Ukázat podél trasy</string>
     <string name="simulate_navigation">Simulovat navigaci</string>
     <string name="choose_track_file_to_follow">Vyberte soubor s trasou, kterou chcete následovat</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 27908f302a..627a38f219 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -3588,4 +3588,5 @@
     <string name="poi_health_specialty_radiotherapy_yes">Strålebehandling</string>
     <string name="poi_rescue_box">Redningsboks</string>
     <string name="poi_climbing_crag">Ja</string>
+    <string name="reddit">Reddit</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 2175247edc..88e7a6d4a7 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1547,7 +1547,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
     <string name="rendering_value__name">Standard</string>
     <string name="rendering_value_highContrastRoads_name">Veje med høj kontrast</string>
     <string name="specified_directiory_not_writeable">Kunne ikke oprettes kort i det angivne bibliotek</string>
-    <string name="copying_osmand_file_failed">Kopiering af filer mislykkedes</string>
+    <string name="copying_osmand_file_failed">Flytning af filer mislykkedes</string>
     <string name="storage_directory_external">Ekstern lager</string>
     <string name="storage_directory_multiuser">Flerbruger lager</string>
     <string name="storage_directory_internal_app">Intern programhukommelse</string>
@@ -1555,7 +1555,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
     <string name="storage_directory_default">Internhukommelse</string>
     <string name="storage_directory">Kortlagring</string>
     <string name="shared_string_copy">Kopier</string>
-    <string name="application_dir_change_warning3">Kopier datafilerne til den nye placering?</string>
+    <string name="application_dir_change_warning3">Flyt datafilerne til den nye placering\?</string>
     <string name="rendering_attr_hideHouseNumbers_name">Husnumre</string>
     <string name="routing_attr_avoid_borders_description">Undgå at krydse landegrænser</string>
     <string name="routing_attr_height_name">Højdegrænse</string>
@@ -2675,7 +2675,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="all_data">Alle data</string>
     <string name="osm_notes">OSM-noter</string>
     <string name="tunnel_warning">Tunnel forude</string>
-    <string name="show_tunnels">"Tunneler "</string>
+    <string name="show_tunnels">Tunneler</string>
     <string name="shared_string_current">Nuværende</string>
     <string name="last_intermediate_dest_description">Tilføjer et mellemliggende stop</string>
     <string name="first_intermediate_dest_description">Tilføjer første stop</string>
@@ -3024,12 +3024,26 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="routing_attr_avoid_subway_description">Undgå metro og lettog</string>
     <string name="routing_attr_avoid_ferry_name">Undgå færger</string>
     <string name="routing_attr_avoid_ferry_description">Undgå færger</string>
-    <string name="release_3_3_7">• Vis tid mellem overførsler i offentlig transport
+    <string name="release_3_3_7">• Vis tid mellem overførsler i offentlig transport 
+\n 
+\n • Korrigeret brugergrænseflade til ruteoplysningerne 
+\n 
+\n • Rettet mørkt tema i Retningsmenuen og Rutedetaljer 
+\n 
+\n • Vis azimut i Mål afstand
 \n
-\n • Korrigeret brugergrænseflade til ruteoplysningerne
-\n
-\n • Rettet mørkt tema i Retningsmenuen og Rutedetaljer
-\n
-\n • Vis azimut i mål afstand</string>
+\n</string>
     <string name="send_log">Send log</string>
+    <string name="files_moved">Flyttede %1$d filer (%2$s).</string>
+    <string name="files_copied">Kopieret %1$d filer (%2$s).</string>
+    <string name="files_failed">Kunne ikke kopiere %1$d filer (%2$s).</string>
+    <string name="files_present">%1$d filer (%2$s) er til stede på tidligere placering \'%3$s\'.</string>
+    <string name="move_maps">Flyt kort</string>
+    <string name="dont_move_maps">Flyt ikke</string>
+    <string name="public_transport_ped_route_title">Ruten til fods er ca %1$s og den kunne være hurtigere end offentlig transport</string>
+    <string name="public_transport_no_route_title">Kunne desværre ikke finde en rute, der passer til indstillingerne.</string>
+    <string name="public_transport_try_ped">Prøv fodgængernavigationen.</string>
+    <string name="public_transport_try_change_settings">Prøv at ændre indstillinger.</string>
+    <string name="public_transport_calc_pedestrian">Beregn fodgængerruten</string>
+    <string name="public_transport_type">Transporttype</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 459e70c007..a3932e07f9 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -75,7 +75,7 @@
     <string name="poi_craft_boatbuilder">Schiffsbauer</string>
     <string name="poi_boatyard">Schiffsanlegeplatz</string>
     <string name="poi_craft_bookbinder">Buchbinder</string>
-    <string name="poi_bookmaker">Buchmacher</string>
+    <string name="poi_bookmaker">Wettbüro</string>
     <string name="poi_books">Buchhandlung</string>
     <string name="poi_border_control">Grenzkontrolle</string>
     <string name="poi_boules">Boule</string>
@@ -433,7 +433,7 @@
     <string name="poi_seafood">Fischgeschäft</string>
     <string name="poi_anchor_berth">Ankerplatz</string>
     <string name="poi_anchorage">Ankerplatz</string>
-    <string name="poi_beacon">Bake (Seezeichen)</string>
+    <string name="poi_beacon">Bake</string>
     <string name="poi_beacon_cardinal">Untiefenbake (Kardinal)</string>
     <string name="poi_beacon_lateral">Fahrrinnenbake (Lateral)</string>
     <string name="poi_beacon_safe_water">Mitte-Fahrwasser-Bake</string>
@@ -3202,7 +3202,7 @@
     <string name="poi_gorge">Schlucht</string>
     <string name="poi_couloir">Felsschlucht</string>
     <string name="poi_mountain_area">Berggebiet</string>
-    <string name="poi_surface_clay">Sand</string>
+    <string name="poi_surface_clay">Asche</string>
     <string name="poi_surface_tartan">Tartan</string>
     <string name="poi_surface_artificial_turf">Kunstrasen</string>
     <string name="poi_surface_decoturf">Zierrasen</string>
@@ -3534,7 +3534,7 @@
     <string name="poi_substation_valve">Ventil</string>
     <string name="poi_substation_valve_group">Ventilgruppe</string>
     <string name="poi_substation_field_gathering">Feldleitung</string>
-    <string name="poi_pipeline_substation">Pipeline-Umspannwerk</string>
+    <string name="poi_pipeline_substation">Pipeline-Verteiler</string>
     <string name="poi_substation_inspection_gauge">Kontrollmanometer</string>
     <string name="poi_craft_confectionery">Süßwarenproduktion</string>
     <string name="poi_shop_wholesale">Großhandel</string>
@@ -3584,4 +3584,5 @@
     <string name="poi_climbing_crag_filter">Kletterfelsen</string>
     <string name="poi_rescue_box">Rettungskasten</string>
     <string name="poi_climbing_crag">Ja</string>
+    <string name="reddit">Reddit</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 8d56579143..890575570e 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1513,9 +1513,9 @@ Proportionaler Speicher %4$s MB (Android Limit %5$s MB, Dalvik %6$s MB).</string
     <string name="shared_string_selected_lowercase">ausgewählt</string>
     <string name="shared_string_is_open">Jetzt offen</string>
     <string name="rendering_attr_hideHouseNumbers_name">Hausnummern</string>
-    <string name="application_dir_change_warning3">OsmAnd-Daten an den neuen Ort kopieren?</string>
+    <string name="application_dir_change_warning3">OsmAnd-Dateien an den neuen Ort verschieben\?</string>
     <string name="specified_directiory_not_writeable">Karten konnten im angegebenen Verzeichnis nicht erstellt werden</string>
-    <string name="copying_osmand_file_failed">Das Kopieren der Dateien ist fehlgeschlagen!</string>
+    <string name="copying_osmand_file_failed">Das Verschieben von Dateien ist fehlgeschlagen</string>
     <string name="storage_directory_external">Externer Speicher</string>
     <string name="storage_directory_multiuser">Mehrbenutzer-Speicher</string>
     <string name="storage_directory_internal_app">Interner App-speicher</string>
@@ -3013,12 +3013,12 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="routing_attr_avoid_sett_description">Vermeiden Sie Kopfsteinpflaster und Pflastersteine</string>
     <string name="shared_string_degrees">Grad</string>
     <string name="shared_string_milliradians">Milliradiant</string>
-    <string name="angular_measeurement">Winkel-Maßeinheiten</string>
+    <string name="angular_measeurement">Winkeleinheit</string>
     <string name="angular_measeurement_descr">Ändern, in welchem Azimut gemessen wird.</string>
     <string name="routing_attr_avoid_tram_name">Straßenbahnen meiden</string>
     <string name="routing_attr_avoid_tram_description">Straßenbahnen meiden</string>
     <string name="routing_attr_avoid_bus_name">Busse meiden</string>
-    <string name="routing_attr_avoid_bus_description">Busse und Trolleybusse meiden</string>
+    <string name="routing_attr_avoid_bus_description">Busse und Oberleitungsbusse meiden</string>
     <string name="routing_attr_avoid_share_taxi_name">Sammeltaxi meiden</string>
     <string name="routing_attr_avoid_share_taxi_description">Sammeltaxi meiden</string>
     <string name="routing_attr_avoid_train_name">Züge meiden</string>
@@ -3027,14 +3027,26 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="routing_attr_avoid_subway_description">U-Bahnen und leichten Schienenverkehr meiden</string>
     <string name="routing_attr_avoid_ferry_name">Fähren meiden</string>
     <string name="routing_attr_avoid_ferry_description">Fähren meiden</string>
-    <string name="release_3_3_7">• Anzeige der Zeit zwischen den Umsteigen in öffentlichen Verkehrsmitteln
-\n
-\n• Korrigierte Benutzeroberfläche für die Routendetails korrigiert
-\n
-\n• Das dunkle Thema im Richtungsmenü und in den Routendetails wurde korrigiert.
-\n
+    <string name="release_3_3_7">• Anzeige der Zeit zwischen den Umsteigen in öffentlichen Verkehrsmitteln 
+\n 
+\n• Korrigierte Benutzeroberfläche für die Routendetails
+\n 
+\n• Das dunkle Thema im Richtungsmenü und in den Routendetails wurde korrigiert. 
+\n 
 \n• Azimut in der Maßeinheit Distanz anzeigen
 \n
 \n</string>
-    <string name="send_log">Sendeprotokoll</string>
+    <string name="send_log">Log senden</string>
+    <string name="files_copied">Kopierte %1$d Dateien (%2$s).</string>
+    <string name="files_failed">Es konnten keine %1$d Dateien (%2$s) kopiert werden.</string>
+    <string name="public_transport_try_ped">Probieren Sie die Fußgängernavigation aus.</string>
+    <string name="public_transport_try_change_settings">Versuchen Sie, die Einstellungen zu ändern.</string>
+    <string name="public_transport_calc_pedestrian">Fußgängerroute berechnen</string>
+    <string name="public_transport_type">Transportart</string>
+    <string name="files_moved">%1$d Dateien verschoben (%2$s).</string>
+    <string name="files_present">%1$d Dateien (%2$s) sind am vorherigen Ort \'%3$s\' vorhanden.</string>
+    <string name="move_maps">Karten verschieben</string>
+    <string name="dont_move_maps">Nicht bewegen</string>
+    <string name="public_transport_ped_route_title">Die Route beträgt ca. %1$s und könnte zu Fuß schneller sein als mit öffentlichen Verkehrsmitteln</string>
+    <string name="public_transport_no_route_title">Leider konnte OsmAnd keine für Ihre Einstellungen geeignete Route finden.</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index b76fdd751a..0eb91cc1ed 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -10,22 +10,20 @@
     <string name="poi_filter_restaurants">Εστιατόρια</string>
     <string name="poi_filter_sightseeing">Αξιοθέατα</string>
     <string name="poi_filter_car_aid">Εξυπηρέτηση αυτοκινήτων</string>
-	<string name="poi_filter_food_shop">Κατάστημα τροφίμων</string>
-	<string name="poi_filter_for_tourists">Τουριστικά</string>
-	<string name="poi_filter_fuel">Καύσιμα</string>
-	<string name="show_warnings_title">Εμφάνιση προειδοποιήσεων…</string>
-	<string name="show_warnings_descr">Ρύθμιση προειδοποιήσεων κυκλοφορίας (όρια ταχύτητας, αναγκαστικές στάσεις, σαμαράκια, σήραγγες) προειδοποιήσεις καμερών ταχύτητας και πληροφορίες λωρίδων.</string>
-	<string name="use_compass_navigation_descr">Χρήση της πυξίδας όταν η πορεία δεν έχει εντοπιστεί διαφορετικά.</string>
-	<string name="use_compass_navigation">Χρήση πυξίδας</string>
-	<string name="avoid_motorway">Αποφυγή αυτοκινητόδρομων</string>
-	<string name="auto_zoom_map_descr">Επίπεδο εστίασης χάρτη ανάλογα με την ταχύτητά σας (ενώ ο χάρτης συγχρονίζεται με την τρέχουσα θέση).</string>
-	<string name="auto_zoom_map">Αυτόματη εστίαση χάρτη</string>
-	
-	<string name="snap_to_road_descr">Κλείδωμα θέσης στους δρόμους κατά την πλοήγηση.</string>
-	<string name="snap_to_road">Κλείδωμα στο δρόμο</string>
-	
-	<string name="osmand_short_description_80_chars">Προβολή παγκόσμιου χάρτη κινητών &amp; πλοήγηση για χάρτες OSM χωρίς και με σύνδεση</string>
-	<string name="osmand_long_description_1000_chars">"OsmAnd (OSM Αυτοματοποιημένες Οδηγίες Πλοήγησης) 
+    <string name="poi_filter_food_shop">Κατάστημα τροφίμων</string>
+    <string name="poi_filter_for_tourists">Τουριστικά</string>
+    <string name="poi_filter_fuel">Καύσιμα</string>
+    <string name="show_warnings_title">Εμφάνιση προειδοποιήσεων…</string>
+    <string name="show_warnings_descr">Ρύθμιση προειδοποιήσεων κυκλοφορίας (όρια ταχύτητας, αναγκαστικές στάσεις, σαμαράκια, σήραγγες) προειδοποιήσεις καμερών ταχύτητας και πληροφορίες λωρίδων.</string>
+    <string name="use_compass_navigation_descr">Χρήση της πυξίδας όταν η πορεία δεν έχει εντοπιστεί διαφορετικά.</string>
+    <string name="use_compass_navigation">Χρήση πυξίδας</string>
+    <string name="avoid_motorway">Αποφυγή αυτοκινητόδρομων</string>
+    <string name="auto_zoom_map_descr">Επίπεδο εστίασης χάρτη ανάλογα με την ταχύτητά σας (ενώ ο χάρτης συγχρονίζεται με την τρέχουσα θέση).</string>
+    <string name="auto_zoom_map">Αυτόματη εστίαση χάρτη</string>
+    <string name="snap_to_road_descr">Κλείδωμα θέσης στους δρόμους κατά την πλοήγηση.</string>
+    <string name="snap_to_road">Κλείδωμα στο δρόμο</string>
+    <string name="osmand_short_description_80_chars">Προβολή παγκόσμιου χάρτη κινητών &amp; πλοήγηση για χάρτες OSM χωρίς και με σύνδεση</string>
+    <string name="osmand_long_description_1000_chars">"OsmAnd (OSM Αυτοματοποιημένες Οδηγίες Πλοήγησης) 
 \n
 \n Το OsmAnd είναι μια εφαρμογή πλοήγησης ανοικτού κώδικα με πρόσβαση σε μεγάλη ποικιλία από παγκόσμια δεδομένα του OpenStreetMap (OSM). Όλα τα δεδομένα χάρτη (διανυσματικά ή πλακίδια χάρτη) μπορούν να αποθηκευτούν στην κάρτα μνήμης του τηλεφώνου για χρήση χωρίς σύνδεση. Προσφέρεται επίσης  λειτουργία δρομολόγησης με και χωρίς διαδικτυακή σύνδεση συμπεριλαμβανομένων φωνητικών οδηγιών βήμα προς βήμα.
 \n
@@ -44,8 +42,8 @@
 \n - Περιορισμένος αριθμός λήψης χαρτών
 \n - Όχι πρόσβαση στα εκτός σύνδεσης ΣΕ της βικιπαίδειας.
 \n Το OsmAnd είναι ενεργά στο στάδιο της ανάπτυξης και το εγχείρημά μας και η περαιτέρω ανάπτυξή του επαφίεται στις οικονομικές προσφορές για την χρηματοδότηση της ανάπτυξης και τις δοκιμές νέων λειτουργιών. Παρακαλούμε σκεφτείτε την αγορά του OsmAnd+, ή χρηματοδοτήστε συγκεκριμένες νέες λειτουργίες ή κάντε μια γενική δωρεά στο https://osmand.net."</string>
-	<string name="osmand_plus_short_description_80_chars">Προβολή παγκόσμιου χάρτη &amp; πλοήγηση για χάρτες OSM χωρίς και με σύνδεση</string>
-	<string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Αυτοματοποιημένες Οδηγίες Πλοήγησης)
+    <string name="osmand_plus_short_description_80_chars">Προβολή παγκόσμιου χάρτη &amp; πλοήγηση για χάρτες OSM χωρίς και με σύνδεση</string>
+    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Αυτοματοποιημένες Οδηγίες Πλοήγησης)
 \n
 \n Το OsmAnd+ είναι μια εφαρμογή πλοήγησης ανοικτού κώδικα με πρόσβαση σε μεγάλη ποικιλία από παγκόσμια δεδομένα OpenStreetMap (OSM). Όλα τα δεδομένα χάρτη (διανυσματικά ή πλακίδια χάρτη) μπορούν να αποθηκευτούν στην κάρτα μνήμης του τηλεφώνου για χρήση χωρίς σύνδεση. Προσφέρεται επίσης λειτουργία δρομολόγησης χωρίς και με διαδίκτυο, συμπεριλαμβανομένων φωνητικών οδηγιών βήμα προς βήμα.
 \n
@@ -63,895 +61,771 @@
 \n - προαιρετική εστίαση χάρτη βάσει ταχύτητας - προαιρετικός αυτόματος προσανατολισμός χάρτη βάσει της πυξίδας ή της κατεύθυνσης κίνησης
 \n - προαιρετική καθοδήγηση με λωρίδες, εμφάνιση ορίου ταχύτητας, καταγεγραμμένες και TTS φωνές 
 \n</string>
-	
-	
-	<string name="filterpoi_activity">Δημιουργία φίλτρου ΣΕ</string>
-	<string name="recalculate_route_to_your_location">Τρόπος μετακίνησης:</string>
-	<string name="select_navigation_mode">Επιλογή τρόπου μετακίνησης</string>
-	
-	<string name="day_night_info_description">Ανατολή : %1$s \nΔύση : %2$s</string>
-	<string name="day_night_info">Πληρ. Ημέρας/Νύχτας</string>
-	
-	<string name="map_widget_vector_attributes">Χαρακτηριστικά απεικόνισης</string>
-	<string name="map_widget_renderer">Μορφή χάρτη</string>
-	
-	
-	
-	
-	<string name="layer_map_appearance">Διαμόρφωση οθόνης</string>
-	<string name="show_lanes">Λωρίδες</string>
-	<string name="avoid_unpaved">Αποφυγή χωματόδρομων</string>
-	<string name="avoid_ferries">Αποφυγή πορθμείων</string>
-	<string name="avoid_in_routing_title">Αποφυγή…</string>
-	<string name="avoid_in_routing_descr">Αποφυγή π.χ.: διοδίων, χωματόδρομων, πορθμείων.</string>
-	<string name="map_widget_fluorescent">Φωτεινές διαδρομές</string>
-	<string name="map_widget_show_ruler">Χάρακας</string>
-	
-	<string name="map_widget_view_direction">Κατεύθυνση επισκόπησης</string>
-	<string name="map_widget_transparent">Διάφανα γραφικά στοιχεία</string>
-	
-	
-	<string name="bg_service_sleep_mode_off">Εκτέλεση
+    <string name="filterpoi_activity">Δημιουργία φίλτρου ΣΕ</string>
+    <string name="recalculate_route_to_your_location">Τρόπος μετακίνησης:</string>
+    <string name="select_navigation_mode">Επιλογή τρόπου μετακίνησης</string>
+    <string name="day_night_info_description">Ανατολή : %1$s \nΔύση : %2$s</string>
+    <string name="day_night_info">Πληρ. Ημέρας/Νύχτας</string>
+    <string name="map_widget_vector_attributes">Χαρακτηριστικά απεικόνισης</string>
+    <string name="map_widget_renderer">Μορφή χάρτη</string>
+    <string name="layer_map_appearance">Διαμόρφωση οθόνης</string>
+    <string name="show_lanes">Λωρίδες</string>
+    <string name="avoid_unpaved">Αποφυγή χωματόδρομων</string>
+    <string name="avoid_ferries">Αποφυγή πορθμείων</string>
+    <string name="avoid_in_routing_title">Αποφυγή…</string>
+    <string name="avoid_in_routing_descr">Αποφυγή π.χ.: διοδίων, χωματόδρομων, πορθμείων.</string>
+    <string name="map_widget_fluorescent">Φωτεινές διαδρομές</string>
+    <string name="map_widget_show_ruler">Χάρακας</string>
+    <string name="map_widget_view_direction">Κατεύθυνση επισκόπησης</string>
+    <string name="map_widget_transparent">Διάφανα γραφικά στοιχεία</string>
+    <string name="bg_service_sleep_mode_off">Εκτέλεση
 \n εφαρμογής στο παρασκήνιο</string>
-	<string name="bg_service_sleep_mode_on">Σταμάτημα
+    <string name="bg_service_sleep_mode_on">Σταμάτημα
 \n εκτέλεσης στο παρασκήνιο</string>
-	<string name="gps_wakeup_interval">Διάστημα αφύπνισης GPS: %s</string>
-	<string name="int_continuosly">Συνεχόμενο</string>
-	<string name="screen_is_locked">Για ξεκλείδωμα της οθόνης πατήστε το εικονίδιο της κλειδαριάς</string>
-	<string name="map_widget_top_text">Όνομα οδού</string>
-	<string name="map_widget_config">Διαμόρφωση οθόνης</string>
-	
-	<string name="map_widget_back_to_loc">Πού είμαι</string>
-	<string name="map_widget_lock_screen">Κλείδωμα οθόνης</string>
-	<string name="map_widget_compass">Πυξίδα</string>
-	
-	<string name="map_widget_reset">Επαναφορά στα προκαθορισμένα</string>
-	
-	
-	<string name="map_widget_parking">Στάθμευση</string>
-	<string name="map_widget_monitoring">Καταγραφή GPX</string>
-	<string name="map_widget_speed">Ταχύτητα</string>
-	<string name="map_widget_distance">Προορισμός</string>
-	<string name="map_widget_altitude">Υψόμετρο</string>
-	<string name="map_widget_time">Υπολειπόμενος χρόνος</string>
-	<string name="map_widget_next_turn">Επόμενη στροφή</string>
-	<string name="map_widget_next_turn_small">Επόμενη στροφή (μικρή)</string>
-	<string name="map_widget_next_next_turn">Μεθεπόμενη στροφή</string>
-	<string name="map_widget_mini_route">Μίνι χάρτης διαδρομής</string>
-	<string name="bg_service_screen_lock">Κλείδωμα οθόνης</string>
-	<string name="bg_service_screen_unlock">Ξεκλείδωμα οθόνης</string>
-	<string name="bg_service_screen_lock_toast">Η οθόνη είναι κλειδωμένη</string>
-	<string name="bg_service_interval">Ορισμός διαστήματος αφύπνισης:</string>
-	<string name="show_cameras">Κάμερες ταχύτητας</string>
-	<string name="show_traffic_warnings">Προειδοποιήσεις κυκλοφορίας</string>
-	<string name="avoid_toll_roads">Αποφυγή διοδίων</string>
-	<string name="continue_follow_previous_route_auto">Συνέχιση της παρακολούθησης της προηγουμένως μη ολοκληρωμένης πλοήγησης; (%1$s δευτ.)</string>
-	<string name="route_updated_loc_found">Αναμονή θέσης για υπολογισμό διαδρομής</string>
-	<string name="osmand_parking_hours">Ώρες</string>
-	<string name="osmand_parking_minutes">Λεπτά</string>
-	<string name="osmand_parking_position_description_add_time">Το αυτοκίνητο στάθμευσε στις</string>
-	
-	<string name="select_animate_speedup">Επιλέξτε ταχύτητα της προσομοίωσης διαδρομής</string>
-    	<string name="global_app_allocated_memory_descr">Εκχωρημένη μνήμη %1$s MB (Όριο Android %2$s MB, Dalvik %3$s MB).</string>
-	<string name="global_app_allocated_memory">Εκχωρημένη μνήμη</string>
-	<string name="native_app_allocated_memory_descr">Συνολική εγγενής μνήμη δεσμευμένη από την εφαρμογή %1$s MB (Dalvik %2$s MB, άλλα %3$s MB).
+    <string name="gps_wakeup_interval">Διάστημα αφύπνισης GPS: %s</string>
+    <string name="int_continuosly">Συνεχόμενο</string>
+    <string name="screen_is_locked">Για ξεκλείδωμα της οθόνης πατήστε το εικονίδιο της κλειδαριάς</string>
+    <string name="map_widget_top_text">Όνομα οδού</string>
+    <string name="map_widget_config">Διαμόρφωση οθόνης</string>
+    <string name="map_widget_back_to_loc">Πού είμαι</string>
+    <string name="map_widget_lock_screen">Κλείδωμα οθόνης</string>
+    <string name="map_widget_compass">Πυξίδα</string>
+    <string name="map_widget_reset">Επαναφορά στα προκαθορισμένα</string>
+    <string name="map_widget_parking">Στάθμευση</string>
+    <string name="map_widget_monitoring">Καταγραφή GPX</string>
+    <string name="map_widget_speed">Ταχύτητα</string>
+    <string name="map_widget_distance">Προορισμός</string>
+    <string name="map_widget_altitude">Υψόμετρο</string>
+    <string name="map_widget_time">Υπολειπόμενος χρόνος</string>
+    <string name="map_widget_next_turn">Επόμενη στροφή</string>
+    <string name="map_widget_next_turn_small">Επόμενη στροφή (μικρή)</string>
+    <string name="map_widget_next_next_turn">Μεθεπόμενη στροφή</string>
+    <string name="map_widget_mini_route">Μίνι χάρτης διαδρομής</string>
+    <string name="bg_service_screen_lock">Κλείδωμα οθόνης</string>
+    <string name="bg_service_screen_unlock">Ξεκλείδωμα οθόνης</string>
+    <string name="bg_service_screen_lock_toast">Η οθόνη είναι κλειδωμένη</string>
+    <string name="bg_service_interval">Ορισμός διαστήματος αφύπνισης:</string>
+    <string name="show_cameras">Κάμερες ταχύτητας</string>
+    <string name="show_traffic_warnings">Προειδοποιήσεις κυκλοφορίας</string>
+    <string name="avoid_toll_roads">Αποφυγή διοδίων</string>
+    <string name="continue_follow_previous_route_auto">Συνέχιση της παρακολούθησης της προηγουμένως μη ολοκληρωμένης πλοήγησης; (%1$s δευτ.)</string>
+    <string name="route_updated_loc_found">Αναμονή θέσης για υπολογισμό διαδρομής</string>
+    <string name="osmand_parking_hours">Ώρες</string>
+    <string name="osmand_parking_minutes">Λεπτά</string>
+    <string name="osmand_parking_position_description_add_time">Το αυτοκίνητο στάθμευσε στις</string>
+    <string name="select_animate_speedup">Επιλέξτε ταχύτητα της προσομοίωσης διαδρομής</string>
+    <string name="global_app_allocated_memory_descr">Εκχωρημένη μνήμη %1$s MB (Όριο Android %2$s MB, Dalvik %3$s MB).</string>
+    <string name="global_app_allocated_memory">Εκχωρημένη μνήμη</string>
+    <string name="native_app_allocated_memory_descr">Συνολική εγγενής μνήμη δεσμευμένη από την εφαρμογή %1$s MB (Dalvik %2$s MB, άλλα %3$s MB).
 		Αναλογική μνήμη %4$s MB (Όριο Android %5$s MB, Dalvik %6$s MB).</string>
-	<string name="native_app_allocated_memory">Συνολική εγγενής μνήμη</string>
-	
-	<string name="starting_point_too_far">Η αφετηρία είναι πολύ μακριά από το κοντινότερο δρόμο.</string>
-	<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_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_time_limit">Στάθμευση περιορισμένου χρόνου</string>
-	<string name="osmand_parking_time_no_limit">Στάθμευση απεριορίστου χρόνου</string>
-	<string name="osmand_parking_position_description">Η θέση του σταθμευμένου αυτοκινήτου σας. %1$s</string>
-	<string name="osmand_parking_position_description_add">Παραλαβή αυτοκινήτου στις:</string>
-	<string name="osmand_parking_pm">ΜΜ</string>
-	<string name="osmand_parking_am">ΠΜ</string>
-	<string name="osmand_parking_position_name">Σημείο στάθμευσης</string>
-	<string name="osmand_parking_plugin_description">"Το πρόσθετο θέσης στάθμευσης σας επιτρέπει να καταγράψετε πού είναι σταθμευμένο το αυτοκίνητό σας και πόσος χρόνος στάθμευσης απομένει (εάν υπάρχει χρονικός περιορισμός). 
+    <string name="native_app_allocated_memory">Συνολική εγγενής μνήμη</string>
+    <string name="starting_point_too_far">Η αφετηρία είναι πολύ μακριά από το κοντινότερο δρόμο.</string>
+    <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_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_time_limit">Στάθμευση περιορισμένου χρόνου</string>
+    <string name="osmand_parking_time_no_limit">Στάθμευση απεριορίστου χρόνου</string>
+    <string name="osmand_parking_position_description">Η θέση του σταθμευμένου αυτοκινήτου σας. %1$s</string>
+    <string name="osmand_parking_position_description_add">Παραλαβή αυτοκινήτου στις:</string>
+    <string name="osmand_parking_pm">ΜΜ</string>
+    <string name="osmand_parking_am">ΠΜ</string>
+    <string name="osmand_parking_position_name">Σημείο στάθμευσης</string>
+    <string name="osmand_parking_plugin_description">"Το πρόσθετο θέσης στάθμευσης σας επιτρέπει να καταγράψετε πού είναι σταθμευμένο το αυτοκίνητό σας και πόσος χρόνος στάθμευσης απομένει (εάν υπάρχει χρονικός περιορισμός). 
 \nΚαι η τοποθεσία και ο χρόνος είναι ορατά στον πίνακα εργαλείων του OsmAnd καθώς και σε γραφικό στοιχείο στην οθόνη του χάρτη. Μπορεί να προστεθεί ειδοποίηση στο ημερολόγιο του  Android ως υπενθύμιση."</string>
-	<string name="osmand_parking_plugin_name">Θέση Στάθμευσης</string>
-	<string name="context_menu_item_add_parking_point">Σήμανση ως θέσης στάθμευσης</string>
-	<string name="context_menu_item_delete_parking_point">Διαγραφή δείκτη στάθμευσης</string>
-	<string name="gpxup_public">Δημόσιο</string>
-	<string name="gpxup_identifiable">Αναγνωρίσιμες</string>
-	<string name="gpxup_trackable">Ιχνηλάσιμο</string>
-	<string name="gpxup_private">Ιδιωτικό</string>
-	<string name="asap">ASAP</string>
-	
-	<string name="route_roundabout">Κυκλικός κόμβος: Ακολουθήστε την έξοδο %1$d και συνεχίστε</string>
-	<string name="route_kl">Μείνετε αριστερά και προχωρήστε</string>
-	<string name="route_kr">Μείνετε δεξιά και προχωρήστε</string>
-	<string name="rendering_attr_noPolygons_description">Απόδοση όλων των επιφανειακών χαρακτηριστικών εδάφους στο χάρτη ως διαφανή.</string>
-	<string name="rendering_attr_noPolygons_name">Πολύγωνα</string>
-	<string name="rendering_attr_appMode_name">Τρόπος απεικόνισης</string>
-	<string name="rendering_attr_appMode_description">Βελτιστοποίηση του χάρτη για</string>
-	<string name="rendering_attr_contourLines_description">Εμφάνιση από το επίπεδο εστίασης (χρειάζεται αρχείο ισοϋψών):</string>
-	<string name="rendering_attr_contourLines_name">Εμφάνιση ισοϋψών γραμμών</string>
-	<string name="rendering_attr_hmRendered_description">Αύξηση εμφανιζόμενης λεπτομέρειας χάρτη.</string>
-	<string name="rendering_attr_hmRendered_name">Εμφάνιση περισσότερων λεπτομερειών χάρτη</string>
-	<string name="local_index_routing_data">Δεδομένα δρομολόγησης</string>
-	<string name="navigate_point_format">Μορφή</string>
-	<string name="poi_search_desc">Αναζήτηση ΣΕ (σημείο ενδιαφέροντος)</string>
-	<string name="address_search_desc">Αναζήτηση διεύθυνσης</string>
-	<string name="navpoint_search_desc">Συντεταγμένες</string>
-	<string name="transport_search_desc">Αναζήτηση ΜΜΜ</string>
-	<string name="favourites_search_desc">Ένας τρόπος αναζήτησης αγαπημένων</string>
-	
-	<string name="offline_navigation_not_available">Η εκτός σύνδεσης πλοήγηση του OsmAnd δεν είναι διαθέσιμη προσωρινά.</string>
-	<string name="left_side_navigation">Οδήγηση αριστερά</string>
-	<string name="left_side_navigation_descr">Για χώρες όπου οι άνθρωποι οδηγούν στα αριστερά του δρόμου.</string>
-	
-	<string name="unknown_from_location">Η αφετηρία δεν έχει ακόμη καθοριστεί</string>
-	<string name="unknown_location">Η Θέση σας δεν είναι ακόμα γνωστή</string>
-	<string name="modify_transparency">Τροποποίηση διαφάνειας (0 - διάφανο, 255 - αδιαφανές)</string>
-	<string name="confirm_interrupt_download">Να ακυρωθεί η λήψη αρχείου;</string>
-	<string name="first_time_msg">"Ευχαριστούμε που χρησιμοποιείτε το OsmAnd. Κατεβάστε τοπικά δεδομένα για χρήση χωρίς σύνδεση μέσω του  \'Ρυθμίσεις\' → \'Διαχείριση αρχείων χάρτη\' για να προβάλετε χάρτες, να εντοπίσετε διευθύνσεις, να αναζητήσετε ΣΕ, να βρείτε δημόσιες μεταφορές και άλλα."</string>    
-	<string name="basemap_was_selected_to_download">Ο βασικός χάρτης επιλέγεται για λήψη, έτσι ώστε να λειτουργεί η εφαρμογή.</string>
-	<string name="select_index_file_to_download">Δεν βρέθηκε τίποτα. Εάν δεν μπορείτε να βρείτε την περιοχή σας, μπορείτε να τη φτιάξετε μόνος σας (βλέπε https://osmand.net).</string>
-	<string name="local_indexes_cat_tile">Χάρτες με σύνδεση και αποθηκευμένα πλακίδια</string>
-	<string name="local_indexes_cat_map">Τυπικοί χάρτες (διανυσματικοί)</string>
-	
-	<string name="index_settings_descr">Λήψη και διαχείριση εκτός σύνδεσης αρχείων χαρτών αποθηκευμένων στη συσκευή σας.</string>
-	<string name="map_online_plugin_is_not_installed">Ενεργοποιήστε το πρόσθετο \'Χάρτες με σύνδεση\' για να επιλέξετε διαφορετικές πηγές χάρτη</string>
-	<string name="map_online_data">Χάρτες με σύνδεση και πλακίδια</string>
-	<string name="map_online_data_descr">Χρήση χαρτών με σύνδεση (λήψη και αποθήκευση πλακιδίων σε κάρτα μνήμης).</string>
-	<string name="shared_string_online_maps">Χάρτες με σύνδεση</string>
-	<string name="online_map_settings_descr">Διαμορφώστε τις πηγές των χαρτών με σύνδεση ή με αποθηκευμένα πλακίδια.</string>
-	
-	
-	<string name="osmand_rastermaps_plugin_description">"Με αυτό το πρόσθετο μπορείτε να προσπελάσετε πολλούς τύπους χαρτών με σύνδεση (τους αποκαλούμενους πλακίδια ή εικονογραφίες), από προκαθορισμένα πλακίδια του OpenStreetMap (όπως το Mapnik) μέχρι δορυφορικές εικόνες και στρώσεις ειδικού σκοπού όπως μετεωρολογικούς χάρτες,  κλιματολογικούς χάρτες, γεωλογικούς χάρτες, στρώσεις σκίασης ανάγλυφου κλπ. 
+    <string name="osmand_parking_plugin_name">Θέση Στάθμευσης</string>
+    <string name="context_menu_item_add_parking_point">Σήμανση ως θέσης στάθμευσης</string>
+    <string name="context_menu_item_delete_parking_point">Διαγραφή δείκτη στάθμευσης</string>
+    <string name="gpxup_public">Δημόσιο</string>
+    <string name="gpxup_identifiable">Αναγνωρίσιμες</string>
+    <string name="gpxup_trackable">Ιχνηλάσιμο</string>
+    <string name="gpxup_private">Ιδιωτικό</string>
+    <string name="asap">ASAP</string>
+    <string name="route_roundabout">Κυκλικός κόμβος: Ακολουθήστε την έξοδο %1$d και συνεχίστε</string>
+    <string name="route_kl">Μείνετε αριστερά και προχωρήστε</string>
+    <string name="route_kr">Μείνετε δεξιά και προχωρήστε</string>
+    <string name="rendering_attr_noPolygons_description">Απόδοση όλων των επιφανειακών χαρακτηριστικών εδάφους στο χάρτη ως διαφανή.</string>
+    <string name="rendering_attr_noPolygons_name">Πολύγωνα</string>
+    <string name="rendering_attr_appMode_name">Τρόπος απεικόνισης</string>
+    <string name="rendering_attr_appMode_description">Βελτιστοποίηση του χάρτη για</string>
+    <string name="rendering_attr_contourLines_description">Εμφάνιση από το επίπεδο εστίασης (χρειάζεται αρχείο ισοϋψών):</string>
+    <string name="rendering_attr_contourLines_name">Εμφάνιση ισοϋψών γραμμών</string>
+    <string name="rendering_attr_hmRendered_description">Αύξηση εμφανιζόμενης λεπτομέρειας χάρτη.</string>
+    <string name="rendering_attr_hmRendered_name">Εμφάνιση περισσότερων λεπτομερειών χάρτη</string>
+    <string name="local_index_routing_data">Δεδομένα δρομολόγησης</string>
+    <string name="navigate_point_format">Μορφή</string>
+    <string name="poi_search_desc">Αναζήτηση ΣΕ (σημείο ενδιαφέροντος)</string>
+    <string name="address_search_desc">Αναζήτηση διεύθυνσης</string>
+    <string name="navpoint_search_desc">Συντεταγμένες</string>
+    <string name="transport_search_desc">Αναζήτηση ΜΜΜ</string>
+    <string name="favourites_search_desc">Ένας τρόπος αναζήτησης αγαπημένων</string>
+    <string name="offline_navigation_not_available">Η εκτός σύνδεσης πλοήγηση του OsmAnd δεν είναι διαθέσιμη προσωρινά.</string>
+    <string name="left_side_navigation">Οδήγηση αριστερά</string>
+    <string name="left_side_navigation_descr">Για χώρες όπου οι άνθρωποι οδηγούν στα αριστερά του δρόμου.</string>
+    <string name="unknown_from_location">Η αφετηρία δεν έχει ακόμη καθοριστεί</string>
+    <string name="unknown_location">Η Θέση σας δεν είναι ακόμα γνωστή</string>
+    <string name="modify_transparency">Τροποποίηση διαφάνειας (0 - διάφανο, 255 - αδιαφανές)</string>
+    <string name="confirm_interrupt_download">Να ακυρωθεί η λήψη αρχείου;</string>
+    <string name="first_time_msg">"Ευχαριστούμε που χρησιμοποιείτε το OsmAnd. Κατεβάστε τοπικά δεδομένα για χρήση χωρίς σύνδεση μέσω του  \'Ρυθμίσεις\' → \'Διαχείριση αρχείων χάρτη\' για να προβάλετε χάρτες, να εντοπίσετε διευθύνσεις, να αναζητήσετε ΣΕ, να βρείτε δημόσιες μεταφορές και άλλα."</string>
+    <string name="basemap_was_selected_to_download">Ο βασικός χάρτης επιλέγεται για λήψη, έτσι ώστε να λειτουργεί η εφαρμογή.</string>
+    <string name="select_index_file_to_download">Δεν βρέθηκε τίποτα. Εάν δεν μπορείτε να βρείτε την περιοχή σας, μπορείτε να τη φτιάξετε μόνος σας (βλέπε https://osmand.net).</string>
+    <string name="local_indexes_cat_tile">Χάρτες με σύνδεση και αποθηκευμένα πλακίδια</string>
+    <string name="local_indexes_cat_map">Τυπικοί χάρτες (διανυσματικοί)</string>
+    <string name="index_settings_descr">Λήψη και διαχείριση εκτός σύνδεσης αρχείων χαρτών αποθηκευμένων στη συσκευή σας.</string>
+    <string name="map_online_plugin_is_not_installed">Ενεργοποιήστε το πρόσθετο \'Χάρτες με σύνδεση\' για να επιλέξετε διαφορετικές πηγές χάρτη</string>
+    <string name="map_online_data">Χάρτες με σύνδεση και πλακίδια</string>
+    <string name="map_online_data_descr">Χρήση χαρτών με σύνδεση (λήψη και αποθήκευση πλακιδίων σε κάρτα μνήμης).</string>
+    <string name="shared_string_online_maps">Χάρτες με σύνδεση</string>
+    <string name="online_map_settings_descr">Διαμορφώστε τις πηγές των χαρτών με σύνδεση ή με αποθηκευμένα πλακίδια.</string>
+    <string name="osmand_rastermaps_plugin_description">"Με αυτό το πρόσθετο μπορείτε να προσπελάσετε πολλούς τύπους χαρτών με σύνδεση (τους αποκαλούμενους πλακίδια ή εικονογραφίες), από προκαθορισμένα πλακίδια του OpenStreetMap (όπως το Mapnik) μέχρι δορυφορικές εικόνες και στρώσεις ειδικού σκοπού όπως μετεωρολογικούς χάρτες,  κλιματολογικούς χάρτες, γεωλογικούς χάρτες, στρώσεις σκίασης ανάγλυφου κλπ. 
 \n
 \nΟποιοσδήποτε από αυτούς τους χάρτες μπορεί να χρησιμοποιηθεί είτε ως ο κύριος (βασικός) χάρτης που θα εμφανίζεται στην οθόνη χάρτη του OsmAnd, είτε ως επίστρωμα ή υπόστρωμα σε έναν άλλο βασικό χάρτη (όπως στους τυπικούς χωρίς σύνδεση χάρτες του OsmAnd). Για να γίνει οποιοσδήποτε χάρτης υποστρώματος πιο ορατός, μπορούν να κρυφτούν εύκολα συγκεκριμένα στοιχεία των διανυσματικών χαρτών του OsmAnd μέσω του μενού \'Διαμόρφωση χάρτη\' κατ\' επιθυμία. 
 \n
 \nΟι χάρτες πλακιδίων μπορούν να ληφθούν μέσω διαδικτυακών πηγών, ή μπορούν να προετοιμαστούν για χρήση χωρίς σύνδεση (και να αντιγραφούν χειροκίνητα στον φάκελο δεδομένων του OsmAnd) ως βάση δεδομένων του SQLite που μπορεί να παραχθεί από διάφορα εργαλεία προετοιμασίας χαρτών τρίτων."</string>
-	<string name="osmand_background_plugin_description">Εμφάνιση των ρυθμίσεων για ενεργοποίηση ιχνηλάτησης και πλοήγησης παρασκηνίου μέσω περιοδικής αφύπνισης της συσκευής GPS (με την οθόνη σβηστή).</string>
-	<string name="osmand_accessibility_description">Αυτό το πρόσθετο κάνει τα χαρακτηριστικά προσβασιμότητας της συσκευής διαθέσιμα απευθείας στο OsmAnd. Διευκολύνει π.χ. τη ρύθμιση του ρυθμού ομιλίας για φωνές TTS, διαμορφώνοντας πλοήγηση οθόνης κατευθυντήριου χειριστηρίου, χρήση ιχνόσφαιρας για έλεγχο εστίασης, ή ανατροφοδότηση κειμένου σε ομιλία, π.χ. για αυτόματη ανακοίνωση της θέσης σας.</string>
-	
-	
-	
-	<string name="osmand_development_plugin_description">Αυτό το πρόσθετο εμφανίζει τις ρυθμίσεις για τα χαρακτηριστικά ανάπτυξης και αποσφαλμάτωσης όπως η δοκιμή ή η προσομοίωση πλοήγησης, η απόδοση απεικόνισης οθόνης, ή η φωνητική καθοδήγηση. Αυτές οι ρυθμίσεις προορίζονται για τους προγραμματιστές και δεν χρειάζονται στον απλό χρήστη.</string>
-	<string name="plugins_screen">Πρόσθετα</string>
-	
-	<string name="prefs_plugins_descr">Τα πρόσθετα ενεργοποιούν προχωρημένες ρυθμίσεις και επιπλέον λειτουργικότητα.</string>
-	<string name="prefs_plugins">Πρόσθετα</string>
-	
-	<string name="osm_editing_plugin_description">Μέσω αυτού του προσθέτου το OsmAnd μπορεί να χρησιμοποιηθεί για να κάνετε συνεισφορές OSM όπως δημιουργία ή τροποποίηση αντικειμένων ΣΕ OSM, άνοιγμα ή σχολιασμό σημειώσεων OSM και συνεισφορά καταγεγραμμένων αρχείων GPX. Το OSM είναι μια κοινότητα που κατευθύνει ένα παγκόσμιο έργο χαρτογράφησης δημόσιου τομέα. Για λεπτομέρειες παρακαλούμε δείτε το https://openstreetmap.org. Η ενεργός συμμετοχή εκτιμάται και οι συνεισφορές μπορούν να γίνουν απευθείας από το OsmAnd, εάν ορίσετε τα προσωπικά σας διαπιστευτήρια OSM στην εφαρμογή.</string>
-	<string name="vector_maps_may_display_faster_on_some_devices">Οι διανυσματικοί χάρτες πιθανόν εμφανίζονται γρηγορότερα. Ίσως δεν λειτουργούν καλά σε κάποιες συσκευές.</string>
-	<string name="play_commands_of_currently_selected_voice">Επιλέξτε μια φωνή και δοκιμάστε παίζοντας προτροπές</string>
-	<string name="debugging_and_development">Ανάπτυξη του OsmAnd</string>
-	<string name="native_rendering">Εγγενής απεικόνιση</string>
-	<string name="test_voice_prompts">Δοκιμή φωνητικών εντολών</string>    
-	<string name="switch_to_raster_map_to_see">Δεν υπάρχουν διανυσματικοί χάρτες χωρίς σύνδεση για αυτήν την τοποθεσία. Κατεβάστε μία από τις \'Ρυθμίσεις\' (\'Διαχείριση αρχείων χαρτών\'), ή να αλλάξτε στο πρόσθετο \'χάρτες με σύνδεση\'.</string>
-	
-	<string name="send_files_to_osm">Αποστολή αρχείων GPX στο OSM;</string>
-	<string name="gpx_visibility_txt">Ορατότητα</string>
-	<string name="gpx_tags_txt">Ετικέτες</string>
-	<string name="shared_string_description">Περιγραφή</string>
-	<string name="validate_gpx_upload_name_pwd">Παρακαλούμε, καθορίστε το όνομα χρήστη OSM και τον κωδικό πρόσβασης για να ανεβάσετε τα αρχεία GPX.</string>
-    	<string name="default_buttons_support">Υποστήριξη</string>
-	<string name="support_new_features">Υποστηρίξτε νέα χαρακτηριστικά</string>
-	<string name="show_ruler_level">Εμφάνιση χάρακα</string>	
-	<string name="info_button">Πληροφορίες</string>
-	<string name="back_to_location">Επιστροφή στη θέση</string>
-	
-	<string name="accessibility_mode">Λειτουργία προσβασιμότητας</string>
-	<string name="accessibility_mode_descr">Ενεργοποιεί τις δυνατότητες για ΑΜΕΑ.</string>
-	<string name="shared_string_on">Ενεργό</string>
-	<string name="shared_string_off">Ανενεργό</string>
-	<string name="accessibility_default">Σύμφωνα με την ρύθμιση του συστήματος του Android</string>
-	<string name="backToMenu">Πίσω στο μενού</string>
-	<string name="zoomOut">Σμίκρυνση</string>
-	<string name="zoomIn">Μεγέθυνση</string>
-	<string name="zoomIs">Η κλίμακα εστίασης είναι</string>
-	<string name="north">βόρεια</string>
-	<string name="north_north_east">βόρεια-βορειοανατολικά</string>
-	<string name="north_east">βορειοανατολικά</string>
-	<string name="east_north_east">ανατολικά-βορειοανατολικά</string>
-	<string name="east">ανατολικά</string>
-	<string name="east_south_east">ανατολικά-νοτιοανατολικά</string>
-	<string name="south_east">νοτιοανατολικά</string>
-	<string name="south_south_east">νότια-νοτιοανατολικά</string>
-	<string name="south">νότια</string>
-	<string name="south_south_west">νότια-νοτιοδυτικά</string>
-	<string name="south_west">νοτιοδυτικά</string>
-	<string name="west_south_west">δυτικά-νοτιοδυτικά</string>
-	<string name="west">δυτικά</string>
-	<string name="west_north_west">δυτικά-βορειοδυτικά</string>
-	<string name="north_west">βορειοδυτικά</string>
-	<string name="north_north_west">βόρεια-βορειοδυτικά</string>
-	<string name="front">εμπρός</string>
-	<string name="front_right">εμπρός-δεξιά</string>
-	<string name="right">προς τα δεξιά</string>
-	<string name="back_right">πίσω-δεξιά</string>
-	<string name="back">πίσω</string>
-	<string name="back_left">πίσω-αριστερά</string>
-	<string name="left">προς τα αριστερά</string>
-	<string name="front_left">μπροστά-αριστερά</string>
-	<string name="oclock">ώρα</string>
-	<string name="towards">προς</string>
-	<string name="accuracy">Ακρίβεια</string>
-	<string name="altitude">Υψόμετρο</string>
-	<string name="no_info">Καμία πληροφορία</string>
-	<string name="direction_style_sidewise">Πλαγίως (8 τομείς)</string>
-	<string name="direction_style_clockwise">Δεξιόστροφα (12 τομείς)</string>
-	<string name="settings_direction_style">Τρόπος Κατεύθυνσης</string>
-	<string name="settings_direction_style_descr">Επιλέξτε μορφή έκφρασης των σχετικών κατευθύνσεων κατά την κίνηση.</string>
-	<string name="auto_announce_on">Έναρξη αυτόματης εκφώνησης</string>
-	<string name="auto_announce_off">Διακοπή αυτόματης εκφώνησης</string>
-	<string name="i_am_here">Είμαι εδώ</string>
-	<string name="zoom_by_trackball_descr">Αλλαγή εστίασης του χάρτη με οριζόντιες κινήσεις της ιχνόσφαιρας.</string>
-	<string name="zoom_by_trackball">Χρήση του trackball για έλεγχο τις κλίμακας</string>
-	<string name="accessibility_preferences_descr">Προτιμήσεις σχετικές με προσβασιμότητα.</string>
-	<string name="shared_string_accessibility">Προσβασιμότητα</string>
-	<string name="rendering_out_of_memory">Δεν υπάρχει αρκετή μνήμη για να εμφανιστεί η επιλεγμένη περιοχή</string>
-	<string name="use_fluorescent_overlays">Φωτεινές επικαλύψεις</string>
-	<string name="use_fluorescent_overlays_descr">Χρήση φωτεινών χρωμάτων για εμφάνιση ιχνών και διαδρομών.</string>
-	<string name="offline_edition">Επεξεργασία χωρίς σύνδεση</string>
-	<string name="offline_edition_descr">Χρήση πάντα επεξεργασίας χωρίς σύνδεση.</string>
-	
-	<string name="update_poi_does_not_change_indexes">Οι αλλαγές στα ΣΕ μέσω της εφαρμογής δεν επηρεάζουν τα ληφθέντα αρχεία χάρτη, οι αλλαγές αποθηκεύονται ως αρχείο στη συσκευή σας.</string>
-	<string name="local_openstreetmap_uploading">Αποστολή …</string>
-	<string name="local_openstreetmap_were_uploaded">{0} ΣΕ/Σημειώσεις απεστάλησαν</string>
-	<string name="local_openstreetmap_uploadall">Αποστολή όλων</string>
-	
-	<string name="local_openstreetmap_upload">Αποστολή τροποποίησης στο OSM</string>
-	<string name="local_openstreetmap_delete">Διαγραφή τροποποίησης</string>
-	<string name="local_openstreetmap_descr_title">Ασύγχρονη επεξεργασία OSM:</string>
-	<string name="local_openstreetmap_settings">ΣΕ OSM/Οι σημειώσεις αποθηκεύτηκαν στη συσκευή</string>
-	<string name="local_openstreetmap_settings_descr">Εμφάνιση και διαχείριση των ΣΕ/Σημειώσεων OSM σημειωμένων στη βάση δεδομένων στη συσκευή.</string>
-	
-	
-	<string name="live_monitoring_interval_descr">Καθορίστε το διάστημα της ιχνηλάτησης με σύνδεση.</string>
-	<string name="live_monitoring_interval">Διάστημα ιχνηλάτησης με σύνδεση</string>
-	<string name="live_monitoring_url_descr">Καθορίστε τη διεύθυνση ιστού με την σύνταξη παραμέτρων : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5},bearing={6}.</string>
-	<string name="live_monitoring_url">Διαδικτυακή διεύθυνση ιχνηλάτησης με σύνδεση</string>
-	<string name="gpx_monitoring_disabled_warn">Καταγραφή ίχνους χρησιμοποιώντας το γραφικό στοιχείο GPX\', ή μέσω των ρυθμίσεων \'Εγγραφή ταξιδιού\'.</string>
-	<string name="show_current_gpx_title">Εμφάνιση τρέχοντος ίχνους</string>
-	    
-	<string name="free_version_message">Μπορείτε να κατεβάσετε ή να ενημερώσετε %1$s χάρτες.</string>
-	<string name="free_version_title">Ελεύθερη έκδοση</string>
-	<string name="poi_context_menu_showdescription">Εμφάνιση περιγραφής ΣΕ.</string>
-	<string name="index_name_north_america">Βόρεια Αμερική</string>
-	<string name="index_name_us">Βόρεια Αμερική - Ηνωμένες Πολιτείες</string>
-	<string name="index_name_central_america">Κεντρική Αμερική</string>
-	<string name="index_name_south_america">Νότια Αμερική</string>
-	<string name="index_name_europe">Ευρώπη</string>
-	<string name="index_name_france">Ευρώπη - Γαλλία</string>
-	<string name="index_name_germany">Ευρώπη - Γερμανία</string>
-	<string name="index_name_russia">Ρωσία</string>
-	<string name="index_name_africa">Αφρική</string>
-	<string name="index_name_asia">Ασία</string>
-	<string name="index_name_oceania">Αυστραλία και Ωκεανία</string>
-	<string name="index_name_other">Παγκόσμιοι και τοπικοί χάρτες</string>
-	<string name="index_name_wiki">ΣΕ Παγκόσμιας Wikipedia</string>
-	<string name="index_name_voice">Φωνητικές οδηγίες (ηχογραφημένες, περιορισμένες δυνατότητες)</string>
-	<string name="index_name_tts_voice">Φωνητικές οδηγίες (σύνθεση-TTS, προτιμώμενο)</string>
-	<string name="amenity_type_osmwiki">Wikipedia (εκτός σύνδεσης)</string>
-	<string name="amenity_type_user_defined">Ορισμένο από το χρήστη</string>
-	<string name="fav_export_confirmation">Υπάρχει ήδη αρχείο από προηγούμενη εξαγωγή αγαπημένων. Να αντικατασταθεί?</string>
-	<string name="profile_settings">Ειδικές Ρυθμίσεις Προφίλ</string>
-	<string name="settings_preset">Προκαθορισμένο προφίλ</string>
-	<string name="settings_preset_descr">Η εμφάνιση χάρτη και οι ρυθμίσεις δρομολόγησης αποθηκεύονται ανά προφίλ χρήστη. Καθορίστε το προεπιλεγμένο προφίλ σας εδώ.</string>
-	<string name="routing_settings">Πλοήγηση</string>
-	<string name="routing_settings_descr">Καθορίστε τις επιλογές πλοήγησης.</string>
-	<string name="global_settings">Καθολικές Ρυθμίσεις</string>
-	<string name="index_settings">Διαχείριση αρχείων χαρτών</string>
-	<string name="general_settings">Γενικές</string>
-	<string name="general_settings_descr">Διαμόρφωση οθόνης και κοινές ρυθμίσεις για την εφαρμογή.</string>
-	<string name="global_app_settings">Καθολικές ρυθμίσεις εφαρμογής</string>
-	<string name="user_name">Το όνομα χρήστη σας στο OSM</string>
-	<string name="open_street_map_login_descr">Απαιτείται για υποβολές στο openstreetmap.org.</string>
-	<string name="user_password">Κωδικός OSM</string>
-	
-	<string name="osmand_service">Κατάσταση παρασκηνίου</string>
-	<string name="osmand_service_descr">Το OsmAnd εκτελείται στο παρασκήνιο με την οθόνη σβηστή.</string>
-	
-	
-	
-	
-		
-	
-	
-	<string name="download_files_not_enough_space">Δεν υπάρχει αρκετός ελεύθερος χώρος για να κάνετε λήψη %1$s MB (ελεύθερα: %2$s).</string>
-	<string name="download_files_question_space">Λήψη {0} αρχείου(ων); Ο χρησιμοποιούμενος αποθηκευτικός χώρος είναι {1} MB. (Ο διαθέσιμος χώρος είναι {2} MB.)</string>
-	
-	 
-	
-	<string name="use_transparent_map_theme">Διάφανο θέμα</string>
-	<string name="native_library_not_supported">Η εγγενής βιβλιοθήκη δεν υποστηρίζεται σε αυτήν τη συσκευή.</string>
-	<string name="init_native_library">Αρχικοποίηση εγγενούς βιβλιοθήκης…</string>
-	<string name="choose_auto_follow_route">Αυτο-κεντράρισμα όψης χάρτη</string>
-	<string name="choose_auto_follow_route_descr">Χρόνος μέχρι η προβολή του χάρτη να συγχρονιστεί με την τρέχουσα θέση.</string>
-	
-	<string name="auto_follow_route_navigation">Αυτο-κεντράρισμα μόνο κατά την πλοήγηση</string>
-	<string name="auto_follow_route_navigation_descr">Αυτο-κεντραρισμένη οπτική χάρτη μόνο κατά την πλοήγηση.</string>
-	<string name="auto_follow_location_enabled">Αυτο-κεντράρισμα χάρτη σε χρήση.</string>
-	<string name="pref_vector_rendering">Ειδικές επιλογές απεικονιστή διανυσμάτων</string>
-	<string name="pref_overlay">Επικάλυψη / υπόστρωμα</string>
-	<string name="pref_raster_map">Ρυθμίσεις προέλευσης χάρτη</string>
-	<string name="pref_vector_map">Ρυθμίσεις διανυσματικού χάρτη</string>
-	<string name="delete_confirmation_msg">Διαγραφή του %1$s?</string>
-	<string name="city_type_suburb">Προάστιο</string>
-	<string name="city_type_hamlet">Οικισμός</string>
-	<string name="city_type_village">Χωριό</string>
-	<string name="city_type_town">Κωμόπολη</string>
-	<string name="city_type_city">Πόλη</string>
-	
-	<string name="animate_route_off">Διακοπή προσομοίωσης</string>
-	<string name="animate_route">Έναρξη προσομοίωσης</string>
-	
-	<string name="file_can_not_be_renamed">Το αρχείο δεν μπορεί να μετονομαστεί.</string>
-	<string name="file_with_name_already_exists">Υπάρχει ήδη αρχείο με αυτό το όνομα.</string>
-	<string name="shared_string_gpx_route">διαδρομή GPX</string>
-	<string name="poi_query_by_name_matches_categories">Βρέθηκαν αρκετές κατηγορίες ΣΕ που ταιριάζουν με το ερώτημα:</string>
-	<string name="data_to_search_poi_not_available">Δεν υπάρχουν τοπικά δεδομένα για αναζήτηση ΣΕ.</string>
-	<string name="poi_filter_by_name">Αναζήτηση βάσει ονόματος</string>
-	<string name="old_poi_file_should_be_deleted">Το αρχείο δεδομένων ΣΕ \'%1$s\' είναι περιττό και μπορεί να διαγραφεί.</string>
-	<string name="update_poi_file_not_found">Δεν βρέθηκε τοπικό αρχείο για τη διατήρηση των αλλαγών στα ΣΕ και δεν μπορεί να δημιουργηθεί.</string>
-	<string name="button_upgrade_osmandplus">Αναβάθμιση OsmAnd+</string>
-	<string name="map_version_changed_info">Κατεβάσετε τη νέα έκδοση της εφαρμογής για να μπορείτε να χρησιμοποιήσετε τα νέα αρχεία χαρτών.</string>
-	<string name="poi_filter_nominatim">Nominatim με σύνδεση</string>
-	<string name="search_position_current_location_search">Αναζήτηση θέσης…</string>
-	<string name="search_position_current_location_found">Η θέση μου (βρέθηκε)</string>
-	<string name="search_position_address">Διεύθυνση…</string>
-	<string name="search_position_favorites">Αγαπημένα…</string>
-	<string name="search_position_undefined">Ακαθόριστο</string>
-	
-	
-	<string name="search_position_map_view">Τρέχον κέντρο χάρτη</string>
-	<string name="select_search_position">Πηγή:</string>
-	<string name="context_menu_item_search">Κοντινή αναζήτηση</string>
-	
-	<string name="shared_string_save_as_gpx">Αποθήκευση ως νέο αρχείο GPX</string>
-	<string name="route_successfully_saved_at">Η διαδρομή αποθηκεύτηκε ως \'%1$s\'.</string>
-	<string name="filename_input">Όνομα αρχείου: </string>
-	<string name="file_with_name_already_exist">Υπάρχει ήδη αρχείο με το ίδιο όνομα.</string>
-	<string name="local_index_upload_gpx_description">Ανεβάστε τα αρχεία GPX στη κοινότητα του OSM, βελτιώνοντας τους χάρτες.</string>
-	<string name="local_index_items_uploaded">%1$d από %2$d αντικείμενο(α) απεστάλησαν.</string>
-	<string name="local_index_mi_upload_gpx">Αποστολή στο OSM</string>
-	<string name="show_more_map_detail">Εμφάνιση περισσότερων λεπτομερειών χάρτη</string>
-	<string name="show_more_map_detail_descr">Εμφάνιση μερικών λεπτομερειών διανυσματικού χάρτη (δρόμοι κλπ) σε χαμηλότερα επίπεδα εστίασης ήδη.</string>
-	<string name="favourites_delete_multiple_succesful">Τα αγαπημένα σημεία διαγράφηκαν.</string>
-	<string name="favorite_delete_multiple">Πρόκειται να διαγράψετε %1$d αγαπημένα και %2$d ομάδες αγαπημένων. Είστε σίγουρος;</string>
-	<string name="favorite_home_category">Σπίτι</string>
-	<string name="favorite_friends_category">Φίλοι</string>
-	<string name="favorite_places_category">Μέρη</string>
-	
-	<string name="shared_string_name">Όνομα</string>
-	<string name="favourites_edit_dialog_category">Κατηγορία</string>
-	<string name="shared_string_no_thanks">Όχι, ευχαριστώ</string>
-	<string name="basemap_missing">Κατεβάστε τον βασικό παγκόσμιο χάρτη για να έχετε μια επισκόπηση που καλύπτει όλον τον κόσμο σε χαμηλά επίπεδα εστίασης.</string>
-	<string name="vector_data_missing">Κατεβάστε (\'χωρίς σύνδεση\') δεδομένα για να χρησιμοποιήσετε χάρτες χωρίς σύνδεση.</string>
-	<string name="local_index_gpx_info_show">"
+    <string name="osmand_background_plugin_description">Εμφάνιση των ρυθμίσεων για ενεργοποίηση ιχνηλάτησης και πλοήγησης παρασκηνίου μέσω περιοδικής αφύπνισης της συσκευής GPS (με την οθόνη σβηστή).</string>
+    <string name="osmand_accessibility_description">Αυτό το πρόσθετο κάνει τα χαρακτηριστικά προσβασιμότητας της συσκευής διαθέσιμα απευθείας στο OsmAnd. Διευκολύνει π.χ. τη ρύθμιση του ρυθμού ομιλίας για φωνές TTS, διαμορφώνοντας πλοήγηση οθόνης κατευθυντήριου χειριστηρίου, χρήση ιχνόσφαιρας για έλεγχο εστίασης, ή ανατροφοδότηση κειμένου σε ομιλία, π.χ. για αυτόματη ανακοίνωση της θέσης σας.</string>
+    <string name="osmand_development_plugin_description">Αυτό το πρόσθετο εμφανίζει τις ρυθμίσεις για τα χαρακτηριστικά ανάπτυξης και αποσφαλμάτωσης όπως η δοκιμή ή η προσομοίωση πλοήγησης, η απόδοση απεικόνισης οθόνης, ή η φωνητική καθοδήγηση. Αυτές οι ρυθμίσεις προορίζονται για τους προγραμματιστές και δεν χρειάζονται στον απλό χρήστη.</string>
+    <string name="plugins_screen">Πρόσθετα</string>
+    <string name="prefs_plugins_descr">Τα πρόσθετα ενεργοποιούν προχωρημένες ρυθμίσεις και επιπλέον λειτουργικότητα.</string>
+    <string name="prefs_plugins">Πρόσθετα</string>
+    <string name="osm_editing_plugin_description">Μέσω αυτού του προσθέτου το OsmAnd μπορεί να χρησιμοποιηθεί για να κάνετε συνεισφορές OSM όπως δημιουργία ή τροποποίηση αντικειμένων ΣΕ OSM, άνοιγμα ή σχολιασμό σημειώσεων OSM και συνεισφορά καταγεγραμμένων αρχείων GPX. Το OSM είναι μια κοινότητα που κατευθύνει ένα παγκόσμιο έργο χαρτογράφησης δημόσιου τομέα. Για λεπτομέρειες παρακαλούμε δείτε το https://openstreetmap.org. Η ενεργός συμμετοχή εκτιμάται και οι συνεισφορές μπορούν να γίνουν απευθείας από το OsmAnd, εάν ορίσετε τα προσωπικά σας διαπιστευτήρια OSM στην εφαρμογή.</string>
+    <string name="vector_maps_may_display_faster_on_some_devices">Οι διανυσματικοί χάρτες πιθανόν εμφανίζονται γρηγορότερα. Ίσως δεν λειτουργούν καλά σε κάποιες συσκευές.</string>
+    <string name="play_commands_of_currently_selected_voice">Επιλέξτε μια φωνή και δοκιμάστε παίζοντας προτροπές</string>
+    <string name="debugging_and_development">Ανάπτυξη του OsmAnd</string>
+    <string name="native_rendering">Εγγενής απεικόνιση</string>
+    <string name="test_voice_prompts">Δοκιμή φωνητικών εντολών</string>
+    <string name="switch_to_raster_map_to_see">Δεν υπάρχουν διανυσματικοί χάρτες χωρίς σύνδεση για αυτήν την τοποθεσία. Κατεβάστε μία από τις \'Ρυθμίσεις\' (\'Διαχείριση αρχείων χαρτών\'), ή να αλλάξτε στο πρόσθετο \'χάρτες με σύνδεση\'.</string>
+    <string name="send_files_to_osm">Αποστολή αρχείων GPX στο OSM;</string>
+    <string name="gpx_visibility_txt">Ορατότητα</string>
+    <string name="gpx_tags_txt">Ετικέτες</string>
+    <string name="shared_string_description">Περιγραφή</string>
+    <string name="validate_gpx_upload_name_pwd">Παρακαλούμε, καθορίστε το όνομα χρήστη OSM και τον κωδικό πρόσβασης για να ανεβάσετε τα αρχεία GPX.</string>
+    <string name="default_buttons_support">Υποστήριξη</string>
+    <string name="support_new_features">Υποστηρίξτε νέα χαρακτηριστικά</string>
+    <string name="show_ruler_level">Εμφάνιση χάρακα</string>
+    <string name="info_button">Πληροφορίες</string>
+    <string name="back_to_location">Επιστροφή στη θέση</string>
+    <string name="accessibility_mode">Λειτουργία προσβασιμότητας</string>
+    <string name="accessibility_mode_descr">Ενεργοποιεί τις δυνατότητες για ΑΜΕΑ.</string>
+    <string name="shared_string_on">Ενεργό</string>
+    <string name="shared_string_off">Ανενεργό</string>
+    <string name="accessibility_default">Σύμφωνα με την ρύθμιση του συστήματος του Android</string>
+    <string name="backToMenu">Πίσω στο μενού</string>
+    <string name="zoomOut">Σμίκρυνση</string>
+    <string name="zoomIn">Μεγέθυνση</string>
+    <string name="zoomIs">Η κλίμακα εστίασης είναι</string>
+    <string name="north">βόρεια</string>
+    <string name="north_north_east">βόρεια-βορειοανατολικά</string>
+    <string name="north_east">βορειοανατολικά</string>
+    <string name="east_north_east">ανατολικά-βορειοανατολικά</string>
+    <string name="east">ανατολικά</string>
+    <string name="east_south_east">ανατολικά-νοτιοανατολικά</string>
+    <string name="south_east">νοτιοανατολικά</string>
+    <string name="south_south_east">νότια-νοτιοανατολικά</string>
+    <string name="south">νότια</string>
+    <string name="south_south_west">νότια-νοτιοδυτικά</string>
+    <string name="south_west">νοτιοδυτικά</string>
+    <string name="west_south_west">δυτικά-νοτιοδυτικά</string>
+    <string name="west">δυτικά</string>
+    <string name="west_north_west">δυτικά-βορειοδυτικά</string>
+    <string name="north_west">βορειοδυτικά</string>
+    <string name="north_north_west">βόρεια-βορειοδυτικά</string>
+    <string name="front">εμπρός</string>
+    <string name="front_right">εμπρός-δεξιά</string>
+    <string name="right">προς τα δεξιά</string>
+    <string name="back_right">πίσω-δεξιά</string>
+    <string name="back">πίσω</string>
+    <string name="back_left">πίσω-αριστερά</string>
+    <string name="left">προς τα αριστερά</string>
+    <string name="front_left">μπροστά-αριστερά</string>
+    <string name="oclock">ώρα</string>
+    <string name="towards">προς</string>
+    <string name="accuracy">Ακρίβεια</string>
+    <string name="altitude">Υψόμετρο</string>
+    <string name="no_info">Καμία πληροφορία</string>
+    <string name="direction_style_sidewise">Πλαγίως (8 τομείς)</string>
+    <string name="direction_style_clockwise">Δεξιόστροφα (12 τομείς)</string>
+    <string name="settings_direction_style">Τρόπος Κατεύθυνσης</string>
+    <string name="settings_direction_style_descr">Επιλέξτε μορφή έκφρασης των σχετικών κατευθύνσεων κατά την κίνηση.</string>
+    <string name="auto_announce_on">Έναρξη αυτόματης εκφώνησης</string>
+    <string name="auto_announce_off">Διακοπή αυτόματης εκφώνησης</string>
+    <string name="i_am_here">Είμαι εδώ</string>
+    <string name="zoom_by_trackball_descr">Αλλαγή εστίασης του χάρτη με οριζόντιες κινήσεις της ιχνόσφαιρας.</string>
+    <string name="zoom_by_trackball">Χρήση του trackball για έλεγχο τις κλίμακας</string>
+    <string name="accessibility_preferences_descr">Προτιμήσεις σχετικές με προσβασιμότητα.</string>
+    <string name="shared_string_accessibility">Προσβασιμότητα</string>
+    <string name="rendering_out_of_memory">Δεν υπάρχει αρκετή μνήμη για να εμφανιστεί η επιλεγμένη περιοχή</string>
+    <string name="use_fluorescent_overlays">Φωτεινές επικαλύψεις</string>
+    <string name="use_fluorescent_overlays_descr">Χρήση φωτεινών χρωμάτων για εμφάνιση ιχνών και διαδρομών.</string>
+    <string name="offline_edition">Επεξεργασία χωρίς σύνδεση</string>
+    <string name="offline_edition_descr">Χρήση πάντα επεξεργασίας χωρίς σύνδεση.</string>
+    <string name="update_poi_does_not_change_indexes">Οι αλλαγές στα ΣΕ μέσω της εφαρμογής δεν επηρεάζουν τα ληφθέντα αρχεία χάρτη, οι αλλαγές αποθηκεύονται ως αρχείο στη συσκευή σας.</string>
+    <string name="local_openstreetmap_uploading">Αποστολή …</string>
+    <string name="local_openstreetmap_were_uploaded">{0} ΣΕ/Σημειώσεις απεστάλησαν</string>
+    <string name="local_openstreetmap_uploadall">Αποστολή όλων</string>
+    <string name="local_openstreetmap_upload">Αποστολή τροποποίησης στο OSM</string>
+    <string name="local_openstreetmap_delete">Διαγραφή τροποποίησης</string>
+    <string name="local_openstreetmap_descr_title">Ασύγχρονη επεξεργασία OSM:</string>
+    <string name="local_openstreetmap_settings">ΣΕ OSM/Οι σημειώσεις αποθηκεύτηκαν στη συσκευή</string>
+    <string name="local_openstreetmap_settings_descr">Εμφάνιση και διαχείριση των ΣΕ/Σημειώσεων OSM σημειωμένων στη βάση δεδομένων στη συσκευή.</string>
+    <string name="live_monitoring_interval_descr">Καθορίστε το διάστημα της ιχνηλάτησης με σύνδεση.</string>
+    <string name="live_monitoring_interval">Διάστημα ιχνηλάτησης με σύνδεση</string>
+    <string name="live_monitoring_url_descr">Καθορίστε τη διεύθυνση ιστού με την σύνταξη παραμέτρων : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5},bearing={6}.</string>
+    <string name="live_monitoring_url">Διαδικτυακή διεύθυνση ιχνηλάτησης με σύνδεση</string>
+    <string name="gpx_monitoring_disabled_warn">Καταγραφή ίχνους χρησιμοποιώντας το γραφικό στοιχείο GPX\', ή μέσω των ρυθμίσεων \'Εγγραφή ταξιδιού\'.</string>
+    <string name="show_current_gpx_title">Εμφάνιση τρέχοντος ίχνους</string>
+    <string name="free_version_message">Μπορείτε να κατεβάσετε ή να ενημερώσετε %1$s χάρτες.</string>
+    <string name="free_version_title">Ελεύθερη έκδοση</string>
+    <string name="poi_context_menu_showdescription">Εμφάνιση περιγραφής ΣΕ.</string>
+    <string name="index_name_north_america">Βόρεια Αμερική</string>
+    <string name="index_name_us">Βόρεια Αμερική - Ηνωμένες Πολιτείες</string>
+    <string name="index_name_central_america">Κεντρική Αμερική</string>
+    <string name="index_name_south_america">Νότια Αμερική</string>
+    <string name="index_name_europe">Ευρώπη</string>
+    <string name="index_name_france">Ευρώπη - Γαλλία</string>
+    <string name="index_name_germany">Ευρώπη - Γερμανία</string>
+    <string name="index_name_russia">Ρωσία</string>
+    <string name="index_name_africa">Αφρική</string>
+    <string name="index_name_asia">Ασία</string>
+    <string name="index_name_oceania">Αυστραλία και Ωκεανία</string>
+    <string name="index_name_other">Παγκόσμιοι και τοπικοί χάρτες</string>
+    <string name="index_name_wiki">ΣΕ Παγκόσμιας Wikipedia</string>
+    <string name="index_name_voice">Φωνητικές οδηγίες (ηχογραφημένες, περιορισμένες δυνατότητες)</string>
+    <string name="index_name_tts_voice">Φωνητικές οδηγίες (σύνθεση-TTS, προτιμώμενο)</string>
+    <string name="amenity_type_osmwiki">Wikipedia (εκτός σύνδεσης)</string>
+    <string name="amenity_type_user_defined">Ορισμένο από το χρήστη</string>
+    <string name="fav_export_confirmation">Υπάρχει ήδη αρχείο από προηγούμενη εξαγωγή αγαπημένων. Να αντικατασταθεί?</string>
+    <string name="profile_settings">Ειδικές Ρυθμίσεις Προφίλ</string>
+    <string name="settings_preset">Προκαθορισμένο προφίλ</string>
+    <string name="settings_preset_descr">Η εμφάνιση χάρτη και οι ρυθμίσεις δρομολόγησης αποθηκεύονται ανά προφίλ χρήστη. Καθορίστε το προεπιλεγμένο προφίλ σας εδώ.</string>
+    <string name="routing_settings">Πλοήγηση</string>
+    <string name="routing_settings_descr">Καθορίστε τις επιλογές πλοήγησης.</string>
+    <string name="global_settings">Καθολικές Ρυθμίσεις</string>
+    <string name="index_settings">Διαχείριση αρχείων χαρτών</string>
+    <string name="general_settings">Γενικές</string>
+    <string name="general_settings_descr">Διαμόρφωση οθόνης και κοινές ρυθμίσεις για την εφαρμογή.</string>
+    <string name="global_app_settings">Καθολικές ρυθμίσεις εφαρμογής</string>
+    <string name="user_name">Το όνομα χρήστη σας στο OSM</string>
+    <string name="open_street_map_login_descr">Απαιτείται για υποβολές στο openstreetmap.org.</string>
+    <string name="user_password">Κωδικός OSM</string>
+    <string name="osmand_service">Κατάσταση παρασκηνίου</string>
+    <string name="osmand_service_descr">Το OsmAnd εκτελείται στο παρασκήνιο με την οθόνη σβηστή.</string>
+    <string name="download_files_not_enough_space">Δεν υπάρχει αρκετός ελεύθερος χώρος για να κάνετε λήψη %1$s MB (ελεύθερα: %2$s).</string>
+    <string name="download_files_question_space">Λήψη {0} αρχείου(ων); Ο χρησιμοποιούμενος αποθηκευτικός χώρος είναι {1} MB. (Ο διαθέσιμος χώρος είναι {2} MB.)</string>
+    <string name="use_transparent_map_theme">Διάφανο θέμα</string>
+    <string name="native_library_not_supported">Η εγγενής βιβλιοθήκη δεν υποστηρίζεται σε αυτήν τη συσκευή.</string>
+    <string name="init_native_library">Αρχικοποίηση εγγενούς βιβλιοθήκης…</string>
+    <string name="choose_auto_follow_route">Αυτο-κεντράρισμα όψης χάρτη</string>
+    <string name="choose_auto_follow_route_descr">Χρόνος μέχρι η προβολή του χάρτη να συγχρονιστεί με την τρέχουσα θέση.</string>
+    <string name="auto_follow_route_navigation">Αυτο-κεντράρισμα μόνο κατά την πλοήγηση</string>
+    <string name="auto_follow_route_navigation_descr">Αυτο-κεντραρισμένη οπτική χάρτη μόνο κατά την πλοήγηση.</string>
+    <string name="auto_follow_location_enabled">Αυτο-κεντράρισμα χάρτη σε χρήση.</string>
+    <string name="pref_vector_rendering">Ειδικές επιλογές απεικονιστή διανυσμάτων</string>
+    <string name="pref_overlay">Επικάλυψη / υπόστρωμα</string>
+    <string name="pref_raster_map">Ρυθμίσεις προέλευσης χάρτη</string>
+    <string name="pref_vector_map">Ρυθμίσεις διανυσματικού χάρτη</string>
+    <string name="delete_confirmation_msg">Διαγραφή του %1$s?</string>
+    <string name="city_type_suburb">Προάστιο</string>
+    <string name="city_type_hamlet">Οικισμός</string>
+    <string name="city_type_village">Χωριό</string>
+    <string name="city_type_town">Κωμόπολη</string>
+    <string name="city_type_city">Πόλη</string>
+    <string name="animate_route_off">Διακοπή προσομοίωσης</string>
+    <string name="animate_route">Έναρξη προσομοίωσης</string>
+    <string name="file_can_not_be_renamed">Το αρχείο δεν μπορεί να μετονομαστεί.</string>
+    <string name="file_with_name_already_exists">Υπάρχει ήδη αρχείο με αυτό το όνομα.</string>
+    <string name="shared_string_gpx_route">διαδρομή GPX</string>
+    <string name="poi_query_by_name_matches_categories">Βρέθηκαν αρκετές κατηγορίες ΣΕ που ταιριάζουν με το ερώτημα:</string>
+    <string name="data_to_search_poi_not_available">Δεν υπάρχουν τοπικά δεδομένα για αναζήτηση ΣΕ.</string>
+    <string name="poi_filter_by_name">Αναζήτηση βάσει ονόματος</string>
+    <string name="old_poi_file_should_be_deleted">Το αρχείο δεδομένων ΣΕ \'%1$s\' είναι περιττό και μπορεί να διαγραφεί.</string>
+    <string name="update_poi_file_not_found">Δεν βρέθηκε τοπικό αρχείο για τη διατήρηση των αλλαγών στα ΣΕ και δεν μπορεί να δημιουργηθεί.</string>
+    <string name="button_upgrade_osmandplus">Αναβάθμιση OsmAnd+</string>
+    <string name="map_version_changed_info">Κατεβάσετε τη νέα έκδοση της εφαρμογής για να μπορείτε να χρησιμοποιήσετε τα νέα αρχεία χαρτών.</string>
+    <string name="poi_filter_nominatim">Nominatim με σύνδεση</string>
+    <string name="search_position_current_location_search">Αναζήτηση θέσης…</string>
+    <string name="search_position_current_location_found">Η θέση μου (βρέθηκε)</string>
+    <string name="search_position_address">Διεύθυνση…</string>
+    <string name="search_position_favorites">Αγαπημένα…</string>
+    <string name="search_position_undefined">Ακαθόριστο</string>
+    <string name="search_position_map_view">Τρέχον κέντρο χάρτη</string>
+    <string name="select_search_position">Πηγή:</string>
+    <string name="context_menu_item_search">Κοντινή αναζήτηση</string>
+    <string name="shared_string_save_as_gpx">Αποθήκευση ως νέο αρχείο GPX</string>
+    <string name="route_successfully_saved_at">Η διαδρομή αποθηκεύτηκε ως \'%1$s\'.</string>
+    <string name="filename_input">Όνομα αρχείου: </string>
+    <string name="file_with_name_already_exist">Υπάρχει ήδη αρχείο με το ίδιο όνομα.</string>
+    <string name="local_index_upload_gpx_description">Ανεβάστε τα αρχεία GPX στη κοινότητα του OSM, βελτιώνοντας τους χάρτες.</string>
+    <string name="local_index_items_uploaded">%1$d από %2$d αντικείμενο(α) απεστάλησαν.</string>
+    <string name="local_index_mi_upload_gpx">Αποστολή στο OSM</string>
+    <string name="show_more_map_detail">Εμφάνιση περισσότερων λεπτομερειών χάρτη</string>
+    <string name="show_more_map_detail_descr">Εμφάνιση μερικών λεπτομερειών διανυσματικού χάρτη (δρόμοι κλπ) σε χαμηλότερα επίπεδα εστίασης ήδη.</string>
+    <string name="favourites_delete_multiple_succesful">Τα αγαπημένα σημεία διαγράφηκαν.</string>
+    <string name="favorite_delete_multiple">Πρόκειται να διαγράψετε %1$d αγαπημένα και %2$d ομάδες αγαπημένων. Είστε σίγουρος;</string>
+    <string name="favorite_home_category">Σπίτι</string>
+    <string name="favorite_friends_category">Φίλοι</string>
+    <string name="favorite_places_category">Μέρη</string>
+    <string name="shared_string_name">Όνομα</string>
+    <string name="favourites_edit_dialog_category">Κατηγορία</string>
+    <string name="shared_string_no_thanks">Όχι, ευχαριστώ</string>
+    <string name="basemap_missing">Κατεβάστε τον βασικό παγκόσμιο χάρτη για να έχετε μια επισκόπηση που καλύπτει όλον τον κόσμο σε χαμηλά επίπεδα εστίασης.</string>
+    <string name="vector_data_missing">Κατεβάστε (\'χωρίς σύνδεση\') δεδομένα για να χρησιμοποιήσετε χάρτες χωρίς σύνδεση.</string>
+    <string name="local_index_gpx_info_show">"
 \n
 \nΠαρατεταμένο πάτημα για επιλογές"</string>
-	
-	
-	
-	<string name="local_index_installed">Τοπική έκδοση</string>
-	<string name="local_index_items_backuped">%1$d από %2$d αντικείμενο(α) απενεργοποιήθηκαν.</string>
-	<string name="local_index_items_deleted">%1$d από %2$d αντικείμενο(α) διαγράφηκαν.</string>
-	<string name="local_index_items_restored">%1$d από %2$d αντικείμενο(α) ενεργοποιήθηκαν.</string>
-	<string name="local_index_no_items_to_do">Δεν υπάρχουν στοιχεία προς %1$s</string>
-	<string name="local_index_action_do">Πρόκειται να %1$s %2$s αντικείμενο(α). Συνέχεια?</string>
-	<string name="local_index_descr_title">Διαχείριση αρχείων χαρτών.</string>
-	<string name="local_index_mi_restore">Ενεργοποίηση</string>
-	<string name="local_index_mi_backup">Απενεργοποίηση</string>
-	
-	
-	
-	<string name="local_index_poi_data">Δεδομένα ΣΕ</string>
-	<string name="local_index_address_data">Δεδομένα διευθύνσεων</string>
-	<string name="local_index_transport_data">Δεδομένα δημόσιων μεταφορών</string>
-	<string name="local_index_map_data">Δεδομένα χάρτη</string>
-	<string name="local_indexes_cat_backup">Απενεργοποιημένο</string>
-	<string name="local_indexes_cat_tts">Δεδομένα φωνής (TTS)</string>
-	<string name="local_indexes_cat_voice">Δεδομένα φωνής (ηχογραφημένα)</string>
-	
-	<string name="local_indexes_cat_poi">Δεδομένα ΣΕ</string>
-	<string name="ttsvoice">Φωνή TTS</string>
-	<string name="search_offline_clear_search">Νέα Αναζήτηση</string>
-	<string name="map_text_size_descr">Επιλέξτε μέγεθος κειμένου για τα ονόματα στον χάρτη.</string>
-	<string name="map_text_size">Μέγεθος γραμματοσειράς χάρτη</string>
-	<string name="trace_rendering">Πληρ. αποσφαλμάτωσης απεικόνισης</string>
-	<string name="trace_rendering_descr">Εμφάνιση επίδοσης απόδοσης.</string>
-	
-	
-	
-	
-	<string name="installing_new_resources">Αποσυμπίεση νέων δεδομένων…</string>
-	<string name="internet_connection_required_for_online_route">Επιλέχτηκε μια υπηρεσία πλοήγησης με σύνδεση, αλλά δεν είσαστε συνδεμένοι στο διαδίκτυο.</string>
-	<string name="tts_language_not_supported_title">Μη υποστηριζόμενη γλώσσα</string>
-	<string name="tts_language_not_supported">Η επιλεγμένη γλώσσα δεν υποστηρίζεται από την εγκατεστημένη μηχανή TTS (κείμενο σε ομιλία) του Android. Να αναζητηθεί μια άλλη μηχανή TTS στην αγορά; Ειδάλλως θα χρησιμοποιηθεί η προεπιλεγμένη γλώσσα TTS.</string>
-	<string name="tts_missing_language_data_title">Απουσία δεδομένων</string>
-	<string name="tts_missing_language_data">Μετάβαση στην αγορά ( Market) για λήψη της επιλεγμένης γλώσσας;</string>
-	<string name="gpx_option_reverse_route">Αντιστροφή κατεύθυνσης GPX</string>
-	<string name="gpx_option_destination_point">Χρήση τρέχοντος προορισμού</string>
-	<string name="gpx_option_from_start_point">Πέρασμα κατά μήκος ολόκληρου του ίχνους</string>
-	<string name="switch_to_vector_map_to_see">Υπάρχουν διανυσματικοί χάρτες χωρίς σύνδεση για αυτήν την τοποθεσία. 
+    <string name="local_index_installed">Τοπική έκδοση</string>
+    <string name="local_index_items_backuped">%1$d από %2$d αντικείμενο(α) απενεργοποιήθηκαν.</string>
+    <string name="local_index_items_deleted">%1$d από %2$d αντικείμενο(α) διαγράφηκαν.</string>
+    <string name="local_index_items_restored">%1$d από %2$d αντικείμενο(α) ενεργοποιήθηκαν.</string>
+    <string name="local_index_no_items_to_do">Δεν υπάρχουν στοιχεία προς %1$s</string>
+    <string name="local_index_action_do">Πρόκειται να %1$s %2$s αντικείμενο(α). Συνέχεια?</string>
+    <string name="local_index_descr_title">Διαχείριση αρχείων χαρτών.</string>
+    <string name="local_index_mi_restore">Ενεργοποίηση</string>
+    <string name="local_index_mi_backup">Απενεργοποίηση</string>
+    <string name="local_index_poi_data">Δεδομένα ΣΕ</string>
+    <string name="local_index_address_data">Δεδομένα διευθύνσεων</string>
+    <string name="local_index_transport_data">Δεδομένα δημόσιων μεταφορών</string>
+    <string name="local_index_map_data">Δεδομένα χάρτη</string>
+    <string name="local_indexes_cat_backup">Απενεργοποιημένο</string>
+    <string name="local_indexes_cat_tts">Δεδομένα φωνής (TTS)</string>
+    <string name="local_indexes_cat_voice">Δεδομένα φωνής (ηχογραφημένα)</string>
+    <string name="local_indexes_cat_poi">Δεδομένα ΣΕ</string>
+    <string name="ttsvoice">Φωνή TTS</string>
+    <string name="search_offline_clear_search">Νέα Αναζήτηση</string>
+    <string name="map_text_size_descr">Επιλέξτε μέγεθος κειμένου για τα ονόματα στον χάρτη.</string>
+    <string name="map_text_size">Μέγεθος γραμματοσειράς χάρτη</string>
+    <string name="trace_rendering">Πληρ. αποσφαλμάτωσης απεικόνισης</string>
+    <string name="trace_rendering_descr">Εμφάνιση επίδοσης απόδοσης.</string>
+    <string name="installing_new_resources">Αποσυμπίεση νέων δεδομένων…</string>
+    <string name="internet_connection_required_for_online_route">Επιλέχτηκε μια υπηρεσία πλοήγησης με σύνδεση, αλλά δεν είσαστε συνδεμένοι στο διαδίκτυο.</string>
+    <string name="tts_language_not_supported_title">Μη υποστηριζόμενη γλώσσα</string>
+    <string name="tts_language_not_supported">Η επιλεγμένη γλώσσα δεν υποστηρίζεται από την εγκατεστημένη μηχανή TTS (κείμενο σε ομιλία) του Android. Να αναζητηθεί μια άλλη μηχανή TTS στην αγορά; Ειδάλλως θα χρησιμοποιηθεί η προεπιλεγμένη γλώσσα TTS.</string>
+    <string name="tts_missing_language_data_title">Απουσία δεδομένων</string>
+    <string name="tts_missing_language_data">Μετάβαση στην αγορά ( Market) για λήψη της επιλεγμένης γλώσσας;</string>
+    <string name="gpx_option_reverse_route">Αντιστροφή κατεύθυνσης GPX</string>
+    <string name="gpx_option_destination_point">Χρήση τρέχοντος προορισμού</string>
+    <string name="gpx_option_from_start_point">Πέρασμα κατά μήκος ολόκληρου του ίχνους</string>
+    <string name="switch_to_vector_map_to_see">Υπάρχουν διανυσματικοί χάρτες χωρίς σύνδεση για αυτήν την τοποθεσία. 
 \n\t
 \n\tΓια να τους χρησιμοποιήσετε ενεργοποιήστε \'Μενού\' → \'Διαμόρφωση χάρτη\' → \'Προέλευση χάρτη…\' → \'Διανυσματικοί χάρτες χωρίς σύνδεση\'.</string>
-	<string name="choose_audio_stream">Έξοδος φωνητικής καθοδήγησης</string>
-	<string name="choose_audio_stream_descr">Επιλέξτε το ηχείο αναπαραγωγής της φωνητικής καθοδήγησης.</string>
-	<string name="voice_stream_voice_call">Ήχος κλήσης τηλεφώνου (επίσης για διακοπή στερεοφωνικών αυτοκινήτου μπλουτούθ)</string>
-	<string name="voice_stream_notification">Ήχος ειδοποίησης</string>
-	<string name="voice_stream_music">Ήχος πολυμέσων/μουσικής</string>
-	<string name="warning_tile_layer_not_downloadable">Η εφαρμογή δεν μπορεί να κατεβάσει τη στρώση χάρτη %1$s, η επανεγκατάστασή της μπορεί να βοηθήσει.</string>
-	<string name="overlay_transparency_descr">Τροποποίηση διαφάνειας επικάλυψης.</string>
-	<string name="overlay_transparency">Διαφάνεια επικάλυψης</string>
-	<string name="map_transparency_descr">Τροποποίηση διαφάνειας βασικού χάρτη.</string>
-	<string name="map_transparency">Διαφάνεια βασικού χάρτη</string>
-	<string name="layer_underlay">Χάρτης υποστρώματος…</string>
-	<string name="map_underlay">Χάρτης υποστρώματος</string>
-	<string name="map_underlay_descr">Επιλογή του χάρτη υποστρώματος.</string>
-	<string name="layer_overlay">Χάρτης επικάλυψης…</string>
-	<string name="map_overlay">Χάρτης επικάλυψης</string>
-	<string name="map_overlay_descr">Επιλογή του χάρτη επικάλυψης.</string>
-	<string name="tile_source_already_installed">Ο χάρτης είναι ήδη εγκατεστημένος, οι \'Ρυθμίσεις\' θα ενημερωθούν.</string>
-	<string name="select_tile_source_to_install">Επιλέξτε χάρτες (πλακίδια) για εγκατάσταση ή ενημέρωση.</string>
-	<string name="internet_not_available">Αδυναμία εκτέλεσης λειτουργίας χωρίς διαδικτυακή σύνδεση.</string>
-	<string name="install_more">Εγκατάσταση περισσότερων…</string>
-	<string name="level_to_switch_vector_raster_descr">Χρήση χαρτών εικονογραφίας για ο,τιδήποτε κάτω από αυτό το επίπεδο.</string>
-	<string name="level_to_switch_vector_raster">Ελάχιστο επίπεδο εστίασης διανύσματος</string>
-	
-	
-	
-	
-	<string name="error_doing_search">Αδυναμία εκτέλεσης αναζήτησης χωρίς σύνδεση.</string>
-	<string name="search_offline_geo_error">Αδυναμία ανάλυσης της γεωγρ πρόθεσης \'%s\'.</string>
-	<string name="search_osm_offline">Αναζήτηση κατά γεωγραφική τοποθεσία</string>
-	<string name="system_locale">Σύστημα</string>
-	<string name="preferred_locale_descr">Επιλέξτε γλώσσα εμφάνισης (λαμβάνει χώρα όταν επανεκκινεί το OsmAnd).</string>
-	<string name="preferred_locale">Γλώσσα εμφάνισης</string>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<string name="shared_string_next">Επόμενο</string>
-	<string name="shared_string_previous">Προηγούμενο</string>
-	<string name="unit_of_length_descr">Αλλαγή απόστασης που μετριέται.</string>
-	<string name="unit_of_length">Μονάδες μήκους</string>
-	<string name="si_mi_feet">Μίλια/πόδια</string>
-	<string name="si_mi_yard">Μίλια/γιάρδες</string>
-	<string name="si_km_m">Χιλιόμετρα/μέτρα</string>
-	<string name="yard">γδ</string>
-	<string name="foot">πδ</string>
-	<string name="mile_per_hour">μαω</string>
-	<string name="mile">μλ</string>
-	<string name="send_location_way_choose_title">Κοινή χρήση τοποθεσίας χρησιμοποιώντας</string>
-	<string name="send_location_sms_pattern">Τοποθεσία: %1$s\n%2$s</string>
-	<string name="send_location_email_pattern">Για να δείτε την τοποθεσία ακολουθήστε τον σύνδεσμο ιστού %1$s ή τον σύνδεσμο στόχου android %2$s</string>
-	<string name="send_location">Αποστολή τοποθεσίας</string>
-	<string name="context_menu_item_share_location">Κοινή χρήση τοποθεσίας</string>
-	<string name="add_waypoint_dialog_added">Προστέθηκε το GPX σημείο διαδρομής \'\'{0}\'\'</string>
-	<string name="add_waypoint_dialog_title">Προσθήκη σημείου διαδρομής στο εγγραφόμενο ίχνος GPX</string>
-	<string name="context_menu_item_add_waypoint">Προσθήκη σημείου GPX</string>
-	<string name="amenity_type_administrative">Διοικητικό</string>
-	<string name="amenity_type_barrier">Φράκτης</string>
-	<string name="amenity_type_education">Εκπαίδευση</string>
-	<string name="amenity_type_emergency">Επείγοντα</string>
-	<string name="amenity_type_entertainment">Ψυχαγωγία</string>
-	<string name="amenity_type_finance">Χρηματοοικονομικά</string>
-	<string name="amenity_type_geocache">Geocache</string>
-	<string name="amenity_type_healthcare">Υγεία</string>
-	<string name="amenity_type_historic">Ιστορικά</string>
-	<string name="amenity_type_landuse">Χρήσης γης</string>
-	<string name="amenity_type_leisure">Αναψυχή</string>
-	<string name="amenity_type_man_made">Ανθρώπινες κατασκευές</string>
-	<string name="amenity_type_military">Στρατιωτικά</string>
-	<string name="amenity_type_natural">Φύση</string>
-	<string name="amenity_type_office">Γραφείο</string>
-	<string name="amenity_type_other">Άλλα</string>
-	<string name="amenity_type_shop">Κατάστημα</string>
-	<string name="amenity_type_sport">Αθλητισμός</string>
-	<string name="amenity_type_sustenance">Διατροφή</string>
-	<string name="amenity_type_tourism">Τουρισμός</string>
-	<string name="amenity_type_transportation">Μεταφορές</string>
-	<string name="indexing_address">Ευρετηρίαση διευθύνσεων…</string>
-	<string name="indexing_map">Ευρετηρίαση χάρτη…</string>
-	<string name="indexing_poi">Ευρετηρίαση Σημ. Ενδ…</string>
-	<string name="indexing_transport">Ευρετηρίαση μεταφορών…</string>
-	<string name="shared_string_io_error">Σφάλμα Εισ/Εξ</string>
-	<string name="km">χλμ</string>
-	<string name="km_h">χλμ/ω</string>
-	<string name="m">μ</string>
-	<string name="old_map_index_is_not_supported">Η παρωχημένη μορφή δεδομένων χάρτη \'\'{0}\'\', δεν υποστηρίζεται</string>
-	<string name="poi_filter_closest_poi">Πλησιέστερα ΣΕ</string>
-	<string name="poi_filter_custom_filter">Προσαρμοσμένο φίλτρο</string>
-	<string name="poi_filter_namefinder">Εύρεση ονόματος (NameFinder) με σύνδεση</string>
-	<string name="reading_cached_tiles">Ανάγνωση αποθηκευμένων πλακιδίων…</string>
-	<string name="version_index_is_big_for_memory">Το ευρετήριο \'\'{0}\'\' δεν χωράει στη μνήμη</string>
-	<string name="version_index_is_not_supported">Η εκδοχή \'\'{0}\'\' του ευρετηρίου δεν υποστηρίζεται</string>
-	
-	
-	<string name="osmand_routing_experimental">Η πλοήγηση OsmAnd χωρίς δίκτυο είναι μια πειραματική λειτουργία και δε λειτουργεί για αποστάσεις πάνω από 20 χλμ.
+    <string name="choose_audio_stream">Έξοδος φωνητικής καθοδήγησης</string>
+    <string name="choose_audio_stream_descr">Επιλέξτε το ηχείο αναπαραγωγής της φωνητικής καθοδήγησης.</string>
+    <string name="voice_stream_voice_call">Ήχος κλήσης τηλεφώνου (επίσης για διακοπή στερεοφωνικών αυτοκινήτου μπλουτούθ)</string>
+    <string name="voice_stream_notification">Ήχος ειδοποίησης</string>
+    <string name="voice_stream_music">Ήχος πολυμέσων/μουσικής</string>
+    <string name="warning_tile_layer_not_downloadable">Η εφαρμογή δεν μπορεί να κατεβάσει τη στρώση χάρτη %1$s, η επανεγκατάστασή της μπορεί να βοηθήσει.</string>
+    <string name="overlay_transparency_descr">Τροποποίηση διαφάνειας επικάλυψης.</string>
+    <string name="overlay_transparency">Διαφάνεια επικάλυψης</string>
+    <string name="map_transparency_descr">Τροποποίηση διαφάνειας βασικού χάρτη.</string>
+    <string name="map_transparency">Διαφάνεια βασικού χάρτη</string>
+    <string name="layer_underlay">Χάρτης υποστρώματος…</string>
+    <string name="map_underlay">Χάρτης υποστρώματος</string>
+    <string name="map_underlay_descr">Επιλογή του χάρτη υποστρώματος.</string>
+    <string name="layer_overlay">Χάρτης επικάλυψης…</string>
+    <string name="map_overlay">Χάρτης επικάλυψης</string>
+    <string name="map_overlay_descr">Επιλογή του χάρτη επικάλυψης.</string>
+    <string name="tile_source_already_installed">Ο χάρτης είναι ήδη εγκατεστημένος, οι \'Ρυθμίσεις\' θα ενημερωθούν.</string>
+    <string name="select_tile_source_to_install">Επιλέξτε χάρτες (πλακίδια) για εγκατάσταση ή ενημέρωση.</string>
+    <string name="internet_not_available">Αδυναμία εκτέλεσης λειτουργίας χωρίς διαδικτυακή σύνδεση.</string>
+    <string name="install_more">Εγκατάσταση περισσότερων…</string>
+    <string name="level_to_switch_vector_raster_descr">Χρήση χαρτών εικονογραφίας για ο,τιδήποτε κάτω από αυτό το επίπεδο.</string>
+    <string name="level_to_switch_vector_raster">Ελάχιστο επίπεδο εστίασης διανύσματος</string>
+    <string name="error_doing_search">Αδυναμία εκτέλεσης αναζήτησης χωρίς σύνδεση.</string>
+    <string name="search_offline_geo_error">Αδυναμία ανάλυσης της γεωγρ πρόθεσης \'%s\'.</string>
+    <string name="search_osm_offline">Αναζήτηση κατά γεωγραφική τοποθεσία</string>
+    <string name="system_locale">Σύστημα</string>
+    <string name="preferred_locale_descr">Επιλέξτε γλώσσα εμφάνισης (λαμβάνει χώρα όταν επανεκκινεί το OsmAnd).</string>
+    <string name="preferred_locale">Γλώσσα εμφάνισης</string>
+    <string name="shared_string_next">Επόμενο</string>
+    <string name="shared_string_previous">Προηγούμενο</string>
+    <string name="unit_of_length_descr">Αλλαγή απόστασης που μετριέται.</string>
+    <string name="unit_of_length">Μονάδες μήκους</string>
+    <string name="si_mi_feet">Μίλια/πόδια</string>
+    <string name="si_mi_yard">Μίλια/γιάρδες</string>
+    <string name="si_km_m">Χιλιόμετρα/μέτρα</string>
+    <string name="yard">γδ</string>
+    <string name="foot">πδ</string>
+    <string name="mile_per_hour">μαω</string>
+    <string name="mile">μλ</string>
+    <string name="send_location_way_choose_title">Κοινή χρήση τοποθεσίας χρησιμοποιώντας</string>
+    <string name="send_location_sms_pattern">Τοποθεσία: %1$s\n%2$s</string>
+    <string name="send_location_email_pattern">Για να δείτε την τοποθεσία ακολουθήστε τον σύνδεσμο ιστού %1$s ή τον σύνδεσμο στόχου android %2$s</string>
+    <string name="send_location">Αποστολή τοποθεσίας</string>
+    <string name="context_menu_item_share_location">Κοινή χρήση τοποθεσίας</string>
+    <string name="add_waypoint_dialog_added">Προστέθηκε το GPX σημείο διαδρομής \'\'{0}\'\'</string>
+    <string name="add_waypoint_dialog_title">Προσθήκη σημείου διαδρομής στο εγγραφόμενο ίχνος GPX</string>
+    <string name="context_menu_item_add_waypoint">Προσθήκη σημείου GPX</string>
+    <string name="amenity_type_administrative">Διοικητικό</string>
+    <string name="amenity_type_barrier">Φράκτης</string>
+    <string name="amenity_type_education">Εκπαίδευση</string>
+    <string name="amenity_type_emergency">Επείγοντα</string>
+    <string name="amenity_type_entertainment">Ψυχαγωγία</string>
+    <string name="amenity_type_finance">Χρηματοοικονομικά</string>
+    <string name="amenity_type_geocache">Geocache</string>
+    <string name="amenity_type_healthcare">Υγεία</string>
+    <string name="amenity_type_historic">Ιστορικά</string>
+    <string name="amenity_type_landuse">Χρήσης γης</string>
+    <string name="amenity_type_leisure">Αναψυχή</string>
+    <string name="amenity_type_man_made">Ανθρώπινες κατασκευές</string>
+    <string name="amenity_type_military">Στρατιωτικά</string>
+    <string name="amenity_type_natural">Φύση</string>
+    <string name="amenity_type_office">Γραφείο</string>
+    <string name="amenity_type_other">Άλλα</string>
+    <string name="amenity_type_shop">Κατάστημα</string>
+    <string name="amenity_type_sport">Αθλητισμός</string>
+    <string name="amenity_type_sustenance">Διατροφή</string>
+    <string name="amenity_type_tourism">Τουρισμός</string>
+    <string name="amenity_type_transportation">Μεταφορές</string>
+    <string name="indexing_address">Ευρετηρίαση διευθύνσεων…</string>
+    <string name="indexing_map">Ευρετηρίαση χάρτη…</string>
+    <string name="indexing_poi">Ευρετηρίαση Σημ. Ενδ…</string>
+    <string name="indexing_transport">Ευρετηρίαση μεταφορών…</string>
+    <string name="shared_string_io_error">Σφάλμα Εισ/Εξ</string>
+    <string name="km">χλμ</string>
+    <string name="km_h">χλμ/ω</string>
+    <string name="m">μ</string>
+    <string name="old_map_index_is_not_supported">Η παρωχημένη μορφή δεδομένων χάρτη \'\'{0}\'\', δεν υποστηρίζεται</string>
+    <string name="poi_filter_closest_poi">Πλησιέστερα ΣΕ</string>
+    <string name="poi_filter_custom_filter">Προσαρμοσμένο φίλτρο</string>
+    <string name="poi_filter_namefinder">Εύρεση ονόματος (NameFinder) με σύνδεση</string>
+    <string name="reading_cached_tiles">Ανάγνωση αποθηκευμένων πλακιδίων…</string>
+    <string name="version_index_is_big_for_memory">Το ευρετήριο \'\'{0}\'\' δεν χωράει στη μνήμη</string>
+    <string name="version_index_is_not_supported">Η εκδοχή \'\'{0}\'\' του ευρετηρίου δεν υποστηρίζεται</string>
+    <string name="osmand_routing_experimental">Η πλοήγηση OsmAnd χωρίς δίκτυο είναι μια πειραματική λειτουργία και δε λειτουργεί για αποστάσεις πάνω από 20 χλμ.
 \n
 \nΗ πλοήγηση έχει προσωρινά αλλάξει στην δικτυακή υπηρεσία CloudMade.</string>
-	<string name="specified_dir_doesnt_exist">Δεν μπορώ να βρω τον καθορισμένο φάκελο.</string>
-	<string name="application_dir">Φάκελος αποθήκευσης δεδομένων</string>
-	
-	<string name="osmand_net_previously_installed">Όλα τα δεδομένα χωρίς σύνδεση στην παλιά εγκατεστημένη εφαρμογή θα υποστηρίζονται από τη νέα εφαρμογή, αλλά τα αγαπημένα σημεία θα πρέπει να εξαχθούν από την παλιά εφαρμογή και στη συνέχεια να εισαχθούν στη νέα.</string>
-	<string name="build_installed">Η δόμηση {0} εγκαταστάθηκε ({1}).</string>
-	<string name="downloading_build">Λήψη build…</string>
-	<string name="install_selected_build">Εγκατάσταση του OsmAnd - {0} από {1} {2} MB ;</string>
-	<string name="loading_builds_failed">Η ανάκτηση της λίστας των OsmAnd builds απέτυχε</string>
-	<string name="loading_builds">Φόρτωση OsmAnd builds…</string>
-	<string name="select_build_to_install">Επιλέξτε ένα από τα OsmAnd builds προς εγκατάσταση</string>
-	<string name="contribution_activity">Εγκατάσταση έκδοσης</string>
-	<string name="gps_status_app_not_found">Η εφαρμογή κατάστασης GPS δεν είναι εγκατεστημένη. Αναζήτηση στην αγορά ;</string>
-	<string name="voice_is_not_available_msg">"Δεν υπάρχει διαθέσιμη φωνητική καθοδήγηση, παρακαλούμε μεταβείτε στο \'Ρυθμίσεις\' →  \'Ρυθμίσεις πλοήγησης\' → \'Φωνητική καθοδήγηση\' και επιλέξτε ή κατεβάστε ένα πακέτο φωνητικών οδηγιών."</string>
-	<string name="voice_is_not_available_title">Δεν επιλέχτηκε φωνητική καθοδήγηση</string>
-	<string name="daynight_mode_day">Ημέρα</string>
-	<string name="daynight_mode_night">Νύχτα</string>
-	<string name="daynight_mode_auto">Ανατολή/δύση</string>
-	<string name="daynight_mode_sensor">Αισθητήρας φωτός</string>
-	<string name="daynight_descr">Επιλέξτε τον κανόνα εναλλαγής λειτουργίας μεταξύ ημέρας και νύχτας.</string>
-	<string name="daynight">Λειτουργία ημέρας/νύχτας</string>
-	<string name="download_files_question">Λήψη {0} αρχείου(ων) ({1} MB)?</string>
-	<string name="items_were_selected">{0} αντικείμενο(α) επιλέχτηκαν</string>
-	<string name="filter_existing_indexes">Κατεβασμένα</string>
-	
-	<string name="shared_string_refresh">Ανανέωση</string>
-	<string name="fast_route_mode">Ταχύτερη διαδρομή</string>
-	<string name="fast_route_mode_descr">Ενεργοποίηση για υπολογισμό ταχύτερης διαδρομής ή απενεργοποίηση για διαδρομή εξοικονόμησης καυσίμου.</string>
-	<string name="tiles_to_download_estimated_size">Στην εστίαση {0} λήψη {1} πλακίδια ({2} MB)</string>
-	<string name="shared_string_download_map">Λήψη χάρτη</string>
-	<string name="select_max_zoom_preload_area">Επιλέξτε τη μέγιστη μεγέθυνση για προφόρτωση</string>
-	<string name="maps_could_not_be_downloaded">Αυτός ο χάρτης δεν μπορεί να ληφθεί</string>
-	<string name="continuous_rendering">Συνεχής απεικόνιση</string>
-	<string name="continuous_rendering_descr">Εμφάνιση συνεχούς απεικόνισης αντί για εικόνα με τη μία.</string>
-	<string name="rendering_exception">Αδυναμία σχεδίασης της επιλεγμένης περιοχής</string>
-	<string name="show_point_options">Χρήση τοποθεσίας …</string>
-	<string name="renderer_load_sucess">Ο απεικονιστής φορτώθηκε</string>
-	<string name="renderer_load_exception">Αδυναμία φόρτωσης απεικονιστή</string>
-	<string name="renderers">Απεικονιστής διανυσμάτων</string>
-	<string name="renderers_descr">Επιλέξτε εμφάνιση απεικόνισης.</string>
-	<string name="poi_context_menu_website">Εμφάνιση ιστοσελίδας ΣΕ</string>
-	<string name="poi_context_menu_call">Εμφάνιση τηλεφώνου ΣΕ</string>
-	<string name="website">Ιστότοπος</string>
-	<string name="phone">Τηλέφωνο</string>
-	<string name="download_type_to_filter">πληκτρ/στε. για φιλτράρισμα</string>
-	<string name="use_high_res_maps">Οθόνη υψηλής ανάλυσης</string>
-	<string name="use_high_res_maps_descr">Χωρίς επέκταση (και θόλωμα) των πλακιδίων χάρτη σε οθόνες υψηλής πυκνότητας.</string>
-	
-	<string name="context_menu_item_search_transport">Αναζήτηση ΜΜΜ</string>
-	<string name="transport_searching_transport">Αποτελέσματα μέσων μεταφοράς (χωρίς προορισμό):</string>
-	<string name="transport_searching_route">Αποτελέσματα μέσων μεταφοράς ({0} μέχρι τον προορισμό):</string>
-	
-	<string name="transport_search_again">Καθαρισμός αναζήτησης ΜΜΜ</string>
-	
-	<string name="voice">Ηχογραφημένη φωνή</string>
-	<string name="no_vector_map_loaded">Οι διανυσματικοί χάρτες δεν φορτώθηκαν</string>
-	
-	<string name="gpx_files_not_found">Δεν βρέθηκαν αρχεία GPX στον κατάλογο ιχνών</string>
-	<string name="layer_gpx_layer">Αρχεία GPX…</string>
-	<string name="error_reading_gpx">Αδυναμία ανάγνωσης δεδομένων GPX</string>
-	<string name="vector_data">Διανυσματικοί χάρτες χωρίς σύνδεση</string>
-	<string name="transport_context_menu">Αναζήτηση μέσου μεταφοράς στη στάση</string>
-	
-	
-	<string name="poi_context_menu_modify">Τροποποίηση ΣΕ</string>
-	<string name="poi_context_menu_delete">Διαγραφή ΣΕ</string>
-	<string name="rotate_map_compass_opt">Κατεύθυνση πυξίδας</string>
-	<string name="rotate_map_bearing_opt">Κατεύθυνση κίνησης</string>
-	<string name="rotate_map_none_opt">Χωρίς περιστροφή (ο βορράς πάντα προς τα πάνω)</string>
-	<string name="rotate_map_to_bearing_descr">Επιλέξτε τη στοίχιση οθόνης χάρτη.</string>
-	<string name="rotate_map_to_bearing">Προσανατολισμός χάρτη</string>
-	<string name="show_route">Λεπτομέρειες διαδρομής</string>
-	<string name="fav_imported_sucessfully">Τα αγαπημένα εισήχθησαν</string>
-	<string name="fav_file_to_load_not_found">Δεν βρέθηκε αρχείο GPX που να περιέχει αγαπημένα στο {0}</string>
-	<string name="fav_saved_sucessfully">Τα αγαπημένα αποθηκεύτηκαν στο {0}</string>
-	<string name="no_fav_to_save">Δεν υπάρχουν αγαπημένα σημεία προς αποθήκευση</string>
-	<string name="error_occurred_loading_gpx">Αδυναμία φόρτωσης του GPX</string>
-	<string name="send_report">Αποστολή αναφοράς</string>
-	<string name="none_region_found">Αδυναμία εύρεσης κατεβασμένων χαρτών στην κάρτα μνήμης.</string>
-	<string name="poi_namefinder_query_empty">Πληκτρολογήστε για να βρείτε ΣΕ</string>
-	<string name="any_poi">Οποιοδήποτε</string>
-	
-	<string name="thanks_yandex_traffic">Ευχαριστούμε τη Yandex για τις πληροφορίες κυκλοφορίας.</string>
-	<string name="layer_yandex_traffic">Κυκλοφορία Yandex</string>
-	<string name="layer_route">Διαδρομή</string>
-	<string name="layer_osm_bugs">Σημειώσεις OSM (σε σύνδεση)</string>
-	
-	<string name="layer_poi">Επίστρωμα ΣΕ…</string>
-	<string name="layer_map">Πηγή χάρτη…</string>
-	<string name="menu_layers">Επίπεδα χάρτη</string>
-	<string name="context_menu_item_search_poi">Αναζήτηση ΣΕ</string>
-	
-	<string name="use_trackball_descr">Χρήση ιχνόσφαιρας για μετακίνηση του χάρτη.</string>
-	<string name="use_trackball">Χρήση του trackball</string>
-	<string name="background_service_wait_int_descr">Ορίστε τον μέγιστο επιτρεπόμενο χρόνο αναμονής για κάθε διόρθωση θέσης παρασκηνίου.</string>
-	<string name="background_service_wait_int">Μέγιστη αναμονή για εύρεση</string>
-	
-	<string name="where_am_i">Πού είμαι;</string>
-	<string name="process_navigation_service">Υπηρεσία πλοήγησης OsmAnd</string>
-	<string name="network_provider">Δίκτυο</string>
-	<string name="gps_provider">GPS</string>
-	<string name="int_seconds">δευτερόλεπτα</string>
-	<string name="int_min">λεπτ.</string>
-	<string name="background_service_int_descr">Ορισμός διαστήματος αφύπνισης χρησιμοποιούμενο από την υπηρεσία παρασκηνίου.</string>
-	<string name="background_service_int">Διάστημα αφύπνισης GPS</string>
-	<string name="background_service_provider_descr">Επιλέξτε μέθοδο τοποθεσίας που χρησιμοποιείται από την υπηρεσία παρασκηνίου.</string>
-	<string name="background_service_provider">Πάροχος τοποθεσίας</string>
-	<string name="background_router_service_descr">Εντοπίζει τη θέση σας, ενώ η οθόνη είναι σβηστή.</string>
-	<string name="background_router_service">Εκτέλεση OsmAnd στο παρασκήνιο</string>
-	<string name="off_router_service_no_gps_available">Η υπηρεσία πλοήγησης παρασκηνίου απαιτεί έναν πάροχο τοποθεσίας που να είναι ενεργοποιημένος.</string>
-	<string name="hide_poi_filter">Απόκρυψη φίλτρου</string>
-	<string name="show_poi_filter">Εμφάνιση φίλτρου</string>
-	<string name="search_poi_filter">Φιλτράρισμα</string>
-	<string name="menu_mute_off">Ήχος ανοικτός</string>
-	<string name="menu_mute_on">Ήχος κλειστός</string>
-	<string name="voice_provider_descr">Επιλέξτε τη φωνητική καθοδήγηση για πλοήγηση.</string>
-	<string name="voice_provider">Φωνητική καθοδήγηση</string>
-	<string name="voice_data_initializing">Αρχικοποίηση δεδομένων φωνής…</string>
-	<string name="voice_data_not_supported">Μη υποστηριζόμενη έκδοση των δεδομένων φωνής</string>
-	<string name="voice_data_corrupted">Τα καθορισμένα δεδομένα φωνής είναι κατεστραμμένα</string>
-	<string name="voice_data_unavailable">Τα επιλεγμένα δεδομένα φωνής δεν είναι διαθέσιμα</string>
-	
-	<string name="sd_unmounted">Η κάρτα μνήμης δεν είναι προσβάσιμη.
+    <string name="specified_dir_doesnt_exist">Δεν μπορώ να βρω τον καθορισμένο φάκελο.</string>
+    <string name="application_dir">Φάκελος αποθήκευσης δεδομένων</string>
+    <string name="osmand_net_previously_installed">Όλα τα δεδομένα χωρίς σύνδεση στην παλιά εγκατεστημένη εφαρμογή θα υποστηρίζονται από τη νέα εφαρμογή, αλλά τα αγαπημένα σημεία θα πρέπει να εξαχθούν από την παλιά εφαρμογή και στη συνέχεια να εισαχθούν στη νέα.</string>
+    <string name="build_installed">Η δόμηση {0} εγκαταστάθηκε ({1}).</string>
+    <string name="downloading_build">Λήψη build…</string>
+    <string name="install_selected_build">Εγκατάσταση του OsmAnd - {0} από {1} {2} MB ;</string>
+    <string name="loading_builds_failed">Η ανάκτηση της λίστας των OsmAnd builds απέτυχε</string>
+    <string name="loading_builds">Φόρτωση OsmAnd builds…</string>
+    <string name="select_build_to_install">Επιλέξτε ένα από τα OsmAnd builds προς εγκατάσταση</string>
+    <string name="contribution_activity">Εγκατάσταση έκδοσης</string>
+    <string name="gps_status_app_not_found">Η εφαρμογή κατάστασης GPS δεν είναι εγκατεστημένη. Αναζήτηση στην αγορά ;</string>
+    <string name="voice_is_not_available_msg">"Δεν υπάρχει διαθέσιμη φωνητική καθοδήγηση, παρακαλούμε μεταβείτε στο \'Ρυθμίσεις\' →  \'Ρυθμίσεις πλοήγησης\' → \'Φωνητική καθοδήγηση\' και επιλέξτε ή κατεβάστε ένα πακέτο φωνητικών οδηγιών."</string>
+    <string name="voice_is_not_available_title">Δεν επιλέχτηκε φωνητική καθοδήγηση</string>
+    <string name="daynight_mode_day">Ημέρα</string>
+    <string name="daynight_mode_night">Νύχτα</string>
+    <string name="daynight_mode_auto">Ανατολή/δύση</string>
+    <string name="daynight_mode_sensor">Αισθητήρας φωτός</string>
+    <string name="daynight_descr">Επιλέξτε τον κανόνα εναλλαγής λειτουργίας μεταξύ ημέρας και νύχτας.</string>
+    <string name="daynight">Λειτουργία ημέρας/νύχτας</string>
+    <string name="download_files_question">Λήψη {0} αρχείου(ων) ({1} MB)?</string>
+    <string name="items_were_selected">{0} αντικείμενο(α) επιλέχτηκαν</string>
+    <string name="filter_existing_indexes">Κατεβασμένα</string>
+    <string name="shared_string_refresh">Ανανέωση</string>
+    <string name="fast_route_mode">Ταχύτερη διαδρομή</string>
+    <string name="fast_route_mode_descr">Ενεργοποίηση για υπολογισμό ταχύτερης διαδρομής ή απενεργοποίηση για διαδρομή εξοικονόμησης καυσίμου.</string>
+    <string name="tiles_to_download_estimated_size">Στην εστίαση {0} λήψη {1} πλακίδια ({2} MB)</string>
+    <string name="shared_string_download_map">Λήψη χάρτη</string>
+    <string name="select_max_zoom_preload_area">Επιλέξτε τη μέγιστη μεγέθυνση για προφόρτωση</string>
+    <string name="maps_could_not_be_downloaded">Αυτός ο χάρτης δεν μπορεί να ληφθεί</string>
+    <string name="continuous_rendering">Συνεχής απεικόνιση</string>
+    <string name="continuous_rendering_descr">Εμφάνιση συνεχούς απεικόνισης αντί για εικόνα με τη μία.</string>
+    <string name="rendering_exception">Αδυναμία σχεδίασης της επιλεγμένης περιοχής</string>
+    <string name="show_point_options">Χρήση τοποθεσίας …</string>
+    <string name="renderer_load_sucess">Ο απεικονιστής φορτώθηκε</string>
+    <string name="renderer_load_exception">Αδυναμία φόρτωσης απεικονιστή</string>
+    <string name="renderers">Απεικονιστής διανυσμάτων</string>
+    <string name="renderers_descr">Επιλέξτε εμφάνιση απεικόνισης.</string>
+    <string name="poi_context_menu_website">Εμφάνιση ιστοσελίδας ΣΕ</string>
+    <string name="poi_context_menu_call">Εμφάνιση τηλεφώνου ΣΕ</string>
+    <string name="website">Ιστότοπος</string>
+    <string name="phone">Τηλέφωνο</string>
+    <string name="download_type_to_filter">πληκτρ/στε. για φιλτράρισμα</string>
+    <string name="use_high_res_maps">Οθόνη υψηλής ανάλυσης</string>
+    <string name="use_high_res_maps_descr">Χωρίς επέκταση (και θόλωμα) των πλακιδίων χάρτη σε οθόνες υψηλής πυκνότητας.</string>
+    <string name="context_menu_item_search_transport">Αναζήτηση ΜΜΜ</string>
+    <string name="transport_searching_transport">Αποτελέσματα μέσων μεταφοράς (χωρίς προορισμό):</string>
+    <string name="transport_searching_route">Αποτελέσματα μέσων μεταφοράς ({0} μέχρι τον προορισμό):</string>
+    <string name="transport_search_again">Καθαρισμός αναζήτησης ΜΜΜ</string>
+    <string name="voice">Ηχογραφημένη φωνή</string>
+    <string name="no_vector_map_loaded">Οι διανυσματικοί χάρτες δεν φορτώθηκαν</string>
+    <string name="gpx_files_not_found">Δεν βρέθηκαν αρχεία GPX στον κατάλογο ιχνών</string>
+    <string name="layer_gpx_layer">Αρχεία GPX…</string>
+    <string name="error_reading_gpx">Αδυναμία ανάγνωσης δεδομένων GPX</string>
+    <string name="vector_data">Διανυσματικοί χάρτες χωρίς σύνδεση</string>
+    <string name="transport_context_menu">Αναζήτηση μέσου μεταφοράς στη στάση</string>
+    <string name="poi_context_menu_modify">Τροποποίηση ΣΕ</string>
+    <string name="poi_context_menu_delete">Διαγραφή ΣΕ</string>
+    <string name="rotate_map_compass_opt">Κατεύθυνση πυξίδας</string>
+    <string name="rotate_map_bearing_opt">Κατεύθυνση κίνησης</string>
+    <string name="rotate_map_none_opt">Χωρίς περιστροφή (ο βορράς πάντα προς τα πάνω)</string>
+    <string name="rotate_map_to_bearing_descr">Επιλέξτε τη στοίχιση οθόνης χάρτη.</string>
+    <string name="rotate_map_to_bearing">Προσανατολισμός χάρτη</string>
+    <string name="show_route">Λεπτομέρειες διαδρομής</string>
+    <string name="fav_imported_sucessfully">Τα αγαπημένα εισήχθησαν</string>
+    <string name="fav_file_to_load_not_found">Δεν βρέθηκε αρχείο GPX που να περιέχει αγαπημένα στο {0}</string>
+    <string name="fav_saved_sucessfully">Τα αγαπημένα αποθηκεύτηκαν στο {0}</string>
+    <string name="no_fav_to_save">Δεν υπάρχουν αγαπημένα σημεία προς αποθήκευση</string>
+    <string name="error_occurred_loading_gpx">Αδυναμία φόρτωσης του GPX</string>
+    <string name="send_report">Αποστολή αναφοράς</string>
+    <string name="none_region_found">Αδυναμία εύρεσης κατεβασμένων χαρτών στην κάρτα μνήμης.</string>
+    <string name="poi_namefinder_query_empty">Πληκτρολογήστε για να βρείτε ΣΕ</string>
+    <string name="any_poi">Οποιοδήποτε</string>
+    <string name="thanks_yandex_traffic">Ευχαριστούμε τη Yandex για τις πληροφορίες κυκλοφορίας.</string>
+    <string name="layer_yandex_traffic">Κυκλοφορία Yandex</string>
+    <string name="layer_route">Διαδρομή</string>
+    <string name="layer_osm_bugs">Σημειώσεις OSM (σε σύνδεση)</string>
+    <string name="layer_poi">Επίστρωμα ΣΕ…</string>
+    <string name="layer_map">Πηγή χάρτη…</string>
+    <string name="menu_layers">Επίπεδα χάρτη</string>
+    <string name="context_menu_item_search_poi">Αναζήτηση ΣΕ</string>
+    <string name="use_trackball_descr">Χρήση ιχνόσφαιρας για μετακίνηση του χάρτη.</string>
+    <string name="use_trackball">Χρήση του trackball</string>
+    <string name="background_service_wait_int_descr">Ορίστε τον μέγιστο επιτρεπόμενο χρόνο αναμονής για κάθε διόρθωση θέσης παρασκηνίου.</string>
+    <string name="background_service_wait_int">Μέγιστη αναμονή για εύρεση</string>
+    <string name="where_am_i">Πού είμαι;</string>
+    <string name="process_navigation_service">Υπηρεσία πλοήγησης OsmAnd</string>
+    <string name="network_provider">Δίκτυο</string>
+    <string name="gps_provider">GPS</string>
+    <string name="int_seconds">δευτερόλεπτα</string>
+    <string name="int_min">λεπτ.</string>
+    <string name="background_service_int_descr">Ορισμός διαστήματος αφύπνισης χρησιμοποιούμενο από την υπηρεσία παρασκηνίου.</string>
+    <string name="background_service_int">Διάστημα αφύπνισης GPS</string>
+    <string name="background_service_provider_descr">Επιλέξτε μέθοδο τοποθεσίας που χρησιμοποιείται από την υπηρεσία παρασκηνίου.</string>
+    <string name="background_service_provider">Πάροχος τοποθεσίας</string>
+    <string name="background_router_service_descr">Εντοπίζει τη θέση σας, ενώ η οθόνη είναι σβηστή.</string>
+    <string name="background_router_service">Εκτέλεση OsmAnd στο παρασκήνιο</string>
+    <string name="off_router_service_no_gps_available">Η υπηρεσία πλοήγησης παρασκηνίου απαιτεί έναν πάροχο τοποθεσίας που να είναι ενεργοποιημένος.</string>
+    <string name="hide_poi_filter">Απόκρυψη φίλτρου</string>
+    <string name="show_poi_filter">Εμφάνιση φίλτρου</string>
+    <string name="search_poi_filter">Φιλτράρισμα</string>
+    <string name="menu_mute_off">Ήχος ανοικτός</string>
+    <string name="menu_mute_on">Ήχος κλειστός</string>
+    <string name="voice_provider_descr">Επιλέξτε τη φωνητική καθοδήγηση για πλοήγηση.</string>
+    <string name="voice_provider">Φωνητική καθοδήγηση</string>
+    <string name="voice_data_initializing">Αρχικοποίηση δεδομένων φωνής…</string>
+    <string name="voice_data_not_supported">Μη υποστηριζόμενη έκδοση των δεδομένων φωνής</string>
+    <string name="voice_data_corrupted">Τα καθορισμένα δεδομένα φωνής είναι κατεστραμμένα</string>
+    <string name="voice_data_unavailable">Τα επιλεγμένα δεδομένα φωνής δεν είναι διαθέσιμα</string>
+    <string name="sd_unmounted">Η κάρτα μνήμης δεν είναι προσβάσιμη.
 \nΔεν μπορείτε να δείτε χάρτες ή να αναζητήσετε διάφορα.</string>
-	<string name="sd_mounted_ro">Η κάρτα μνήμης είναι μόνο για ανάγνωση. 
+    <string name="sd_mounted_ro">Η κάρτα μνήμης είναι μόνο για ανάγνωση. 
 \nΜπορείτε μόνο να δείτε τον προφορτωμένο χάρτη, αλλά όχι να κατεβάσετε νέες περιοχές.</string>
-	<string name="unzipping_file">Αποσυμπίεση αρχείου…</string>
-	<string name="route_tr">Στρίψτε δεξιά και προχωρήστε</string>
-	<string name="route_tshr">Στρίψτε κλειστά δεξιά και προχωρήστε</string>
-	<string name="route_tslr">Στρίψτε ελαφρώς δεξιά και προχωρήστε</string>
-	<string name="route_tl">Στρίψτε αριστερά και προχωρήστε</string>
-	<string name="route_tshl">Στρίψτε κλειστά αριστερά και προχωρήστε</string>
-	<string name="route_tsll">Στρίψτε ελαφρώς αριστερά και προχωρήστε</string>
-	<string name="route_tu">Κάντε αναστροφή και προχωρήστε</string>
-	<string name="route_head">Προχωρήστε</string>
-	<string name="first_time_continue">Αργότερα</string>
-	<string name="first_time_download">Λήψη περιοχών</string>
-	<string name="search_poi_location">Αναμονή σήματος…</string>
-	<string name="search_near_map">Αναζήτηση κοντά στο τρέχον κέντρο του χάρτη</string>
-	<string name="search_nearby">Αναζήτηση στη γύρω περιοχή</string>
-	<string name="map_orientation_default">Το ίδιο με τη συσκευή</string>
-	<string name="map_orientation_portrait">Πορτραίτο</string>
-	<string name="map_orientation_landscape">Τοπίο</string>
-	<string name="map_screen_orientation">Προσανατολισμός οθόνης</string>
-	<string name="map_screen_orientation_descr">Πορτρέτο, τοπίο, ή συσκευή.</string>
-	<string name="opening_hours_not_supported">Η μορφή των ωρών λειτουργίας δεν μπορεί να αλλαχθεί</string>
-	<string name="add_new_rule">Προσθήκη νέου κανόνα</string>
-	<string name="transport_Routes">Δρομολόγια</string>
-	<string name="transport_Stop">Στάση</string>
-	<string name="transport_stops">στάσεις</string>
-	<string name="transport_search_after">Μεταγενέστερο δρομολόγιο</string>	
-	<string name="transport_search_before">Προηγούμενο δρομολόγιο</string>
-	<string name="transport_finish_search">Τέλος αναζήτησης</string>
-	<string name="transport_stop_to_go_out">Επιλέξτε στάση αποβίβασης</string>
-	<string name="transport_to_go_after">προηγούμενη απόσταση</string>
-	<string name="transport_to_go_before">επακόλουθη απόσταση</string>
-	<string name="transport_stops_to_pass">στάσεις προς προσπέραση</string>
-	<string name="transport_route_distance">Απόσταση δρομολογίου</string>
-	<string name="transport">Μεταφορές</string>
-	<string name="shared_string_ok">Εντάξει</string>
-	<string name="show_transport_over_map_description">Εμφάνιση στάσεων δημόσιων συγκοινωνιών στον χάρτη.</string>
-	<string name="show_transport_over_map">Εμφάνιση στάσεων ΜΜΜ</string>
-	<string name="hello">Εφαρμογή πλοήγησης OsmAnd</string>
-	<string name="update_poi_success">Τα δεδομένα ΣΕ ενημερώθηκαν ({0} είχαν φορτωθεί)</string>
-	<string name="update_poi_error_local">Αδυναμία ενημέρωσης τοπικής λίστας ΣΕ</string>
-	<string name="update_poi_error_loading">Αδυναμία φόρτωσης δεδομένων από τον διακομιστή</string>
-	<string name="update_poi_no_offline_poi_index">Δεν υπάρχουν διαθέσιμα δεδομένα ΣΕ για αυτή την περιοχή</string>
-	<string name="update_poi_is_not_available_for_zoom">Με εστίαση μπορείτε να ενημερώσετε τα ΣΕ</string>
-	<string name="context_menu_item_update_poi">Ενημέρωση ΣΕ</string>
-	<string name="context_menu_item_update_map_confirm">Ενημέρωση τοπικών δεδομένων μέσω διαδικτύου;</string>
-	<string name="search_history_city">Πόλη: {0}</string>
-	<string name="search_history_street">Οδός: {0}, {1}</string>
-	<string name="search_history_int_streets">Διασταύρωση: {0} x {1} στη(ο) {2}</string>
-	<string name="search_history_building">Κτήριο: {0}, {1}, {2}</string>
-	<string name="favorite">Αγαπημένο</string>
-	<string name="uploading_data">Αποστολή δεδομένων…</string>
-	<string name="uploading">Αποστολή…</string>
-	<string name="search_nothing_found">Δε βρέθηκε τίποτα</string>
-	<string name="searching">Αναζήτηση…</string>
-	<string name="searching_address">Αναζήτηση διεύθυνσης…</string>
-	<string name="search_osm_nominatim">Αναζήτηση διεύθυνσης χρησιμοποιώντας το OSM Nominatim</string>
-	<string name="hint_search_online">Αναζήτηση με σύνδεση: Αριθμός σπιτιού, οδός, πόλη</string>
-	<string name="search_offline_address">Χωρίς σύνδεση</string>
-	<string name="search_online_address">Διαδίκτυο</string>
-	<string name="max_level_download_tile">Μέγιστη εστίαση με σύνδεση</string>
-	<string name="max_level_download_tile_descr">Μην περιηγείστε πλακίδια χάρτη με σύνδεση για επίπεδα εστίασης κάτω από αυτό.</string>
-	<string name="route_general_information">Συνολική απόσταση %1$s, χρόνος ταξιδιού %2$d ω %3$d λ.</string>
-	<string name="router_service_descr">Επιλέξτε μια υπηρεσία πλοήγησης με ή χωρίς σύνδεση.</string>
-	<string name="router_service">Υπηρεσία πλοήγησης</string>
-	<string name="sd_dir_not_accessible">Ο κατάλογος αποθήκευσης δεδομένων στην κάρτα μνήμης δεν είναι προσβάσιμος!</string>
-	<string name="download_question">Λήψη {0} - {1} ;</string>
-	<string name="download_question_exist">Δεδομένα χωρίς σύνδεση για {0} υπάρχουν ήδη ({1}). Να ενημερωθούν ({2}) ?</string>
-	<string name="address">Διεύθυνση</string>
-	<string name="downloading_list_indexes">Λήψη λίστας διαθέσιμων περιοχών…</string>
-	<string name="list_index_files_was_not_loaded">Αδυναμία προσκόμισης καταλόγου περιοχών από το https://osmand.net.</string>
-	
-	<string name="fav_points_edited">Το αγαπημένο σημείο έχει επεξεργαστεί</string>
-	<string name="fav_points_not_exist">Δεν υπάρχουν αγαπημένα σημεία</string>
-	<string name="update_existing">Αντικατάσταση</string>
-	<string name="only_show">Εμφάνιση διαδρομής</string>
-	<string name="follow">Έναρξη πορείας</string>
-	<string name="mark_final_location_first">Παρακαλώ επιλέξτε πρώτα προορισμό</string>
-	<string name="get_directions">Οδηγίες</string>
-	
-	<string name="opening_hours">Ώρες λειτουργίας</string>
-	<string name="opening_changeset">Άνοιγμα ομάδας αλλαγών…</string>
-	<string name="closing_changeset">Κλείσιμο ομάδας αλλαγών…</string>
-	<string name="commiting_node">Δέσμευση κόμβου…</string>
-	<string name="loading_poi_obj">Φόρτωση ΣΕ…</string>
-	<string name="auth_failed">Αποτυχία εξουσιοδότησης</string>
-	<string name="failed_op">απέτυχε</string>
-	<string name="converting_names">Μετατροπή τοπικών/αγγλικών ονομάτων…</string>
-	<string name="loading_streets_buildings">Φόρτωση δρόμων/κτηρίων…</string>
-	<string name="loading_postcodes">Φόρτωση ταχυδρομικών κωδικών…</string>
-	<string name="loading_streets">Φόρτωση δρόμων…</string>
-	<string name="loading_cities">Φόρτωση πόλεων…</string>
-	
-	<string name="poi">Σημ Ενδ</string>
-	<string name="error_occurred_saving_gpx">Αδυναμία αποθήκευσης αρχείου GPX</string>
-	<string name="error_calculating_route">Αδυναμία υπολογισμού διαδρομής</string>
-	<string name="error_calculating_route_occured">Αδυναμία υπολογισμού διαδρομής</string>
-	<string name="empty_route_calculated">Η υπολογισμένη διαδρομή είναι κενή</string>					
-	<string name="new_route_calculated_dist">Υπολογίστηκε νέα διαδρομή, απόσταση</string>
-	<string name="arrived_at_destination">Φτάσατε στον προορισμό σας</string>
-	<string name="invalid_locations">Άκυρες συντεταγμένες</string>
-	<string name="go_back_to_osmand">Επιστροφή στον χάρτη OsmAnd</string>
-	<string name="loading_data">Φόρτωση δεδομένων…</string>
-	<string name="reading_indexes">Ανάγνωση τοπικών δεδομένων…</string>
-	<string name="previous_run_crashed">Η τελευταία εκτέλεση του OsmAnd κατέρρευσε. Το αρχείο καταγραφής είναι στο {0}. Παρακαλώ αναφέρετε το συμβάν και επισυνάψτε το αρχείο καταγραφής.</string>
-	<string name="saving_gpx_tracks">Αποθήκευση αρχείου GPX…</string>
-	<string name="finished_task">Ολοκληρώθηκε</string>
-	
-	
-	
-	
-	<string name="use_online_routing_descr">Χρήση διαδικτύου για υπολογισμό διαδρομής.</string>
-	<string name="use_online_routing">Χρήση πλοήγησης με σύνδεση</string>
-	<string name="osm_settings_descr">Καθορίστε τις ρυθμίσεις OpenStreetMap.org (OSM) που απαιτούνται για τις υποβολές OSM.</string>
-	<string name="data_settings_descr">Καθορισμός γλώσσας, λήψη/επαναφόρτωση δεδομένων.</string>
-	<string name="data_settings">Δεδομένα</string>
-	
-	<string name="osm_settings">Επεξεργασία OSM</string>
-	<string name="additional_settings">Πρόσθετες ρυθμίσεις</string>
-	<string name="save_current_track_descr">Αποθήκευση τρέχοντος ίχνους ως αρχείου GPX τώρα.</string>
-	<string name="save_current_track">Αποθήκευση τρέχοντος ίχνους</string>
-	<string name="save_track_interval">Διάστημα καταγραφής κατά την πλοήγηση</string>
-	<string name="save_track_interval_descr">Επιλέξτε διάστημα καταγραφής για την εγγραφή ιχνών κατά την πλοήγηση.</string>
-	<string name="save_track_to_gpx_descrp">Το ίχνος GPX αποθηκεύεται αυτόματα στον κατάλογο ιχνών κατά την πλοήγηση.</string>
-	<string name="save_track_to_gpx">Αυτόματη εγγραφή ίχνους κατά την πλοήγηση</string>
-	<string name="update_tile">Ενημέρωση χάρτη</string>
-	<string name="reload_tile">Ανανέωση πλακιδίου</string>
-	<string name="mark_point">Στόχος</string>
-	
-	
-	<string name="use_english_names_descr">Επιλέξτε μεταξύ τοπικών και αγγλικών ονομάτων.</string>
-	<string name="use_english_names">Χρήση αγγλικών ονομάτων στους χάρτες</string>
-	<string name="app_settings">Ρυθμίσεις εφαρμογής</string>
-	<string name="search_address">Αναζήτηση διεύθυνσης</string>
-	<string name="choose_building">Επιλέξτε κτήριο</string>
-	<string name="choose_street">Επιλέξτε οδό</string>
-	<string name="choose_city">Επιλέξτε πόλη ή ταχυδρομικό κώδικα</string>
-	<string name="ChooseCountry">Επιλέξτε χώρα</string>
-	<string name="show_view_angle">Εμφάνιση κατεύθυνσης οπτικής</string>
-	<string name="map_view_3d_descr">Ενεργοποίηση προβολής 3Δ του χάρτη.</string>
-	<string name="map_view_3d">Εμφάνιση χάρτη 3Δ</string>
-	<string name="show_poi_over_map_description">Εμφάνιση του τελευταίου επιλεγμένου επιστρώματος ΣΕ στον χάρτη.</string>
-	<string name="show_poi_over_map">Εμφάνιση επιστρώματος ΣΕ</string>
-	<string name="map_tile_source_descr">Επιλέξτε την πηγή των αποθηκευμένων πλακιδίων χάρτη ή με σύνδεση.</string>
-	<string name="map_tile_source">Πηγή πλακιδίων χάρτη</string>
-	<string name="map_source">Πηγή χάρτη</string>
-	<string name="use_internet">Χρήση διαδικτύου</string>
-	<string name="show_location">Εμφάνιση τοποθεσίας σου</string>
-	
-	
-	<string name="show_gps_coordinates_text">Εμφάνιση συντεταγμένων GPS στον χάρτη</string>
-	<string name="use_internet_to_download_tile">Κατέβασμα απόντων πλακιδίων χάρτη</string>
-	<string name="app_description">Εφαρμογή πλοήγησης</string>
-	<string name="search_button">Αναζήτηση</string>
-	<string name="search_activity">Αναζήτηση</string>
-	<string name="searchpoi_activity">Επιλέξτε ΣΕ</string>
-	<string name="search_POI_level_btn">Βρες περισσότερα</string>
-	<string name="incremental_search_city">Αναζήτηση πόλης αυξητικά</string>
-	<string name="incremental_search_street">Αναζήτηση οδού αυξητικά</string>
-	<string name="incremental_search_building">Αναζήτηση κτηρίου αυξητικά</string>
-	<string name="choose_available_region">Επιλογή περιοχής από λίστα</string>
-	<string name="choose_intersected_street">Επιλογή διασταυρούμενης οδού</string>
-	<string name="Closest_Amenities">Πλησιέστερες παροχές</string>
-	<string name="app_mode_default">Επισκόπηση χάρτη</string>
-	<string name="app_mode_car">Οδήγηση</string>
-	<string name="app_mode_bicycle">Ποδηλασία</string>
-	<string name="app_mode_pedestrian">Πεζοπορία</string>
-	<string name="position_on_map_center">Κέντρο</string>
-	<string name="position_on_map_bottom">Κάτω μέρος</string>
-	<string name="navigate_point_top_text">Εισαγωγή γ. πλάτους &amp; γ. μήκους στην επιλεγμένη μορφή (D - μοίρες, M - λεπτά, S - δεύτερα)</string>
-	<string name="navigate_point_latitude">Γεωγραφικό πλάτος</string>
-	<string name="navigate_point_longitude">Γεωγραφικό μήκος</string>
-	<string name="navigate_point_format_D">DDD.DD</string>
-	<string name="navigate_point_format_DM">DDD MM.MM</string>
-	<string name="navigate_point_format_DMS">DDD MM SS.SS</string>
-	<string name="search_address_top_text">Επιλογή διεύθυνσης</string>
-	<string name="search_address_region">Περιοχή</string>
-	<string name="search_address_city">Πόλη</string>
-	<string name="search_address_street">Οδός</string>
-	<string name="search_address_building">Κτήριο</string>
-	<string name="search_address_building_option">Κτήριο</string>
-	<string name="search_address_street_option">Διασταυρούμενη οδός</string>
-	
-	
-	<string name="context_menu_item_update_map">Ενημέρωση χάρτη</string>
-	
-	<string name="context_menu_item_create_poi">Δημιουργία ΣΕ</string>
-	<string name="shared_string_yes">Ναι</string>
-	<string name="shared_string_cancel">Ακύρωση</string>
-	<string name="shared_string_apply">Εφαρμογή</string>
-	<string name="shared_string_no">Όχι</string>
-	<string name="add_favorite_dialog_top_text">Εισαγωγή ονόματος αγαπημένου</string>
-	<string name="add_favorite_dialog_default_favourite_name">Αγαπημένο</string>
-	<string name="add_favorite_dialog_favourite_added_template">Το αγαπημένο σημείο \'\'{0}\'\' προστέθηκε.</string>
-	<string name="favourites_context_menu_edit">Επεξεργασία αγαπημένου</string>
-	<string name="favourites_context_menu_delete">Διαγραφή αγαπημένου</string>
-	<string name="favourites_remove_dialog_msg">Αφαίρεση αγαπημένου σημείου \'%s\';</string>
-	<string name="favourites_remove_dialog_success">Το αγαπημένο σημείο {0} διαγράφηκε.</string>
-	
-	
-	
-	
-	<string name="osb_comment_dialog_message">Μήνυμα</string>
-	<string name="osb_comment_dialog_author">Όνομα συγγραφέα</string>
-	
-	
-	<string name="osb_comment_dialog_success">Το σχόλιο προστέθηκε</string>
-	<string name="osb_comment_dialog_error">Αδυναμία προσθήκης σχολίου</string>
-	
-	
-	
-	
-	
-	<string name="poi_edit_title">Επεξεργασία ΣΕ</string>
-	<string name="poi_create_title">Δημιουργία ΣΕ</string>
-	<string name="poi_error_poi_not_found">Ο κόμβος δεν μπορεί να βρεθεί ή η υποδομή αποτελείται από πολλούς κόμβους, που δεν υποστηρίζεται ακόμα.</string>
-	<string name="poi_remove_confirm_template">Διαγραφή {0} (σχολίου);</string>
-	<string name="poi_remove_title">Διαγραφή ΣΕ</string>
-	<string name="poi_remove_success">Το ΣΕ διαγράφτηκε</string>
-	<string name="poi_action_add">προσθήκη</string>
-	<string name="poi_action_change">αλλαγή</string>
-	<string name="poi_action_succeded_template">Η ενέργεια {0} ολοκληρώθηκε.</string>
-	<string name="poi_error_unexpected_template">Αδυναμία εκτέλεσης της ενέργειας {0}.</string>
-	<string name="poi_error_io_error_template">Σφάλμα εισόδου/εξόδου κατά την εκτέλεση της δράσης {0}.</string>
-	<string name="poi_error_info_not_loaded">Δεν φορτώθηκαν πληροφορίες σχετικά με τον κόμβο</string>
-	<string name="poi_dialog_opening_hours">Άνοιγμα</string>
-	<string name="poi_dialog_comment">Σχόλιο</string>
-	<string name="poi_dialog_comment_default">Αλλαγή ΣΕ</string>
-	<string name="poi_dialog_other_tags_message">Όλες οι άλλες ετικέτες διατηρούνται</string>
-	<string name="default_buttons_commit">Commit</string>
-	<string name="filter_current_poiButton">Φιλτράρισμα</string>
-	
-	<string name="edit_filter_save_as_menu_item">Αποθήκευση Ως</string>
-	<string name="edit_filter_delete_dialog_title">Διαγραφή του επιλεγμένου φίλτρου?</string>
-	<string name="edit_filter_delete_message">Το φίλτρο {0} έχει διαγραφεί</string>
-	<string name="edit_filter_create_message">Το φίλτρο {0} έχει δημιουργηθεί</string>
-	
-	<string name="email">ηλ. διεύθυνση</string>
-<string name="intermediate_point_too_far">Ο ενδιάμεσος προορισμός %1$s είναι πολύ μακριά από το κοντινότερο δρόμο.</string>
-<string name="arrived_at_intermediate_point">Φτάσατε στον ενδιάμεσο προορισμό σας</string>
-<string name="context_menu_item_intermediate_point">Προσθήκη ως ενδιάμεσου προορισμού</string>
-<string name="map_widget_intermediate_distance">Ενδιάμεσος προορισμός</string>
-<string name="ending_point_too_far">Το τελικό σημείο είναι πολύ μακριά από πλησιέστερο δρόμο.</string>
-
+    <string name="unzipping_file">Αποσυμπίεση αρχείου…</string>
+    <string name="route_tr">Στρίψτε δεξιά και προχωρήστε</string>
+    <string name="route_tshr">Στρίψτε κλειστά δεξιά και προχωρήστε</string>
+    <string name="route_tslr">Στρίψτε ελαφρώς δεξιά και προχωρήστε</string>
+    <string name="route_tl">Στρίψτε αριστερά και προχωρήστε</string>
+    <string name="route_tshl">Στρίψτε κλειστά αριστερά και προχωρήστε</string>
+    <string name="route_tsll">Στρίψτε ελαφρώς αριστερά και προχωρήστε</string>
+    <string name="route_tu">Κάντε αναστροφή και προχωρήστε</string>
+    <string name="route_head">Προχωρήστε</string>
+    <string name="first_time_continue">Αργότερα</string>
+    <string name="first_time_download">Λήψη περιοχών</string>
+    <string name="search_poi_location">Αναμονή σήματος…</string>
+    <string name="search_near_map">Αναζήτηση κοντά στο τρέχον κέντρο του χάρτη</string>
+    <string name="search_nearby">Αναζήτηση στη γύρω περιοχή</string>
+    <string name="map_orientation_default">Το ίδιο με τη συσκευή</string>
+    <string name="map_orientation_portrait">Πορτραίτο</string>
+    <string name="map_orientation_landscape">Τοπίο</string>
+    <string name="map_screen_orientation">Προσανατολισμός οθόνης</string>
+    <string name="map_screen_orientation_descr">Πορτρέτο, τοπίο, ή συσκευή.</string>
+    <string name="opening_hours_not_supported">Η μορφή των ωρών λειτουργίας δεν μπορεί να αλλαχθεί</string>
+    <string name="add_new_rule">Προσθήκη νέου κανόνα</string>
+    <string name="transport_Routes">Δρομολόγια</string>
+    <string name="transport_Stop">Στάση</string>
+    <string name="transport_stops">στάσεις</string>
+    <string name="transport_search_after">Μεταγενέστερο δρομολόγιο</string>
+    <string name="transport_search_before">Προηγούμενο δρομολόγιο</string>
+    <string name="transport_finish_search">Τέλος αναζήτησης</string>
+    <string name="transport_stop_to_go_out">Επιλέξτε στάση αποβίβασης</string>
+    <string name="transport_to_go_after">προηγούμενη απόσταση</string>
+    <string name="transport_to_go_before">επακόλουθη απόσταση</string>
+    <string name="transport_stops_to_pass">στάσεις προς προσπέραση</string>
+    <string name="transport_route_distance">Απόσταση δρομολογίου</string>
+    <string name="transport">Μεταφορές</string>
+    <string name="shared_string_ok">Εντάξει</string>
+    <string name="show_transport_over_map_description">Εμφάνιση στάσεων δημόσιων συγκοινωνιών στον χάρτη.</string>
+    <string name="show_transport_over_map">Εμφάνιση στάσεων ΜΜΜ</string>
+    <string name="hello">Εφαρμογή πλοήγησης OsmAnd</string>
+    <string name="update_poi_success">Τα δεδομένα ΣΕ ενημερώθηκαν ({0} είχαν φορτωθεί)</string>
+    <string name="update_poi_error_local">Αδυναμία ενημέρωσης τοπικής λίστας ΣΕ</string>
+    <string name="update_poi_error_loading">Αδυναμία φόρτωσης δεδομένων από τον διακομιστή</string>
+    <string name="update_poi_no_offline_poi_index">Δεν υπάρχουν διαθέσιμα δεδομένα ΣΕ για αυτή την περιοχή</string>
+    <string name="update_poi_is_not_available_for_zoom">Με εστίαση μπορείτε να ενημερώσετε τα ΣΕ</string>
+    <string name="context_menu_item_update_poi">Ενημέρωση ΣΕ</string>
+    <string name="context_menu_item_update_map_confirm">Ενημέρωση τοπικών δεδομένων μέσω διαδικτύου;</string>
+    <string name="search_history_city">Πόλη: {0}</string>
+    <string name="search_history_street">Οδός: {0}, {1}</string>
+    <string name="search_history_int_streets">Διασταύρωση: {0} x {1} στη(ο) {2}</string>
+    <string name="search_history_building">Κτήριο: {0}, {1}, {2}</string>
+    <string name="favorite">Αγαπημένο</string>
+    <string name="uploading_data">Αποστολή δεδομένων…</string>
+    <string name="uploading">Αποστολή…</string>
+    <string name="search_nothing_found">Δε βρέθηκε τίποτα</string>
+    <string name="searching">Αναζήτηση…</string>
+    <string name="searching_address">Αναζήτηση διεύθυνσης…</string>
+    <string name="search_osm_nominatim">Αναζήτηση διεύθυνσης χρησιμοποιώντας το OSM Nominatim</string>
+    <string name="hint_search_online">Αναζήτηση με σύνδεση: Αριθμός σπιτιού, οδός, πόλη</string>
+    <string name="search_offline_address">Χωρίς σύνδεση</string>
+    <string name="search_online_address">Διαδίκτυο</string>
+    <string name="max_level_download_tile">Μέγιστη εστίαση με σύνδεση</string>
+    <string name="max_level_download_tile_descr">Μην περιηγείστε πλακίδια χάρτη με σύνδεση για επίπεδα εστίασης κάτω από αυτό.</string>
+    <string name="route_general_information">Συνολική απόσταση %1$s, χρόνος ταξιδιού %2$d ω %3$d λ.</string>
+    <string name="router_service_descr">Επιλέξτε μια υπηρεσία πλοήγησης με ή χωρίς σύνδεση.</string>
+    <string name="router_service">Υπηρεσία πλοήγησης</string>
+    <string name="sd_dir_not_accessible">Ο κατάλογος αποθήκευσης δεδομένων στην κάρτα μνήμης δεν είναι προσβάσιμος!</string>
+    <string name="download_question">Λήψη {0} - {1} ;</string>
+    <string name="download_question_exist">Δεδομένα χωρίς σύνδεση για {0} υπάρχουν ήδη ({1}). Να ενημερωθούν ({2}) ?</string>
+    <string name="address">Διεύθυνση</string>
+    <string name="downloading_list_indexes">Λήψη λίστας διαθέσιμων περιοχών…</string>
+    <string name="list_index_files_was_not_loaded">Αδυναμία προσκόμισης καταλόγου περιοχών από το https://osmand.net.</string>
+    <string name="fav_points_edited">Το αγαπημένο σημείο έχει επεξεργαστεί</string>
+    <string name="fav_points_not_exist">Δεν υπάρχουν αγαπημένα σημεία</string>
+    <string name="update_existing">Αντικατάσταση</string>
+    <string name="only_show">Εμφάνιση διαδρομής</string>
+    <string name="follow">Έναρξη πορείας</string>
+    <string name="mark_final_location_first">Παρακαλώ επιλέξτε πρώτα προορισμό</string>
+    <string name="get_directions">Οδηγίες</string>
+    <string name="opening_hours">Ώρες λειτουργίας</string>
+    <string name="opening_changeset">Άνοιγμα ομάδας αλλαγών…</string>
+    <string name="closing_changeset">Κλείσιμο ομάδας αλλαγών…</string>
+    <string name="commiting_node">Δέσμευση κόμβου…</string>
+    <string name="loading_poi_obj">Φόρτωση ΣΕ…</string>
+    <string name="auth_failed">Αποτυχία εξουσιοδότησης</string>
+    <string name="failed_op">απέτυχε</string>
+    <string name="converting_names">Μετατροπή τοπικών/αγγλικών ονομάτων…</string>
+    <string name="loading_streets_buildings">Φόρτωση δρόμων/κτηρίων…</string>
+    <string name="loading_postcodes">Φόρτωση ταχυδρομικών κωδικών…</string>
+    <string name="loading_streets">Φόρτωση δρόμων…</string>
+    <string name="loading_cities">Φόρτωση πόλεων…</string>
+    <string name="poi">Σημ Ενδ</string>
+    <string name="error_occurred_saving_gpx">Αδυναμία αποθήκευσης αρχείου GPX</string>
+    <string name="error_calculating_route">Αδυναμία υπολογισμού διαδρομής</string>
+    <string name="error_calculating_route_occured">Αδυναμία υπολογισμού διαδρομής</string>
+    <string name="empty_route_calculated">Η υπολογισμένη διαδρομή είναι κενή</string>
+    <string name="new_route_calculated_dist">Υπολογίστηκε νέα διαδρομή, απόσταση</string>
+    <string name="arrived_at_destination">Φτάσατε στον προορισμό σας</string>
+    <string name="invalid_locations">Άκυρες συντεταγμένες</string>
+    <string name="go_back_to_osmand">Επιστροφή στον χάρτη OsmAnd</string>
+    <string name="loading_data">Φόρτωση δεδομένων…</string>
+    <string name="reading_indexes">Ανάγνωση τοπικών δεδομένων…</string>
+    <string name="previous_run_crashed">Η τελευταία εκτέλεση του OsmAnd κατέρρευσε. Το αρχείο καταγραφής είναι στο {0}. Παρακαλώ αναφέρετε το συμβάν και επισυνάψτε το αρχείο καταγραφής.</string>
+    <string name="saving_gpx_tracks">Αποθήκευση αρχείου GPX…</string>
+    <string name="finished_task">Ολοκληρώθηκε</string>
+    <string name="use_online_routing_descr">Χρήση διαδικτύου για υπολογισμό διαδρομής.</string>
+    <string name="use_online_routing">Χρήση πλοήγησης με σύνδεση</string>
+    <string name="osm_settings_descr">Καθορίστε τις ρυθμίσεις OpenStreetMap.org (OSM) που απαιτούνται για τις υποβολές OSM.</string>
+    <string name="data_settings_descr">Καθορισμός γλώσσας, λήψη/επαναφόρτωση δεδομένων.</string>
+    <string name="data_settings">Δεδομένα</string>
+    <string name="osm_settings">Επεξεργασία OSM</string>
+    <string name="additional_settings">Πρόσθετες ρυθμίσεις</string>
+    <string name="save_current_track_descr">Αποθήκευση τρέχοντος ίχνους ως αρχείου GPX τώρα.</string>
+    <string name="save_current_track">Αποθήκευση τρέχοντος ίχνους</string>
+    <string name="save_track_interval">Διάστημα καταγραφής κατά την πλοήγηση</string>
+    <string name="save_track_interval_descr">Επιλέξτε διάστημα καταγραφής για την εγγραφή ιχνών κατά την πλοήγηση.</string>
+    <string name="save_track_to_gpx_descrp">Το ίχνος GPX αποθηκεύεται αυτόματα στον κατάλογο ιχνών κατά την πλοήγηση.</string>
+    <string name="save_track_to_gpx">Αυτόματη εγγραφή ίχνους κατά την πλοήγηση</string>
+    <string name="update_tile">Ενημέρωση χάρτη</string>
+    <string name="reload_tile">Ανανέωση πλακιδίου</string>
+    <string name="mark_point">Στόχος</string>
+    <string name="use_english_names_descr">Επιλέξτε μεταξύ τοπικών και αγγλικών ονομάτων.</string>
+    <string name="use_english_names">Χρήση αγγλικών ονομάτων στους χάρτες</string>
+    <string name="app_settings">Ρυθμίσεις εφαρμογής</string>
+    <string name="search_address">Αναζήτηση διεύθυνσης</string>
+    <string name="choose_building">Επιλέξτε κτήριο</string>
+    <string name="choose_street">Επιλέξτε οδό</string>
+    <string name="choose_city">Επιλέξτε πόλη ή ταχυδρομικό κώδικα</string>
+    <string name="ChooseCountry">Επιλέξτε χώρα</string>
+    <string name="show_view_angle">Εμφάνιση κατεύθυνσης οπτικής</string>
+    <string name="map_view_3d_descr">Ενεργοποίηση προβολής 3Δ του χάρτη.</string>
+    <string name="map_view_3d">Εμφάνιση χάρτη 3Δ</string>
+    <string name="show_poi_over_map_description">Εμφάνιση του τελευταίου επιλεγμένου επιστρώματος ΣΕ στον χάρτη.</string>
+    <string name="show_poi_over_map">Εμφάνιση επιστρώματος ΣΕ</string>
+    <string name="map_tile_source_descr">Επιλέξτε την πηγή των αποθηκευμένων πλακιδίων χάρτη ή με σύνδεση.</string>
+    <string name="map_tile_source">Πηγή πλακιδίων χάρτη</string>
+    <string name="map_source">Πηγή χάρτη</string>
+    <string name="use_internet">Χρήση διαδικτύου</string>
+    <string name="show_location">Εμφάνιση τοποθεσίας σου</string>
+    <string name="show_gps_coordinates_text">Εμφάνιση συντεταγμένων GPS στον χάρτη</string>
+    <string name="use_internet_to_download_tile">Κατέβασμα απόντων πλακιδίων χάρτη</string>
+    <string name="app_description">Εφαρμογή πλοήγησης</string>
+    <string name="search_button">Αναζήτηση</string>
+    <string name="search_activity">Αναζήτηση</string>
+    <string name="searchpoi_activity">Επιλέξτε ΣΕ</string>
+    <string name="search_POI_level_btn">Βρες περισσότερα</string>
+    <string name="incremental_search_city">Αναζήτηση πόλης αυξητικά</string>
+    <string name="incremental_search_street">Αναζήτηση οδού αυξητικά</string>
+    <string name="incremental_search_building">Αναζήτηση κτηρίου αυξητικά</string>
+    <string name="choose_available_region">Επιλογή περιοχής από λίστα</string>
+    <string name="choose_intersected_street">Επιλογή διασταυρούμενης οδού</string>
+    <string name="Closest_Amenities">Πλησιέστερες παροχές</string>
+    <string name="app_mode_default">Επισκόπηση χάρτη</string>
+    <string name="app_mode_car">Οδήγηση</string>
+    <string name="app_mode_bicycle">Ποδηλασία</string>
+    <string name="app_mode_pedestrian">Πεζοπορία</string>
+    <string name="position_on_map_center">Κέντρο</string>
+    <string name="position_on_map_bottom">Κάτω μέρος</string>
+    <string name="navigate_point_top_text">Εισαγωγή γ. πλάτους &amp; γ. μήκους στην επιλεγμένη μορφή (D - μοίρες, M - λεπτά, S - δεύτερα)</string>
+    <string name="navigate_point_latitude">Γεωγραφικό πλάτος</string>
+    <string name="navigate_point_longitude">Γεωγραφικό μήκος</string>
+    <string name="navigate_point_format_D">DDD.DD</string>
+    <string name="navigate_point_format_DM">DDD MM.MM</string>
+    <string name="navigate_point_format_DMS">DDD MM SS.SS</string>
+    <string name="search_address_top_text">Επιλογή διεύθυνσης</string>
+    <string name="search_address_region">Περιοχή</string>
+    <string name="search_address_city">Πόλη</string>
+    <string name="search_address_street">Οδός</string>
+    <string name="search_address_building">Κτήριο</string>
+    <string name="search_address_building_option">Κτήριο</string>
+    <string name="search_address_street_option">Διασταυρούμενη οδός</string>
+    <string name="context_menu_item_update_map">Ενημέρωση χάρτη</string>
+    <string name="context_menu_item_create_poi">Δημιουργία ΣΕ</string>
+    <string name="shared_string_yes">Ναι</string>
+    <string name="shared_string_cancel">Ακύρωση</string>
+    <string name="shared_string_apply">Εφαρμογή</string>
+    <string name="shared_string_no">Όχι</string>
+    <string name="add_favorite_dialog_top_text">Εισαγωγή ονόματος αγαπημένου</string>
+    <string name="add_favorite_dialog_default_favourite_name">Αγαπημένο</string>
+    <string name="add_favorite_dialog_favourite_added_template">Το αγαπημένο σημείο \'\'{0}\'\' προστέθηκε.</string>
+    <string name="favourites_context_menu_edit">Επεξεργασία αγαπημένου</string>
+    <string name="favourites_context_menu_delete">Διαγραφή αγαπημένου</string>
+    <string name="favourites_remove_dialog_msg">Αφαίρεση αγαπημένου σημείου \'%s\';</string>
+    <string name="favourites_remove_dialog_success">Το αγαπημένο σημείο {0} διαγράφηκε.</string>
+    <string name="osb_comment_dialog_message">Μήνυμα</string>
+    <string name="osb_comment_dialog_author">Όνομα συγγραφέα</string>
+    <string name="osb_comment_dialog_success">Το σχόλιο προστέθηκε</string>
+    <string name="osb_comment_dialog_error">Αδυναμία προσθήκης σχολίου</string>
+    <string name="poi_edit_title">Επεξεργασία ΣΕ</string>
+    <string name="poi_create_title">Δημιουργία ΣΕ</string>
+    <string name="poi_error_poi_not_found">Ο κόμβος δεν μπορεί να βρεθεί ή η υποδομή αποτελείται από πολλούς κόμβους, που δεν υποστηρίζεται ακόμα.</string>
+    <string name="poi_remove_confirm_template">Διαγραφή {0} (σχολίου);</string>
+    <string name="poi_remove_title">Διαγραφή ΣΕ</string>
+    <string name="poi_remove_success">Το ΣΕ διαγράφτηκε</string>
+    <string name="poi_action_add">προσθήκη</string>
+    <string name="poi_action_change">αλλαγή</string>
+    <string name="poi_action_succeded_template">Η ενέργεια {0} ολοκληρώθηκε.</string>
+    <string name="poi_error_unexpected_template">Αδυναμία εκτέλεσης της ενέργειας {0}.</string>
+    <string name="poi_error_io_error_template">Σφάλμα εισόδου/εξόδου κατά την εκτέλεση της δράσης {0}.</string>
+    <string name="poi_error_info_not_loaded">Δεν φορτώθηκαν πληροφορίες σχετικά με τον κόμβο</string>
+    <string name="poi_dialog_opening_hours">Άνοιγμα</string>
+    <string name="poi_dialog_comment">Σχόλιο</string>
+    <string name="poi_dialog_comment_default">Αλλαγή ΣΕ</string>
+    <string name="poi_dialog_other_tags_message">Όλες οι άλλες ετικέτες διατηρούνται</string>
+    <string name="default_buttons_commit">Commit</string>
+    <string name="filter_current_poiButton">Φιλτράρισμα</string>
+    <string name="edit_filter_save_as_menu_item">Αποθήκευση Ως</string>
+    <string name="edit_filter_delete_dialog_title">Διαγραφή του επιλεγμένου φίλτρου?</string>
+    <string name="edit_filter_delete_message">Το φίλτρο {0} έχει διαγραφεί</string>
+    <string name="edit_filter_create_message">Το φίλτρο {0} έχει δημιουργηθεί</string>
+    <string name="email">ηλ. διεύθυνση</string>
+    <string name="intermediate_point_too_far">Ο ενδιάμεσος προορισμός %1$s είναι πολύ μακριά από το κοντινότερο δρόμο.</string>
+    <string name="arrived_at_intermediate_point">Φτάσατε στον ενδιάμεσο προορισμό σας</string>
+    <string name="context_menu_item_intermediate_point">Προσθήκη ως ενδιάμεσου προορισμού</string>
+    <string name="map_widget_intermediate_distance">Ενδιάμεσος προορισμός</string>
+    <string name="ending_point_too_far">Το τελικό σημείο είναι πολύ μακριά από πλησιέστερο δρόμο.</string>
     <string name="context_menu_item_first_intermediate_point">Προσθήκη ως πρώτου ενδιάμεσου προορισμού</string>
     <string name="add_as_last_destination_point">Προσθήκη ως τελευταίου ενδιάμεσου προορισμού</string>
     <string name="add_as_first_destination_point">Προσθήκη ως πρώτου ενδιάμεσου προορισμού</string>
@@ -961,43 +835,34 @@
     <string name="context_menu_item_last_intermediate_point">Προσθήκη ως τελευταίου ενδιάμεσου προορισμού</string>
     <string name="shared_string_target_points">Προορισμοί</string>
     <string name="map_widget_monitoring_services">Υπηρεσίες καταγραφής</string>
-	<string name="delete_target_point">Αφαίρεση προορισμού</string>
-	<string name="intermediate_point">Ενδιάμεσος προορισμός %1$s</string>
+    <string name="delete_target_point">Αφαίρεση προορισμού</string>
+    <string name="intermediate_point">Ενδιάμεσος προορισμός %1$s</string>
     <string name="gps_not_available">Παρακαλώ ενεργοποιήστε το GPS στις ρυθμίσεις</string>
     <string name="no_route">Χωρίς διαδρομή</string>
-	<string name="map_widget_show_destination_arrow">Εμφάνιση κατεύθυνσης προορισμού</string>
+    <string name="map_widget_show_destination_arrow">Εμφάνιση κατεύθυνσης προορισμού</string>
     <string name="enable_plugin_monitoring_services">Ενεργοποιήστε το πρόσθετο καταγραφής ταξιδιού για να χρησιμοποιήσετε τις υπηρεσίες καταγραφής θέσης (καταγραφή GPX, ιχνηλάτηση με σύνδεση)</string>
     <string name="non_optimal_route_calculation">Υπολογισμός πιθανόν μη-βέλτιστης διαδρομής σε πολύ μεγάλες αποστάσεις</string>
     <string name="rendering_attr_roadColors_description">Επιλέξτε ένα χρωματικό συνδυασμό οδών:</string>
-	<string name="rendering_attr_roadColors_name">Χρωματικός συνδυασμός οδών</string>
+    <string name="rendering_attr_roadColors_name">Χρωματικός συνδυασμός οδών</string>
     <string name="zxing_barcode_scanner_not_found">Η εφαρμογή ZXing Barcode Scanner δεν είναι εγκατεστημένη. Αναζήτηση στο Google Play;</string>
-	<string name="close_changeset">Κλείσιμο ομάδας αλλαγών</string>
-	<string name="safe_mode_description">Εκτέλεση της εφαρμογής σε ασφαλή λειτουργία (χρησιμοποιώντας πιο αργό Android αντί του εγγενούς κώδικα).</string>
+    <string name="close_changeset">Κλείσιμο ομάδας αλλαγών</string>
+    <string name="safe_mode_description">Εκτέλεση της εφαρμογής σε ασφαλή λειτουργία (χρησιμοποιώντας πιο αργό Android αντί του εγγενούς κώδικα).</string>
     <string name="safe_mode">Ασφαλής λειτουργία</string>
     <string name="native_library_not_running">Η εφαρμογή εκτελείται σε ασφαλή λειτουργία (απενεργοποίηση από τις \'Ρυθμίσεις\').</string>
     <string name="background_service_is_enabled_question">Το OsmAnd εκτελείται ακόμη στο παρασκήνιο. Να διακοπεί, επίσης;</string>
-    
     <string name="rendering_attr_showRoadMaps_description">Επιλέξτε πότε θα εμφανίζονται οδικοί-μόνο χάρτες:</string>
-	<string name="rendering_attr_showRoadMaps_name">Οδικοί-μόνο χάρτες</string>
+    <string name="rendering_attr_showRoadMaps_name">Οδικοί-μόνο χάρτες</string>
     <string name="download_roads_only_item">Δρόμοι μόνο</string>
     <string name="download_regular_maps">Τυπικοί χάρτες</string>
     <string name="download_roads_only_maps">Μόνο οδικός χάρτης</string>
     <string name="incomplete_locale">ημιτελές</string>
-	<string name="search_villages_and_postcodes">Αναζήτηση περισσότερων χωριών/ταχ. κωδικών</string>
-	<string name="no_buildings_found">Δεν βρέθηκαν κτήρια.</string>
+    <string name="search_villages_and_postcodes">Αναζήτηση περισσότερων χωριών/ταχ. κωδικών</string>
+    <string name="no_buildings_found">Δεν βρέθηκαν κτήρια.</string>
     <string name="route_descr_lat_lon">Πλ %1$.3f μήκ %2$.3f</string>
-    
-    
-    
     <string name="map_widget_max_speed">Όριο ταχύτητας</string>
     <string name="monitoring_control_start">GPX</string>
-    
     <string name="rendering_attr_noAdminboundaries_name">Όρια</string>
-	<string name="rendering_attr_noAdminboundaries_description">Περιορισμός εμφάνισης διοικητικών ορίων (επίπεδα διαχειριστή 5-9).</string>
-	
-	
-	
-    
+    <string name="rendering_attr_noAdminboundaries_description">Περιορισμός εμφάνισης διοικητικών ορίων (επίπεδα διαχειριστή 5-9).</string>
     <string name="download_select_map_types">Άλλοι χάρτες</string>
     <string name="index_srtm_ele">Ισοϋψείς γραμμές</string>
     <string name="srtm_plugin_description">Αυτό το πρόσθετο παρέχει και την επικάλυψη ισοϋψών γραμμών και ένα στρώμα (ανάγλυφο) σκιάς λόφων για να εμφανιστεί στην κορυφή των τυπικών χαρτών του OsmAnd. Αυτή η λειτουργικότητα θα εκτιμηθεί πολύ από αθλητές, πεζοπόρους, εκδρομείς και οποιονδήποτε ενδιαφέρεται για τη δομή του ανάγλυφου ενός τοπίου. (Παρακαλούμε, σημειώστε ότι η ισοϋψής γραμμή και/ή τα δεδομένα του αναγλύφου είναι ξεχωριστά, με διαθέσιμες πρόσθετες μεταφορτώσεις μετά την ενεργοποίηση του προσθέτου.)
@@ -1005,22 +870,16 @@
 \nΤα γενικά δεδομένα (μεταξύ 70 ° βόρεια και 70 ° νότια βασίζονται σε μετρήσεις από τα SRTM (Shuttle Radar Topography Mission) και ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), ένα ενσωματωμένο εργαλείο απεικόνισης στο Terra, τον βασικό δορυφόρο του συστήματος παρατήρησης της γης από τη NASA. Το ASTER είναι μια συνεργατική προσπάθεια της NASA, του Ιαπωνικού υπουργείου οικονομίας, εμπορίου και βιομηχανίας (METI) και των Ιαπωνικών διαστημικών συστημάτων (J-spacesystems).</string>
     <string name="srtm_plugin_name">Ισοϋψείς Γραμμές</string>
     <string name="download_srtm_maps">Ισοϋψείς γραμμές</string>
-    
-	
-<string name="index_srtm_parts">μέρη</string>
-    
+    <string name="index_srtm_parts">μέρη</string>
     <string name="map_widget_audionotes">Ηχητικές σημειώσεις</string>
     <string name="audionotes_plugin_description">Το πρόσθετο σημειώσεων ήχου/video παρέχει τη λειτουργία λήψης σημειώσεων ήχου/φωτογραφίας/video κατά τη διάρκεια του ταξιδιού, χρησιμοποιώντας είτε ένα κουμπί στην οθόνη χάρτη, ή απευθείας στο αναδυόμενο μενού για οποιοδήποτε σημείο στον χάρτη.</string>
     <string name="audionotes_plugin_name">Σημειώσεις ήχου/video</string>
-    
     <string name="osmand_srtm_short_description_80_chars">Πρόσθετο του OsmAnd για ισοϋψείς γραμμές χωρίς σύνδεση</string>
-    
     <string name="map_widget_distancemeasurement">Μέτρηση απόστασης</string>
     <string name="recording_is_recorded">Εγγραφή Ήχου/βίντεο. Σταμάτημα πατώντας το γραφικό στοιχείο AV.</string>
     <string name="recording_playing">Ένας ήχος από την συγκεκριμένη εγγραφή αναπαράγεται.\n%1$s</string>
     <string name="recording_open_external_player">Άνοιγμα εξωτερικού αναπαραγωγέα</string>
     <string name="recording_delete_confirm">Να διαγραφεί αυτό το στοιχείο;</string>
-    
     <string name="recording_unavailable">μη διαθέσιμο</string>
     <string name="recording_context_menu_arecord">Κάντε ηχητική σημείωση</string>
     <string name="recording_context_menu_vrecord">Κάντε σημείωση video</string>
@@ -1042,11 +901,9 @@
     <string name="av_video_format_descr">Επιλέξτε μορφή εξόδου βίντεο.</string>
     <string name="av_video_format">Μορφή εξόδου video</string>
     <string name="av_use_external_recorder_descr">Χρήση του καταγραφέα συστήματος για βίντεο.</string>
-    
     <string name="av_settings_descr">Διαμόρφωση ρυθμίσεων ήχου και video.</string>
     <string name="dropbox_plugin_description">Το πρόσθετο Dropbox επιτρέπει τον συγχρονισμό ιχνών και σημειώσεων ήχου/βίντεο με τον Dropbox λογαριασμό σας.</string>
     <string name="dropbox_plugin_name">Πρόσθετο dropbox</string>
-    
     <string name="intermediate_points_change_order">Αλλαγή σειράς</string>
     <string name="srtm_paid_version_msg">Παρακαλούμε, σκεφτείτε την αγορά του πρόσθετου \'ισοϋψών γραμμών\' για να υποστηρίξετε την περαιτέρω ανάπτυξη.</string>
     <string name="srtm_paid_version_title">Πρόσθετο ισοϋψών γραμμών</string>
@@ -1059,36 +916,30 @@
     <string name="recording_context_menu_precord">Λήψη φωτογραφίας</string>
     <string name="audionotes_location_not_defined">Δεν έχει καθοριστεί ακόμα τοποθεσία για συσχέτιση με τη σημείωση. \"Χρήση τοποθεσίας …\" για να συνδέσετε μια σημείωση με την καθορισμένη τοποθεσία.</string>
     <string name="local_indexes_cat_av">Δεδομένα Ήχου/Εικόνας</string>
-    
     <string name="precise_routing_mode_descr">Υπολογισμός δρομολογίων με ακρίβεια χωρίς προβλήματα. Ακόμη περιορισμένο σε σχέση με την απόσταση και αργό.</string>
     <string name="layer_recordings">Επίπεδο εγγραφής</string>
     <string name="shared_string_control_start">Έναρξη</string>
     <string name="av_use_external_camera_descr">Χρήση εφαρμογής συστήματος για φωτογραφίες.</string>
     <string name="av_use_external_camera">Χρήση εφαρμογής κάμερας</string>
-    
     <string name="osmand_srtm_long_description_1000_chars">Αυτό το πρόσθετο παρέχει επιστρώματα ισοϋψών γραμμών και σκίαση αναγλύφου που μπορούν να εμφανιστούν στην κορυφή των τυπικών χαρτών του OsmAnd. Αυτή η λειτουργικότητα θα εκτιμηθεί ιδιαίτερα από αθλητές, πεζοπόρους και οποιονδήποτε ενδιαφέρεται για τη δομή του αναγλύφου ενός τοπίου.
 \n
 \nΤα παγκόσμια δεδομένα (μεταξύ 70 μοιρών βόρεια και 70 μοιρών νότια) είναι βασισμένα σε μετρήσεις από το SRTM (Shuttle Radar Topography Mission) και το ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), ένα όργανο απεικόνισης ενσωματωμένο στον Terra, τη ναυαρχίδα των δορυφόρων του Συστήματος Παρακολούθησης της Γης της NASA. Το ASTER είναι μια συνεργασία μεταξύ της NASA, Του Υπουργείου οικονομίας,εμπορίου και βιομηχανίας της Ιαπωνίας (METI), και της Japan Space Systems (J-spacesystems).</string>
     <string name="support_new_features_descr">Δωρίστε για να δείτε νέα χαρακτηριστικά να πραγματοποιούνται στην εφαρμογή.</string>
-	<string name="prefer_motorways">Προτίμηση αυτοκινητοδρόμων</string>
-	<string name="prefer_in_routing_title">Προτίμηση…</string>
-	<string name="prefer_in_routing_descr">Προτίμηση αυτοκινητοδρόμων.</string>
+    <string name="prefer_motorways">Προτίμηση αυτοκινητοδρόμων</string>
+    <string name="prefer_in_routing_title">Προτίμηση…</string>
+    <string name="prefer_in_routing_descr">Προτίμηση αυτοκινητοδρόμων.</string>
     <string name="max_speed_none">καμία</string>
     <string name="access_arrival_time">Ώρα άφιξης</string>
     <string name="item_checked">επιλεγμένο</string>
     <string name="item_unchecked">μη επιλεγμένο</string>
     <string name="map_widget_gps_info">Πληροφορίες GPS</string>
-    
     <string name="download_hillshade_maps">Ανάγλυφα</string>
     <string name="osmand_play_title_30_chars">OsmAnd Χάρτες &amp; Δρομολόγηση</string>
-	<string name="osmand_plus_play_title_30_chars">OsmAnd+ Χάρτες &amp; Πλοήγηση</string>
-	
-    
-	<string name="street_name">Όνομα οδού</string>
-	<string name="hno">Αριθμός σπιτιού</string>
+    <string name="osmand_plus_play_title_30_chars">OsmAnd+ Χάρτες &amp; Πλοήγηση</string>
+    <string name="street_name">Όνομα οδού</string>
+    <string name="hno">Αριθμός σπιτιού</string>
     <string name="monitoring_settings">Καταγραφή ταξιδιού</string>
     <string name="monitoring_settings_descr">Διαμορφώστε πώς θα εγγράφονται τα ταξίδια σας.</string>
-    
     <string name="choose_osmand_theme_descr">Επιλογή εμφάνισης εφαρμογής.</string>
     <string name="choose_osmand_theme">Θέμα Εφαρμογής</string>
     <string name="accessibility_options">Επιλογές προσβασιμότητας</string>
@@ -1097,7 +948,6 @@
     <string name="local_openstreetmap_act_title">Τροποποιήσεις OSM</string>
     <string name="shared_string_more_actions">Άλλες ενέργειες</string>
     <string name="av_def_action_choose">Επιλογή κατά την ζήτηση</string>
-    
     <string name="download_using_mobile_internet">Δεν είσαστε συνδεμένοι με ασύρματο δίκτυο. Θέλετε να χρησιμοποιήσετε την τρέχουσα διαδικτυακή σύνδεση για λήψη;</string>
     <string name="cancel_route">Απόρριψη διαδρομής</string>
     <string name="cancel_navigation">Διακοπή πλοήγησης</string>
@@ -1113,7 +963,7 @@
     <string name="wait_current_task_finished">Παρακαλώ περιμένετε μέχρι να τελειώσει η τρέχουσα διεργασία</string>
     <string name="local_indexes_cat_srtm">Ισοϋψείς γραμμές</string>
     <string name="shared_string_downloading">Λήψη</string>
-	<string name="delete_point">Διαγραφή σημείου</string>
+    <string name="delete_point">Διαγραφή σημείου</string>
     <string name="plugin_distance_point_time">χρόνος</string>
     <string name="plugin_distance_point_hdop">ακρίβεια</string>
     <string name="plugin_distance_point_speed">ταχύτητα</string>
@@ -1125,7 +975,6 @@
     <string name="distance_measurement_start_editing">Έναρξη επεξεργασίας</string>
     <string name="distance_measurement_finish_editing">Τέλος επεξεργασίας</string>
     <string name="distance_measurement_clear_route">Καθαρισμός όλων των σημείων</string>
-    
     <string name="distance_measurement_load_gpx">Άνοιγμα υφιστάμενου αρχείου GPX</string>
     <string name="local_osm_changes_backup_successful">Το αρχείο αλλαγών OSM δημιουργήθηκε %1$s</string>
     <string name="destination_point">Προορισμός %1$s</string>
@@ -1143,42 +992,33 @@
     <string name="route_to">Προς:</string>
     <string name="route_via">Μέσω:</string>
     <string name="route_from">Από:</string>
-    
-	
     <string name="speak_speed_limit">Όρια ταχύτητας</string>
     <string name="speak_cameras">Κάμερες ταχύτητας</string>
-	<string name="speak_traffic_warnings">Προειδοποιήσεις κυκλοφορίας</string>
-	<string name="search_street_in_neighborhood_cities">Αναζήτηση οδού σε γειτονικές πόλεις</string>
+    <string name="speak_traffic_warnings">Προειδοποιήσεις κυκλοφορίας</string>
+    <string name="search_street_in_neighborhood_cities">Αναζήτηση οδού σε γειτονικές πόλεις</string>
     <string name="index_name_openmaps">OpenMaps EU</string>
     <string name="osb_author_dialog_password">Κωδικός πρόσβασης OSM (προαιρετικό)</string>
-	<string name="av_camera_focus_auto">Αυτόματη εστίαση</string>
-	<string name="av_camera_focus_edof">Εκτεταμένου βάθους πεδίου (EDOF)</string>
-	<string name="av_camera_focus_infinity">Η εστίαση ρυθμίστηκε στο άπειρο</string>
-	<string name="av_photo_play_sound">Αναπαραγωγή ήχου κατά τη λήψη φωτογραφίας</string>
-	
+    <string name="av_camera_focus_auto">Αυτόματη εστίαση</string>
+    <string name="av_camera_focus_edof">Εκτεταμένου βάθους πεδίου (EDOF)</string>
+    <string name="av_camera_focus_infinity">Η εστίαση ρυθμίστηκε στο άπειρο</string>
+    <string name="av_photo_play_sound">Αναπαραγωγή ήχου κατά τη λήψη φωτογραφίας</string>
     <string name="speak_title">Εκφώνηση…</string>
-	<string name="speak_descr">Ρυθμίστε την εκφώνηση ονομάτων οδών, προειδοποιήσεων κυκλοφορίας (αναγκαστικές στάσεις, σαμαράκια), προειδοποιήσεις για κάμερες ταχύτητας, όρια ταχύτητας.</string>
-	<string name="speak_street_names">Ονόματα οδών (TTS)</string>
-    
+    <string name="speak_descr">Ρυθμίστε την εκφώνηση ονομάτων οδών, προειδοποιήσεων κυκλοφορίας (αναγκαστικές στάσεις, σαμαράκια), προειδοποιήσεις για κάμερες ταχύτητας, όρια ταχύτητας.</string>
+    <string name="speak_street_names">Ονόματα οδών (TTS)</string>
     <string name="osb_author_or_password_not_specified">Παρακαλούμε, καθορίστε χρήστη και κωδικό πρόσβασης OSM στις \'Ρυθμίσεις\'</string>
     <string name="new_directions_point_dialog">Έχετε ήδη καθορίσει ενδιάμεσους προορισμούς.</string>
-    
-	
-	<string name="intermediate_items_sort_return">Βελτιστοποιημένη σειρά των ενδιάμεσων προορισμών καθ\' οδόν προς τον προορισμό.</string>
+    <string name="intermediate_items_sort_return">Βελτιστοποιημένη σειρά των ενδιάμεσων προορισμών καθ\' οδόν προς τον προορισμό.</string>
     <string name="osmand_distance_planning_plugin_name">Υπολογιστής απόστασης &amp; εργαλείο σχεδιασμού</string>
     <string name="av_camera_focus">Τύπος εστίασης κάμερας</string>
-	<string name="av_camera_focus_descr">Επιλέξτε την εσωτερική κατάσταση εστίασης της κάμερας.</string>
-	    
-    
+    <string name="av_camera_focus_descr">Επιλέξτε την εσωτερική κατάσταση εστίασης της κάμερας.</string>
     <string name="driving_region_japan">Ιαπωνία</string>
-	<string name="driving_region_us">ΗΠΑ</string>
-	<string name="driving_region_canada">Καναδάς</string>
-	<string name="driving_region_europe_asia">Ευρώπη, Ασία, Λατινική Αμερική &amp; παρόμοια</string>
-	<string name="driving_region_uk">ΗΒ, Ινδία &amp; παρόμοια</string>
-	<string name="about_version">Έκδοση:</string>
+    <string name="driving_region_us">ΗΠΑ</string>
+    <string name="driving_region_canada">Καναδάς</string>
+    <string name="driving_region_europe_asia">Ευρώπη, Ασία, Λατινική Αμερική &amp; παρόμοια</string>
+    <string name="driving_region_uk">ΗΒ, Ινδία &amp; παρόμοια</string>
+    <string name="about_version">Έκδοση:</string>
     <string name="shared_string_about">Περί</string>
     <string name="about_settings_descr">Πληροφορίες έκδοσης, άδειες, μέλη έργου</string>
-    
     <string name="local_index_tile_data_expire">Λήξη (λεπτά): %1$s</string>
     <string name="local_index_tile_data_maxzoom">Μέγιστη εστίαση: %1$s</string>
     <string name="local_index_tile_data_minzoom">Ελάχιστη εστίαση: %1$s</string>
@@ -1186,8 +1026,7 @@
     <string name="edit_tilesource_expiration_time">Λήξη (λεπτά)</string>
     <string name="edit_tilesource_minzoom">Ελάχιστη εστίαση</string>
     <string name="maps_define_edit">Καθορισμός/Επεξεργασία…</string>
-	
-	<string name="local_index_tile_data_downloadable">Διαθέσιμο για λήψη: %1$s</string>
+    <string name="local_index_tile_data_downloadable">Διαθέσιμο για λήψη: %1$s</string>
     <string name="local_index_tile_data_zooms">Εστιάσεις που ελήφθησαν: %1$s</string>
     <string name="local_index_tile_data_name">Δεδομένα πλακιδίου: %1$s</string>
     <string name="edit_tilesource_successfully">Η πηγή πλακιδίων %1$s αποθηκεύτηκε</string>
@@ -1195,47 +1034,37 @@
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Επιλογή υπάρχοντος…</string>
     <string name="driving_region_descr">Επιλέξτε περιοχή οδήγησης: ΗΠΑ, Ευρώπη, ΗΒ, Ασία κλπ.</string>
-	<string name="driving_region">Περιοχή οδήγησης</string>
-	<string name="av_photo_play_sound_descr">Επιλέξτε εάν θα αναπαράγεται ήχος κατά τη λήψη φωτογραφιών.</string>
-<string name="app_modes_choose">Κατατομές (προφίλ) εφαρμογής</string>
-	<string name="map_widget_map_rendering">Σχεδιασμός χάρτη</string>
+    <string name="driving_region">Περιοχή οδήγησης</string>
+    <string name="av_photo_play_sound_descr">Επιλέξτε εάν θα αναπαράγεται ήχος κατά τη λήψη φωτογραφιών.</string>
+    <string name="app_modes_choose">Κατατομές (προφίλ) εφαρμογής</string>
+    <string name="map_widget_map_rendering">Σχεδιασμός χάρτη</string>
     <string name="app_mode_hiking">Πεζοπορία</string>
     <string name="app_mode_motorcycle">Μοτοσυκλέτα</string>
     <string name="app_mode_boat">Πλοίο</string>
     <string name="app_mode_aircraft">Αεροσκάφος</string>
-    
-    
     <string name="local_osm_changes_delete_all_confirm">Πρόκειται να διαγράψετε %1$d αλλαγές του OSM. Είστε σίγουρος;</string>
     <string name="animate_routing_route_not_calculated">Παρακαλώ υπολογίστε την διαδρομή πρώτα</string>
     <string name="animate_routing_route">Προσομοίωση με χρήση της υπολογισμένης διαδρομής </string>
     <string name="animate_routing_gpx">Προσομοίωση χρησιμοποιώντας δεδομένα διαδρομής GPX</string>
     <string name="shared_string_remember_my_choice">Να θυμάσαι την επιλογή</string>
-	<string name="auto_zoom_none">Χωρίς αυτόματη εστίαση</string>
-	<string name="auto_zoom_far">Μεσαία εμφάνιση</string>
-	<string name="map_magnifier">Μεγεθυντής χάρτη</string>
-	<string name="base_world_map">Βασικός παγκόσμιος χάρτης</string>
-	
-    
-    
+    <string name="auto_zoom_none">Χωρίς αυτόματη εστίαση</string>
+    <string name="auto_zoom_far">Μεσαία εμφάνιση</string>
+    <string name="map_magnifier">Μεγεθυντής χάρτη</string>
+    <string name="base_world_map">Βασικός παγκόσμιος χάρτης</string>
     <string name="distance_measurement_finish_subtrack">Ξεκινήστε ένα νέο υπομονοπάτι</string>
     <string name="av_camera_focus_continuous">Η κάμερα προσπαθεί συνεχώς να εστιάσει</string>
-	<string name="sort_by_distance">Ταξινόμηση κατά απόσταση</string>
+    <string name="sort_by_distance">Ταξινόμηση κατά απόσταση</string>
     <string name="sort_by_name">Ταξινόμηση κατά όνομα</string>
-    
     <string name="save_as_favorites_points">Αποθήκευση ως ομάδα αγαπημένων</string>
     <string name="app_modes_choose_descr">Επιλογή κατατομών (προφίλ) που θα είναι ορατές στην εφαρμογή.</string>
     <string name="loading_smth">Φόρτωση %1$s …</string>
     <string name="delay_navigation_start">Έναρξη πλοήγησης στροφή-στροφή αυτόματα</string>
     <string name="gpx_info_distance">Απόσταση: %1$s (%2$s σημεία) </string>
-	<string name="gpx_info_average_speed">Μέση ταχύτητα: %1$s </string>
-	<string name="gpx_info_maximum_speed">Μέγιστη ταχύτητα: %1$s </string>
-	<string name="gpx_info_avg_altitude">Μέσο υψόμετρο: %1$s</string>
-    
-	<string name="rendering_value_pink_name">ροζ</string>
-	
-	<string name="rendering_value_brown_name">καφέ</string>
-
-
+    <string name="gpx_info_average_speed">Μέση ταχύτητα: %1$s </string>
+    <string name="gpx_info_maximum_speed">Μέγιστη ταχύτητα: %1$s </string>
+    <string name="gpx_info_avg_altitude">Μέσο υψόμετρο: %1$s</string>
+    <string name="rendering_value_pink_name">ροζ</string>
+    <string name="rendering_value_brown_name">καφέ</string>
     <string name="local_index_select_gpx_file">Επιλέξτε για εμφάνιση</string>
     <string name="show_zoom_buttons_navigation_descr">Εμφάνιση πλήκτρων εστίασης κατά την πλοήγηση.</string>
     <string name="show_zoom_buttons_navigation">Εμφάνιση κουμπιών ζουμ</string>
@@ -1245,24 +1074,23 @@
 \n
 \nΠαρατεταμένο πάτημα για προβολή στον χάρτη"</string>
     <string name="gpx_info_start_time">"Χρόνος έναρξης: %1$tF, %1$tT "</string>
-	<string name="gpx_info_end_time">"Χρόνος λήξης: %1$tF, %1$tT "</string>
-	<string name="gpx_info_diff_altitude">Εύρος υψομέτρου: %1$s</string>
-	<string name="gpx_info_asc_altitude">Κατηφόρα/Ανηφόρα: %1$s</string>
+    <string name="gpx_info_end_time">"Χρόνος λήξης: %1$tF, %1$tT "</string>
+    <string name="gpx_info_diff_altitude">Εύρος υψομέτρου: %1$s</string>
+    <string name="gpx_info_asc_altitude">Κατηφόρα/Ανηφόρα: %1$s</string>
     <string name="gpx_selection_number_of_points">%1$s σημεία</string>
     <string name="gpx_selection_point">"Σημείο  %1$s"</string>
-    
     <string name="gpx_selection_route_points">"%1$s\nΣημεία διαδρομής  %2$s"</string>
     <string name="gpx_selection_points">%1$s\nΣημεία</string>
     <string name="osmo_edit_color">Χρώμα εμφάνισης</string>
-	<string name="int_days">ημέρες</string>
+    <string name="int_days">ημέρες</string>
     <string name="osmo_connect_menu">Σύνδεση</string>
     <string name="gpx_split_interval">Διάστημα διαχωρισμού</string>
     <string name="select_destination_and_intermediate_points">Επιλέξτε προορισμούς</string>
     <string name="shared_string_waypoint">Σημείο διαδρομής</string>
     <string name="gpx_info_subtracks">"Υποΐχνη: %1$s "</string>
-	<string name="gpx_info_waypoints">"Σημεία διαδρομής: %1$s "</string>
-	<string name="gpx_timespan">Χρονική διάρκεια: %1$s</string>
-	<string name="gpx_timemoving">Χρόνος σε κίνηση: %1$s</string>
+    <string name="gpx_info_waypoints">"Σημεία διαδρομής: %1$s "</string>
+    <string name="gpx_timespan">Χρονική διάρκεια: %1$s</string>
+    <string name="gpx_timemoving">Χρόνος σε κίνηση: %1$s</string>
     <string name="gpx_selection_segment_title">Τμήμα</string>
     <string name="gpx_selection_track">%1$s
 \nΊχνος %2$s</string>
@@ -1272,75 +1100,72 @@
     <string name="voice_pref_title">Φωνή</string>
     <string name="misc_pref_title">Διάφορα</string>
     <string name="index_item_nation_addresses">διευθύνσεις πανεθνικά</string>
-	<string name="index_item_world_altitude_correction">Παγκόσμια διόρθωση υψομέτρου</string>
-	<string name="index_item_world_bitcoin_payments">Παγκόσμιες πληρωμές bitcoin</string>
-	<string name="index_item_world_ski">Παγκόσμιος Χάρτης σκι</string>
+    <string name="index_item_world_altitude_correction">Παγκόσμια διόρθωση υψομέτρου</string>
+    <string name="index_item_world_bitcoin_payments">Παγκόσμιες πληρωμές bitcoin</string>
+    <string name="index_item_world_ski">Παγκόσμιος Χάρτης σκι</string>
     <string name="lang_hr">Κροατικά</string>
     <string name="lang_zh">Κινέζικα</string>
     <string name="lang_pt_br">Πορτογαλικά (Βραζιλίας)</string>
     <string name="lang_en">Αγγλικά</string>
-	<string name="lang_af">Αφρικάανς</string>
-	<string name="lang_hy">Αρμενικά</string>
-	<string name="lang_eu">Βασκικά</string>
-	<string name="lang_be">Λευκορωσικά</string>
-	<string name="lang_bs">Βοσνιακά</string>
-	<string name="lang_bg">Βουλγαρικά</string>
-	<string name="lang_ca">Καταλανικά</string>
-	<string name="lang_cs">Τσεχικά</string>
-	<string name="lang_da">Δανικά</string>
-	<string name="lang_nl">Ολλανδικά</string>
-	<string name="lang_fi">Φινλανδικά</string>
-	<string name="lang_fr">Γαλλικά</string>
-	<string name="lang_ka">Γεωργιανά</string>
-	<string name="lang_de">Γερμανικά</string>
-	<string name="lang_el">Ελληνικά</string>
-	<string name="lang_iw">Εβραϊκά</string>
-	<string name="lang_hi">Χίντι</string>
-	<string name="lang_hu">Ουγγρικά</string>
-	<string name="lang_id">Ινδονησιακά</string>
-	<string name="lang_it">Ιταλικά</string>
-	<string name="lang_ja">Ιαπωνικά</string>
-	<string name="lang_ko">Κορεατικά</string>
-	<string name="lang_lv">Λεττονικά</string>
-	<string name="lang_lt">Λιθουανικά</string>
-	<string name="lang_mr">Μαραθικά</string>
-	<string name="lang_no">Νορβηγικά Bokmål</string>
-	<string name="lang_pl">Πολωνικά</string>
-	<string name="lang_pt">Πορτογαλικά</string>
-	<string name="lang_ro">Ρουμανικά</string>
-	<string name="lang_ru">Ρωσικά</string>
-	<string name="lang_sk">Σλοβακικά</string>
-	<string name="lang_sl">Σλοβενικά</string>
-	<string name="lang_es">Ισπανικά</string>
-	<string name="lang_sv">Σουηδικά</string>
-	<string name="lang_tr">Τουρκικά</string>
-	<string name="lang_uk">Ουκρανικά</string>
-	<string name="lang_vi">Βιετναμέζικα</string>
-	<string name="lang_cy">Ουαλικά</string>
-	<string name="index_name_canada">Βόρεια Αμερική - Καναδάς</string>
+    <string name="lang_af">Αφρικάανς</string>
+    <string name="lang_hy">Αρμενικά</string>
+    <string name="lang_eu">Βασκικά</string>
+    <string name="lang_be">Λευκορωσικά</string>
+    <string name="lang_bs">Βοσνιακά</string>
+    <string name="lang_bg">Βουλγαρικά</string>
+    <string name="lang_ca">Καταλανικά</string>
+    <string name="lang_cs">Τσεχικά</string>
+    <string name="lang_da">Δανικά</string>
+    <string name="lang_nl">Ολλανδικά</string>
+    <string name="lang_fi">Φινλανδικά</string>
+    <string name="lang_fr">Γαλλικά</string>
+    <string name="lang_ka">Γεωργιανά</string>
+    <string name="lang_de">Γερμανικά</string>
+    <string name="lang_el">Ελληνικά</string>
+    <string name="lang_iw">Εβραϊκά</string>
+    <string name="lang_hi">Χίντι</string>
+    <string name="lang_hu">Ουγγρικά</string>
+    <string name="lang_id">Ινδονησιακά</string>
+    <string name="lang_it">Ιταλικά</string>
+    <string name="lang_ja">Ιαπωνικά</string>
+    <string name="lang_ko">Κορεατικά</string>
+    <string name="lang_lv">Λεττονικά</string>
+    <string name="lang_lt">Λιθουανικά</string>
+    <string name="lang_mr">Μαραθικά</string>
+    <string name="lang_no">Νορβηγικά Bokmål</string>
+    <string name="lang_pl">Πολωνικά</string>
+    <string name="lang_pt">Πορτογαλικά</string>
+    <string name="lang_ro">Ρουμανικά</string>
+    <string name="lang_ru">Ρωσικά</string>
+    <string name="lang_sk">Σλοβακικά</string>
+    <string name="lang_sl">Σλοβενικά</string>
+    <string name="lang_es">Ισπανικά</string>
+    <string name="lang_sv">Σουηδικά</string>
+    <string name="lang_tr">Τουρκικά</string>
+    <string name="lang_uk">Ουκρανικά</string>
+    <string name="lang_vi">Βιετναμέζικα</string>
+    <string name="lang_cy">Ουαλικά</string>
+    <string name="index_name_canada">Βόρεια Αμερική - Καναδάς</string>
     <string name="index_name_italy">Ευρώπη - Ιταλία</string>
     <string name="index_name_gb">Ευρώπη - Μεγάλη Βρετανία</string>
     <string name="keep_and_add_destination_point">Προσθήκη ως επόμενος προορισμός</string>
     <string name="select_gpx">Επιλέξτε GPX…</string>
     <string name="route_descr_select_destination">Επιλέξτε Προορισμό</string>
-    
     <string name="shared_string_favorite">Αγαπημένο</string>
     <string name="route_preferences">Προτιμήσεις δρομολογίου</string>
     <string name="route_info">Πληροφορίες δρομολογίου</string>
     <string name="routing_attr_prefer_motorway_name">Προτίμηση αυτοκινητοδρόμων</string>
-	<string name="routing_attr_prefer_motorway_description">Προτίμηση αυτοκινητοδρόμων</string>
-	
-	
-	<string name="routing_attr_avoid_toll_name">Αποφυγή δρόμων με διόδια</string>
-	<string name="routing_attr_avoid_toll_description">Αποφυγή δρόμων με διόδια</string>
-	<string name="routing_attr_avoid_unpaved_name">Αποφυγή χωματόδρομων</string>
-	<string name="routing_attr_avoid_unpaved_description">Αποφυγή μη ασφαλτοστρωμένων δρόμων.</string>
-	<string name="routing_attr_avoid_ferries_name">Αποφυγή πορθμείων</string>
-	<string name="routing_attr_avoid_ferries_description">Αποφυγή πορθμείων</string>
-	<string name="routing_attr_avoid_motorway_name">Αποφυγή αυτοκινητόδρομων</string>
-	<string name="routing_attr_avoid_motorway_description">Αποφυγή αυτοκινητόδρομων</string>
-	<string name="routing_attr_weight_name">Όριο βάρους</string>
-	<string name="routing_attr_weight_description">Καθορίσετε το επιτρεπόμενο όριο βάρους του οχήματος στις διαδρομές.</string>
+    <string name="routing_attr_prefer_motorway_description">Προτίμηση αυτοκινητοδρόμων</string>
+    <string name="routing_attr_avoid_toll_name">Αποφυγή δρόμων με διόδια</string>
+    <string name="routing_attr_avoid_toll_description">Αποφυγή δρόμων με διόδια</string>
+    <string name="routing_attr_avoid_unpaved_name">Αποφυγή χωματόδρομων</string>
+    <string name="routing_attr_avoid_unpaved_description">Αποφυγή μη ασφαλτοστρωμένων δρόμων.</string>
+    <string name="routing_attr_avoid_ferries_name">Αποφυγή πορθμείων</string>
+    <string name="routing_attr_avoid_ferries_description">Αποφυγή πορθμείων</string>
+    <string name="routing_attr_avoid_motorway_name">Αποφυγή αυτοκινητόδρομων</string>
+    <string name="routing_attr_avoid_motorway_description">Αποφυγή αυτοκινητόδρομων</string>
+    <string name="routing_attr_weight_name">Όριο βάρους</string>
+    <string name="routing_attr_weight_description">Καθορίσετε το επιτρεπόμενο όριο βάρους του οχήματος στις διαδρομές.</string>
     <string name="copying_osmand_one_file_descr">Αντιγραφή αρχείου (%s) στο νέο προορισμό…</string>
     <string name="copying_osmand_files_descr">Αντιγραφή αρχείων δεδομένων OsmAnd στο νέο προορισμό (%s)…</string>
     <string name="copying_osmand_files">Αντιγραφή αρχείων δεδομένων OsmAnd…</string>
@@ -1350,20 +1175,18 @@
     <string name="speech_rate_descr">Καθορίσετε το ρυθμό ομιλίας TTS.</string>
     <string name="speech_rate">Ρυθμός ομιλίας</string>
     <string name="interrupt_music_descr">Η φωνή προτρέπει παύση, όχι απλά μείωση, αναπαραγωγής της μουσικής.</string>
-	<string name="interrupt_music">Παύση μουσικής</string>
-	<string name="share_route_as_gpx">Διαμοιρασμός διαδρομής ως αρχείο GPX</string>
-	<string name="arrival_distance">Ανακοίνωση άφιξης</string>
+    <string name="interrupt_music">Παύση μουσικής</string>
+    <string name="share_route_as_gpx">Διαμοιρασμός διαδρομής ως αρχείο GPX</string>
+    <string name="arrival_distance">Ανακοίνωση άφιξης</string>
     <string name="arrival_distance_descr">Πόσο σύντομα θέλετε την αναγγελία άφιξης;</string>
     <string name="keep_informing_never">Μόνο χειροκίνητα (πατήστε το βέλος)</string>
     <string name="keep_informing">Επανάληψη οδηγιών πλοήγησης</string>
-	
-	<string name="import_file_favourites">Αποθήκευση δεδομένων ως αρχείο GPX ή εισαγωγή σημείων διαδρομής στα \'Αγαπημένα\';</string>
-	
-	<string name="shared_string_share">Διαμοιρασμός</string>
-	<string name="navigation_intent_invalid">Μη έγκυρη μορφή: %s</string>
-<string name="stop_navigation_service">Διακοπή</string>
-	<string name="sleep_mode_stop_dialog">Διακοπή λειτουργίας παρασκηνίου του GPS;</string>
-	<string name="map_preferred_locale_descr">Προτιμώμενη γλώσσα για τις ετικέτες στον χάρτη (εάν δεν είναι διαθέσιμη, θα χρησιμοποιηθούν τα αγγλικά ή τα τοπικά ονόματα).</string>
+    <string name="import_file_favourites">Αποθήκευση δεδομένων ως αρχείο GPX ή εισαγωγή σημείων διαδρομής στα \'Αγαπημένα\';</string>
+    <string name="shared_string_share">Διαμοιρασμός</string>
+    <string name="navigation_intent_invalid">Μη έγκυρη μορφή: %s</string>
+    <string name="stop_navigation_service">Διακοπή</string>
+    <string name="sleep_mode_stop_dialog">Διακοπή λειτουργίας παρασκηνίου του GPS;</string>
+    <string name="map_preferred_locale_descr">Προτιμώμενη γλώσσα για τις ετικέτες στον χάρτη (εάν δεν είναι διαθέσιμη, θα χρησιμοποιηθούν τα αγγλικά ή τα τοπικά ονόματα).</string>
     <string name="map_preferred_locale">Προτιμώμενη γλώσσα χάρτη</string>
     <string name="local_map_names">Τοπικά ονόματα</string>
     <string name="lang_sw">Σουαχίλι</string>
@@ -1377,47 +1200,35 @@
     <string name="rendering_attr_hideAccess_name">Περιορισμοί πρόσβασης</string>
     <string name="rendering_attr_showAccess_name">Εμφάνιση περιορισμών πρόσβασης και διοδίων</string>
     <string name="rendering_attr_showSurfaceGrade_name">Εμφάνιση ποιότητας των δρόμων</string>
-    
     <string name="rendering_attr_coloredBuildings_name">Έγχρωμα κτίρια κατά τύπο</string>
-    
-    
     <string name="continue_navigation">Συνέχιση της Πλοήγησης</string>
     <string name="pause_navigation">Παύση Πλοήγησης</string>
     <string name="keep_navigation_service">Διατήρηση</string>
-	<string name="enable_sleep_mode">Ενεργοποίηση λειτουργίας παρασκηνίου του GPS</string>
-	<string name="gps_wake_up_timer">Διάστημα αφύπνισης GPS</string>
-	<string name="rendering_attr_hideNonVehicleHighways_name">Μη αμαξιτοί δρόμοι</string>
+    <string name="enable_sleep_mode">Ενεργοποίηση λειτουργίας παρασκηνίου του GPS</string>
+    <string name="gps_wake_up_timer">Διάστημα αφύπνισης GPS</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Μη αμαξιτοί δρόμοι</string>
     <string name="rendering_attr_showSurfaces_name">Εμφάνιση οδοστρωμάτων</string>
-    
-    
     <string name="no_index_file_to_download">Δεν βρέθηκαν λήψεις, ελέγξτε τη σύνδεση σας στο διαδίκτυο.</string>
-    
-    
-    
     <string name="lang_al">Αλβανικά</string>
-	<string name="lang_ar">Αραβικά</string>
-	<string name="lang_fa">Περσικά</string>
-	<string name="lang_sr">Σερβικά</string>
-	<string name="lang_zh_cn">Κινέζικα (Απλοποιημένα)</string>
-	<string name="lang_zh_tw">Κινέζικα (Παραδοσιακά)</string>
-	<string name="arrival_distance_factor_early">Νωρίς</string>
+    <string name="lang_ar">Αραβικά</string>
+    <string name="lang_fa">Περσικά</string>
+    <string name="lang_sr">Σερβικά</string>
+    <string name="lang_zh_cn">Κινέζικα (Απλοποιημένα)</string>
+    <string name="lang_zh_tw">Κινέζικα (Παραδοσιακά)</string>
+    <string name="arrival_distance_factor_early">Νωρίς</string>
     <string name="arrival_distance_factor_normally">Κανονικά</string>
     <string name="arrival_distance_factor_late">Αργά</string>
     <string name="arrival_distance_factor_at_last">Στα τελευταία μέτρα</string>
     <string name="keep_informing_descr">Επανάληψη οδηγιών πλοήγησης σε τακτά χρονικά διαστήματα.</string>
-    
-    
-<string name="download_additional_maps">Λήψη απόντων χαρτών %1$s (%2$d MB);</string>
-    <string name="rendering_value_browse_map_name">Επισκόπηση χάρτη</string>  
+    <string name="download_additional_maps">Λήψη απόντων χαρτών %1$s (%2$d MB);</string>
+    <string name="rendering_value_browse_map_name">Επισκόπηση χάρτη</string>
     <string name="rendering_value_car_name">Αυτοκίνητο</string>
     <string name="rendering_value_bicycle_name">Ποδήλατο</string>
     <string name="rendering_value_pedestrian_name">Πεζός</string>
     <string name="gpx_monitoring_start">Έναρξη καταγραφής GPX</string>
-	<string name="gpx_monitoring_stop">Παύση καταγραφής GPX</string>
+    <string name="gpx_monitoring_stop">Παύση καταγραφής GPX</string>
     <string name="gpx_start_new_segment">Έναρξη νέου τμήματος</string>
-    
     <string name="shared_string_all">Όλα</string>
-    
     <string name="way_alarms">Προειδοποιήσεις κυκλοφορίας</string>
     <string name="speak_favorites">Κοντινά αγαπημένα</string>
     <string name="speak_poi">Κοντινά ΣΕ</string>
@@ -1428,18 +1239,17 @@
     <string name="index_tours">Περιηγήσεις</string>
     <string name="shared_string_waypoints">Σημεία διαδρομής</string>
     <string name="save_track_to_gpx_globally">Καταγραφή ίχνους σε αρχείο GPX</string>
-	<string name="save_track_to_gpx_globally_descr">Η γενική καταγραφή θέσης σε αρχείο GPX μπορεί να ενεργοποιηθεί και να απενεργοποιηθεί χρησιμοποιώντας το γραφικό στοιχείο καταγραφής GPX στην οθόνη του χάρτη.</string>
-	<string name="save_track_interval_globally">Διάστημα καταγραφής</string>
-	<string name="rendering_attr_publicTransportMode_name">Λεωφορεία, τρόλεϊ, shuttle routes</string>
-	<string name="confirm_every_run">Πάντα ερώτηση</string>
-	<string name="traffic_warning_speed_limit">Όριο ταχύτητας</string>
+    <string name="save_track_to_gpx_globally_descr">Η γενική καταγραφή θέσης σε αρχείο GPX μπορεί να ενεργοποιηθεί και να απενεργοποιηθεί χρησιμοποιώντας το γραφικό στοιχείο καταγραφής GPX στην οθόνη του χάρτη.</string>
+    <string name="save_track_interval_globally">Διάστημα καταγραφής</string>
+    <string name="rendering_attr_publicTransportMode_name">Λεωφορεία, τρόλεϊ, shuttle routes</string>
+    <string name="confirm_every_run">Πάντα ερώτηση</string>
+    <string name="traffic_warning_speed_limit">Όριο ταχύτητας</string>
     <string name="traffic_warning_border_control">Συνοριακός έλεγχος</string>
     <string name="traffic_warning_payment">Διόδια</string>
     <string name="traffic_warning_stop">Πινακίδα stop</string>
     <string name="traffic_warning_speed_camera">Κάμερα ταχύτητας</string>
     <string name="text_size_descr">Ορίστε το μέγεθος του κειμένου στο χάρτη.</string>
     <string name="text_size">Μέγεθος κειμένου</string>
-    
     <string name="anonymous_user">Ανώνυμος χρήστης</string>
     <string name="logged_as">Συνδεδεμένος ως %1$s</string>
     <string name="impassable_road">Αποφυγή δρόμων…</string>
@@ -1448,159 +1258,148 @@
     <string name="rendering_category_details">Λεπτομέρειες</string>
     <string name="rendering_category_others">Άλλα χαρακτηριστικά χάρτη</string>
     <string name="map_widget_right">Δεξιός πίνακας</string>
-	<string name="map_widget_left">Αριστερός πίνακας</string>
-	<string name="configure_map">Διαμόρφωση χάρτη</string>
+    <string name="map_widget_left">Αριστερός πίνακας</string>
+    <string name="configure_map">Διαμόρφωση χάρτη</string>
     <string name="rendering_attr_tramTrainRoutes_name">Δρομολόγια τραμ και τρένων</string>
-	<string name="rendering_attr_trainLightrailRoutes_name">Δρομολόγια τρένου</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Δρομολόγια τρένου</string>
     <string name="rendering_attr_tramRoutes_name">Δρομολόγια τραμ</string>
     <string name="rendering_attr_trolleybusRoutes_name">Δρομολόγια τρόλεϊ</string>
     <string name="rendering_attr_busRoutes_name">Δρομολόγια λεωφορείων</string>
     <string name="rendering_category_transport">Μεταφορές</string>
     <string name="map_widget_top">Γραμμή κατάστασης</string>
-	<string name="speed_limit_exceed">Ανοχή ορίου ταχύτητας</string>
-	<string name="download_tab_downloads">Όλες οι λήψεις</string>
+    <string name="speed_limit_exceed">Ανοχή ορίου ταχύτητας</string>
+    <string name="download_tab_downloads">Όλες οι λήψεις</string>
     <string name="download_tab_updates">Ενημερώσεις</string>
     <string name="download_tab_local">Τοπικά</string>
-	<string name="no_internet_connection">Αδύνατη η λήψη, παρακαλούμε ελέγξτε τη σύνδεση σας στο διαδίκτυο.</string>
+    <string name="no_internet_connection">Αδύνατη η λήψη, παρακαλούμε ελέγξτε τη σύνδεση σας στο διαδίκτυο.</string>
     <string name="everything_up_to_date">Όλα τα αρχεία είναι ενημερωμένα</string>
-    
-	<string name="map_update">Υπάρχουν ενημερώσεις για %1$s χάρτες</string>
-	<string name="search_for">Αναζήτηση για</string>
-	<string name="coordinates">Συντεταγμένες</string>
-	<string name="dash_download_msg">Έχετε κατεβάσει %1$s χάρτες</string>
+    <string name="map_update">Υπάρχουν ενημερώσεις για %1$s χάρτες</string>
+    <string name="search_for">Αναζήτηση για</string>
+    <string name="coordinates">Συντεταγμένες</string>
+    <string name="dash_download_msg">Έχετε κατεβάσει %1$s χάρτες</string>
     <string name="dash_download_new_one">Λήψη Νέου Χάρτη</string>
     <string name="map_locale">Γλώσσα χάρτη</string>
     <string name="rendering_attr_roadStyle_name">Μορφή δρόμου</string>
     <string name="rendering_value_default_name">Προκαθορισμένο</string>
     <string name="rendering_value_orange_name">Πορτοκαλί</string>
     <string name="traffic_warning_railways">Διασταύρωση σιδηροτροχιάς</string>
-	<string name="show_railway_warnings">Διασταυρώσεις σιδηροτροχιάς</string>
-	<string name="show_pedestrian_warnings">Διαβάσεις πεζών</string>
+    <string name="show_railway_warnings">Διασταυρώσεις σιδηροτροχιάς</string>
+    <string name="show_pedestrian_warnings">Διαβάσεις πεζών</string>
     <string name="rendering_attr_transportStops_name">Στάσεις ΜΜΜ</string>
     <string name="shared_string_dismiss">Απόρριψη</string>
-    
-	<string name="speak_pedestrian">Διαβάσεις πεζών</string>
+    <string name="speak_pedestrian">Διαβάσεις πεζών</string>
     <string name="traffic_warning_pedestrian">Διάβαση πεζών</string>
-	<string name="routing_attr_no_new_routing_name">Κανόνες δρομολόγησης v1.9</string>
+    <string name="routing_attr_no_new_routing_name">Κανόνες δρομολόγησης v1.9</string>
     <string name="routing_attr_no_new_routing_description">Να μην χρησιμοποιηθούν οι κανόνες δρομολόγησης που εισήχθησαν στην έκδοση 1.9.</string>
     <string name="dash_download_msg_none">Λήψη χαρτών χωρίς σύνδεση;</string>
     <string name="dash_download_manage">Διαχείριση</string>
-    
     <string name="navigate_point_zone">Ζώνη</string>
     <string name="error_avoid_specific_road">Δεν βρέθηκε παράκαμψη</string>
-    
-    
-	<string name="wake_on_voice">Άναμμα οθόνης</string>
+    <string name="wake_on_voice">Άναμμα οθόνης</string>
     <string name="map_widget_appearance_rem">Εναπομείναντα στοιχεία</string>
     <string name="speed_limit_exceed_message">Επιλέξτε το περιθώριο του ορίου ταχύτητας, πάνω από το οποίο θα ακούτε ηχητική προειδοποίηση.</string>
-	<string name="fav_point_dublicate_message">Το καθορισμένο όνομα αγαπημένου είναι ήδη σε χρήση, αλλάχτηκε σε %1$s για να αποφευχθούν διπλά ονόματα.</string>
+    <string name="fav_point_dublicate_message">Το καθορισμένο όνομα αγαπημένου είναι ήδη σε χρήση, αλλάχτηκε σε %1$s για να αποφευχθούν διπλά ονόματα.</string>
     <string name="rendering_value_germanRoadAtlas_name">Γερμανικός άτλαντας δρόμων</string>
-	<string name="rendering_value_americanRoadAtlas_name">Αμερικάνικος άτλαντας δρόμων</string>
+    <string name="rendering_value_americanRoadAtlas_name">Αμερικάνικος άτλαντας δρόμων</string>
     <string name="use_opengl_render">Χρήση αποτύπωσης OpenGL</string>
     <string name="use_opengl_render_descr">Χρήση αποτύπωσης με επιτάχυνση υλικού OpenGL (μπορεί να χρησιμοποιεί περισσότερη μπαταρία, ή να μη λειτουργεί σε πολύ παλιές συσκευές).</string>
     <string name="wake_on_voice_descr">Ενεργοποίση της οθόνης της συσκευής (εάν είναι ανενεργή) όταν πλησιάζετε μια στροφή.</string>
     <string name="traffic_warning">Προειδοποίηση κυκλοφοριακού</string>
-	<string name="save_global_track_interval">Γενικό διάστημα καταγραφής</string>
-	<string name="use_displayed_track_for_navigation">Να χρησιμοποιηθεί το εμφανιζόμενο ίχνος για πλοήγηση;</string>
+    <string name="save_global_track_interval">Γενικό διάστημα καταγραφής</string>
+    <string name="use_displayed_track_for_navigation">Να χρησιμοποιηθεί το εμφανιζόμενο ίχνος για πλοήγηση;</string>
     <string name="route_descr_destination">Προορισμός</string>
     <string name="voices">Φωνητικές οδηγίες</string>
-	<string name="parking_place">Χώρος στάθμευσης</string>
+    <string name="parking_place">Χώρος στάθμευσης</string>
     <string name="gps_status">Κατάσταση GPS</string>
     <string name="shared_string_gpx_points">Σημεία</string>
-    
-    
-	<string name="navigation_over_track">Έναρξη πλοήγησης κατά μήκος του ίχνους;</string>
-	<string name="edit_group">Επεξεργασία ομάδας</string>
+    <string name="navigation_over_track">Έναρξη πλοήγησης κατά μήκος του ίχνους;</string>
+    <string name="edit_group">Επεξεργασία ομάδας</string>
     <string name="remove_the_tag">ΑΦΑΙΡΕΣΗ ΕΤΙΚΕΤΑΣ</string>
     <string name="proxy_pref_title">Διαμεσολαβητής</string>
-    
-    
-	<string name="shared_string_ellipsis">…</string>
-	<string name="shared_string_enable">Ενεργοποίηση</string>
-	<string name="shared_string_disable">Απενεργοποίηση</string>
-	<string name="shared_string_enabled">Ενεργοποιημένο</string>
-	<string name="shared_string_disabled">Απενεργοποιημένο</string>
-	<string name="shared_string_selected">Επιλεγμένο</string>
-	<string name="shared_string_selected_lowercase">επιλεγμένο</string>
-	<string name="shared_string_never">Ποτέ</string>
-	<string name="shared_string_none">Κανένα</string>
-	<string name="shared_string_and">και</string>
-	<string name="shared_string_or">ή</string>
-	<string name="shared_string_help">Βοήθεια</string>
-	<string name="shared_string_settings">Επιλογές</string>
-	<string name="shared_string_history">Ιστορικό</string>
-	<string name="shared_string_select_on_map">Επιλέξτε στον χάρτη</string>
-	<string name="shared_string_select_all">Επιλογή όλων</string>
-	<string name="shared_string_deselect">Αποεπιλογή</string>
-	<string name="shared_string_clear">Καθαρισμός</string>
-	<string name="shared_string_clear_all">Καθαρισμός όλων</string>
-	<string name="shared_string_save">Αποθήκευση</string>
-	<string name="shared_string_rename">Μετονομασία</string>
-	<string name="shared_string_delete">Διαγραφή</string>
-	<string name="shared_string_delete_all">Διαγραφή όλων</string>
-	<string name="shared_string_add">Προσθήκη</string>
-	<string name="shared_string_import">Εισαγωγή</string>
-	<string name="shared_string_export">Εξαγωγή</string>
-	<string name="shared_string_more">Περισσότερα…</string>
-	<string name="shared_string_download">Λήψη</string>
-	<string name="shared_string_download_successful">Μεταφορτώθηκε</string>
-	<string name="shared_string_action_template">Ενέργεια {0}</string>
-	<string name="shared_string_close">Κλείσιμο</string>
-	<string name="shared_string_exit">Έξοδος</string>
-	<string name="shared_string_show">Εμφάνιση</string>
-	<string name="shared_string_show_all">Εμφάνιση όλων</string>
-	<string name="shared_string_show_on_map">Εμφάνιση στον χάρτη</string>
-	<string name="shared_string_map">Χάρτης</string>
-	<string name="shared_string_favorites">Αγαπημένα</string>
-	<string name="shared_string_add_to_favorites">Προσθήκη στα \'Αγαπημένα\'</string>
-	<string name="shared_string_my_location">Η Τοποθεσία μου</string>
-	<string name="shared_string_my_places">Τα μέρη μου</string>
-	<string name="shared_string_my_favorites">Τα Αγαπημένα</string>
-	<string name="shared_string_tracks">Ίχνη</string>
-	<string name="shared_string_audio">Ήχος</string>
-	<string name="shared_string_video">Εικόνα</string>
-	<string name="shared_string_photo">Φωτογραφία</string>
-
-	<string name="osmand_parking_time_left">αριστερά</string> <string name="your_edits">Η επεξεργασίες σου</string>
+    <string name="shared_string_ellipsis">…</string>
+    <string name="shared_string_enable">Ενεργοποίηση</string>
+    <string name="shared_string_disable">Απενεργοποίηση</string>
+    <string name="shared_string_enabled">Ενεργοποιημένο</string>
+    <string name="shared_string_disabled">Απενεργοποιημένο</string>
+    <string name="shared_string_selected">Επιλεγμένο</string>
+    <string name="shared_string_selected_lowercase">επιλεγμένο</string>
+    <string name="shared_string_never">Ποτέ</string>
+    <string name="shared_string_none">Κανένα</string>
+    <string name="shared_string_and">και</string>
+    <string name="shared_string_or">ή</string>
+    <string name="shared_string_help">Βοήθεια</string>
+    <string name="shared_string_settings">Επιλογές</string>
+    <string name="shared_string_history">Ιστορικό</string>
+    <string name="shared_string_select_on_map">Επιλέξτε στον χάρτη</string>
+    <string name="shared_string_select_all">Επιλογή όλων</string>
+    <string name="shared_string_deselect">Αποεπιλογή</string>
+    <string name="shared_string_clear">Καθαρισμός</string>
+    <string name="shared_string_clear_all">Καθαρισμός όλων</string>
+    <string name="shared_string_save">Αποθήκευση</string>
+    <string name="shared_string_rename">Μετονομασία</string>
+    <string name="shared_string_delete">Διαγραφή</string>
+    <string name="shared_string_delete_all">Διαγραφή όλων</string>
+    <string name="shared_string_add">Προσθήκη</string>
+    <string name="shared_string_import">Εισαγωγή</string>
+    <string name="shared_string_export">Εξαγωγή</string>
+    <string name="shared_string_more">Περισσότερα…</string>
+    <string name="shared_string_download">Λήψη</string>
+    <string name="shared_string_download_successful">Μεταφορτώθηκε</string>
+    <string name="shared_string_action_template">Ενέργεια {0}</string>
+    <string name="shared_string_close">Κλείσιμο</string>
+    <string name="shared_string_exit">Έξοδος</string>
+    <string name="shared_string_show">Εμφάνιση</string>
+    <string name="shared_string_show_all">Εμφάνιση όλων</string>
+    <string name="shared_string_show_on_map">Εμφάνιση στον χάρτη</string>
+    <string name="shared_string_map">Χάρτης</string>
+    <string name="shared_string_favorites">Αγαπημένα</string>
+    <string name="shared_string_add_to_favorites">Προσθήκη στα \'Αγαπημένα\'</string>
+    <string name="shared_string_my_location">Η Τοποθεσία μου</string>
+    <string name="shared_string_my_places">Τα μέρη μου</string>
+    <string name="shared_string_my_favorites">Τα Αγαπημένα</string>
+    <string name="shared_string_tracks">Ίχνη</string>
+    <string name="shared_string_audio">Ήχος</string>
+    <string name="shared_string_video">Εικόνα</string>
+    <string name="shared_string_photo">Φωτογραφία</string>
+    <string name="osmand_parking_time_left">αριστερά</string>
+    <string name="your_edits">Η επεξεργασίες σου</string>
     <string name="waypoint_visit_after">Επίσκεψη μετά</string>
     <string name="waypoint_visit_before">Επίσκεψη πριν</string>
     <string name="routing_settings_2">Ρυθμίσεις πλοήγησης</string>
     <string name="general_settings_2">Γενικές ρυθμίσεις</string>
-	<string name="shared_string_deselect_all">Αποεπιλογή όλων</string>
-	<string name="shared_string_collapse">Κατάρρευση</string>
-	<string name="route_points">Σημεία δρομολογίου</string>
-	<string name="agps_info">Πληροφορίες A-GPS</string>
-	<string name="agps_data_last_downloaded">Τελευταία λήψη δεδομένων A-GPS: %1$s</string>
+    <string name="shared_string_deselect_all">Αποεπιλογή όλων</string>
+    <string name="shared_string_collapse">Κατάρρευση</string>
+    <string name="route_points">Σημεία δρομολογίου</string>
+    <string name="agps_info">Πληροφορίες A-GPS</string>
+    <string name="agps_data_last_downloaded">Τελευταία λήψη δεδομένων A-GPS: %1$s</string>
     <string name="welmode_download_maps">Λήψη χαρτών</string>
-	<string name="welcome_select_region">Για να αντικατοπτρίζονται σωστά ο κώδικας και τα σήματα κυκλοφορίας, παρακαλώ επιλέξτε την περιοχή οδήγησής σας:</string>
-	<string name="welcome_header">Καλώς ήλθατε</string>
+    <string name="welcome_select_region">Για να αντικατοπτρίζονται σωστά ο κώδικας και τα σήματα κυκλοφορίας, παρακαλώ επιλέξτε την περιοχή οδήγησής σας:</string>
+    <string name="welcome_header">Καλώς ήλθατε</string>
     <string name="current_route">Τρέχουσα διαδρομή</string>
     <string name="mark_to_delete">Σήμανση για διαγραφή</string>
-	
-	<string name="local_osm_changes_upload_all_confirm">Πρόκειται να ανεβάσετε %1$d αλλαγές στο OSM. Είστε σίγουρος;</string>
+    <string name="local_osm_changes_upload_all_confirm">Πρόκειται να ανεβάσετε %1$d αλλαγές στο OSM. Είστε σίγουρος;</string>
     <string name="confirmation_to_clear_history">Να καθαριστεί το ιστορικό;</string>
     <string name="osm_edits">Επεξεργασίες OSM</string>
-	<string name="osmand_parking_hour">ω</string>
-	<string name="osmand_parking_minute">λεπτά</string>
-	<string name="tips_and_tricks_descr">Συχνές ερωτήσεις, πρόσφατες αλλαγές και άλλα.</string>
+    <string name="osmand_parking_hour">ω</string>
+    <string name="osmand_parking_minute">λεπτά</string>
+    <string name="tips_and_tricks_descr">Συχνές ερωτήσεις, πρόσφατες αλλαγές και άλλα.</string>
     <string name="shared_string_unexpected_error">Αναπάντεχο σφάλμα</string>
-	<string name="shared_string_currently_recording_track">Τρέχουσα καταγραφή ίχνους</string>
-	
-	<string name="plugin_nautical_name">Προβολή Ναυτικού χάρτη</string>
-	<string name="rename_failed">Η μετονομασία απέτυχε.</string>
-	<string name="days_behind">ημέρες πίσω</string>
-	<string name="back_to_map">Πίσω στο χάρτη</string>
-	<string name="share_note">Κοινή χρήση σημείωσης</string>
+    <string name="shared_string_currently_recording_track">Τρέχουσα καταγραφή ίχνους</string>
+    <string name="plugin_nautical_name">Προβολή Ναυτικού χάρτη</string>
+    <string name="rename_failed">Η μετονομασία απέτυχε.</string>
+    <string name="days_behind">ημέρες πίσω</string>
+    <string name="back_to_map">Πίσω στο χάρτη</string>
+    <string name="share_note">Κοινή χρήση σημείωσης</string>
     <string name="notes">Σημειώσεις</string>
-	<string name="roads_only">Μόνο δρόμοι</string>
+    <string name="roads_only">Μόνο δρόμοι</string>
     <string name="free">"Ελεύθερο %1$s "</string>
-	<string name="device_memory">Μνήμη συσκευής</string>
+    <string name="device_memory">Μνήμη συσκευής</string>
     <string name="rendering_attr_streetLighting_name">Φωτισμός οδών</string>
     <string name="rendering_attr_subwayMode_name">Δρομολόγια μετρό</string>
     <string name="enable_proxy_title">Ενεργοποίηση διακομιστή μεσολάβησης HTTP</string>
-	<string name="proxy_host_title">Διαμεσολαβητής</string>
-	<string name="rendering_attr_hideHouseNumbers_name">Αριθμοί σπιτιών</string>
-    <string name="copying_osmand_file_failed">Η αντιγραφή των αρχείων απέτυχε</string>    
+    <string name="proxy_host_title">Διαμεσολαβητής</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Αριθμοί σπιτιών</string>
+    <string name="copying_osmand_file_failed">Η αντιγραφή των αρχείων απέτυχε</string>
     <string name="storage_directory_external">Εξωτερικό αποθηκευτικό μέσο</string>
     <string name="storage_directory_internal_app">Εσωτερική μνήμη εφαρμογής</string>
     <string name="storage_directory_manual">Καθορισμένο χειροκίνητα</string>
@@ -1608,17 +1407,17 @@
     <string name="shared_string_copy">Αντιγραφή</string>
     <string name="shared_string_is_open">Άνοιγμα</string>
     <string name="shared_string_edit">Επεξεργασία</string>
-	<string name="shared_string_places">Μέρη</string>
-	<string name="shared_string_search">Αναζήτηση</string>
-	<string name="shared_string_show_description">Εμφάνιση περιγραφής.</string>
-	<string name="shared_string_message">Μήνυμα</string>
-	<string name="shared_string_address">Διεύθυνση</string>
-	<string name="avoid_roads_msg">Προκαλέσετε μια εναλλακτική διαδρομή επιλέγοντας δρόμους προς αποφυγή</string>
-	<string name="traffic_warning_hazard">Κίνδυνος</string>
+    <string name="shared_string_places">Μέρη</string>
+    <string name="shared_string_search">Αναζήτηση</string>
+    <string name="shared_string_show_description">Εμφάνιση περιγραφής.</string>
+    <string name="shared_string_message">Μήνυμα</string>
+    <string name="shared_string_address">Διεύθυνση</string>
+    <string name="avoid_roads_msg">Προκαλέσετε μια εναλλακτική διαδρομή επιλέγοντας δρόμους προς αποφυγή</string>
+    <string name="traffic_warning_hazard">Κίνδυνος</string>
     <string name="rendering_value_boldOutline_name">Έντονο περίγραμμα</string>
     <string name="no_updates_available">Δεν υπάρχουν διαθέσιμες ενημερώσεις</string>
     <string name="rendering_value_default13_name">Προεπιλογή (13)</string>
-	<string name="rendering_value_defaultTranslucentCyan_name">Προεπιλογή (ημιδιαφανές κυανό)</string>
+    <string name="rendering_value_defaultTranslucentCyan_name">Προεπιλογή (ημιδιαφανές κυανό)</string>
     <string name="rendering_attr_currentTrackColor_name">χρώμα GPX</string>
     <string name="rendering_attr_currentTrackWidth_name">πλάτος GPX</string>
     <string name="rendering_value_red_name">Κόκκινο</string>
@@ -1662,7 +1461,6 @@
     <string name="gps_network_not_enabled">Η υπηρεσία τοποθεσίας δεν είναι ενεργοποιημένη. Θέλετε να την ενεργοποιήσετε;</string>
     <string name="shared_string_import2osmand">Εισαγωγή στον OsmAnd</string>
     <string name="read_full_article">Διαβάστε ολόκληρο το άρθρο (με σύνδεση)</string>
-    
     <string name="local_indexes_cat_wiki">Βικιπαίδεια</string>
     <string name="shared_string_show_details">Προβολή λεπτομερειών</string>
     <string name="osm_edit_context_menu_delete">Διαγραφή επεξεργασίας OSM</string>
@@ -1671,26 +1469,25 @@
     <string name="application_dir_change_warning3">Να αντιγραφούν τα αρχεία δεδομένων του OsmAnd στον νέο προορισμό;</string>
     <string name="filter_poi_hint">Φιλτράρισμα κατά όνομα</string>
     <string name="shared_string_manage">Διαχείριση</string>
-	<string name="local_recordings_delete_all_confirm">Πρόκειται να διαγράψεις %1$d σημειώσεις. Είσαι σίγουρος?</string>
-	<string name="delay_to_start_navigation">Εκκίνηση πλοήγησης στροφή προς στροφή μετά από.…</string>
+    <string name="local_recordings_delete_all_confirm">Πρόκειται να διαγράψεις %1$d σημειώσεις. Είσαι σίγουρος?</string>
+    <string name="delay_to_start_navigation">Εκκίνηση πλοήγησης στροφή προς στροφή μετά από.…</string>
     <string name="shared_string_go">Εκτέλεση</string>
-	<string name="short_location_on_map">Γ. Πλ %1$s
+    <string name="short_location_on_map">Γ. Πλ %1$s
 \nΓ. Μηκ %2$s</string>
     <string name="track_segments">Τμήματα διαδρομής</string>
-	<string name="track_points">Σημεία της διαδρομής</string>
-	<string name="location_on_map">Τοποθεσία:\n Γ. Πλ %1$s\n Γ. Μηκ %2$s</string>
-	<string name="rendering_value__name">Προκαθορισμένο</string>
+    <string name="track_points">Σημεία της διαδρομής</string>
+    <string name="location_on_map">Τοποθεσία:\n Γ. Πλ %1$s\n Γ. Μηκ %2$s</string>
+    <string name="rendering_value__name">Προκαθορισμένο</string>
     <string name="print_route">Εκτύπωση διαδρομής</string>
     <string name="osmand_parking_overdue">εκπρόθεσμο</string>
-	<string name="simulate_your_location">Προσομοίωση της θέση σας</string>
+    <string name="simulate_your_location">Προσομοίωση της θέση σας</string>
     <string name="rendering_value_highContrastRoads_name">Δρόμοι με υψηλή αντίθεση</string>
-	<string name="plugin_settings">Πρόσθετα</string>
-	<string name="av_locations">Τοποθεσίες</string>
+    <string name="plugin_settings">Πρόσθετα</string>
+    <string name="av_locations">Τοποθεσίες</string>
     <string name="favorite_category_dublicate_message">Παρακαλούμε, χρησιμοποιήστε όνομα κατηγορίας που δεν υπάρχει ήδη.</string>
     <string name="favorite_category_name">Όνομα κατηγορίας</string>
     <string name="favorite_category_add_new_title">Προσθήκη νέας κατηγορίας</string>
     <string name="regions">Περιοχές</string>
-    
     <string name="world_maps">Παγκόσμιοι χάρτες</string>
     <string name="srtm_plugin_disabled">Ισοϋψείς γραμμές απενεργοποιημένες</string>
     <string name="favorite_category_add_new">Προσθήκη νέου</string>
@@ -1710,12 +1507,12 @@
     <string name="navigate_point_northing">Βόρεια</string>
     <string name="navigate_point_easting">Ανατολικά</string>
     <string name="proxy_port_title">Θύρα διακομιστή μεσολάβησης</string>
-	<string name="recalculate_route">Επαναυπολογισμός διαδρομής</string>
+    <string name="recalculate_route">Επαναυπολογισμός διαδρομής</string>
     <string name="donations">Δωρεές</string>
     <string name="osm_live_subscribe_btn">Εγγραφή</string>
     <string name="osm_live_user_public_name">Δημόσιο Όνομα</string>
     <string name="app_mode_bus">Λεωφορείο</string>
- 	<string name="app_mode_train">Τρένο</string>
+    <string name="app_mode_train">Τρένο</string>
     <string name="map_widget_battery">Στάθμη μπαταρίας</string>
     <!-- string name="lat_lon_pattern">Γ. Πλ:%1$.5f Γ. Μηκ: %2$.5f</string -->
     <string name="follow_us">Ακολούθησε μας</string>
@@ -1815,16 +1612,16 @@
     <string name="enter_lon">Εισάγετε το γεωγραφικό μήκος</string>
     <string name="enter_lat">Εισάγετε το γεωγραφικό πλάτος</string>
     <string name="enter_lat_and_lon">Εισάγετε γεωγραφικό πλάτος και μήκος</string>
-	<string name="dd_mm_ss_format">ΜΜ°ΠΠ′ΔΔ″</string>
-	<string name="dd_dddddd_format">ΜΜ.ΜΜΜΜΜΜ°</string>
-	<string name="dd_ddddd_format">ΜΜ.ΜΜΜΜΜ°</string>
-	<string name="dd_mm_mmmm_format">ΜΜ°ΠΠ.ΠΠΠΠ′</string>
-	<string name="dd_mm_mmm_format">ΜΜ°ΠΠ.ΠΠΠ′</string>
-	<string name="east_abbreviation">Α</string>
-	<string name="west_abbreviation">Δ</string>
-	<string name="south_abbreviation">Ν</string>
-	<string name="north_abbreviation">Β</string>
-	<string name="optional_point_name">Προαιρετικό όνομα σημείου</string>
+    <string name="dd_mm_ss_format">ΜΜ°ΠΠ′ΔΔ″</string>
+    <string name="dd_dddddd_format">ΜΜ.ΜΜΜΜΜΜ°</string>
+    <string name="dd_ddddd_format">ΜΜ.ΜΜΜΜΜ°</string>
+    <string name="dd_mm_mmmm_format">ΜΜ°ΠΠ.ΠΠΠΠ′</string>
+    <string name="dd_mm_mmm_format">ΜΜ°ΠΠ.ΠΠΠ′</string>
+    <string name="east_abbreviation">Α</string>
+    <string name="west_abbreviation">Δ</string>
+    <string name="south_abbreviation">Ν</string>
+    <string name="north_abbreviation">Β</string>
+    <string name="optional_point_name">Προαιρετικό όνομα σημείου</string>
     <string name="transport_nearby_routes_within">Κοντινές διαδρομές</string>
     <string name="transport_nearby_routes">Με</string>
     <string name="enter_the_file_name">Πληκτρολογήστε το όνομα του αρχείου.</string>
@@ -1885,12 +1682,12 @@
     <string name="import_as_gpx">Εισαγωγή ως αρχείο GPX</string>
     <string name="import_as_favorites">Εισαγωγή ως αγαπημένου</string>
     <string name="import_file">Εισαγωγή αρχείου</string>
-	<string name="wrong_input">Εσφαλμένη εισαγωγή</string>
-	<string name="enter_new_name">Εισάγετε νέο όνομα</string>
-	<string name="shared_string_back">Προηγούμενο</string>
-	<string name="shared_string_view">Προβολή</string>
-	<string name="waypoints_added_to_map_markers">Προστέθηκαν σημεία διαδρομής στους δείκτες χάρτη</string>
-	<string name="wrong_format">Εσφαλμένη μορφή</string>
+    <string name="wrong_input">Εσφαλμένη εισαγωγή</string>
+    <string name="enter_new_name">Εισάγετε νέο όνομα</string>
+    <string name="shared_string_back">Προηγούμενο</string>
+    <string name="shared_string_view">Προβολή</string>
+    <string name="waypoints_added_to_map_markers">Προστέθηκαν σημεία διαδρομής στους δείκτες χάρτη</string>
+    <string name="wrong_format">Εσφαλμένη μορφή</string>
     <string name="shared_string_road">Δρόμος</string>
     <string name="show_map">Εμφάνιση χάρτη</string>
     <string name="route_is_calculated">Υπολογίστηκε η διαδρομή</string>
@@ -2037,7 +1834,6 @@
     <string name="depth_contour_descr">Χάρτες ισοϋψών γραμμών βάθους θαλάσσης και ναυτικών σημείων.</string>
     <string name="sea_depth_thanks">Σας ευχαριστούμε για την αγορά των ναυτικών ισοβαθών</string>
     <string name="index_item_depth_contours_osmand_ext">Ναυτικές ισοβαθείς καμπύλες</string>
-    
     <string name="index_item_world_wikivoyage">Παγκόσμια άρθρα βικιταξιδιών</string>
     <string name="index_item_depth_points_southern_hemisphere">Ναυτικά σημεία βάθους νοτίου ημισφαιρίου</string>
     <string name="index_item_depth_points_northern_hemisphere">Ναυτικά σημεία βάθους βορείου ημισφαιρίου</string>
@@ -2110,9 +1906,6 @@
     <string name="routing_attr_height_obstacles_description">Συντελεστής σε ανύψωση εδάφους (μέσω SRTM, ASTER και δεδομένων EU-DEM).</string>
     <string name="rendering_attr_depthContours_description">Εμφάνιση ισοβαθών καμπυλών και σημείων.</string>
     <string name="rendering_attr_depthContours_name">Ναυτικές ισοβαθείς καμπύλες</string>
-    
-    
-    
     <string name="auto_split_recording_title">Καταγραφές αυτόματης διαίρεσης μετά από κενό</string>
     <string name="auto_split_recording_descr">Εκκίνηση νέου τμήματος μετά από κενό 6 λεπτών, νέο ίχνος μετά από κενό 2 ωρών, ή νέο αρχείο μετά από πιο μεγάλο κενό, εάν έχει αλλάξει η ημερομηνία.</string>
     <string name="rendering_value_high_name">Υψηλή</string>
@@ -2141,13 +1934,11 @@
     <string name="shared_string_continue">Συνέχεια</string>
     <string name="shared_string_pause">Παύση</string>
     <string name="online_webpage_warning">Η σελίδα είναι διαθέσιμη μόνο διαδικτυακά. Να ανοιχθεί με έναν πλοηγητή ιστού;</string>
-    
     <string name="shared_string_paused">Σε παύση</string>
     <string name="shared_string_trip">Ταξίδι</string>
     <string name="shared_string_recorded">Καταγεγραμμένο</string>
     <string name="shared_string_record">Καταγραφή</string>
     <string name="gpx_logging_no_data">Χωρίς δεδομένα</string>
-    
     <string name="rendering_attr_contourColorScheme_description">Χρωματικοί συνδυασμοί ισοϋψών γραμμών</string>
     <string name="save_track_min_speed">Ελάχιστη ταχύτητα για σύνδεση</string>
     <string name="save_track_min_speed_descr">Φίλτρο: Χωρίς σύνδεση σημείων κάτω από αυτήν την ταχύτητα.</string>
@@ -2217,7 +2008,6 @@
     <string name="back_to_search">Πίσω στην αναζήτηση</string>
     <string name="confirmation_to_delete_history_items">Να αφαιρεθούν τα επιλεγμένα στοιχεία από το \'Ιστορικό\';</string>
     <string name="show_something_on_map">Εμφάνιση του %1$s στον χάρτη</string>
-    
     <string name="dist_away_from_my_location">"Αναζήτηση %1$s μακριά "</string>
     <string name="share_history_subject">κοινόχρηστο μέσω του OsmAnd</string>
     <string name="search_categories">Κατηγορίες</string>
@@ -2276,7 +2066,6 @@
 \n- Να συγχρονίσει ομάδες και συσκευές με τον διακομιστή, 
 \n- Να διαχειριστεί ομάδες και συσκευές σε προσωπικό πίνακα εργαλείων στον ιστότοπο.</string>
     <string name="storage_permission_restart_is_required">Επιτρέπεται από την εφαρμογή τώρα να γράψει σε εξωτερικό αποθηκευτικό χώρο, αλλά χρειάζεται να ξαναξεκινήσει για να γίνει αυτό.</string>
-    
     <string name="shared_string_move_up">Μετακίνηση ↑</string>
     <string name="shared_string_move_down">Μετακίνηση ↓</string>
     <string name="finish_navigation">Ολοκλήρωση πλοήγησης</string>
@@ -2452,7 +2241,6 @@
     <string name="lang_br">Βρετονικά</string>
     <string name="lang_ml">Μαλαγιαλαμικά</string>
     <string name="lang_lo">Λαοϊκά</string>
-    
     <string name="share_geo">γεω:</string>
     <string name="routing_attr_avoid_shuttle_train_name">Αποφυγή τρένου κλειστής διαδρομής</string>
     <string name="routing_attr_avoid_shuttle_train_description">Αποφυγή χρήσης τρένου κλειστής διαδρομής</string>
@@ -2719,7 +2507,8 @@
     <string name="index_name_netherlands">Ευρώπη - Κάτω Χώρες</string>
     <string name="shared_string_others">Άλλα</string>
     <string name="shared_string_release">Εκδόθηκε</string>
-    <string name="create_poi_link_to_osm_doc"><u>Διαδικτυακό OSM</u> ταξινόμηση χαρτών με εικόνες.</string>
+    <string name="create_poi_link_to_osm_doc">
+        <u>Διαδικτυακό OSM</u> ταξινόμηση χαρτών με εικόνες.</string>
     <string name="share_fav_subject">Αγαπημένα που μοιράστηκαν μέσω του OsmAnd</string>
     <string name="favourites_context_menu_add">Προσθήκη αγαπημένου</string>
     <string name="poi_action_delete">διαγραφή</string>
@@ -2934,31 +2723,29 @@
     <string name="toast_empty_name_error">Ανώνυμη τοποθεσία</string>
     <string name="tunnel_warning">Προσέγγιση σήραγγας</string>
     <string name="show_tunnels">Σήραγγες</string>
-<string name="purchase_dialog_title">Επιλογή σχεδίου</string>
+    <string name="purchase_dialog_title">Επιλογή σχεδίου</string>
     <string name="purchase_dialog_travel_description">Αγοράσετε ένα από τα παρακάτω για να πάρετε τη λειτουργία οδηγού ταξιδιών χωρίς σύνδεση :</string>
     <string name="purchase_dialog_subtitle">Επιλέξτε κατάλληλο στοιχείο:</string>
-    <string name="monthly_map_updates">Ενημερώσεις χαρτών: <b>κάθε μήνα</b></string>
-    <string name="daily_map_updates">Ενημερώσεις χαρτών: <b>κάθε ώρα</b></string>
+    <string name="monthly_map_updates">Ενημερώσεις χαρτών: <b>κάθε μήνα</b>
+    </string>
+    <string name="daily_map_updates">Ενημερώσεις χαρτών: <b>κάθε ώρα</b>
+    </string>
     <string name="in_app_purchase">Αγορά μέσω της εφαρμογής</string>
     <string name="in_app_purchase_desc">Εφάπαξ πληρωμή</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">Βικιταξίδια χωρίς σύνδεση</string>
-    
     <string name="unlimited_downloads">Απεριόριστες λήψεις</string>
     <string name="wikipedia_offline">Βικιπαίδεια χωρίς σύνδεση</string>
-    
     <string name="unlock_all_features">Ξεκλείδωμα όλων των χαρακτηριστικών του OsmAnd</string>
-
     <string name="popular_destinations">Δημοφιλείς προορισμοί</string>
     <string name="paid_app">Εφαρμογή επί πληρωμή</string>
     <string name="paid_plugin">Πρόσθετο επί πληρωμή</string>
     <string name="travel_card_update_descr">Νέα δεδομένα βικιταξιδιών είναι διαθέσιμα, ενημερώστε τα για να το απολαύσετε.</string>
-	<string name="travel_card_download_descr">Κατεβάστε τους οδηγούς ταξιδιών των βικιταξιδιών για να προβάλετε τα άρθρα για μέρη σε όλον τον κόσμο χωρίς σύνδεση διαδικτύου.</string>
-	<string name="update_is_available">Υπάρχει διαθέσιμη ενημέρωση</string>
-	<string name="download_file">Λήψη αρχείου</string>
+    <string name="travel_card_download_descr">Κατεβάστε τους οδηγούς ταξιδιών των βικιταξιδιών για να προβάλετε τα άρθρα για μέρη σε όλον τον κόσμο χωρίς σύνδεση διαδικτύου.</string>
+    <string name="update_is_available">Υπάρχει διαθέσιμη ενημέρωση</string>
+    <string name="download_file">Λήψη αρχείου</string>
     <string name="start_editing_card_image_text">Ο ελεύθερος παγκόσμιος ταξιδιωτικός οδηγός που οποιοσδήποτε μπορεί να επεξεργαστεί.</string>
     <string name="welcome_to_open_beta_description">"Το OsmAnd Travel βασίζεται, προς το παρόν, στα βικιταξίδια.  Ελέγξτε όλα τα χαρακτηριστικά δωρεάν κατά την ανοικτή βήμα δοκιμή. Κατόπιν, οι οδηγοί ταξιδιού θα είναι διαθέσιμοι στους συνδρομητές του απεριόριστου OsmAnd και στους κατόχους του OsmAnd+."</string>
     <string name="start_editing_card_description">"Μπορείτε και πρέπει  να επεξεργαστείτε οποιοδήποτε άρθρο στο βικιταξίδια,  Μοιραστείτε τη γνώση, την εμπειρία, το ταλέντο και την προσοχή σας"</string>
@@ -2976,11 +2763,10 @@
     <string name="wiki_article_search_text">Αναζήτηση για το αντίστοιχο άρθρο βίκι</string>
     <string name="wiki_article_not_found">Δεν βρέθηκε το άρθρο</string>
     <string name="how_to_open_wiki_title">Πώς να ανοίξετε τα άρθρα της βικιπαίδειας;</string>
-<string name="osmand_team">Ομάδα OsmAnd</string>
+    <string name="osmand_team">Ομάδα OsmAnd</string>
     <string name="shared_string_restart">Επανεκκίνηση εφαρμογής</string>
     <string name="purchase_cancelled_dialog_title">Έχετε ακυρώσει τη συνδρομή σας στο OsmAnd Live</string>
     <string name="purchase_cancelled_dialog_descr">Ανανεώστε τη συνδρομή για να συνεχίσετε τη χρήση όλων των χαρακτηριστικών:</string>
-
     <string name="maps_you_need_descr">Με βάση τα άρθρα που επισυμάνατε, σας συνιστούμε να κατεβάσετε τους παρακάτω χάρτες:</string>
     <string name="maps_you_need">Χάρτες που χρειάζεστε</string>
     <string name="hide_full_description">Απόκρυψη πλήρους περιγραφής</string>
@@ -3033,7 +2819,9 @@
 \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="send_search_query_description">Θα στείλουμε το ερώτημα αναζήτησής σας:<b>\"%1$s\"</b>,καθώς και την τοποθεσία σας.<br/>
+        <br/> Δεν συλλέγουμε προσωπικές πληροφορίες, χρειαζόμαστε μόνο δεδομένα αναζήτησης για να βελτιώσουμε τον αλγόριθμο αναζήτησης.<br/>
+    </string>
     <string name="send_search_query">Αποστολή ερωτήματος αναζήτησης;</string>
     <string name="shared_string_world">Κόσμος</string>
     <string name="test_voice_desrc">Πιέστε ένα κουμπί και ακούστε την αντίστοιχη φωνητική προτροπή για να ταυτοποιήσετε ελλειπείς ή λανθασμένες προτροπές.</string>
@@ -3079,4 +2867,89 @@
 \n"</string>
     <string name="mapillary_menu_title_pano">Εμφάνιση μόνο εικόνων 360°</string>
     <string name="rendering_value_black_name">Μαύρο</string>
+    <string name="files_moved">Μετακινήθηκαν %1$d αρχεία (%2$s).</string>
+    <string name="files_copied">Αντιγράφτηκαν %1$d αρχεία (%2$s).</string>
+    <string name="files_failed">"Αποτυχία αντιγραφής %1$d αρχείων  (%2$s)."</string>
+    <string name="files_present">Υπάρχουν %1$d αρχεία (%2$s) παρόντα στη προηγούμενη τοποθεσία \'%3$s\'.</string>
+    <string name="move_maps">Μετακίνηση χαρτών</string>
+    <string name="dont_move_maps">Να μην μετακινηθούν</string>
+    <string name="public_transport_ped_route_title">Η διαδρομή με τα πόδια είναι περίπου %1$s και μπορεί να είναι πιο γρήγορη από τις δημόσιες συγκοινωνίες</string>
+    <string name="public_transport_no_route_title">Δυστυχώς, το OsmAnd δεν μπόρεσε να βρει διαδρομή κατάλληλη για τις ρυθμίσεις σας.</string>
+    <string name="public_transport_try_ped">Δοκιμάστε την πλοήγηση πεζών.</string>
+    <string name="public_transport_try_change_settings">Δοκιμάστε να αλλάξετε τις ρυθμίσεις.</string>
+    <string name="public_transport_calc_pedestrian">Υπολογισμός της πεζοπορικής διαδρομής</string>
+    <string name="public_transport_type">Τύπος μετακίνησης</string>
+    <string name="send_log">Αποστολή καταγραφής</string>
+    <string name="routing_attr_avoid_tram_name">Αποφυγή τραμ</string>
+    <string name="routing_attr_avoid_tram_description">Αποφυγή τραμ</string>
+    <string name="routing_attr_avoid_bus_name">Αποφυγή λεωφορείων</string>
+    <string name="routing_attr_avoid_bus_description">Αποφυγή λεωφορείων και τρόλεϊ</string>
+    <string name="routing_attr_avoid_share_taxi_name">Αποφυγή κοινού ταξί</string>
+    <string name="routing_attr_avoid_share_taxi_description">Αποφυγή κοινού ταξί</string>
+    <string name="routing_attr_avoid_train_name">Αποφυγή τρένων</string>
+    <string name="routing_attr_avoid_train_description">Αποφυγή τρένων</string>
+    <string name="routing_attr_avoid_subway_name">Αποφυγή μετρό</string>
+    <string name="routing_attr_avoid_subway_description">Αποφυγή μετρό και ελαφριάς σιδηροτροχιάς</string>
+    <string name="routing_attr_avoid_ferry_name">Αποφυγή πορθμείων</string>
+    <string name="routing_attr_avoid_ferry_description">Αποφυγή πορθμείων</string>
+    <string name="release_3_3_7">• Εμφάνιση του χρόνου μεταξύ μεταφορών στις δημόσιες συγκοινωνίες
+\n
+\n • Διόρθωση διεπαφής χρήστη για τις λεπτομέρειες της διαδρομής
+\n
+\n • Διόρθωση σκούρου θέματος στο μενού κατεύθυνσης και στις λεπτομέρειες διαδρομής
+\n
+\n • Εμφάνιση του αζιμουθίου στη μέτρηση απόστασης
+\n
+\nΜετάφραση
+\n
+\n</string>
+    <string name="shared_string_degrees">Μοίρες</string>
+    <string name="shared_string_milliradians">Χιλιοστά ακτινίων</string>
+    <string name="angular_measeurement">Γωνιακές μονάδες μέτρησης</string>
+    <string name="angular_measeurement_descr">Αλλαγή τρόπου μέτρησης αζιμουθίου.</string>
+    <string name="avoid_pt_types_descr">Επιλογή τύπων δημόσιων μεταφορών προς αποφυγή στην πλοήγηση:</string>
+    <string name="quick_action_day_night_mode">%s κατάστασης</string>
+    <string name="avoid_pt_types">Αποφυγή τύπων μεταφορών…</string>
+    <string name="shared_string_walk">Περπάτημα</string>
+    <string name="save_poi_value_exceed_length">Το μέγιστο μήκος της ετικέτας \"%s\" είναι 255χαρακτήρες. 
+\nΠαρακαλούμε, συντομεύστε για να συνεχίσετε.</string>
+    <string name="save_poi_value_exceed_length_title">Μήκος της τιμής \"%s\"</string>
+    <string name="public_transport_warning_descr_blog">Μάθετε περισσότερα για το πώς υπολογίζει το OsmAnd τις διαδρομές στο ιστολόγιό μας.</string>
+    <string name="public_transport_warning_title">Η περιήγηση με δημόσιες συγκοινωνίες είναι προς το παρόν σε δοκιμαστικό έλεγχο, αναμένονται λάθη και ανακρίβειες.</string>
+    <string name="add_intermediate">Προσθήκη ενδιάμεσου σημείου</string>
+    <string name="transfers_size">%1$d μεταφορές</string>
+    <string name="add_start_and_end_points">Προσθέστε σημείο έναρξης και τέλους</string>
+    <string name="route_add_start_point">Προσθέστε σημείο έναρξης</string>
+    <string name="route_descr_select_start_point">Επιλέξτε σημείο έναρξης</string>
+    <string name="rendering_attr_surface_unpaved_name">Χωρίς πλακόστρωση</string>
+    <string name="rendering_attr_surface_sand_name">Άμμος</string>
+    <string name="rendering_attr_surface_grass_name">Χορτάρι</string>
+    <string name="rendering_attr_surface_grass_paver_name">Πλάκες και χορτάρι</string>
+    <string name="rendering_attr_surface_ground_name">Έδαφος</string>
+    <string name="rendering_attr_surface_dirt_name">Χώμα</string>
+    <string name="rendering_attr_surface_mud_name">Λάσπη</string>
+    <string name="rendering_attr_surface_ice_name">Πάγος</string>
+    <string name="rendering_attr_surface_salt_name">Αλάτι</string>
+    <string name="rendering_attr_surface_snow_name">Χιόνι</string>
+    <string name="rendering_attr_surface_asphalt_name">Άσφαλτος</string>
+    <string name="rendering_attr_surface_paved_name">Με πλάκες</string>
+    <string name="rendering_attr_surface_concrete_name">Μπετόν</string>
+    <string name="rendering_attr_surface_sett_name">Πλακόστρωση</string>
+    <string name="rendering_attr_surface_cobblestone_name">Βότσαλο</string>
+    <string name="rendering_attr_surface_paving_stones_name">Πέτρες πλακόστρωσης</string>
+    <string name="rendering_attr_surface_pebblestone_name">Πέτρες από βότσαλα</string>
+    <string name="rendering_attr_surface_stone_name">Πέτρα</string>
+    <string name="rendering_attr_surface_metal_name">Μέταλλο</string>
+    <string name="rendering_attr_surface_wood_name">Ξύλο</string>
+    <string name="rendering_attr_surface_gravel_name">Χαλίκι</string>
+    <string name="rendering_attr_surface_fine_gravel_name">Λεπτό χαλίκι</string>
+    <string name="rendering_attr_surface_compacted_name">Συμπαγές</string>
+    <string name="rendering_attr_smoothness_excellent_name">Εξαιρετικό</string>
+    <string name="rendering_attr_smoothness_good_name">Καλό</string>
+    <string name="rendering_attr_smoothness_intermediate_name">Μεσαίο</string>
+    <string name="rendering_attr_smoothness_bad_name">Κακό</string>
+    <string name="rendering_attr_smoothness_very_bad_name">Πολύ κακό</string>
+    <string name="rendering_attr_smoothness_horrible_name">Απαίσιο</string>
+    <string name="rendering_attr_smoothness_very_horrible_name">Πολύ απαίσιο</string>
+    <string name="rendering_attr_smoothness_impassable_name">Αδιάβατο</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml
index e9955fb56e..c2695cdd63 100644
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@@ -75,12 +75,12 @@
     <string name="poi_bag">Sak-vendejo</string>
     <string name="poi_bathroom_furnishing">Lavĉambr-akcesoraĵa vendejo</string>
     <string name="poi_bed">Litaĵ-vendejo</string>
-    <string name="poi_boutique">Galanteriejo</string>
+    <string name="poi_boutique">Mod‑butiko</string>
     <string name="poi_camera">Fotiloj-k-lensoj vendejo</string>
     <string name="poi_carpet">Tapiŝ-vendejo</string>
     <string name="poi_chemist">Purigaĵ-vendejo</string>
     <string name="poi_charity">Almoza vendejo</string>
-    <string name="poi_clothes">Vest-vendejo</string>
+    <string name="poi_clothes">Vest‑vendejo</string>
     <string name="poi_clothes_children">infanaj</string>
     <string name="poi_shoes">Ŝu-vendejo</string>
     <string name="poi_candles">Kandel-vendejo</string>
@@ -124,7 +124,7 @@
     <string name="poi_doityourself">Memfaradil-vendejo</string>
     <string name="poi_doors">Pord-vendejo</string>
     <string name="poi_erotic">Seksumil-vendejo</string>
-    <string name="poi_fashion">Mod-butiko</string>
+    <string name="poi_fashion">Vest‑vendejo</string>
     <string name="poi_fishing">Fiŝkaptil-vendejo</string>
     <string name="poi_florist">Florvendejo</string>
     <string name="poi_frame">Kadroj-de-pentraĵoj-vendejo</string>
@@ -344,7 +344,7 @@
     <string name="poi_geyser">Gejsero</string>
     <string name="poi_club_linux">Linuksa klubejo</string>
     <string name="poi_glacier">Glaciejo</string>
-    <string name="poi_stone">Roko</string>
+    <string name="poi_stone">Ŝtonego</string>
     <string name="poi_aerialway_station">Kablovoja stacio</string>
     <string name="poi_aerialway_cable_car">Telfero unu-vagoneta (ir-reira)</string>
     <string name="poi_aerialway_chair_lift">Telfero seĝa</string>
@@ -829,7 +829,7 @@
     <string name="poi_food_court">Manĝobazaro</string>
     <string name="poi_drinking_water">Trinkakvejo</string>
     <string name="poi_barbecue">Rostilo</string>
-    <string name="poi_craft_agricultural_engines">Oficejo de isto de agrokulturaj maŝinoj</string>
+    <string name="poi_craft_agricultural_engines">Laborejo de agrokulturaj maŝinoj</string>
     <string name="poi_craft_basket_maker">Korb-laborejo</string>
     <string name="poi_craft_beekeeper">Abelistejo</string>
     <string name="poi_craft_blacksmith">Forĝejo</string>
@@ -923,7 +923,7 @@
     <string name="poi_strait">Markolo</string>
     <string name="poi_anchorage">Rodo (regiono)</string>
     <string name="poi_anchor_berth">Rodo (preciza ankrejo)</string>
-    <string name="poi_beacon">Buo fiksa</string>
+    <string name="poi_beacon">Signalilo</string>
     <string name="poi_beacon_cardinal">Buo fiksa: ĉefa (mondflanka)</string>
     <string name="poi_beacon_lateral">Buo fiksa: flanka (latera)</string>
     <string name="poi_beacon_safe_water">Buo fiksa: sekurakva</string>
@@ -2195,11 +2195,11 @@
     <string name="poi_bridge_ref">Referenco de ponto</string>
     <string name="poi_tunnel_ref">Referenco de tunelo</string>
     <string name="poi_ref">Referenco</string>
-    <string name="poi_cargo_passengers">Pasaĝeroj</string>
-    <string name="poi_cargo_vehicle">Veturiloj</string>
-    <string name="poi_cargo_bicycle">Bicikloj</string>
-    <string name="poi_cargo_container">Transportujoj</string>
-    <string name="poi_cargo_hgv">Kamionoj</string>
+    <string name="poi_cargo_passengers">pasaĝeroj</string>
+    <string name="poi_cargo_vehicle">veturiloj</string>
+    <string name="poi_cargo_bicycle">bicikloj</string>
+    <string name="poi_cargo_container">transportujoj</string>
+    <string name="poi_cargo_hgv">kamionoj</string>
     <string name="poi_wiki_lang_als">Vikipedio Alemana</string>
     <string name="poi_wiki_lang_az">Vikipedio Azerbajĝana</string>
     <string name="poi_wiki_lang_bn">Vikipedio Bengala</string>
@@ -2413,7 +2413,7 @@
     <string name="poi_health_service_support_no">San-servo: apogo psika: ne</string>
     <string name="poi_health_service_test_yes">San-servo: testoj: jes</string>
     <string name="poi_health_service_test_no">San-servo: testoj: ne</string>
-    <string name="poi_health_facility_type_office">San-servejo: kabineto de kuracisto</string>
+    <string name="poi_health_facility_type_office">Kabineto de kuracisto</string>
     <string name="poi_health_facility_type_field_hospital">San-servejo: kampa malsanulejo</string>
     <string name="poi_fire_hydrant_diameter">Diametro de hidranto</string>
     <string name="poi_fire_hydrant_pressure">Premo de hidranto</string>
@@ -2573,13 +2573,13 @@
     <string name="poi_aquaculture_fish">Akvokulturo: fiŝoj</string>
     <string name="poi_aquaculture_mussels">Akvokulturo: moluskoj</string>
     <string name="poi_mdf">Telefon-diskonektig-stacio</string>
-    <string name="poi_diplomatic_consulate">Konsulejo</string>
-    <string name="poi_diplomatic_consulate_general">Konsulejo ĝenerala</string>
-    <string name="poi_diplomatic_honorary_consulate">Konsulejo honora</string>
-    <string name="poi_diplomatic_permanent_mission">Oficejo de misio diplomatia</string>
-    <string name="poi_diplomatic_delegation">Oficejo de delegitaro (EU)</string>
-    <string name="poi_diplomatic_ambassadors_residence">Ambasadestrejo</string>
-    <string name="poi_diplomatic_high_commission">Oficejo de alta komisaro</string>
+    <string name="poi_diplomatic_consulate">konsulejo</string>
+    <string name="poi_diplomatic_consulate_general">konsulejo ĝenerala</string>
+    <string name="poi_diplomatic_honorary_consulate">konsulejo honora</string>
+    <string name="poi_diplomatic_permanent_mission">oficejo de misio diplomatia</string>
+    <string name="poi_diplomatic_delegation">oficejo de delegitaro (EU)</string>
+    <string name="poi_diplomatic_ambassadors_residence">ambasadestrejo</string>
+    <string name="poi_diplomatic_high_commission">oficejo de alta komisaro</string>
     <string name="poi_diaper_table_count">Tabloj por tra-vindotuk-ado</string>
     <string name="poi_fire_operator">Administranto kontraŭfajrega</string>
     <string name="poi_toilets_disposal_flush">Necesej-speco: akvoŝpruca</string>
@@ -2778,7 +2778,7 @@
     <string name="poi_parking_type">Speco de parkumejo</string>
     <string name="poi_covered">Kovrita</string>
     <string name="poi_subway_station_filter">Metroa stacio</string>
-    <string name="poi_ferry_terminal_cargo">Portaĵo de</string>
+    <string name="poi_ferry_terminal_cargo">Transporto de</string>
     <string name="poi_bicycle_parking_type">Speco de bicikl‑parkumejo</string>
     <string name="poi_aerialway_bicycle">Transportado de bicikloj</string>
     <string name="poi_aerialway_heating">Hejtado</string>
@@ -2786,7 +2786,7 @@
     <string name="poi_observatory_designation">Apliko</string>
     <string name="poi_telescope_type">Speco</string>
     <string name="poi_animal_training_type">Dresado de</string>
-    <string name="poi_embassy_type">Speco</string>
+    <string name="poi_embassy_type">Speco de diplomata oficejo</string>
     <string name="poi_city_capital">Ĉefurbo</string>
     <string name="poi_pharmacy_dispensing">Medikamentoj je preskribo</string>
     <string name="poi_healthcare_alternative_types">Kontraŭmedicino</string>
@@ -3323,7 +3323,7 @@
     <string name="poi_map_size_city">Grando de mapo: urba</string>
     <string name="poi_map_size_region">Grando de mapo: regiona</string>
     <string name="poi_charging_station">Ŝargostacio</string>
-    <string name="poi_depot">Aŭtobusejo/tramejo</string>
+    <string name="poi_depot">Remizo</string>
     <string name="poi_letter_box">Leterkesto</string>
     <string name="poi_post_street">Strato</string>
     <string name="poi_post_housenumber">Numero de domo</string>
@@ -3574,4 +3574,5 @@
     <string name="poi_climbing_crag_filter">Areo de grimpado</string>
     <string name="poi_rescue_box">Tujhelpilo (ensovaĝe)</string>
     <string name="poi_climbing_crag">jes</string>
+    <string name="reddit">Reddit</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 95306d21cb..01d8e62dce 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -312,9 +312,9 @@
     <string name="rendering_value_walkingRoutesOSMC_name">Kolorigi laŭ OSMC piedirada simbolo</string>
     <string name="shared_string_logoff">Elsaluti</string>
     <string name="rendering_attr_hideHouseNumbers_name">Numeroj de domoj</string>
-    <string name="application_dir_change_warning3">Ĉu kopii dosierojn de OsmAnd-datumoj al la nova loko?</string>
+    <string name="application_dir_change_warning3">Ĉu movi dosierojn de OsmAnd-datumoj al la nova loko\?</string>
     <string name="specified_directiory_not_writeable">Ne povas krei mapojn en la difina dosierujo</string>
-    <string name="copying_osmand_file_failed">Kopiado de dosieroj malsukcesis</string>
+    <string name="copying_osmand_file_failed">Fiaskis movi dosierojn</string>
     <string name="storage_directory_external">Ekstera konservejo</string>
     <string name="storage_directory_multiuser">Pluruzanta konservejo</string>
     <string name="storage_directory_internal_app">Interna aplikaĵa konservejo</string>
@@ -1533,7 +1533,7 @@ Proporcia memoro %4$s MB (limito de Android %5$s MB, Dalvik %6$s MB).</string>
     <string name="search_offline_geo_error">Ne povas interpreti “%s”.</string>
     <string name="search_osm_offline">Serĉi per pozici-trova servo</string>
     <string name="preferred_locale_descr">Elekti lingvon de fasado (bonvolu restarti OsmAnd post ŝanĝo).</string>
-    <string name="unit_of_length">Long-unuoj</string>
+    <string name="unit_of_length">Unuoj de longo</string>
     <string name="unit_of_length_descr">Ŝanĝi unuon por reprezenti distancoj.</string>
     <string name="si_mi_feet">Mejloj/futoj</string>
     <string name="si_mi_yard">Mejloj/jardoj</string>
@@ -2987,7 +2987,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="quick_action_day_night_mode">%s reĝimo</string>
     <string name="shared_string_degrees">Gradoj</string>
     <string name="shared_string_milliradians">Miliradianoj</string>
-    <string name="angular_measeurement">Mezurunuo de anguloj</string>
+    <string name="angular_measeurement">Unuo de anguloj</string>
     <string name="angular_measeurement_descr">Elekti mezurunuon por azimuto.</string>
     <string name="routing_attr_avoid_sett_name">Eviti malglatan ŝtonpavimon</string>
     <string name="routing_attr_avoid_sett_description">Eviti rulŝtonajn kahelojn kaj kvadratajn ŝtonojn</string>
@@ -3012,4 +3012,16 @@ Indikas lokon:  %1$s x %2$s"</string>
 \n• montri azimuton ĉe distanc‑mezurilo
 \n</string>
     <string name="send_log">Sendi erar‑protokolon</string>
+    <string name="files_moved">Movis %1$d dosierojn (%2$s).</string>
+    <string name="files_copied">Kopiis %1$d dosierojn (%2$s).</string>
+    <string name="files_failed">Fiaskis kopii %1$d dosierojn (%2$s).</string>
+    <string name="files_present">%1$d dosieroj (%2$s) estas en la antaŭa loko: %3$s.</string>
+    <string name="move_maps">Movi mapojn</string>
+    <string name="dont_move_maps">Ne movi</string>
+    <string name="public_transport_ped_route_title">Tiu ĉi kurso perpiede estas proksimume %1$s kaj povas esti pli rapida ol per publika transporto</string>
+    <string name="public_transport_no_route_title">Bedaŭrinde OsmAnd ne povis kalkuli kurson laŭ viaj agordoj.</string>
+    <string name="public_transport_try_ped">Provu piedirantan navigadon.</string>
+    <string name="public_transport_try_change_settings">Provu ŝanĝi agordojn.</string>
+    <string name="public_transport_calc_pedestrian">Kalkuli piedirantan kurson</string>
+    <string name="public_transport_type">Speco de transporto</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 130dd391e7..95806c9255 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -663,7 +663,7 @@
     <string name="poi_money_lender">Prestamista</string>
     <string name="poi_pawnbroker">Casa de empeños;Prestamista</string>
     <string name="poi_bureau_de_change">Casa de cambio</string>
-    <string name="poi_accountant">Contador</string>
+    <string name="poi_accountant">Estudio contable;Contador</string>
     <string name="poi_bitcoin_yes">Pago de Bitcoin</string>
     <string name="poi_cave_entrance">Entrada a cueva</string>
     <string name="poi_peak">Pico de montaña</string>
@@ -1494,9 +1494,9 @@
     <string name="poi_takeaway_yes">Comida para llevar: sí</string>
     <string name="poi_takeaway_no">Comida para llevar: no</string>
     <string name="poi_takeaway_only">Comida para llevar: únicamente</string>
-    <string name="poi_delivery_no">Servicio a domicilio: no</string>
-    <string name="poi_delivery_yes">Servicio a domicilio: sí</string>
-    <string name="poi_delivery_only">Servicio a domicilio: únicamente</string>
+    <string name="poi_delivery_no">Envío a domicilio: no</string>
+    <string name="poi_delivery_yes">Envío a domicilio: sí</string>
+    <string name="poi_delivery_only">Envío a domicilio: únicamente</string>
     <string name="poi_outdoor_seating_yes">Asientos exteriores: sí</string>
     <string name="poi_outdoor_seating_no">Asientos exteriores: no</string>
     <string name="poi_outdoor_seating_terrace">Asientos exteriores: terraza</string>
@@ -2827,7 +2827,7 @@
     <string name="poi_theatre_genre">Género</string>
     <string name="poi_outdoor_seating">Asientos exteriores</string>
     <string name="poi_smoking">Permitido fumar</string>
-    <string name="poi_delivery">Servicio a domicilio;Delivery</string>
+    <string name="poi_delivery">Envío a domicilio;Delivery</string>
     <string name="poi_drive_in">Conducir por dentro</string>
     <string name="poi_drive_through">Servicio en el automóvil</string>
     <string name="poi_takeaway">Comida para llevar</string>
@@ -3588,4 +3588,5 @@
     <string name="poi_climbing_crag_filter">Peñón de escalada</string>
     <string name="poi_rescue_box">Caja de rescate</string>
     <string name="poi_climbing_crag">Sí</string>
+    <string name="reddit">Reddit</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 610e1be314..c293c0ce51 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
-    <string name="copying_osmand_file_failed">Falló al copiar archivos</string>
+    <string name="copying_osmand_file_failed">Fallo al mover archivos</string>
     <string name="storage_directory_external">Almacenamiento externo</string>
     <string name="storage_directory_multiuser">Almacenamiento multiusuario</string>
     <string name="specified_directiory_not_writeable">No se pueden crear mapas en el directorio indicado</string>
@@ -30,7 +30,7 @@
     <string name="mark_to_delete">Marcar para borrar</string>
     <string name="local_osm_changes_upload_all_confirm">¿Subir %1$d cambio(s) a OSM?</string>
     <string name="confirmation_to_clear_history">¿Limpiar el historial?</string>
-    <string name="application_dir_change_warning3">¿Copiar los archivos de datos de OsmAnd al nuevo destino?</string>
+    <string name="application_dir_change_warning3">¿Mover los archivos de datos de OsmAnd al nuevo destino\?</string>
     <string name="storage_directory">Almacenamiento del mapa</string>
     <string name="shared_string_places">Lugares</string>
     <string name="delay_to_start_navigation_descr">Indica el tiempo de espera para permanecer en la pantalla de planificación de ruta.</string>
@@ -1775,7 +1775,7 @@ Lon %2$s</string>
     <string name="context_menu_item_open_note">Abrir nota de OSM</string>
     <string name="osm_edit_reopened_note">Nota de OSM reabierta</string>
     <string name="osm_edit_commented_note">Nota de OSM comentada</string>
-    <string name="osm_edit_removed_note">Nota de OSM borrada</string>
+    <string name="osm_edit_removed_note">Nota de OSM resuelta</string>
     <string name="osm_edit_created_note">Nota de OSM creada</string>
     <string name="osn_bug_name">Nota de OSM</string>
     <string name="osn_add_dialog_title">Crear nota</string>
@@ -3002,19 +3002,19 @@ Lon %2$s</string>
     <string name="avoid_pt_types_descr">Marca los tipos de transporte público a evitar para la navegación:</string>
     <string name="avoid_pt_types">Evitar tipos de transporte…</string>
     <string name="quick_action_day_night_mode">modo %s</string>
-    <string name="routing_attr_avoid_sett_name">Evitar el empedrado y adoquín</string>
+    <string name="routing_attr_avoid_sett_name">Evitar el empedrado y adoquinado</string>
     <string name="routing_attr_avoid_sett_description">Evita las calles empedradas y adoquinadas</string>
     <string name="shared_string_degrees">Grados</string>
     <string name="shared_string_milliradians">Mil angular</string>
-    <string name="angular_measeurement">Unidades de medición angular</string>
+    <string name="angular_measeurement">Unidad angular</string>
     <string name="angular_measeurement_descr">Cambiar el acimut en el que se mide.</string>
-    <string name="routing_attr_avoid_tram_name">Evitar los tranvías</string>
+    <string name="routing_attr_avoid_tram_name">Evitar tranvías</string>
     <string name="routing_attr_avoid_tram_description">Evita usar los tranvías</string>
-    <string name="routing_attr_avoid_bus_name">Evitar los colectivos</string>
+    <string name="routing_attr_avoid_bus_name">Evitar colectivos</string>
     <string name="routing_attr_avoid_bus_description">Evita usar los colectivos y trolebuses</string>
-    <string name="routing_attr_avoid_share_taxi_name">Evitar los taxis colectivos</string>
+    <string name="routing_attr_avoid_share_taxi_name">Evitar taxis colectivos</string>
     <string name="routing_attr_avoid_share_taxi_description">Evita usar los taxis colectivos</string>
-    <string name="routing_attr_avoid_train_name">Evitar los trenes</string>
+    <string name="routing_attr_avoid_train_name">Evitar trenes</string>
     <string name="routing_attr_avoid_train_description">Evita usar los trenes</string>
     <string name="routing_attr_avoid_subway_name">Evitar subterráneos</string>
     <string name="routing_attr_avoid_subway_description">Evita usar los subterráneos y trenes ligeros</string>
@@ -3029,4 +3029,16 @@ Lon %2$s</string>
 \n• Visualización de medida «azimut» en «Medir distancia»
 \n</string>
     <string name="send_log">Enviar registro del problema</string>
+    <string name="files_moved">Se movieron %1$d archivos (%2$s).</string>
+    <string name="files_copied">Se copiaron %1$d archivos (%2$s).</string>
+    <string name="files_failed">Error al copiar %1$d archivo(s) (%2$s).</string>
+    <string name="files_present">Existen %1$d archivo(s) (%2$s) en la ubicación anterior «%3$s».</string>
+    <string name="move_maps">Mover mapas</string>
+    <string name="dont_move_maps">No mover</string>
+    <string name="public_transport_ped_route_title">La ruta a pie es de aproximadamente %1$s y podría ser más rápida que en transporte público</string>
+    <string name="public_transport_no_route_title">Por desgracia, OsmAnd no pudo encontrar una ruta adecuada a sus ajustes.</string>
+    <string name="public_transport_try_ped">Prueba la navegación a pie.</string>
+    <string name="public_transport_try_change_settings">Intenta cambiar los ajustes.</string>
+    <string name="public_transport_calc_pedestrian">Calcular la ruta a pie</string>
+    <string name="public_transport_type">Tipo de transporte</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index 13e0ed000d..9fe170268c 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -663,7 +663,7 @@
     <string name="poi_money_lender">Prestamista</string>
     <string name="poi_pawnbroker">Casa de empeños;Prestamista</string>
     <string name="poi_bureau_de_change">Casa de cambio</string>
-    <string name="poi_accountant">Contador;Contable</string>
+    <string name="poi_accountant">Estudio contable;Contador</string>
     <string name="poi_bitcoin_yes">Pago de Bitcoin</string>
     <string name="poi_cave_entrance">Entrada a cueva</string>
     <string name="poi_peak">Pico de montaña</string>
@@ -1494,9 +1494,9 @@
     <string name="poi_takeaway_yes">Comida para llevar: sí</string>
     <string name="poi_takeaway_no">Comida para llevar: no</string>
     <string name="poi_takeaway_only">Comida para llevar: únicamente</string>
-    <string name="poi_delivery_no">Servicio a domicilio: no</string>
-    <string name="poi_delivery_yes">Servicio a domicilio: sí</string>
-    <string name="poi_delivery_only">Servicio a domicilio: únicamente</string>
+    <string name="poi_delivery_no">Envío a domicilio: no</string>
+    <string name="poi_delivery_yes">Envío a domicilio: sí</string>
+    <string name="poi_delivery_only">Envío a domicilio: únicamente</string>
     <string name="poi_outdoor_seating_yes">Asientos exteriores: sí</string>
     <string name="poi_outdoor_seating_no">Asientos exteriores: no</string>
     <string name="poi_outdoor_seating_terrace">Asientos exteriores: terraza</string>
@@ -2826,7 +2826,7 @@
     <string name="poi_outdoor_seating">Asientos exteriores</string>
     <string name="poi_fee">Tarifado</string>
     <string name="poi_smoking">Permitido fumar</string>
-    <string name="poi_delivery">Servicio a domicilio;Delivery</string>
+    <string name="poi_delivery">Envío a domicilio;Delivery</string>
     <string name="poi_drive_in">Conducir por dentro</string>
     <string name="poi_drive_through">Servicio en el automóvil</string>
     <string name="poi_takeaway">Comida para llevar</string>
@@ -3588,4 +3588,5 @@
     <string name="poi_climbing_crag_filter">Peñón de escalada</string>
     <string name="poi_rescue_box">Caja de rescate</string>
     <string name="poi_climbing_crag">Sí</string>
+    <string name="reddit">Reddit</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 5b6a2becb6..fccbde8854 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
-    <string name="copying_osmand_file_failed">Falló al copiar archivos</string>
+    <string name="copying_osmand_file_failed">Fallo al mover archivos</string>
     <string name="storage_directory_external">Almacenamiento externo</string>
     <string name="storage_directory_multiuser">Almacenamiento multiusuario</string>
     <string name="specified_directiory_not_writeable">No se pueden crear mapas en el directorio indicado</string>
@@ -30,7 +30,7 @@
     <string name="mark_to_delete">Marcar para borrar</string>
     <string name="local_osm_changes_upload_all_confirm">¿Subir %1$d cambio(s) a OSM?</string>
     <string name="confirmation_to_clear_history">¿Limpiar el historial?</string>
-    <string name="application_dir_change_warning3">¿Copiar los archivos de datos de OsmAnd al nuevo destino?</string>
+    <string name="application_dir_change_warning3">¿Mover los archivos de datos de OsmAnd al nuevo destino\?</string>
     <string name="storage_directory">Almacenamiento del mapa</string>
     <string name="shared_string_places">Lugares</string>
     <string name="delay_to_start_navigation_descr">Indica el tiempo de espera para permanecer en la pantalla de planificación de ruta.</string>
@@ -1775,7 +1775,7 @@ Lon %2$s</string>
     <string name="context_menu_item_open_note">Abrir nota de OSM</string>
     <string name="osm_edit_reopened_note">Nota de OSM reabierta</string>
     <string name="osm_edit_commented_note">Nota de OSM comentada</string>
-    <string name="osm_edit_removed_note">Nota de OSM borrada</string>
+    <string name="osm_edit_removed_note">Nota de OSM resuelta</string>
     <string name="osm_edit_created_note">Nota de OSM creada</string>
     <string name="osn_bug_name">Nota de OSM</string>
     <string name="osn_add_dialog_title">Crear nota</string>
@@ -3003,19 +3003,19 @@ Lon %2$s</string>
     <string name="avoid_pt_types_descr">Marca los tipos de transporte público a evitar para la navegación:</string>
     <string name="avoid_pt_types">Evitar tipos de transporte…</string>
     <string name="quick_action_day_night_mode">modo %s</string>
-    <string name="routing_attr_avoid_sett_name">Evitar el empedrado y adoquín</string>
+    <string name="routing_attr_avoid_sett_name">Evitar el empedrado y adoquinado</string>
     <string name="routing_attr_avoid_sett_description">Evita las calles empedradas y adoquinadas</string>
     <string name="shared_string_degrees">Grados</string>
     <string name="shared_string_milliradians">Mil angular</string>
-    <string name="angular_measeurement">Unidades de medición angular</string>
+    <string name="angular_measeurement">Unidad angular</string>
     <string name="angular_measeurement_descr">Cambiar el acimut en el que se mide.</string>
-    <string name="routing_attr_avoid_tram_name">Evitar los tranvías</string>
+    <string name="routing_attr_avoid_tram_name">Evitar tranvías</string>
     <string name="routing_attr_avoid_tram_description">Evita usar los tranvías</string>
-    <string name="routing_attr_avoid_bus_name">Evitar los autobuses</string>
+    <string name="routing_attr_avoid_bus_name">Evitar autobuses</string>
     <string name="routing_attr_avoid_bus_description">Evita usar los autobuses y trolebuses</string>
-    <string name="routing_attr_avoid_share_taxi_name">Evitar los taxis colectivos</string>
+    <string name="routing_attr_avoid_share_taxi_name">Evitar taxis colectivos</string>
     <string name="routing_attr_avoid_share_taxi_description">Evita usar los taxis colectivos</string>
-    <string name="routing_attr_avoid_train_name">Evitar los trenes</string>
+    <string name="routing_attr_avoid_train_name">Evitar trenes</string>
     <string name="routing_attr_avoid_train_description">Evita usar los trenes</string>
     <string name="routing_attr_avoid_subway_name">Evitar subterráneos</string>
     <string name="routing_attr_avoid_subway_description">Evita usar los subterráneos y trenes ligeros</string>
@@ -3030,4 +3030,16 @@ Lon %2$s</string>
 \n • Visualización de medida «azimut» en «Medir distancia»
 \n</string>
     <string name="send_log">Enviar registro del problema</string>
+    <string name="files_moved">Se movieron %1$d archivos (%2$s).</string>
+    <string name="files_copied">Se copiaron %1$d archivos (%2$s).</string>
+    <string name="files_failed">Error al copiar %1$d archivo(s) (%2$s).</string>
+    <string name="files_present">Existen %1$d archivo(s) (%2$s) en la ubicación anterior «%3$s».</string>
+    <string name="move_maps">Mover mapas</string>
+    <string name="dont_move_maps">No mover</string>
+    <string name="public_transport_ped_route_title">La ruta a pie es de aproximadamente %1$s y podría ser más rápida que en transporte público</string>
+    <string name="public_transport_no_route_title">Por desgracia, OsmAnd no pudo encontrar una ruta adecuada para sus ajustes.</string>
+    <string name="public_transport_try_ped">Prueba la navegación a pie.</string>
+    <string name="public_transport_try_change_settings">Intenta cambiar los ajustes.</string>
+    <string name="public_transport_calc_pedestrian">Calcular la ruta a pie</string>
+    <string name="public_transport_type">Tipo de transporte</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index f8bd6c2a20..095c9ac289 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -352,7 +352,7 @@
     <string name="poi_crematorium">Crematorio</string>
     <string name="poi_bank">Banco</string>
     <string name="poi_amenity_atm">Cajero automático</string>
-    <string name="poi_accountant">Contable</string>
+    <string name="poi_accountant">Estudio contable;Contador</string>
     <string name="poi_cave_entrance">Entrada a cueva</string>
     <string name="poi_volcano">Volcán</string>
     <string name="poi_crater">Cráter</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index e97015d911..3d5b4a5653 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1791,7 +1791,7 @@
     <string name="context_menu_item_open_note">Abrir nota de OSM</string>
     <string name="osm_edit_reopened_note">Nota de OSM reabierta</string>
     <string name="osm_edit_commented_note">Nota de OSM comentada</string>
-    <string name="osm_edit_removed_note">Nota de OSM borrada</string>
+    <string name="osm_edit_removed_note">Nota de OSM resuelta</string>
     <string name="osm_edit_created_note">Nota de OSM creada</string>
     <string name="osn_bug_name">Nota de OSM</string>
     <string name="osn_add_dialog_title">Crear nota</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 2ef4449ef4..83353a7e6f 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -468,7 +468,7 @@
     <string name="oclock">puntuan</string>
     <string name="towards">honuntz</string>
     <string name="accuracy">Zehastasuna</string>
-    <string name="altitude">Altuera</string>
+    <string name="altitude">Altitudea</string>
     <string name="no_info">Informaziorik ez</string>
     <string name="direction_style_sidewise">Ezkerreruntz (8 sektore)</string>
     <string name="direction_style_clockwise">Eskubiruntz (12 sektore)</string>
@@ -533,7 +533,7 @@
     <string name="user_name">Zure OSM erabiltzailea</string>
     <string name="open_street_map_login_descr">Beharrezkoa openstreetmap.org-eko bidalketentzat.</string>
     <string name="user_password">Zure OSMeko pasahitza</string>
-    <string name="osmand_service">Bigarren planoko modua</string>
+    <string name="osmand_service">Atzeko plano modua</string>
     <string name="osmand_service_descr">OsmAnd bigarren planoan dabil pantaila itzalia dagoen bitartean.</string>
     <string name="download_files_not_enough_space">Ez dago leku nahikorik %1$s MB deskargatzeko (%2$s libre).</string>
     <string name="download_files_question_space">{0} fitxategi deskargatu? 
@@ -672,12 +672,12 @@ Biltegiratzean {1} MB erabiliko dira.
     <string name="shared_string_previous">Aurrekoa</string>
     <string name="unit_of_length_descr">Aldatu distantzia neurtzeko unitateak.</string>
     <string name="unit_of_length">Luzera unitatea</string>
-    <string name="si_mi_feet">Miliak/oinak</string>
+    <string name="si_mi_feet">Miliak/Oin</string>
     <string name="si_mi_yard">Miliak/yardak</string>
     <string name="si_km_m">Kilometroak/metroak</string>
     <string name="yard">yd</string>
     <string name="foot">oin</string>
-    <string name="mile_per_hour">m/h</string>
+    <string name="mile_per_hour">mph</string>
     <string name="mile">mi</string>
     <string name="send_location_way_choose_title">Kokapena partekatu erabiliz</string>
     <string name="send_location_sms_pattern">Kokapena: %1$s⏎\n%2$s</string>
@@ -871,7 +871,7 @@ Biltegiratzean {1} MB erabiliko dira.
     <string name="transport_stops_to_pass">pasatu beharreko geltokiak</string>
     <string name="transport_route_distance">Ibilbidearen distantzia</string>
     <string name="transport">Garraioa</string>
-    <string name="shared_string_ok">Ados</string>
+    <string name="shared_string_ok">ADOS</string>
     <string name="show_transport_over_map_description">Erakutsi garraio publikoaren geltokiak mapan.</string>
     <string name="show_transport_over_map">Erakutsi garraioaren geltokiak</string>
     <string name="hello">OsmAnd nabigazio aplikazioa</string>
@@ -984,7 +984,7 @@ Biltegiratzean {1} MB erabiliko dira.
     <string name="show_gps_coordinates_text">Erakutsi GPS koordenatuak mapan</string>
     <string name="use_internet_to_download_tile">Deskargatu falta diren tesela mapak</string>
     <string name="app_description">Nabigazio aplikazioa</string>
-    <string name="shared_string_exit">Atera</string>
+    <string name="shared_string_exit">Irten</string>
     <string name="search_button">Bilatu</string>
     <string name="search_activity">Bilatu</string>
     <string name="searchpoi_activity">Aukeratu POI-a</string>
@@ -1123,7 +1123,7 @@ Biltegiratzean {1} MB erabiliko dira.
     <string name="av_camera_pic_size">Kameraren irudiaren tamaina</string>
     <string name="av_camera_pic_size_descr">Aukeratu barne-kameraren irudiaren tamaina.</string>
     <string name="navigation_intent_invalid">Baliogabeko formatuak: %s</string>
-    <string name="shared_string_share">Banatu</string>
+    <string name="shared_string_share">Partekatu</string>
     <string name="share_fav_subject">OsmAnd bidez partekatutako gogokoak</string>
     <string name="import_file_favourites">Gorde datuak GPX fitxategi bezala edo inportatu bide-puntuak \'Gogoko\' gisa?</string>
     <string name="keep_informing_never">Inoiz</string>
@@ -1259,7 +1259,7 @@ Lorratza %2$s</string>
     <string name="shared_string_ellipsis">…</string>
     <string name="shared_string_do_not_use">Ez erabili</string>
     <string name="shared_string_enable">Gaitu</string>
-    <string name="shared_string_disable">Ezgaitu</string>
+    <string name="shared_string_disable">Desgaitu</string>
     <string name="shared_string_enabled">Gaituta</string>
     <string name="shared_string_disabled">Ezgaituta</string>
     <string name="shared_string_selected">Hautatuta</string>
@@ -1415,9 +1415,9 @@ Lorratza %2$s</string>
     <string name="favorite_category_select">Hautatu kategoria</string>
     <string name="default_speed_system_descr">Zehaztu abiadura unitatea.</string>
     <string name="default_speed_system">Abiadura unitatea</string>
-    <string name="si_kmh">Kilometroak orduko</string>
-    <string name="si_m_s">Metroak segundoko</string>
-    <string name="si_min_km">Minutuak kilometroko</string>
+    <string name="si_kmh">Kilometro orduko</string>
+    <string name="si_m_s">Metro segunduko</string>
+    <string name="si_min_km">Minutu kilometroko</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
@@ -1461,7 +1461,7 @@ Lorratza %2$s</string>
     <string name="shared_string_logoff">Itxi saioa</string>
     <string name="rendering_attr_hideHouseNumbers_name">Etxeen zenbakiak</string>
     <string name="specified_directiory_not_writeable">Ezin izan dira mapak zehaztutako direktorioan sortu</string>
-    <string name="copying_osmand_file_failed">Fitxategiak kopiatzeak huts egin du</string>
+    <string name="copying_osmand_file_failed">Fitxategiak lekuz aldatzean huts egin du</string>
     <string name="storage_directory_external">Kanpo biltegiratzea</string>
     <string name="storage_directory_internal_app">Barne aplikazio memoria</string>
     <string name="storage_directory_manual">Eskuz zehaztuta</string>
@@ -1679,9 +1679,9 @@ Eskuragarri {2} MB besterik ez daude.</string>
     <string name="storage_directory_card">Memoria txartela</string>
     <string name="hillshade_layer_disabled">Erliebe-itzalak geruza desgaituta</string>
     <string name="nm">nmi</string>
-    <string name="si_nm">Itsas miliak</string>
-    <string name="si_mph">Miliak orduko</string>
-    <string name="si_min_m">Minutuak miliako</string>
+    <string name="si_nm">Milia nautikoak</string>
+    <string name="si_mph">Milia orduko</string>
+    <string name="si_min_m">Minutu miliaro</string>
     <string name="si_nm_h">Itsas miliak orduko (korapiloak)</string>
     <string name="nm_h">kn</string>
     <string name="av_locations_descr">GPX fitxategia ohar-kokapenekin.</string>
@@ -1717,7 +1717,7 @@ Eskuragarri {2} MB besterik ez daude.</string>
     <string name="disable_recording_once_app_killed">Eragotzi bigarren planoko egunkaria</string>
     <string name="disable_recording_once_app_killed_descrp">GPX erregistroa geldiaraziko du aplikazioa hiltzean (azken aplikazioak pantailaren bidez). (OsmAnd bigarren planoan dabilela adierazten duen ikonoa Android jakinarazpen barratik desagertuko da)</string>
     <string name="rendering_value_walkingRoutesOSMC_name">OSMC bidezidor kirol sinboloen araberako koloreztatzea</string>
-    <string name="application_dir_change_warning3">Kopiatu OsmAnd-en datu fitxategiak xede berrira ?</string>
+    <string name="application_dir_change_warning3">Eraman OsmAnd-en datu fitxategiak xede berrira \?</string>
     <string name="storage_directory_multiuser">Erabiltzaile anitzeko biltegiratzea</string>
     <string name="rendering_attr_OSMMapperAssistant_name">OSM kartografia laguntzailea</string>
     <string name="welcome_select_region">Trafiko seinaleak eta arauak ongi adierazteko, mesedez hautatu zure gidatze eremua:</string>
@@ -1807,7 +1807,7 @@ Eskuragarri {2} MB besterik ez daude.</string>
     <string name="duration">Iraupena</string>
     <string name="distance">Distantzia</string>
     <string name="index_tours">Ibilaldiak</string>
-    <string name="shared_string_all">Guztiak</string>
+    <string name="shared_string_all">Guztia</string>
     <string name="rendering_value_browse_map_name">Arakatu mapa</string>
     <string name="rendering_value_car_name">Kotxea</string>
     <string name="rendering_value_bicycle_name">Bizikleta</string>
@@ -3008,6 +3008,23 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="rendering_attr_surface_sett_name">Galtzada-harria</string>
     <string name="rendering_attr_surface_cobblestone_name">Galtzadarria</string>
     <string name="rendering_attr_surface_fine_gravel_name">Legarra</string>
-    <string name="routing_attr_avoid_sett_name"/>
+    <string name="routing_attr_avoid_sett_name">Saihestu harri eta baldosa galtzadak</string>
     <string name="send_log">Bidali egunkaria</string>
+    <string name="files_moved">%1$d fitxategi mugituta (%2$s).</string>
+    <string name="files_copied">%1$d fitxategi kopiatuta (%2$s).</string>
+    <string name="files_failed">%1$d fitxategi kopiatzeak huts egin du (%2$s).</string>
+    <string name="move_maps">Mugitu mapak</string>
+    <string name="dont_move_maps">Ez mugitu</string>
+    <string name="public_transport_ped_route_title">Oinezko bidea</string>
+    <string name="public_transport_no_route_title">Tamalez, OsmAnd-ek ezin izan du zure ezarpenetarako bide egokirik aurkitu.</string>
+    <string name="public_transport_try_ped">Saiatu oinezko nabigazioa.</string>
+    <string name="public_transport_try_change_settings">Saiatu ezarpenak aldatzen.</string>
+    <string name="public_transport_calc_pedestrian">Kalkulatu</string>
+    <string name="public_transport_type">Garraio mota</string>
+    <string name="shared_string_milliradians">Miliradianak</string>
+    <string name="angular_measeurement">Neurri-unitate angularra</string>
+    <string name="angular_measeurement_descr">Aldatu zertan azimuta neurtzen den.</string>
+    <string name="rendering_attr_surface_pebblestone_name">Hartxindar bidea</string>
+    <string name="rendering_attr_surface_gravel_name">Hartxindarra</string>
+    <string name="routing_attr_avoid_sett_description">Saihestu harri eta baldosa galtzadak</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index 650069478d..63a5e0e275 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -39,7 +39,7 @@
     <string name="poi_bedding">پنبه زنی</string>
     <string name="poi_dive">تجهیزات غواصی</string>
     <string name="poi_doityourself">فروشگاه بهسازی خانه</string>
-    <string name="poi_erotic"></string>
+    <string name="poi_erotic"/>
     <string name="poi_fishing">لوازم ماهیگیری</string>
     <string name="poi_florist">گلفروشی</string>
     <string name="poi_frame">قاب سازی</string>
@@ -77,7 +77,7 @@
     <string name="poi_ticket">فروشگاه بلیط</string>
     <string name="poi_tobacco">دخانیات</string>
     <string name="poi_toys">اسباب بازی فروشی</string>
-    <string name="poi_trade">باربری</string>
+    <string name="poi_trade"></string>
     <string name="poi_vacuum_cleaner">فروشگاه جاروبرقی</string>
     <string name="poi_variety_store">فروشگاه متنوع و ارزان</string>
     <string name="poi_video">کلوب فیلم</string>
@@ -1347,4 +1347,5 @@
     <string name="poi_park_ride_hov">خودروی پرسرنشین</string>
     <string name="poi_park_ride_tram">تراموا</string>
     <string name="poi_park_ride_ferry">فرابر</string>
+    <string name="poi_logistics">دفتر باربری</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index ebac73eebe..519aefa6e1 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -1352,7 +1352,7 @@
     <string name="arrival_distance_factor_at_last">در چند متر آخر</string>
     <string name="av_camera_pic_size">اندازهٔ عکس دوربین</string>
     <string name="av_camera_pic_size_descr">اندازهٔ عکس دوربین داخلی را انتخاب کنید.</string>
-    <string name="rename_failed">تغییر نام انجام نشد.</string>
+    <string name="rename_failed">تغییر نام ناموفق بود.</string>
     <string name="days_behind">روز قبل</string>
     <string name="shared_string_currently_recording_track">ردّ در حال ضبط</string>
     <string name="back_to_map">برگشتن به نقشه</string>
@@ -1476,9 +1476,9 @@
     <string name="speed_limit_exceed_message">محدودهٔ حداکثر سرعت را انتخاب کنید؛ با گذشتن از این مقدار، آوای هشدار پخش می‌شود.</string>
     <string name="fav_point_emoticons_message">نام نقطهٔ برگزیده به %1$s تغییر کرد تا ذخیره‌سازی آن به‌همراه شکلک‌ها در فایل تسهیل شود.</string>
     <string name="rendering_attr_hideHouseNumbers_name">پلاک خانه‌ها</string>
-    <string name="application_dir_change_warning3">فایل‌های دادهٔ OsmAnd به مکان جدید کپی شود؟</string>
+    <string name="application_dir_change_warning3">فایل‌های دادهٔ OsmAnd به مکان جدید منتقل شود؟</string>
     <string name="specified_directiory_not_writeable">نمی‌توان نقشه‌ها را در پوشهٔ موردنظر ایجاد کرد</string>
-    <string name="copying_osmand_file_failed">کپی‌کردن فایل‌ها ناموفق بود</string>
+    <string name="copying_osmand_file_failed">انتقال فایل‌ها ناموفق بود</string>
     <string name="storage_directory_external">ذخیره‌گاه خارجی</string>
     <string name="storage_directory_multiuser">ذخیره‌گاه چندکاربره</string>
     <string name="storage_directory_internal_app">حافظهٔ داخلی برنامه</string>
@@ -2093,7 +2093,7 @@
     <string name="rate_this_app_long">لطفاً در فروشگاه Play به OsmAnd امتیاز بدهید</string>
     <string name="user_hates_app_get_feedback">لطفاً علتش به ما بگویید.</string>
     <string name="user_hates_app_get_feedback_long">دوست دارید این برنامه چه تغییری بکند؟ لطفاً به ما بگویید.</string>
-    <string name="failed_to_upload">آپلود نشد</string>
+    <string name="failed_to_upload">آپلود ناموفق بود</string>
     <string name="delete_change">حذف تغییر</string>
     <string name="successfully_uploaded_pattern">{0} مورد از {1} مورد آپلود شد</string>
     <string name="try_again">تلاش مجدد</string>
@@ -3067,4 +3067,17 @@
 \n
 \n • نمایش سمت (azimuth) در اندازه‌گیری مسافت
 \n</string>
+    <string name="files_moved">%1$d فایل منتقل شد (%2$s).</string>
+    <string name="files_copied">%1$d فایل کپی شد (%2$s).</string>
+    <string name="files_failed">کپی %1$d فایل (%2$s) ناموفق بود.</string>
+    <string name="files_present">%1$d فایل (%2$s) در مکان قبلی وجود دارد: \'%3$s\'</string>
+    <string name="move_maps">نقشه‌ها را منتقل کن</string>
+    <string name="dont_move_maps">منتقل نکن</string>
+    <string name="public_transport_ped_route_title">مسیر پیاده حدود %1$s است و به‌نظر می‌رسد سریع‌تر از حمل‌ونقل عمومی باشد</string>
+    <string name="public_transport_no_route_title">متأسفانه OsmAnd نتوانست مسیری متناسب با تنظیمات شما بیابد.</string>
+    <string name="public_transport_try_ped">ناوبری پیاده را امتحان کنید.</string>
+    <string name="public_transport_try_change_settings">با تنظیمات دیگر امتحان کنید.</string>
+    <string name="public_transport_calc_pedestrian">محاسبهٔ مسیر پیاده</string>
+    <string name="public_transport_type">نوع حمل‌ونقل</string>
+    <string name="send_log">ارسال گزارش</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 5c13a8baab..6e0e5d1061 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -3285,4 +3285,251 @@
     <string name="poi_rtsa_scale_3b">3Б</string>
     <string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
     <string name="poi_climbing_crag">Oui</string>
+    <string name="poi_climbing_crag_filter">Rocher d\'escalade</string>
+    <string name="poi_free_flying_guest_guidelines_yes">Directives à l\'intention des invités : oui</string>
+    <string name="poi_free_flying_guest_guidelines_no">Directives à l\'intention des invités : non</string>
+    <string name="poi_fire_hydrant_type_dry_barrel">Fût sec</string>
+    <string name="poi_health_person_type_assistant">Rôle de l\'agent de santé : assistant</string>
+    <string name="poi_health_person_type_healer">Rôle de l\'agent de santé : guérisseur</string>
+    <string name="poi_health_person_type_midwife">Rôle de l\'agent de santé : sage-femme</string>
+    <string name="poi_health_person_type_nurse">Rôle de l\'agent de santé : infirmière</string>
+    <string name="poi_health_person_type_physician_assitant">Rôle de l\'agent de santé : assistant médical</string>
+    <string name="poi_health_person_type_witchdoctor">Rôle de l\'agent de santé : sorcier</string>
+    <string name="poi_counselling_type_addiction_yes">Conseiller (toxicomanie) : oui</string>
+    <string name="poi_counselling_type_addiction_no">Conseiller (dépendance) : non</string>
+    <string name="poi_counselling_type_antenatal_yes">Conseiller (prénatal) : oui</string>
+    <string name="poi_counselling_type_antenatal_no">Conseiller (prénatal) : non</string>
+    <string name="poi_counselling_type_child_guidance_yes">Conseiller (orientation de l\'enfant) : oui</string>
+    <string name="poi_counselling_type_child_guidance_no">Conseiller (orientation de l\'enfant) : non</string>
+    <string name="poi_counselling_type_couple_yes">Conseiller (couple) : oui</string>
+    <string name="poi_counselling_type_couple_no">Conseiller (couple) : non</string>
+    <string name="poi_counselling_type_crisis_yes">Conseiller (crise) : oui</string>
+    <string name="poi_counselling_type_crisis_no">Conseiller (crise) : non</string>
+    <string name="poi_counselling_type_drugs_yes">Conseiller (drogues) : oui</string>
+    <string name="poi_counselling_type_drugs_no">Conseiller (médicaments) : non</string>
+    <string name="poi_counselling_type_education_yes">Conseiller (éducation) : oui</string>
+    <string name="poi_counselling_type_education_no">Conseiller (éducation) : non</string>
+    <string name="poi_counselling_type_family_yes">Conseiller (famille) : oui</string>
+    <string name="poi_counselling_type_family_no">Conseiller (famille) : non</string>
+    <string name="poi_counselling_type_homeless_yes">Conseiller (sans-abri) : oui</string>
+    <string name="poi_counselling_type_homeless_no">Conseiller (sans-abri) : non</string>
+    <string name="poi_counselling_type_immigrant_yes">Conseiller (immigrant) : oui</string>
+    <string name="poi_counselling_type_immigrant_no">Conseiller (immigrant) : non</string>
+    <string name="poi_counselling_type_marriage_yes">Conseiller (mariage) : oui</string>
+    <string name="poi_counselling_type_marriage_no">Conseiller (mariage) : non</string>
+    <string name="poi_counselling_type_nutrition_yes">Conseiller (nutrition) : oui</string>
+    <string name="poi_counselling_type_nutrition_nfire_hydo">Conseiller (nutrition) : non</string>
+    <string name="poi_counselling_type_rehabilitation_yes">Conseiller (réadaptation) : oui</string>
+    <string name="poi_counselling_type_rehabilitation_no">Conseiller (réadaptation) : non</string>
+    <string name="poi_counselling_type_sexual_yes">Conseiller (sexuel) : oui</string>
+    <string name="poi_counselling_type_sexual_no">Conseiller (sexuel) : non</string>
+    <string name="poi_counselling_type_sexual_abuse_yes">Conseiller (abus sexuel) : oui</string>
+    <string name="poi_counselling_type_sexual_abuse_no">Conseiller (abus sexuel) : non</string>
+    <string name="poi_counselling_type_victim_yes">Conseiller (victime) : oui</string>
+    <string name="poi_counselling_type_victim_no">Conseiller (victime) : non</string>
+    <string name="poi_counselling_type_violence_yes">Conseiller (violence) : oui</string>
+    <string name="poi_counselling_type_violence_no">Conseiller (violence) : non</string>
+    <string name="poi_provided_for_infant_yes">Prévu pour les nourrissons : oui</string>
+    <string name="poi_provided_for_infant_no">Prévu pour les nourrissons : non</string>
+    <string name="poi_provided_for_toddler_yes">Prévu pour les tout-petits : oui</string>
+    <string name="poi_provided_for_toddler_no">Pour les tout-petits : non</string>
+    <string name="poi_provided_for_child_yes">Pour les enfants : oui</string>
+    <string name="poi_provided_for_child_no">Pour les enfants : non</string>
+    <string name="poi_provided_for_adult_yes">Pour les adultes : oui</string>
+    <string name="poi_provided_for_adult_no">Pour les adultes : non</string>
+    <string name="poi_provided_for_woman_yes">Prévu pour les femmes : oui</string>
+    <string name="poi_provided_for_woman_no">Prévu pour les femmes : non</string>
+    <string name="poi_provided_for_senior_yes">Pour les personnes âgées : oui</string>
+    <string name="poi_provided_for_senior_no">Pour les personnes âgées : non</string>
+    <string name="poi_provided_for_girl_yes">Prévu pour les filles : oui</string>
+    <string name="poi_provided_for_girl_no">Pour les filles : non</string>
+    <string name="poi_provided_for_man_yes">Prévu pour les hommes : oui</string>
+    <string name="poi_provided_for_man_no">Prévu pour les hommes : non</string>
+    <string name="poi_provided_for_boy_yes">Pour les garçons : oui</string>
+    <string name="poi_provided_for_boy_no">Pour les garçons : non</string>
+    <string name="poi_treat_inpatient_yes">Services aux patients hospitalisés : oui</string>
+    <string name="poi_treat_inpatient_no">Services aux patients hospitalisés : non</string>
+    <string name="poi_treat_inpatient_only">Services aux patients hospitalisés : seulement</string>
+    <string name="poi_counselling_yes">Conseils: oui</string>
+    <string name="poi_counselling_no">Conseils : non</string>
+    <string name="poi_office_physician">Cabinet de médecin</string>
+    <string name="poi_office_therapist">Bureau de thérapeute</string>
+    <string name="poi_office_podologist">Cabinet du podologue</string>
+    <string name="poi_office_healer">Bureau du guérisseur</string>
+    <string name="poi_office_psychologist">Bureau du psychologue</string>
+    <string name="poi_office_nursing_service">Service de soins infirmiers</string>
+    <string name="poi_office_midwife">Cabinet de sage-femme</string>
+    <string name="poi_fire_hydrant_diameter">Diamètre de la bouche d\'incendie</string>
+    <string name="poi_fire_hydrant_style_wsh">Borne d\'incendie style : wsh</string>
+    <string name="poi_street_cabinet_power">Type d\'armoire : puissance</string>
+    <string name="poi_pump_type_india_mk_2_3">Type de pompe : Inde Mk II ou III&gt;</string>
+    <string name="poi_pump_type_gravity">Pompe de type : gravité</string>
+    <string name="poi_pump_style_historic">Style de pompe : historique</string>
+    <string name="poi_observatory_type_gravitational">Gravitationnel</string>
+    <string name="poi_generator_output_electricity_yes">Sortie: électricité</string>
+    <string name="poi_generator_output_hot_water">Puissance de sortie de l\'eau chaude</string>
+    <string name="poi_aquaculture_shrimp">Aquaculture : crevettes</string>
+    <string name="poi_aquaculture_mussels">Aquaculture : moules</string>
+    <string name="poi_cuisine_fine_dining">Cuisine raffinée</string>
+    <string name="poi_cuisine_savory_pancakes">Crêpes salées</string>
+    <string name="poi_animal_keeping_type_open_stable">Type : écurie ouverte</string>
+    <string name="poi_tower_construction_lattice">Construction : treillis</string>
+    <string name="poi_energy_supplier">Bureau des fournisseurs d\'énergie</string>
+    <string name="poi_resort_kids_camp">Camp pour enfants</string>
+    <string name="poi_zoo_petting_zoo">Zoo pour enfants</string>
+    <string name="poi_zoo_wildlife_park">Parc animalier</string>
+    <string name="poi_zoo_enclosure">Enceinte</string>
+    <string name="poi_zoo_safari_park">Parc safari</string>
+    <string name="poi_stands">Râtelier pour vélo</string>
+    <string name="poi_motorcycle_type_sportbike">Vélo de sport</string>
+    <string name="poi_motorcycle_type_chopper">Hachoir</string>
+    <string name="poi_motorcycle_type_offroad">Hors route</string>
+    <string name="poi_generator_output_electricity_no">Production (électricité) : non</string>
+    <string name="poi_animal_shelter_purpose_adoption_yes">Adoption : oui</string>
+    <string name="poi_animal_shelter_purpose_adoption_no">Adoption : non</string>
+    <string name="poi_animal_shelter_purpose_release_yes">Libre : oui</string>
+    <string name="poi_animal_shelter_purpose_release_no">Libre : non</string>
+    <string name="poi_winter_room_yes">Salle d\'hiver: oui</string>
+    <string name="poi_winter_room_no">Salle d\'hiver: non</string>
+    <string name="poi_boat_houseboat_rental_yes">Péniches: oui</string>
+    <string name="poi_boat_houseboat_rental_no">Péniches: non</string>
+    <string name="poi_boat_dinghy_rental_rental_yes">Canot : oui</string>
+    <string name="poi_boat_dinghy_rental_rental_no">Canot : non</string>
+    <string name="poi_water_place_durability_durable">Durabilité des plans d\'eau : durable</string>
+    <string name="poi_water_place_durability_emergency">Durabilité des plans d\'eau : urgence</string>
+    <string name="poi_water_purification_chlorine">Chlore</string>
+    <string name="poi_water_supply_water_well">Puits d’eau</string>
+    <string name="poi_water_supply_pipeline">Pipeline</string>
+    <string name="poi_water_supply_borehole">Trou de forage</string>
+    <string name="poi_socket_cee_blue">Prise de courant : Bleu CEE</string>
+    <string name="poi_socket_cee_blue_current">Prise de courant : Bleu CEE : courant</string>
+    <string name="poi_socket_cee_blue_output">Prise de courant : Bleu CEE : sortie</string>
+    <string name="poi_socket_cee_red_16a">Prise de courant : Rouge CEE 16A</string>
+    <string name="poi_socket_cee_red_16a_current">Prise de courant : Rouge CEE 16A : courant</string>
+    <string name="poi_socket_cee_red_16a_output">Prise de courant : CEE rouge 16A : sortie</string>
+    <string name="poi_socket_cee_red_32a">Prise de courant : Rouge CEE 32A</string>
+    <string name="poi_socket_cee_red_32a_current">Prise de courant : CEE rouge 32A : courant</string>
+    <string name="poi_socket_cee_red_32a_output">Prise de courant : CEE rouge 32A : sortie</string>
+    <string name="poi_socket_cee_red_64a">Prise de courant : Rouge CEE 64A</string>
+    <string name="poi_socket_cee_red_64a_current">Prise de courant : CEE rouge 64A : courant</string>
+    <string name="poi_socket_cee_red_64a_output">Prise de courant : CEE rouge 64A : sortie</string>
+    <string name="poi_socket_cee_red_125a">Prise de courant : Rouge CEE 125A</string>
+    <string name="poi_socket_cee_red_125a_current">Prise de courant : Rouge CEE 125A : courant</string>
+    <string name="poi_socket_cee_red_125a_output">Prise de courant : CEE rouge 125A : sortie</string>
+    <string name="poi_socket_type1">Prise de courant : Type 1</string>
+    <string name="poi_socket_type1_current">Prise de courant : Type 1 : courant</string>
+    <string name="poi_socket_type1_output">Prise de courant : Type 1 : sortie</string>
+    <string name="poi_socket_type1_combo">Prise de courant : Type 1 combo</string>
+    <string name="poi_socket_type1_combo_current">Prise de courant : Type 1 combo : courant</string>
+    <string name="poi_socket_type1_combo_output">Prise de courant : Type 1 combo : sortie</string>
+    <string name="poi_socket_type2">Prise de courant : Type 2</string>
+    <string name="poi_socket_type2_current">Prise de courant : Type 2 : courant</string>
+    <string name="poi_socket_type2_output">Prise de courant : Type 2 : sortie</string>
+    <string name="poi_socket_type2_combo">Prise de courant : Type 2 combo</string>
+    <string name="poi_socket_type2_combo_current">Prise de courant : Type 2 combo : courant</string>
+    <string name="poi_socket_type2_combo_output">Prise de courant : Type 2 combo : sortie</string>
+    <string name="poi_socket_type3">Prise de courant : Type 3</string>
+    <string name="poi_socket_type3_current">Prise de courant : Type 3 : courant</string>
+    <string name="poi_socket_type3_output">Prise de courant : Type 3 : sortie</string>
+    <string name="poi_socket_chademo">Prise de courant : CHAdeMO</string>
+    <string name="poi_socket_chademo_current">Prise de courant : CHAdeMO : actuel</string>
+    <string name="poi_socket_chademo_output">Prise de courant : CHAdeMO : sortie</string>
+    <string name="poi_socket_tesla_standard">Prise de courant : norme Tesla</string>
+    <string name="poi_socket_tesla_standard_current">Prise de courant : Norme Tesla : courant</string>
+    <string name="poi_socket_tesla_standard_output">Prise de courant : Norme Tesla : sortie</string>
+    <string name="poi_socket_tesla_supercharger">Prise de courant : Superchargeur Tesla</string>
+    <string name="poi_socket_tesla_supercharger_current">Prise de courant : Superchargeur Tesla : courant</string>
+    <string name="poi_socket_tesla_supercharger_output">Prise de courant : Superchargeur Tesla : sortie</string>
+    <string name="poi_socket_tesla_roadster">Prise de courant : Tesla Roadster</string>
+    <string name="poi_socket_tesla_roadster_current">Prise de courant : Tesla Roadster : courant</string>
+    <string name="poi_socket_tesla_roadster_output">Prise de courant : Tesla Roadster : sortie</string>
+    <string name="poi_socket_nema_5_15">Prise de courant : NEMA 5-15R</string>
+    <string name="poi_socket_nema_5_15_current">Prise de courant : NEMA 5-15R : courant</string>
+    <string name="poi_socket_nema_5_15_output">Prise de courant : NEMA 5-15R : sortie</string>
+    <string name="poi_socket_nema_5_20">Prise de courant : NEMA 5-20</string>
+    <string name="poi_socket_nema_5_20_current">Prise de courant : NEMA 5-20 : courant</string>
+    <string name="poi_socket_nema_5_20_output">Prise de courant : NEMA 5-20 : sortie</string>
+    <string name="poi_socket_nema_14_30">Prise de courant : NEMA 14-30</string>
+    <string name="poi_socket_nema_14_30_current">Prise de courant : NEMA 14-30 : courant</string>
+    <string name="poi_socket_nema_14_30_output">Prise de courant : NEMA 14-30 : sortie</string>
+    <string name="poi_socket_nema_14_50">Prise de courant : NEMA 14-50</string>
+    <string name="poi_socket_nema_14_50_current">Prise de courant : NEMA 14-50 : courant</string>
+    <string name="poi_socket_nema_14_50_output">Prise de courant : NEMA 14-50 : sortie</string>
+    <string name="poi_socket_schuko">Prise de courant : Schuko</string>
+    <string name="poi_socket_schuko_current">Prise de courant : Schuko : courant</string>
+    <string name="poi_socket_schuko_output">Prise de courant : Schuko : sortie</string>
+    <string name="poi_socket_bs1363">Prise de courant : BS 1363</string>
+    <string name="poi_socket_bs1363_current">Prise de courant : BS 1363 : courant</string>
+    <string name="poi_socket_bs1363_output">Prise de courant : BS 1363 : sortie</string>
+    <string name="poi_socket_as3112">Prise de courant : AS/NZS 3112</string>
+    <string name="poi_socket_as3112_current">Prise de courant : AS/NZS 3112 : courant</string>
+    <string name="poi_socket_as3112_output">Prise de courant : AS/NZS 3112 : sortie</string>
+    <string name="poi_charging_station_output">Sortie de la station de recharge</string>
+    <string name="poi_charging_station">Station de recharge</string>
+    <string name="poi_depot">Dépôt</string>
+    <string name="poi_money_transfer">Transfert d’argent</string>
+    <string name="poi_climbing_deepwater_yes">Solo en eau profonde : oui</string>
+    <string name="poi_climbing_deepwater_no">Solo en eau profonde : non</string>
+    <string name="poi_climbing_length">Longueur d\'escalade</string>
+    <string name="poi_climbing_length_min">Longueur minimum d\'escalade</string>
+    <string name="poi_climbing_length_max">Longueur maxi d\'escalade</string>
+    <string name="poi_climbing_rock_limestone">Rocher d\'escalade : calcaire</string>
+    <string name="poi_climbing_rock_granite">Rocher d\'escalade : granit</string>
+    <string name="poi_climbing_rock_sandstone">Rocher d\'escalade : grès</string>
+    <string name="poi_climbing_rock_quartzite">Roche d\'escalade : quartzite</string>
+    <string name="poi_climbing_rock_gneiss">Rocher d\'escalade : gneiss</string>
+    <string name="poi_climbing_rock_porphyry">Rocher d\'escalade : porphyre</string>
+    <string name="poi_meadow_agricultural">Type : agricole</string>
+    <string name="poi_meadow_perpetual">Type : perpétuel</string>
+    <string name="poi_meadow_transitional">Type : transitoire</string>
+    <string name="poi_meadow_pasture">Type : pâturage</string>
+    <string name="poi_socket_cee_blue_yes">Bleu CEE</string>
+    <string name="poi_socket_cee_red_16a_yes">Rouge CEE 16A</string>
+    <string name="poi_socket_cee_red_32a_yes">Rouge CEE 32A</string>
+    <string name="poi_socket_cee_red_64a_yes">Rouge CEE 64A</string>
+    <string name="poi_socket_cee_red_125a_yes">Rouge CEE 125A</string>
+    <string name="poi_socket_type1_combo_yes">Type 1 combo</string>
+    <string name="poi_socket_tesla_standard_yes">Norme Tesla</string>
+    <string name="poi_socket_tesla_supercharger_yes">Superchargeur Tesla</string>
+    <string name="poi_socket_chademo_output_high">Élevée</string>
+    <string name="poi_socket_chademo_output_medium">Moyenne</string>
+    <string name="poi_socket_chademo_output_low">Faible</string>
+    <string name="poi_socket_type2_combo_output_medium">Moyenne</string>
+    <string name="poi_socket_type2_combo_output_low">Faible</string>
+    <string name="poi_socket_type3_output_high">Élevée</string>
+    <string name="poi_socket_type3_output_medium">Moyenne</string>
+    <string name="poi_socket_type3_output_low">Faible</string>
+    <string name="poi_socket_cee_blue_output_high">Élevée</string>
+    <string name="poi_socket_cee_blue_output_medium">Moyenne</string>
+    <string name="poi_socket_cee_blue_output_low">Faible</string>
+    <string name="poi_socket_schuko_output_high">Élevée</string>
+    <string name="poi_socket_schuko_output_medium">Moyenne</string>
+    <string name="poi_socket_schuko_output_low">Faible</string>
+    <string name="poi_childcare">Garde d’enfants</string>
+    <string name="poi_denotation_natural_monument">Monument naturel</string>
+    <string name="poi_denotation_landmark">Point de repère</string>
+    <string name="poi_change_delete">Objet supprimé</string>
+    <string name="poi_rescue_box">Boîte de sauvetage</string>
+    <string name="poi_climbing_boulder_yes">Bloc : oui</string>
+    <string name="poi_climbing_boulder_no">Bloc : non</string>
+    <string name="poi_climbing_toprope_yes">Moulinette : oui</string>
+    <string name="poi_climbing_toprope_no">Moulinette : non</string>
+    <string name="poi_climbing_multipitch_yes">Voie en plusieurs longueurs : oui</string>
+    <string name="poi_climbing_multipitch_no">Voie en plusieurs longueurs : non</string>
+    <string name="poi_climbing_bolted_yes">Mousquetons fixés : oui</string>
+    <string name="poi_climbing_bolted_no">Mousquetons fixés : non</string>
+    <string name="poi_circumference">Circonférence</string>
+    <string name="poi_socket_chademo_yes">CHAdeMO</string>
+    <string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
+    <string name="poi_barbecue_grill">Grille de barbecue : oui</string>
+    <string name="poi_service_vehicle_wheels_yes">Pneus</string>
+    <string name="poi_service_vehicle_glass_yes">Vitres</string>
+    <string name="poi_service_vehicle_truck_repair_yes">Réparation de camion</string>
+    <string name="poi_service_vehicle_muffler_yes">Silencieux</string>
+    <string name="poi_service_vehicle_alignment_yes">Alignement</string>
+    <string name="poi_service_vehicle_transmission_repair_yes">Réparation de la transmission</string>
+    <string name="poi_aerialway_zip_line">Tyrolienne</string>
+    <string name="poi_cable_number">Numéro de câble</string>
+    <string name="poi_outcrop">Affleurement</string>
+    <string name="poi_atoll">Atoll</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index fd43ebef46..7246fabd9b 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1524,7 +1524,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="rendering_value__name">Par défaut</string>
     <string name="rendering_value_highContrastRoads_name">Routes avec fort contraste</string>
     <string name="specified_directiory_not_writeable">Impossible de créer les cartes dans le dossier spécifié</string>
-    <string name="copying_osmand_file_failed">Échec lors de la copie des fichiers</string>
+    <string name="copying_osmand_file_failed">Échec lors du déplacement des fichiers</string>
     <string name="storage_directory_external">Stockage externe</string>
     <string name="storage_directory_multiuser">Stockage multi-utilisateurs</string>
     <string name="storage_directory_internal_app">Mémoire interne de l\'application</string>
@@ -1532,7 +1532,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="storage_directory_default">Mémoire interne</string>
     <string name="storage_directory">Stockage de la carte</string>
     <string name="shared_string_copy">Copier</string>
-    <string name="application_dir_change_warning3">Copier les fichiers vers la nouvelle destination ?</string>
+    <string name="application_dir_change_warning3">Déplacer les fichiers de données vers la nouvelle destination \?</string>
     <string name="rendering_attr_hideHouseNumbers_name">Numérotation des bâtiments</string>
     <string name="routing_attr_avoid_borders_description">Éviter de franchir les frontières</string>
     <string name="routing_attr_height_name">Limite de hauteur</string>
@@ -1739,7 +1739,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="contact_us">Nous contacter</string>
     <string name="osm_edit_created_poi">Point d\'intérêt créé sur OSM</string>
     <string name="map_legend">Légende</string>
-    <string name="shared_string_upload">Téléchargement</string>
+    <string name="shared_string_upload">Téléversement</string>
     <string name="shared_string_update">Mise à jour</string>
     <string name="read_more">Lire plus</string>
     <string name="whats_new">Quoi de neuf en version</string>
@@ -2022,7 +2022,7 @@ Si vous appréciez OsmAnd et OSM et que vous souhaitez soutenir ces projets, c\'
     <string name="osmand_plus_banner_desc">Téléchargements illimités des cartes, des mises à jour et des données pour le greffon Wikipédia.</string>
     <string name="donation_to_osm">Don à la communauté OpenStreetMap</string>
     <string name="osm_live_subscription_desc">L\'abonnement permet de bénéficier des mises à jour horaires, quotidiennes, hebdomadaires et de télécharger de nouvelles cartes sans limite.</string>
-    <string name="osm_live_payment_desc">Abonnement mensuel. Vous pouvez l\'annuler à tout moment sur Google Play.</string>
+    <string name="osm_live_payment_desc">Abonnement facturé chaque mois. Annulation possible à tout moment depuis Google Play.</string>
     <string name="donation_to_osm_desc">Une partie de votre don sera reversée aux contributeurs OSM qui mettent à jour OpenStreetMap. Le coût de l\'abonnement reste identique.</string>
     <string name="driving_region_australia">Australie</string>
     <string name="lang_kab">Kabyle</string>
@@ -2267,7 +2267,7 @@ représentant la zone : %1$s x %2$s</string>
 \n
 \nQuelques-unes des fonctionnalités :</string>
     <string name="sea_depth_thanks">Merci d\'avoir acheté le greffon Lignes de sonde marines</string>
-    <string name="index_item_depth_contours_osmand_ext">Lignes de sonde marines</string>
+    <string name="index_item_depth_contours_osmand_ext">Isobathes</string>
     <string name="index_item_depth_points_southern_hemisphere">Lignes de sonde marines pour l\'hémisphère sud</string>
     <string name="index_item_depth_points_northern_hemisphere">Lignes de sonde marines pour l\'hémisphère nord</string>
     <string name="download_depth_countours">Lignes de sonde marines</string>
@@ -2709,10 +2709,10 @@ représentant la zone : %1$s x %2$s</string>
     <string name="download_images">Télécharger les images</string>
     <string name="purchase_dialog_title">Sélectionnez un abonnement</string>
     <string name="purchase_dialog_subtitle">Sélectionnez l\'élément adapté :</string>
-    <string name="purchase_dialog_travel_description">Pour lire des articles de voyage hors ligne, achetez l\'un des éléments suivants :</string>
+    <string name="purchase_dialog_travel_description">Achetez l\'une des options suivantes pour obtenir la fonctionnalité guide de voyage hors ligne :</string>
     <string name="wikivoyage_travel_guide_descr">Guides des lieux les plus intéressants au monde depuis OsmAnd et sans connexion Internet.</string>
     <string name="wikivoyage_travel_guide">Guides de voyage</string>
-    <string name="in_app_purchase">Achat via l\'application</string>
+    <string name="in_app_purchase">Achat depuis l\'application</string>
     <string name="in_app_purchase_desc">Paiement en une fois</string>
     <string name="purchase_unlim_title">Acheter - %1$s</string>
     <string name="purchase_subscription_title">Souscrire - %1$s</string>
@@ -2734,7 +2734,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="start_editing">Démarrer les modifications</string>
     <string name="get_unlimited_access">Obtenir un accès illimité</string>
     <string name="welcome_to_open_beta">Bienvenue dans cette bêta ouverte !</string>
-    <string name="contour_lines_hillshade_maps">Cartes avec courbes de niveaux et ombrages du relief</string>
+    <string name="contour_lines_hillshade_maps">Cartes avec courbes de niveaux et ombrage du relief</string>
     <string name="download_wikipedia_description">Téléchargez les articles Wikipedia pour %1$s afin de pouvoir les lire hors-ligne.</string>
     <string name="download_wikipedia_label">Télécharger les données Wikipedia</string>
     <string name="open_in_browser_wiki">Ouvrir l\'article en ligne</string>
@@ -2970,8 +2970,8 @@ représentant la zone : %1$s x %2$s</string>
 \n• Correction des plantages sur les arrêts de transports publics
 \n• Pour la version gratuite : retrait des analyses Facebook et Firebase (c\'était déjà le cas pour OsmAnd+).</string>
     <string name="shared_string_degrees">Degrés</string>
-    <string name="shared_string_milliradians">Millièmes angulaires</string>
-    <string name="angular_measeurement">Unités de mesure d\'angle</string>
+    <string name="shared_string_milliradians">Milliradians</string>
+    <string name="angular_measeurement">Unité d\'angle</string>
     <string name="angular_measeurement_descr">Modifier l\'unité de mesure de l\'azimut.</string>
     <string name="routing_attr_avoid_tram_name">Éviter le tram</string>
     <string name="routing_attr_avoid_tram_description">Éviter le tram</string>
@@ -2997,4 +2997,16 @@ représentant la zone : %1$s x %2$s</string>
     <string name="routing_attr_avoid_bus_description">Éviter le bus et le trolleybus</string>
     <string name="routing_attr_avoid_sett_name">Éviter les pavés</string>
     <string name="routing_attr_avoid_sett_description">Éviter les pavés</string>
+    <string name="files_moved">%1$d fichiers déplacés (%2$s).</string>
+    <string name="files_copied">%1$d fichiers copiés (%2$s).</string>
+    <string name="files_failed">Impossible de copier %1$d fichiers (%2$s).</string>
+    <string name="files_present">%1$d fichiers (%2$s) sont présents à l\'emplacement précédent \'%3$s\'.</string>
+    <string name="move_maps">Déplacer les cartes</string>
+    <string name="dont_move_maps">Ne pas déplacer</string>
+    <string name="public_transport_ped_route_title">L\'itinéraire piéton est approximativement de %1$s et peut-être plus rapide qu\'en transport public.</string>
+    <string name="public_transport_no_route_title">Malheureusement OsmAnd n\'a pas trouvé d\'itinéraire avec les paramètres courants.</string>
+    <string name="public_transport_try_ped">Essayez l\'itinéraire piéton.</string>
+    <string name="public_transport_try_change_settings">Essayez de modifier les paramètres.</string>
+    <string name="public_transport_calc_pedestrian">Calculer l\'itinéraire piéton</string>
+    <string name="public_transport_type">Type de transport</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index 3f8f65e9af..88a13b1177 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -405,7 +405,7 @@
     <string name="poi_camera">Cámaras e lentes</string>
     <string name="poi_fashion">Tenda de moda</string>
     <string name="poi_music">Tenda de música</string>
-    <string name="poi_optician">Optometría</string>
+    <string name="poi_optician">Óptica</string>
     <string name="poi_tyres">Tenda de rodas</string>
     <string name="poi_watches">Reloxaría</string>
     <string name="poi_games">Xogos</string>
@@ -770,7 +770,7 @@
     <string name="poi_greengrocer">Froitaría</string>
     <string name="poi_confectionery">Dozaría ou confeitaría</string>
     <string name="poi_pastry">Confeitaría</string>
-    <string name="poi_vending_machine">Máquina vendedora</string>
+    <string name="poi_vending_machine">Máquina expendedora</string>
     <string name="poi_baby_goods">Produtos de bebés</string>
     <string name="poi_furnace">Tenda de calefacción</string>
     <string name="poi_garden_furniture">Mobiliario do xardín</string>
@@ -1087,7 +1087,7 @@
     <string name="poi_shop_yes">Tenda xeral</string>
     <string name="poi_hearing_aids">Aparellos auditivos</string>
     <string name="poi_herbalist">Herboristaría</string>
-    <string name="poi_hifi">Tenda de alta fidelidade</string>
+    <string name="poi_hifi">Tenda de equipos de audio</string>
     <string name="poi_houseware">Tenda de artigos domésticos</string>
     <string name="poi_outdoor">Tenda de actividades ó ar libre</string>
     <string name="poi_ship_chandler">Fornecedor de navíos</string>
@@ -3571,4 +3571,8 @@
     <string name="poi_flare">Chama de gas;Queimadura de facho</string>
     <string name="poi_change_delete">Obxecto eliminado</string>
     <string name="poi_health_specialty_radiotherapy_yes">Radioterapia</string>
+    <string name="poi_climbing_crag_filter">Penedo de escalada</string>
+    <string name="poi_climbing_crag">Si</string>
+    <string name="reddit">Reddit</string>
+    <string name="poi_rescue_box">Caixa de rescate</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 08a4e9894e..3897ac6d6b 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -339,8 +339,8 @@
     <string name="use_magnetic_sensor_descr">Para a lectura do compás, emprega o sensor magnético no canto do sensor da orientación.</string>
     <string name="use_magnetic_sensor">Empregar o sensor magnético</string>
     <string name="other_location">Outra</string>
-    <string name="files_limit">Fican %1$d ficheiros</string>
-    <string name="available_downloads_left">Aínda fican %1$d ficheiros para baixar</string>
+    <string name="files_limit">Quedan %1$d ficheiros</string>
+    <string name="available_downloads_left">Aínda quedan %1$d ficheiros para baixar</string>
     <string name="install_paid">Versión completa</string>
     <string name="cancel_route">Rexeitar rota</string>
     <string name="cancel_navigation">Para-la navigación</string>
@@ -474,11 +474,11 @@
     <string name="replace_destination_point">Substituí-lo destino</string>
     <string name="new_destination_point_dialog">Xa existe un destino:</string>
     <string name="shared_string_target_points">Destinos</string>
-    <string name="intermediate_point_too_far">O destino intermedio %1$s está demasiado lonxe da estrada máis preta.</string>
+    <string name="intermediate_point_too_far">O destino intermedio %1$s está demasiado lonxe da estrada máis próxima.</string>
     <string name="arrived_at_intermediate_point">Destino intermedio acadado</string>
     <string name="context_menu_item_intermediate_point">Engadir un destino intermedio</string>
     <string name="map_widget_intermediate_distance">Destino intermedio</string>
-    <string name="ending_point_too_far">O derradeiro punto está moi lonxe da estrada máis preta.</string>
+    <string name="ending_point_too_far">O derradeiro punto está moi lonxe da estrada máis próxima.</string>
     <string name="add_tag">Engadir unha etiqueta</string>
     <string name="btn_advanced_mode">Modo avanzado…</string>
     <string name="poi_filter_parking">Aparcamento</string>
@@ -620,7 +620,7 @@
     <string name="native_app_allocated_memory_descr">A memoria nativa total empregada polo aplicativo é %1$s MB (Dalvik %2$s MB, outros %3$s MB).
 \nMemoria proporcional %4$s MB (O límite do Android é %5$s MB, Dalvik %6$s MB).</string>
     <string name="native_app_allocated_memory">Memoria nativa total</string>
-    <string name="starting_point_too_far">O punto de comezo está demasiado lonxe da estrada máis preta.</string>
+    <string name="starting_point_too_far">O punto de comezo está demasiado lonxe da estrada máis próxima.</string>
     <string name="shared_location">Localización partillada ou compartida</string>
     <string name="osmand_parking_event">Recolle-lo automóbil de onde está aparcado</string>
     <string name="osmand_parking_warning">Aviso</string>
@@ -961,7 +961,7 @@
     <string name="incomplete_locale">incompleto</string>
     <string name="shared_string_next">Seguinte</string>
     <string name="shared_string_previous">Anterior</string>
-    <string name="unit_of_length_descr">Muda a distancia da medición.</string>
+    <string name="unit_of_length_descr">Muda en que unidades se mide a distancia.</string>
     <string name="unit_of_length">Unidades da lonxitude</string>
     <string name="si_mi_feet">Millas/pés</string>
     <string name="si_mi_yard">Millas/iardas</string>
@@ -1482,9 +1482,9 @@
     <string name="shared_string_show_details">Amosar detalles</string>
     <string name="rendering_value_disabled_name">Desactivado</string>
     <string name="rendering_attr_hideHouseNumbers_name">Números dos edificios</string>
-    <string name="application_dir_change_warning3">Desexas que o OsmAnd copie tamén os teus ficheiros de datos ó novo destino\?</string>
+    <string name="application_dir_change_warning3">Desexas mover os ficheiros de datos de OsmAnd ó novo destino\?</string>
     <string name="specified_directiory_not_writeable">Non foi posíbel crear os mapas no directorio indicado</string>
-    <string name="copying_osmand_file_failed">Fallou o copiado dos ficheiros</string>
+    <string name="copying_osmand_file_failed">Non se puideron mover os ficheiros</string>
     <string name="storage_directory_external">Almacenaxe externo</string>
     <string name="storage_directory_multiuser">Almacenaxe multiusuario</string>
     <string name="storage_directory_internal_app">Memoria interna do aplicativo</string>
@@ -1701,7 +1701,7 @@ Lon %2$s</string>
     <string name="count_of_lines">Número de liñas</string>
     <string name="are_you_sure">Tes a certeza de querer facelo\?</string>
     <string name="unsaved_changes_will_be_lost">Vanse perde-las mudanzas non gardadas. Proseguer\?</string>
-    <string name="downloads_left_template">Fican %1$s baixadas</string>
+    <string name="downloads_left_template">Quedan %1$s baixadas</string>
     <string name="roads">Estradas</string>
     <string name="downloading_number_of_files">Estase a baixar - ficheiro %1$d</string>
     <string name="buy">Mercar</string>
@@ -2390,7 +2390,7 @@ Lon %2$s</string>
     <string name="south_abbreviation">S</string>
     <string name="north_abbreviation">N</string>
     <string name="optional_point_name">Nome do punto opcional</string>
-    <string name="transport_nearby_routes_within">Liñas pretas a menos dos</string>
+    <string name="transport_nearby_routes_within">Liñas próximas a menos dos</string>
     <string name="transport_nearby_routes">Preto dos</string>
     <string name="enter_the_file_name">Insire o nome do ficheiro.</string>
     <string name="map_import_error">Erro de importación de mapa</string>
@@ -3045,13 +3045,15 @@ Lon %2$s</string>
     <string name="routing_attr_avoid_subway_description">Evitar metros e tranvías/metros lixeiros</string>
     <string name="routing_attr_avoid_ferry_name">Evitar ferris</string>
     <string name="routing_attr_avoid_ferry_description">Evitar ferris</string>
-    <string name="release_3_3_7">• Amosar o tempo entre transbordos no transporte público
+    <string name="release_3_3_7">• Amosar o tempo entre transbordos no transporte público 
+\n 
+\n • Interface de usuario corrixida para «Detalles da rota» 
+\n 
+\n • Tema escuro solucionado no menú «Dirección» e «Detalles da rota» 
+\n 
+\n • Visualización de medida «azimut» en «Medir distancia»
 \n
-\n • Interface de usuario corrixida para «Detalles da rota»
-\n
-\n • Tema escuro solucionado no menú «Dirección» e «Detalles da rota»
-\n
-\n • Visualización de medida «azimut» en «Medir distancia»</string>
+\n</string>
     <string name="shared_string_degrees">Graos</string>
     <string name="shared_string_milliradians">Milirradiáns</string>
     <string name="angular_measeurement">Unidades de medición angular</string>
@@ -3062,4 +3064,16 @@ Lon %2$s</string>
     <string name="routing_attr_avoid_sett_name">Evitar o pavemento empedrado e lastros</string>
     <string name="routing_attr_avoid_sett_description">Evita as rúas empedradas e con lastros</string>
     <string name="send_log">Enviar rexistro (log)</string>
+    <string name="files_moved">%1$d ficheiros movidos (%2$s).</string>
+    <string name="files_copied">%1$d ficheiros copiados (%2$s).</string>
+    <string name="files_failed">Non se puideron copiar %1$d ficheiros (%2$s).</string>
+    <string name="files_present">%1$d ficheiros (%2$s) están presentes na localización anterior \"%3$s\".</string>
+    <string name="move_maps">Mover mapas</string>
+    <string name="dont_move_maps">Non mover</string>
+    <string name="public_transport_ped_route_title">A ruta a pé é de aproximadamente %1$s e pode que sexa máis rápida que no transporte público</string>
+    <string name="public_transport_no_route_title">Por desgraza, OsmAnd non puido atopar unha ruta adecuada para a túa configuración.</string>
+    <string name="public_transport_try_ped">Inténtao coa navegación a pé.</string>
+    <string name="public_transport_try_change_settings">Proba a cambiar os axustes.</string>
+    <string name="public_transport_calc_pedestrian">Calcular a ruta a pé</string>
+    <string name="public_transport_type">Tipo de transporte</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 0f63e86df9..645fa44244 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -1937,9 +1937,9 @@
     <string name="rendering_value_walkingRoutesScopeOSMC_name">צבע לפי שיוך לרשת</string>
     <string name="shared_string_logoff">יציאה</string>
     <string name="rendering_attr_hideHouseNumbers_name">מספרי בתים</string>
-    <string name="application_dir_change_warning3">להעתיק את קובצי הנתונים של OsmAnd ליעד החדש?</string>
+    <string name="application_dir_change_warning3">להעביר את קובצי הנתונים של OsmAnd ליעד החדש\?</string>
     <string name="specified_directiory_not_writeable">לא ניתן ליצור מפות בתיקייה שצוינה</string>
-    <string name="copying_osmand_file_failed">העתקת הקבצים נכשלה</string>
+    <string name="copying_osmand_file_failed">העברת הקבצים נכשלה</string>
     <string name="storage_directory_external">אחסון חיצוני</string>
     <string name="storage_directory_multiuser">אחסון למגוון משתמשים</string>
     <string name="storage_directory_internal_app">זיכרון פנימי של היישומון</string>
@@ -2997,7 +2997,7 @@
     <string name="quick_action_day_night_mode">מצב %s</string>
     <string name="shared_string_degrees">מעלות</string>
     <string name="shared_string_milliradians">מילי־רדיאנים</string>
-    <string name="angular_measeurement">יחידות מידה זוויתיות</string>
+    <string name="angular_measeurement">יחידה זוויתית</string>
     <string name="angular_measeurement_descr">החלפת יחידת המידה לאזימוט.</string>
     <string name="routing_attr_avoid_sett_name">הימנעות מריצוף חלוקי נחל ואבנים משתלבות</string>
     <string name="routing_attr_avoid_sett_description">הימנעות מריצוף חלוקי נחל ואבנים משתלבות</string>
@@ -3022,4 +3022,16 @@
 \n • הצגת אזימוט במדידת מרחק
 \n</string>
     <string name="send_log">שליחת יומן</string>
+    <string name="files_moved">הועברו %1$d קבצים (%2$s).</string>
+    <string name="files_copied">הועתקו %1$d קבצים (%2$s).</string>
+    <string name="files_failed">העתקתם של %1$d קבצים נכשלה (%2$s).</string>
+    <string name="files_present">%1$d קבצים (%2$s) נמצאים במיקום הקודם ‚%3$s’.</string>
+    <string name="move_maps">להעביר מפות</string>
+    <string name="dont_move_maps">לא להעביר</string>
+    <string name="public_transport_ped_route_title">זמן ההגעה בהליכה הוא בערך %1$s וייתכן שתחבורה ציבורית תקצר אותו</string>
+    <string name="public_transport_no_route_title">לרוע המזל, OsmAnd לא הצליח למצוא מסלול שמתאים להגדרות שלך.</string>
+    <string name="public_transport_try_ped">מוטב לנסות ניווט להולכי רגל.</string>
+    <string name="public_transport_try_change_settings">מוטב לנסות לשנות את ההגדרות.</string>
+    <string name="public_transport_calc_pedestrian">חישוב מסלול להולכי רגל</string>
+    <string name="public_transport_type">סוג תחבורה</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 98d87d0646..cdce738eb6 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1532,7 +1532,7 @@ Hosszúság: %2$s</string>
     <string name="filter_poi_hint">Szűrés név szerint</string>
     <string name="search_poi_category_hint">Gépelj az összes kereséséhez</string>
     <string name="specified_directiory_not_writeable">A térképeket nem sikerült létrehozni a megadott könyvtárban</string>
-    <string name="copying_osmand_file_failed">A fájlok másolása sikertelen</string>
+    <string name="copying_osmand_file_failed">A fájlok áthelyezése sikertelen</string>
     <string name="storage_directory_external">Külső tároló</string>
     <string name="storage_directory_multiuser">Többfelhasználós tároló</string>
     <string name="storage_directory_internal_app">Belső alkalmazás-memória</string>
@@ -1543,7 +1543,7 @@ Hosszúság: %2$s</string>
     <string name="rendering_value__name">Alapértelmezett</string>
     <string name="rendering_value_highContrastRoads_name">Nagy kontrasztú utak</string>
     <string name="index_name_netherlands">Európa – Hollandia</string>
-    <string name="application_dir_change_warning3">Az OsmAnd adatfájljait másoljuk az új helyre?</string>
+    <string name="application_dir_change_warning3">Az OsmAnd adatfájljait áthelyezzük az új helyre\?</string>
     <string name="rendering_attr_hideHouseNumbers_name">Házszámok</string>
     <string name="routing_attr_avoid_borders_description">Országhatár átlépésének elkerülése</string>
     <string name="routing_attr_height_name">Magasságkorlátozás</string>
@@ -2985,4 +2985,26 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="rendering_attr_undefined_name">Meghatározatlan</string>
     <string name="routing_attr_avoid_sett_name">Macskakő és kavicsburkolat elkerülése</string>
     <string name="routing_attr_avoid_sett_description">Macskakő és kavicsburkolat elkerülése</string>
+    <string name="files_moved">%1$d fájl áthelyezve (%2$s).</string>
+    <string name="files_copied">%1$d fájl átmásolva (%2$s).</string>
+    <string name="files_failed">%1$d fájl másolása nem sikerült (%2$s).</string>
+    <string name="files_present">%1$d fájl (%2$s) megtalálható az előző helyen: \'%3$s\'.</string>
+    <string name="move_maps">Térképek áthelyezése</string>
+    <string name="dont_move_maps">Ne mozogjon</string>
+    <string name="public_transport_ped_route_title">Az út gyalogosan körülbelül %1$s, vagyis valószínűleg gyorsabb, mint tömegközlekedéssel.</string>
+    <string name="public_transport_no_route_title">Az OsmAnd sajnos nem talál a beállításoknak megfelelő útvonalat.</string>
+    <string name="public_transport_try_ped">Próbálja meg a gyalogos navigációt.</string>
+    <string name="public_transport_try_change_settings">Próbálja meg módosítani a beállításokat.</string>
+    <string name="public_transport_calc_pedestrian">Gyalogos útvonal kiszámítása</string>
+    <string name="public_transport_type">Közlekedési mód</string>
+    <string name="send_log">Napló küldése</string>
+    <string name="release_3_3_7">• A tömegközlekedési átszállási idők megjelenítése
+\n
+\n • Javított felhasználói felület az útvonal részleteivel
+\n
+\n • Javított sötét téma az Irányok menüben és az Útvonal részleteinél
+\n
+\n • A távolságmérésnél a tájolás megjelenítése
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 7ca02e3147..a173ecf352 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -3566,4 +3566,5 @@
     <string name="poi_climbing_crag_filter">Klifursvæði</string>
     <string name="poi_rescue_box">Björgunarkassi</string>
     <string name="poi_climbing_crag">Já</string>
+    <string name="reddit">Reddit</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index dc50dba206..7959f20698 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -803,8 +803,8 @@
     <string name="lang_ms">Malasíska</string>
     <string name="shared_string_import2osmand">Flytja inn í OsmAnd</string>
     <string name="read_full_article">Lesa alla greinina (á netinu)</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Litur fer eftir netveitu</string>
-    <string name="copying_osmand_file_failed">Afritun skráa mistókst</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Litur fer eftir leiðakerfi</string>
+    <string name="copying_osmand_file_failed">Færsla skráa mistókst</string>
     <string name="storage_directory_external">Ytri gagnageymsla</string>
     <string name="storage_directory_multiuser">Fjölnotendageymsla</string>
     <string name="storage_directory_internal_app">Innra minni forrita</string>
@@ -1929,7 +1929,7 @@ Punktar</string>
     <string name="restart_is_required">Til að breytingarnar verði að fullu virkar, þarf að endurræsa forritið handvirkt.</string>
     <string name="lang_ber">Berberska</string>
     <string name="gps_network_not_enabled">Staðsetningarþjónustan er ekki virk. Viltu kveikja á henni?</string>
-    <string name="application_dir_change_warning3">Afrita OsmAnd-gagnaskrárnar sínar á nýja áfangastaðinn?</string>
+    <string name="application_dir_change_warning3">Færa OsmAnd-gagnaskrárnar á nýja áfangastaðinn\?</string>
     <string name="action_create">Aðgerðin útbúa</string>
     <string name="action_modify">Aðgerðin breyta</string>
     <string name="action_delete">Aðgerðin eyða</string>
@@ -3017,7 +3017,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="routing_attr_avoid_sett_description">Forðast götusteina og steinlögn</string>
     <string name="shared_string_degrees">Gráður</string>
     <string name="shared_string_milliradians">Millíradíanar</string>
-    <string name="angular_measeurement">Mælieiningar horna</string>
+    <string name="angular_measeurement">Mælieining horna</string>
     <string name="angular_measeurement_descr">Breyttu í hvaða einingum áttarhorn (hæð) er mælt.</string>
     <string name="routing_attr_avoid_tram_name">Forðast sporvagna</string>
     <string name="routing_attr_avoid_tram_description">Forðast sporvagna</string>
@@ -3041,4 +3041,16 @@ Stendur fyrir svæði: %1$s x %2$s</string>
 \n
 \n</string>
     <string name="send_log">Senda atvikaskrá</string>
+    <string name="files_moved">Færði %1$d skrár (%2$s).</string>
+    <string name="files_copied">Afritaði %1$d skrár (%2$s).</string>
+    <string name="files_failed">Mistókst að afrita %1$d skrár (%2$s).</string>
+    <string name="files_present">%1$d skrár (%2$s) eru til staðar á fyrri staðsetningunni \'%3$s\'.</string>
+    <string name="move_maps">Flytja kort</string>
+    <string name="dont_move_maps">Ekki flytja</string>
+    <string name="public_transport_ped_route_title">Leiðin er um það bil %1$s fótgangandi og gæti verið fljótfarnari þannig heldur en með almenningssamgöngum</string>
+    <string name="public_transport_no_route_title">Því miður gat OsmAnd ekki fundið hentuga leið miðað við stillingarnar þínar.</string>
+    <string name="public_transport_try_ped">Prófaðu leiðsögn fyrir fótgangandi.</string>
+    <string name="public_transport_try_change_settings">Prófaðu að breyta stillingunum.</string>
+    <string name="public_transport_calc_pedestrian">Reikna leið fyrir fótgangandi</string>
+    <string name="public_transport_type">Tegund samgangna</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index da70e83aa1..50ec95b417 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1525,7 +1525,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="filter_poi_hint">Filtra per nome</string>
     <string name="search_poi_category_hint">Scrivi per cercare</string>
     <string name="index_name_netherlands">Europa - Paesi Bassi</string>
-    <string name="copying_osmand_file_failed">Copia dei file fallita</string>
+    <string name="copying_osmand_file_failed">Spostamento dei file fallita</string>
     <string name="storage_directory_external">Memoria esterna</string>
     <string name="application_dir_change_warning3">Copiare i file dei dati OsmAnd nella nuova destinazione\?</string>
     <string name="specified_directiory_not_writeable">Le mappe non possono essere create nella destinazione specificata</string>
@@ -2206,7 +2206,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="points_delete_multiple_succesful">Punti cancellati.</string>
     <string name="points_delete_multiple">Stai cancellando %1$d punto(i). Confermi?</string>
     <string name="route_points_category_name">Svolte di questo percorso</string>
-    <string name="track_points_category_name">Punti di passaggio, punti di interesse, caratteristiche notevoli</string>
+    <string name="track_points_category_name">Punti di passaggio, punti di interesse, caratteristiche con un nome</string>
     <string name="shared_string_gpx_track">Traccia</string>
     <string name="max_speed">Velocità massima</string>
     <string name="add_new_folder">Aggiungi una nuova cartella</string>
@@ -3015,4 +3015,17 @@ Rappresenta l\'area: %1$s x %2$s</string>
 \n• Visualizza l’azimut nella misura della distanza.
 \n
 \n</string>
+    <string name="files_moved">Spostato %1$d files (%2$s).</string>
+    <string name="files_copied">Copiati %1$d files (%2$s).</string>
+    <string name="files_failed">Fallita la copia di %1$d files (%2$s).</string>
+    <string name="files_present">%1$d files (%2$s) sono presenti nella precedente posizione \'%3$s\'.</string>
+    <string name="move_maps">Sposta le mappe</string>
+    <string name="dont_move_maps">Non spostare</string>
+    <string name="public_transport_ped_route_title">Il percorso a piedi è circa %1$s e poterebbe essere più veloce di quello con i mezzi pubblici</string>
+    <string name="public_transport_no_route_title">Sfortunatamente, OsmAnd non può individuare un percorso compatibile alle tue impostazioni.</string>
+    <string name="public_transport_try_ped">Prova la navigazione per pedoni.</string>
+    <string name="public_transport_try_change_settings">Prova cambiando le impostazioni.</string>
+    <string name="public_transport_calc_pedestrian">Calcola un percorso per pedoni</string>
+    <string name="public_transport_type">Modalità di trasporto</string>
+    <string name="send_log">Invia il registro</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 9ad0203744..be944cee1c 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -2680,7 +2680,7 @@ POIの更新は利用できません</string>
     <string name="travel_card_download_descr">Wikivoyageの旅行ガイドを事前にダウンロードすれば、インターネット接続なしで世界各地の観光場所を知ることができます。</string>
     <string name="start_editing_card_image_text">誰でも自由に編集できる世界規模の旅行ガイドです。</string>
     <string name="welcome_to_open_beta_description">『旅行ガイド』はWikivoyageをベースとした機能です。オープンβ時に限り無料で全ての機能を利用できます。旅行ガイドは将来的にOsmAndのサブスクライブ登録者や、OsmAnd+の利用者に提供される予定です。</string>
-    <string name="start_editing_card_description">あなたもWikivoyageの記事を編集できます。場所に関する知識、旅先での経験、魅力あるスポットはもちろん注意事項なども共有できます</string>
+    <string name="start_editing_card_description">あなたもWikivoyageの記事を編集できます。場所に関する知識、旅先での経験、魅力あるスポットはもちろん注意事項なども共有できます。</string>
     <string name="start_editing">編集を開始</string>
     <string name="get_unlimited_access">制限のないアクセス権の取得</string>
     <string name="wikivoyage_travel_guide">旅行ガイド</string>
diff --git a/OsmAnd/res/values-mn/strings.xml b/OsmAnd/res/values-mn/strings.xml
index 697c332e0b..5976030ce9 100644
--- a/OsmAnd/res/values-mn/strings.xml
+++ b/OsmAnd/res/values-mn/strings.xml
@@ -1,3 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
     <string name="back_to_search">Гэр тайхар</string>
-    </resources>
\ No newline at end of file
+    <string name="rendering_attr_highway_class_road_name">Зам</string>
+    <string name="rendering_attr_highway_class_street_name">Гудамж</string>
+    <string name="road_types">замын төрөл</string>
+    <string name="search_street">Гудамж хайх</string>
+    <string name="search_no_results_feedback">илэрц алга</string>
+    <string name="download_all">Бүгдийг татах</string>
+    <string name="download_file">Файл татах</string>
+    <string name="wikivoyage_download_pics">Зураг татах</string>
+    <string name="delete_search_history">Хайсан түүхийг устгах</string>
+    <string name="restart_search">Дахин хайх</string>
+    <string name="srtm_menu_download_descr">татах</string>
+    <string name="do_not_send_anonymous_app_usage_desc">татах</string>
+    <string name="search_map_hint">Хот болон улс хайх</string>
+    <string name="custom_search">Чөлөөт хайлт</string>
+    <string name="coords_search">Координат хайх</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml
index 1a67874bc1..27bf187f37 100644
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@@ -1330,4 +1330,12 @@
     <string name="poi_beauty_salon_nails">Manikyr</string>
     <string name="poi_atm">Minibank</string>
     <string name="poi_rapids">Stryk</string>
+    <string name="poi_tableware">Bestikkbutikk</string>
+    <string name="poi_recycling_animal_waste">Animalsk avfall</string>
+    <string name="poi_waste_basket">Søppelkurv</string>
+    <string name="poi_orchard">Nyttevekstbeplantning</string>
+    <string name="poi_reservoir">Reservoar</string>
+    <string name="poi_college">Høyskole</string>
+    <string name="poi_bailiff">Fogd</string>
+    <string name="poi_tax_inspection">Skattekontor</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 829f9e2fe0..f18da6ea9a 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -1038,7 +1038,7 @@
     <string name="osm_settings_descr">Spesifiser innstillinger for OpenStreetMap.org (OSM) som er nødvendige for bidrag til OSM.</string>
     <string name="shared_string_disabled">Deaktivert</string>
     <string name="shared_string_enabled">Aktivert</string>
-    <string name="shared_string_enable">Aktiver</string>
+    <string name="shared_string_enable">Skru på</string>
     <string name="shared_string_disable">Deaktiver</string>
     <string name="plugin_install_needs_network">Du må være koblet til Internett for å installere dette programtillegget.</string>
     <string name="shared_string_never">Aldri</string>
@@ -1127,9 +1127,9 @@
     <string name="download_type_to_filter">Filtrer</string>
     <string name="get_plugin">Hent</string>
     <string name="shared_string_is_open">Åpen nå</string>
-    <string name="application_dir_change_warning3">Kopiere OsmAnd-datafiler til det nye målet?</string>
+    <string name="application_dir_change_warning3">Flytt OsmAnd-datafiler til det nye målet\?</string>
     <string name="specified_directiory_not_writeable">Kart kunne ikke opprettes i angitte mappe</string>
-    <string name="copying_osmand_file_failed">Kopiering av filer mislyktes</string>
+    <string name="copying_osmand_file_failed">Flytting av filer mislyktes</string>
     <string name="storage_directory_external">Ekstern lagring</string>
     <string name="storage_directory_multiuser">Flerbruker-lagring</string>
     <string name="storage_directory_internal_app">Internt programminne</string>
@@ -2471,7 +2471,7 @@
     <string name="osm_notes">OSM-notater</string>
     <string name="tunnel_warning">Tunnel foran</string>
     <string name="show_tunnels">Tunneler</string>
-    <string name="enable_plugin_monitoring_services">Aktiver turopptakstillegget for å bruke posisjonloggingstjenester (GPX-logging, nettbasert sporing)</string>
+    <string name="enable_plugin_monitoring_services">Aktiver tillegget \"Turopptak\" for å bruke posisjonloggingstjenester (GPX-logging, nettbasert sporing)</string>
     <string name="non_optimal_route_calculation">Beregn mulig ikke-optimal rute over lange avstander</string>
     <string name="vector_data_missing">Last ned (\'nettfrakoblede\') data for å kunne bruke kart nettfrakoblet.</string>
     <string name="create_poi_link_to_osm_doc">
@@ -3029,4 +3029,16 @@
 \n
 \n</string>
     <string name="send_log">Send logg</string>
+    <string name="files_moved">Flyttet %1$d filer (%2$s).</string>
+    <string name="files_copied">Kopierte %1$d filer (%2$s).</string>
+    <string name="files_failed">Klarte ikke å kopiere %1$d filer (%2$s).</string>
+    <string name="files_present">%1$d filer (%2$s) finnes på forrige plassering \'%3$s\'.</string>
+    <string name="move_maps">Flytt kart</string>
+    <string name="dont_move_maps">Ikke flytt</string>
+    <string name="public_transport_ped_route_title">Ruten til fots er omtrent %1$s og kan framskyndes av offentlig transport</string>
+    <string name="public_transport_no_route_title">OsmAnd fant ikke en rute som passet med innstillingene dine.</string>
+    <string name="public_transport_try_ped">Prøv fotgjengernavigasjonen.</string>
+    <string name="public_transport_try_change_settings">Prøv å endre innstillingene.</string>
+    <string name="public_transport_calc_pedestrian">Regn ut rute til fots</string>
+    <string name="public_transport_type">Transporttype</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 0472080201..bc1b9b4868 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -3348,7 +3348,7 @@
     <string name="poi_climbing_trad_yes">Tradycyjne: tak</string>
     <string name="poi_climbing_trad_no">Tradycyjne: nie</string>
     <string name="poi_climbing_multipitch_yes">Wspinaczka wielowyciągowa: tak</string>
-    <string name="poi_climbing_multipitch_no">Wspinaczka wielowyciągowa: nie</string>
+    <string name="poi_climbing_multipitch_no">Trasy wielostrefowe: nie</string>
     <string name="poi_climbing_ice_yes">Lód: tak</string>
     <string name="poi_climbing_ice_no">Lód: nie</string>
     <string name="poi_climbing_mixed_yes">Mieszane: tak</string>
@@ -3579,4 +3579,5 @@
     <string name="poi_flare">Palnik gazowy</string>
     <string name="poi_climbing_crag_filter">Wspinaczka na skały</string>
     <string name="poi_climbing_crag">Tak</string>
+    <string name="poi_rescue_box">Skrzynka ratunkowa</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 44d50f49a3..61ca12fdb1 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1536,9 +1536,9 @@ Długość %2$s</string>
     <string name="shared_string_manage">Zarządzaj</string>
     <string name="shared_string_edit">Edytuj</string>
     <string name="filter_poi_hint">Filtruj po nazwie</string>
-    <string name="application_dir_change_warning3">Skopiować pliki danych OsmAnd do nowego miejsca docelowego?</string>
+    <string name="application_dir_change_warning3">Przenieść pliki danych OsmAnd do nowego miejsca docelowego\?</string>
     <string name="specified_directiory_not_writeable">Nie można zapisać map we wskazanym katalogu</string>
-    <string name="copying_osmand_file_failed">Nie udało się skopiować plików</string>
+    <string name="copying_osmand_file_failed">Przenoszenie plików nie powiodło się</string>
     <string name="storage_directory_external">Pamięć zewnętrzna</string>
     <string name="storage_directory_default">Pamięć wewnętrzna</string>
     <string name="shared_string_copy">Skopiuj</string>
@@ -2733,7 +2733,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="import_gpx_file_description">można zaimportować jako Ulubione lub plik GPX.</string>
     <string name="import_as_favorites">Importuj jako Ulubione</string>
     <string name="import_file">Zapisz plik</string>
-    <string name="access_intermediate_arrival_time">Czas przybycia do punktu pośredniego</string>
+    <string name="access_intermediate_arrival_time">Pośredni czas przyjazdu</string>
     <string name="map_widget_intermediate_time">Czas pośredni</string>
     <string name="unirs_render_descr">Modyfikacja domyślnego stylu zwiększająca kontrast dróg pieszych i rowerowych. Używa przestarzałych kolorów stylu „Mapnik”.</string>
     <string name="off_road_render_descr">Styl odpowiedni do przejazdów terenowych. Nadaje się do użycia z podkładami o barwie zielonej. Kluczowe cechy: zmniejszona szerokość głównych dróg, zwiększona szerokość dróg leśnych i polnych, ścieżek, dróg rowerowych i innych. Stworzona na podstawie stylu „Topo”.</string>
@@ -3000,7 +3000,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
 \n • Usunięcie Facebooka i analiz Firebase z darmowej wersji (OsmAnd+ tego nie zawiera)
 \n</string>
     <string name="shared_string_degrees">Stopnie</string>
-    <string name="shared_string_milliradians">Miliradiany</string>
+    <string name="shared_string_milliradians">Miliradianach</string>
     <string name="quick_action_day_night_mode">Tryb %s</string>
     <string name="routing_attr_avoid_tram_name">Unikanie tramwajów</string>
     <string name="routing_attr_avoid_tram_description">Unikanie tramwajów</string>
@@ -3034,4 +3034,16 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="routing_attr_avoid_share_taxi_name">Unikanie taksówek zbiorowych</string>
     <string name="routing_attr_avoid_share_taxi_description">Unikanie taksówek zbiorowych</string>
     <string name="send_log">Wyślij dziennik</string>
+    <string name="files_moved">Przeniesiono %1$d plików (%2$s).</string>
+    <string name="files_copied">Skopiowano %1$d plików (%2$s).</string>
+    <string name="files_failed">Nie udało się skopiować %1$d plików (%2$s).</string>
+    <string name="files_present">%1$d pliki (%2$s) są obecne w poprzednim położeniu „%3$s”.</string>
+    <string name="move_maps">Przenieś mapy</string>
+    <string name="dont_move_maps">Nie przenoś</string>
+    <string name="public_transport_ped_route_title">Trasa pieszo wynosi około %1$s i może być szybsza niż transportem publicznym</string>
+    <string name="public_transport_no_route_title">Niestety OsmAnd nie mógł znaleźć trasy odpowiedniej dla wybranych ustawień.</string>
+    <string name="public_transport_try_ped">Wypróbuj nawigację pieszą.</string>
+    <string name="public_transport_try_change_settings">Spróbuj zmienić ustawienia.</string>
+    <string name="public_transport_calc_pedestrian">Oblicz trasę pieszą</string>
+    <string name="public_transport_type">Typ transportu</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index 3357b7bba1..bcff4d3173 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -3581,4 +3581,5 @@
     <string name="poi_rescue_box">Caixa de resgate</string>
     <string name="poi_climbing_crag_filter">Penhasco de escalada</string>
     <string name="poi_climbing_crag">Sim</string>
+    <string name="reddit">Reddit</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index cf77636258..9057e7e5d8 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -12,9 +12,9 @@
     <string name="favorite_home_category">Casa</string>
     <string name="local_index_action_do">Você está prestes a %1$s %2$s item(s). Continuar?</string>
     <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
-    <string name="application_dir_change_warning3">Copiar arquivos de dados OsmAnd para o novo destino\?</string>
+    <string name="application_dir_change_warning3">Mover arquivos de dados OsmAnd para o novo destino\?</string>
     <string name="specified_directiory_not_writeable">Mapas não podem ser criados no diretório especificado</string>
-    <string name="copying_osmand_file_failed">A cópia de arquivos falhou</string>
+    <string name="copying_osmand_file_failed">Falha ao mover os arquivos</string>
     <string name="storage_directory_external">Armazenamento externo</string>
     <string name="storage_directory_multiuser">Armazenamento multiusuário</string>
     <string name="storage_directory_internal_app">Memória interna do aplicativo</string>
@@ -1326,7 +1326,7 @@ Pôr do Sol: %2$s</string>
     <string name="fav_imported_sucessfully">Favoritos importados</string>
     <string name="import_file_favourites">Salvar dados como arquivo GPX ou importar pontos para os \'Favoritos\'\?</string>
     <string name="fav_file_to_load_not_found">O arquivo GPX contendo os favoritos não foi encontrado em {0}</string>
-    <string name="share_fav_subject">Favoritos compartilhados através do OsmAnd</string>
+    <string name="share_fav_subject">Favoritos compartilhados via OsmAnd</string>
     <string name="error_occurred_loading_gpx">Não foi possível carregar o GPX</string>
     <string name="send_report">Enviar o relatório</string>
     <string name="none_region_found">Não foi possível encontrar nenhum mapa baixado no cartão de memória.</string>
@@ -1646,7 +1646,7 @@ Pôr do Sol: %2$s</string>
     <string name="routing_attr_avoid_shuttle_train_description">Evitar trem de conexão</string>
     <string name="plugin_settings">Complementos</string>
     <string name="tab_title_basic">Básico</string>
-    <string name="tab_title_advanced">Estendido</string>
+    <string name="tab_title_advanced">Avançado</string>
     <string name="building_number">Número de edifício</string>
     <string name="next_proceed">Próximo</string>
     <string name="opening_at">Abre às</string>
@@ -2877,7 +2877,7 @@ Pôr do Sol: %2$s</string>
     <string name="choose_track_file_to_follow">Escolha arquivo de trilha para seguir</string>
     <string name="voice_announcements">Avisos por voz</string>
     <string name="intermediate_destinations">Destinos intermediários</string>
-    <string name="arrive_at_time">Chegada em %1$s</string>
+    <string name="arrive_at_time">Chega às %1$s</string>
     <string name="lang_gn_py">Guarani</string>
     <string name="quick_action_switch_day_night_descr">Tocando neste botão de ação, alterne entre os modos Dia e Noite para OsmAnd</string>
     <string name="quick_action_switch_day_mode">"Modo diurno "</string>
@@ -2990,7 +2990,7 @@ Pôr do Sol: %2$s</string>
     <string name="routing_attr_avoid_sett_description">Evitar pavimento de pedras irregulares e paralelepípedo</string>
     <string name="shared_string_degrees">Graus</string>
     <string name="shared_string_milliradians">Milirradianos</string>
-    <string name="angular_measeurement">Unidades de medição angular</string>
+    <string name="angular_measeurement">Unidade angular</string>
     <string name="angular_measeurement_descr">Mude em que o azimute é medido.</string>
     <string name="routing_attr_avoid_tram_name">Evitar bondes</string>
     <string name="routing_attr_avoid_tram_description">Evitar de usar bondes</string>
@@ -3013,4 +3013,16 @@ Pôr do Sol: %2$s</string>
 \n  • Exibição do azimute na distância medida
 \n</string>
     <string name="send_log">Enviar log</string>
+    <string name="files_moved">Arquivos %1$d movidos (%2$s).</string>
+    <string name="files_copied">Arquivos %1$d copiados (%2$s).</string>
+    <string name="files_failed">Falha ao copiar %1$d arquivos (%2$s).</string>
+    <string name="files_present">"%1$d  arquivos (%2$s) estão presentes no local anterior \'%3$s\'."</string>
+    <string name="move_maps">Mover mapas</string>
+    <string name="dont_move_maps">Não Mover</string>
+    <string name="public_transport_ped_route_title">A rota a pé é de aproximadamente %1$s e pode ser mais rápida do que por transporte público</string>
+    <string name="public_transport_no_route_title">Infelizmente, OsmAnd não conseguiu encontrar uma rota adequada para suas configurações.</string>
+    <string name="public_transport_try_ped">Experimente a navegação a pé.</string>
+    <string name="public_transport_try_change_settings">Tente alterar as configurações.</string>
+    <string name="public_transport_calc_pedestrian">Calcular rota a pé</string>
+    <string name="public_transport_type">Tipo de transporte</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt/phrases.xml b/OsmAnd/res/values-pt/phrases.xml
index 7f28517e4e..57a5658031 100644
--- a/OsmAnd/res/values-pt/phrases.xml
+++ b/OsmAnd/res/values-pt/phrases.xml
@@ -3355,7 +3355,7 @@
     <string name="poi_climbing_trad_yes">Tradicional: sim</string>
     <string name="poi_climbing_trad_no">Tradicional: não</string>
     <string name="poi_climbing_multipitch_yes">Rotas multi-pitch: sim</string>
-    <string name="poi_climbing_multipitch_no">Rotas multi-pitch: não</string>
+    <string name="poi_climbing_multipitch_no">Rotas multi passo: não</string>
     <string name="poi_climbing_ice_yes">Gelo: sim</string>
     <string name="poi_climbing_ice_no">Gelo: não</string>
     <string name="poi_climbing_mixed_yes">Misto: sim</string>
@@ -3566,4 +3566,5 @@
     <string name="poi_change_delete">Objeto excluído</string>
     <string name="poi_rescue_box">Caixa de resgate</string>
     <string name="poi_climbing_crag">Sim</string>
+    <string name="reddit">Reddit</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 20c6822b21..2223ffb7ef 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -56,9 +56,9 @@
     <string name="filter_existing_indexes">Descarregado</string>
     <string name="shared_string_select_all">Marcar tudo</string>
     <string name="shared_string_refresh">Atualizar</string>
-    <string name="general_settings_descr">Configure a exibição e configurações comuns para o app.</string>
+    <string name="general_settings_descr">Configure a visualização e configurações comuns para a aplicação.</string>
     <string name="general_settings">Configurações Gerais</string>
-    <string name="index_settings_descr">Descarregar e gerenciar ficheiros de mapas offline armazenados no seu aparelho.</string>
+    <string name="index_settings_descr">Descarregar e gerir ficheiros de mapas offline armazenados no seu aparelho.</string>
     <string name="index_settings">Gerir Ficheiros de mapa</string>
     <string name="osmand_service">Modo de fundo</string>
     <string name="osmand_service_descr">Executar o serviço de segundo plano para usar OsmAnd enquanto o ecrã está desligado.</string>
@@ -107,8 +107,8 @@
     <string name="show_route">Mostrar rota</string>
     <string name="fav_imported_sucessfully">Favoritos importados</string>
     <string name="fav_file_to_load_not_found">O ficheiro GPX contendo os favoritos não foi encontrado em {0}</string>
-    <string name="fav_saved_sucessfully">Favoritos gravados em {0}</string>
-    <string name="no_fav_to_save">Nenhum favorito para gravar</string>
+    <string name="fav_saved_sucessfully">Favoritos guardados em {0}</string>
+    <string name="no_fav_to_save">Nenhum ponto favorito para guardar</string>
     <string name="shared_string_import">Importar</string>
     <string name="error_occurred_loading_gpx">Erro ao carregar o ficheiro GPX</string>
     <string name="send_report">Enviar o relatório</string>
@@ -231,7 +231,7 @@
     <string name="shared_string_download_successful">Descarregado</string>
     <string name="downloading_list_indexes">Descarregando lista de regiões disponíveis…</string>
     <string name="list_index_files_was_not_loaded">Não foi possível obter uma lista de regiões em https://osmand.net.</string>
-    <string name="select_index_file_to_download">Nada foi encontrado. Se não conseguir encontrar a sua região, pode fazê-lo você mesmo (ver https://osmand.net).</string>
+    <string name="select_index_file_to_download">Nada encontrado. Se não conseguir encontrar a sua região, pode fazê-lo por si mesmo (ver https://osmand.net).</string>
     <string name="fav_points_edited">O favorito foi modificado</string>
     <string name="fav_points_not_exist">Não existe nenhum Favorito</string>
     <string name="update_existing">Modificar</string>
@@ -240,7 +240,7 @@
     <string name="recalculate_route_to_your_location">Meio de transporte:</string>
     <string name="mark_final_location_first">Por favor, primeiro selecione um destino</string>
     <string name="get_directions">Navegação</string>
-    <string name="gps_status_app_not_found">O aplicativo de estado GPS não está instalado. Pesquisar no mercado\?</string>
+    <string name="gps_status_app_not_found">A aplicação do estado do GPS não está instalada. Pesquisar na loja de aplicações\?</string>
     <string name="opening_hours">Horas de abertura</string>
     <string name="opening_changeset">Abrindo conjunto de alterações …</string>
     <string name="closing_changeset">Fechando conjunto de alterações…</string>
@@ -254,12 +254,12 @@
     <string name="loading_streets">Carregando ruas…</string>
     <string name="loading_cities">Carregando cidades…</string>
     <string name="poi">POI</string>
-    <string name="error_occurred_saving_gpx">Não foi possível gravar o ficheiro GPX</string>
+    <string name="error_occurred_saving_gpx">Não foi possível guardar o ficheiro GPX</string>
     <string name="error_calculating_route">Não foi possível calcular a rota</string>
     <string name="error_calculating_route_occured">Não foi possível calcular a rota</string>
     <string name="empty_route_calculated">A rota calculada está vazia</string>
     <string name="new_route_calculated_dist">Nova rota calculada, distância</string>
-    <string name="arrived_at_destination">Você alcançou o seu destino</string>
+    <string name="arrived_at_destination">Chegou ao seu destino</string>
     <string name="invalid_locations">Coordenadas inválidas</string>
     <string name="go_back_to_osmand">Voltar ao mapa do OsmAnd</string>
     <string name="shared_string_close">Fechar</string>
@@ -281,11 +281,11 @@
     <string name="settings_preset_descr">A visão do mapa e as configurações de navegação são guardadas por perfil. Defina aqui o seu.</string>
     <string name="settings_preset">Perfil predefinido</string>
     <string name="shared_string_settings">Configurações</string>
-    <string name="save_current_track_descr">Agora salvar a trilha atual no cartão SD.</string>
-    <string name="save_current_track">Salvar a trilha atual</string>
+    <string name="save_current_track_descr">Guardar agora o trilho atual num ficheiro GPX.</string>
+    <string name="save_current_track">Guardar o trilho atual</string>
     <string name="save_track_interval_descr">Escolher o intervaloentre posições nas trilhas durante a navegação.</string>
     <string name="save_track_interval">Intervalo de gravação durante a navegação</string>
-    <string name="save_track_to_gpx_descrp">As trilhas serão automaticamente gravadas no directório \'tracks\' durante a navegação.</string>
+    <string name="save_track_to_gpx_descrp">O trilho GPX é guardado automaticamente na pasta \'tracks\' durante a navegação.</string>
     <string name="save_track_to_gpx">Gravar trilha durante a navegação</string>
     <string name="update_tile">Atualizar mapa</string>
     <string name="reload_tile">Atualizar imagens</string>
@@ -295,7 +295,7 @@
     <string name="shared_string_add_to_favorites">Adicionar aos \'Favoritos\'</string>
     <string name="use_english_names_descr">Escolher entre os nomes nativos e inglês.</string>
     <string name="use_english_names">Usar nomes em inglês</string>
-    <string name="app_settings">Configurações do aplicativo</string>
+    <string name="app_settings">Configurações da aplicação</string>
     <string name="search_address">Pesquisar endereço</string>
     <string name="choose_building">Escolher edifício</string>
     <string name="choose_street">Escolher rua</string>
@@ -380,8 +380,8 @@
     <string name="default_buttons_commit">Enviar</string>
     <string name="shared_string_clear">Apagar</string>
     <string name="filter_current_poiButton">Filtro</string>
-    <string name="edit_filter_save_as_menu_item">Salvar como</string>
-    <string name="edit_filter_delete_dialog_title">Você quer mesmo apagar o filtro seleccionado?</string>
+    <string name="edit_filter_save_as_menu_item">Guardar como</string>
+    <string name="edit_filter_delete_dialog_title">Eliminar o filtro selecionado\?</string>
     <string name="edit_filter_delete_message">Filtro {0} apagado</string>
     <string name="edit_filter_create_message">Filtro {0} foi criado</string>
     <string name="local_index_routing_data">Informação de Percurso</string>
@@ -397,7 +397,7 @@
     <string name="unknown_from_location">Ponto de partida ainda não foi determinado</string>
     <string name="modify_transparency">Modificar a transparência (0 - transparente, 255 - opaco)</string>
     <string name="confirm_interrupt_download">Quer interromper o descarregamento de ficheiros\?</string>
-    <string name="basemap_was_selected_to_download">O mapa-base está selecionado para descarregar para que o aplicativo funcione.</string>
+    <string name="basemap_was_selected_to_download">O mapa base está selecionado para descarregar para que a aplicação funcione.</string>
     <string name="local_indexes_cat_tile">Quadrículas de mapa on-line e em cache</string>
     <string name="local_indexes_cat_map">Mapas de padrão (vector)</string>
     <string name="map_online_plugin_is_not_installed">Activar complemento de \'mapas on-line\' para seleccionar diferentes fontes de mapas</string>
@@ -411,18 +411,18 @@
 \n
 \nQuadrículas de mapas podem ser obtidas diretamente através de fontes on-line ou podem ser preparados para uso off-line (e copiadas manualmente para o diretório de dados do OsmAnd) como um banco de dados sqlite, que pode ser produzido por uma variedade de ferramentas de terceiros para preparação de mapas.</string>
     <string name="osmand_background_plugin_description">Mostra as configurações para ativar o rastreamento em segundo plano e a navegação, despertando periodicamente o aparelho GPS (com o ecrã desligado).</string>
-    <string name="osmand_accessibility_description">Este complemento torna os recursos de acessibilidade do aparelho disponíveis diretamente no OsmAnd. Ele facilita, p. ex., o ajuste da velocidade de fala para vozes TTS, configurando a navegação no ecrã do teclado direcional, usando um trackball para controle de zoom, ou feedback texto-para-fala, por exemplo, para anunciar automaticamente a sua posição.</string>
+    <string name="osmand_accessibility_description">Este complemento torna os recursos de acessibilidade do aparelho disponíveis diretamente no OsmAnd. Ele facilita, por exemplo, o ajuste da velocidade de fala para vozes TTS, configurando a navegação no ecrã do teclado direcional, usando um trackball para controle de ampliação, ou feedback texto-para-fala, por exemplo, para anunciar automaticamente a sua posição.</string>
     <string name="osmand_development_plugin_description">Este complemento exibe configurações para recursos de desenvolvimento e depuração como testar ou simular roteamento, o desempenho de renderização do ecrã ou solicitação de voz. Essas configurações são destinadas a desenvolvedores e não são necessárias para o usuário geral.</string>
     <string name="plugins_screen">Complementos</string>
     <string name="prefs_plugins_descr">Complementos activam as configurações avançadas e funcionalidades adicionais.</string>
     <string name="prefs_plugins">Complementos</string>
-    <string name="osm_editing_plugin_description">Este complemento do OsmAnd pode ser usado para fazer contribuições ao OSM como criar ou modificar POI, abertura ou comentários de erros do OSM e contribuir com ficheiros GPX gravados. OSM é um projeto de mapeamento mundial dirigido pela comunidade e de domínio público. Para mais detalhes, consulte https://openstreetmap.org. Participação ativa é apreciada e as contribuições podem ser feitas diretamente do OsmAnd, se você especificar suas credenciais pessoais de OSM no app.</string>
+    <string name="osm_editing_plugin_description">Este complemento do OsmAnd pode ser usado para enviar alterações para o OpenStreetMap, tais como criar ou alterar POIs, abrir ou comentar erros reportados do OpenStreetMap e contribuir com ficheiros GPX gravados. O OpenStreetMap é um projeto de mapeamento mundial dirigido pela comunidade e de domínio público. Para mais detalhes, consulte https://openstreetmap.org. A participação ativa é apreciada e as contribuições podem ser feitas diretamente do OsmAnd, se introduzir os seus dados de acesso à sua conta de utilizador do OpenStreetMap na aplicação.</string>
     <string name="vector_maps_may_display_faster_on_some_devices">Mapas vectoriais são visualizados mais rápido. Podem não funcionar bem em alguns aparelhos.</string>
     <string name="play_commands_of_currently_selected_voice">Selecione uma voz e teste reproduzindo os avisos</string>
     <string name="debugging_and_development">Desenvolvimento OsmAnd</string>
     <string name="native_rendering">Renderização nativa</string>
     <string name="test_voice_prompts">Testar comandos de voz</string>
-    <string name="switch_to_raster_map_to_see">Nenhum mapa vetorial presente para este local. Você pode descarregar um em Configurações (\'Gerenciar ficheiros de mapas\') ou mudar para o complemento \"mapas online\".</string>
+    <string name="switch_to_raster_map_to_see">Nenhum mapa vetorial presente para este local. Pode descarregar um em Configurações (\'Gerir ficheiros de mapas\') ou mudar para o complemento \"mapas online\".</string>
     <string name="send_files_to_osm">Enviar ficheiros GPX para o OSM\?</string>
     <string name="gpx_visibility_txt">Visibilidade</string>
     <string name="gpx_tags_txt">Etiquetas</string>
@@ -487,22 +487,22 @@
     <string name="use_fluorescent_overlays_descr">Use cores fluorescentes para exibir trajectos e rotas.</string>
     <string name="offline_edition">Edição offline</string>
     <string name="offline_edition_descr">Usar sempre a edição offline.</string>
-    <string name="update_poi_does_not_change_indexes">As alterações de PI dentro da aplicação não afectam os ficheiros de mapas descaaregados; em vez disso, as alterações são guardadas num ficheiro no seu aparelho.</string>
+    <string name="update_poi_does_not_change_indexes">As alterações de POI dentro da aplicação não afetam os ficheiros de mapas descarregados; essas alterações são guardadas num ficheiro separado no seu aparelho.</string>
     <string name="local_openstreetmap_uploading">A enviar…</string>
     <string name="local_openstreetmap_were_uploaded">{0} POIs/Anotações enviados</string>
     <string name="local_openstreetmap_uploadall">Enviar todos</string>
     <string name="local_openstreetmap_upload">Enviar a modificação OSM</string>
     <string name="local_openstreetmap_delete">Apagar modificação</string>
     <string name="local_openstreetmap_descr_title">Edição assíncrona de OSM:</string>
-    <string name="local_openstreetmap_settings">POI/Anotações armazenados na memória local</string>
-    <string name="local_openstreetmap_settings_descr">Mostrar e gerenciar POIs/anotações OSM salvos localmente.</string>
+    <string name="local_openstreetmap_settings">POIs / anotações guardados no dispositivo</string>
+    <string name="local_openstreetmap_settings_descr">Mostrar e gerir POIs/anotações OSM guardados localmente.</string>
     <string name="live_monitoring_interval_descr">Especificar intervalo de monitoramento on-line.</string>
     <string name="live_monitoring_interval">Intervalo de rastreamento on-line</string>
     <string name="live_monitoring_url_descr">Especifique o endereço web com a sintaxe de parâmetros: lat={0}, lon={1}, data/hora={2}, hdop={3}, altitude={4}, velocidade={5}, bearing={6}.</string>
     <string name="live_monitoring_url">Endereço web de rastreamento on-line</string>
     <string name="gpx_monitoring_disabled_warn">Registro de trajeto usando widget GPX ou via \'Gravação de viagem\' nas configurações.</string>
     <string name="show_current_gpx_title">Mostrar rota atual</string>
-    <string name="free_version_message">Você pode descarrgar ou atualizar %1$s mapas.</string>
+    <string name="free_version_message">Pode descarregar ou atualizar %1$s mapas.</string>
     <string name="free_version_title">Versão gratuita</string>
     <string name="poi_context_menu_showdescription">Mostrar descrição do POI.</string>
     <string name="index_name_north_america">América do Norte</string>
@@ -555,7 +555,7 @@
     <string name="old_poi_file_should_be_deleted">O ficheiro POI \'%1$s\' é repetido e pode ser apagado.</string>
     <string name="update_poi_file_not_found">Não foi encontrado (e não pôde ser criado) o ficheiro local para guardar as mudanças de POI.</string>
     <string name="button_upgrade_osmandplus">Upgrade para OsmAnd+</string>
-    <string name="map_version_changed_info">Descarregue a nova versão do aplicativo para poder usar os novos ficheiros de mapa.</string>
+    <string name="map_version_changed_info">Descarregue a nova versão da aplicação para poder usar os novos ficheiros de mapas.</string>
     <string name="shared_string_rename">Mudar o nome</string>
     <string name="poi_filter_nominatim">Online Nomeação</string>
     <string name="search_position_current_location_search">Procurando posição…</string>
@@ -566,18 +566,18 @@
     <string name="search_position_map_view">Centro do mapa atual</string>
     <string name="select_search_position">Pesquisar próximo a:</string>
     <string name="context_menu_item_search">Pesquisar nas proximidades</string>
-    <string name="shared_string_save_as_gpx">Gravar como novo ficheiro GPX</string>
-    <string name="route_successfully_saved_at">Rota gravada como \'%1$s\'.</string>
+    <string name="shared_string_save_as_gpx">Guardar como novo ficheiro GPX</string>
+    <string name="route_successfully_saved_at">Rota guardada como \'%1$s\'.</string>
     <string name="filename_input">Nome de ficheiro:</string>
     <string name="file_with_name_already_exist">Já existe um ficheiro com o mesmo nome.</string>
-    <string name="shared_string_save">Salvar</string>
+    <string name="shared_string_save">Guardar</string>
     <string name="local_index_upload_gpx_description">Enviar ficheiros de GPX para a comunidade OSM, para ajudar a melhorar os mapas.</string>
     <string name="local_index_items_uploaded">%1$d de %2$d items enviados.</string>
     <string name="local_index_mi_upload_gpx">Enviar para OSM</string>
     <string name="show_more_map_detail">Ver mais detalhes de mapa</string>
     <string name="show_more_map_detail_descr">Mostrar detalhes do mapa vectorial (estradas, etc.) já em níveis de zoom mais baixos.</string>
     <string name="favourites_delete_multiple_succesful">Ponto favorito apagado.</string>
-    <string name="favorite_delete_multiple">Você vai apagar %1$d favoritos e %2$d gropus favorito. Tem certeza\?</string>
+    <string name="favorite_delete_multiple">Vai eliminar %1$d favoritos e %2$d grupos favoritos. Tem a certeza\?</string>
     <string name="favorite_home_category">Casa</string>
     <string name="favorite_friends_category">Amigos</string>
     <string name="favorite_places_category">Locais</string>
@@ -594,7 +594,7 @@
     <string name="local_index_items_deleted">%1$d de %2$d item(s) apagados.</string>
     <string name="local_index_items_restored">%1$d de %2$d item(s) activados.</string>
     <string name="local_index_no_items_to_do">Sem items para %1$s</string>
-    <string name="local_index_action_do">Você está prestes a %1$s %2$s item(s). Continuar?</string>
+    <string name="local_index_action_do">Está prestes a %1$s %2$s item(s). Continuar\?</string>
     <string name="local_index_descr_title">Gerir ficheiros de mapas.</string>
     <string name="local_index_mi_restore">Activar</string>
     <string name="local_index_mi_backup">Desactivar</string>
@@ -612,9 +612,9 @@
     <string name="map_text_size_descr">Seleccione o tamanho do texto para nomes no mapa.</string>
     <string name="map_text_size">Text size</string>
     <string name="installing_new_resources">Preparando novos dados…</string>
-    <string name="internet_connection_required_for_online_route">Um serviço de navegação on-line é selecionado, mas você não está conectado à Internet.</string>
+    <string name="internet_connection_required_for_online_route">Está selecionado um serviço de navegação on-line, mas não está conectado à Internet neste momento.</string>
     <string name="tts_language_not_supported_title">Idioma não suportado</string>
-    <string name="tts_language_not_supported">O idioma selecionado não é suportado pelo mecanismo Android TTS (text-to-speech) instalado. Você quer procurar outro mecanismo TTS na loja de apps\? Caso contrário, o idioma TTS predefinido será usado.</string>
+    <string name="tts_language_not_supported">O idioma selecionado não é suportado pelo mecanismo Android TTS (texto para voz) instalado. Quer procurar outro mecanismo TTS na loja de aplicações\? Caso contrário, será usado o idioma predefinido do TTS.</string>
     <string name="tts_missing_language_data_title">Faltam dados de voz TTS</string>
     <string name="tts_missing_language_data">Ir ao mercado para descarregar o idioma selecionado\?</string>
     <string name="gpx_option_destination_point">Usar destino actual</string>
@@ -626,7 +626,7 @@
     <string name="voice_stream_voice_call">Áudio de chamada telefônica (também para interromper os aparelhos de som BT do carro)</string>
     <string name="voice_stream_notification">Áudio de Notificação</string>
     <string name="voice_stream_music">Áudio de Media/Música</string>
-    <string name="warning_tile_layer_not_downloadable">O aplicativo não pode descarregar o layer do mapa %1$s, reinstalá-lo pode ajudar.</string>
+    <string name="warning_tile_layer_not_downloadable">A aplicação não conseguiu descarregar a camada do mapa %1$s, se a tornar a instalar pode resolver o problema.</string>
     <string name="overlay_transparency_descr">Modificar a transparência da sobreposição.</string>
     <string name="overlay_transparency">Transparência da Sobreposição</string>
     <string name="map_transparency_descr">Modificar a transparência do mapa base.</string>
@@ -675,7 +675,7 @@
 \nO serviço de navegação está temporariamente mudado para CloudMade on-line.</string>
     <string name="specified_dir_doesnt_exist">Não é possível encontrar a pasta especificada.</string>
     <string name="application_dir">Local de armazenamento</string>
-    <string name="osmand_net_previously_installed">Todos os dados offline no aplicativo antigo instalado serão suportados pelo novo aplicativo, mas os pontos Favoritos devem ser exportados do aplicativo antigo e depois importados no novo aplicativo.</string>
+    <string name="osmand_net_previously_installed">Todos os dados offline na aplicação instalada antiga serão suportados pela nova aplicação, mas os pontos Favoritos devem ser exportados da aplicação antiga e depois importados na nova aplicação.</string>
     <string name="build_installed">Build {0} foi instalado ({1}).</string>
     <string name="downloading_build">Descarregando construção…</string>
     <string name="install_selected_build">Instalar OsmAnd - {0} de {1} {2} MB \?</string>
@@ -704,7 +704,7 @@
     <string name="gpxup_private">Privado</string>
     <string name="osmand_parking_event">Ir buscar viatura ao estacionamento</string>
     <string name="osmand_parking_warning">Aviso</string>
-    <string name="osmand_parking_warning_text">Uma notificação para levantar o seu carro foi adicionada ao seu calendário. Ele permanecerá lá até que você o apague manualmente.</string>
+    <string name="osmand_parking_warning_text">Foi adicionada ao seu calendário uma notificação para levantar o seu carro. Esta irá permanecer lá até que elimine manualmente o lembrete.</string>
     <string name="osmand_parking_time_limit_title">Definir limite de tempo de estacionamento</string>
     <string name="osmand_parking_delete_confirm">Eliminar o marcador de localização do estacionamento\?</string>
     <string name="osmand_parking_delete">Excluir um marcador de estacionamento</string>
@@ -728,8 +728,8 @@
     <string name="shared_location">Local partilhado</string>
     <string name="global_app_allocated_memory_descr">Allocated memory %1$s MB (Android limit %2$s MB, dalvik %3$s MB).</string>
     <string name="global_app_allocated_memory">Memória alocada</string>
-    <string name="native_app_allocated_memory_descr">Memória nativa total alocada por app %1$s MB (Dalvik %2$s MB, outros %3$s MB). 
-\nMemória proporcional %4$s MB (limite de Android %5$s MB, Dalvik %6$s MB).</string>
+    <string name="native_app_allocated_memory_descr">Memória nativa total alocada pela aplicação %1$s MB (Dalvik %2$s MB, outros %3$s MB). 
+\nMemória proporcional %4$s MB (limite do Android %5$s MB, Dalvik %6$s MB).</string>
     <string name="native_app_allocated_memory">Memória nativa total</string>
     <string name="select_animate_speedup">Selecione velocidade de animação da rota</string>
     <string name="osmand_parking_hours">Horas</string>
@@ -794,28 +794,28 @@
     <string name="gps_wakeup_interval">GPS intervalo de despertar: %s</string>
     <string name="int_continuosly">Contínuo</string>
     <string name="email">e-mail</string>
-    <string name="osmand_long_description_1000_chars">OsmAnd (Direções OSM automatizadas de navegação)
+    <string name="osmand_long_description_1000_chars">OsmAnd (direções automatizadas de navegação OSM)
 \n
-\nOsmAnd é uma aplicação de navegação livre, com acesso a uma ampla variedade de dados OpenStreetMap (OSM) globais. Todos os dados de mapas (mapas vectoriais ou imagens) podem ser armazenados no cartão de memória do telefone para uso off-line. OsmAnd também oferece roteamento off-line e on-line, incluindo a funcionalidade de roteamento curva-a-curva com orientação por voz. 
+\nO OsmAnd é uma aplicação de navegação livre, com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados dos mapas (mapas vetoriais ou imagens raster) podem ser armazenados no cartão de memória do telemóvel para usar desligado da Internet. O OsmAnd também permite roteamento, tanto ligado como desligado da Internet, incluindo a funcionalidade de roteamento curva a curva com orientação por voz.
 \n
-\nAlgumas das características principais: 
-\n- Funcionalidade offline completa (guarda os mapas obtidos, sejam eles vectoriais ou imagens, numa pasta seleccionável) 
-\n- Mapas vectoriais compactados disponíveis para o mundo inteiro 
-\n- Descarregamento de mapas de países ou regiões directamente no aplicativo 
-\n- Sobreposição de mapas diversos, como GPX ou trajectos de navegação, Pontos de Interesse (POI), Favoritos, Curvas de nível, paragens de transportes públicos, mapas adicionais com transparência personalizável 
-\n- Pesquisa off-line para endereços e locais (POIs) 
-\n- Encaminhamento off-line para distâncias médias
-\n- Modo de Carro, Bicicleta, e Pedestre 
-\n- Vista de dia/noite, com comutação automática (opcional) 
-\n- Zoom de mapa em dependente da velocidade
-\n- Alinhamento de mapa de acordo com bússola ou direção do movimento
-\n- Orientação de faixas, aviso de limite de velocidade, vozes gravadas e TTS 
-\n 
-\nLimitações desta versão gratuita de OsmAnd: 
-\n- Quantidade de descarregamentos de mapa limitado 
-\n- Sem acesso aos POIs Wikipedia off-line. 
-\n 
-\nOsmAnd está a em desenvolvimento activo, mas o nosso projecto e o seu progresso ainda depende de contribuições financeiras para o desenvolvimento e testes de novas funcionalidades. Por favor, considere a compra de OsmAnd+ ou ajude a financiar novas funcionalidades específicas ou através duma doação no osmand.net.</string>
+\nAlgumas das características principais:
+\n- Funcionalidade totalmente desligado da Internet (guarda os mapas obtidos, sejam eles vetoriais ou imagens, numa pasta selecionável).
+\n- Mapas vetoriais compactados do mundo inteiro disponíveis.
+\n- Descarregamento de mapas de países ou regiões diretamente na aplicação.
+\n- Sobreposição de mapas diversos, como GPX ou trajetos de navegação, pontos de interesse (POI), favoritos, curvas de nível, paragens de transportes públicos, mapas adicionais com transparência personalizável.
+\n- Pesquisa desligado da Internet para endereços e locais (POIs).
+\n- Encaminhamento desligado da Internet para distâncias médias.
+\n- Modo de carro, bicicleta e pedestre.
+\n- Vista de dia/noite, com alteração automática (opcional).
+\n- Ampliação do mapa dependente da velocidade.
+\n- Orientação do mapa de acordo com bússola ou direção do movimento.
+\n- Orientação de faixas de rodagem, aviso de limite de velocidade, vozes gravadas e vozes TTS.
+\n
+\nLimitações desta versão gratuita do OsmAnd:
+\n- Número de descarregamentos de mapas limitado.
+\n- Sem acesso aos POIs da Wikipédia no modo desligado da Internet.
+\n
+\nO OsmAnd está a em desenvolvimento ativo, mas o nosso projeto e o seu progresso ainda depende de contribuições financeiras para o desenvolvimento e testes de novas funcionalidades. Por favor, considere comprar o OsmAnd+, ou a ajudar a financiar novas funcionalidades específicas ou fazer um donativo no osmand.net</string>
     <string name="rendering_attr_roadColors_description">Selecione um esquema de cores de estrada:</string>
     <string name="rendering_attr_roadColors_name">Esquema de cores</string>
     <string name="map_widget_show_destination_arrow">Ver direção para o destino</string>
@@ -853,7 +853,7 @@
     <string name="download_roads_only_item">Só Estradas</string>
     <string name="download_regular_maps">Mapa padrão</string>
     <string name="download_roads_only_maps">Mapas só de estradas</string>
-    <string name="safe_mode_description">Execute o aplicativo em modo de segurança (usando do código do Android mais lento em vez do nativo).</string>
+    <string name="safe_mode_description">Execute a aplicação em modo de segurança (usando do código do Android mais lento em vez do nativo).</string>
     <string name="safe_mode">Modo seguro</string>
     <string name="native_library_not_running">A aplicação está a ser executada no modo de segurança (desligue-a em \"Definições\").</string>
     <string name="background_service_is_enabled_question">O serviço de segundo plano OsmAnd ainda está em execução. Tambẽm pará-lo\?</string>
@@ -889,7 +889,7 @@
     <string name="index_name_openmaps">OpenMaps UE</string>
     <string name="local_indexes_cat_av">Dados de Áudio/Vídeo</string>
     <string name="stop_routing_confirm">Quer parar a navegação?</string>
-    <string name="clear_dest_confirm">Tem certeza de que deseja limpar o seu destino (e destinos intermediários)\?</string>
+    <string name="clear_dest_confirm">Tem a certeza que quer limpar o seu destino (e destinos intermédios)\?</string>
     <string name="precise_routing_mode_descr">Calcule rotas precisas sem falhas. Ainda com distância limitada e lenta.</string>
     <string name="precise_routing_mode">Roteamento preciso (alfa)</string>
     <string name="recording_context_menu_precord">Tire uma foto</string>
@@ -901,7 +901,7 @@
     <string name="av_video_format_descr">Selecione o formato de saída de vídeo.</string>
     <string name="av_use_external_recorder_descr">Usar gravador do sistema para vídeo.</string>
     <string name="av_use_external_camera_descr">Utilize aplicação do sistema para fotos.</string>
-    <string name="av_use_external_camera">Use aplicativo da câmera</string>
+    <string name="av_use_external_camera">Usar aplicação da câmara</string>
     <string name="recording_playing">A tocar o áudio da gravação. \n%1$s</string>
     <string name="recording_unavailable">Indisponível</string>
     <string name="recording_description">Gravação %1$s %3$s %2$s</string>
@@ -936,7 +936,7 @@
     <string name="item_unchecked">desmarcado</string>
     <string name="map_widget_max_speed">Limite de Velocidade</string>
     <string name="no_buildings_found">Nenhum edifício encontrado.</string>
-    <string name="zxing_barcode_scanner_not_found">Aplicativo scanner de código de barras ZXing não instalado. Procurar no Google Play\?</string>
+    <string name="zxing_barcode_scanner_not_found">A aplicação do leitor de código de barras ZXing não está instalada. Procurar no Google Play\?</string>
     <string name="support_new_features_descr">Faça uma doação para ver novas funcionalidades implementadas nesta aplicação.</string>
     <string name="incomplete_locale">incompleto</string>
     <string name="street_name">Nome da rua</string>
@@ -948,7 +948,7 @@
     <string name="select_address_activity">Selecione o endereço</string>
     <string name="favourites_list_activity">Selecione favorito</string>
     <string name="local_openstreetmap_act_title">Modificaçoes OSM</string>
-    <string name="shared_string_more_actions">Outras acções</string>
+    <string name="shared_string_more_actions">Outras ações</string>
     <string name="layer_hillshade">Camada de sombreamentos de relevo</string>
     <string name="map_widget_gps_info">Informação de GPS</string>
     <string name="download_using_mobile_internet">Não conetado ao Wi-Fi. Use a conexão atual com a Internet para descarregar\?</string>
@@ -970,10 +970,10 @@
     <string name="plugin_distance_point_ele">Altitude</string>
     <string name="plugin_distance_point">Ponto</string>
     <string name="gpx_file_name">Nome do ficheiro GPX</string>
-    <string name="gpx_saved_sucessfully">Ficheiro GPX gravado para {0}</string>
+    <string name="gpx_saved_sucessfully">Ficheiro GPX guardado em {0}</string>
     <string name="osmand_distance_planning_plugin_name">Calculadora de Distância e Ferramenta de Planeamento</string>
-    <string name="osmand_distance_planning_plugin_description">Este complemento fornece um widget no ecrã do mapa que permite criar caminhos ao tocar no mapa, ou usar/modificar ficheiros GPX existentes, para planear uma viagem e medir a distância entre os pontos. Os resultados podem ser guardados como um ficheiro GPX, que pode ser usado posteriormente para orientação.</string>
-    <string name="driving_region_descr">Seleccione a região de condução: EUA, Europa, Reino Unido, Ásia e outros.</string>
+    <string name="osmand_distance_planning_plugin_description">Este complemento fornece um widget no ecrã do mapa que permite criar caminhos ao tocar no mapa, ou usar/alterar ficheiros GPX existentes, para planear uma viagem e medir a distância entre os pontos. Os resultados podem ser guardados como um ficheiro GPX, que pode ser usado posteriormente para orientação.</string>
+    <string name="driving_region_descr">Selecione a região de condução: EUA, Europa, Reino Unido, Ásia e outros.</string>
     <string name="driving_region">Região de condução</string>
     <string name="driving_region_japan">Japão</string>
     <string name="driving_region_us">Estados Unidos</string>
@@ -1044,7 +1044,7 @@
     <string name="local_index_tile_data_maxzoom">Zoom máximo: %1$s</string>
     <string name="local_index_tile_data_minzoom">Zoom Mínimo: %1$s</string>
     <string name="local_index_tile_data_name">Dados do mosaico: %1$s</string>
-    <string name="edit_tilesource_successfully">A origem do mosaico %1$s foi gravada</string>
+    <string name="edit_tilesource_successfully">A origem do mosaico %1$s foi guardada</string>
     <string name="edit_tilesource_elliptic_tile">Mercator elíptico</string>
     <string name="edit_tilesource_maxzoom">Zoom máximo</string>
     <string name="edit_tilesource_expiration_time">Expira (minutos)</string>
@@ -1055,12 +1055,27 @@
     <string name="map_widget_fps_info">Depuração FPS</string>
     <string name="map_magnifier">Lupa do mapa</string>
     <string name="base_world_map">Mapa mundial</string>
-    <string name="osmand_plus_long_description_1000_chars">Osmand+ (OSM automatizados direções de navegação)
-\n
-\n OsmAnd+ é uma aplicação de navegação de código aberto, com acesso a uma ampla variedade de dados globais OpenStreetMap (OSM). Todos os dados cartográficos (mapas vectoriais ou de imagem) podem ser armazenados no cartão de memória do telefone para uso off-line. OsmAnd também oferece funcionalidade de roteamento off-line e on-line , incluindo orientação por voz curva-a-curva.
-\n
-\n OsmAnd + é a versão do aplicativo pago, ao comprá-lo você apoia o projecto, financia o desenvolvimento de novas funcionalidades, e recebe as últimas actualizações. ↵ ↵ → → Algumas das características principais: ↵ → → - funcionalidade off-line completa ( armazenar mapas vectoriais obtidos ou imagens numa pasta seleccionável) ↵ → → - mapas vectoriais compactos off-line disponíveis para todo o mundo ↵ → → - Descarregamentos ilimitados de mapas de países ou regiões diretamente no aplicativo ↵ → → - Funcionalidade Wikipedia off-line (obter POIs Wikipedia) , ótimo para passeios ↵ → → - Sobreposição de várias camadas de mapas possíveis , como GPX ou trilhas de navegação, pontos de interesse, favoritos, curvas de nível, paragens de transportes públicos, mapas adicionais com transparência personalizável ↵ → → - Busca off-line de endereços e locais ( POIs) ↵ → → - Encaminhamento Off-line para distâncias curtas (experimental) ↵ → → - Modos de Carro, Bicicleta, e Pedestre↵ → → - Vista de mapa em modo dia / noite, com comutação automatizada (opcional)↵ → → - Zoom de mapa em função da velocidade (opcional)↵ → → - Alinhamento de mapa de acordo com a bússola ou direcção do movimento (opcional)↵ → → - Indicação de vias, aviso de limite de velocidade, vozes gravadas e TTS (opcional)
-\n</string>
+    <string name="osmand_plus_long_description_1000_chars">"OsmAnd+ (Direções de Navegação Automatizada do OSM) 
+\n 
+\n  OsmAnd+ é uma aplicação de navegação livre, com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados dos mapas (mapas vetoriais ou imagens raster) podem ser armazenados no cartão de memória do telemóvel para usar desligado da Internet. O OsmAnd também permite roteamento, tanto ligado como desligado da Internet, incluindo a funcionalidade de roteamento curva a curva com orientação por voz.
+\n 
+\n OsmAnd+ é a versão paga da aplicação, ao comprá-lo está a apoiar o projeto, a financiar o desenvolvimento de novas funcionalidades e a receber as últimas atualizações.
+\n 
+\n Algumas das características principais:
+\n - Funcionalidade totalmente desligado da Internet (guarda os mapas obtidos, sejam eles vetoriais ou imagens, numa pasta selecionável).
+\n - Mapas vetoriais compactados do mundo inteiro disponíveis.
+\n - Descarregamento de mapas de países ou regiões diretamente na aplicação.
+\n - Recurso Wikipédia desligado da Internet (descarregamento de POIs da Wikipédia), ótimo para passeios turísticos.
+\n - Possibilidade de sobreposição de várias camadas de mapas, como trilhos GPX ou navegação, pontos de Interesse, favoritos, curvas de nível, paragens de transporte público, mapas adicionais com transparência personalizável.
+\n 
+\n - Pesquisa desligado da Internet para endereços e locais (POIs).
+\n - Encaminhamento desligado da Internet para distâncias médias.
+\n - Modos de carro, bicicleta e pedestre com os opcionais:
+\n - Mudança automática de visualização dia/noite
+\n - Ampliação do mapa conforme a velocidade
+\n - Orientação do mapa de acordo com a bússola ou a direção do movimento.
+\n - Orientação por faixas de rodagem, indicação do limite de velocidade, vozes gravadas e TTS.
+\n"</string>
     <string name="auto_zoom_none">Sem zoom automático</string>
     <string name="auto_zoom_close">Aproximar</string>
     <string name="auto_zoom_far">Visão intermédia</string>
@@ -1076,7 +1091,7 @@
     <string name="app_mode_motorcycle">Motocicleta</string>
     <string name="app_mode_boat">Barco</string>
     <string name="app_mode_aircraft">Aeronave</string>
-    <string name="local_osm_changes_delete_all_confirm">Você vai apagar %1$d mudanças no OSM. Tem certeza\?</string>
+    <string name="local_osm_changes_delete_all_confirm">Vai eliminar %1$d alterações do OpenStreetMap. Tem a certeza\?</string>
     <string name="shared_string_delete_all">Eliminar tudo</string>
     <string name="amenity_type_osmwiki">Wikipedia (off-line)</string>
     <string name="amenity_type_seamark">Marca Marítima</string>
@@ -1098,7 +1113,7 @@
     <string name="misc_pref_title">Diversos</string>
     <string name="localization_pref_title">Localização</string>
     <string name="index_item_nation_addresses">moradas nacionais</string>
-    <string name="index_item_world_altitude_correction">Correcção de altitude mundial</string>
+    <string name="index_item_world_altitude_correction">Correção de altitude mundial</string>
     <string name="index_item_world_seamarks">Marcas marítimas mundiais</string>
     <string name="index_item_world_bitcoin_payments">Pagamentos de bitcoin do mundo</string>
     <string name="index_item_world_basemap">Mapa de visão geral do mundo</string>
@@ -1131,9 +1146,9 @@
     <string name="routing_attr_avoid_motorway_description">Evitar auto-estradas</string>
     <string name="routing_attr_weight_name">Peso máximo</string>
     <string name="routing_attr_weight_description">Especifique o limite de peso permitido para veículos em rotas.</string>
-    <string name="android_19_location_disabled">Desde a versão KitKat você não pode descarregar e atualizar de mapa no local de armazenamento anterior (%s). Você deseja alterar para um local com permissão e copiar todos os ficheiros para lá\?          
-\n Nota 1: os ficheiros antigos permanecerão intocados (mas podem ser apagados manualmente).
-\n Nota 2: não será possível compartilhar ficheiros entre OsmAnd e OsmAnd+ no novo armazenamento.</string>
+    <string name="android_19_location_disabled">Desde a versão KitKat que não se pode descarregar e atualizar mapas no local de armazenamento anterior (%s). Quer alterar para um local com permissão e copiar todos os ficheiros para lá\?          
+\n Nota 1: os ficheiros antigos permanecerão intocados (mas podem ser eliminados manualmente).
+\n Nota 2: não será possível partilhar ficheiros entre o OsmAnd e o OsmAnd+ no novo armazenamento.</string>
     <string name="copying_osmand_one_file_descr">Copiando o ficheiro (%s) para novo destino …</string>
     <string name="copying_osmand_files_descr">Cópia de ficheiros Osmand para o novo destino (%s)…</string>
     <string name="copying_osmand_files">Copiando ficheiros Osmand…</string>
@@ -1203,15 +1218,15 @@
     <string name="share_route_as_gpx">Partilhar rota como ficheiro GPX</string>
     <string name="share_route_subject">Rota partilhada via OsmAnd</string>
     <string name="arrival_distance">Anúncio da chegada</string>
-    <string name="arrival_distance_descr">Em quanto tempo você quer o anúncio da chegada ?</string>
+    <string name="arrival_distance_descr">Quão cedo quer o anúncio da chegada\?</string>
     <string name="keep_informing_never">Nunca</string>
     <string name="keep_informing_descr">Repetir as instruções de navegação em intervalos regulares.</string>
     <string name="keep_informing">Repetir as instruções de navegação</string>
-    <string name="import_file_favourites">Salvar como ficheiro GPX ou importar ponto de rota nos favoritos\?</string>
+    <string name="import_file_favourites">Guardar como ficheiro GPX ou importar pontos de rotas para os \'Favoritos\'\?</string>
     <string name="shared_string_share">Partilhar</string>
     <string name="share_fav_subject">Favoritos partilhados via OsmAnd</string>
     <string name="navigation_intent_invalid">Formato inválido: %s</string>
-    <string name="save_as_favorites_points">Gravar como grupo de Favoritos</string>
+    <string name="save_as_favorites_points">Guardar como grupo de Favoritos</string>
     <string name="select_destination_and_intermediate_points">Selecionar destinos</string>
     <string name="layer_amenity_label">Rótulos de sobreposições de POI</string>
     <string name="loading_smth">Carregando %1$s …</string>
@@ -1221,7 +1236,7 @@
 \n
 \nToque longo para ver no mapa"</string>
     <string name="delay_navigation_start">Iniciar a orientação passo a passo automaticamente</string>
-    <string name="shared_string_selected_lowercase">seleccionado</string>
+    <string name="shared_string_selected_lowercase">selecionado</string>
     <string name="gpx_split_interval">Intervalo de divisão</string>
     <string name="gpx_info_waypoints">"ponto de rota: %1$s "</string>
     <string name="gpx_info_distance">Distância: %1$s (%2$s pontos ) </string>
@@ -1249,13 +1264,14 @@
     <string name="save_global_track_interval_descr">Escolher o intervalo de log para a gravação de trajecto geral (ativado através do widget de gravação GPX no mapa).</string>
     <string name="save_global_track_interval">Intervalo de log geral</string>
     <string name="enable_sleep_mode">Ativar o modo de GPS em segundo plano</string>
-    <string name="save_track_to_gpx_globally">Salvar trilha GPX</string>
-    <string name="save_track_to_gpx_globally_descr">Posição geral de log para um ficheiro GPX pode ser ativada ou desativado usando o GPX gravação widget no ecrã do mapa.</string>
+    <string name="save_track_to_gpx_globally">Guardar trilho para um ficheiro GPX</string>
+    <string name="save_track_to_gpx_globally_descr">O registo da posição geral para um ficheiro GPX pode ser ativado ou desativado usando o widget de gravação GPX no ecrã do mapa.</string>
     <string name="save_track_interval_globally">Intervalo de log</string>
     <string name="rendering_attr_publicTransportMode_name">Rotas de ônibus, trólebus</string>
-    <string name="record_plugin_description">Este complemento ativa a funcionalidade para gravar e salvar os seus trajetos manualmente, tocando o widget de gravação GPX no ecrã do mapa, ou também fazendo automaticamente o registro de todas as suas rotas de navegação para um ficheiro GPX. 
-\n 
-\nTrajetos gravados podem ser compartilhadas com os seus amigos, ou serem usados para contribuições ao OSM. Atletas podem usar trajetos gravados para controlar os seus treinos. Algumas análises básicas do trajeto podem ser feitas diretamente no OsmAnd, como tempos de volta, velocidade média, etc. E, claro, trajetos também podem ser analisados mais tarde em ferramentas de terceiros.</string>
+    <string name="record_plugin_description">Este complemento ativa a funcionalidade para gravar e guardar os seus trajetos manualmente, tocando no widget de gravação GPX no ecrã do mapa, ou fazendo também automaticamente o registo de todas as suas rotas de navegação para um ficheiro GPX.
+\n
+\n
+\nOs trajetos gravados podem ser partilhados com os seus amigos, ou serem usados para contribuições no OpenStreetMap. Os atletas podem usar trajetos gravados para controlar os seus treinos. Podem ser feitas algumas análises básicas do trajeto diretamente no OsmAnd, como tempos de volta, velocidade média, etc. E claro, os trajetos também podem ser analisados mais tarde em ferramentas externas.</string>
     <string name="record_plugin_name">Gravação de viagem</string>
     <string name="int_hour">h</string>
     <string name="duration">Duração</string>
@@ -1280,7 +1296,7 @@
     <string name="remove_the_tag">REMOVA A TAG</string>
     <string name="routing_attr_no_new_routing_description">Não use as regras de roteamento introduzidas na v1.9.</string>
     <string name="dash_download_msg_none">Descarregar mapas offline\?</string>
-    <string name="dash_download_msg">Você baixou %1$s mapas</string>
+    <string name="dash_download_msg">Descarregou %1$s mapas</string>
     <string name="dash_download_new_one">Baixe um novo mapa</string>
     <string name="map_locale">Idioma do mapa</string>
     <string name="navigate_point_zone">Zona</string>
@@ -1307,12 +1323,12 @@
     <string name="rendering_category_routes">Rotas</string>
     <string name="rendering_category_details">Detalhes</string>
     <string name="map_widget_appearance_rem">Elementos restantes</string>
-    <string name="plugin_install_needs_network">Você precisa estar conectado à Internet para instalar este complemento.</string>
-    <string name="welcome_select_region">Para refletir corretamente seus sinais e regras de trânsito, por favor, selecione a região que você dirige:</string>
+    <string name="plugin_install_needs_network">Tem de estar conectado à Internet para instalar este complemento.</string>
+    <string name="welcome_select_region">Para refletir corretamente seus sinais e regras de trânsito, por favor, selecione a região onde conduz:</string>
     <string name="rendering_attr_hideHouseNumbers_name">Números da casa</string>
-    <string name="application_dir_change_warning3">Copiar os ficheiros de dados OsmAnd para o novo destino\?</string>
+    <string name="application_dir_change_warning3">Mover os ficheiros de dados OsmAnd para o novo destino\?</string>
     <string name="specified_directiory_not_writeable">Mapas não podem ser criados no diretório especificado</string>
-    <string name="copying_osmand_file_failed">A cópia de ficheiros falhou</string>
+    <string name="copying_osmand_file_failed">Mover ficheiros falhou</string>
     <string name="storage_directory_external">Armazenamento externo</string>
     <string name="storage_directory_multiuser">Armazenamento multiusuário</string>
     <string name="storage_directory_manual">Especificado manualmente</string>
@@ -1324,27 +1340,27 @@
     <string name="shared_string_is_open">Abrir</string>
     <string name="rendering_attr_OSMMapperAssistant_name">Assistente de mapeador OSM</string>
     <string name="agps_info">A-GPS info</string>
-    <string name="shared_string_manage">Gerenciar</string>
+    <string name="shared_string_manage">Gerir</string>
     <string name="shared_string_edit">Editar</string>
     <string name="shared_string_places">Locais</string>
     <string name="shared_string_search">Pesquisar</string>
     <string name="shared_string_show_description">Mostrar descrição.</string>
     <string name="shared_string_message">Mensagem</string>
     <string name="agps_data_last_downloaded">A-GPS últimos dados descarregados: %1$s</string>
-    <string name="confirm_usage_speed_cameras">Em diversos países (Alemanha, França, Itália, etc.) o uso de alertas de radar é proibido por lei. OsmAnd não assume qualquer responsabilidade se você violar a lei. Por favor, toque em \"sim\" somente se você pode aceitar o uso deste recurso.</string>
+    <string name="confirm_usage_speed_cameras">Em diversos países (Alemanha, França, Itália, etc.) o uso de alertas de radar é proibido por lei. O OsmAnd não assume qualquer responsabilidade se você violar a lei. Por favor, toque em \"sim\" apenas se você pode aceitar o uso deste recurso.</string>
     <string name="welmode_download_maps">Descarregar mapas</string>
     <string name="rendering_attr_pisteGrooming_name">Preparando pista</string>
     <string name="days_behind">dias atrás</string>
     <string name="watch">Ver</string>
     <string name="navigate_point_northing">Norte</string>
     <string name="navigate_point_easting">Leste</string>
-    <string name="storage_directory_internal_app">Memória interna do aplicativo</string>
+    <string name="storage_directory_internal_app">Memória interna da aplicação</string>
     <string name="shared_string_go">Ir</string>
     <string name="routing_settings_2">Configurações de navegação</string>
-    <string name="general_settings_2">"Configurações gerais  "</string>
+    <string name="general_settings_2">Configurações gerais</string>
     <string name="version_settings_descr">Descarregar compilações noturnas.</string>
     <string name="proxy_pref_descr">Especifique um servidor proxy.</string>
-    <string name="dash_download_manage">Gerenciador</string>
+    <string name="dash_download_manage">Gerir</string>
     <string name="rendering_category_transport">Transporte</string>
     <string name="rendering_attr_tramTrainRoutes_name">Rotas de bonde e trem</string>
     <string name="rendering_attr_streetLighting_name">Iluminação pública</string>
@@ -1355,7 +1371,7 @@
     <string name="current_route">Rota atual</string>
     <string name="osm_changes_added_to_local_edits">Mudanças no OSM adicionadas ao conjunto de alterações local</string>
     <string name="mark_to_delete">Selecione para apagar</string>
-    <string name="local_osm_changes_upload_all_confirm">Você enviará %1$d mudanças ao OSM. Tem certeza\?</string>
+    <string name="local_osm_changes_upload_all_confirm">Vai enviar %1$d alterações para o OpenStreetMap. Tem a certeza\?</string>
     <string name="confirmation_to_clear_history">Limpar histórico\?</string>
     <string name="delay_to_start_navigation_descr">Especifique o tempo de espera para permanecer no ecrã de planejamento de rota.</string>
     <string name="delay_to_start_navigation">Iniciar orientação curva a curva depois de…</string>
@@ -1444,7 +1460,7 @@
     <string name="hillshade_layer_disabled">Camada de sombreamento de relevo desligada</string>
     <string name="srtm_plugin_disabled">Curvas de Nível desligadas</string>
     <string name="favorite_category_add_new">Adicionar novo</string>
-    <string name="favorite_category_select">Seleccionar Categoria</string>
+    <string name="favorite_category_select">Selecionar categoria</string>
     <string name="default_speed_system_descr">Definir unidades de velocidade.</string>
     <string name="default_speed_system">Unidade de velocidade</string>
     <string name="si_nm">Milhas Náuticas</string>
@@ -1519,7 +1535,7 @@
     <string name="map_downloaded_descr">O mapa %1$s está pronto para ser usado.</string>
     <string name="map_downloaded">Mapa obtido com sucesso</string>
     <string name="go_to_map">Mostrar mapa</string>
-    <string name="simulate_initial_startup_descr">Define o sinalizador que indica a primeira inicialização do aplicativo, mantém todas as outras configurações inalteradas.</string>
+    <string name="simulate_initial_startup_descr">Define o sinalizador que indica a primeira inicialização da aplicação, mantém todas as outras configurações inalteradas.</string>
     <string name="simulate_initial_startup">Simular arranque inicial da aplicação</string>
     <string name="share_geo">geo:</string>
     <string name="share_menu_location">Partilhar Localização</string>
@@ -1560,7 +1576,7 @@
     <string name="rendering_value_translucent_blue_name">Azul translúcido</string>
     <string name="rendering_value_purple_name">Roxo</string>
     <string name="rendering_value_translucent_purple_name">Roxo translúcido</string>
-    <string name="restart_is_required">Reinicie o aplicativo manualmente para aplicar todas as alterações.</string>
+    <string name="restart_is_required">Reinicie a aplicação manualmente para aplicar todas as alterações.</string>
     <string name="light_theme">Claro</string>
     <string name="dark_theme">Escuro</string>
     <string name="rec_split_desc">Sobrescrever clipes quando o espaço utilizado excede o armazenamento disponível.</string>
@@ -1570,7 +1586,7 @@
     <string name="select_voice_provider">Escolher orientação por voz</string>
     <string name="select_voice_provider_descr">Escolher ou descarregar a orientação por voz para o seu idioma.</string>
     <string name="night">Noite</string>
-    <string name="dashboard_or_drawer_description">Há uma nova opção para controlar principalmente o aplicativo através do painel flexível (Dashboard) ou um menu estático. A sua escolha pode sempre ser alterada nas configurações do painel.</string>
+    <string name="dashboard_or_drawer_description">Há uma nova opção para controlar principalmente a aplicação através do painel de controlo flexível ou um menu estático. A sua escolha pode ser alterada nas configurações do painel.</string>
     <string name="dashboard_or_drawer_title">Dashboard ou menu de controle</string>
     <string name="update">Actualizar em cada</string>
     <string name="only_download_over_wifi">Apenas descarregar com Wi-Fi</string>
@@ -1591,7 +1607,7 @@
     <string name="archive_wikipedia_data">Tem dados antigos incompatíveis guardados da Wikipédia. Quer arquivá-los\?</string>
     <string name="download_wikipedia_files">Quer descarregar dados adicionais da Wikipédia (%1$s MB)\?</string>
     <string name="gps_network_not_enabled">Serviço de localização não activado. Ligá-lo\?</string>
-    <string name="disable_recording_once_app_killed_descrp">Irá pausar o registo GPX quando o aplicativo é encerrado (via aplicativos recentes). (A indicação de serviço em segundo plano de Osmand desaparece da barra de notificação Android.)</string>
+    <string name="disable_recording_once_app_killed_descrp">Irá pausar o registo GPX quando a aplicação é encerrada (via aplicações recentes). (A indicação de serviço em segundo plano do Osmand desaparece da barra de notificação do Android.)</string>
     <string name="shared_string_import2osmand">Importar para Osmand</string>
     <string name="read_full_article">Ler o artigo completo (on-line)</string>
     <string name="shared_string_wikipedia">Wikipedia</string>
@@ -1627,7 +1643,7 @@
 \n- Gerir grupos e aparelhos num painel de controle pessoal no sitio web.</string>
     <string name="anonymous_user">Utilizador anónimo</string>
     <string name="logged_as">Ligado como %1$s</string>
-    <string name="shared_string_not_selected">Não seleccionado</string>
+    <string name="shared_string_not_selected">Não selecionado</string>
     <string name="select_month_and_country">Escolha Mês e País</string>
     <string name="updates_size">Tamanho das actualizações</string>
     <string name="poi_context_menu_modify_osm_change">Modificar edição OSM</string>
@@ -1657,7 +1673,7 @@
     <string name="access_shared_string_navigate_up">Navegar até</string>
     <string name="access_sort">Ordenar</string>
     <string name="map_mode">Modo mapa</string>
-    <string name="number_of_gpx_files_selected_pattern">%s ficheiros GPX seleccionados</string>
+    <string name="number_of_gpx_files_selected_pattern">%s ficheiros GPX selecionados</string>
     <string name="rendering_value_thin_name">Fino</string>
     <string name="rendering_value_medium_name">Médio</string>
     <string name="rendering_value_bold_name">Negrito</string>
@@ -1686,7 +1702,7 @@
     <string name="reports_for">Relatório para</string>
     <string name="number_of_contributors">Número de colaboradores</string>
     <string name="number_of_edits">Número de edições</string>
-    <string name="save_poi_without_poi_type_message">Quer mesmo gravar POI sem o tipo de POI?</string>
+    <string name="save_poi_without_poi_type_message">Quer mesmo guardar o POI sem especificar o tipo\?</string>
     <string name="versions_item">Versões</string>
     <string name="feedback">Comentários</string>
     <string name="contact_us">Contato</string>
@@ -1728,10 +1744,8 @@
     <string name="osm_live_region_desc">Parte da sua doação será enviada aos utilizadores OSM que submetem alterações ao mapa nessa região.</string>
     <string name="osm_live_subscription_settings">Configurações da subscrição</string>
     <string name="osm_live_ask_for_purchase">Por favor primeiro compre a assinatura do OSM Live</string>
-    <string name="osm_live_header">Essa assinatura permite atualizações por hora para todos os mapas ao redor do mundo.
-\nParte da renda remonta à comunidade OSM e é pago para cada contribuição OSM.
-\nSe você gosta do OsmAnd e OSM e quer apoiar e ser apoiado por eles, esta é a maneira perfeita para fazê-lo.</string>
-    <string name="select_map_marker">Seleccione o marcador do mapa</string>
+    <string name="osm_live_header">Esta assinatura permite atualizações hora a hora de todos os mapas à volta do mundo. Parte da renda regressa à comunidade do OpenStreetMap e paga-se para cada contribuição no OpenStreetMap. Se gosta do OsmAnd e do OpenStreetMap e quer apoiar e ser apoiado por eles, esta é a maneira perfeita para o fazer.</string>
+    <string name="select_map_marker">Selecione o marcador do mapa</string>
     <string name="map_markers_other">Outros marcadores</string>
     <string name="upload_anonymously">Enviar anonimamente</string>
     <string name="download_files_error_not_enough_space">Não há espaço suficiente! O espaço de armazenamento necessário é {3} MB temporariamente, {1} MB permanentemente. O espaço disponível é apenas {2} MB.</string>
@@ -1743,7 +1757,7 @@
     <string name="shared_string_toolbar">Barra de Ferramentas</string>
     <string name="add_points_to_map_markers_q">Adicionar todos os pontos como marcadores de mapa\?</string>
     <string name="shared_string_add_to_map_markers">Adicionar aos marcadores de mapa</string>
-    <string name="select_map_markers">Seleccionar marcadores de mapa</string>
+    <string name="select_map_markers">Selecionar marcadores de mapa</string>
     <string name="shared_string_reverse_order">Ordem inversa</string>
     <string name="show_map_markers_description">Ativar a funcionalidade dos marcadores de mapa.</string>
     <string name="clear_active_markers_q">Remover todos os marcadores activos\?</string>
@@ -1764,7 +1778,7 @@
     <string name="clear_updates_proposition_message">Remover actualizações descarregadas e voltar à edição do mapa original</string>
     <string name="add_time_span">Adicionar intervalo de tempo</string>
     <string name="road_blocked">Estrada bloqueada</string>
-    <string name="shared_string_select">Seleccionar</string>
+    <string name="shared_string_select">Selecionar</string>
     <string name="switch_start_finish">Inverter ponto de partida e destino</string>
     <string name="rendering_attr_hideIcons_name">Ícones POI</string>
     <string name="item_removed">Item removido</string>
@@ -1805,7 +1819,7 @@
     <string name="search_another_country">Selecione outra região</string>
     <string name="shared_string_change">Alterar</string>
     <string name="storage_directory_card">Cartão de memória</string>
-    <string name="skip_map_downloading_desc">Você não tem o mapa offline instalado. Pode escolher um mapa na lista ou descarrgar mapas mais tarde através do \'menu - %1$s\'.</string>
+    <string name="skip_map_downloading_desc">Não tem o mapa offline instalado. Pode escolher um mapa na lista ou descarregar mapas mais tarde através do \'menu - %1$s\'.</string>
     <string name="shared_string_markers">Marcadores</string>
     <string name="coordinates_format">Formato de coordenadas</string>
     <string name="use_system_keyboard">Usar teclado do sistema</string>
@@ -1820,9 +1834,9 @@
     <string name="plan_route">Planear percurso</string>
     <string name="shared_string_sort">Classificar</string>
     <string name="coordinate_input">Introdução de coordenada</string>
-    <string name="is_saved">é gravado</string>
+    <string name="is_saved">está guardado</string>
     <string name="marker_save_as_track_descr">Exporte os seus marcadores para um ficheiro que pode especificar aqui:</string>
-    <string name="marker_save_as_track">Gravar como ficheiro GPX</string>
+    <string name="marker_save_as_track">Guardar como ficheiro GPX</string>
     <string name="move_to_history">Mover para histórico</string>
     <string name="group_will_be_removed_after_restart">O grupo terá desaparecido na próxima vez que iniciar a aplicação.</string>
     <string name="show_guide_line">Mostrar linhas direcionais</string>
@@ -1856,7 +1870,7 @@
     <string name="keep_showing_on_map">Manter o mapa observável</string>
     <string name="exit_without_saving">Sair sem guardar?</string>
     <string name="line">Linha</string>
-    <string name="save_as_route_point">Guardar como pontos do percurso</string>
+    <string name="save_as_route_point">Guardar como pontos da rota</string>
     <string name="save_as_line">Guardar como linha</string>
     <string name="route_point">Ponto de percurso</string>
     <string name="edit_line">Editar linha</string>
@@ -1864,7 +1878,7 @@
     <string name="add_point_after">Adicionar ponto depois</string>
     <string name="shared_string_options">Opções</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd irá ligar os pontos com percursos para o perfil selecionado.</string>
-    <string name="measurement_tool_save_as_new_track_descr">Gravar os pontos como pontos de percurso ou como uma linha.</string>
+    <string name="measurement_tool_save_as_new_track_descr">Guardar os pontos como pontos de rota ou como uma linha.</string>
     <string name="choose_navigation_type">Selecionar perfil de navegação</string>
     <string name="none_point_error">Por favor adicione pelo menos um ponto.</string>
     <string name="enter_gpx_name">Nome de ficheiro GPX:</string>
@@ -1973,7 +1987,7 @@
     <string name="right_side_navigation">Condução destra</string>
     <string name="driving_region_automatic">Automático</string>
     <string name="do_not_send_anonymous_app_usage">Não envie estatísticas anónimas de utilização da aplicação</string>
-    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd coleta informação sobre quais porções da aplicação que você abriu. A sua localização nunca é enviada, nem é nada que introduza na aplicação ou detalhes de áreas que observe, procure ou descarregue.</string>
+    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd recolhe informação sobre as secções da aplicação que abriu. Não são enviadas: a sua localização; a informação que introduz na aplicação; detalhes de áreas que veja, procure ou descarregue.</string>
     <string name="do_not_show_startup_messages">Não mostrar mensagens ao iniciar</string>
     <string name="do_not_show_startup_messages_desc">Nâo mostrar descontos da aplicação e mensagens de eventos locais especiais.</string>
     <string name="parking_options">Opções de estacionamento</string>
@@ -2133,7 +2147,7 @@
     <string name="coord_input_edit_point">Editar o ponto</string>
     <string name="coord_input_add_point">Adicionar ponto</string>
     <string name="coord_input_save_as_track">Gravar como caminho</string>
-    <string name="coord_input_save_as_track_descr">Você adicionou %1$s pontos. Digite um nome de ficheiro e toque em \"Gravar\".</string>
+    <string name="coord_input_save_as_track_descr">Adicionou %1$s pontos. Introduza um nome do ficheiro e toque em \"Guardar\".</string>
     <string name="error_notification_desc">Por favor envie um screenshot da notificação para support@osmand.net</string>
     <string name="quick_action_edit_actions">Editar ações</string>
     <string name="get_osmand_live">Obter OsmAnd Live para desbloquear todos as funcionalidades: atualizações de mapas diários com descarregamentos ilimitados, todos os complementos pagos e gratuitos, wikipedia, Wikivoyage e muito mais.</string>
@@ -2179,7 +2193,7 @@
     <string name="osm_live_payment_renews_quarterly">Renova trimestral</string>
     <string name="osm_live_payment_renews_annually">Renova anualmente</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
-    <string name="osm_live_payment_header">Selecione o período de pagamento conveniente para você:</string>
+    <string name="osm_live_payment_header">Selecione o período de pagamento conveniente para si:</string>
     <string name="osm_live_payment_contribute_descr">Parte da renda vai para contribuidores do OpenStreetMap.</string>
     <string name="release_3_1">• Navegação: Fix barra de progresso, troca rápida do ponto inicial e final da rota
 \n
@@ -2211,13 +2225,13 @@
     <string name="download_all">Descarregar tudo</string>
     <string name="shared_string_restart">Reiníciar a aplicação</string>
     <string name="show_images">Mostrar imagens</string>
-    <string name="purchase_cancelled_dialog_title">Você cancelou sua assinatura do OsmAnd Live</string>
+    <string name="purchase_cancelled_dialog_title">Cancelou a sua assinatura do OsmAnd Live</string>
     <string name="purchase_cancelled_dialog_descr">Renovar assinatura para continuar a utilizar todas as funcionalidades:</string>
-    <string name="maps_you_need_descr">Com base nos artigos que você marcou, os mapas seguintes são recomendados para você descarregar:</string>
-    <string name="maps_you_need">Mapas que você precisa</string>
+    <string name="maps_you_need_descr">Com base nos artigos que marcou, sugerimos que descarregue os seguintes mapas:</string>
+    <string name="maps_you_need">Mapas que precisa</string>
     <string name="osmand_team">Equipe do OsmAnd</string>
     <string name="popular_destinations">Destinos populares</string>
-    <string name="paid_app">Aplicativo pago</string>
+    <string name="paid_app">Aplicação paga</string>
     <string name="paid_plugin">Complemento pago</string>
     <string name="travel_card_update_descr">Há novos dados disponíveis da Wikivoyage, atualize-os para desfrutar.</string>
     <string name="travel_card_download_descr">Descarregue guias de viagem da Wikivoyage para ver artigos sobre lugares ao redor do mundo sem uma conexão com a Internet.</string>
@@ -2225,7 +2239,7 @@
     <string name="download_file">Descarregar ficheiro</string>
     <string name="start_editing_card_image_text">O mundo livre guia de viagem, que qualquer pessoa pode editar.</string>
     <string name="welcome_to_open_beta_description">Os guias de viagem estão atualmente baseados no Wikivoyage. Teste todos os recursos gratuitamente durante o teste aberto beta. Posteriormente os guias de viagem estarão disponíveis para assinantes do OsmAnd Unlimited e proprietários da OsmAnd+.</string>
-    <string name="start_editing_card_description">Você pode e deve editar qualquer artigo na Wikivoyage. Compartilhe saber, experiência, talento e sua atenção</string>
+    <string name="start_editing_card_description">Pode e deve editar qualquer artigo no Wikivoyage. Partilhe saber, experiência, talento e a sua atenção</string>
     <string name="start_editing">Começar a editar</string>
     <string name="get_unlimited_access">Obter acesso ilimitado</string>
     <string name="welcome_to_open_beta">Bem-vindo ao beta aberto</string>
@@ -2235,9 +2249,9 @@
     </string>
     <string name="daily_map_updates">Atualizações de mapa: <b>a cada hora</b>
     </string>
-    <string name="in_app_purchase">Compra in-app</string>
+    <string name="in_app_purchase">Compra na aplicação</string>
     <string name="in_app_purchase_desc">Pagamento de uma só vez</string>
-    <string name="in_app_purchase_desc_ex">Uma vez comprado, estará permanentemente disponível para você.</string>
+    <string name="in_app_purchase_desc_ex">Uma vez comprado, estará sempre disponível para si.</string>
     <string name="purchase_unlim_title">Comprar - %1$s</string>
     <string name="purchase_subscription_title">Assinar - %1$s</string>
     <string name="wikivoyage_offline">Wikivoyage offline</string>
@@ -2405,7 +2419,7 @@
     <string name="show_map">Exibir mapa</string>
     <string name="route_is_calculated">Rota calculada</string>
     <string name="round_trip">Ida e volta</string>
-    <string name="plan_route_no_markers_toast">Você precisa adicionar ao menos um marcador para usar esta função.</string>
+    <string name="plan_route_no_markers_toast">Tem de adicionar pelo menos um marcador para usar esta função.</string>
     <string name="osn_modify_dialog_error">Não foi possível modificar a nota</string>
     <string name="osn_modify_dialog_title">Modificar nota</string>
     <string name="context_menu_item_modify_note">Modificar anotação do OSM</string>
@@ -2481,7 +2495,7 @@
     <string name="navigate_point_olc_info_area">OLC completo válido 
 \nRepresenta área: %1$s x %2$s</string>
     <string name="speed_limit_exceed">Tolerância do limite de velocidade</string>
-    <string name="speed_limit_exceed_message">Selecione a margem de tolerância de limite de velocidade, acima do qual você receberá um aviso de voz.</string>
+    <string name="speed_limit_exceed_message">Selecione a margem de tolerância de limite de velocidade, acima do qual receberá um aviso de voz.</string>
     <string name="fav_point_emoticons_message">O nome do Favorito foi modificado para %1$s para facilitar gravar corretamente a sequência de caracteres com emoticons para um ficheiro.</string>
     <string name="print_route">Imprimir rota</string>
     <string name="fav_point_dublicate">Nome de favorito duplicado</string>
@@ -2560,9 +2574,9 @@
     <string name="rendering_attr_alpineHiking_description">Renderizar caminhos de acordo com a escala de SAC.</string>
     <string name="rendering_attr_hikingRoutesOSMC_description">Renderizar caminhos de acordo com traços OSMC.</string>
     <string name="map_widget_intermediate_time">Hora intermediária</string>
-    <string name="osmand_extended_description_part1">OsmAnd (sigla em inglês de Direções de Navegação Automatizada do OSM) é um aplicativo de mapa e navegação com acesso a dados livres, mundiais e de alta qualidade do OpenStreetMap (OSM). 
+    <string name="osmand_extended_description_part1">OsmAnd (sigla em inglês de direções de navegação automatizada do OSM) é uma aplicação de mapas e navegação com acesso a dados livres, mundiais e de alta qualidade do OpenStreetMap (OSM). 
 \n 
-\nPoderá usar o navegador visual e por voz, exibir POIs (pontos de interesse), criar e gerenciar trilhas GPX, usar (através de complemento) curvas de nível e dados de altitude, escolher entre os modos motorista, ciclista e pedestre, editar o OSM e muito mais.</string>
+\nPoderá usar o navegador visual e por voz, ver POIs (pontos de interesse), criar e gerir trilhos GPX, usar (através de um complemento) curvas de nível e dados de altitude, escolher entre os modos motorista, ciclista e pedestre, editar o OpenStreetMap e muito mais.</string>
     <string name="osmand_extended_description_part2">Navegação GPS 
 \n• Escolha entre modos off-line (sem tarifa de roaming quando estiver no exterior) ou on-line (mais rápido) 
 \n• Orientação por voz passo-a-passo lhe guia ao longo do caminho (vozes gravadas e sintetizadas) 
@@ -2584,67 +2598,73 @@
 \n• Permite-lhe escolher como exibir nomes no mapa: em inglês, local ou escrita fonética 
 \n• Exibe mapas on-line especializados, vista de satélite (do Bing), sobreposições diferentes como trajectos GPX de navegação/turismo e camadas adicionais com transparência personalizável
 \n</string>
-    <string name="osmand_extended_description_part4">Esqui 
-\n O complemento de mapas de ski OsmAnd Ski permite que você veja pistas de ski com nível de complexidade e algumas informações adicionais, como localização de elevadores e outras facilidades.</string>
+    <string name="osmand_extended_description_part4">Esqui
+\n O complemento de mapas de esqui OsmAnd Ski permite que veja pistas de esqui com nível de complexidade e algumas informações adicionais, como localização de elevadores e outras instalações invernais.</string>
     <string name="osmand_extended_description_part5">Ciclismo 
-\n • Encontre caminhos de bicicleta no mapa 
-\n • Navegação por GPS no modo ciclismo constrói a sua rota utilizando caminhos de bicicleta 
-\n • Ver a sua velocidade e altitude 
-\n • Opção de gravação GPX permite-lhe gravar a sua viagem e compartilhá-la 
-\n • Através de complementos adicionais, você pode ativar curvas de nível e sombreamento de relevo</string>
+\n • Encontre trilhos para bicicletas no mapa.
+\n • Navegação por GPS no modo ciclismo cria a sua rota utilizando trilhos para bicicletas.
+\n • Veja a sua velocidade e altitude.
+\n • Opção de gravação GPX permite-lhe gravar a sua viagem e partilhá-la.
+\n • Através de complementos adicionais, pode ativar curvas de nível e sombreamento de relevo.</string>
     <string name="osmand_extended_description_part6">Passeio, caminhada, turismo pela cidade 
 \n• O mapa mostra caminhos para passeios e caminhadas 
 \n• A Wikipédia no seu idioma preferido pode dizer muito durante um turismo pela cidade 
 \n• Paradas de transportes públicos (autocarro, troleibus, trem) incluindo nomes de linha, ajuda a navegar em uma nova cidade 
 \n• Navegação GPS em modo pedestre constrói a sua rota usando caminhos para pedestres 
 \n• Fazer upload e seguir uma rota GPX ou gravar e compartilhar a sua própria rota</string>
-    <string name="osmand_extended_description_part7">"Contribua para o OSM  • Comunique falha de dados  • Carregue trilhas GPX diretamente do app  • Adicione POIs e carregue-os diretamente ao OSM (ou mais tarde caso off-line)"</string>
-    <string name="osmand_extended_description_part8">OsmAnd é um software aberto desenvolvido ativamente. Todos podem contribuir para o app reportando bugs, melhorando traduções ou programando novas funcionalidades. Além disso, o projeto conta com contribuições financeiras para financiar a programação e testes de novas funcionalidades. 
-\nCobertura de mapa e qualidade aproximada: 
-\n• Europa Ocidental: **** 
-\n• Europa Oriental: *** 
-\n• Rússia: *** 
-\n• América do Norte: *** 
-\n• América do Sul: ** 
-\n• Ásia: ** 
-\n• Japão e Coreia: *** 
-\n• Oriente Médio: ** 
-\n• África: ** 
-\n• Antártida: * 
-\nA maioria dos países ao redor do globo é disponível para descarregar! 
-\nObtenha um navegador confiável em seu país - seja a França, Alemanha, México, Reino Unido, Espanha, Holanda, EUA, Rússia, Brasil ou qualquer outro.</string>
-    <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions) é um aplicativo de mapa e navegação com acesso a dados do OpenStreetMap (OSM) livre, em todo o mundo e de alta qualidade. 
-\nDesfrute da navegação visual ou por voz, exibindo POIs (pontos de interesse), criando e gerenciando trilhas GPX, usando informação de altitude e curvas de nível, escolher entre modos dirigir, andar de bicicleta e pedestres, editar o OSM e muito mais. 
+    <string name="osmand_extended_description_part7">Contribua para o OpenStretMap
+\n • Envie relatórios de erros
+\n • Envie trilhos GPX para o OpenStretMap diretamente da aplicação
+\n • Adicione POIs e envie-os diretamente para o OpenStretMap (ou mais tarde se estiver desconectado da Internet)
+\n</string>
+    <string name="osmand_extended_description_part8">OsmAnd é um programa de fonte aberta desenvolvido ativamente. Todos podem contribuir para a aplicação reportando erros, melhorando as traduções ou programando novas funcionalidades. Além disso, o projeto conta com contribuições financeiras para financiar a programação e testes de novas funcionalidades.
+\n Cobertura de mapa e qualidade aproximada:
+\n • Europa Ocidental: ****
+\n • Europa Oriental: ***
+\n • Rússia: ***
+\n • América do Norte: ***
+\n • América do Sul: **
+\n • Ásia: **
+\n • Japão e Coreia: ***
+\n • Oriente Médio: **
+\n • África: **
+\n • Antártida: *
+\n A maioria dos países ao redor do globo está disponível para descarregar!
+\n Obtenha um navegador confiável no seu país - seja em França, Alemanha, México, Reino Unido, Espanha, Holanda, EUA, Rússia, Brasil ou qualquer outro.</string>
+    <string name="osmand_plus_extended_description_part1">OsmAnd+ (direções de navegação automatizada do OSM) é uma aplicação de mapas e navegação com acesso a dados livres do OpenStreetMap (OSM), de todo o mundo e de alta qualidade. 
+\nDesfrute da navegação visual ou por voz, vendo POIs (pontos de interesse), criando e gerindo trilhos GPX, usando informação de altitude e curvas de nível, escolher entre modos dirigir, andar de bicicleta e pedestre, editar o OpenStreetMap e muito mais. 
 \n 
-\nOsmAnd+ é a versão paga do app. Ao comprá-lo, você apoia o projeto, financia o desenvolvimento de novas funcionalidades e recebe as últimas atualizações. 
+\nOsmAnd+ é a versão paga da aplicação. Ao comprá-lo, está a apoiar o projeto, a financiar o desenvolvimento de novas funcionalidades e a receber as últimas atualizações. 
 \n 
-\nAlgumas das principais características:</string>
+\nAlgumas das características principais:</string>
     <string name="osmand_plus_extended_description_part2">Navegação 
-\n• Funciona on-line (rápido) ou off-line (sem custo de roaming quando estiver no exterior) 
-\n• Orientação por voz passo-a-passo (vozes gravadas e sintetizadas) 
-\n• Orientação de trajectos opcionais, exibição do nome da rua e tempo estimado de chegada 
-\n• Suporta pontos intermediários do seu itinerário 
-\n• Correção de rota automático sempre que você sair da rota 
-\n• Busque lugares por endereço, pelo tipo (ex.: restaurante, hotel, posto de gasolina, museu), ou por coordenadas geográficas</string>
+\n• Funciona on-line (rápido) ou off-line (sem custos de roaming quando estiver no estrangeiro).
+\n• Orientação por voz passo a passo (vozes gravadas e sintetizadas).
+\n• Orientação de trajetos opcionais, visualização do nome da rua e tempo estimado de chegada.
+\n• Suporta pontos intermediários do seu itinerário.
+\n• Correção automática da rota sempre que sair da rota.
+\n• Procure lugares por endereço, pelo tipo (por exemplo: restaurante, hotel, posto de gasolina, museu...) ou por coordenadas geográficas.</string>
     <string name="osmand_plus_extended_description_part3">Visualização de mapa 
-\n• Exiba sua posição e orientação 
-\n• Opcionalmente alinhe o ecrã de acordo com a bússola ou a direção de seu movimento 
-\n• Grave seus lugares mais importantes como favoritos 
-\n• Exiba POIs (pontos de interesse) pertos 
-\n• Exiba imagens online especializadas, vista de satélite (do Bing), diferentes camadas como trilhas de navegação GPX e camadas adicionais com transparência personalizável 
-\n• Opcionalmente exiba nomes de lugares em inglês, língua local ou fonéticos</string>
-    <string name="osmand_plus_extended_description_part4">Use dados OSM e da Wikipédia
-\n • Informações de alta qualidade dos melhores projetos colaborativos do mundo
-\n • Dados OSM disponíveis por país ou região
-\n • POIs da Wikipédia, ótimo para visitas turísticas
-\n • Descarregamentos grátis ilimitados, diretamente do aplicativo
-\n • Mapas vetoriais offline compactos e atualizados mensalmente
-\n • Seleção entre região completa ou apenas rede rodoviária (Exemplo: Japão inteiro tem 700 MB ou apenas 200 MB para rede rodoviária)</string>
-    <string name="osmand_plus_extended_description_part5">Recursos de segurança 
-\n• Alternância de exibição dia/noite automatizada opcional 
-\n• Exibição de limite de velocidade opcional, com lembrete se você ultrapassá-lo 
-\n• Zoom dependente da velocidade opcional 
-\n• Compartilhe sua localização para que seus amigos possam encontrar você</string>
+\n • Veja a sua posição e orientação.
+\n • Oriente opcionalmente o ecrã de acordo com a bússola ou a direção do seu movimento.
+\n • Guarde os seus lugares mais importantes como favoritos.
+\n • Veja POIs (pontos de interesse) por perto.
+\n • Veja imagens online especializadas, vistas de satélite (do Bing), diferentes camadas como trilhos de navegação GPX e camadas adicionais com transparência personalizável.
+\n • Veja opcionalmente nomes de lugares em inglês, na língua local ou grafia fonética.
+\n</string>
+    <string name="osmand_plus_extended_description_part4">Use dados do OpenStretMap e da Wikipédia 
+\n • Informações de alta qualidade dos melhores projetos colaborativos do mundo.
+\n • Dados do OpenStretMap disponíveis por país ou região.
+\n • POIs da Wikipédia, ótimo para passeios turísticos.
+\n • Descarregamentos grátis ilimitados, diretamente da aplicação.
+\n • Mapas vetoriais compactos e atualizados mensalmente, desligado da Internet.
+\n • Seleção entre região completa ou apenas a rede rodoviária (exemplo: o Japão inteiro tem 700 MB e a rede rodoviária tem apenas 200 MB).</string>
+    <string name="osmand_plus_extended_description_part5">Recursos de segurança
+\n• Mudança da visualização automática para dia/noite opcional
+\n• Visualização do limite de velocidade (opcional), com lembrete se o ultrapassar
+\n• Ampliação dependente da velocidade (opcional)
+\n• Partilhe a sua localização para que os seus amigos o possam encontrar
+\n</string>
     <string name="osmand_plus_extended_description_part6">Recursos de ciclismo e pedestre 
 \n• Visualização de caminhos a pé, pistas de caminhadas e ciclovias, ideal para atividades ao ar livre 
 \n• Roteamento e modos de exibição especiais para bicicleta e pedestres 
@@ -2652,12 +2672,12 @@
 \n• Gravação opcional de viagem para ficheiro GPX local ou serviço on-line 
 \n• Exibição opcional de velocidade e altitudes 
 \n• Exibição de curvas de nível e sombreamento de relevo (via complemento adicional)</string>
-    <string name="osmand_plus_extended_description_part7">Contribuia diretamente para o OSM 
-\n• Avisar erros de dados 
-\n• Fazer upload de trilhas GPX para o OSM diretamente do app 
-\n• Adicionar POIs e fazer o upload diretamente para OSM (ou mais tarde se off-line) 
-\n• Gravação de viagem opcional também em modo background (enquanto o aparelho está no modo sleep) 
-\nOsmAnd é um software de código aberto desenvolvido ativamente. Todos podem contribuir para o app, reportando bugs, melhorando as traduções ou programando novas funcionalidades. Além disso, o projeto conta com contribuições financeiras para financiar o desenvolvimento e testes de novas funcionalidades. 
+    <string name="osmand_plus_extended_description_part7">Contribua diretamente para o OpenStreetMap
+\n • Envie relatórios de erros.
+\n • Envie trilhos GPX para o OpenStretMap diretamente da aplicação.
+\n • Adicione POIs e envie-os diretamente para o OpenStretMap (ou mais tarde se estiver desconectado da Internet).
+\n • Gravação de viagem opcional também em plano de fundo (enquanto o aparelho está no modo adormecido).
+\n OsmAnd é um programa de fonte aberta desenvolvido ativamente. Todos podem contribuir para a aplicação reportando erros, melhorando as traduções ou programando novas funcionalidades. Além disso, o projeto conta com contribuições financeiras para financiar a programação e testes de novas funcionalidades.
 \n</string>
     <string name="osmand_plus_extended_description_part8">Cobertura de mapa e qualidade aproximada: 
 \n• Europa Ocidental: **** 
@@ -2694,10 +2714,10 @@
     <string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota para viagens longas.</string>
     <string name="do_you_like_osmand">Está a gostar do OsmAnd\?</string>
     <string name="we_really_care_about_your_opinion">A sua opinião e o seu comentário são importantes para nós.</string>
-    <string name="rate_this_app">Avalie este app</string>
+    <string name="rate_this_app">Avalie esta aplicação</string>
     <string name="rate_this_app_long">Por favor, avalie o OsmAnd no Google Play</string>
     <string name="user_hates_app_get_feedback">Diga-nos porquê.</string>
-    <string name="user_hates_app_get_feedback_long">Por favor, diga-nos o que quer mudar neste app.</string>
+    <string name="user_hates_app_get_feedback_long">Por favor, diga-nos o que gostaria de alterar nesta aplicação.</string>
     <string name="failed_to_upload">Falha no envio</string>
     <string name="delete_change">Apagar mudança</string>
     <string name="successfully_uploaded_pattern">Enviado {0}/{1}</string>
@@ -2724,12 +2744,12 @@
     <string name="working_days">Dias úteis</string>
     <string name="recent_places">Lugares recentes</string>
     <string name="favourites">Favoritos</string>
-    <string name="saved_at_time">Gravado em: %1$s</string>
-    <string name="poi_deleted_localy">POI será excluído quando você enviar suas alterações</string>
+    <string name="saved_at_time">Guardado em: %1$s</string>
+    <string name="poi_deleted_localy">O POI será eliminado quando enviar as suas alterações</string>
     <string name="show_gpx">Mostrar dados do GPX</string>
     <string name="count_of_lines">Contagem de linhas</string>
-    <string name="are_you_sure">Tem certeza\?</string>
-    <string name="unsaved_changes_will_be_lost">Quaisquer alterações não gravadas serão perdidas. Continuar\?</string>
+    <string name="are_you_sure">Tem a certeza\?</string>
+    <string name="unsaved_changes_will_be_lost">Quaisquer alterações por guardar serão perdidas. Continuar\?</string>
     <string name="show_free_version_banner_description">Exibe o banner da versão gratuita mesmo na versão paga.</string>
     <string name="activate_seamarks_plugin">Favor ativar o complemento \'Mapa náutico\'</string>
     <string name="activate_srtm_plugin">Favor ativar o complemento \'Curvas de nível\'</string>
@@ -2758,7 +2778,7 @@
     <string name="quick_action_add_favorite">Adicionar Favorito</string>
     <string name="dialog_add_action_title">Adicionar ação</string>
     <string name="quick_actions_delete">Apagar ação</string>
-    <string name="quick_actions_delete_text">Tem certeza de que deseja apagar a ação \"%s\"\?</string>
+    <string name="quick_actions_delete_text">Tem a certeza de que quer eliminar a ação \"%s\"\?</string>
     <string name="quick_favorites_show_favorites_dialog">Mostrar diálogo Favoritos</string>
     <string name="quick_favorites_name_preset">Nome do preset</string>
     <string name="quick_action_add_marker_descr">Tocar no botão de ação adicionará um marcador de mapa no local do centro do ecrã.</string>
@@ -2771,7 +2791,7 @@
     <string name="quick_action_navigation_voice_descr">Tocar no botão de ação irá ativar ou desativar a orientação por voz durante a navegação.</string>
     <string name="quick_action_add_parking_descr">Tocar no botão de ação adicionará um lugar de estacionamento no local do centro do ecrã.</string>
     <string name="quick_action_interim_dialog">Mostrar um diálogo intermediário</string>
-    <string name="favorite_autofill_toast_text">" está gravado no "</string>
+    <string name="favorite_autofill_toast_text">" está guardado em "</string>
     <string name="favorite_empty_place_name">Lugar</string>
     <string name="quick_action_duplicates">Nome de ação rápida especificada já está em uso, foi mudado para %1$s para evitar uma duplicação.</string>
     <string name="quick_action_duplicate">Nome de ação rápida duplicado</string>
@@ -2790,7 +2810,7 @@
     <string name="quick_action_fav_name_descr">Deixe em branco para automaticamente usar o endereço ou nome de lugar.</string>
     <string name="quick_action_bug_descr">Esta mensagem está incluída no campo de comentário.</string>
     <string name="quick_action_bug_message">Mensagem</string>
-    <string name="quick_action_category_descr">Selecione a categoria para gravar o favorito.</string>
+    <string name="quick_action_category_descr">Selecione a categoria onde guardar o favorito.</string>
     <string name="quick_action_gpx_category_descr">Selecione uma categoria opcional.</string>
     <string name="quick_action_poi_list">Lista de POIs</string>
     <string name="quick_action_sh_poi_descr">Adicione uma ou mais categorias de POI para mostrar no mapa.</string>
@@ -2813,13 +2833,13 @@
     <string name="quick_action_btn_tutorial_title">Mudar posição do botão</string>
     <string name="quick_action_btn_tutorial_descr">Segure e arraste o botão para mudar a sua posição no ecrã.</string>
     <string name="shared_string_action_name">Nome da ação</string>
-    <string name="mappilary_no_internet_desc">Você precisa de coneçao à internet para ver as fotos do Mapillary.</string>
+    <string name="mappilary_no_internet_desc">Tem de estar conectado à Internet para ver as fotos do Mapillary.</string>
     <string name="retry">Repetir</string>
     <string name="add_route_points">Adicionar Pontos de Rota</string>
     <string name="add_waypoint">Adicionar Ponto de Passagem</string>
     <string name="add_line">Adicionar Linha</string>
-    <string name="save_gpx_waypoint">Gravar Ponto de Passagem GPX</string>
-    <string name="save_route_point">Gravar Ponto de Rota</string>
+    <string name="save_gpx_waypoint">Guardar ponto de passagem GPX</string>
+    <string name="save_route_point">Guardar ponto de rota</string>
     <string name="waypoint_one">Ponto de Passagem 1</string>
     <string name="route_point_one">Ponto de Rota 1</string>
     <string name="empty_state_my_tracks">Adicione ficheiros GPX</string>
@@ -2859,7 +2879,7 @@
     <string name="quick_action_switch_day_mode">Modo de Dia</string>
     <string name="quick_action_switch_night_mode">Modo Nocturno</string>
     <string name="quick_action_day_night_switch_mode">Mudar de modo Dia/Nocturno</string>
-    <string name="run_full_osmand_msg">Você está usando {0} Mapa que é alimentado por OsmAnd. Você quer lançar a versão completa do OsmAnd\?</string>
+    <string name="run_full_osmand_msg">Está a usar o mapa {0} que funciona com o OsmAnd. Quer abrir a versão completa do OsmAnd\?</string>
     <string name="run_full_osmand_header">Lançar OsmAnd\?</string>
     <string name="cubic_m">m³</string>
     <string name="metric_ton">t</string>
@@ -2877,15 +2897,15 @@
     <string name="points_of_interests">Pontos de interesse (POI)</string>
     <string name="waiting_for_route_calculation">Calculando a rota…</string>
     <string name="app_mode_public_transport">Transporte público</string>
-    <string name="avoid_roads_descr">Seleccione uma estrada que pretende evitar durante a navegação, ou no mapa ou na lista abaixo:</string>
+    <string name="avoid_roads_descr">Selecione uma estrada que pretende evitar durante a navegação, ou no mapa ou na lista abaixo:</string>
     <string name="show_along_the_route">Mostrar ao longo da rota</string>
     <string name="simulate_navigation">Simular navegação</string>
     <string name="choose_track_file_to_follow">Escolha o ficheiro de caminho a seguir</string>
     <string name="voice_announcements">Anúncios de voz</string>
     <string name="intermediate_destinations">Destinos intermediários</string>
-    <string name="arrive_at_time">Chegar às %1$s</string>
+    <string name="arrive_at_time">Chega às %1$s</string>
     <string name="shared_string_degrees">Graus</string>
-    <string name="angular_measeurement">Unidades de medida angular</string>
+    <string name="angular_measeurement">Unidade angular</string>
     <string name="angular_measeurement_descr">Mudar em que o azimute é medido.</string>
     <string name="avoid_pt_types_descr">Selecione quais tipos de transporte público evitar para a navegação:</string>
     <string name="quick_action_day_night_mode">Modo %s</string>
@@ -2941,21 +2961,21 @@
     <string name="rendering_attr_highway_class_path_name">Caminho</string>
     <string name="rendering_attr_highway_class_cycleway_name">Ciclovia</string>
     <string name="rendering_attr_undefined_name">Indefinido</string>
-    <string name="release_3_3">- Novo ecrã \'Direções\': apresenta os botões de destino Casa e Trabalho, atalho \"percurso anterior\", lista de trajectos e marcadores GPX activos, histórico de pesquisa
-\n
-\n - Informação adicional em \"Detalhes da rota\": tipos de estrada, superfície, declive, suavidade
-\n
-\n - Navegação de transporte público que suporta todos os tipos de transporte: metro, autocarro, eléctrico, etc.
-\n
-\n - Nova acção rápida para mostrar/ocultar trajectos e modos dia/noite
-\n
-\n - Áreas fixas exibidas como inundadas na Alemanha, África do Sul, Quebec
-\n
-\n - Suporte adicional para importação de KML e KMZ
-\n
-\n - Quebras fixas na abertura de algumas paragens de transportes públicos
-\n
-\n - Facebook e Firebase Analytics removidas da versão gratuita (OsmAnd+ não inclui)
+    <string name="release_3_3">- Novo ecrã \'Direções\': apresenta os botões de destino Casa e Trabalho, atalho \"percurso anterior\", lista de trajetos e marcadores GPX ativos, histórico de pesquisa 
+\n 
+\n - Informação adicional em \"Detalhes da rota\": tipos de estrada, superfície, declive, suavidade 
+\n 
+\n - Navegação de transporte público que suporta todos os tipos de transporte: metro, autocarro, elétrico, etc. 
+\n 
+\n - Nova ação rápida para mostrar/ocultar trajetos e modos dia/noite 
+\n 
+\n - Áreas fixas exibidas como inundadas na Alemanha, África do Sul, Quebec 
+\n 
+\n - Suporte adicional para importação de KML e KMZ 
+\n 
+\n - Quebras fixas na abertura de algumas paragens de transportes públicos 
+\n 
+\n - Analíticas do Facebook e Firebase removidas da versão gratuita (OsmAnd+ não as inclui)
 \n
 \n</string>
     <string name="use_osm_live_public_transport_description">Ativar transportes públicos para as mudanças do OsmAnd Live.</string>
@@ -2969,7 +2989,7 @@
     <string name="show_more">Mostrar mais</string>
     <string name="tracks_on_map">Trajectos exibidas</string>
     <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trajectos GPX</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Tocar neste botão de acção mostra ou oculta trajectos GPX seleccionados no mapa</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Tocar neste botão de ação mostra ou oculta trajetos GPX selecionados no mapa</string>
     <string name="quick_action_gpx_tracks_hide">Esconder trajectos GPX</string>
     <string name="routing_attr_avoid_tram_name">Evitar eléctricos</string>
     <string name="routing_attr_avoid_tram_description">Evitar eléctricos</string>
@@ -3010,4 +3030,16 @@
     <string name="routing_attr_avoid_sett_description">Evitar paralelepípedo</string>
     <string name="send_log">Enviar log</string>
     <string name="sit_on_the_stop">Embarque na parada</string>
+    <string name="files_moved">%1$d ficheiros movidos (%2$s).</string>
+    <string name="files_copied">%1$d ficheiros copiados (%2$s).</string>
+    <string name="files_failed">Não foi possível copiar %1$d ficheiros (%2$s).</string>
+    <string name="files_present">%1$d ficheiros (%2$s) estão presentes na localização anterior \'%3$s\'.</string>
+    <string name="move_maps">Mover mapas</string>
+    <string name="dont_move_maps">Não mover</string>
+    <string name="public_transport_ped_route_title">A rota a pé é de aproximadamente %1$s e pode ser mais rápida do que o transporte público</string>
+    <string name="public_transport_no_route_title">Infelizmente, OsmAnd não conseguiu encontrar uma rota adequada para sua configuração.</string>
+    <string name="public_transport_try_ped">Tente a navegação pedestre.</string>
+    <string name="public_transport_try_change_settings">Tente alterar a configuração.</string>
+    <string name="public_transport_calc_pedestrian">Calcular a rota pedestre</string>
+    <string name="public_transport_type">Tipo de transporte</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index fba550058c..48f3668fcf 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -3016,4 +3016,9 @@
 \n
 \n</string>
     <string name="send_log">Отправить log</string>
+    <string name="public_transport_no_route_title">К сожалению OsmAnd не смог найти подходящий для вас маршрут.</string>
+    <string name="public_transport_try_ped">Попробуйте пешеходную навигацию.</string>
+    <string name="public_transport_try_change_settings">Попробуйте изменить настройки.</string>
+    <string name="public_transport_calc_pedestrian">Рассчитать пешеходный маршрут</string>
+    <string name="public_transport_type">Тип транспорта</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 892da7d28a..a6a0e40aaf 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1527,12 +1527,12 @@ Lon %2$s</string>
     <string name="index_name_netherlands">Europa - Olanda</string>
     <string name="search_poi_category_hint">Iscrie pro chircare totu</string>
     <string name="specified_directiory_not_writeable">Sas mapas non podent èssere creadas in sa cartella dislindada</string>
-    <string name="copying_osmand_file_failed">Còpia de sos documentos fallida</string>
+    <string name="copying_osmand_file_failed">Tramudòngiu de sos documentos fallidu</string>
     <string name="storage_directory_external">Memòria esterna</string>
     <string name="storage_directory_manual">Dislindada manualmente</string>
     <string name="storage_directory_default">Memòria interna</string>
     <string name="shared_string_copy">Còpia</string>
-    <string name="application_dir_change_warning3">Cheres copiare in sa destinatzione noa fintzas sos documentos de sos datos de OsmAnd?</string>
+    <string name="application_dir_change_warning3">Cheres tramudare in sa destinatzione noa fintzas sos documentos de sos datos de OsmAnd\?</string>
     <string name="storage_directory_internal_app">Memòria interna de s\'aplicatzione</string>
     <string name="rendering_value__name">Predefinidu</string>
     <string name="rendering_value_highContrastRoads_name">Caminos a cuntrastu artu</string>
@@ -3017,4 +3017,16 @@ Pro praghere iscrie su còdighe intreu</string>
 \n
 \n</string>
     <string name="send_log">Imbia su registru</string>
+    <string name="files_moved">%1$d documentos tramudados (%2$s).</string>
+    <string name="files_copied">%1$d documentos copiados (%2$s).</string>
+    <string name="files_failed">Còpia de %1$d documentos fallida (%2$s).</string>
+    <string name="files_present">%1$d documentos (%2$s) sunt presentes in sa positzione anteposta \'%3$s\'.</string>
+    <string name="move_maps">Tràmuda sas mapas</string>
+    <string name="dont_move_maps">Non tràmudes</string>
+    <string name="public_transport_ped_route_title">Cust\'àndala a pede est pagu prus o mancu de %1$s e diat pòdere èssere prus lestra de su trasportu pùblicu</string>
+    <string name="public_transport_no_route_title">A dolu mannu OsmAnd no at pòtiu agatare un\'àndala adata a sas impostatziones tuas.</string>
+    <string name="public_transport_try_ped">Proa su nàvigu a pede.</string>
+    <string name="public_transport_try_change_settings">Proa a cambiare sas impostatziones.</string>
+    <string name="public_transport_calc_pedestrian">Càlcula un\'àndala a pede</string>
+    <string name="public_transport_type">Casta de trasportu</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 026482031a..b4d570b08f 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1532,7 +1532,7 @@ Dĺžka %2$s</string>
     <string name="rendering_value__name">Predvolené</string>
     <string name="rendering_value_highContrastRoads_name">Vysoko kontrastné cesty</string>
     <string name="specified_directiory_not_writeable">V zadanom priečinku nemohli byť vytvorené mapy</string>
-    <string name="copying_osmand_file_failed">Kopírovanie súborov zlyhalo</string>
+    <string name="copying_osmand_file_failed">Presúvanie súborov zlyhalo</string>
     <string name="storage_directory_external">Externé úložisko</string>
     <string name="storage_directory_multiuser">Úložisko pre viacerých používateľov</string>
     <string name="storage_directory_internal_app">Interná pamäť aplikácie</string>
@@ -1540,7 +1540,7 @@ Dĺžka %2$s</string>
     <string name="storage_directory_default">Interná pamäť</string>
     <string name="storage_directory">Úložisko máp</string>
     <string name="shared_string_copy">Kopírovať</string>
-    <string name="application_dir_change_warning3">Skopírovať údaje OsmAnd do nového cieľa?</string>
+    <string name="application_dir_change_warning3">Presunúť údaje OsmAnd do nového cieľa\?</string>
     <string name="rendering_attr_hideHouseNumbers_name">Čísla domov</string>
     <string name="routing_attr_avoid_borders_description">Vyhnúť sa prekročeniu hraníc krajín</string>
     <string name="routing_attr_height_name">Výškový limit</string>
@@ -2404,7 +2404,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="quick_action_osmbugs_show">Zobraziť OSM poznámky</string>
     <string name="quick_action_osmbugs_hide">Skryť OSM poznámky</string>
     <string name="quick_action_showhide_osmbugs_descr">Aktivovaním tohto tlačidla akcie sa zobrazia alebo skryjú OSM Poznámky na mape.</string>
-    <string name="private_access_routing_req">Váš cieľ je v oblasti so súkromným prístupom. Povoliť vstúp na súkromné cesty pre tento výlet?</string>
+    <string name="private_access_routing_req">Váš cieľ je v oblasti so súkromným prístupom. Povoliť vstup na súkromné cesty pre tento výlet\?</string>
     <string name="restart_search">Znovu začať hľadanie</string>
     <string name="increase_search_radius">Zväčšiť okruh hľadania</string>
     <string name="nothing_found">Nič sa nenašlo</string>
@@ -3016,4 +3016,16 @@ Zodpovedá oblasti: %1$s x %2$s</string>
 \n • Zobrazenie azimutu v meraní vzdialenosti
 \n</string>
     <string name="send_log">Odoslať záznam</string>
+    <string name="files_moved">%1$d súborov presunutých (%2$s).</string>
+    <string name="files_copied">%1$d súborov skopírovaných (%2$s).</string>
+    <string name="files_failed">Nepodarilo sa skopírovať %1$d súborov (%2$s).</string>
+    <string name="files_present">%1$d súborov (%2$s) sa nachádza v pôvodnom umiestnení \'%3$s\'.</string>
+    <string name="move_maps">Presunúť mapy</string>
+    <string name="dont_move_maps">Nepresúvať</string>
+    <string name="public_transport_ped_route_title">Trasa peši je približne %1$s a mohla by byť rýchlejšia ako hromadnou dopravou</string>
+    <string name="public_transport_no_route_title">Žiaľ, OsmAnd nemohol nájsť vhodnú trasu pri vašich nastaveniach.</string>
+    <string name="public_transport_try_ped">Skúste navigáciu pre peších.</string>
+    <string name="public_transport_try_change_settings">Skúste zmeniť nastavenia.</string>
+    <string name="public_transport_calc_pedestrian">Vypočítať pešiu trasu</string>
+    <string name="public_transport_type">Spôsob dopravy</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 995b040185..24593b8092 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -1484,9 +1484,9 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="osmand_parking_overdue">prekoračen čas</string>
     <string name="shared_string_places">Kraji</string>
     <string name="watch">Poglej</string>
-    <string name="application_dir_change_warning3">Ali želite kopirati podatkovne datoteke na novo ciljno mesto\?</string>
+    <string name="application_dir_change_warning3">Ali želite premakniti podatkovne datoteke na novo ciljno mesto\?</string>
     <string name="specified_directiory_not_writeable">V navedeno mapo ni mogoče shraniti zemljevidov.</string>
-    <string name="copying_osmand_file_failed">Kopiranje datotek je spodletelo.</string>
+    <string name="copying_osmand_file_failed">Premikanje datotek je spodletelo.</string>
     <string name="storage_directory_external">Zunanje mesto za shranjevanje</string>
     <string name="storage_directory_multiuser">Shranjevanje za različne uporabnike</string>
     <string name="storage_directory_internal_app">Notranji pomnilnik programa</string>
@@ -2984,7 +2984,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="route_steepness_stat_container">Naklon</string>
     <string name="shared_string_degrees">Stopinje</string>
     <string name="shared_string_milliradians">Miliradiani</string>
-    <string name="angular_measeurement">Kotne merske enote</string>
+    <string name="angular_measeurement">Kotne enote</string>
     <string name="angular_measeurement_descr">Spreminjanje merila azimuta.</string>
     <string name="avoid_pt_types_descr">Izbor vrst javnega transporta za izogibanje:</string>
     <string name="quick_action_day_night_mode">Način %s</string>
@@ -3017,4 +3017,13 @@ Koda predstavlja območje: %1$s x %2$s</string>
 \n
 \n</string>
     <string name="send_log">Pošlji dnevnik</string>
+    <string name="files_moved">Premaknjenih je %1$d datotek (%2$s).</string>
+    <string name="files_copied">Kopiranih je %1$d datotek (%2$s).</string>
+    <string name="files_failed">Kopiranje %1$d datotek je spodletelo (%2$s).</string>
+    <string name="move_maps">Premakni zemljevide</string>
+    <string name="dont_move_maps">Ne premakni</string>
+    <string name="public_transport_try_ped">Preizkusite navigacijo za pešačenje.</string>
+    <string name="public_transport_try_change_settings">Poskusite spreminjati nastavitve.</string>
+    <string name="public_transport_calc_pedestrian">Izračunaj pot za pešačenje</string>
+    <string name="public_transport_type">Vrsta transporta</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 819580777e..08ff83712e 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources><string name="close_changeset">Değişiklik listesini kapat</string>
-	<string name="zxing_barcode_scanner_not_found">ZXing Barcode Scanner uygulaması kurulu değil. Uygulama marketinde aramak ister misiniz?</string>
-	<string name="rendering_attr_roadColors_description">Yol renk şemasını seç:</string>
-	<string name="rendering_attr_roadColors_name">Yol renk şeması</string>
+<resources>
+    <string name="close_changeset">Değişiklik listesini kapat</string>
+    <string name="zxing_barcode_scanner_not_found">ZXing Barcode Scanner uygulaması kurulu değil. Uygulama marketinde aramak ister misiniz?</string>
+    <string name="rendering_attr_roadColors_description">Yol renk şemasını seç:</string>
+    <string name="rendering_attr_roadColors_name">Yol renk şeması</string>
     <string name="map_widget_show_destination_arrow">Hedef yönü göster</string>
     <string name="enable_plugin_monitoring_services">Konum kayıt tutma hizmetlerini (GPX kaydı tutma, çevrim içi tracking) kullanmak için seyahat kaydetme eklentisini etkinleştir</string>
     <string name="non_optimal_route_calculation">Uzak hedefler için tahmini rotayı hesapla</string>
-	<string name="gps_not_available">Lütfen GPS\'yi ayarlardan açık konuma getirin</string>
+    <string name="gps_not_available">Lütfen GPS\'yi ayarlardan açık konuma getirin</string>
     <string name="map_widget_monitoring_services">Log servisi</string>
-	<string name="no_route">Rota yok</string>
-	<string name="delete_target_point">Varış Noktasını kaldır</string>
-	<string name="target_point">Varış noktası %1$s</string>
+    <string name="no_route">Rota yok</string>
+    <string name="delete_target_point">Varış Noktasını kaldır</string>
+    <string name="target_point">Varış noktası %1$s</string>
     <string name="intermediate_point">Intermediate hedef %1$s</string>
     <string name="context_menu_item_last_intermediate_point">Son ara nokta olarak ekle</string>
     <string name="context_menu_item_first_intermediate_point">İlk ara hedef eklemek</string>
@@ -34,65 +35,52 @@
     <string name="poi_filter_restaurants">Restorantlar</string>
     <string name="poi_filter_sightseeing">Gezinti</string>
     <string name="poi_filter_car_aid">Araç Yardım</string>
-	<string name="poi_filter_food_shop">Yiyecek Market</string>
-	<string name="poi_filter_for_tourists">Turistler için</string>
-	<string name="poi_filter_fuel">Yakıt</string>
-	<string name="show_warnings_title">Uyarıları göster…</string>
-	<string name="use_compass_navigation">Pusulayı kullan</string>
-	<string name="avoid_motorway">Otoyollardan geçme</string>
-	<string name="auto_zoom_map_descr">Hızınıza göre haritayı kendiliğinden yakınlaştırma (geçerli konum ile haritanız eşzamanlandığında)</string>
-	<string name="auto_zoom_map">Haritayı kendiliğinden yakınlaştır</string>
-	
-	<string name="filterpoi_activity">POI filtresi yarat</string>
-	<string name="recalculate_route_to_your_location">Ulaşım modu:</string>
-	<string name="select_navigation_mode">Ulaşım modunu seç</string>
-	
-	<string name="day_night_info">Gündüz/gece bilgisi</string>
-	
-	<string name="osmand_short_description_80_chars">Küresel Mobil Harita Görüntüleme ve Yolbul için Çevrim Dışı ve Çevrim İçi OSM Haritaları</string>
-	
-	
-	<string name="map_widget_view_direction">Görüntüleme yönü</string>
-	
-	<string name="bg_service_sleep_mode_off">Aktifleştir\nUygulamayı arka planda</string>
-	<string name="bg_service_sleep_mode_on">Durdur\nArka planda çalışan Uygulamayı</string>
-	<string name="int_continuosly">Devam et</string>
-	<string name="screen_is_locked">Ekran kilidini açmak için kilit simgesine basın</string>
-	<string name="map_widget_top_text">Sokak ismi</string>
-	
-	<string name="map_widget_back_to_loc">Neredeyim</string>
-	<string name="map_widget_lock_screen">Ekran kilidi</string>
-	<string name="map_widget_compass">Pusula</string>
-	
-	<string name="map_widget_reset">Varsayılanlara geri dön</string>
-	
-	
-	<string name="map_widget_monitoring">GPX günlüğü</string>
-	<string name="map_widget_speed">Hız</string>
-	<string name="map_widget_distance">Varış Noktası</string>
-	<string name="bg_service_screen_lock">Ekran kilidi</string>
-	<string name="bg_service_screen_unlock">Ekran kilidini kaldır</string>
-	<string name="bg_service_screen_lock_toast">Ekran kilitli</string>
-	<string name="show_cameras">Hız kameraları</string>
-	<string name="show_traffic_warnings">Trafik uyarıları</string>
-	<string name="avoid_toll_roads">Ücretli yollardan sakın</string>
-	<string name="osmand_parking_hours">Saat</string>
-	<string name="osmand_parking_minutes">Dakika</string>
-	<string name="global_app_allocated_memory">Ayrılmış bellek</string>
-	<string name="native_app_allocated_memory">Toplam yerel bellek</string>
-	
-	<string name="osmand_parking_warning">Uyarı</string>
-	<string name="osmand_parking_add_event">Takvim uygulamasına bir bildirim ekle</string>
-	<string name="osmand_parking_pm">ÖS</string>
-	<string name="osmand_parking_am">ÖÖ</string>
-	<string name="osmand_parking_position_name">Park noktası</string>
-	<string name="safe_mode_description">Uygulamayı güvenli kipte çalıştır (sisteme özgü kod yerine yavaş Android kodu kullanılarak).</string>
+    <string name="poi_filter_food_shop">Yiyecek Market</string>
+    <string name="poi_filter_for_tourists">Turistler için</string>
+    <string name="poi_filter_fuel">Yakıt</string>
+    <string name="show_warnings_title">Uyarıları göster…</string>
+    <string name="use_compass_navigation">Pusulayı kullan</string>
+    <string name="avoid_motorway">Otoyollardan geçme</string>
+    <string name="auto_zoom_map_descr">Hızınıza göre haritayı kendiliğinden yakınlaştırma (geçerli konum ile haritanız eşzamanlandığında)</string>
+    <string name="auto_zoom_map">Haritayı kendiliğinden yakınlaştır</string>
+    <string name="filterpoi_activity">POI filtresi yarat</string>
+    <string name="recalculate_route_to_your_location">Ulaşım modu:</string>
+    <string name="select_navigation_mode">Ulaşım modunu seç</string>
+    <string name="day_night_info">Gündüz/gece bilgisi</string>
+    <string name="osmand_short_description_80_chars">Küresel Mobil Harita Görüntüleme ve Yolbul için Çevrim Dışı ve Çevrim İçi OSM Haritaları</string>
+    <string name="map_widget_view_direction">Görüntüleme yönü</string>
+    <string name="bg_service_sleep_mode_off">Aktifleştir\nUygulamayı arka planda</string>
+    <string name="bg_service_sleep_mode_on">Durdur\nArka planda çalışan Uygulamayı</string>
+    <string name="int_continuosly">Devam et</string>
+    <string name="screen_is_locked">Ekran kilidini açmak için kilit simgesine basın</string>
+    <string name="map_widget_top_text">Sokak ismi</string>
+    <string name="map_widget_back_to_loc">Neredeyim</string>
+    <string name="map_widget_lock_screen">Ekran kilidi</string>
+    <string name="map_widget_compass">Pusula</string>
+    <string name="map_widget_reset">Varsayılanlara geri dön</string>
+    <string name="map_widget_monitoring">GPX günlüğü</string>
+    <string name="map_widget_speed">Hız</string>
+    <string name="map_widget_distance">Varış Noktası</string>
+    <string name="bg_service_screen_lock">Ekran kilidi</string>
+    <string name="bg_service_screen_unlock">Ekran kilidini kaldır</string>
+    <string name="bg_service_screen_lock_toast">Ekran kilitli</string>
+    <string name="show_cameras">Hız kameraları</string>
+    <string name="show_traffic_warnings">Trafik uyarıları</string>
+    <string name="avoid_toll_roads">Ücretli yollardan sakın</string>
+    <string name="osmand_parking_hours">Saat</string>
+    <string name="osmand_parking_minutes">Dakika</string>
+    <string name="global_app_allocated_memory">Ayrılmış bellek</string>
+    <string name="native_app_allocated_memory">Toplam yerel bellek</string>
+    <string name="osmand_parking_warning">Uyarı</string>
+    <string name="osmand_parking_add_event">Takvim uygulamasına bir bildirim ekle</string>
+    <string name="osmand_parking_pm">ÖS</string>
+    <string name="osmand_parking_am">ÖÖ</string>
+    <string name="osmand_parking_position_name">Park noktası</string>
+    <string name="safe_mode_description">Uygulamayı güvenli kipte çalıştır (sisteme özgü kod yerine yavaş Android kodu kullanılarak).</string>
     <string name="safe_mode">Güvenli kip</string>
     <string name="native_library_not_running">Uygulama güvenli kipte çalışıyor (Ayarlar menüsünden kapatabilirsiniz).</string>
     <string name="background_service_is_enabled_question">Osmand arka plan hizmeti hala çalışıyor. Sen de bunu durdurmak istiyor musunuz?</string>
-    
-    
-	<string name="local_indexes_cat_av">Ses/Video verisi</string>
+    <string name="local_indexes_cat_av">Ses/Video verisi</string>
     <string name="stop_routing_confirm">Navigasyonu durdurmak istediğinize emin misiniz?</string>
     <string name="clear_dest_confirm">Hedefi (ve ara hedefleri) temizlemek istediğinize emin misiniz\?</string>
     <string name="precise_routing_mode">Hassas yönlendirme (alfa)</string>
@@ -102,7 +90,6 @@
     <string name="recording_context_menu_precord">Fotoğraf çek</string>
     <string name="dropbox_plugin_description">Dropbox eklentisi, yol tariflerini ve ses/video notlarını dropbox hesabınızla eşitlemenize olanak verir.</string>
     <string name="dropbox_plugin_name">Dropbox eklentisi</string>
-    
     <string name="intermediate_points_change_order">Sıralamayı değiştir</string>
     <string name="srtm_paid_version_msg">Programın geliştirilebilmesi için lütfen çevreleme çizgileri eklentisini Mağazadan almayı da düşünün.</string>
     <string name="srtm_paid_version_title">Çevreleme çizgileri eklentisi</string>
@@ -118,10 +105,7 @@
     <string name="av_settings">Ses/Video ayarları </string>
     <string name="recording_error">Kayıt sırasında hata oluştu </string>
     <string name="recording_camera_not_available">Kamera kullanılabilir değil</string>
-    
     <string name="index_name_openmaps">AB Açık haritası</string>
-    
-    
     <string name="precise_routing_mode_descr">Kusursuz ve hassas rota hesapla. Henüz uzaklık kısıtlıdır ve yavaştır.</string>
     <string name="av_use_external_camera_descr">Fotoğraflar için sistem uygulamasını kullan.</string>
     <string name="av_use_external_camera">Kamera uygulamasını kullan</string>
@@ -129,7 +113,6 @@
     <string name="recording_playing">Belirtilen kayıttan bir ses çalınıyor.\n%1$s</string>
     <string name="recording_open_external_player">Harici oynatıcı aç</string>
     <string name="recording_delete_confirm">Bu kaydı silmek istiyor musunuz?</string>
-    
     <string name="recording_unavailable">kullanılamaz</string>
     <string name="recording_context_menu_arecord">Sesli bir not al</string>
     <string name="recording_context_menu_vrecord">Bir video notu al</string>
@@ -143,13 +126,8 @@
     <string name="map_widget_av_notes">Ses/video notları</string>
     <string name="osmand_srtm_short_description_80_chars">Çevrim dışı çevreleme çizgileri için OsmAnd eklentisi</string>
     <string name="osmand_srtm_long_description_1000_chars">"Bu eklenti OsmAnd çevrimdışı haritalarda eşyükseltileri (kabartma olarak) ve gölgeli yamaçları gösterir. Bu özellik çoğunlukla sporcular, uzun yürüyüşcüler, yürüyüşçüler ve tabii ki bir manzaranın kabartma yapısıyla ilgilenen herkesin takdirinedir.\n\nGlobal veri (70 derece kuzey ve 70 derece güney arasındaki) SRTM (Mekik Radar Topografi Misyonu) ve ASTER (Gelişmiş Uzay Termal Yayılma ve Yansıma Radyometre), bir görüntüleme aracı onboard Terra, NASA&amp;#39;nın Earth Gözlem amiral gemisi uydudan ölçümleri esas Sistemi. ASTER NASA arasında bir kooperatif çabadır, Ekonomi, Ticaret ve Sanayi Odası (METI) ve Japonya Uzay Sistemleri (J-spacesystems) Japonya Bakanlığı. "</string>
-    
-    
-    
-    
     <string name="map_widget_distancemeasurement">Mesafe ölçümü</string>
     <string name="audionotes_location_not_defined">Notu ile ilişkilendirmek Yer henüz tanımlanmamıştır. &amp;quot;Konumu kullan ...&amp;quot; Belirtilen yere not atamak</string>
-    
     <string name="map_widget_audionotes">Sesli notlar</string>
     <string name="audionotes_plugin_description">Ses / video eklentisi harita üzerinde herhangi bir pozisyon için harita ekranında bir düğme veya doğrudan bağlam menüsünü kullanarak, bir yolculuk sırasında ses / fotoğraf / video notlar almak için işlevsellik sağlar belirtiyor.</string>
     <string name="audionotes_plugin_name">Ses/video notları</string>
@@ -162,581 +140,486 @@
     <string name="download_srtm_maps">Çevreleme çizgileri</string>
     <string name="download_regular_maps">Standart Harita</string>
     <string name="download_roads_only_maps">Yalnızca yolları gösteren harita</string>
-    
-	<string name="rendering_attr_noAdminboundaries_name">Sınırlar</string>
-	<string name="rendering_attr_noAdminboundaries_description">Bölgesel sınırların gösterimini sakla (admin düzeyleri 5-9)</string>
-    
-    
-    
-	
-	
+    <string name="rendering_attr_noAdminboundaries_name">Sınırlar</string>
+    <string name="rendering_attr_noAdminboundaries_description">Bölgesel sınırların gösterimini sakla (admin düzeyleri 5-9)</string>
     <string name="map_widget_max_speed">Hız sınırı</string>
     <string name="route_descr_lat_lon">Enlem %1$.3f, boylam %2$.3f</string>
-    
-    
-    
     <string name="no_buildings_found">Bina bulunmadı.</string>
     <string name="incremental_search_city">Adım adım şehiri arama</string>
     <string name="search_villages_and_postcodes"/>
-	<string name="rendering_attr_showRoadMaps_description">sadece haritalar görüntülemek için seç-sadece haritalar:</string>
-	<string name="rendering_attr_showRoadMaps_name">Yollar-sadece haritalar</string>
+    <string name="rendering_attr_showRoadMaps_description">sadece haritalar görüntülemek için seç-sadece haritalar:</string>
+    <string name="rendering_attr_showRoadMaps_name">Yollar-sadece haritalar</string>
     <string name="show_warnings_descr">Trafik uyarıları (hız sınırları, zorunlu duruşlar, hız tümsekleri), hız kamerası uyarıları ve şerit bilgilerini yapılandırma</string>
-	<string name="use_compass_navigation_descr"/>
-	<string name="snap_to_road_descr">Navigasyon sırasında konumu yola uydur.</string>
-	<string name="snap_to_road">Yola tuttur</string>
-	
-	<string name="osmand_long_description_1000_chars">" ↵ →→OsmAnd (OSM Otomatik Navigasyon Var)↵ ↵ →→OsmAnd küresel bir yelpazede erişimi olan açık kaynak kodlu bir navigasyon uygulaması OpenStreetMap (OSM) verileri.Tüm harita verisi ( vektör veya kiremit haritaları ) çevrimdışı kullanım içintelefon hafıza kartında saklanabilir .OsmAnd da turn - by-turn sesli rehberlik dahil offline ve online yönlendirme işlevselliği sunuyor.↵ ↵ →→Çekirdek özelliklerden bazıları:↵ →→- Komple isimli işlevselliği (seçilebilir bir klasöre mağaza indirilen vektör veya kiremit haritaları)↵ →→- Kompakt isimli vektör mevcuttüm dünya için haritalar↵ →→- Ülkenin veya bölgenin indirinapp doğrudan harita ↵ →→- GPX veya navigasyon parça , Görülecek Yerler gibi olası çeşitli harita katmanları , Yerleşimi, sık , kontur çizgileri , toplu taşıma durakları , özelleştirilebilir şeffaflık ek haritaları↵ →→- Adresler ve yerler için çevrimdışı arama (POIs)↵ →→- Kısa mesafeler için Çevrimdışı yönlendirme (deneysel)↵ →→- Ile otomobil , bisiklet ve yaya modları:↵ →→- İsteğe bağlı otomatik gündüz / gece görünümü anahtarlama↵ →→- İsteğe bağlı hız bağımlı harita yakınlaştırma↵ →→- hareket pusula veya yöne göre isteğe haritası hizalama↵ →→- İsteğe bağlı şerit rehberlik , hız sınırı göstergesi , kaydedilmiş ve TTS sesler↵ ↵ →→OsmAnd bu ücretsiz sürümü Sınırlamaları:↵ →→- Sınırlı harita indirilme sayısı↵ →→- Wikipedia erişim isimli POIs yok↵ ↵ →→OsmAnd aktif gelişmiş ve bizim proje ve daha fazla ilerlemegelişimini finanse etmek için mali katkılar dayanır ve yeni işlevler testdriving ediliyor .Osmand.net üzerinde genel bir bağış OsmAnd satın alma , ya da belirli yeni özellikler fon veya yapmayı düşünün lütfen.↵ → "</string>
-	<string name="osmand_plus_short_description_80_chars">Küresel Mobil Harita Görüntüleme &amp; Yolbul için Çevrim Dışı ve Çevrim İçi OSM Haritaları</string>
-	<string name="osmand_plus_long_description_1000_chars">" OsmAnd   (OSM Automated Gezinti Tarifi) OsmAnd   küresel OpenStreetMap (OSM) veri çok çeşitli erişimi olan bir açık kaynak navigasyon bir uygulamadır. Tüm harita verisi (vektör veya kiremit harita) çevrimdışı kullanım için telefonun hafıza kartında saklanabilir. OsmAnd zamanda turn-by-turn sesli yönlendirme dahil olmak üzere çevrimiçi ve çevrimdışı yönlendirme işlevselliği sunuyor. OsmAnd   Eğer, projeyi destekleyen yeni özellikler geliştirme fonu, ve en son güncellemeleri almak onu satın alarak, ücretli uygulama sürümüdür. Temel özelliklerden bazıları: - Komple çevrimdışı işlevsellik (seçilebilir klasör deposu indirilen vektör veya kiremit harita) - Mevcut tüm dünya için Kompakt çevrimdışı vektör haritaları - doğrudan app ülke veya bölge haritaları Sınırsız indirme - Çevrimdışı Vikipedi özelliği (indir İÇN Wikipedia), gezi için büyük - adresleri ve yerleri (POI) için Çevrimdışı arama - GPX veya navigasyon parçaları, İlgi Çekici Nokta, sık, kontür çizgileri, toplu taşıma durakları, özelleştirilebilir şeffaflık ek haritalar gibi olası birçok harita katmanları Yerleşimi, - - İsteğe bağlı otomatik gündüz / gece görüntüsüyle anahtarlama - yakınlaştırma opsiyonel hız bağımlı haritası - hareket pusula veya yönüne göre opsiyonel harita hizalama - İsteğe bağlı şerit takibi, hız: Otomobil, bisiklet ve yaya ile modları - Kısa mesafelerde (deneysel) için Çevrimdışı yönlendirme sınırı göstergesi kaydedilmeli ve TTS sesleri "</string>
-	
-	<string name="day_night_info_description">Gün doğumu:%1$s
+    <string name="use_compass_navigation_descr"/>
+    <string name="snap_to_road_descr">Navigasyon sırasında konumu yola uydur.</string>
+    <string name="snap_to_road">Yola tuttur</string>
+    <string name="osmand_long_description_1000_chars">" ↵ →→OsmAnd (OSM Otomatik Navigasyon Var)↵ ↵ →→OsmAnd küresel bir yelpazede erişimi olan açık kaynak kodlu bir navigasyon uygulaması OpenStreetMap (OSM) verileri.Tüm harita verisi ( vektör veya kiremit haritaları ) çevrimdışı kullanım içintelefon hafıza kartında saklanabilir .OsmAnd da turn - by-turn sesli rehberlik dahil offline ve online yönlendirme işlevselliği sunuyor.↵ ↵ →→Çekirdek özelliklerden bazıları:↵ →→- Komple isimli işlevselliği (seçilebilir bir klasöre mağaza indirilen vektör veya kiremit haritaları)↵ →→- Kompakt isimli vektör mevcuttüm dünya için haritalar↵ →→- Ülkenin veya bölgenin indirinapp doğrudan harita ↵ →→- GPX veya navigasyon parça , Görülecek Yerler gibi olası çeşitli harita katmanları , Yerleşimi, sık , kontur çizgileri , toplu taşıma durakları , özelleştirilebilir şeffaflık ek haritaları↵ →→- Adresler ve yerler için çevrimdışı arama (POIs)↵ →→- Kısa mesafeler için Çevrimdışı yönlendirme (deneysel)↵ →→- Ile otomobil , bisiklet ve yaya modları:↵ →→- İsteğe bağlı otomatik gündüz / gece görünümü anahtarlama↵ →→- İsteğe bağlı hız bağımlı harita yakınlaştırma↵ →→- hareket pusula veya yöne göre isteğe haritası hizalama↵ →→- İsteğe bağlı şerit rehberlik , hız sınırı göstergesi , kaydedilmiş ve TTS sesler↵ ↵ →→OsmAnd bu ücretsiz sürümü Sınırlamaları:↵ →→- Sınırlı harita indirilme sayısı↵ →→- Wikipedia erişim isimli POIs yok↵ ↵ →→OsmAnd aktif gelişmiş ve bizim proje ve daha fazla ilerlemegelişimini finanse etmek için mali katkılar dayanır ve yeni işlevler testdriving ediliyor .Osmand.net üzerinde genel bir bağış OsmAnd satın alma , ya da belirli yeni özellikler fon veya yapmayı düşünün lütfen.↵ → "</string>
+    <string name="osmand_plus_short_description_80_chars">Küresel Mobil Harita Görüntüleme &amp; Yolbul için Çevrim Dışı ve Çevrim İçi OSM Haritaları</string>
+    <string name="osmand_plus_long_description_1000_chars">" OsmAnd   (OSM Automated Gezinti Tarifi) OsmAnd   küresel OpenStreetMap (OSM) veri çok çeşitli erişimi olan bir açık kaynak navigasyon bir uygulamadır. Tüm harita verisi (vektör veya kiremit harita) çevrimdışı kullanım için telefonun hafıza kartında saklanabilir. OsmAnd zamanda turn-by-turn sesli yönlendirme dahil olmak üzere çevrimiçi ve çevrimdışı yönlendirme işlevselliği sunuyor. OsmAnd   Eğer, projeyi destekleyen yeni özellikler geliştirme fonu, ve en son güncellemeleri almak onu satın alarak, ücretli uygulama sürümüdür. Temel özelliklerden bazıları: - Komple çevrimdışı işlevsellik (seçilebilir klasör deposu indirilen vektör veya kiremit harita) - Mevcut tüm dünya için Kompakt çevrimdışı vektör haritaları - doğrudan app ülke veya bölge haritaları Sınırsız indirme - Çevrimdışı Vikipedi özelliği (indir İÇN Wikipedia), gezi için büyük - adresleri ve yerleri (POI) için Çevrimdışı arama - GPX veya navigasyon parçaları, İlgi Çekici Nokta, sık, kontür çizgileri, toplu taşıma durakları, özelleştirilebilir şeffaflık ek haritalar gibi olası birçok harita katmanları Yerleşimi, - - İsteğe bağlı otomatik gündüz / gece görüntüsüyle anahtarlama - yakınlaştırma opsiyonel hız bağımlı haritası - hareket pusula veya yönüne göre opsiyonel harita hizalama - İsteğe bağlı şerit takibi, hız: Otomobil, bisiklet ve yaya ile modları - Kısa mesafelerde (deneysel) için Çevrimdışı yönlendirme sınırı göstergesi kaydedilmeli ve TTS sesleri "</string>
+    <string name="day_night_info_description">Gün doğumu:%1$s
 \nGün batımı:%2$s</string>
-	<string name="map_widget_vector_attributes">Öznitelikleri oluşturma</string>
-	<string name="map_widget_renderer">Harita tarzı</string>
-	
-	
-	<string name="layer_map_appearance">Ekran yapılandırma</string>
-	<string name="show_lanes">Şeritler</string>
-	<string name="avoid_unpaved">Asfaltsız yollardan kaçın</string>
-	<string name="avoid_ferries">Feribotlardan kaçın</string>
-	<string name="avoid_in_routing_title">Kaçın…</string>
-	<string name="avoid_in_routing_descr">Paralı yollardan, asfaltsız yollardan, feribotlardan kaçın</string>
-	<string name="map_widget_fluorescent">Floresan rotalar</string>
-	<string name="map_widget_show_ruler">Cetvel</string>
-	
-	<string name="map_widget_transparent">Şeffaf widget\'lar</string>
-	
-	<string name="gps_wakeup_interval">GPS uyandırma aralığı:%1$s</string>
-	<string name="map_widget_config">Ekranı ayarla</string>
-	<string name="map_widget_parking">Park et</string>
-	<string name="map_widget_altitude">Rakım</string>
-	<string name="map_widget_time">Gitme zamanı</string>
-	<string name="map_widget_next_turn">Sonraki dönüş</string>
-	<string name="map_widget_next_turn_small">Sonraki dönüş (küçük)</string>
-	<string name="map_widget_next_next_turn">İkinci sonraki dönüş</string>
-	<string name="map_widget_mini_route">Mini rota haritası</string>
-	<string name="download_hillshade_maps">Tepe gölgeleri</string>
+    <string name="map_widget_vector_attributes">Öznitelikleri oluşturma</string>
+    <string name="map_widget_renderer">Harita tarzı</string>
+    <string name="layer_map_appearance">Ekran yapılandırma</string>
+    <string name="show_lanes">Şeritler</string>
+    <string name="avoid_unpaved">Asfaltsız yollardan kaçın</string>
+    <string name="avoid_ferries">Feribotlardan kaçın</string>
+    <string name="avoid_in_routing_title">Kaçın…</string>
+    <string name="avoid_in_routing_descr">Paralı yollardan, asfaltsız yollardan, feribotlardan kaçın</string>
+    <string name="map_widget_fluorescent">Floresan rotalar</string>
+    <string name="map_widget_show_ruler">Cetvel</string>
+    <string name="map_widget_transparent">Şeffaf widget\'lar</string>
+    <string name="gps_wakeup_interval">GPS uyandırma aralığı:%1$s</string>
+    <string name="map_widget_config">Ekranı ayarla</string>
+    <string name="map_widget_parking">Park et</string>
+    <string name="map_widget_altitude">Rakım</string>
+    <string name="map_widget_time">Gitme zamanı</string>
+    <string name="map_widget_next_turn">Sonraki dönüş</string>
+    <string name="map_widget_next_turn_small">Sonraki dönüş (küçük)</string>
+    <string name="map_widget_next_next_turn">İkinci sonraki dönüş</string>
+    <string name="map_widget_mini_route">Mini rota haritası</string>
+    <string name="download_hillshade_maps">Tepe gölgeleri</string>
     <string name="email">e-posta</string>
-<string name="osmand_parking_position_description_add_time">Araba şu zamanda park edildi</string>
-	<string name="starting_point_too_far">Başlangıç noktası en yakın yoldan çok uzakta.</string>
-	<string name="osmand_parking_delete_confirm">Arabayı park ettiğiniz konumu silmek istiyor musunuz?</string>
-	<string name="osmand_parking_lim_text">Zaman-sınırlı</string>
-	<string name="osmand_parking_no_lim_text">Zaman-sınırsız</string>
-	<string name="osmand_parking_time_limit">Süresi kısıtlı park</string>
-	<string name="osmand_parking_position_description">Park edilmiş aracınızın konumu: %1$s</string>
-	<string name="context_menu_item_add_parking_point">Park etme konumu olarak işaretle</string>
-	
-	<string name="route_kl">Solda kalın ve devam edin</string>
-	<string name="route_kr">Sağda kalın ve devam edin</string>
-	<string name="rendering_attr_hmRendered_name">Haritayı daha detaylı göster</string>
-	<string name="address_search_desc">Adres arama</string>
-	<string name="favourites_search_desc">Favorileri arama</string>
-	
-	<string name="unknown_from_location">Başlangıç noktası henüz belirtilmedi</string>
-	<string name="unknown_location">Konum henüz bilinmiyor</string>
-	<string name="confirm_interrupt_download">Dosya indirirken iptal etmek istiyor musunuz?</string>
-	<string name="select_index_file_to_download">Hiçbir şey bulunamadı. Eğer bölgenizi bulamıyorsanız, kendiniz yapabilirsiniz (bakınız: http://osmand.net).</string>
-	<string name="local_indexes_cat_map">Standart haritalar (vektör)</string>
-	<string name="shared_string_online_maps">Çevrim içi haritalar</string>
-	
-	
-	<string name="default_buttons_support">Destek</string>
-	<string name="shared_string_help">Yardım</string>
-	
-	<string name="shared_string_on">Açık</string>
-	<string name="shared_string_off">Kapalı</string>
-	<string name="backToMenu">Menüye Geri Dön</string>
-	<string name="zoomOut">Uzaklaştır</string>
-	<string name="zoomIn">Yaklaştır</string>
-	<string name="north">kuzey</string>
-	<string name="i_am_here">Buradayım</string>
-	
-	<string name="poi_context_menu_showdescription">POI açıklaması göster</string>
-	<string name="index_name_europe">Avrupa</string>
-	<string name="index_name_france">Avrupa - Fransa</string>
-	<string name="index_name_germany">Avrupa - Almanya</string>
-	<string name="index_name_africa">Afrika</string>
-	<string name="index_name_asia">Asya</string>
-	<string name="index_name_voice">Sesli uyarılar (kaydedilmiş, kısıtlı özellikler)</string>
-	<string name="index_name_tts_voice">Sesli uyarılar (TTS- yazıdan-sese sentezli, tercih edilen)</string>
-	<string name="amenity_type_osmwiki">Wikipedia (çevrim dışı)</string>
-	<string name="amenity_type_user_defined">Kullanıcı tanımlı</string>
-	<string name="settings_preset">Varsayılan profil</string>
-	<string name="user_password">OSM şifreniz</string>
-	
-	<string name="download_files_not_enough_space">İndirme için yeterli yer yok: %1$s MB (free: %2$s).</string>
-	
-	
-	<string name="animate_route_off">Animasyonu durdur</string>
-	<string name="animate_route">Animasyonu başlat</string>
-	<string name="file_can_not_be_renamed">Dosya yeniden adlandırılamaz.</string>
-	<string name="file_with_name_already_exists">Bu isimli dosya zaten var.</string>
-	<string name="poi_filter_by_name">İsme göre ara</string>
-	<string name="shared_string_rename">Yeniden adlandır</string>
-	
-	<string name="search_position_address">Adres…</string>
-	<string name="search_position_favorites">Favoriler…</string>
-	
-	<string name="file_with_name_already_exist">Aynı isimli dosya zaten var.</string>
-	<string name="shared_string_save">Kaydet</string>
-	<string name="favorite_home_category">Ev</string>
-	<string name="favorite_friends_category">Arkadaşlar</string>
-	<string name="favorite_places_category">Yerler</string>
-	
-	<string name="shared_string_name">Ad</string>
-	<string name="favourites_edit_dialog_category">Kategori</string>
-	<string name="shared_string_no_thanks">Hayır, teşekkürler</string>
-	
-	
-	<string name="shared_string_download">İndir</string>
-	<string name="search_offline_clear_search">Yeni Arama</string>
-	<string name="map_text_size_descr">Haritadaki yer adları için yazı boyutunu seçin</string>
-	<string name="map_text_size">Harita yazı karakteri boyutu</string>
-	
-	
-	
-	<string name="tts_language_not_supported_title">Dil desteklenmemektedir</string>
-	<string name="tts_missing_language_data_title">Kayıp data</string>
-	<string name="tile_source_already_installed">Harita zaten yüklenmiş, Ayarlar güncellenecek</string>
-	<string name="error_doing_search">Çevrim dışı aramada hata oluştu</string>
-	<string name="search_osm_offline">Coğrafi konum ara</string>
-	<string name="system_locale">Sistem</string>
-	<string name="preferred_locale_descr">Ekran dilini seç (değiştirdikten sonra lütfen OsmAnd\'ı yeniden başlatın)</string>
-	<string name="preferred_locale">Ekran dili</string>
-	<string name="incomplete_locale">Tamamlanmamış</string>
-	
-	
-	
-	
-	
-	<string name="shared_string_next">Sonraki</string>
-	<string name="shared_string_previous">Önceki</string>
-	<string name="unit_of_length_descr">Uzunluk ve hız birimlerini değiştir</string>
-	<string name="si_km_m">Kilometre/metre</string>
-	<string name="amenity_type_education">Eğitim</string>
-	<string name="amenity_type_emergency">Acil durum</string>
-	<string name="amenity_type_entertainment">Eğlence</string>
-	<string name="amenity_type_finance">Finans</string>
-	<string name="amenity_type_healthcare">Sağlık</string>
-	<string name="amenity_type_other">Diğer</string>
-	<string name="voice_is_not_available_title">Sesli yönlendirme seçilmedi</string>
-	<string name="daynight_mode_day">Gündüz</string>
-	<string name="daynight_mode_night">Gece</string>
-	<string name="daynight_mode_auto">Gündoğumu/günbatımı</string>
-	<string name="daynight">Gündüz/gece modu</string>
-	<string name="shared_string_select_all">Hepsini seç</string>
-	<string name="shared_string_refresh">Yenile</string>
-	<string name="fast_route_mode">En hızlı rota</string>
-	<string name="shared_string_download_map">Harita indir</string>
-	<string name="maps_could_not_be_downloaded">Bu harita indirilemedi</string>
-	<string name="phone">Telefon</string>
-	<string name="use_high_res_maps">Yüksek çözünürlüklü ekran</string>
-	
-	
-	
-	<string name="voice">Kaydedilen Ses</string>
-	<string name="no_vector_map_loaded">Vektör haritalar yüklenmedi</string>
-	<string name="vector_data">Çevrim dışı vektör haritaları</string>
-	
-	<string name="poi_context_menu_delete">POI sil</string>
-	<string name="fav_saved_sucessfully">Favoriler şuraya başarıyla kaydedildi: {0}</string>
-	<string name="no_fav_to_save">Kaydedecek favori noktalar yok</string>
-	<string name="send_report">Rapor gönder</string>
-	<string name="any_poi">Herhangi</string>
-	<string name="layer_yandex_traffic">Yandex Trafik</string>
-	<string name="layer_route">Rota</string>
-	<string name="shared_string_favorites">Favoriler</string>
-	<string name="layer_map">Harita kaynağı…</string>
-	<string name="context_menu_item_search_poi">POI Ara</string>
-	<string name="where_am_i">Neredeyim?</string>
-	<string name="process_navigation_service">OsmAnd yolbul hizmeti</string>
-	<string name="network_provider">Ağ</string>
-	<string name="int_seconds">saniyeler</string>
-	<string name="int_min">dk.</string>
-	<string name="menu_mute_off">Ses açık</string>
-	<string name="menu_mute_on">Ses kapalı</string>
-	<string name="unzipping_file">Dosya çıkarılıyor…</string>
-	<string name="route_tr">Sağa dönün ve ilerleyin</string>
-	<string name="route_tshr">Sağa keskince dönün ve ilerleyin</string>
-	<string name="route_tslr">Sağa hafifçe dönün ve ilerleyin</string>
-	<string name="route_tl">Sola dönün ve ilerleyin</string>
-	<string name="route_tshl">Sola keskince dönün ve ilerleyin</string>
-	<string name="route_tsll">Sola hafifçe dönün ve ilerleyin</string>
-	<string name="route_tu">U dönüşü yapın ve ilerleyin</string>
-	<string name="first_time_continue">Sonra</string>
-	<string name="search_poi_location">Sinyal aranıyor…</string>
-	<string name="transport_Routes">Rotalar</string>
-	<string name="shared_string_ok">Ok</string>
-	<string name="shared_string_clear_all">Hepsini temizle</string>
-	<string name="searching">Aranıyor…</string>
-	<string name="searching_address">Adres aranıyor…</string>
-	<string name="search_online_address">İnternet</string>
-	<string name="router_service">Yolbul hizmeti</string>
-	<string name="address">Adres</string>
-	<string name="shared_string_download_successful">İndirildi</string>
-	
-	
-	
-	
-	<string name="loading_poi_obj">İÇN yükleniyor…</string>
-	<string name="failed_op">başarısız</string>
-	<string name="loading_postcodes">Posta kodları yükleniyor…</string>
-	<string name="loading_cities">Şehirler yükleniyor…</string>
-	
-	<string name="arrived_at_destination">Varış noktasına ulaştınız</string>
-	<string name="invalid_locations">Geçersiz koordinatlar</string>
-	<string name="go_back_to_osmand">OsmAnd haritalara geri dön</string>
-	<string name="shared_string_close">Kapat</string>
-	<string name="loading_data">Veri yükleniyor…</string>
-	<string name="finished_task">Tamamlandı</string>
-	
-	
-	
-	
-	<string name="use_online_routing_descr">Rotayı hesaplamak için interneti kullanın.</string>
-	<string name="use_online_routing">Çevrim içi yolbulu kullan</string>
-	<string name="data_settings">Veriler</string>
-	<string name="additional_settings">İlave ayarlar</string>
-	<string name="shared_string_settings">Ayarlar</string>
-	<string name="update_tile">Haritayı güncelle</string>
-	<string name="mark_point">"Hedef "</string>
-	
-	<string name="shared_string_add_to_favorites">Favorilere ekle</string>
-	<string name="use_english_names">Haritalarda ingilizce yer adlarını kullan</string>
-	<string name="map_view_3d_descr">3D harita görünümünü etkinleştir</string>
-	<string name="show_poi_over_map">POI göster</string>
-	<string name="map_source">Harita kaynağı</string>
-	<string name="use_internet">İnterneti kullan</string>
-	<string name="show_location">Pozisyonunuzu göster</string>
-	
-	
-	<string name="shared_string_exit">Çıkış</string>
-	
-	
-	
-	<string name="search_button">Ara</string>
-	<string name="search_activity">Ara</string>
-	<string name="searchpoi_activity">POI seç</string>
-	<string name="search_POI_level_btn">Daha fazla bul</string>
-	<string name="app_mode_default">Varsayılan</string>
-	<string name="app_mode_car">Araba</string>
-	<string name="app_mode_bicycle">Bisiklet</string>
-	<string name="app_mode_pedestrian">Yaya</string>
-	<string name="position_on_map_center">Merkez</string>
-	<string name="shared_string_show_on_map">Haritada göster</string>
-	
-	<string name="search_address_top_text">Adres seç</string>
-	
-	
-	<string name="context_menu_item_update_map">Haritayı güncelle</string>
-	<string name="context_menu_item_create_poi">POI oluştur</string>
-	<string name="shared_string_yes">Evet</string>
-	<string name="shared_string_cancel">İptal</string>
-	<string name="shared_string_apply">Uygula</string>
-	<string name="shared_string_add">Ekle</string>
-	<string name="shared_string_no">Hayır</string>
-	<string name="add_favorite_dialog_default_favourite_name">Favori</string>
-	<string name="favourites_context_menu_delete">Favoriyi sil</string>
-	
-	
-	<string name="osb_comment_dialog_message">Mesaj</string>
-	<string name="osb_comment_dialog_author">Yazar adı</string>
-	
-	<string name="osb_comment_dialog_success">Yorum başarıyla eklendi</string>
-	<string name="osb_comment_dialog_error">İstisnai durum oluştu: yorum eklenemedi</string>
-	
-	<string name="poi_edit_title">POI düzenle</string>
-	<string name="poi_create_title">POI oluştur</string>
-	<string name="poi_remove_title">POI sil</string>
-	<string name="shared_string_delete">Sil</string>
-	<string name="poi_remove_success">POI başarıyla silindi</string>
-	<string name="poi_action_add">ekle</string>
-	<string name="poi_action_change">değiştir</string>
-	<string name="poi_dialog_opening_hours">Aç</string>
-	<string name="poi_dialog_comment">Yorum</string>
-	
-	<string name="edit_filter_save_as_menu_item">Farklı kaydet</string>
-	
-	<string name="asap">ACİL</string>
-	<string name="recording_context_menu_play">Oynat</string>
+    <string name="osmand_parking_position_description_add_time">Araba şu zamanda park edildi</string>
+    <string name="starting_point_too_far">Başlangıç noktası en yakın yoldan çok uzakta.</string>
+    <string name="osmand_parking_delete_confirm">Arabayı park ettiğiniz konumu silmek istiyor musunuz?</string>
+    <string name="osmand_parking_lim_text">Zaman-sınırlı</string>
+    <string name="osmand_parking_no_lim_text">Zaman-sınırsız</string>
+    <string name="osmand_parking_time_limit">Süresi kısıtlı park</string>
+    <string name="osmand_parking_position_description">Park edilmiş aracınızın konumu: %1$s</string>
+    <string name="context_menu_item_add_parking_point">Park etme konumu olarak işaretle</string>
+    <string name="route_kl">Solda kalın ve devam edin</string>
+    <string name="route_kr">Sağda kalın ve devam edin</string>
+    <string name="rendering_attr_hmRendered_name">Haritayı daha detaylı göster</string>
+    <string name="address_search_desc">Adres arama</string>
+    <string name="favourites_search_desc">Favorileri arama</string>
+    <string name="unknown_from_location">Başlangıç noktası henüz belirtilmedi</string>
+    <string name="unknown_location">Konum henüz bilinmiyor</string>
+    <string name="confirm_interrupt_download">Dosya indirirken iptal etmek istiyor musunuz?</string>
+    <string name="select_index_file_to_download">Hiçbir şey bulunamadı. Eğer bölgenizi bulamıyorsanız, kendiniz yapabilirsiniz (bakınız: http://osmand.net).</string>
+    <string name="local_indexes_cat_map">Standart haritalar (vektör)</string>
+    <string name="shared_string_online_maps">Çevrim içi haritalar</string>
+    <string name="default_buttons_support">Destek</string>
+    <string name="shared_string_help">Yardım</string>
+    <string name="shared_string_on">Açık</string>
+    <string name="shared_string_off">Kapalı</string>
+    <string name="backToMenu">Menüye Geri Dön</string>
+    <string name="zoomOut">Uzaklaştır</string>
+    <string name="zoomIn">Yaklaştır</string>
+    <string name="north">kuzey</string>
+    <string name="i_am_here">Buradayım</string>
+    <string name="poi_context_menu_showdescription">POI açıklaması göster</string>
+    <string name="index_name_europe">Avrupa</string>
+    <string name="index_name_france">Avrupa - Fransa</string>
+    <string name="index_name_germany">Avrupa - Almanya</string>
+    <string name="index_name_africa">Afrika</string>
+    <string name="index_name_asia">Asya</string>
+    <string name="index_name_voice">Sesli uyarılar (kaydedilmiş, kısıtlı özellikler)</string>
+    <string name="index_name_tts_voice">Sesli uyarılar (TTS- yazıdan-sese sentezli, tercih edilen)</string>
+    <string name="amenity_type_osmwiki">Wikipedia (çevrim dışı)</string>
+    <string name="amenity_type_user_defined">Kullanıcı tanımlı</string>
+    <string name="settings_preset">Varsayılan profil</string>
+    <string name="user_password">OSM şifreniz</string>
+    <string name="download_files_not_enough_space">İndirme için yeterli yer yok: %1$s MB (free: %2$s).</string>
+    <string name="animate_route_off">Animasyonu durdur</string>
+    <string name="animate_route">Animasyonu başlat</string>
+    <string name="file_can_not_be_renamed">Dosya yeniden adlandırılamaz.</string>
+    <string name="file_with_name_already_exists">Bu isimli dosya zaten var.</string>
+    <string name="poi_filter_by_name">İsme göre ara</string>
+    <string name="shared_string_rename">Yeniden adlandır</string>
+    <string name="search_position_address">Adres…</string>
+    <string name="search_position_favorites">Favoriler…</string>
+    <string name="file_with_name_already_exist">Aynı isimli dosya zaten var.</string>
+    <string name="shared_string_save">Kaydet</string>
+    <string name="favorite_home_category">Ev</string>
+    <string name="favorite_friends_category">Arkadaşlar</string>
+    <string name="favorite_places_category">Yerler</string>
+    <string name="shared_string_name">Ad</string>
+    <string name="favourites_edit_dialog_category">Kategori</string>
+    <string name="shared_string_no_thanks">Hayır, teşekkürler</string>
+    <string name="shared_string_download">İndir</string>
+    <string name="search_offline_clear_search">Yeni Arama</string>
+    <string name="map_text_size_descr">Haritadaki yer adları için yazı boyutunu seçin</string>
+    <string name="map_text_size">Harita yazı karakteri boyutu</string>
+    <string name="tts_language_not_supported_title">Dil desteklenmemektedir</string>
+    <string name="tts_missing_language_data_title">Kayıp data</string>
+    <string name="tile_source_already_installed">Harita zaten yüklenmiş, Ayarlar güncellenecek</string>
+    <string name="error_doing_search">Çevrim dışı aramada hata oluştu</string>
+    <string name="search_osm_offline">Coğrafi konum ara</string>
+    <string name="system_locale">Sistem</string>
+    <string name="preferred_locale_descr">Ekran dilini seç (değiştirdikten sonra lütfen OsmAnd\'ı yeniden başlatın)</string>
+    <string name="preferred_locale">Ekran dili</string>
+    <string name="incomplete_locale">Tamamlanmamış</string>
+    <string name="shared_string_next">Sonraki</string>
+    <string name="shared_string_previous">Önceki</string>
+    <string name="unit_of_length_descr">Uzunluk ve hız birimlerini değiştir</string>
+    <string name="si_km_m">Kilometre/metre</string>
+    <string name="amenity_type_education">Eğitim</string>
+    <string name="amenity_type_emergency">Acil durum</string>
+    <string name="amenity_type_entertainment">Eğlence</string>
+    <string name="amenity_type_finance">Finans</string>
+    <string name="amenity_type_healthcare">Sağlık</string>
+    <string name="amenity_type_other">Diğer</string>
+    <string name="voice_is_not_available_title">Sesli yönlendirme seçilmedi</string>
+    <string name="daynight_mode_day">Gündüz</string>
+    <string name="daynight_mode_night">Gece</string>
+    <string name="daynight_mode_auto">Gündoğumu/günbatımı</string>
+    <string name="daynight">Gündüz/gece modu</string>
+    <string name="shared_string_select_all">Hepsini seç</string>
+    <string name="shared_string_refresh">Yenile</string>
+    <string name="fast_route_mode">En hızlı rota</string>
+    <string name="shared_string_download_map">Harita indir</string>
+    <string name="maps_could_not_be_downloaded">Bu harita indirilemedi</string>
+    <string name="phone">Telefon</string>
+    <string name="use_high_res_maps">Yüksek çözünürlüklü ekran</string>
+    <string name="voice">Kaydedilen Ses</string>
+    <string name="no_vector_map_loaded">Vektör haritalar yüklenmedi</string>
+    <string name="vector_data">Çevrim dışı vektör haritaları</string>
+    <string name="poi_context_menu_delete">POI sil</string>
+    <string name="fav_saved_sucessfully">Favoriler şuraya başarıyla kaydedildi: {0}</string>
+    <string name="no_fav_to_save">Kaydedecek favori noktalar yok</string>
+    <string name="send_report">Rapor gönder</string>
+    <string name="any_poi">Herhangi</string>
+    <string name="layer_yandex_traffic">Yandex Trafik</string>
+    <string name="layer_route">Rota</string>
+    <string name="shared_string_favorites">Favoriler</string>
+    <string name="layer_map">Harita kaynağı…</string>
+    <string name="context_menu_item_search_poi">POI Ara</string>
+    <string name="where_am_i">Neredeyim?</string>
+    <string name="process_navigation_service">OsmAnd yolbul hizmeti</string>
+    <string name="network_provider">Ağ</string>
+    <string name="int_seconds">saniyeler</string>
+    <string name="int_min">dk.</string>
+    <string name="menu_mute_off">Ses açık</string>
+    <string name="menu_mute_on">Ses kapalı</string>
+    <string name="unzipping_file">Dosya çıkarılıyor…</string>
+    <string name="route_tr">Sağa dönün ve ilerleyin</string>
+    <string name="route_tshr">Sağa keskince dönün ve ilerleyin</string>
+    <string name="route_tslr">Sağa hafifçe dönün ve ilerleyin</string>
+    <string name="route_tl">Sola dönün ve ilerleyin</string>
+    <string name="route_tshl">Sola keskince dönün ve ilerleyin</string>
+    <string name="route_tsll">Sola hafifçe dönün ve ilerleyin</string>
+    <string name="route_tu">U dönüşü yapın ve ilerleyin</string>
+    <string name="first_time_continue">Sonra</string>
+    <string name="search_poi_location">Sinyal aranıyor…</string>
+    <string name="transport_Routes">Rotalar</string>
+    <string name="shared_string_ok">Ok</string>
+    <string name="shared_string_clear_all">Hepsini temizle</string>
+    <string name="searching">Aranıyor…</string>
+    <string name="searching_address">Adres aranıyor…</string>
+    <string name="search_online_address">İnternet</string>
+    <string name="router_service">Yolbul hizmeti</string>
+    <string name="address">Adres</string>
+    <string name="shared_string_download_successful">İndirildi</string>
+    <string name="loading_poi_obj">İÇN yükleniyor…</string>
+    <string name="failed_op">başarısız</string>
+    <string name="loading_postcodes">Posta kodları yükleniyor…</string>
+    <string name="loading_cities">Şehirler yükleniyor…</string>
+    <string name="arrived_at_destination">Varış noktasına ulaştınız</string>
+    <string name="invalid_locations">Geçersiz koordinatlar</string>
+    <string name="go_back_to_osmand">OsmAnd haritalara geri dön</string>
+    <string name="shared_string_close">Kapat</string>
+    <string name="loading_data">Veri yükleniyor…</string>
+    <string name="finished_task">Tamamlandı</string>
+    <string name="use_online_routing_descr">Rotayı hesaplamak için interneti kullanın.</string>
+    <string name="use_online_routing">Çevrim içi yolbulu kullan</string>
+    <string name="data_settings">Veriler</string>
+    <string name="additional_settings">İlave ayarlar</string>
+    <string name="shared_string_settings">Ayarlar</string>
+    <string name="update_tile">Haritayı güncelle</string>
+    <string name="mark_point">"Hedef "</string>
+    <string name="shared_string_add_to_favorites">Favorilere ekle</string>
+    <string name="use_english_names">Haritalarda ingilizce yer adlarını kullan</string>
+    <string name="map_view_3d_descr">3D harita görünümünü etkinleştir</string>
+    <string name="show_poi_over_map">POI göster</string>
+    <string name="map_source">Harita kaynağı</string>
+    <string name="use_internet">İnterneti kullan</string>
+    <string name="show_location">Pozisyonunuzu göster</string>
+    <string name="shared_string_exit">Çıkış</string>
+    <string name="search_button">Ara</string>
+    <string name="search_activity">Ara</string>
+    <string name="searchpoi_activity">POI seç</string>
+    <string name="search_POI_level_btn">Daha fazla bul</string>
+    <string name="app_mode_default">Varsayılan</string>
+    <string name="app_mode_car">Araba</string>
+    <string name="app_mode_bicycle">Bisiklet</string>
+    <string name="app_mode_pedestrian">Yaya</string>
+    <string name="position_on_map_center">Merkez</string>
+    <string name="shared_string_show_on_map">Haritada göster</string>
+    <string name="search_address_top_text">Adres seç</string>
+    <string name="context_menu_item_update_map">Haritayı güncelle</string>
+    <string name="context_menu_item_create_poi">POI oluştur</string>
+    <string name="shared_string_yes">Evet</string>
+    <string name="shared_string_cancel">İptal</string>
+    <string name="shared_string_apply">Uygula</string>
+    <string name="shared_string_add">Ekle</string>
+    <string name="shared_string_no">Hayır</string>
+    <string name="add_favorite_dialog_default_favourite_name">Favori</string>
+    <string name="favourites_context_menu_delete">Favoriyi sil</string>
+    <string name="osb_comment_dialog_message">Mesaj</string>
+    <string name="osb_comment_dialog_author">Yazar adı</string>
+    <string name="osb_comment_dialog_success">Yorum başarıyla eklendi</string>
+    <string name="osb_comment_dialog_error">İstisnai durum oluştu: yorum eklenemedi</string>
+    <string name="poi_edit_title">POI düzenle</string>
+    <string name="poi_create_title">POI oluştur</string>
+    <string name="poi_remove_title">POI sil</string>
+    <string name="shared_string_delete">Sil</string>
+    <string name="poi_remove_success">POI başarıyla silindi</string>
+    <string name="poi_action_add">ekle</string>
+    <string name="poi_action_change">değiştir</string>
+    <string name="poi_dialog_opening_hours">Aç</string>
+    <string name="poi_dialog_comment">Yorum</string>
+    <string name="edit_filter_save_as_menu_item">Farklı kaydet</string>
+    <string name="asap">ACİL</string>
+    <string name="recording_context_menu_play">Oynat</string>
     <string name="bg_service_interval">Uyandırma aralığı ayarlayın:</string>
-	<string name="continue_follow_previous_route_auto">Önceki navigasyon bitmemiş. Onu izlemeye devam et? (%1$s saniye)</string>
-	<string name="route_updated_loc_found">Pozisyon bulundu sonra rota hesaplanacak</string>
-	
-	<string name="select_animate_speedup">Rota hızlanma animasyonu seçin</string>
-    	<string name="global_app_allocated_memory_descr">Ayrılan bellek %1$s MB(Android sınırı %2$s MB, Dalvik %3$s MB).</string>
-	<string name="native_app_allocated_memory_descr">Uygulaması tarafından ayrılan toplam yerel bellek %1$s MB (Dalvik %2$s MB, diğer %3$s MB. tarafından tahsis. Orantılı bellek %4$s MB (Android limiti %5$s MB, Dalvik %6$s MB).</string>
-	<string name="shared_location">Paylaşılan konum</string>
-	<string name="osmand_parking_event">Park yerinden arabayı almak</string>
-	<string name="osmand_parking_warning_text">Aracını almak için Bildirim önceden takvimine eklendi.Onu elden silinceye kadar orada kalacaktır.</string>    
-	<string name="osmand_parking_time_limit_title">Park etme süre sınırı ayarla</string>
-	<string name="osmand_parking_delete">Bir park etme işareti sil</string>
-	<string name="osmand_parking_choose_type">Park etme türü seç</string>
-	<string name="osmand_parking_time_no_limit">Zaman-sınırsız park et</string>
-	<string name="osmand_parking_position_description_add">De arabayı almak için:</string>
-	<string name="osmand_parking_plugin_description">Park yeri konumu eklentisi arabanızın nerede park edildiğini ve (eğer zaman limiti varsa) ne kadar park süresi kaldığını hatırlamanızı sağlar. 
+    <string name="continue_follow_previous_route_auto">Önceki navigasyon bitmemiş. Onu izlemeye devam et? (%1$s saniye)</string>
+    <string name="route_updated_loc_found">Pozisyon bulundu sonra rota hesaplanacak</string>
+    <string name="select_animate_speedup">Rota hızlanma animasyonu seçin</string>
+    <string name="global_app_allocated_memory_descr">Ayrılan bellek %1$s MB(Android sınırı %2$s MB, Dalvik %3$s MB).</string>
+    <string name="native_app_allocated_memory_descr">Uygulaması tarafından ayrılan toplam yerel bellek %1$s MB (Dalvik %2$s MB, diğer %3$s MB. tarafından tahsis. Orantılı bellek %4$s MB (Android limiti %5$s MB, Dalvik %6$s MB).</string>
+    <string name="shared_location">Paylaşılan konum</string>
+    <string name="osmand_parking_event">Park yerinden arabayı almak</string>
+    <string name="osmand_parking_warning_text">Aracını almak için Bildirim önceden takvimine eklendi.Onu elden silinceye kadar orada kalacaktır.</string>
+    <string name="osmand_parking_time_limit_title">Park etme süre sınırı ayarla</string>
+    <string name="osmand_parking_delete">Bir park etme işareti sil</string>
+    <string name="osmand_parking_choose_type">Park etme türü seç</string>
+    <string name="osmand_parking_time_no_limit">Zaman-sınırsız park et</string>
+    <string name="osmand_parking_position_description_add">De arabayı almak için:</string>
+    <string name="osmand_parking_plugin_description">Park yeri konumu eklentisi arabanızın nerede park edildiğini ve (eğer zaman limiti varsa) ne kadar park süresi kaldığını hatırlamanızı sağlar. 
 \n
 \nPark konumu ve park süresi OsmAnd kontrol panelinde ve harita ekranındaki widget ta görüntülenir. Android takvimine hatırlatıcı olarak bir alarm eklenebilir.</string>
-	<string name="osmand_parking_plugin_name">Park Etme Konumu</string>
-	<string name="context_menu_item_delete_parking_point">Bir park etme işareti sil</string>
-	<string name="gpxup_public">Halk</string>
-	<string name="gpxup_identifiable">Teşhis edilebilir</string>
-	<string name="gpxup_trackable">Takip edilebilir</string>
-	<string name="gpxup_private">Özel</string>
-	<string name="route_roundabout">Yaklaşık yuvarlak olarak: al %1$d çık ve git</string>
-	<string name="rendering_attr_noPolygons_description">Haritadaki tüm alansal arazi özelliklerini şeffaf Yap</string>
-	<string name="rendering_attr_noPolygons_name"/>
-	<string name="rendering_attr_appMode_name">işleme modu</string>
-	<string name="rendering_attr_appMode_description">Için haritayı optimize et</string>
-	<string name="rendering_attr_contourLines_description">Yakınlaştırma düzeyindenekran(gerektirir kontur veriler):</string>
-	<string name="rendering_attr_contourLines_name">Çevre çizgileri göster</string>
-	<string name="rendering_attr_hmRendered_description">Haritanın gösterilen detay miktarını artırın.</string>
-	<string name="local_index_routing_data">Rota edilen veri</string>
-	<string name="navigate_point_format">Biçim</string>
-	<string name="poi_search_desc">İÇN (İhtiyaç Noktası) arama</string>
-	<string name="navpoint_search_desc">Koordinatlar</string>
-	<string name="transport_search_desc">Toplu taşıma arama</string>
-	<string name="offline_navigation_not_available">OsmAnd çevrim dışı yolbul geçici olarak kullanılamıyor.</string>
-	<string name="left_side_navigation">Soldan-direksiyonlu araç sürüşü</string>
-	<string name="left_side_navigation_descr">Sol taraftan akan trafiğe sahip ülkeler için seçin</string>
-	
-	<string name="modify_transparency">"Şeffaflık değiştir(0 -Şeffaf,255-opak) "</string>
-	<string name="first_time_msg">OsmAnd kullandığınız için teşekkür ederiz. Bu uygulamanın bir çok özelliği için \'Ayarlar\' → \'Veri Yönetimi\' kısmından edinebileceğiniz bölgesel çevrim dışı veriye ihtiyacınız var. Daha sonra haritaları görebilir, adres bulabilir, POI (İhtiyaç Noktalarına) bakabilir ve toplu taşıma bulabilirsiniz.</string>    
-	<string name="basemap_was_selected_to_download">Baz haritası doğru uygulama çalışması için gereklidir ve indirmek için seçildi.</string>
-	<string name="local_indexes_cat_tile">Çevrim içi ve önbelleğe alınan döşeme haritalar</string>
-	
-	<string name="index_settings_descr">Aygıtınızda saklanan çevrim dışı harita dosyaları yönet ve indir</string>
-	<string name="map_online_plugin_is_not_installed">Farklı harita kaynaklarını seçmek için Online haritalar eklentisi etkinleştirme</string>
-	<string name="map_online_data">Çevrimiçi ve çini harita</string>
-	<string name="map_online_data_descr">Çevrimiçi haritalar kullan (SD kart üzerine indirme ve önbellek verisi)</string>
-	<string name="online_map_settings_descr">Çevrimiçi veya önbelleğe alınmış çini harita kaynaklarını yapılandırın</string>
-	
-	<string name="osmand_rastermaps_plugin_description">"Bu eklenti ile bir çok çevirimiçi (karo ya da raster) haritaya erişebilirsiniz, önceden tanımlanmış Openstreetmap karolarından (Mapnik gibi) uydu görüntülerine, hava haritaları gibi özel amaçlı katmanları, iklim haritaları, jeolojik haritalar, tepe katmanları, vb\n\nHerhangi bir harita ana (taban) olarak kullanılabilir ve OsmAnd ana harita ekranında gösterilir, veya başka bir ana haritaya üstlük, ya da altlık olabilir (normal OsmAnd çevrimdışı haritalar gibi). Herhangi bir altlık haritayı daha görünür yapmak, veya istediğiniz unsurları gizlemek için ‘Haritayı yapılandır’ bölümünden seçilebilir.\n\nKaro haritalar doğrudan çevrimiçi edinilebilir, veya çevrimdışı kullanmak için sqlite veritabanı üçüncü parti harita hazırlama araçları ile oluşturup hazırlanabilir (OsmAnd klasörüne elle kopyalamak gerekir). "</string>
-	<string name="osmand_accessibility_description">Bu eklenti Osmand doğrudan cihazın erişilebilirlik özellikleri kullanılabilir hale getirir. Bu, örneğin kolaylaştırır TTS sesler konuşma hızını, yön-pad ekran navigasyon yapılandırmak yakınlaştırma kontrolü için bir topunu kullanarak, ya da konumunu duyuran oto için olduğu gibi, text-to-speech geribildirim kullanarak ayarlama.</string>
-	
-	
-	<string name="osmand_development_plugin_description">Bu eklenti geliştirme ve hata ayıklama özellikleri için ayarları test etmek ya da isteyen yönlendirme, ekran render performansı veya ses simüle etmek istiyorum gösterir. Bu ayarlar geliştiriciler için tasarlanmıştır ve genel kullanıcı için gerekli değildir.</string>
-	<string name="plugins_screen">Eklentiler</string>
-	
-	<string name="prefs_plugins_descr">Eklentiler gelişmiş ayarları ve ek işlevselliği etkinleştirir.</string>
-	<string name="prefs_plugins">Eklentiler</string>
-	
-	<string name="osm_editing_plugin_description">Bu eklenti Osmand aracılığıyla oluşturma veya değiştirme OSM POI nesneleri açma veya OSM hataları yorumlama ve kaydedilen GPX dosyaları katkıda gibi OSM katkıda bulunmak için kullanılabilir. OSM bir topluluk odaklı, küresel kamu malı haritalama projesidir. Detaylar için https://openstreetmap.org başvurun. Aktif katılım takdir ve app kişisel OSM kimlik belirtirseniz katkıları, Osmand doğrudan yapılabilir.</string>
-	<string name="vector_maps_may_display_faster_on_some_devices">Vektörel haritalar daha hızlı görüntülenir. Bazı aygıtlarda düzgün çalışmayabilir.</string>
-	<string name="play_commands_of_currently_selected_voice">Seçili ses komutları oynat</string>
-	<string name="debugging_and_development">OsmAnd gelişimi</string>
-	<string name="native_rendering">Yerel render etme</string>
-	<string name="test_voice_prompts">Sesli uyarıları dene</string>    
-	<string name="switch_to_raster_map_to_see">Bu konum için mevcut çevrim dışı vektör haritası yok. Ayarlar biri (harita dosyalarını yönetme) indirmek veya çevrimiçi haritalar (bunun için eklentisi çevrimiçi haritalar etkinleştirmek) geçiş yapabilirsiniz.</string>
-	
-	<string name="send_files_to_osm">GPX dosyalarını OSM ye gönder?</string>
-	<string name="gpx_visibility_txt">Görünürlük</string>
-	<string name="gpx_tags_txt">Etiketler</string>
-	<string name="shared_string_description">Tanım</string>
-	<string name="validate_gpx_upload_name_pwd">OSM kullanıcı adı ve GPX dosyaları yüklemek için şifre belirtin.</string>
-    	<string name="support_new_features">Yeni özellikler Destekle</string>
-	<string name="support_new_features_descr">Uygulamada uygulanan yeni özellikleri görmek için bağış yap</string>
-	<string name="show_ruler_level">Ekran cetveli</string>	
-	<string name="info_button">Bilgi</string>
-	<string name="back_to_location">Konuma geri dön</string>
-	<string name="accessibility_mode">Erişilebilirlik modu</string>
-	<string name="accessibility_mode_descr">Erişilebilirlik özelliklerine dön</string>
-	<string name="accessibility_default">Global sistem ayarına göre</string>
-	<string name="zoomIs">Yakınlaştırma düzeyi</string>
-	<string name="north_north_east">kuzey-kuzey-doğu</string>
-	<string name="north_east">kuzey-doğu</string>
-	<string name="east_north_east">doğu-kuzey-doğu</string>
-	<string name="east">doğu</string>
-	<string name="east_south_east">doğu-güney-doğu</string>
-	<string name="south_east">güney-doğu</string>
-	<string name="south_south_east">güney-güney-doğu</string>
-	<string name="south">güney</string>
-	<string name="south_south_west">güney-güney-batı</string>
-	<string name="south_west">güney-batı</string>
-	<string name="west_south_west">batı-güney-batı</string>
-	<string name="west">batı</string>
-	<string name="west_north_west">batı-kuzey-batı</string>
-	<string name="north_west">kuzey-batı</string>
-	<string name="north_north_west">kuzey-kuzey-batı</string>
-	<string name="front">İleri</string>
-	<string name="front_right">Sağ ileri</string>
-	<string name="right">sağa</string>
-	<string name="back_right">Sağ geriye</string>
-	<string name="back">Geriye</string>
-	<string name="back_left">Sol-geri</string>
-	<string name="left">solda</string>
-	<string name="front_left">Sol ileri</string>
-	<string name="oclock">saat</string>
-	<string name="towards">karşı</string>
-	<string name="accuracy">Doğruluk</string>
-	<string name="altitude">Rakım</string>
-	<string name="no_info">Bilgi yok</string>
-	<string name="direction_style_sidewise">Yandaki akıllı (8 sektör)</string>
-	<string name="direction_style_clockwise">Saat Yönünde (12 sektör)</string>
-	<string name="settings_direction_style">Yön stili</string>
-	<string name="settings_direction_style_descr">Hareket ederken göreceli yönleri ifade etmek için bir stil seçin</string>
-	<string name="auto_announce_on">Duyuruyu otomatik başlat</string>
-	<string name="auto_announce_off">Duyuruyu otomatik durdur</string>
-	<string name="zoom_by_trackball_descr">Yatay topunu hamle ile yakınlaştırarak haritayı değiştirme</string>
-	<string name="zoom_by_trackball">Zoom kontrolü için topunu kullan</string>
-	<string name="accessibility_preferences_descr">Erişilebilirlik ile ilgili tercihler</string>
-	<string name="shared_string_accessibility">Erişilebilirlik</string>
-	<string name="rendering_out_of_memory">Seçilen alanı görüntülemek için işlem belleği yeterli değil</string>
-	<string name="use_fluorescent_overlays">Floresan bindirmeleri</string>
-	<string name="use_fluorescent_overlays_descr">Parkur ve güzergah görüntülemek için floresan renkler kullan</string>
-	<string name="offline_edition">Çevrim dışı düzenleme</string>
-	<string name="offline_edition_descr">Her zaman çevrim dışı düzenlemeyi kullan</string>
-	
-	<string name="update_poi_does_not_change_indexes">Uygulama içinde POI değişiklikleri indirilen harita dosyaları etkilemez, bunun yerine yerel bir dosyaya kaydedilir.</string>
-	<string name="local_openstreetmap_uploading">Yükleniyor …</string>
-	<string name="local_openstreetmap_were_uploaded">{0} POI / Notlar yüklendi</string>
-	<string name="local_openstreetmap_uploadall">tümünü yükle</string>
-	<string name="local_openstreetmap_upload">OSM modifikasyonu yükle</string>
-	<string name="local_openstreetmap_delete">modifikasyonu sil</string>
-	<string name="local_openstreetmap_descr_title">Asenkron OSM düzenleme:</string>
-	<string name="local_openstreetmap_settings">Yerel OSM POIler / Notlar kurtardı</string>
-	<string name="local_openstreetmap_settings_descr">Yerel veritabanında belirtilmiş POIler/Hataları OSMde gösterme ve yönetme</string>
-	
-	
-	<string name="live_monitoring_interval_descr">Canlı izleme aralığı belirtin</string>
-	<string name="live_monitoring_interval">Canlı izleme aralığı</string>
-	<string name="live_monitoring_url_descr">"Parametre sözdizimi ile web adresini belirtin: Enlem={0}, Boylam={1}, Damga zamanı={2}, HDOP={3}, Rakım={4}, Hız={5}, bearing={6} "</string>
-	<string name="live_monitoring_url">Web adresinden izlemeyi canlı izlemek</string>
-	<string name="gpx_monitoring_disabled_warn">Track\'ın kaydını GPX widget\'ı kullanarak ya da \'Seyahat kaydetme\' ayarları aracılığıyla tut.</string>
-	<string name="show_current_gpx_title">Geçerli izi göster</string>
-	    
-	<string name="free_version_message">Bu ücretsiz OsmAnd sürümü %1$s indirmeyle sınırlanmıştır ve çevrim dışı Vikipedi maddelerini desteklemez.</string>
-	<string name="free_version_title">Ücretsiz sürüm</string>
-	<string name="index_name_north_america">Kuzey Amerika</string>
-	<string name="index_name_us">Kuzey Amerika - Amerika Birleşik Devletleri</string>
-	<string name="index_name_central_america">Orta Amerika</string>
-	<string name="index_name_south_america">Güney Amerika</string>
-	<string name="index_name_russia">Rusya</string>
-	<string name="index_name_oceania">Avustralya ve Okyanusya</string>
-	<string name="index_name_other">Dünya ve konu haritaları</string>
-	<string name="index_name_wiki">Dünya Wikipedia POIleri</string>
-	<string name="fav_export_confirmation">Daha önce dışarıdan alınan favorili dosya zaten var. Bunu değiştirmek istiyor musunuz?</string>
-	<string name="profile_settings">Profile Özel Ayarlar</string>
-	<string name="settings_preset_descr">Harita görünümü ve navigasyon ayarları kullanılan profile göre hatırlanır. Varsayılan profilinizi burada ayarlayın.</string>
-	<string name="routing_settings">Navigasyon</string>
-	<string name="routing_settings_descr">Yolbul için seçenekleri belirtin</string>
-	<string name="global_settings">Genel ayarlar</string>
-	<string name="index_settings">Harita dosyalarını yönet</string>
-	<string name="general_settings">Genel</string>
-	<string name="general_settings_descr">Uygulama için ekran ve ortak ayarları yapılandırma</string>
-	<string name="global_app_settings">Genel uygulama ayarları</string>
-	<string name="user_name">OSM kullanıcı adınız</string>
-	<string name="open_street_map_login_descr">Openstreetmap.org gönderimler için gereklidir</string>
-	
-	<string name="osmand_service">Arka plan modu</string>
-	<string name="osmand_service_descr">Ekran kapalı iken Osmand arka planda çalışır</string>
-	
-	
-	
-		
-	
-	
-	<string name="download_files_question_space">{0} dosya(lar) indirilsin mi? {1} MB depolama alanı kullanılmaktadır. (Şu anda kullanılabilir alanda {2} MB vardır.)</string>
-	 
-	
-	<string name="use_transparent_map_theme">Şeffaf tema</string>
-	<string name="native_library_not_supported">Yerel kütüphane bu aygıtta desteklenmiyor.</string>
-	<string name="init_native_library">Yerel kütüphane başlatılıyor…</string>
-	<string name="choose_auto_follow_route">Harita görünümünü otomatik olarak ortala</string>
-	<string name="choose_auto_follow_route_descr">Geçerli konum ile harita görünümünü eşzamanlamaya kadar geçecek süre</string>
-	<string name="auto_follow_route_navigation">Otomatik-sadece merkezi nav</string>
-	<string name="auto_follow_route_navigation_descr">Otomatik-navigasyon yaparken sadece merkezi harita görünümü.</string>
-	<string name="auto_follow_location_enabled">Haritayı kullanırken görünümü otomatik olarak ortala.</string>
-	<string name="pref_vector_rendering">Özel seçenekli vektör renderer etme</string>
-	<string name="pref_overlay">Bindirme / altlık</string>
-	<string name="pref_raster_map">Harita kaynağı ayarları</string>
-	<string name="pref_vector_map">Vektör harita ayarları</string>
-	<string name="delete_confirmation_msg">%1$s silinsin mi?</string>
-	<string name="city_type_suburb">Banliyö</string>
-	<string name="city_type_hamlet">Mezra</string>
-	<string name="city_type_village">Köy</string>
-	<string name="city_type_town">Kasaba</string>
-	<string name="city_type_city">Şehir</string>
-	
-	
-	<string name="map_widget_gps_info">GPS bilgisi</string>
+    <string name="osmand_parking_plugin_name">Park Etme Konumu</string>
+    <string name="context_menu_item_delete_parking_point">Bir park etme işareti sil</string>
+    <string name="gpxup_public">Halk</string>
+    <string name="gpxup_identifiable">Teşhis edilebilir</string>
+    <string name="gpxup_trackable">Takip edilebilir</string>
+    <string name="gpxup_private">Özel</string>
+    <string name="route_roundabout">Yaklaşık yuvarlak olarak: al %1$d çık ve git</string>
+    <string name="rendering_attr_noPolygons_description">Haritadaki tüm alansal arazi özelliklerini şeffaf Yap</string>
+    <string name="rendering_attr_noPolygons_name"/>
+    <string name="rendering_attr_appMode_name">işleme modu</string>
+    <string name="rendering_attr_appMode_description">Için haritayı optimize et</string>
+    <string name="rendering_attr_contourLines_description">Yakınlaştırma düzeyindenekran(gerektirir kontur veriler):</string>
+    <string name="rendering_attr_contourLines_name">Çevre çizgileri göster</string>
+    <string name="rendering_attr_hmRendered_description">Haritanın gösterilen detay miktarını artırın.</string>
+    <string name="local_index_routing_data">Rota edilen veri</string>
+    <string name="navigate_point_format">Biçim</string>
+    <string name="poi_search_desc">İÇN (İhtiyaç Noktası) arama</string>
+    <string name="navpoint_search_desc">Koordinatlar</string>
+    <string name="transport_search_desc">Toplu taşıma arama</string>
+    <string name="offline_navigation_not_available">OsmAnd çevrim dışı yolbul geçici olarak kullanılamıyor.</string>
+    <string name="left_side_navigation">Soldan-direksiyonlu araç sürüşü</string>
+    <string name="left_side_navigation_descr">Sol taraftan akan trafiğe sahip ülkeler için seçin</string>
+    <string name="modify_transparency">"Şeffaflık değiştir(0 -Şeffaf,255-opak) "</string>
+    <string name="first_time_msg">OsmAnd kullandığınız için teşekkür ederiz. Bu uygulamanın bir çok özelliği için \'Ayarlar\' → \'Veri Yönetimi\' kısmından edinebileceğiniz bölgesel çevrim dışı veriye ihtiyacınız var. Daha sonra haritaları görebilir, adres bulabilir, POI (İhtiyaç Noktalarına) bakabilir ve toplu taşıma bulabilirsiniz.</string>
+    <string name="basemap_was_selected_to_download">Baz haritası doğru uygulama çalışması için gereklidir ve indirmek için seçildi.</string>
+    <string name="local_indexes_cat_tile">Çevrim içi ve önbelleğe alınan döşeme haritalar</string>
+    <string name="index_settings_descr">Aygıtınızda saklanan çevrim dışı harita dosyaları yönet ve indir</string>
+    <string name="map_online_plugin_is_not_installed">Farklı harita kaynaklarını seçmek için Online haritalar eklentisi etkinleştirme</string>
+    <string name="map_online_data">Çevrimiçi ve çini harita</string>
+    <string name="map_online_data_descr">Çevrimiçi haritalar kullan (SD kart üzerine indirme ve önbellek verisi)</string>
+    <string name="online_map_settings_descr">Çevrimiçi veya önbelleğe alınmış çini harita kaynaklarını yapılandırın</string>
+    <string name="osmand_rastermaps_plugin_description">"Bu eklenti ile bir çok çevirimiçi (karo ya da raster) haritaya erişebilirsiniz, önceden tanımlanmış Openstreetmap karolarından (Mapnik gibi) uydu görüntülerine, hava haritaları gibi özel amaçlı katmanları, iklim haritaları, jeolojik haritalar, tepe katmanları, vb\n\nHerhangi bir harita ana (taban) olarak kullanılabilir ve OsmAnd ana harita ekranında gösterilir, veya başka bir ana haritaya üstlük, ya da altlık olabilir (normal OsmAnd çevrimdışı haritalar gibi). Herhangi bir altlık haritayı daha görünür yapmak, veya istediğiniz unsurları gizlemek için ‘Haritayı yapılandır’ bölümünden seçilebilir.\n\nKaro haritalar doğrudan çevrimiçi edinilebilir, veya çevrimdışı kullanmak için sqlite veritabanı üçüncü parti harita hazırlama araçları ile oluşturup hazırlanabilir (OsmAnd klasörüne elle kopyalamak gerekir). "</string>
+    <string name="osmand_accessibility_description">Bu eklenti Osmand doğrudan cihazın erişilebilirlik özellikleri kullanılabilir hale getirir. Bu, örneğin kolaylaştırır TTS sesler konuşma hızını, yön-pad ekran navigasyon yapılandırmak yakınlaştırma kontrolü için bir topunu kullanarak, ya da konumunu duyuran oto için olduğu gibi, text-to-speech geribildirim kullanarak ayarlama.</string>
+    <string name="osmand_development_plugin_description">Bu eklenti geliştirme ve hata ayıklama özellikleri için ayarları test etmek ya da isteyen yönlendirme, ekran render performansı veya ses simüle etmek istiyorum gösterir. Bu ayarlar geliştiriciler için tasarlanmıştır ve genel kullanıcı için gerekli değildir.</string>
+    <string name="plugins_screen">Eklentiler</string>
+    <string name="prefs_plugins_descr">Eklentiler gelişmiş ayarları ve ek işlevselliği etkinleştirir.</string>
+    <string name="prefs_plugins">Eklentiler</string>
+    <string name="osm_editing_plugin_description">Bu eklenti Osmand aracılığıyla oluşturma veya değiştirme OSM POI nesneleri açma veya OSM hataları yorumlama ve kaydedilen GPX dosyaları katkıda gibi OSM katkıda bulunmak için kullanılabilir. OSM bir topluluk odaklı, küresel kamu malı haritalama projesidir. Detaylar için https://openstreetmap.org başvurun. Aktif katılım takdir ve app kişisel OSM kimlik belirtirseniz katkıları, Osmand doğrudan yapılabilir.</string>
+    <string name="vector_maps_may_display_faster_on_some_devices">Vektörel haritalar daha hızlı görüntülenir. Bazı aygıtlarda düzgün çalışmayabilir.</string>
+    <string name="play_commands_of_currently_selected_voice">Seçili ses komutları oynat</string>
+    <string name="debugging_and_development">OsmAnd gelişimi</string>
+    <string name="native_rendering">Yerel render etme</string>
+    <string name="test_voice_prompts">Sesli uyarıları dene</string>
+    <string name="switch_to_raster_map_to_see">Bu konum için mevcut çevrim dışı vektör haritası yok. Ayarlar biri (harita dosyalarını yönetme) indirmek veya çevrimiçi haritalar (bunun için eklentisi çevrimiçi haritalar etkinleştirmek) geçiş yapabilirsiniz.</string>
+    <string name="send_files_to_osm">GPX dosyalarını OSM ye gönder?</string>
+    <string name="gpx_visibility_txt">Görünürlük</string>
+    <string name="gpx_tags_txt">Etiketler</string>
+    <string name="shared_string_description">Tanım</string>
+    <string name="validate_gpx_upload_name_pwd">OSM kullanıcı adı ve GPX dosyaları yüklemek için şifre belirtin.</string>
+    <string name="support_new_features">Yeni özellikler Destekle</string>
+    <string name="support_new_features_descr">Uygulamada uygulanan yeni özellikleri görmek için bağış yap</string>
+    <string name="show_ruler_level">Ekran cetveli</string>
+    <string name="info_button">Bilgi</string>
+    <string name="back_to_location">Konuma geri dön</string>
+    <string name="accessibility_mode">Erişilebilirlik modu</string>
+    <string name="accessibility_mode_descr">Erişilebilirlik özelliklerine dön</string>
+    <string name="accessibility_default">Global sistem ayarına göre</string>
+    <string name="zoomIs">Yakınlaştırma düzeyi</string>
+    <string name="north_north_east">kuzey-kuzey-doğu</string>
+    <string name="north_east">kuzey-doğu</string>
+    <string name="east_north_east">doğu-kuzey-doğu</string>
+    <string name="east">doğu</string>
+    <string name="east_south_east">doğu-güney-doğu</string>
+    <string name="south_east">güney-doğu</string>
+    <string name="south_south_east">güney-güney-doğu</string>
+    <string name="south">güney</string>
+    <string name="south_south_west">güney-güney-batı</string>
+    <string name="south_west">güney-batı</string>
+    <string name="west_south_west">batı-güney-batı</string>
+    <string name="west">batı</string>
+    <string name="west_north_west">batı-kuzey-batı</string>
+    <string name="north_west">kuzey-batı</string>
+    <string name="north_north_west">kuzey-kuzey-batı</string>
+    <string name="front">İleri</string>
+    <string name="front_right">Sağ ileri</string>
+    <string name="right">sağa</string>
+    <string name="back_right">Sağ geriye</string>
+    <string name="back">Geriye</string>
+    <string name="back_left">Sol-geri</string>
+    <string name="left">solda</string>
+    <string name="front_left">Sol ileri</string>
+    <string name="oclock">saat</string>
+    <string name="towards">karşı</string>
+    <string name="accuracy">Doğruluk</string>
+    <string name="altitude">Rakım</string>
+    <string name="no_info">Bilgi yok</string>
+    <string name="direction_style_sidewise">Yandaki akıllı (8 sektör)</string>
+    <string name="direction_style_clockwise">Saat Yönünde (12 sektör)</string>
+    <string name="settings_direction_style">Yön stili</string>
+    <string name="settings_direction_style_descr">Hareket ederken göreceli yönleri ifade etmek için bir stil seçin</string>
+    <string name="auto_announce_on">Duyuruyu otomatik başlat</string>
+    <string name="auto_announce_off">Duyuruyu otomatik durdur</string>
+    <string name="zoom_by_trackball_descr">Yatay topunu hamle ile yakınlaştırarak haritayı değiştirme</string>
+    <string name="zoom_by_trackball">Zoom kontrolü için topunu kullan</string>
+    <string name="accessibility_preferences_descr">Erişilebilirlik ile ilgili tercihler</string>
+    <string name="shared_string_accessibility">Erişilebilirlik</string>
+    <string name="rendering_out_of_memory">Seçilen alanı görüntülemek için işlem belleği yeterli değil</string>
+    <string name="use_fluorescent_overlays">Floresan bindirmeleri</string>
+    <string name="use_fluorescent_overlays_descr">Parkur ve güzergah görüntülemek için floresan renkler kullan</string>
+    <string name="offline_edition">Çevrim dışı düzenleme</string>
+    <string name="offline_edition_descr">Her zaman çevrim dışı düzenlemeyi kullan</string>
+    <string name="update_poi_does_not_change_indexes">Uygulama içinde POI değişiklikleri indirilen harita dosyaları etkilemez, bunun yerine yerel bir dosyaya kaydedilir.</string>
+    <string name="local_openstreetmap_uploading">Yükleniyor …</string>
+    <string name="local_openstreetmap_were_uploaded">{0} POI / Notlar yüklendi</string>
+    <string name="local_openstreetmap_uploadall">tümünü yükle</string>
+    <string name="local_openstreetmap_upload">OSM modifikasyonu yükle</string>
+    <string name="local_openstreetmap_delete">modifikasyonu sil</string>
+    <string name="local_openstreetmap_descr_title">Asenkron OSM düzenleme:</string>
+    <string name="local_openstreetmap_settings">Yerel OSM POIler / Notlar kurtardı</string>
+    <string name="local_openstreetmap_settings_descr">Yerel veritabanında belirtilmiş POIler/Hataları OSMde gösterme ve yönetme</string>
+    <string name="live_monitoring_interval_descr">Canlı izleme aralığı belirtin</string>
+    <string name="live_monitoring_interval">Canlı izleme aralığı</string>
+    <string name="live_monitoring_url_descr">"Parametre sözdizimi ile web adresini belirtin: Enlem={0}, Boylam={1}, Damga zamanı={2}, HDOP={3}, Rakım={4}, Hız={5}, bearing={6} "</string>
+    <string name="live_monitoring_url">Web adresinden izlemeyi canlı izlemek</string>
+    <string name="gpx_monitoring_disabled_warn">Track\'ın kaydını GPX widget\'ı kullanarak ya da \'Seyahat kaydetme\' ayarları aracılığıyla tut.</string>
+    <string name="show_current_gpx_title">Geçerli izi göster</string>
+    <string name="free_version_message">Bu ücretsiz OsmAnd sürümü %1$s indirmeyle sınırlanmıştır ve çevrim dışı Vikipedi maddelerini desteklemez.</string>
+    <string name="free_version_title">Ücretsiz sürüm</string>
+    <string name="index_name_north_america">Kuzey Amerika</string>
+    <string name="index_name_us">Kuzey Amerika - Amerika Birleşik Devletleri</string>
+    <string name="index_name_central_america">Orta Amerika</string>
+    <string name="index_name_south_america">Güney Amerika</string>
+    <string name="index_name_russia">Rusya</string>
+    <string name="index_name_oceania">Avustralya ve Okyanusya</string>
+    <string name="index_name_other">Dünya ve konu haritaları</string>
+    <string name="index_name_wiki">Dünya Wikipedia POIleri</string>
+    <string name="fav_export_confirmation">Daha önce dışarıdan alınan favorili dosya zaten var. Bunu değiştirmek istiyor musunuz?</string>
+    <string name="profile_settings">Profile Özel Ayarlar</string>
+    <string name="settings_preset_descr">Harita görünümü ve navigasyon ayarları kullanılan profile göre hatırlanır. Varsayılan profilinizi burada ayarlayın.</string>
+    <string name="routing_settings">Navigasyon</string>
+    <string name="routing_settings_descr">Yolbul için seçenekleri belirtin</string>
+    <string name="global_settings">Genel ayarlar</string>
+    <string name="index_settings">Harita dosyalarını yönet</string>
+    <string name="general_settings">Genel</string>
+    <string name="general_settings_descr">Uygulama için ekran ve ortak ayarları yapılandırma</string>
+    <string name="global_app_settings">Genel uygulama ayarları</string>
+    <string name="user_name">OSM kullanıcı adınız</string>
+    <string name="open_street_map_login_descr">Openstreetmap.org gönderimler için gereklidir</string>
+    <string name="osmand_service">Arka plan modu</string>
+    <string name="osmand_service_descr">Ekran kapalı iken Osmand arka planda çalışır</string>
+    <string name="download_files_question_space">{0} dosya(lar) indirilsin mi? {1} MB depolama alanı kullanılmaktadır. (Şu anda kullanılabilir alanda {2} MB vardır.)</string>
+    <string name="use_transparent_map_theme">Şeffaf tema</string>
+    <string name="native_library_not_supported">Yerel kütüphane bu aygıtta desteklenmiyor.</string>
+    <string name="init_native_library">Yerel kütüphane başlatılıyor…</string>
+    <string name="choose_auto_follow_route">Harita görünümünü otomatik olarak ortala</string>
+    <string name="choose_auto_follow_route_descr">Geçerli konum ile harita görünümünü eşzamanlamaya kadar geçecek süre</string>
+    <string name="auto_follow_route_navigation">Otomatik-sadece merkezi nav</string>
+    <string name="auto_follow_route_navigation_descr">Otomatik-navigasyon yaparken sadece merkezi harita görünümü.</string>
+    <string name="auto_follow_location_enabled">Haritayı kullanırken görünümü otomatik olarak ortala.</string>
+    <string name="pref_vector_rendering">Özel seçenekli vektör renderer etme</string>
+    <string name="pref_overlay">Bindirme / altlık</string>
+    <string name="pref_raster_map">Harita kaynağı ayarları</string>
+    <string name="pref_vector_map">Vektör harita ayarları</string>
+    <string name="delete_confirmation_msg">%1$s silinsin mi?</string>
+    <string name="city_type_suburb">Banliyö</string>
+    <string name="city_type_hamlet">Mezra</string>
+    <string name="city_type_village">Köy</string>
+    <string name="city_type_town">Kasaba</string>
+    <string name="city_type_city">Şehir</string>
+    <string name="map_widget_gps_info">GPS bilgisi</string>
     <string name="access_arrival_time">Varış zamanı</string>
     <string name="item_checked">işaretli</string>
     <string name="item_unchecked">işaretsiz</string>
     <string name="shared_string_map">Harita</string>
     <string name="prefer_motorways">Otoyol tercih et</string>
-	<string name="prefer_in_routing_title">Tercih et…</string>
-	<string name="prefer_in_routing_descr">Otoyolları yeğle.</string>
+    <string name="prefer_in_routing_title">Tercih et…</string>
+    <string name="prefer_in_routing_descr">Otoyolları yeğle.</string>
     <string name="max_speed_none">hiçbiri</string>
     <string name="av_def_action_choose">Talep üzerine seç</string>
     <string name="osmand_play_title_30_chars">OsmAnd Haritalar &amp; Yolbul</string>
-	<string name="osmand_plus_play_title_30_chars">OsmAnd+ Haritalar &amp; Yolbul</string>
-	<string name="shared_string_gpx_route">GPX Rotası</string>
-	<string name="poi_query_by_name_matches_categories">Sorgunuza uyan çeşitli POI kategorileri bulundu:</string>
-	<string name="data_to_search_poi_not_available">POI araması yapmak için yerel veri mevcut değil.</string>
-	<string name="old_poi_file_should_be_deleted">POI veri dosyası \'%1$s\' gereksiz ve silinebilir.</string>
-	<string name="update_poi_file_not_found">POI değişikliklerinin kaydedilebileceği yerel dosya bulunamadı ve oluşturulamadı.</string>
-	<string name="button_upgrade_osmandplus">OsmAnd+\'a Yükselt</string>
-	<string name="map_version_changed_info">Sunucuda yüklü haritalar uygulamanın versiyonuyla uyumlu değil. Bunları kullanabilmek için uygulama sürümünüzü yükseltmelisiniz.</string>
-	<string name="search_position_current_location_search">Konum aranıyor…</string>
-	<string name="search_position_current_location_found">Benim Konum (bulundu)</string>
-	<string name="search_position_undefined">Tanımlanmamış</string>
-	
-	<string name="search_position_map_view">Güncel harita merkezi</string>
-	<string name="select_search_position">Menşei:</string>
-	<string name="context_menu_item_search">Buraya yakın ara</string>
-	<string name="shared_string_save_as_gpx">Yeni GPX dosyası olarak kaydet</string>
-	<string name="route_successfully_saved_at">Rota \'%1$s\' olarak kaydedildi.</string>
-	<string name="filename_input">"Dosya adı: "</string>
-	
-	<string name="local_index_upload_gpx_description">OSM Comunity üzerine haritaları geliştirmek için kullanılacak GPX dosyaları yükleyin.</string>
-	<string name="local_index_items_uploaded">%2$d/%1$d nesne yüklendi.</string>
-	<string name="local_index_mi_upload_gpx">OSM\'ye Gönder</string>
-	<string name="show_more_map_detail">Daha fazla harita detayı</string>
-	<string name="favourites_delete_multiple_succesful">Favari nokta(lar) silindi.</string>
-	<string name="favorite_delete_multiple">%1$d favori ve %2$d favori grubunu silmek istediğinize emin misiniz?</string>
-	<string name="local_index_gpx_info_show">"
+    <string name="osmand_plus_play_title_30_chars">OsmAnd+ Haritalar &amp; Yolbul</string>
+    <string name="shared_string_gpx_route">GPX Rotası</string>
+    <string name="poi_query_by_name_matches_categories">Sorgunuza uyan çeşitli POI kategorileri bulundu:</string>
+    <string name="data_to_search_poi_not_available">POI araması yapmak için yerel veri mevcut değil.</string>
+    <string name="old_poi_file_should_be_deleted">POI veri dosyası \'%1$s\' gereksiz ve silinebilir.</string>
+    <string name="update_poi_file_not_found">POI değişikliklerinin kaydedilebileceği yerel dosya bulunamadı ve oluşturulamadı.</string>
+    <string name="button_upgrade_osmandplus">OsmAnd+\'a Yükselt</string>
+    <string name="map_version_changed_info">Sunucuda yüklü haritalar uygulamanın versiyonuyla uyumlu değil. Bunları kullanabilmek için uygulama sürümünüzü yükseltmelisiniz.</string>
+    <string name="search_position_current_location_search">Konum aranıyor…</string>
+    <string name="search_position_current_location_found">Benim Konum (bulundu)</string>
+    <string name="search_position_undefined">Tanımlanmamış</string>
+    <string name="search_position_map_view">Güncel harita merkezi</string>
+    <string name="select_search_position">Menşei:</string>
+    <string name="context_menu_item_search">Buraya yakın ara</string>
+    <string name="shared_string_save_as_gpx">Yeni GPX dosyası olarak kaydet</string>
+    <string name="route_successfully_saved_at">Rota \'%1$s\' olarak kaydedildi.</string>
+    <string name="filename_input">"Dosya adı: "</string>
+    <string name="local_index_upload_gpx_description">OSM Comunity üzerine haritaları geliştirmek için kullanılacak GPX dosyaları yükleyin.</string>
+    <string name="local_index_items_uploaded">%2$d/%1$d nesne yüklendi.</string>
+    <string name="local_index_mi_upload_gpx">OSM\'ye Gönder</string>
+    <string name="show_more_map_detail">Daha fazla harita detayı</string>
+    <string name="favourites_delete_multiple_succesful">Favari nokta(lar) silindi.</string>
+    <string name="favorite_delete_multiple">%1$d favori ve %2$d favori grubunu silmek istediğinize emin misiniz?</string>
+    <string name="local_index_gpx_info_show">"
 \n
 \nAyarlar için ekrana uzun basın"</string>
-	
-	<string name="local_index_installed">Yerel Versiyon</string>
-	<string name="local_index_items_backuped">%1$d/%2$d nesne pasifleştirildi.</string>
-	<string name="local_index_items_deleted">%1$d/%2$d nesne silindi.</string>
-	<string name="local_index_items_restored">%1$d/%2$d nesne aktifleştirildi.</string>
-	<string name="local_index_descr_title">Harita dosyalarını yönetin</string>
-	<string name="local_index_mi_restore">Aktifleştir</string>
-	<string name="local_index_mi_backup">Pasifleştir</string>
-	<string name="local_index_poi_data">POI Verisi</string>
-	<string name="local_index_address_data">Adres Verisi</string>
-	<string name="local_index_transport_data">Toplu taşıma verileri</string>
-	<string name="local_index_map_data">Harita Verisi</string>
-	<string name="local_indexes_cat_backup">Pasifleştir</string>
-	<string name="local_indexes_cat_tts">Sesli uyarılar (TTS)</string>
-	<string name="local_indexes_cat_voice">Sesli uyarılar (kayıtlı)</string>
-	
-	<string name="local_indexes_cat_poi">POI Verisi</string>
-	<string name="ttsvoice">TTS sesi</string>
-	<string name="trace_rendering">Hata ayıklama bilgisi dönüştürülüyor</string>
-	<string name="trace_rendering_descr">Dönüştürme performansını göster</string>
-	<string name="installing_new_resources">Yeni veri(ler) açılıyor…</string>
-	<string name="internet_connection_required_for_online_route">Çevrimiçi navigasyon servisi seçildi ancak İnternet bağlantısı kullanılabilir değil.</string>
-	<string name="layer_hillshade">Tepe gölgesi katmanı</string>
+    <string name="local_index_installed">Yerel Versiyon</string>
+    <string name="local_index_items_backuped">%1$d/%2$d nesne pasifleştirildi.</string>
+    <string name="local_index_items_deleted">%1$d/%2$d nesne silindi.</string>
+    <string name="local_index_items_restored">%1$d/%2$d nesne aktifleştirildi.</string>
+    <string name="local_index_descr_title">Harita dosyalarını yönetin</string>
+    <string name="local_index_mi_restore">Aktifleştir</string>
+    <string name="local_index_mi_backup">Pasifleştir</string>
+    <string name="local_index_poi_data">POI Verisi</string>
+    <string name="local_index_address_data">Adres Verisi</string>
+    <string name="local_index_transport_data">Toplu taşıma verileri</string>
+    <string name="local_index_map_data">Harita Verisi</string>
+    <string name="local_indexes_cat_backup">Pasifleştir</string>
+    <string name="local_indexes_cat_tts">Sesli uyarılar (TTS)</string>
+    <string name="local_indexes_cat_voice">Sesli uyarılar (kayıtlı)</string>
+    <string name="local_indexes_cat_poi">POI Verisi</string>
+    <string name="ttsvoice">TTS sesi</string>
+    <string name="trace_rendering">Hata ayıklama bilgisi dönüştürülüyor</string>
+    <string name="trace_rendering_descr">Dönüştürme performansını göster</string>
+    <string name="installing_new_resources">Yeni veri(ler) açılıyor…</string>
+    <string name="internet_connection_required_for_online_route">Çevrimiçi navigasyon servisi seçildi ancak İnternet bağlantısı kullanılabilir değil.</string>
+    <string name="layer_hillshade">Tepe gölgesi katmanı</string>
     <string name="map_widget_fps_info">FPS hata ayıklama bilgisi</string>
-	<string name="driving_region_descr">Sürüş bölgesini seç: ABD, Avrupa, İngiltere, Asya ve Diğerleri.</string>
-	<string name="driving_region">Sürüş bölgesi</string>
-	<string name="driving_region_japan">Japonya</string>
-	<string name="driving_region_us">Birleşik Devletler</string>
-	<string name="driving_region_canada">Kanada</string>
-	<string name="driving_region_europe_asia">Avrupa, Asya, Latin Amerika ve benzeri</string>
-	<string name="driving_region_uk">Birleşik Krallık (İngiltere), Hindistan ve benzerleri</string>
-	    
-    
+    <string name="driving_region_descr">Sürüş bölgesini seç: ABD, Avrupa, İngiltere, Asya ve Diğerleri.</string>
+    <string name="driving_region">Sürüş bölgesi</string>
+    <string name="driving_region_japan">Japonya</string>
+    <string name="driving_region_us">Birleşik Devletler</string>
+    <string name="driving_region_canada">Kanada</string>
+    <string name="driving_region_europe_asia">Avrupa, Asya, Latin Amerika ve benzeri</string>
+    <string name="driving_region_uk">Birleşik Krallık (İngiltere), Hindistan ve benzerleri</string>
     <string name="speak_title">Bildir…</string>
-	<string name="speak_descr">Sokak isimleri, trafik uyarıları (zorunlu duruşlar, hız tümsekleri), hız kamerası uyarıları, hız sınırları bildirimini ayarla</string>
-	<string name="speak_street_names">Cadde isimleri (TTS)</string>
+    <string name="speak_descr">Sokak isimleri, trafik uyarıları (zorunlu duruşlar, hız tümsekleri), hız kamerası uyarıları, hız sınırları bildirimini ayarla</string>
+    <string name="speak_street_names">Cadde isimleri (TTS)</string>
     <string name="speak_speed_limit">Hız sınırı</string>
     <string name="speak_cameras">Hız kameraları</string>
-	<string name="speak_traffic_warnings">Trafik uyarıları</string>
+    <string name="speak_traffic_warnings">Trafik uyarıları</string>
     <string name="osb_author_or_password_not_specified">Lütfen OSM kullanıcı adı ve şifrenizi Ayarlar bölümünde belirtin</string>
     <string name="context_menu_item_directions_to">Yol tarifi</string>
     <string name="context_menu_item_directions_from">Yol tarifi</string>
@@ -744,9 +627,7 @@
     <string name="route_to">Buraya:</string>
     <string name="route_via">Üzerinden:</string>
     <string name="route_from">Buradan:</string>
-	
-	
-	<string name="destination_point">Varış Noktası %1$s</string>
+    <string name="destination_point">Varış Noktası %1$s</string>
     <string name="context_menu_item_destination_point">Varış noktası olarak ayarla</string>
     <string name="please_select_address">Önce şehir ya da sokak seç</string>
     <string name="search_street_in_neighborhood_cities">Komşu şehirlerdeki sokak için ara</string>
@@ -766,7 +647,6 @@
     <string name="distance_measurement_finish_editing">Düzenlemeyi bitir</string>
     <string name="distance_measurement_finish_subtrack">Yeni bir alt yola başla</string>
     <string name="distance_measurement_clear_route">Tüm mevkileri temizle</string>
-    
     <string name="distance_measurement_load_gpx">Var olan GPX dosyasını aç</string>
     <string name="wait_current_task_finished">Mevcut görev bitene kadar bekleyin lütfen</string>
     <string name="use_kalman_filter_compass_descr">Pusula okumalarındaki gürültüyü azaltır ama durgunluk ekler.</string>
@@ -780,11 +660,10 @@
     <string name="clear_destination">Varış noktasını temizle</string>
     <string name="download_using_mobile_internet">Kablosuz ağa bağlı değil. İndirmek için şimdiki İnternet bağlantısı kullanılsın mı\?</string>
     <string name="street_name">Sokak Adı</string>
-	<string name="hno">Bina numarası</string>
+    <string name="hno">Bina numarası</string>
     <string name="website">Web sitesi</string>
-	<string name="monitoring_settings">Seyahat kaydetme</string>
+    <string name="monitoring_settings">Seyahat kaydetme</string>
     <string name="monitoring_settings_descr">Seyahatlerinizi nasıl kaydedeceğinizi ayarlayın.</string>
-    
     <string name="contribution_activity">Yükleme versiyonu</string>
     <string name="choose_osmand_theme_descr">Uygulamanın nasıl görüneceğini seç.</string>
     <string name="choose_osmand_theme">Uygulama gövdesi</string>
@@ -794,11 +673,9 @@
     <string name="local_openstreetmap_act_title">OSM değişiklikleri</string>
     <string name="shared_string_more_actions">Diğer komutlar</string>
     <string name="local_indexes_cat_srtm">Kontür çizgileri</string>
-    
     <string name="about_version">Sürüm :</string>
     <string name="shared_string_about">Hakkında</string>
     <string name="about_settings_descr">Sürüm bilgisi, lisanslar, proje üyeleri</string>
-    
     <string name="local_index_tile_data_expire">Sona erecek (dakika): %1$s</string>
     <string name="local_index_tile_data_downloadable">İndirilebilir: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Azami yakınlaştırma: %1$s</string>
@@ -808,7 +685,7 @@
     <string name="edit_tilesource_url_to_load">Adres</string>
     <string name="edit_tilesource_choose_existing">Varolanı seçin…</string>
     <string name="maps_define_edit">Tanımla/Düzenle…</string>
-	<string name="clear_intermediate_points"/>
+    <string name="clear_intermediate_points"/>
     <string name="keep_intermediate_points">Ara hedefler tutun</string>
     <string name="new_directions_point_dialog">Zaten ara hedefleri belirlemişsiniz.</string>
     <string name="intermediate_items_sort_return">Ara hedefler sıralarına hedef geçerli konumdan giden yolda en iyi duruma getirmek için başvurdu.</string>
@@ -821,284 +698,265 @@
     <string name="available_downloads_left">İndirilecek %1$d dosya kaldı</string>
     <string name="osmand_background_plugin_description">Periyodik GPS cihazı uyanma aracılığıyla arka planda izleme ve navigasyon (kapalı ekranı) modunu etkinleştirmek için ayarları gösterir.</string>
     <string name="get_directions">Yol tarifleri</string>
-	<string name="menu_layers">Harita katmanları</string>
-	
-	<string name="gps_status_app_not_found">GPS Durum uygulaması yüklenmedi, mağazada arayın?</string>
-	<string name="poi_filter_closest_poi">En yakın POI</string>
-	<string name="amenity_type_administrative">İdari</string>
-	<string name="amenity_type_barrier">Engel</string>
-	<string name="amenity_type_historic">Tarihi</string>
-	<string name="amenity_type_man_made">İnsan yapımı</string>
-	<string name="amenity_type_military">Askeri</string>
-	<string name="amenity_type_natural">Doğal</string>
-	<string name="amenity_type_office">Büro</string>
-	<string name="amenity_type_shop">Alışveriş</string>
-	<string name="amenity_type_sport">Spor</string>
-	<string name="amenity_type_sustenance">Gıda</string>
-	<string name="amenity_type_tourism">Turizm</string>
-	<string name="search_address_region">Bölge</string>
-	<string name="search_address_city">Şehir</string>
-	<string name="search_address_street">Sokak</string>
-	<string name="search_address_building">Bina</string>
-	<string name="search_address_building_option">Bina</string>
-	<string name="search_address_street_option">Kesişen sokak</string>
-	<string name="navigate_point_top_text">Seçilen biçimde (D - derece, M - dakika, S - saniye) enlem ve boylamı girin</string>
-	<string name="navigate_point_latitude">Enlem</string>
-	<string name="navigate_point_longitude">Boylam</string>
-	
-	<string name="search_near_map">Mevcut harita konumu yakınlarında ara</string>
-	
-	<string name="show_more_map_detail_descr">Yakınlaştırmalarda biraz daha vektör harita ayrıntısı göster (yollar gibi)</string>
-	<string name="tts_missing_language_data">Seçilen dil için veri yüklü değil. Yüklemek için mağazaya gitmek ister misiniz?</string>
-	<string name="gpx_option_destination_point">Mevcut varış noktasını kullan</string>
-	<string name="voice_stream_notification">Bildirim sesi</string>
-	<string name="voice_stream_music">Ortam/müzik sesi</string>
-	<string name="warning_tile_layer_not_downloadable">Uygulama %1$s harita katmanını indiremiyor, lütfen tekrar yüklemeyi deneyin.</string>
-	<string name="overlay_transparency_descr">Katman şeffaflığını değiştir</string>
-	<string name="overlay_transparency">Katman şeffaflığı</string>
-	<string name="internet_not_available">İşlem için gerekli genel ağ (internet) bağlantısı mevcut değil</string>
-	<string name="install_more">Daha fazla yükle…</string>
-	<string name="si_mi_feet">Mil/fit</string>
-	<string name="mile_per_hour">mph</string>
-	<string name="send_location_way_choose_title">Konumu paylaş</string>
-	<string name="send_location_sms_pattern">Konum: %1$s\n%2$s</string>
-	<string name="send_location">Konum gönder</string>
-	<string name="context_menu_item_share_location">Konum paylaş</string>
-	<string name="amenity_type_landuse">Arazi</string>
-	<string name="amenity_type_transportation">Ulaşım</string>
-	<string name="shared_string_io_error">G/Ç hatası</string>
-	<string name="km">km</string>
-	<string name="km_h">km/h</string>
-	<string name="m">m</string>
-	<string name="poi_filter_custom_filter">Özel süzgeç</string>
-	<string name="specified_dir_doesnt_exist">Belirtilen klasörü bulamıyor.</string>
-	<string name="application_dir">Veri depolama dizini</string>
-	<string name="osmand_net_previously_installed">Önceki bir OsmAnd sürümü yüklü. Tüm çevrimdışı veri yeni uygulama tarafından desteklenecek. Fakat Favori noktalar eski uygulamada dışa aktarılıp, sonra yeni uygulamada içe aktarılmalıdır.</string>
-	<string name="build_installed">{0} yapımı başarıyla yüklendi ({1}).</string>
-	<string name="downloading_build">Yapı indiriliyor…</string>
-	<string name="loading_builds_failed">OsmAnd yapı listesi alınırken başarısız olundu</string>
-	<string name="loading_builds">OsmAnd yapıları yükleniyor…</string>
-	<string name="select_build_to_install">Yüklemek için OsmAnd yapısı seçin</string>
-	<string name="voice_is_not_available_msg">Sesli yönlendirme mevcut değil. Lütfen \'ayarlar\' --&gt; \'Sesle yönlendirme\' ye gidin ve ses veri paketi seçin ya da indirin.</string>
-	<string name="daynight_mode_sensor">Işık algılayıcısı</string>
-	<string name="daynight_descr">Gündüz/gece değişim kipi kuralını seçin</string>
-	<string name="download_files_question">{0} dosya indirilecek ({1} MB)?</string>
-	<string name="items_were_selected">{0} öğe seçildi</string>
-	<string name="filter_existing_indexes">İndirilen</string>
-	
-	<string name="fast_route_mode_descr">"Hızlı güzergah hesaplamayı etkinleştir ya da yakıt tasarrufu için devre dışı bırak. "</string>
-	<string name="continuous_rendering">Devamlı işleme</string>
-	<string name="rendering_exception">Seçilen alanın işlemesi yapılırken hata oluştu</string>
-	<string name="show_point_options">Konum kullan …</string>
-	<string name="renderer_load_sucess">İşleyici başarıyla yüklendi</string>
-	<string name="renderer_load_exception">Özel durum oluştu: işleyici yüklenmedi</string>
-	<string name="poi_context_menu_website">İÇN websitesini göster</string>
-	<string name="poi_context_menu_call">İÇN telefonunu göster</string>
-	<string name="download_type_to_filter">süzmek için yazın</string>
-	<string name="context_menu_item_search_transport">Toplu taşıma ara</string>
-	<string name="transport_searching_transport">Ulaştırma sonuçları (hedef yok):</string>
-	<string name="transport_searching_route">Ulaşım sonuçları (hedefe {0}):</string>
-	<string name="transport_search_again">Taşıma aramasını sıfırla</string>
-	
-	<string name="gpx_files_not_found">GPX dosyaları /tracks dizininde bulunamadı</string>
-	<string name="error_reading_gpx">GPX verisi okunamıyor</string>
-	<string name="poi_context_menu_modify">İÇN düzenle</string>
-	<string name="rotate_map_compass_opt">Pusulaya</string>
-	<string name="rotate_map_bearing_opt">Hareket yönüne</string>
-	<string name="rotate_map_none_opt">Döndürülmesin (kuzey yukarıda)</string>
-	<string name="rotate_map_to_bearing_descr">Harita ekran hizalamasını seçin</string>
-	<string name="show_route">Güzergah ayrıntıları</string>
-	<string name="shared_string_import">İçe Aktar</string>
-	
-	<string name="error_occurred_loading_gpx">GPX yüklenirken hata oluştu</string>
-	<string name="none_region_found">Bölgeler için SD kart üzerinde çevrim dışı veri bulunamadı. İnternetten bölgeleri indirin.</string>
-	<string name="poi_namefinder_query_empty">İÇN bulmak için sorgu girişi yapın</string>
-	
-	<string name="thanks_yandex_traffic">Trafik bilgileri için Yandex\'e teşekkürler.</string>
-	
-	<string name="layer_poi">İÇN…</string>
-	<string name="background_service_wait_int_descr">Arka planda konum düzeltmesi için azami bekleme süresini belirleyin</string>
-	<string name="background_service_wait_int">Düzeltme için azami bekleme</string>
-	<string name="gps_provider">GPS</string>
-	<string name="background_service_provider">Konum sağlayıcı</string>
-	<string name="background_router_service_descr">Ekran kapalıyken konumu izlemek için OsmAnd\'ı arka planda çalıştırır</string>
-	<string name="background_router_service">Arka planda Osmand başlat</string>
-	<string name="off_router_service_no_gps_available">Arka plan navigasyon hizmeti açık olması bir konum sağlayıcı gerektirir.</string>
-	<string name="hide_poi_filter">Süzgeci gizle</string>
-	<string name="show_poi_filter">Süzgeci göster</string>
-	<string name="search_poi_filter">Süzgeç</string>
-	<string name="voice_provider">Sesli yönlendirme</string>
-	<string name="voice_data_initializing">Ses verisi yükleniyor…</string>
-	<string name="voice_data_not_supported">Ses verisinin desteklenmeyen sürümü</string>
-	<string name="voice_data_corrupted">Belirtilen ses verisi hatalı</string>
-	<string name="voice_data_unavailable">Seçilen ses verisi mevcut değil</string>
-	<string name="sd_unmounted">SD kart ulaşılabilir değil.\nHaritaları göremez ve bir şeyler arayamazsınız.</string>
-	<string name="sd_mounted_ro">SD kart sadece okunabilir.\nSadece önceden yüklenen haritaları görebilirsiniz ve genel ağdan (internetten) indiremezsiniz.</string>
-	<string name="first_time_download">Bölgeleri indir</string>
-	<string name="search_nearby">Yakınlarda ara</string>
-	<string name="map_orientation_default">Aygıt ile aynı</string>
-	<string name="map_orientation_portrait">Dikey</string>
-	<string name="map_orientation_landscape">Yatay</string>
-	<string name="map_screen_orientation_descr">Dikey, yatay veya aygıt</string>
-	<string name="add_new_rule">Yeni kural ekle</string>
-	<string name="transport_Stop">Durak</string>
-	<string name="transport_stops">durak</string>
-	<string name="transport_search_after">Sonraki Güzergah</string>	
-	<string name="transport_search_before">Önceki Güzergah</string>
-	<string name="transport_finish_search">Aramayı bitir</string>
-	<string name="transport_route_distance">Güzergah mesafesi</string>
-	<string name="transport">Ulaşım</string>
-	<string name="show_transport_over_map_description">Toplu taşıma duraklarını haritada göster.</string>
-	<string name="show_transport_over_map">Taşıma duraklarını göster</string>
-	<string name="hello">OsmAnd yolbul uygulaması</string>
-	<string name="update_poi_success">İÇN verisi güncellendi ({0} yüklendi)</string>
-	<string name="update_poi_error_local">Yerel İÇN listesi güncellenemedi</string>
-	<string name="update_poi_error_loading">Sunucudan veri yüklenemedi</string>
-	<string name="update_poi_no_offline_poi_index">Bu alan için çevrim dışı İÇN verisi mevcut değil</string>
-	<string name="search_history_city">Şehir: {0}</string>
-	<string name="search_history_street">Sokak: {0}, {1}</string>
-	<string name="search_history_building">Bina: {0}, {1}, {2}</string>
-	<string name="shared_string_history">Geçmiş</string>
-	<string name="uploading_data">Veri yükleniyor…</string>
-	<string name="uploading">Yükleniyor…</string>
-	<string name="search_nothing_found">Sonuç bulunamadı</string>
-	<string name="hint_search_online">Çevrimiçi arama: Ev numarası, sokak, şehir</string>
-	<string name="search_offline_address">Çevrim dışı arama</string>
-	<string name="route_general_information">Toplam uzaklık %1$s, seyahat süresi %2$d s %3$d dak.</string>
-	<string name="router_service_descr">Çevrim içi veya çevrim dışı yolbul hizmeti seçin.</string>
-	<string name="sd_dir_not_accessible">Bellek kartında veri depolama klasörü erişilebilir değil!</string>
-	<string name="download_question">{0} - {1} indir ?</string>
-	<string name="download_question_exist">{0} için çevrim dışı veri zaten var ({1}). ({2}) güncellensin mi\?</string>
-	<string name="shared_string_downloading">İndiriliyor</string>
-	<string name="downloading_list_indexes">Mevcut bölgelerin listesi indiriliyor…</string>
-	<string name="list_index_files_was_not_loaded">https://osmand.net adresinden bölge listesi alınamadı.</string>
-	<string name="update_existing">Değiştir</string>
-	<string name="only_show">Güzergahı göster</string>
-	<string name="follow">Gezintiyi başlat</string>
-	<string name="mark_final_location_first">Lütfen ilk olarak varış noktası seçin</string>
-	<string name="opening_hours">Açılış saatleri</string>
-	<string name="auth_failed">Yetkilendirme başarısız</string>
-	<string name="loading_streets_buildings">Sokaklar/binalar yükleniyor…</string>
-	<string name="loading_streets">Sokaklar yükleniyor…</string>
-	<string name="poi">İÇN</string>
-	<string name="error_occurred_saving_gpx">GPX dosyası kaydedilemedi</string>
-	<string name="error_calculating_route">Rota hesaplanamadı</string>
-	<string name="error_calculating_route_occured">Rota hesaplanamadı</string>
-	<string name="empty_route_calculated">Hesaplanan rota boş</string>					
-	<string name="new_route_calculated_dist">Yeni güzergah hesaplandı, mesafe</string>
-	<string name="reading_indexes">Yerel veri okunuyor…</string>
-	<string name="saving_gpx_tracks">GPX dosyası kaydediliyor…</string>
-	<string name="data_settings_descr">Dil belirleyin, veri indirin/tekrar yükleyin</string>
-	<string name="osm_settings">OSM düzenleme</string>
-	<string name="app_settings">Uygulama ayarları</string>
-	<string name="search_address">Adres ara</string>
-	<string name="choose_building">Bina seç</string>
-	<string name="choose_street">Sokak seç</string>
-	<string name="choose_city">Şehir veya posta kodu seçin</string>
-	<string name="ChooseCountry">Ülke seç</string>
-	<string name="map_view_3d">3B Harita Görüntüsü</string>
-	<string name="show_gps_coordinates_text">Harita üzerinde GPS koordinatlarını göster</string>
-	<string name="app_description">Gezinti uygulaması</string>
-	<string name="choose_available_region">Listeden bölge seçin</string>
-	<string name="Closest_Amenities">Yakın noktalar</string>
-	<string name="position_on_map_bottom">Alt</string>
-	<string name="osb_author_dialog_password">OSM şifresi (isteğe bağlı)</string>
-	<string name="poi_action_succeded_template">{0} olayı başarıyla tamamlandı.</string>
-	<string name="shared_string_clear">Temizle</string>
-	<string name="filter_current_poiButton">Süzgeç</string>
-	<string name="edit_filter_delete_dialog_title">Seçilen süzgeç silinsin mi?</string>
-	<string name="edit_filter_delete_message">{0} süzgeci silindi</string>
-	<string name="edit_filter_create_message">{0} süzgeci oluşturuldu</string>
-	<string name="av_camera_focus">Kamera odaklama tipi</string>
-	<string name="av_camera_focus_descr">Dahili kamera odaklama tipini seçin</string>
-	<string name="av_camera_focus_auto">Kendiliğinden odaklama</string>
-	<string name="av_camera_focus_edof">Genişletilmiş alan derinliği (EDOF)</string>
-	<string name="av_camera_focus_infinity">Sonsuzlukta odaklansın</string>
-	<string name="av_camera_focus_macro">Makro (yakın çekim) odak kipi</string>
-	<string name="av_camera_focus_continuous">Kamera devamlı odaklamaya çalışıyor</string>
-	<string name="av_photo_play_sound">Fotoğraf çekiminde ses çal</string>
-	<string name="av_photo_play_sound_descr">Fotoğrafları çekerken çalınacak sesi seçin</string>
-<string name="basemap_missing">Küçük yakınlaştırmalarda tüm dünyayı kaplayan temel dünya haritası eksik. Tam deneyim için lütfen World_basemap_x.obf indirin.</string>
-	<string name="local_index_no_items_to_do">%1$s\'a öğe yok</string>
-	<string name="tts_language_not_supported">Seçtiğiniz dil yüklü olan Android TTS (yazıdan-sese) motoru tarafından desteklenmiyor. Mağazada başka TTS motoruna bakmak ister misiniz? Aksi halde önceden yüklenen TTS dili kullanılacak.</string>
-	<string name="gpx_option_reverse_route">GPX yönünü tersine çevir</string>
-	<string name="switch_to_vector_map_to_see">Bu konum için çevrimdışı vektör haritası. \n\t\n\tKullanmak için \'Menü\' → \'Harita Katmanları\' → \'Harita Kaynağı…\' → \'Çevrimdışı vektör haritalar\'.</string>
-	<string name="choose_audio_stream">Sesli yönlendirme çıktısı</string>
-	<string name="choose_audio_stream_descr">Sesli yönlendirmenin oynatılacağı hoparlörü seç</string>
-	<string name="voice_stream_voice_call">Sesli çağrı sesi (araç BT setini engellemeyi de dener)</string>
-	<string name="map_transparency_descr">Temel harita saydamlığını değiştirin</string>
-	<string name="map_transparency">Temel harita saydamlığı</string>
-	<string name="shared_string_none">Hiçbiri</string>
-	<string name="map_underlay">Alt katman harita</string>
-	<string name="map_underlay_descr">Alt katman harita seç</string>
-	<string name="layer_overlay">Üst katman harita…</string>
-	<string name="map_overlay">Üst katman harita</string>
-	<string name="map_overlay_descr">Üst katman harita seç</string>
-	<string name="level_to_switch_vector_raster_descr">Vektör haritaların kullanımı için asgari yaklaştırma seviyesi</string>
-	<string name="level_to_switch_vector_raster">Asgari vektör yakınlaştırma seviyesi</string>
-	
-	<string name="routing_attr_prefer_motorway_name">Otoyolları tercih et</string>
-	<string name="routing_attr_prefer_motorway_description">Otoyolları tercih et</string>
-	
-	<string name="routing_attr_avoid_toll_name">Paralı yollardan sakın</string>
-	<string name="routing_attr_avoid_toll_description">Paralı yollardan sakın</string>
-	<string name="routing_attr_avoid_unpaved_name">Asfaltsız yollardan sakın</string>
-	<string name="routing_attr_avoid_unpaved_description">Asfaltsız yollardan kaçın</string>
-	<string name="routing_attr_avoid_ferries_name">Feribotlardan sakın</string>
-	<string name="routing_attr_avoid_ferries_description">Feribotlardan sakın</string>
-	<string name="routing_attr_avoid_motorway_name">Otoyollardan sakın</string>
-	<string name="routing_attr_avoid_motorway_description">Otoyollardan sakın</string>
-	<string name="routing_attr_weight_name">Ağırlık sınırı</string>
-	<string name="routing_attr_weight_description">Güzergahlara uygun olmak için araç ağırlığını belirt</string>
+    <string name="menu_layers">Harita katmanları</string>
+    <string name="gps_status_app_not_found">GPS Durum uygulaması yüklenmedi, mağazada arayın?</string>
+    <string name="poi_filter_closest_poi">En yakın POI</string>
+    <string name="amenity_type_administrative">İdari</string>
+    <string name="amenity_type_barrier">Engel</string>
+    <string name="amenity_type_historic">Tarihi</string>
+    <string name="amenity_type_man_made">İnsan yapımı</string>
+    <string name="amenity_type_military">Askeri</string>
+    <string name="amenity_type_natural">Doğal</string>
+    <string name="amenity_type_office">Büro</string>
+    <string name="amenity_type_shop">Alışveriş</string>
+    <string name="amenity_type_sport">Spor</string>
+    <string name="amenity_type_sustenance">Gıda</string>
+    <string name="amenity_type_tourism">Turizm</string>
+    <string name="search_address_region">Bölge</string>
+    <string name="search_address_city">Şehir</string>
+    <string name="search_address_street">Sokak</string>
+    <string name="search_address_building">Bina</string>
+    <string name="search_address_building_option">Bina</string>
+    <string name="search_address_street_option">Kesişen sokak</string>
+    <string name="navigate_point_top_text">Seçilen biçimde (D - derece, M - dakika, S - saniye) enlem ve boylamı girin</string>
+    <string name="navigate_point_latitude">Enlem</string>
+    <string name="navigate_point_longitude">Boylam</string>
+    <string name="search_near_map">Mevcut harita konumu yakınlarında ara</string>
+    <string name="show_more_map_detail_descr">Yakınlaştırmalarda biraz daha vektör harita ayrıntısı göster (yollar gibi)</string>
+    <string name="tts_missing_language_data">Seçilen dil için veri yüklü değil. Yüklemek için mağazaya gitmek ister misiniz?</string>
+    <string name="gpx_option_destination_point">Mevcut varış noktasını kullan</string>
+    <string name="voice_stream_notification">Bildirim sesi</string>
+    <string name="voice_stream_music">Ortam/müzik sesi</string>
+    <string name="warning_tile_layer_not_downloadable">Uygulama %1$s harita katmanını indiremiyor, lütfen tekrar yüklemeyi deneyin.</string>
+    <string name="overlay_transparency_descr">Katman şeffaflığını değiştir</string>
+    <string name="overlay_transparency">Katman şeffaflığı</string>
+    <string name="internet_not_available">İşlem için gerekli genel ağ (internet) bağlantısı mevcut değil</string>
+    <string name="install_more">Daha fazla yükle…</string>
+    <string name="si_mi_feet">Mil/fit</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="send_location_way_choose_title">Konumu paylaş</string>
+    <string name="send_location_sms_pattern">Konum: %1$s\n%2$s</string>
+    <string name="send_location">Konum gönder</string>
+    <string name="context_menu_item_share_location">Konum paylaş</string>
+    <string name="amenity_type_landuse">Arazi</string>
+    <string name="amenity_type_transportation">Ulaşım</string>
+    <string name="shared_string_io_error">G/Ç hatası</string>
+    <string name="km">km</string>
+    <string name="km_h">km/h</string>
+    <string name="m">m</string>
+    <string name="poi_filter_custom_filter">Özel süzgeç</string>
+    <string name="specified_dir_doesnt_exist">Belirtilen klasörü bulamıyor.</string>
+    <string name="application_dir">Veri depolama dizini</string>
+    <string name="osmand_net_previously_installed">Önceki bir OsmAnd sürümü yüklü. Tüm çevrimdışı veri yeni uygulama tarafından desteklenecek. Fakat Favori noktalar eski uygulamada dışa aktarılıp, sonra yeni uygulamada içe aktarılmalıdır.</string>
+    <string name="build_installed">{0} yapımı başarıyla yüklendi ({1}).</string>
+    <string name="downloading_build">Yapı indiriliyor…</string>
+    <string name="loading_builds_failed">OsmAnd yapı listesi alınırken başarısız olundu</string>
+    <string name="loading_builds">OsmAnd yapıları yükleniyor…</string>
+    <string name="select_build_to_install">Yüklemek için OsmAnd yapısı seçin</string>
+    <string name="voice_is_not_available_msg">Sesli yönlendirme mevcut değil. Lütfen \'ayarlar\' --&gt; \'Sesle yönlendirme\' ye gidin ve ses veri paketi seçin ya da indirin.</string>
+    <string name="daynight_mode_sensor">Işık algılayıcısı</string>
+    <string name="daynight_descr">Gündüz/gece değişim kipi kuralını seçin</string>
+    <string name="download_files_question">{0} dosya indirilecek ({1} MB)?</string>
+    <string name="items_were_selected">{0} öğe seçildi</string>
+    <string name="filter_existing_indexes">İndirilen</string>
+    <string name="fast_route_mode_descr">"Hızlı güzergah hesaplamayı etkinleştir ya da yakıt tasarrufu için devre dışı bırak. "</string>
+    <string name="continuous_rendering">Devamlı işleme</string>
+    <string name="rendering_exception">Seçilen alanın işlemesi yapılırken hata oluştu</string>
+    <string name="show_point_options">Konum kullan …</string>
+    <string name="renderer_load_sucess">İşleyici başarıyla yüklendi</string>
+    <string name="renderer_load_exception">Özel durum oluştu: işleyici yüklenmedi</string>
+    <string name="poi_context_menu_website">İÇN websitesini göster</string>
+    <string name="poi_context_menu_call">İÇN telefonunu göster</string>
+    <string name="download_type_to_filter">süzmek için yazın</string>
+    <string name="context_menu_item_search_transport">Toplu taşıma ara</string>
+    <string name="transport_searching_transport">Ulaştırma sonuçları (hedef yok):</string>
+    <string name="transport_searching_route">Ulaşım sonuçları (hedefe {0}):</string>
+    <string name="transport_search_again">Taşıma aramasını sıfırla</string>
+    <string name="gpx_files_not_found">GPX dosyaları /tracks dizininde bulunamadı</string>
+    <string name="error_reading_gpx">GPX verisi okunamıyor</string>
+    <string name="poi_context_menu_modify">İÇN düzenle</string>
+    <string name="rotate_map_compass_opt">Pusulaya</string>
+    <string name="rotate_map_bearing_opt">Hareket yönüne</string>
+    <string name="rotate_map_none_opt">Döndürülmesin (kuzey yukarıda)</string>
+    <string name="rotate_map_to_bearing_descr">Harita ekran hizalamasını seçin</string>
+    <string name="show_route">Güzergah ayrıntıları</string>
+    <string name="shared_string_import">İçe Aktar</string>
+    <string name="error_occurred_loading_gpx">GPX yüklenirken hata oluştu</string>
+    <string name="none_region_found">Bölgeler için SD kart üzerinde çevrim dışı veri bulunamadı. İnternetten bölgeleri indirin.</string>
+    <string name="poi_namefinder_query_empty">İÇN bulmak için sorgu girişi yapın</string>
+    <string name="thanks_yandex_traffic">Trafik bilgileri için Yandex\'e teşekkürler.</string>
+    <string name="layer_poi">İÇN…</string>
+    <string name="background_service_wait_int_descr">Arka planda konum düzeltmesi için azami bekleme süresini belirleyin</string>
+    <string name="background_service_wait_int">Düzeltme için azami bekleme</string>
+    <string name="gps_provider">GPS</string>
+    <string name="background_service_provider">Konum sağlayıcı</string>
+    <string name="background_router_service_descr">Ekran kapalıyken konumu izlemek için OsmAnd\'ı arka planda çalıştırır</string>
+    <string name="background_router_service">Arka planda Osmand başlat</string>
+    <string name="off_router_service_no_gps_available">Arka plan navigasyon hizmeti açık olması bir konum sağlayıcı gerektirir.</string>
+    <string name="hide_poi_filter">Süzgeci gizle</string>
+    <string name="show_poi_filter">Süzgeci göster</string>
+    <string name="search_poi_filter">Süzgeç</string>
+    <string name="voice_provider">Sesli yönlendirme</string>
+    <string name="voice_data_initializing">Ses verisi yükleniyor…</string>
+    <string name="voice_data_not_supported">Ses verisinin desteklenmeyen sürümü</string>
+    <string name="voice_data_corrupted">Belirtilen ses verisi hatalı</string>
+    <string name="voice_data_unavailable">Seçilen ses verisi mevcut değil</string>
+    <string name="sd_unmounted">SD kart ulaşılabilir değil.\nHaritaları göremez ve bir şeyler arayamazsınız.</string>
+    <string name="sd_mounted_ro">SD kart sadece okunabilir.\nSadece önceden yüklenen haritaları görebilirsiniz ve genel ağdan (internetten) indiremezsiniz.</string>
+    <string name="first_time_download">Bölgeleri indir</string>
+    <string name="search_nearby">Yakınlarda ara</string>
+    <string name="map_orientation_default">Aygıt ile aynı</string>
+    <string name="map_orientation_portrait">Dikey</string>
+    <string name="map_orientation_landscape">Yatay</string>
+    <string name="map_screen_orientation_descr">Dikey, yatay veya aygıt</string>
+    <string name="add_new_rule">Yeni kural ekle</string>
+    <string name="transport_Stop">Durak</string>
+    <string name="transport_stops">durak</string>
+    <string name="transport_search_after">Sonraki Güzergah</string>
+    <string name="transport_search_before">Önceki Güzergah</string>
+    <string name="transport_finish_search">Aramayı bitir</string>
+    <string name="transport_route_distance">Güzergah mesafesi</string>
+    <string name="transport">Ulaşım</string>
+    <string name="show_transport_over_map_description">Toplu taşıma duraklarını haritada göster.</string>
+    <string name="show_transport_over_map">Taşıma duraklarını göster</string>
+    <string name="hello">OsmAnd yolbul uygulaması</string>
+    <string name="update_poi_success">İÇN verisi güncellendi ({0} yüklendi)</string>
+    <string name="update_poi_error_local">Yerel İÇN listesi güncellenemedi</string>
+    <string name="update_poi_error_loading">Sunucudan veri yüklenemedi</string>
+    <string name="update_poi_no_offline_poi_index">Bu alan için çevrim dışı İÇN verisi mevcut değil</string>
+    <string name="search_history_city">Şehir: {0}</string>
+    <string name="search_history_street">Sokak: {0}, {1}</string>
+    <string name="search_history_building">Bina: {0}, {1}, {2}</string>
+    <string name="shared_string_history">Geçmiş</string>
+    <string name="uploading_data">Veri yükleniyor…</string>
+    <string name="uploading">Yükleniyor…</string>
+    <string name="search_nothing_found">Sonuç bulunamadı</string>
+    <string name="hint_search_online">Çevrimiçi arama: Ev numarası, sokak, şehir</string>
+    <string name="search_offline_address">Çevrim dışı arama</string>
+    <string name="route_general_information">Toplam uzaklık %1$s, seyahat süresi %2$d s %3$d dak.</string>
+    <string name="router_service_descr">Çevrim içi veya çevrim dışı yolbul hizmeti seçin.</string>
+    <string name="sd_dir_not_accessible">Bellek kartında veri depolama klasörü erişilebilir değil!</string>
+    <string name="download_question">{0} - {1} indir ?</string>
+    <string name="download_question_exist">{0} için çevrim dışı veri zaten var ({1}). ({2}) güncellensin mi\?</string>
+    <string name="shared_string_downloading">İndiriliyor</string>
+    <string name="downloading_list_indexes">Mevcut bölgelerin listesi indiriliyor…</string>
+    <string name="list_index_files_was_not_loaded">https://osmand.net adresinden bölge listesi alınamadı.</string>
+    <string name="update_existing">Değiştir</string>
+    <string name="only_show">Güzergahı göster</string>
+    <string name="follow">Gezintiyi başlat</string>
+    <string name="mark_final_location_first">Lütfen ilk olarak varış noktası seçin</string>
+    <string name="opening_hours">Açılış saatleri</string>
+    <string name="auth_failed">Yetkilendirme başarısız</string>
+    <string name="loading_streets_buildings">Sokaklar/binalar yükleniyor…</string>
+    <string name="loading_streets">Sokaklar yükleniyor…</string>
+    <string name="poi">İÇN</string>
+    <string name="error_occurred_saving_gpx">GPX dosyası kaydedilemedi</string>
+    <string name="error_calculating_route">Rota hesaplanamadı</string>
+    <string name="error_calculating_route_occured">Rota hesaplanamadı</string>
+    <string name="empty_route_calculated">Hesaplanan rota boş</string>
+    <string name="new_route_calculated_dist">Yeni güzergah hesaplandı, mesafe</string>
+    <string name="reading_indexes">Yerel veri okunuyor…</string>
+    <string name="saving_gpx_tracks">GPX dosyası kaydediliyor…</string>
+    <string name="data_settings_descr">Dil belirleyin, veri indirin/tekrar yükleyin</string>
+    <string name="osm_settings">OSM düzenleme</string>
+    <string name="app_settings">Uygulama ayarları</string>
+    <string name="search_address">Adres ara</string>
+    <string name="choose_building">Bina seç</string>
+    <string name="choose_street">Sokak seç</string>
+    <string name="choose_city">Şehir veya posta kodu seçin</string>
+    <string name="ChooseCountry">Ülke seç</string>
+    <string name="map_view_3d">3B Harita Görüntüsü</string>
+    <string name="show_gps_coordinates_text">Harita üzerinde GPS koordinatlarını göster</string>
+    <string name="app_description">Gezinti uygulaması</string>
+    <string name="choose_available_region">Listeden bölge seçin</string>
+    <string name="Closest_Amenities">Yakın noktalar</string>
+    <string name="position_on_map_bottom">Alt</string>
+    <string name="osb_author_dialog_password">OSM şifresi (isteğe bağlı)</string>
+    <string name="poi_action_succeded_template">{0} olayı başarıyla tamamlandı.</string>
+    <string name="shared_string_clear">Temizle</string>
+    <string name="filter_current_poiButton">Süzgeç</string>
+    <string name="edit_filter_delete_dialog_title">Seçilen süzgeç silinsin mi?</string>
+    <string name="edit_filter_delete_message">{0} süzgeci silindi</string>
+    <string name="edit_filter_create_message">{0} süzgeci oluşturuldu</string>
+    <string name="av_camera_focus">Kamera odaklama tipi</string>
+    <string name="av_camera_focus_descr">Dahili kamera odaklama tipini seçin</string>
+    <string name="av_camera_focus_auto">Kendiliğinden odaklama</string>
+    <string name="av_camera_focus_edof">Genişletilmiş alan derinliği (EDOF)</string>
+    <string name="av_camera_focus_infinity">Sonsuzlukta odaklansın</string>
+    <string name="av_camera_focus_macro">Makro (yakın çekim) odak kipi</string>
+    <string name="av_camera_focus_continuous">Kamera devamlı odaklamaya çalışıyor</string>
+    <string name="av_photo_play_sound">Fotoğraf çekiminde ses çal</string>
+    <string name="av_photo_play_sound_descr">Fotoğrafları çekerken çalınacak sesi seçin</string>
+    <string name="basemap_missing">Küçük yakınlaştırmalarda tüm dünyayı kaplayan temel dünya haritası eksik. Tam deneyim için lütfen World_basemap_x.obf indirin.</string>
+    <string name="local_index_no_items_to_do">%1$s\'a öğe yok</string>
+    <string name="tts_language_not_supported">Seçtiğiniz dil yüklü olan Android TTS (yazıdan-sese) motoru tarafından desteklenmiyor. Mağazada başka TTS motoruna bakmak ister misiniz? Aksi halde önceden yüklenen TTS dili kullanılacak.</string>
+    <string name="gpx_option_reverse_route">GPX yönünü tersine çevir</string>
+    <string name="switch_to_vector_map_to_see">Bu konum için çevrimdışı vektör haritası. \n\t\n\tKullanmak için \'Menü\' → \'Harita Katmanları\' → \'Harita Kaynağı…\' → \'Çevrimdışı vektör haritalar\'.</string>
+    <string name="choose_audio_stream">Sesli yönlendirme çıktısı</string>
+    <string name="choose_audio_stream_descr">Sesli yönlendirmenin oynatılacağı hoparlörü seç</string>
+    <string name="voice_stream_voice_call">Sesli çağrı sesi (araç BT setini engellemeyi de dener)</string>
+    <string name="map_transparency_descr">Temel harita saydamlığını değiştirin</string>
+    <string name="map_transparency">Temel harita saydamlığı</string>
+    <string name="shared_string_none">Hiçbiri</string>
+    <string name="map_underlay">Alt katman harita</string>
+    <string name="map_underlay_descr">Alt katman harita seç</string>
+    <string name="layer_overlay">Üst katman harita…</string>
+    <string name="map_overlay">Üst katman harita</string>
+    <string name="map_overlay_descr">Üst katman harita seç</string>
+    <string name="level_to_switch_vector_raster_descr">Vektör haritaların kullanımı için asgari yaklaştırma seviyesi</string>
+    <string name="level_to_switch_vector_raster">Asgari vektör yakınlaştırma seviyesi</string>
+    <string name="routing_attr_prefer_motorway_name">Otoyolları tercih et</string>
+    <string name="routing_attr_prefer_motorway_description">Otoyolları tercih et</string>
+    <string name="routing_attr_avoid_toll_name">Paralı yollardan sakın</string>
+    <string name="routing_attr_avoid_toll_description">Paralı yollardan sakın</string>
+    <string name="routing_attr_avoid_unpaved_name">Asfaltsız yollardan sakın</string>
+    <string name="routing_attr_avoid_unpaved_description">Asfaltsız yollardan kaçın</string>
+    <string name="routing_attr_avoid_ferries_name">Feribotlardan sakın</string>
+    <string name="routing_attr_avoid_ferries_description">Feribotlardan sakın</string>
+    <string name="routing_attr_avoid_motorway_name">Otoyollardan sakın</string>
+    <string name="routing_attr_avoid_motorway_description">Otoyollardan sakın</string>
+    <string name="routing_attr_weight_name">Ağırlık sınırı</string>
+    <string name="routing_attr_weight_description">Güzergahlara uygun olmak için araç ağırlığını belirt</string>
     <string name="copying_osmand_files">Kopyalama Osmand veri dosyaları …</string>
     <string name="calculate_osmand_route_gpx">Çevrimdışı yol hesaplama Osmand</string>
     <string name="app_mode_truck">Kamyon</string>
-    
-	
     <string name="copying_osmand_one_file_descr">(%s) dosyası yeni hedefine kopyalanıyor…</string>
     <string name="copying_osmand_files_descr">OsmAnd veri dosyaları yeni hedef (%s) \'e kopyalanıyor…</string>
     <string name="guidance_preferences_descr">Navigasyon tercihleri</string>
     <string name="routing_preferences_descr">Güzergah seçenekleri</string>
     <string name="speech_rate_descr">TTS için konuşma hızını belirle.</string>
     <string name="speech_rate">Hoparlör yerleşimi</string>
-    
     <string name="complex_route_calculation_failed">Hızlı rota hesaplama ( $1%s) başarısız oldu , hesaplama yavaş çare .</string>
     <string name="disable_complex_routing_descr">Araba navigasyonu için 2 fazlı yönlendirmesi devre dışı bırakın</string>
     <string name="disable_complex_routing">Karmaşık yönlendirmesi devre dışı bırakın</string>
     <string name="amenity_type_seamark">Mark Deniz</string>
     <string name="app_modes_choose_descr"/>
     <string name="app_modes_choose">Uygulama Profilleri</string>
-	<string name="map_widget_map_rendering">Harita oluşturma</string>
+    <string name="map_widget_map_rendering">Harita oluşturma</string>
     <string name="app_mode_hiking">Yürüyüş</string>
     <string name="app_mode_motorcycle">Motosikletler</string>
     <string name="app_mode_boat">Tekne</string>
     <string name="app_mode_aircraft">Uçak</string>
-    
-    
     <string name="local_osm_changes_delete_all_confirm">Sen%1$d OSM değişiklikleri silmek için gidiyoruz. Emin misiniz?</string>
     <string name="shared_string_delete_all">Tümünü sil</string>
     <string name="animate_routing_route_not_calculated">Lütfen ilk olarak rotayı hesaplayın</string>
     <string name="animate_routing_route">Hesaplanan rotayı kullanarak simülasyon </string>
     <string name="animate_routing_gpx">GPX Rota kullanarak simülasyonlar</string>
     <string name="shared_string_remember_my_choice">Seçimi anımsa</string>
-    
     <string name="shared_string_and">ve</string>
     <string name="shared_string_or">veya</string>
-	
-	<string name="auto_zoom_none">Kendiliğinden görüntü-yakınlaştırma olmasın</string>
-	<string name="auto_zoom_close">Yakınlatırılmış görüntüye</string>
-	<string name="auto_zoom_far">Orta seviye görüntüye</string>
-	<string name="auto_zoom_farthest">Uzun mesafeli görüntüye</string>
-	<string name="map_magnifier">Harita büyüteci</string>
-	<string name="base_world_map">Dünya Haritası</string>
-	
-	<string name="local_index_tile_data_zooms">Zvmhay indirildi : %1$s</string>
+    <string name="auto_zoom_none">Kendiliğinden görüntü-yakınlaştırma olmasın</string>
+    <string name="auto_zoom_close">Yakınlatırılmış görüntüye</string>
+    <string name="auto_zoom_far">Orta seviye görüntüye</string>
+    <string name="auto_zoom_farthest">Uzun mesafeli görüntüye</string>
+    <string name="map_magnifier">Harita büyüteci</string>
+    <string name="base_world_map">Dünya Haritası</string>
+    <string name="local_index_tile_data_zooms">Zvmhay indirildi : %1$s</string>
     <string name="local_index_tile_data_name">Döşeme verisi : %1$s</string>
     <string name="edit_tilesource_successfully">Kaydedilen Çini kaynağı %1$s</string>
     <string name="edit_tilesource_maxzoom">maksimum Yakınlaştırma</string>
-    
     <string name="specified_directiory_not_writeable">Haritalar belirtilen dizinde oluşturulamadı</string>
-	<string name="copying_osmand_file_failed">Dosyaları kopyalama başarısız oldu</string>    
+    <string name="copying_osmand_file_failed">Dosyaları kopyalama başarısız oldu</string>
     <string name="storage_directory_external">Dış depolama</string>
     <string name="storage_directory_multiuser">Çok kullanıcılı depolama</string>
     <string name="storage_directory_internal_app">Dahili uygulama belleği</string>
@@ -1110,23 +968,23 @@
     <string name="search_poi_category_hint">Tümünü aramak için yazın</string>
     <string name="shared_string_is_open">Şimdi aç</string>
     <string name="rendering_attr_OSMMapperAssistant_name">OSM Eşleştiricisi Yardımcısı</string>
-	<string name="agps_info">A-GPS bilgisi</string>
-	<string name="shared_string_manage">Yönet</string>
-	<string name="shared_string_edit">Düzenle</string>
-	<string name="shared_string_places">Yerler</string>
-	<string name="shared_string_search">Ara</string>
-	<string name="shared_string_show_description">Açıklamayı göster.</string>
-	<string name="shared_string_message">İleti</string>
-	<string name="agps_data_last_downloaded">A-GPS verisi son indirilen: %1$s</string>
+    <string name="agps_info">A-GPS bilgisi</string>
+    <string name="shared_string_manage">Yönet</string>
+    <string name="shared_string_edit">Düzenle</string>
+    <string name="shared_string_places">Yerler</string>
+    <string name="shared_string_search">Ara</string>
+    <string name="shared_string_show_description">Açıklamayı göster.</string>
+    <string name="shared_string_message">İleti</string>
+    <string name="agps_data_last_downloaded">A-GPS verisi son indirilen: %1$s</string>
     <string name="welmode_download_maps">Harita indir</string>
-	<string name="welcome_header">Hoş Geldiniz</string>
+    <string name="welcome_header">Hoş Geldiniz</string>
     <string name="current_route">Şu anki rota</string>
     <string name="mark_to_delete">Silmek için işaretle</string>
-	<string name="confirmation_to_clear_history">Geçmişi temizlemek istiyor musunuz?</string>
+    <string name="confirmation_to_clear_history">Geçmişi temizlemek istiyor musunuz?</string>
     <string name="no_updates_available">Kullanılabilir güncelleme yok</string>
     <string name="download_live_updates">Canlı güncelleştirmeler</string>
-	<string name="rendering_value_default13_name">Varsayılan (13)</string>
-	<string name="rendering_value_defaultTranslucentCyan_name">Varsayılan (yarı saydam camgöbeği)</string>
+    <string name="rendering_value_default13_name">Varsayılan (13)</string>
+    <string name="rendering_value_defaultTranslucentCyan_name">Varsayılan (yarı saydam camgöbeği)</string>
     <string name="rendering_attr_currentTrackColor_name">GPX rengi</string>
     <string name="rendering_attr_currentTrackWidth_name">GPX genişliği</string>
     <string name="rendering_value_red_name">Kırmızı</string>
@@ -1150,73 +1008,71 @@
     <string name="dark_theme">Koyu</string>
     <string name="lang_pms">Piyemontece</string>
     <string name="error_message_pattern">Hata: {0}</string>
-<string name="user_hates_app_get_feedback">Nedenini bize söyleyin.</string>
-	<string name="user_hates_app_get_feedback_long">Lütfen bize bu uygulamada ne değişklikler olmasını istediğinizi söyleyin.</string>
-	<string name="failed_to_upload">Yükleme başarısız oldu</string>
-	<string name="delete_change">Değişikliği sil</string>
-	<string name="successfully_uploaded_pattern">Başarıyla yüklendi {0}/{1}</string>
-	<string name="try_again">Tekrar deneyin</string>
-	<string name="archive_wikipedia_data">Daha önce eski ve uyumsuz Wikipedia verisi indirmişsiniz. Bunları arşivlemek ister misiniz?</string>
+    <string name="user_hates_app_get_feedback">Nedenini bize söyleyin.</string>
+    <string name="user_hates_app_get_feedback_long">Lütfen bize bu uygulamada ne değişklikler olmasını istediğinizi söyleyin.</string>
+    <string name="failed_to_upload">Yükleme başarısız oldu</string>
+    <string name="delete_change">Değişikliği sil</string>
+    <string name="successfully_uploaded_pattern">Başarıyla yüklendi {0}/{1}</string>
+    <string name="try_again">Tekrar deneyin</string>
+    <string name="archive_wikipedia_data">Daha önce eski ve uyumsuz Wikipedia verisi indirmişsiniz. Bunları arşivlemek ister misiniz?</string>
     <string name="download_wikipedia_files">Ekstra Wikipedia verisi indirmek ister misiniz? (%1$s MB)?</string>
     <string name="gps_network_not_enabled">Konum servisi devre dışı. Ektinleştirmek ister misiniz?</string>
     <string name="shared_string_show_details">Ayrıntıları göster</string>
     <string name="rendering_value_disabled_name">Devre dışı</string>
-    
     <string name="rendering_attr_hideHouseNumbers_name">Ev kapı numaraları</string>
     <string name="confirm_usage_speed_cameras">Çoğu ülkelerde (Almanya, Fransa, İtalya ve diğerleri) hız kamerası uyarılarının kullanımı yasaktır. OsmAnd yasaları çiğnemeniz durumunda sorumluluk kabul etmez. Eğer bu özellik sizin için uygunsa evet\'e tıklayın.</string>
-	
-	<string name="shared_string_go">Git</string>
-	<string name="action_create">Eylem oluştur</string>
-	<string name="action_modify">Eylem düzenle</string>
-	<string name="action_delete">Eylem sil</string>
-	<string name="osm_edits">OSM düzeltmeleri</string>
-	<string name="osmand_parking_hour">sa</string>
-	<string name="osmand_parking_minute">dk</string>
-	<string name="osmand_parking_time_left">sol</string>
-	<string name="your_edits">Düzeltmeleriniz</string>
+    <string name="shared_string_go">Git</string>
+    <string name="action_create">Eylem oluştur</string>
+    <string name="action_modify">Eylem düzenle</string>
+    <string name="action_delete">Eylem sil</string>
+    <string name="osm_edits">OSM düzeltmeleri</string>
+    <string name="osmand_parking_hour">sa</string>
+    <string name="osmand_parking_minute">dk</string>
+    <string name="osmand_parking_time_left">sol</string>
+    <string name="your_edits">Düzeltmeleriniz</string>
     <string name="tips_and_tricks_descr">Sık sorulan sorular, son değişiklikler ve diğerleri.</string>
     <string name="routing_settings_2">Navigasyon ayarları</string>
     <string name="general_settings_2">Genel ayarlar</string>
-	<string name="shared_string_do_not_use">Kullanma</string>
-	<string name="shared_string_enable">Etkinleştir</string>
-	<string name="shared_string_disable">Devre dışı bırak</string>
-	<string name="shared_string_enabled">Etkin</string>
-	<string name="shared_string_disabled">Devre dışı</string>
-	<string name="shared_string_selected">Seçili</string>
-	<string name="shared_string_never">Hiçbir zaman</string>
-	<string name="shared_string_select_on_map">Haritada seç</string>
-	<string name="shared_string_share">Paylaş</string>
-	<string name="shared_string_export">Dışa aktar</string>
-	<string name="shared_string_more">Daha…</string>
-	<string name="shared_string_unexpected_error">Beklenmeyen hata</string>
-	<string name="shared_string_action_template">Eylem {0}</string>
-	<string name="shared_string_show">Göster</string>
-	<string name="shared_string_show_all">Tümünü göster</string>
-	<string name="shared_string_favorite">Favori</string>
-	<string name="shared_string_address">Adres</string>
-	<string name="shared_string_my_location">Konumum</string>
-	<string name="shared_string_my_places">Yerlerim</string>
-	<string name="shared_string_my_favorites">Favorilerim</string>
-	<string name="shared_string_audio">Ses</string>
-	<string name="shared_string_video">Vidyo</string>
-	<string name="shared_string_photo">Fotoğraf</string>
-	<string name="days_behind">gün geride</string>
-	<string name="back_to_map">Haritaya dön</string>
-	<string name="share_note">Not paylaş</string>
+    <string name="shared_string_do_not_use">Kullanma</string>
+    <string name="shared_string_enable">Etkinleştir</string>
+    <string name="shared_string_disable">Devre dışı bırak</string>
+    <string name="shared_string_enabled">Etkin</string>
+    <string name="shared_string_disabled">Devre dışı</string>
+    <string name="shared_string_selected">Seçili</string>
+    <string name="shared_string_never">Hiçbir zaman</string>
+    <string name="shared_string_select_on_map">Haritada seç</string>
+    <string name="shared_string_share">Paylaş</string>
+    <string name="shared_string_export">Dışa aktar</string>
+    <string name="shared_string_more">Daha…</string>
+    <string name="shared_string_unexpected_error">Beklenmeyen hata</string>
+    <string name="shared_string_action_template">Eylem {0}</string>
+    <string name="shared_string_show">Göster</string>
+    <string name="shared_string_show_all">Tümünü göster</string>
+    <string name="shared_string_favorite">Favori</string>
+    <string name="shared_string_address">Adres</string>
+    <string name="shared_string_my_location">Konumum</string>
+    <string name="shared_string_my_places">Yerlerim</string>
+    <string name="shared_string_my_favorites">Favorilerim</string>
+    <string name="shared_string_audio">Ses</string>
+    <string name="shared_string_video">Vidyo</string>
+    <string name="shared_string_photo">Fotoğraf</string>
+    <string name="days_behind">gün geride</string>
+    <string name="back_to_map">Haritaya dön</string>
+    <string name="share_note">Not paylaş</string>
     <string name="watch">İzle</string>
-	<string name="notes">Notlar</string>
-	<string name="online_map">Çevrim içi harita</string>
-	<string name="roads_only">Sadece yollar</string>
+    <string name="notes">Notlar</string>
+    <string name="online_map">Çevrim içi harita</string>
+    <string name="roads_only">Sadece yollar</string>
     <string name="device_memory">Aygıt belleği</string>
     <string name="edit_group">Grubu düzenle</string>
     <string name="parking_place">Park yeri</string>
     <string name="gps_status">GPS durumu</string>
     <string name="shared_string_gpx_points">Noktalar</string>
-	<string name="rendering_attr_roadStyle_name">Yol tarzı</string>
+    <string name="rendering_attr_roadStyle_name">Yol tarzı</string>
     <string name="rendering_value__name">Varsayılan</string>
     <string name="rendering_value_default_name">Standart</string>
     <string name="traffic_warning_pedestrian">Yaya geçidi</string>
-	<string name="show_pedestrian_warnings">Yaya geçitleri</string>
+    <string name="show_pedestrian_warnings">Yaya geçitleri</string>
     <string name="dash_download_msg_none">Çevrim dışı haritalar indirmek istiyor musunuz?</string>
     <string name="dash_download_msg">%1$s harita indirdiniz</string>
     <string name="dash_download_new_one">Yeni harita indir</string>
@@ -1225,43 +1081,40 @@
     <string name="download_tab_downloads">Tüm İndirmeler</string>
     <string name="download_tab_updates">Güncellemeler</string>
     <string name="download_tab_local">Yerel</string>
-	<string name="everything_up_to_date">Tüm dosyalar güncel</string>
+    <string name="everything_up_to_date">Tüm dosyalar güncel</string>
     <string name="home_button">Ev</string>
-    
-	<string name="map_update">%1$s harita için güncelleme var</string>
-	<string name="coordinates">Koordinatlar</string>
-	<string name="rendering_category_details">Ayrıntılar</string>
+    <string name="map_update">%1$s harita için güncelleme var</string>
+    <string name="coordinates">Koordinatlar</string>
+    <string name="rendering_category_details">Ayrıntılar</string>
     <string name="map_widget_top">Durum çubuğu</string>
-	<string name="map_widget_right">Sağ panel</string>
-	<string name="map_widget_left">Sol panel</string>
-	<string name="configure_map">Haritayı yapılandır</string>
-    
+    <string name="map_widget_right">Sağ panel</string>
+    <string name="map_widget_left">Sol panel</string>
+    <string name="configure_map">Haritayı yapılandır</string>
     <string name="speed_limit_exceed">Hız sınırı oynama payı</string>
-	<string name="traffic_warning_speed_limit">Hız sınırı</string>
+    <string name="traffic_warning_speed_limit">Hız sınırı</string>
     <string name="traffic_warning_stop">Dur işareti</string>
     <string name="traffic_warning_speed_camera">Hız kamerası</string>
     <string name="traffic_warning">Trafik uyarısı</string>
-	<string name="way_alarms">Trafik uyarıları</string>
-	<string name="confirm_every_run">Her zaman sor</string>
-	<string name="shared_string_import2osmand">OsmAnd\'a aktar</string>
+    <string name="way_alarms">Trafik uyarıları</string>
+    <string name="confirm_every_run">Her zaman sor</string>
+    <string name="shared_string_import2osmand">OsmAnd\'a aktar</string>
     <string name="read_full_article">Tüm metni oku (çevrim içi)</string>
     <string name="rendering_value_walkingRoutesOSMC_name">OSMC göre olan boyama</string>
     <string name="local_recordings_delete_all_confirm">%1$d notu silmek üzeresiniz. Emin misiniz?</string>
-	<string name="local_osm_changes_upload_all_confirm">%1%d düzenlemeyi OSM\'ye yüklemek üzeresiniz. Emin misiniz?</string>
+    <string name="local_osm_changes_upload_all_confirm">%1%d düzenlemeyi OSM\'ye yüklemek üzeresiniz. Emin misiniz?</string>
     <string name="plugin_nautical_name">Deniz haritası görünümü</string>
-	<string name="plugin_ski_name">Kayak haritası görünümü</string>
-	<string name="text_size">Yazı boyutu</string>
+    <string name="plugin_ski_name">Kayak haritası görünümü</string>
+    <string name="text_size">Yazı boyutu</string>
     <string name="text_size_descr">Haritadaki yazı boyutunu ayarla.</string>
     <string name="speak_favorites">Yakındaki Sık Kıllanılanlar</string>
-	<string name="speak_poi">Yakınlardaki POI</string>
-	<string name="duration">Süre</string>
+    <string name="speak_poi">Yakınlardaki POI</string>
+    <string name="duration">Süre</string>
     <string name="distance">Mesafe</string>
     <string name="rendering_value_car_name">Araba</string>
     <string name="rendering_value_bicycle_name">Bisiklet</string>
     <string name="rendering_value_pedestrian_name">Yaya</string>
-    
     <string name="pause_navigation">Yolbulu duraklat</string>
- 	<string name="continue_navigation">Navigasyona Devam Et</string>
+    <string name="continue_navigation">Navigasyona Devam Et</string>
     <string name="local_map_names">Yerel isimler</string>
     <string name="home">Pano</string>
     <string name="rendering_attr_hideBuildings_name">Binalar</string>
@@ -1272,21 +1125,14 @@
     <string name="sort_by_distance">Uzaklığa göre sırala</string>
     <string name="sort_by_name">İsme göre sırala</string>
     <string name="gpx_info_average_speed">"Ortalama hız: %1$s "</string>
-	<string name="gpx_info_maximum_speed">Maksimum hız: %1$s</string>
-	<string name="gpx_info_avg_altitude">Ortalama yükseklik: %1$s</string>
-	
-	<string name="rendering_value_pink_name">Pembe</string>
-	
-	<string name="rendering_value_brown_name">Kahverengi</string>
-	
-	
-	
-	
-
+    <string name="gpx_info_maximum_speed">Maksimum hız: %1$s</string>
+    <string name="gpx_info_avg_altitude">Ortalama yükseklik: %1$s</string>
+    <string name="rendering_value_pink_name">Pembe</string>
+    <string name="rendering_value_brown_name">Kahverengi</string>
     <string name="av_locations_descr">Not yerleri ile GPX dosyası</string>
     <string name="av_locations">Lokasyonlar</string>
     <string name="plugin_settings">Eklentiler</string>
-	<string name="routing_attr_avoid_shuttle_train_description">Mekik treninden kaçın</string>
+    <string name="routing_attr_avoid_shuttle_train_description">Mekik treninden kaçın</string>
     <string name="traffic_warning_hazard">Tehlike</string>
     <string name="rendering_value_boldOutline_name">Kalın anahat</string>
     <string name="lang_bn">Bengalce</string>
@@ -1319,42 +1165,39 @@
     <string name="lang_ceb">Sabuan dili</string>
     <string name="disable_recording_once_app_killed">Tek başına günlüğe eklemeyi önle</string>
     <string name="disable_recording_once_app_killed_descrp">Uygulama kapatılırsa (son uygulamalardan) GPX iz kaydına ara verilecektir. (OsmAnd Uyku modu simgesi Bildirim alanından kaybolur)</string>
-    
     <string name="routing_attr_avoid_shuttle_train_name">Mekik treninden kaçın</string>
-	<string name="local_indexes_cat_wiki">Vikipedi</string>
+    <string name="local_indexes_cat_wiki">Vikipedi</string>
     <string name="osm_edit_context_menu_delete">OSM düzeltmesini sil</string>
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Rota kapsamına göre Boyama</string>
     <string name="shared_string_logoff">Oturumu kapat</string>
     <string name="application_dir_change_warning3">OsmAnd\'ın aynı zamanda veri dosyalarınıda yeni varış noktasına kopyalamasını ister misiniz?</string>
     <string name="welcome_select_region">Doğru trafik işaretleri ve düzenlemeleri yansıtmak için sürüş bölgenizi seçin:</string>
-	<string name="welcome_text">OsmAnd küresel çevrim dışı harita tarama ve küresel çevrim dışı yolbul sunar!</string>
-	<string name="osm_changes_added_to_local_edits">OSM değişiklikleri yerel değişiklik kümesine eklendi</string>
-   	<string name="delay_to_start_navigation_descr">Rota planlama ekranındayken beklenecek süreyi belirtin.</string>
+    <string name="welcome_text">OsmAnd küresel çevrim dışı harita tarama ve küresel çevrim dışı yolbul sunar!</string>
+    <string name="osm_changes_added_to_local_edits">OSM değişiklikleri yerel değişiklik kümesine eklendi</string>
+    <string name="delay_to_start_navigation_descr">Rota planlama ekranındayken beklenecek süreyi belirtin.</string>
     <string name="delay_to_start_navigation">Sonra adım-adım navigasyona başla…</string>
     <string name="osmand_parking_overdue">süresi geçmiş</string>
-	<string name="parking_place_limited">Zaman sınırlı otopark</string>
-	<string name="waypoint_visit_after">Sonra ziyaret edin</string>
+    <string name="parking_place_limited">Zaman sınırlı otopark</string>
+    <string name="waypoint_visit_after">Sonra ziyaret edin</string>
     <string name="waypoint_visit_before">Önce ziyaret et</string>
     <string name="simulate_your_location">Konumunuzu simüle et</string>
     <string name="drawer">Düz liste</string>
     <string name="short_location_on_map">Enl %1$s\nBoyl %2$s</string>
     <string name="shared_string_ellipsis">…</string>
-	<string name="shared_string_dismiss">Vazgeç</string>
-	<string name="shared_string_selected_lowercase">seçili</string>
-	<string name="shared_string_deselect">Seçimini kaldırın</string>
-	<string name="shared_string_deselect_all">Tüm Seçimleri Kaldır</string>
-	<string name="shared_string_collapse">Daralt</string>
-	<string name="shared_string_tracks">Benim İzlerim</string>
-	<string name="shared_string_currently_recording_track">Mevcut kaydedilen izim</string>
-	<string name="route_points">Rota noktaları</string>
-	<string name="track_segments">İz bölümü</string>
-	<string name="track_points">İz noktası</string>
-	<string name="record_plugin_name">Seyahat kaydetme</string>
-	<string name="record_plugin_description">"Bu eklenti harita ekranında zımbırtıya elle donunca GPX iz oluşturma ve saklama özelliğini etkinleştirir, ya da GPX izini navigasyon boyunca otomatik olarak saklayabilir.\n\nKaydedilen izler arkadaşlarınızla veya OSM katkıcılarıyla paylaşılabilir. Atletler çalışmalarını izlemek için iz kaydedebilir.  Basit iz analizi OsmAnd içinden yapılabilir, misal tur zamanı, ortalama hız vs., ve izler tabii ki daha sonra üçüncü parti araçlarla da analiz edilebilir. "</string>
-	
-	
-	<string name="plugin_touringview_name">Harita gezinti görünümü</string>
-	<string name="lang_new">Nevar / Nepal Bhasa</string>
+    <string name="shared_string_dismiss">Vazgeç</string>
+    <string name="shared_string_selected_lowercase">seçili</string>
+    <string name="shared_string_deselect">Seçimini kaldırın</string>
+    <string name="shared_string_deselect_all">Tüm Seçimleri Kaldır</string>
+    <string name="shared_string_collapse">Daralt</string>
+    <string name="shared_string_tracks">Benim İzlerim</string>
+    <string name="shared_string_currently_recording_track">Mevcut kaydedilen izim</string>
+    <string name="route_points">Rota noktaları</string>
+    <string name="track_segments">İz bölümü</string>
+    <string name="track_points">İz noktası</string>
+    <string name="record_plugin_name">Seyahat kaydetme</string>
+    <string name="record_plugin_description">"Bu eklenti harita ekranında zımbırtıya elle donunca GPX iz oluşturma ve saklama özelliğini etkinleştirir, ya da GPX izini navigasyon boyunca otomatik olarak saklayabilir.\n\nKaydedilen izler arkadaşlarınızla veya OSM katkıcılarıyla paylaşılabilir. Atletler çalışmalarını izlemek için iz kaydedebilir.  Basit iz analizi OsmAnd içinden yapılabilir, misal tur zamanı, ortalama hız vs., ve izler tabii ki daha sonra üçüncü parti araçlarla da analiz edilebilir. "</string>
+    <string name="plugin_touringview_name">Harita gezinti görünümü</string>
+    <string name="lang_new">Nevar / Nepal Bhasa</string>
     <string name="favorite_category_add_new">Yeni ekle</string>
     <string name="favorite_category_select">Kategori seç</string>
     <string name="default_speed_system_descr">Hız birimini tanımla.</string>
@@ -1376,18 +1219,17 @@
     <string name="osm_edit_reopened_note">Yeniden açılmış OSM Notu</string>
     <string name="osm_edit_commented_note">Yorum yazılmış OSM Notu</string>
     <string name="osm_edit_removed_note">Silinmiş OSM Notu</string>
-	<string name="osm_edit_created_note">Oluşturulmuş OSM Notu</string>
-	<string name="osn_bug_name">OSM Notu</string>
-	<string name="osn_add_dialog_title">Not oluştur</string>
-	<string name="osn_comment_dialog_title">Yorum ekle</string>
-	<string name="osn_reopen_dialog_title">Notu yeniden aç</string>
-	<string name="osn_close_dialog_title">Notu kapat</string>
-	<string name="osn_add_dialog_success">Not başarıyla oluşturuldu</string>
-	<string name="osn_add_dialog_error">İstisnai durum oluştu: not oluşturulamadı</string>
-	<string name="osn_close_dialog_success">Not başarıyla kapatıldı</string>
-	<string name="osn_close_dialog_error">İstisnai durum oluştu: not kapatılmamıştı</string>
-	<string name="shared_string_commit">Yap</string>
-	
+    <string name="osm_edit_created_note">Oluşturulmuş OSM Notu</string>
+    <string name="osn_bug_name">OSM Notu</string>
+    <string name="osn_add_dialog_title">Not oluştur</string>
+    <string name="osn_comment_dialog_title">Yorum ekle</string>
+    <string name="osn_reopen_dialog_title">Notu yeniden aç</string>
+    <string name="osn_close_dialog_title">Notu kapat</string>
+    <string name="osn_add_dialog_success">Not başarıyla oluşturuldu</string>
+    <string name="osn_add_dialog_error">İstisnai durum oluştu: not oluşturulamadı</string>
+    <string name="osn_close_dialog_success">Not başarıyla kapatıldı</string>
+    <string name="osn_close_dialog_error">İstisnai durum oluştu: not kapatılmamıştı</string>
+    <string name="shared_string_commit">Yap</string>
     <string name="context_menu_item_delete_waypoint">GPX waypoint\'i silinsin mi?</string>
     <string name="context_menu_item_edit_waypoint">GPX waypoint\'i düzenle</string>
     <string name="shared_string_location">Konum</string>
@@ -1402,7 +1244,6 @@
     <string name="shared_string_update">Güncelle</string>
     <string name="shared_string_upload">Karşıya Yükle</string>
     <string name="osm_edit_created_poi">Oluşturulmuş OSM POI\'si</string>
-    
     <string name="world_map_download_descr">Dünya temel haritası (küçük görüntü yakınlaştırmalarda tüm dünyayı kapsar) eksik veya eskidir. Dünya çapında genel görünüm için lütfen indirmeyi düşünün.</string>
     <string name="shared_string_qr_code">QR Kodu</string>
     <string name="map_downloaded">İndirilen harita</string>
@@ -1417,7 +1258,7 @@
     <string name="favorite_category_add_new_title">Yeni kategori ekle</string>
     <string name="regions">Bölgeler</string>
     <string name="dashboard_or_drawer_description">Öncelikle esnek pano veya statik menü üzerinden app kontrol etmek için yeni bir seçim var. Seçiminiz her zaman pano ayarlarında değiştirilebilir.</string>
-<string name="use_dashboard_btn">Kullanım pano</string>
+    <string name="use_dashboard_btn">Kullanım pano</string>
     <string name="use_drawer_btn">Kullanım menüsü</string>
     <string name="dashboard_or_drawer_title">Dashboard ve menü kontrolü</string>
     <string name="instalation_troubleshooting_item">Kurulum ve sorun giderme</string>
@@ -1443,7 +1284,6 @@
     <string name="map_viewing_item">Harita görüntüleme</string>
     <string name="search_on_the_map_item">Harita arama</string>
     <string name="application_dir_description">Haritaları ve diğer veri dosyalarını kaydetmek istediğiniz yeri seçin.</string>
-    
     <string name="enter_country_name">Ülke adı girin</string>
     <string name="confirm_download_roadmaps">Eğer zaten standart (tam) harita var olsa bile, yollar sadece harita indirmek istediğinizden emin misiniz?</string>
     <string name="value_downloaded_of_max">%1$.1f of %2$.1f MB</string>
@@ -1457,18 +1297,17 @@
     <string name="downloads">Yüklemeler</string>
     <string name="free_downloads_used">Kullanılan Ücretsiz indirme</string>
     <string name="free_downloads_used_description">Kullanılan ücretsiz indirmeleri görüntüler</string>
-
     <string name="roads">Yollar</string>
     <string name="downloading_number_of_files">İndiriliyor -%1$d dosya</string>
     <string name="show_free_version_banner">Ücretsiz sürümü banner göster</string>
     <string name="show_free_version_banner_description">Sürüm ödemiş olsa bile yine ücretsiz sürümü banner görebilirsiniz</string>
     <string name="poi_deleted_localy">Yaptığınız değişiklikleri karşıya kez POI silinecektir</string>
-	<string name="show_gpx">Göster GPX</string>
-	<string name="count_of_lines">Hatlarının Sayısı</string>
-	<string name="are_you_sure">Emin misiniz?</string>
-	<string name="unsaved_changes_will_be_lost">Herhangi kaydedilmemiş değişiklikler kaybolur. Devam?</string>
-	<string name="downloads_left_template">%1$s indirme kaldı</string>
-	<string name="shared_string_near">Yakın</string>
+    <string name="show_gpx">Göster GPX</string>
+    <string name="count_of_lines">Hatlarının Sayısı</string>
+    <string name="are_you_sure">Emin misiniz?</string>
+    <string name="unsaved_changes_will_be_lost">Herhangi kaydedilmemiş değişiklikler kaybolur. Devam?</string>
+    <string name="downloads_left_template">%1$s indirme kaldı</string>
+    <string name="shared_string_near">Yakın</string>
     <string name="shared_string_hide">Gizle</string>
     <string name="av_video_quality_low">En düşük kalite</string>
     <string name="av_video_quality_high">En yüksek kalite</string>
@@ -1479,154 +1318,151 @@
     <string name="av_audio_bitrate">Ses bit hızı</string>
     <string name="av_audio_bitrate_descr">Ses bit hızı seçin.</string>
     <string name="commit_poi">POI Commit</string>
-	<string name="tab_title_basic">Temel</string>
-	<string name="tab_title_advanced">İleri</string>
-	<string name="building_number">Bina Kat Sayısı</string>
-	<string name="next_proceed">Sonraki</string>
-	<string name="opening_at">Açılış</string>
-	<string name="closing_at">Kapanış</string>
-	<string name="contact_info">İletişim Bilgileri</string>
-	<string name="add_opening_hours">Açılış saatleri ekle</string>
-	<string name="poi_dialog_poi_type">POI Tipi</string>
-	<string name="number_of_rows_in_dash">Dash %1$s satır sayısı</string>
-	<string name="please_specify_poi_type">POI türü belirtiniz.</string>
-	<string name="working_days">İş Günleri</string>
-	<string name="recent_places">Son Gidilen Yerler</string>
-	<string name="favourites">Sık Kullanılanlar</string>
-	<string name="saved_at_time">%1$s: Başarıyla kaydedilmiş</string>
-	<string name="poi_dialog_reopen">Yeniden Açmak</string>
-	<string name="poi_dialog_comment_default">POI Değişen</string>
-	<string name="poi_dialog_other_tags_message">Tüm diğer etiketler korunur</string>
-	<string name="default_buttons_commit">İşlemek</string>
-	<string name="av_camera_focus_hiperfocal">Hiperodak odak</string>
-	<string name="av_camera_pic_size">Kamera Resim Boyutu</string>
-	<string name="av_camera_pic_size_descr">İç kamera Resim Boyutu seçin</string>
+    <string name="tab_title_basic">Temel</string>
+    <string name="tab_title_advanced">İleri</string>
+    <string name="building_number">Bina Kat Sayısı</string>
+    <string name="next_proceed">Sonraki</string>
+    <string name="opening_at">Açılış</string>
+    <string name="closing_at">Kapanış</string>
+    <string name="contact_info">İletişim Bilgileri</string>
+    <string name="add_opening_hours">Açılış saatleri ekle</string>
+    <string name="poi_dialog_poi_type">POI Tipi</string>
+    <string name="number_of_rows_in_dash">Dash %1$s satır sayısı</string>
+    <string name="please_specify_poi_type">POI türü belirtiniz.</string>
+    <string name="working_days">İş Günleri</string>
+    <string name="recent_places">Son Gidilen Yerler</string>
+    <string name="favourites">Sık Kullanılanlar</string>
+    <string name="saved_at_time">%1$s: Başarıyla kaydedilmiş</string>
+    <string name="poi_dialog_reopen">Yeniden Açmak</string>
+    <string name="poi_dialog_comment_default">POI Değişen</string>
+    <string name="poi_dialog_other_tags_message">Tüm diğer etiketler korunur</string>
+    <string name="default_buttons_commit">İşlemek</string>
+    <string name="av_camera_focus_hiperfocal">Hiperodak odak</string>
+    <string name="av_camera_pic_size">Kamera Resim Boyutu</string>
+    <string name="av_camera_pic_size_descr">İç kamera Resim Boyutu seçin</string>
     <string name="navigation_intent_invalid">Geçersiz format:%s</string>
-	<string name="plugin_install_needs_network">Bu eklentiyi yüklemek için bir internet bağlantısına ihtiyacınız vardır.</string>
-	<string name="get_plugin">Al</string>
-	<string name="use_fast_recalculation">Akıllı rota yeniden hesaplama</string>
-	<string name="use_fast_recalculation_desc">Uzun seyahatler için rotanın yalnızca ilk bölümünü yeniden hesapla.</string>
-	<string name="do_you_like_osmand">OsmAnd\'ı Sevdinizmi?</string>
-	<string name="we_really_care_about_your_opinion">Hakkımızdaki düşünceleriniz uygulamayı geliştirmek için önemlidir.</string>
-	<string name="rate_this_app">Bu Uygulamayı Oyla</string>
-	<string name="rate_this_app_long">"Osmand\'a Google Play\'de  puan verin"</string>
-	<string name="dahboard_options_dialog_title">Pano Yapılandırma</string>
-	<string name="shared_string_card_was_hidden">Kart gizlidir</string>
-	<string name="shared_string_undo">UNDO</string>
-	<string name="shared_string_skip">Atla</string>
-	<string name="app_name_osmand">OsmAnd</string>
-	<string name="offline_maps_and_navigation">Çevrim Dışı Haritalar\n&amp; Yolbul</string>
-	<string name="use_english_names_descr">Yerli ve İngilizce isimleri arasında seçin</string>
-	<string name="show_view_angle">Ekran görüntüleme yönü</string>
-	<string name="show_poi_over_map_description">POI\'leri harita üzerinde göster (kullanımının son seçilen filtre)</string>
-	<string name="map_tile_source_descr">Online veya önbelleğe alınmış harita fayans kaynağını seç</string>
-	<string name="map_tile_source">Çini harita kaynağı</string>
-	<string name="use_internet_to_download_tile">Eksik harita fayans indirmek için interneti kullanın</string>
-	<string name="incremental_search_street">Arama sokak aşamalı</string>
-	<string name="incremental_search_building">Arama binası aşamalı</string>
-	<string name="choose_intersected_street">Sokağa kesişen seç</string>
-	<string name="navigate_point_format_D">DDD.DD</string>
-	<string name="navigate_point_format_DM">DDD MM.MM</string>
-	<string name="navigate_point_format_DMS">DDD MM SS.SS</string>
-	<string name="add_favorite_dialog_top_text">En sevdiğiniz adını girin</string>
-	<string name="add_favorite_dialog_favourite_added_template">En sevdiğim nokta \'\' {0} \'başarıyla eklendi.</string>
-	<string name="favourites_context_menu_add">Sık kullanılanlara ekle</string>
-	<string name="favourites_context_menu_edit">Düzenleme favori</string>
-	<string name="favourites_remove_dialog_msg">Favori nokta \'% s\' Sil ?</string>
-	<string name="favourites_remove_dialog_success">En sevdiğim nokta {0} başarıyla silindi.</string>
-	<string name="poi_error_poi_not_found">Düğüm bulunamadı ya da başlıca tek bir düğüm değil, olabilir</string>
-	<string name="poi_remove_confirm_template">Sil {0} (Yorumunuzu Girin)?</string>
-	<string name="poi_action_delete">Sil</string>
-	<string name="poi_error_unexpected_template">Eylem {0} yaparken beklenmeyen bir hata oluştu.</string>
-	<string name="poi_error_io_error_template">I / O hatası eylemi yaparken oluştu {0}.</string>
-	<string name="poi_error_info_not_loaded">Düğüm hakkında bilgi yüklü değildi</string>
-	<string name="context_menu_item_update_map_confirm">İnternetten yerel bilgilerinizi güncelleyin\?</string>
-	<string name="search_history_int_streets">Kesişim: {0} x {1} {2} içinde</string>
-	<string name="favorite">Favori</string>
-	<string name="search_osm_nominatim">OSM Nominatim kullanarak çevrimiçi arama</string>
-	<string name="max_level_download_tile">Max. Online zoom</string>
-	<string name="max_level_download_tile_descr">Çevrim içi harita döşemelerinin bundan sonraki yakınlaştırma düzeylerine göz atmayın.</string>
-	<string name="fav_points_edited">En sevdiğim nokta düzenlendi</string>
-	<string name="fav_points_not_exist">Hiçbir favori noktalar var</string>
-	<string name="opening_changeset">Changeset Açılış …</string>
-	<string name="closing_changeset">Changeset Kapanış …</string>
-	<string name="commiting_node">Düğüm işlemek …</string>
-	<string name="converting_names">Yerli / İngilizce adları dönüştürülüyor …</string>
-	<string name="previous_run_crashed">Son Osmand çalıştırmak çöktü. Log dosya {0} olduğunu. Sorunu bildirmek ve günlük dosyasını ekleyiniz.</string>
-	<string name="osm_settings_descr">OSM gönderimler için gerekli Openstreetmap.org (OSM) ayarlarını belirtin</string>
-	<string name="reload_tile">Sayfaya kiremit</string>
-	<string name="opening_hours_not_supported">Hours formatını Açılış düzenleme için desteklenmiyor</string>
-	<string name="transport_stop_to_go_out">Kurtulmak için durdurmak seçin</string>
-	<string name="transport_to_go_after">Önceki mesafe</string>
-	<string name="transport_to_go_before">Sonraki mesafe</string>
-	<string name="transport_stops_to_pass">geçmek için durur</string>
-	<string name="update_poi_is_not_available_for_zoom">Yakınlaştırma, İÇN\'leri güncellemenizi sağlar</string>
-	<string name="context_menu_item_update_poi">Güncelleme POI</string>
-	<string name="fav_imported_sucessfully">Favoriler başarıyla içe aktarıldı</string>
-	<string name="import_file_favourites">Veri GPX dosyası olarak kaydetmek veya yol işaretleri için sık kullanılanları almak?</string>
-	<string name="fav_file_to_load_not_found">Sık Kullanılanlar içeren GPX dosyası {0} bulunamadı</string>
-	<string name="share_fav_subject">Sık Osmand üzerinden paylaşılan</string>
-	<string name="layer_osm_bugs">(Çevrimiçi) OSM Notları</string>
-	<string name="use_trackball_descr">Haritayı hareket ettirmek için parmağınızı kaydırın kullanın</string>
-	<string name="use_trackball">Kullanım topunu</string>
-	<string name="background_service_int_descr">Arka plan hizmeti tarafından kullanılan Set uyandırma aralık</string>
-	<string name="background_service_provider_descr">Arka plan hizmeti tarafından kullanılan konum sağlayıcı seçin</string>
-	<string name="route_head"/>
-	<string name="map_screen_orientation">Ekran yönlendirme</string>
-	<string name="no_address_found">Hiçbir adres belirlenmedi</string>
-	<string name="voices">Sesli uyarılar</string>
-	<string name="layer_gpx_layer">GPX parça …</string>
-	<string name="transport_context_menu">Durakta Arama taşımacılığı</string>
-	<string name="rotate_map_to_bearing">Harita yönlendirme</string>
-	<string name="version_index_is_not_supported">Endeksin versiyonu \'\' {0} \'desteklenmiyor</string>
-	
-	
-	<string name="osmand_routing_experimental">Osmand çevrimdışı gezinme deneysel bir özelliktir ve daha yaklaşık 20 km\'lik mesafelerde çalışmıyor.\n\nNavigasyon hizmeti geçici olarak çevrimiçi CloudMade geçer.</string>
-	<string name="install_selected_build">Eğer Osmand yüklemek istiyor musunuz - {0} {1} {2} MB?</string>
-	<string name="tiles_to_download_estimated_size">Yakınlaştırma {0} indirmek {1} fayans ({2} MB)</string>
-	<string name="select_max_zoom_preload_area">Preload maksimum zoom seçin</string>
-	<string name="continuous_rendering_descr">Bir defada yerine görüntünün sürekli render görüntüler</string>
-	<string name="renderers">vektör render</string>
-	<string name="renderers_descr">Görünüm render seç</string>
-	<string name="use_high_res_maps_descr">Yüksek yoğunluklu ekranlarda harita fayans streç (ve bulanıklık) etmeyin</string>
-	<string name="indexing_address">Dizin Oluşturma adresi …</string>
-	<string name="indexing_map">Dizin Oluşturma haritası …</string>
-	<string name="indexing_poi">Dizin Oluşturma POI …</string>
-	<string name="indexing_transport">Dizin Oluşturma taşımacılığı …</string>
-	<string name="old_map_index_is_not_supported">\'{0}\' desteklenmiyor onaylanmamaktadır harita veri formatı \'</string>
-	<string name="poi_filter_namefinder">Çevrimiçi Name Finder</string>
-	<string name="reading_cached_tiles">Önbelleğe fayans okunuyor …</string>
-	<string name="version_index_is_big_for_memory">Index \'\' {0} \'belleğe sığmadı</string>
-	<string name="si_mi_yard">Mil/yarda</string>
-	<string name="yard">yd</string>
-	<string name="foot">ft</string>
-	<string name="mile">mi</string>
-	<string name="send_location_email_pattern">Konumu web tarayıcısı bağlantı %1$s ya da android niyet bağlantı %2$s izleyin görmek için</string>
-	<string name="add_waypoint_dialog_added">GPX Mevki \'\' {0} \'başarıyla eklendi</string>
-	<string name="add_waypoint_dialog_title">Kaydedilen GPX parçaya yol noktasını ekle</string>
-	<string name="context_menu_item_add_waypoint">GPX yol noktası ekle</string>
-	<string name="amenity_type_geocache">Geocache</string>
-	<string name="amenity_type_leisure">Boş</string>
-	<string name="gpx_option_from_start_point">Tüm yol-izi boyunca geç</string>
-	<string name="layer_underlay">Underlay haritası …</string>
-	<string name="select_tile_source_to_install">Seç (kiremit) yüklemek veya güncellemek haritalar</string>
-	<string name="create_poi_link_to_osm_doc">&lt;u&gt; Online OSM &lt;/ u&gt; görüntüleri ile harita sınıflandırma<u>Online OSM</u> map classification with images</string>
-	<string name="search_offline_geo_error">Coğrafi niyet ayrıştırılamadı \'%s\'</string>
-	<string name="unit_of_length">Ölçü birimi</string>
-	<string name="keep_informing_never">Yalnızca elle ayarlama (oka basın)</string>
+    <string name="plugin_install_needs_network">Bu eklentiyi yüklemek için bir internet bağlantısına ihtiyacınız vardır.</string>
+    <string name="get_plugin">Al</string>
+    <string name="use_fast_recalculation">Akıllı rota yeniden hesaplama</string>
+    <string name="use_fast_recalculation_desc">Uzun seyahatler için rotanın yalnızca ilk bölümünü yeniden hesapla.</string>
+    <string name="do_you_like_osmand">OsmAnd\'ı Sevdinizmi?</string>
+    <string name="we_really_care_about_your_opinion">Hakkımızdaki düşünceleriniz uygulamayı geliştirmek için önemlidir.</string>
+    <string name="rate_this_app">Bu Uygulamayı Oyla</string>
+    <string name="rate_this_app_long">"Osmand\'a Google Play\'de  puan verin"</string>
+    <string name="dahboard_options_dialog_title">Pano Yapılandırma</string>
+    <string name="shared_string_card_was_hidden">Kart gizlidir</string>
+    <string name="shared_string_undo">UNDO</string>
+    <string name="shared_string_skip">Atla</string>
+    <string name="app_name_osmand">OsmAnd</string>
+    <string name="offline_maps_and_navigation">Çevrim Dışı Haritalar\n&amp; Yolbul</string>
+    <string name="use_english_names_descr">Yerli ve İngilizce isimleri arasında seçin</string>
+    <string name="show_view_angle">Ekran görüntüleme yönü</string>
+    <string name="show_poi_over_map_description">POI\'leri harita üzerinde göster (kullanımının son seçilen filtre)</string>
+    <string name="map_tile_source_descr">Online veya önbelleğe alınmış harita fayans kaynağını seç</string>
+    <string name="map_tile_source">Çini harita kaynağı</string>
+    <string name="use_internet_to_download_tile">Eksik harita fayans indirmek için interneti kullanın</string>
+    <string name="incremental_search_street">Arama sokak aşamalı</string>
+    <string name="incremental_search_building">Arama binası aşamalı</string>
+    <string name="choose_intersected_street">Sokağa kesişen seç</string>
+    <string name="navigate_point_format_D">DDD.DD</string>
+    <string name="navigate_point_format_DM">DDD MM.MM</string>
+    <string name="navigate_point_format_DMS">DDD MM SS.SS</string>
+    <string name="add_favorite_dialog_top_text">En sevdiğiniz adını girin</string>
+    <string name="add_favorite_dialog_favourite_added_template">En sevdiğim nokta \'\' {0} \'başarıyla eklendi.</string>
+    <string name="favourites_context_menu_add">Sık kullanılanlara ekle</string>
+    <string name="favourites_context_menu_edit">Düzenleme favori</string>
+    <string name="favourites_remove_dialog_msg">Favori nokta \'% s\' Sil ?</string>
+    <string name="favourites_remove_dialog_success">En sevdiğim nokta {0} başarıyla silindi.</string>
+    <string name="poi_error_poi_not_found">Düğüm bulunamadı ya da başlıca tek bir düğüm değil, olabilir</string>
+    <string name="poi_remove_confirm_template">Sil {0} (Yorumunuzu Girin)?</string>
+    <string name="poi_action_delete">Sil</string>
+    <string name="poi_error_unexpected_template">Eylem {0} yaparken beklenmeyen bir hata oluştu.</string>
+    <string name="poi_error_io_error_template">I / O hatası eylemi yaparken oluştu {0}.</string>
+    <string name="poi_error_info_not_loaded">Düğüm hakkında bilgi yüklü değildi</string>
+    <string name="context_menu_item_update_map_confirm">İnternetten yerel bilgilerinizi güncelleyin\?</string>
+    <string name="search_history_int_streets">Kesişim: {0} x {1} {2} içinde</string>
+    <string name="favorite">Favori</string>
+    <string name="search_osm_nominatim">OSM Nominatim kullanarak çevrimiçi arama</string>
+    <string name="max_level_download_tile">Max. Online zoom</string>
+    <string name="max_level_download_tile_descr">Çevrim içi harita döşemelerinin bundan sonraki yakınlaştırma düzeylerine göz atmayın.</string>
+    <string name="fav_points_edited">En sevdiğim nokta düzenlendi</string>
+    <string name="fav_points_not_exist">Hiçbir favori noktalar var</string>
+    <string name="opening_changeset">Changeset Açılış …</string>
+    <string name="closing_changeset">Changeset Kapanış …</string>
+    <string name="commiting_node">Düğüm işlemek …</string>
+    <string name="converting_names">Yerli / İngilizce adları dönüştürülüyor …</string>
+    <string name="previous_run_crashed">Son Osmand çalıştırmak çöktü. Log dosya {0} olduğunu. Sorunu bildirmek ve günlük dosyasını ekleyiniz.</string>
+    <string name="osm_settings_descr">OSM gönderimler için gerekli Openstreetmap.org (OSM) ayarlarını belirtin</string>
+    <string name="reload_tile">Sayfaya kiremit</string>
+    <string name="opening_hours_not_supported">Hours formatını Açılış düzenleme için desteklenmiyor</string>
+    <string name="transport_stop_to_go_out">Kurtulmak için durdurmak seçin</string>
+    <string name="transport_to_go_after">Önceki mesafe</string>
+    <string name="transport_to_go_before">Sonraki mesafe</string>
+    <string name="transport_stops_to_pass">geçmek için durur</string>
+    <string name="update_poi_is_not_available_for_zoom">Yakınlaştırma, İÇN\'leri güncellemenizi sağlar</string>
+    <string name="context_menu_item_update_poi">Güncelleme POI</string>
+    <string name="fav_imported_sucessfully">Favoriler başarıyla içe aktarıldı</string>
+    <string name="import_file_favourites">Veri GPX dosyası olarak kaydetmek veya yol işaretleri için sık kullanılanları almak?</string>
+    <string name="fav_file_to_load_not_found">Sık Kullanılanlar içeren GPX dosyası {0} bulunamadı</string>
+    <string name="share_fav_subject">Sık Osmand üzerinden paylaşılan</string>
+    <string name="layer_osm_bugs">(Çevrimiçi) OSM Notları</string>
+    <string name="use_trackball_descr">Haritayı hareket ettirmek için parmağınızı kaydırın kullanın</string>
+    <string name="use_trackball">Kullanım topunu</string>
+    <string name="background_service_int_descr">Arka plan hizmeti tarafından kullanılan Set uyandırma aralık</string>
+    <string name="background_service_provider_descr">Arka plan hizmeti tarafından kullanılan konum sağlayıcı seçin</string>
+    <string name="route_head"/>
+    <string name="map_screen_orientation">Ekran yönlendirme</string>
+    <string name="no_address_found">Hiçbir adres belirlenmedi</string>
+    <string name="voices">Sesli uyarılar</string>
+    <string name="layer_gpx_layer">GPX parça …</string>
+    <string name="transport_context_menu">Durakta Arama taşımacılığı</string>
+    <string name="rotate_map_to_bearing">Harita yönlendirme</string>
+    <string name="version_index_is_not_supported">Endeksin versiyonu \'\' {0} \'desteklenmiyor</string>
+    <string name="osmand_routing_experimental">Osmand çevrimdışı gezinme deneysel bir özelliktir ve daha yaklaşık 20 km\'lik mesafelerde çalışmıyor.\n\nNavigasyon hizmeti geçici olarak çevrimiçi CloudMade geçer.</string>
+    <string name="install_selected_build">Eğer Osmand yüklemek istiyor musunuz - {0} {1} {2} MB?</string>
+    <string name="tiles_to_download_estimated_size">Yakınlaştırma {0} indirmek {1} fayans ({2} MB)</string>
+    <string name="select_max_zoom_preload_area">Preload maksimum zoom seçin</string>
+    <string name="continuous_rendering_descr">Bir defada yerine görüntünün sürekli render görüntüler</string>
+    <string name="renderers">vektör render</string>
+    <string name="renderers_descr">Görünüm render seç</string>
+    <string name="use_high_res_maps_descr">Yüksek yoğunluklu ekranlarda harita fayans streç (ve bulanıklık) etmeyin</string>
+    <string name="indexing_address">Dizin Oluşturma adresi …</string>
+    <string name="indexing_map">Dizin Oluşturma haritası …</string>
+    <string name="indexing_poi">Dizin Oluşturma POI …</string>
+    <string name="indexing_transport">Dizin Oluşturma taşımacılığı …</string>
+    <string name="old_map_index_is_not_supported">\'{0}\' desteklenmiyor onaylanmamaktadır harita veri formatı \'</string>
+    <string name="poi_filter_namefinder">Çevrimiçi Name Finder</string>
+    <string name="reading_cached_tiles">Önbelleğe fayans okunuyor …</string>
+    <string name="version_index_is_big_for_memory">Index \'\' {0} \'belleğe sığmadı</string>
+    <string name="si_mi_yard">Mil/yarda</string>
+    <string name="yard">yd</string>
+    <string name="foot">ft</string>
+    <string name="mile">mi</string>
+    <string name="send_location_email_pattern">Konumu web tarayıcısı bağlantı %1$s ya da android niyet bağlantı %2$s izleyin görmek için</string>
+    <string name="add_waypoint_dialog_added">GPX Mevki \'\' {0} \'başarıyla eklendi</string>
+    <string name="add_waypoint_dialog_title">Kaydedilen GPX parçaya yol noktasını ekle</string>
+    <string name="context_menu_item_add_waypoint">GPX yol noktası ekle</string>
+    <string name="amenity_type_geocache">Geocache</string>
+    <string name="amenity_type_leisure">Boş</string>
+    <string name="gpx_option_from_start_point">Tüm yol-izi boyunca geç</string>
+    <string name="layer_underlay">Underlay haritası …</string>
+    <string name="select_tile_source_to_install">Seç (kiremit) yüklemek veya güncellemek haritalar</string>
+    <string name="create_poi_link_to_osm_doc">&lt;u&gt; Online OSM &lt;/ u&gt; görüntüleri ile harita sınıflandırma<u>Online OSM</u> map classification with images</string>
+    <string name="search_offline_geo_error">Coğrafi niyet ayrıştırılamadı \'%s\'</string>
+    <string name="unit_of_length">Ölçü birimi</string>
+    <string name="keep_informing_never">Yalnızca elle ayarlama (oka basın)</string>
     <string name="keep_informing_descr">Yolbul yönergelerini düzenli aralıklarla yeniden bildir</string>
     <string name="keep_informing">Navigasyon yönergelerini tekrarla</string>
-	<string name="poi_filter_nominatim">özellikle online olarak</string>
-	<string name="shared_string_others">Diğerleri</string>
-	<string name="vector_data_missing">Önceden yüklenmiş (\'çevrim dışı\') veri SD kart üzerinde değil. Haritaları internet olmadan çevrim dışı kullanabilmek için lütfen önceden indirmeyi düşünün.</string>
-	<string name="shared_string_release">Çıkış</string>
-	<string name="local_index_action_do">Siz %1$s %2$s kalem (ler) üzeresiniz. Devam?</string>
-	<string name="index_name_netherlands">Avrupa - Hollanda</string>
-	
-	<string name="share_route_as_gpx">Rotayı GPX dosyası olarak paylaşın</string>
-	<string name="share_route_subject">Rotayı Osmand üzerinden paylaşın</string>
-	<string name="local_index_description">Daha fazla ayrıntı, basın görmek ve devre dışı bırakmak veya silmek için basılı tutun Varolan herhangi bir öğeyi tıklatın. Aygıtın (%1$s ücretsiz) Cari veriler:</string>
-	<string name="arrival_distance_factor_early">Erken</string>
+    <string name="poi_filter_nominatim">özellikle online olarak</string>
+    <string name="shared_string_others">Diğerleri</string>
+    <string name="vector_data_missing">Önceden yüklenmiş (\'çevrim dışı\') veri SD kart üzerinde değil. Haritaları internet olmadan çevrim dışı kullanabilmek için lütfen önceden indirmeyi düşünün.</string>
+    <string name="shared_string_release">Çıkış</string>
+    <string name="local_index_action_do">Siz %1$s %2$s kalem (ler) üzeresiniz. Devam?</string>
+    <string name="index_name_netherlands">Avrupa - Hollanda</string>
+    <string name="share_route_as_gpx">Rotayı GPX dosyası olarak paylaşın</string>
+    <string name="share_route_subject">Rotayı Osmand üzerinden paylaşın</string>
+    <string name="local_index_description">Daha fazla ayrıntı, basın görmek ve devre dışı bırakmak veya silmek için basılı tutun Varolan herhangi bir öğeyi tıklatın. Aygıtın (%1$s ücretsiz) Cari veriler:</string>
+    <string name="arrival_distance_factor_early">Erken</string>
     <string name="arrival_distance_factor_normally">Normal</string>
     <string name="arrival_distance_factor_late">Geç</string>
     <string name="arrival_distance_factor_at_last">Son metrelerde</string>
@@ -1636,12 +1472,10 @@
     <string name="rendering_attr_alpineHiking_description"/>
     <string name="rendering_attr_hikingRoutesOSMC_name">Sembol bindirme Yürüyüş</string>
     <string name="rendering_attr_hikingRoutesOSMC_description"/>
-
-	<string name="monitoring_control_start">GPX</string>
+    <string name="monitoring_control_start">GPX</string>
     <string name="interrupt_music_descr">Sesli uyarılar süresince her müziği tümüyle duraklatır (yalnızca sesini azaltmakla kalmaz)</string>
-	<string name="interrupt_music">Müziği duraklat</string>
-	
-	<string name="download_wikipedia_maps">Wikipedia</string>
+    <string name="interrupt_music">Müziği duraklat</string>
+    <string name="download_wikipedia_maps">Wikipedia</string>
     <string name="use_displayed_track_for_navigation">Görüntülenen yol-izini navigasyon için kullanmak istiyor musunuz?</string>
     <string name="keep_and_add_destination_point">Son varış noktası olarak ekle</string>
     <string name="select_gpx">GPX Seçiniz …</string>
@@ -1714,19 +1548,7 @@
     <string name="lang_eu">Bask</string>
     <string name="lang_be">Belarus</string>
     <string name="lang_bs">Boşnakça</string>
-    
-    
-    
-    
-    
-    
     <string name="use_points_as_intermediates">Noktalar arasındaki rotayı hesaplamak</string>
-    
-    
-    
-    
-    
-    
     <string name="always_center_position_on_map">Konumu sürekli ortada tut</string>
     <string name="voice_pref_title">Ses</string>
     <string name="misc_pref_title">Çeşitli</string>
@@ -1734,8 +1556,6 @@
     <string name="index_item_nation_addresses">Ülke adresleri</string>
     <string name="index_item_world_altitude_correction">Dünya rakım düzeltme</string>
     <string name="index_item_world_seamarks">Dünya deniz işaretleri</string>
-
-
     <string name="select_destination_and_intermediate_points">Varış noktaları seçin</string>
     <string name="layer_amenity_label"/>
     <string name="loading_smth">%1$s yükleniyor …</string>
@@ -1829,7 +1649,6 @@
     <string name="routing_attr_no_new_routing_name">Hiçbir v1.9 yönlendirme kuralları</string>
     <string name="routing_attr_no_new_routing_description">V1.9 tanıtılan yönlendirme kuralları kullanmayın</string>
     <string name="rendering_attr_transportStops_name">Ulaşım durakları</string>
-
     <string name="navigate_point_zone">Bölge</string>
     <string name="navigate_point_northing">Kuzeye doğru katedilen mesafe</string>
     <string name="navigate_point_easting">doğuya doğru yönelme</string>
@@ -1837,7 +1656,6 @@
     <string name="use_opengl_render">Kullanım OpenGL render</string>
     <string name="use_opengl_render_descr">Donanım hızlandırmalı OpenGL render (bazı cihazlarda çalışmayabilir) kullanın.</string>
     <string name="error_avoid_specific_road">Bulunamadı baypas</string>
-    
     <string name="search_for">Arama</string>
     <string name="rendering_attr_publicTransportMode_name">Otobüs, troleybüs, mekik yolları</string>
     <string name="rendering_attr_tramTrainRoutes_name">Tramvay ve tren yolları</string>
@@ -1857,7 +1675,6 @@
     <string name="rendering_category_others">Diğer harita özellikleri</string>
     <string name="map_widget_appearance_rem">Kalan unsurlar</string>
     <string name="search_radius_proximity">Yakınında</string>
-    
     <string name="anonymous_user_hint">Bir anonim kullanıcı şunları yapamaz:
 \n- Grupları oluşturmak;
 \n- Grupları ve aygıtları sunucu ile senkronize etmek;
@@ -1899,12 +1716,9 @@
     <string name="index_tours">Turlar</string>
     <string name="shared_string_all">Tüm</string>
     <string name="shared_string_waypoints">Yol işaretleri</string>
-    
     <string name="download_additional_maps">Eksik haritalar %1$s (%2$d MB) indirilsinmi?</string>
     <string name="rendering_value_browse_map_name">Haritaya göz at</string>
     <string name="rendering_attr_coloredBuildings_name">Binalar türüne göre renk kodu</string>
-    
-    
     <string name="keep_navigation_service">Devam et</string>
     <string name="map_preferred_locale_descr">Harita üzerindeki etiketler için tercih edilen dil (eğer mevcut değilse İngilizce veya yerel adlara geçilecektir)</string>
     <string name="map_preferred_locale">Tercih edilen harita dili</string>
@@ -1925,17 +1739,14 @@
     <string name="rendering_attr_showAccess_name">Geçiş hakkındaki kısıtlamaları ve geçiş ücretlerini göster</string>
     <string name="rendering_attr_showSurfaces_name">Yol yüzeyi göster</string>
     <string name="rendering_attr_showCycleRoutes_name">Döngüsü yolları göster</string>
-    
-    
-    
     <string name="update">Bütün Güncellemler</string>
     <string name="only_download_over_wifi">Sadece WiFi üzerinden İndir</string>
     <string name="live_update">Canlı güncelleştirme</string>
-<string name="route_distance">Mesafe:</string>
+    <string name="route_distance">Mesafe:</string>
     <string name="route_duration">Zaman:</string>
     <string name="update_now">Şimdi güncelle</string>
-<string name="missing_write_external_storage_permission">App SD kartı kullanma iznine sahip değil</string>
-<string name="select_voice_provider">Sesli yönlendirme seç</string>
+    <string name="missing_write_external_storage_permission">App SD kartı kullanma iznine sahip değil</string>
+    <string name="select_voice_provider">Sesli yönlendirme seç</string>
     <string name="select_voice_provider_descr">Diliniz için sesli yönlendirme seçin veya indirin.</string>
     <string name="impassable_road_desc">Navigasyon esnasında kaçınmak istediğiniz yolları seçiniz.</string>
     <string name="shared_string_sound">Ses</string>
@@ -1945,10 +1756,8 @@
     <string name="no_camera_permission">App\'in kameraya erişmek için izni yok.</string>
     <string name="no_microphone_permission">App\'in mikrofona erişmek için izni yok.</string>
     <string name="last_update">Son güncelleme:% s</string>
-    
     <string name="update_time">Güncelleme zamanı</string>
-    
-<string name="shared_string_not_selected">Seçilmedi</string>
+    <string name="shared_string_not_selected">Seçilmedi</string>
     <string name="rec_split"/>
     <string name="rec_split_title"/>
     <string name="rec_split_desc">Kullanılan alan depolama alanı boyutunu aştığında klipleri yeniden yaz.</string>
@@ -1962,10 +1771,9 @@
     <string name="weekly">Haftalık</string>
     <string name="morning">Sabah</string>
     <string name="night">Gece</string>
-
-<string name="updates_size">Güncelleme boyutu</string>
+    <string name="updates_size">Güncelleme boyutu</string>
     <string name="select_month_and_country">Ayı ve ülke seçin</string>
-<string name="item_removed">Öğe kaldırıldı</string>
+    <string name="item_removed">Öğe kaldırıldı</string>
     <string name="n_items_removed">öğeler silindi</string>
     <string name="shared_string_undo_all">TÜMÜNÜ GERİ AL</string>
     <string name="shared_string_type"/>
@@ -1975,23 +1783,20 @@
     <string name="add_time_span">Zaman aralığı ekle</string>
     <string name="road_blocked">Yol kapalı</string>
     <string name="shared_string_select">Seç</string>
-    <string name="switch_start_finish">Rotayı tersine çevir.</string>
+    <string name="switch_start_finish">Rotayı tersine çevir</string>
     <string name="rendering_attr_hideIcons_name">POI simgeleri</string>
     <string name="number_of_contributors">Katkıcı sayısı</string>
     <string name="number_of_edits">Değişiklik sayısı</string>
     <string name="reports_for">Şunun için rapor</string>
-<string name="data_is_not_available">Veri mevcut değil</string>
+    <string name="data_is_not_available">Veri mevcut değil</string>
     <string name="shared_string_status">Durum</string>
     <string name="shared_string_save_changes">Değişiklikleri Kaydet</string>
     <string name="shared_string_email_address">E-posta adresi</string>
     <string name="rendering_attr_hideUnderground_name">Yeraltı nesneleri</string>
     <string name="shared_string_read_more">Devamını oku</string>
-    
     <string name="show_polygons">Çokgenleri göster</string>
-    
     <string name="find_parking">Park yeri bul</string>
     <string name="rendering_attr_showMtbRoutes_name">MTB rotaları göster</string>
-    
     <string name="map_marker_1st">İlk harita işaretleyicisi</string>
     <string name="map_marker_2nd">İkinci harita işaretleyicisi</string>
     <string name="shared_string_toolbar">Araç çubuğu</string>
@@ -2027,9 +1832,7 @@
     <string name="osm_live_region_desc">Bağışınızın bir bölümü, bu bölgede değişiklik yapan OSM kullanıcılarına gönderilecek</string>
     <string name="osm_live_subscription_settings">Abonelik ayarları</string>
     <string name="osm_live_ask_for_purchase">Lütfen ilk olarak OSM canlı abonelik satın alın</string>
-
     <string name="osm_live_header">Bu abonelik, dünya çapındaki tüm haritalar için saatlik güncellemeleri etkinleştirir. Gelirin bir bölümü OSM topluluğuna gitmektedir ve her OSM katkısı için ödenmektedir. Eğer OsmAnd\'ı ve OSM\'yi seviyor ve onları desteklemek istiyorsanız, bu bunu yapmak için en iyi yoldur.</string>
-    
     <string name="select_map_marker">Harita işaretleyicisini seçin</string>
     <string name="map_markers_other">Diğer işaretleyiciler</string>
     <string name="upload_anonymously">Anonim olarak yükle</string>
@@ -2072,12 +1875,12 @@
     <string name="full_report">Tam rapor</string>
     <string name="open_street_map_login_and_pass">OpenStreetMap oturum açma ve parola</string>
     <string name="file_name_containes_illegal_char">Dosya adı uygunsuz karakter içeriyor</string>
-<string name="shared_string_is_open_24_7">7/24 açık</string>
+    <string name="shared_string_is_open_24_7">7/24 açık</string>
     <string name="storage_directory_card">Bellek kartı</string>
     <string name="coords_format">Koordinat biçimi</string>
     <string name="coords_format_descr">Coğrafi koordinatlar için biçim.</string>
-  	<string name="app_mode_bus">Otobüs</string>
- 	<string name="app_mode_train">Tren</string>
+    <string name="app_mode_bus">Otobüs</string>
+    <string name="app_mode_train">Tren</string>
     <string name="current_track">Şimdiki yol</string>
     <string name="map_widget_battery">Pil düzeyi</string>
     <string name="change_markers_position">İşaretleyicinin konumunu değiştir</string>
@@ -2107,7 +1910,6 @@
     <string name="file_can_not_be_moved">Dosya taşınamadı.</string>
     <string name="shared_string_move">Taşı</string>
     <string name="routing_attr_driving_style_name">Sürüş tarzı</string>
-    
     <string name="shared_string_time">Zaman</string>
     <string name="total_distance">Toplam uzaklık</string>
     <string name="rendering_value_high_name">Yüksek</string>
@@ -2115,7 +1917,7 @@
     <string name="rendering_value_low_name">Düşük</string>
     <string name="rendering_attr_hideWaterPolygons_description">Su</string>
     <string name="shared_string_action_name">İşlem Adı</string>
-<string name="quick_action_showhide_osmbugs_title">OSM Notlarını Göster / Gizle</string>
+    <string name="quick_action_showhide_osmbugs_title">OSM Notlarını Göster / Gizle</string>
     <string name="quick_action_osmbugs_show">OSM Notlarını Göster</string>
     <string name="quick_action_osmbugs_hide">OSM Notlarını Gizle</string>
     <string name="quick_action_showhide_osmbugs_descr">Eylem düğmesine dokunulduğunda, OSM Notları haritada gösterilir veya gizlenir.</string>
@@ -2208,7 +2010,6 @@
     <string name="context_menu_item_modify_note">OSM notunu değiştir</string>
     <string name="make_round_trip_descr">Başlangıç noktasının bir kopyasını varış noktası olarak ekle.</string>
     <string name="make_round_trip">Gidiş-dönüş seyahat yap</string>
-    
     <string name="coordinates_format">Koordinat biçimi</string>
     <string name="use_system_keyboard">Sistemde tanımlı klavyeyi kullan</string>
     <string name="fast_coordinates_input_descr">Koordinat giriş biçimini seç. Bunu her zaman Seçenekler\'den değiştirebilirsiniz.</string>
@@ -2234,7 +2035,6 @@
     <string name="by_type">Tipe göre</string>
     <string name="shared_string_more_without_dots">Daha fazla</string>
     <string name="appearance_on_the_map">Harita üzerinde görünüş</string>
-    
     <string name="favourites_group">Favoriler kategorisi</string>
     <string name="add_group">Grup ekle</string>
     <string name="add_group_descr">Grupları, favorilerden veya işaretleri takip etden alabilirsiniz.</string>
@@ -2252,14 +2052,13 @@
     <string name="go_to_next_field">Sonraki alana git</string>
     <string name="rename_marker">İşaretçiyi yeniden adlandır</string>
     <string name="tap_on_map_to_hide_interface">Tam ekran modu</string>
-    
     <string name="import_as_favorites">Sık kullanılanlar olarak içeri aktar</string>
     <string name="import_file">Dosyayı içe aktar</string>
-	<string name="wrong_input">Yanlış girdi</string>
-	<string name="enter_new_name">Yeni isim gir</string>
-	<string name="shared_string_back">Geri</string>
-	<string name="shared_string_view">Görünüm</string>
-	<string name="wrong_format">Yanlış format</string>
+    <string name="wrong_input">Yanlış girdi</string>
+    <string name="enter_new_name">Yeni isim gir</string>
+    <string name="shared_string_back">Geri</string>
+    <string name="shared_string_view">Görünüm</string>
+    <string name="wrong_format">Yanlış format</string>
     <string name="shared_string_markers">İşaretçiler</string>
     <string name="my_location">Konumum</string>
     <string name="shared_string_finish">Bitir</string>
@@ -2329,9 +2128,6 @@
     <string name="points_delete_multiple">%1$d nokta(lar) sileceksiniz. Emin misiniz?</string>
     <string name="wiki_around">Yakındaki Wikipedia makaleleri</string>
     <string name="route_calculation">Rota hesaplama</string>
-    
-    
-    
     <string name="shared_string_notifications">Bildirimler</string>
     <string name="shared_string_continue">Devam et</string>
     <string name="shared_string_pause">Duraklat</string>
@@ -2353,7 +2149,6 @@
     <string name="back_to_search">Aramaya geri dön</string>
     <string name="confirmation_to_delete_history_items">Seçilmiş nesneleri Geçmişten silmek istiyor musunuz?</string>
     <string name="show_something_on_map">%1$s \'ı haritada göster</string>
-    
     <string name="share_history_subject">OsmAnd üzerinden paylaşıldı</string>
     <string name="postcode">Posta-kodu</string>
     <string name="shared_string_from">-dan</string>
@@ -2369,7 +2164,7 @@
     <string name="coordinate_input_accuracy_description">%1$d ondalık basamaklar girildikten sonra sonraki alana otomatik olarak geç.</string>
     <string name="tap_on_map_to_hide_interface_descr">Harita üzerine dokunarak basmak kontrol düğmeleri ve widget\'lara geçiş yapmayı sağlar.</string>
     <string name="waypoints_added_to_map_markers">Waypoint\'ler harita işaretleyicilerine eklendi</string>
-	<string name="marker_save_as_track_descr">Burada belirtilecek dosyaya işaretleyicilerinizi dışa aktarabilirsiniz:</string>
+    <string name="marker_save_as_track_descr">Burada belirtilecek dosyaya işaretleyicilerinizi dışa aktarabilirsiniz:</string>
     <string name="marker_save_as_track">Track olarak kaydet</string>
     <string name="show_arrows_on_the_map">Haritada yön gösterici okları göster</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd seçilmiş profil için rotalı noktalara bağlanacak.</string>
@@ -2392,7 +2187,6 @@
     <string name="trip_rec_notification_settings_desc">Seyahati kaydetmeyi başlatmaya izin vermek için için bir sistem bildirimi göster.</string>
     <string name="shared_string_trip">Seyahat</string>
     <string name="shared_string_recorded">Kaydedildi</string>
-    
     <string name="create_custom_poi">Özel süzgeç oluştur</string>
     <string name="no_update_info_desc">Sürüm güncelleştirmeler veya OsmAnd ile ilgili indirimler kontrol edilmesin.</string>
     <string name="route_stops_before">öncesinde %1$s durak(lar)</string>
@@ -2463,7 +2257,6 @@
     <string name="access_smart_autoannounce_descr">Yalnızca hedef noktaya istikamet değişirse uyar.</string>
     <string name="access_autoannounce_period">Otomatik-sesli-bildirim periyodu</string>
     <string name="no_waypoints_found">Uğranacak-ara-noktalar bulunamadı</string>
-    
     <string name="lang_es_us">İspanyolca (Amerikan)</string>
     <string name="moving_time">Hareket Zamanı</string>
     <string name="purchase_dialog_title">Plan seçin</string>
@@ -2481,7 +2274,7 @@
     <string name="online_webpage_warning">Sayfa yalnızca çevrim içi kullanılabilir. Tarayıcıda açılsın mı?</string>
     <string name="images_cache">Resimler önbelleği</string>
     <string name="delete_search_history">Arama geçmisini sil</string>
-    <string name="download_images">Resimleri göster</string>
+    <string name="download_images">Resimleri indir</string>
     <string name="download_maps_travel">Seyahat rehberleri</string>
     <string name="article_removed">Makale kaldırıldı</string>
     <string name="wikivoyage_search_hint">Ara: Ülke, şehir, eyalet</string>
@@ -2511,4 +2304,110 @@
     <string name="shared_string_current">Geçerli</string>
     <string name="last_intermediate_dest_description">Ara durak ekler</string>
     <string name="shared_string_gpx_files">GPX dosyaları</string>
+    <string name="files_moved">%1$d Dosya taşındı (%2$s).</string>
+    <string name="files_copied">%1$d dosya kopyalandı (%2$s).</string>
+    <string name="files_failed">%1$d dosya kopyalanamadı (%2$s).</string>
+    <string name="dont_move_maps">Taşıma</string>
+    <string name="public_transport_calc_pedestrian">Yaya rotası hesapla</string>
+    <string name="public_transport_type">Transfer tipi</string>
+    <string name="send_log">Rapor gönder</string>
+    <string name="routing_attr_avoid_tram_name">Tramwaylardan kaçın.</string>
+    <string name="routing_attr_avoid_tram_description">Tramwaylardan kaçın.</string>
+    <string name="routing_attr_avoid_bus_name">Otobüsten kaçın</string>
+    <string name="routing_attr_avoid_bus_description">Otobüs ve troleybüsten kaçın</string>
+    <string name="routing_attr_avoid_share_taxi_name">Taksiden kaçın</string>
+    <string name="routing_attr_avoid_share_taxi_description">Taksiden kaçın</string>
+    <string name="routing_attr_avoid_train_name">Trenden kaçın</string>
+    <string name="routing_attr_avoid_train_description">Trenden kaçın</string>
+    <string name="routing_attr_avoid_subway_name">Metrodan kaçın</string>
+    <string name="routing_attr_avoid_subway_description">Metrodan ve hafif raylı taşımadan kaçın</string>
+    <string name="routing_attr_avoid_ferry_name">Feribottan kaçın</string>
+    <string name="routing_attr_avoid_ferry_description">Feribottan kaçın</string>
+    <string name="shared_string_degrees">Dereceler</string>
+    <string name="avoid_pt_types_descr">Kaçınılacak toplu taşıma türlerini seçin:</string>
+    <string name="quick_action_day_night_mode">%s modu</string>
+    <string name="avoid_pt_types">Geçersiz taşıma tipleri…</string>
+    <string name="shared_string_walk">Yürü</string>
+    <string name="public_transport_warning_title">Toplu taşıma rotaları beta aşamasındadır.</string>
+    <string name="add_intermediate">Ara varış noktası ekle</string>
+    <string name="add_start_and_end_points">Başlangıç ve bitiş noktası ekle</string>
+    <string name="route_add_start_point">Başlangıç noktası ekle</string>
+    <string name="route_descr_select_start_point">Başlangıç noktasını seç</string>
+    <string name="rendering_attr_surface_unpaved_name">Kaplamasız</string>
+    <string name="rendering_attr_surface_sand_name">Kum</string>
+    <string name="rendering_attr_surface_grass_name">Çimen</string>
+    <string name="rendering_attr_surface_ground_name">Zemin</string>
+    <string name="rendering_attr_surface_mud_name">Çamur</string>
+    <string name="rendering_attr_surface_ice_name">Buz</string>
+    <string name="rendering_attr_surface_salt_name">Tuz</string>
+    <string name="rendering_attr_surface_snow_name">Kar</string>
+    <string name="rendering_attr_surface_asphalt_name">Asfalt</string>
+    <string name="rendering_attr_surface_paved_name">Taş döşeme</string>
+    <string name="rendering_attr_surface_concrete_name">Beton</string>
+    <string name="rendering_attr_surface_cobblestone_name">Parke taşı</string>
+    <string name="rendering_attr_surface_paving_stones_name">Kaldırım taşı</string>
+    <string name="rendering_attr_surface_pebblestone_name">Çakıl taşı</string>
+    <string name="rendering_attr_surface_stone_name">Taş</string>
+    <string name="rendering_attr_surface_metal_name">Metal</string>
+    <string name="rendering_attr_surface_wood_name">Ahşap</string>
+    <string name="rendering_attr_surface_gravel_name">Çakıl</string>
+    <string name="rendering_attr_surface_fine_gravel_name">İnce çakıl</string>
+    <string name="rendering_attr_surface_compacted_name">Sıkıştırılmış</string>
+    <string name="rendering_attr_smoothness_excellent_name">Mükemmel</string>
+    <string name="rendering_attr_smoothness_good_name">İyi</string>
+    <string name="rendering_attr_smoothness_intermediate_name">Orta</string>
+    <string name="rendering_attr_smoothness_bad_name">Kötü</string>
+    <string name="rendering_attr_smoothness_very_bad_name">Çok kötü</string>
+    <string name="rendering_attr_smoothness_horrible_name">Korkunç</string>
+    <string name="rendering_attr_smoothness_very_horrible_name">Çok korkunç</string>
+    <string name="rendering_attr_highway_class_motorway_name">Otoyol</string>
+    <string name="rendering_attr_highway_class_state_road_name">Devlet yolu</string>
+    <string name="rendering_attr_highway_class_road_name">Yol</string>
+    <string name="rendering_attr_highway_class_street_name">Cadde</string>
+    <string name="rendering_attr_highway_class_service_name">Servis Yolu</string>
+    <string name="rendering_attr_highway_class_footway_name">Yaya yolu</string>
+    <string name="rendering_attr_highway_class_track_name">Tarım yolu</string>
+    <string name="rendering_attr_highway_class_cycleway_name">Bisiklet yolu</string>
+    <string name="rendering_attr_undefined_name">Belirtilmemiş</string>
+    <string name="road_types">Yol tipleri</string>
+    <string name="shared_string_swap">Takas</string>
+    <string name="show_more">Daha fazla görüntüle</string>
+    <string name="quick_action_show_hide_gpx_tracks">Gps izlerini göster/gizle</string>
+    <string name="quick_action_gpx_tracks_hide">Gps izlerini gizle</string>
+    <string name="quick_action_gpx_tracks_show">Gps izlerini göster</string>
+    <string name="add_home">Ev Adresi Ekle</string>
+    <string name="add_work">İş adresi ekle</string>
+    <string name="work_button">İş</string>
+    <string name="cubic_m">m³</string>
+    <string name="shared_string_capacity">Kapasite</string>
+    <string name="shared_string_width">Genişlik</string>
+    <string name="shared_string_height">Yükseklik</string>
+    <string name="add_destination_point">Varış noktası ekle</string>
+    <string name="add_intermediate_point">Ara varış noktası ekle</string>
+    <string name="add_start_point">Başlangıç noktası ekle</string>
+    <string name="waiting_for_route_calculation">Rota hesaplanıyor…</string>
+    <string name="app_mode_public_transport">Toplu taşıma</string>
+    <string name="show_along_the_route">Rotayı göster</string>
+    <string name="simulate_navigation">Navigasyon simülasyonu</string>
+    <string name="voice_announcements">Sesli yönlendirmeler</string>
+    <string name="intermediate_destinations">Ara varış noktaları</string>
+    <string name="osm_live_subscriptions">Açıklamalar</string>
+    <string name="osm_live_payment_monthly_title">Aylık</string>
+    <string name="osm_live_payment_3_months_title">3 Aylık</string>
+    <string name="osm_live_payment_annual_title">Yıllık</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / aylık</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / aylık</string>
+    <string name="osm_live_payment_renews_monthly">Aylık yenileme</string>
+    <string name="osm_live_payment_renews_annually">Yıllık yenileme</string>
+    <string name="osm_live_payment_contribute_descr">Gelirin bir kısmı OpenStreetMap kullanıcılarına gider.</string>
+    <string name="third_party_application">3.parti uygulama</string>
+    <string name="search_street">Cadde ara</string>
+    <string name="start_search_from_city">Önce şehir seçin</string>
+    <string name="thank_you_for_feedback">Yorumunuz için teşekkür ederiz</string>
+    <string name="shared_string_world">Dünya</string>
+    <string name="point_deleted">%1$s nokta silindi</string>
+    <string name="coord_input_edit_point">Noktayı düzenle</string>
+    <string name="coord_input_add_point">Nokta ekle</string>
+    <string name="hide_full_description">Açıklamayı gizle</string>
+    <string name="show_full_description">Açıklamayı göster</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 79e8c24032..ed28e02598 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1529,9 +1529,9 @@
 \n 
 \nУ разі активації цього виду, стиль мапи змінюється на „Winter and ski“, показуючи усі деталі пейзажу так, як вони виглядають взимку. Цей (зимовий) вид може бути де-активований тут, або якщо ви поміняєте „Стиль мапи“ в меню „Налаштування мапи“ на бажаний вид.</string>
     <string name="rendering_attr_hideHouseNumbers_name">Номери будинків</string>
-    <string name="application_dir_change_warning3">Скопіювати файли даних OsmAnd в нове місце?</string>
+    <string name="application_dir_change_warning3">Перемістити файли даних OsmAnd в нове місце\?</string>
     <string name="specified_directiory_not_writeable">Не вдалося створити мапи у вказаній теці</string>
-    <string name="copying_osmand_file_failed">Не вдалося скопіювати файли</string>
+    <string name="copying_osmand_file_failed">Не вдалося перемістити файли</string>
     <string name="storage_directory_external">Зовнішнє сховище</string>
     <string name="storage_directory_multiuser">Толочне сховище</string>
     <string name="storage_directory_internal_app">Внутрішня пам’ять застосунку</string>
@@ -3020,4 +3020,16 @@
     <string name="routing_attr_avoid_sett_name">Уникати мостові та бруківку</string>
     <string name="routing_attr_avoid_sett_description">Уникати мостові та бруківку</string>
     <string name="send_log">Надіслати журнал</string>
+    <string name="files_moved">Переміщено %1$d файлів (%2$s).</string>
+    <string name="files_copied">Скопійовано %1$d файлів (%2$s).</string>
+    <string name="files_failed">Невдача при копіюванні %1$d файлів (%2$s).</string>
+    <string name="files_present">%1$d файлів (%2$s) присутні в попередній локації \'%3$s\'.</string>
+    <string name="move_maps">Перемістити мапи</string>
+    <string name="dont_move_maps">Не переміщувати мапи</string>
+    <string name="public_transport_ped_route_title">Пішохідний маршрут займе приблизно %1$s і він може виявитися швидшим за громадський транспорт</string>
+    <string name="public_transport_no_route_title">На жаль, OsmAnd не зміг підібрати маршрут, що відповідав би вашим налаштуванням.</string>
+    <string name="public_transport_try_ped">Спробуйте пішохідну навігацію.</string>
+    <string name="public_transport_try_change_settings">Спробуйте змінити налаштування.</string>
+    <string name="public_transport_calc_pedestrian">Розрахувати пішохідний маршрут</string>
+    <string name="public_transport_type">Тип транспорту</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index bd8496cefb..0e6f0eae77 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -3347,8 +3347,8 @@
     <string name="poi_climbing_toprope_no">確保繩：沒有</string>
     <string name="poi_climbing_trad_yes">傳統攀登：是的</string>
     <string name="poi_climbing_trad_no">傳統攀登：不是</string>
-    <string name="poi_climbing_multipitch_yes">多繩距路線：是的</string>
-    <string name="poi_climbing_multipitch_no">多繩距路線：是的</string>
+    <string name="poi_climbing_multipitch_yes">多間距路線：是</string>
+    <string name="poi_climbing_multipitch_no">多間距路線：否</string>
     <string name="poi_climbing_ice_yes">結冰：是的</string>
     <string name="poi_climbing_ice_no">結冰：沒有</string>
     <string name="poi_climbing_mixed_yes">混合：是的</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index ec1ccaa4e7..08e73066a3 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1528,9 +1528,9 @@
     <string name="index_name_netherlands">歐洲 - 荷蘭</string>
     <string name="rendering_value__name">預設</string>
     <string name="rendering_value_highContrastRoads_name">高對比道路</string>
-    <string name="application_dir_change_warning3">您想要 OsmAnd 將資料檔案複製到新的目的地嗎？</string>
+    <string name="application_dir_change_warning3">您想要 OsmAnd 將資料檔案移動到新的目的地嗎？</string>
     <string name="specified_directiory_not_writeable">在指定的目錄不能建立地圖</string>
-    <string name="copying_osmand_file_failed">複製檔案時失敗</string>
+    <string name="copying_osmand_file_failed">移動檔案時失敗</string>
     <string name="storage_directory_external">外部存儲器</string>
     <string name="storage_directory_multiuser">多使用者存儲器</string>
     <string name="storage_directory_internal_app">內部程式記憶體</string>
@@ -3018,4 +3018,16 @@
     <string name="use_osm_live_public_transport">OsmAnd Live 大眾運輸</string>
     <string name="routing_attr_avoid_sett_name">避免鵝卵石與枕木</string>
     <string name="routing_attr_avoid_sett_description">避免鵝卵石與枕木</string>
+    <string name="files_moved">已移動 %1$d 個檔案 (%2$s)。</string>
+    <string name="files_copied">已複製 %1$d 個檔案 (%2$s)。</string>
+    <string name="files_failed">複製 %1$d 個檔案失敗 (%2$s)。</string>
+    <string name="files_present">%1$d 個檔案 (%2$s) 出現在先前的位置 \'%3$s\'。</string>
+    <string name="move_maps">移動地圖</string>
+    <string name="dont_move_maps">不要移動</string>
+    <string name="public_transport_ped_route_title">步行路線約 %1$s，可能比大眾運輸還快</string>
+    <string name="public_transport_no_route_title">不幸的是，OsmAnd 找不到適合您設定的路線。</string>
+    <string name="public_transport_try_ped">嘗試行人導航。</string>
+    <string name="public_transport_try_change_settings">嘗試變更設定。</string>
+    <string name="public_transport_calc_pedestrian">計算行人路線</string>
+    <string name="public_transport_type">運輸類型</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 77769ae472..54c36061d2 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1283,6 +1283,7 @@
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
 	<string name="facebook">Facebook</string>
+        <string name="reddit">Reddit</string>
 	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
@@ -3678,7 +3679,7 @@
 	<string name="poi_climbing_trad_yes">Traditional: yes</string>
 	<string name="poi_climbing_trad_no">Traditional: no</string>
 	<string name="poi_climbing_multipitch_yes">Multi-pitch routes: yes</string>
-	<string name="poi_climbing_multipitch_no">Multi-pitch routes: yes</string>
+	<string name="poi_climbing_multipitch_no">Multi-pitch routes: no</string>
 	<string name="poi_climbing_ice_yes">Ice: yes</string>
 	<string name="poi_climbing_ice_no">Ice: no</string>
 	<string name="poi_climbing_mixed_yes">Mixed: yes</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index b8a9d9ea93..53538159d1 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -47,7 +47,7 @@
     </string>
     <string name="shared_string_degrees">Degrees</string>
     <string name="shared_string_milliradians">Milliradians</string>
-    <string name="angular_measeurement">Angular measurement units</string>
+    <string name="angular_measeurement">Angular unit</string>
     <string name="angular_measeurement_descr">Change what azimuth is measured in.</string>
     <string name="avoid_pt_types_descr">Select public transport types to avoid for navigation:</string>
     <string name="quick_action_day_night_mode">%s mode</string>
diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
index 347e1153fe..0d6259ae65 100644
--- a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
+++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
@@ -158,8 +158,9 @@ public class OsmandAidlService extends Service implements AidlCallbackListener {
 
 	@Override
 	public long addAidlCallback(IOsmAndAidlCallback callback, int key) {
-		callbacks.put(getAndIncrementCallbackId(), new AidlCallbackParams(callback, key));
-		return getCallbackId();
+		long id = getAndIncrementCallbackId();
+		callbacks.put(id, new AidlCallbackParams(callback, key));
+		return id;
 	}
 
 	@Override
@@ -765,7 +766,7 @@ public class OsmandAidlService extends Service implements AidlCallbackListener {
 				if (updateTimeMS >= MIN_UPDATE_TIME_MS) {
 					long id = addAidlCallback(callback, KEY_ON_UPDATE);
 					startRemoteUpdates(updateTimeMS, id, callback);
-					return getCallbackId();
+					return id;
 				} else {
 					return MIN_UPDATE_TIME_MS_ERROR;
 				}
diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index 43ca411903..1ccdb75297 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -753,8 +753,8 @@ public class AppInitializer implements IProgress {
 			}
 		}
 		if(app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get() && OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null){
-			int interval = app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get() ;
-			app.startNavigationService(NavigationService.USED_BY_GPX, interval < 30000 ? 0 : interval);
+			int interval = app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get();
+			app.startNavigationService(NavigationService.USED_BY_GPX, app.navigationServiceGpsInterval(interval));
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/GPXDatabase.java b/OsmAnd/src/net/osmand/plus/GPXDatabase.java
index 926f2a5359..e4a4f20692 100644
--- a/OsmAnd/src/net/osmand/plus/GPXDatabase.java
+++ b/OsmAnd/src/net/osmand/plus/GPXDatabase.java
@@ -3,8 +3,8 @@ package net.osmand.plus;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import net.osmand.IndexConstants;
 import net.osmand.GPXUtilities.GPXTrackAnalysis;
+import net.osmand.IndexConstants;
 import net.osmand.plus.api.SQLiteAPI.SQLiteConnection;
 import net.osmand.plus.api.SQLiteAPI.SQLiteCursor;
 import net.osmand.util.Algorithms;
@@ -114,6 +114,27 @@ public class GPXDatabase {
 			GPX_COL_SHOW_AS_MARKERS +
 			" FROM " +	GPX_TABLE_NAME;
 
+	private static final String GPX_TABLE_UPDATE_ANALYSIS = "UPDATE " +
+			GPX_TABLE_NAME + " SET " +
+			GPX_COL_TOTAL_DISTANCE + " = ?, " +
+			GPX_COL_TOTAL_TRACKS + " = ?, " +
+			GPX_COL_START_TIME + " = ?, " +
+			GPX_COL_END_TIME + " = ?, " +
+			GPX_COL_TIME_SPAN + " = ?, " +
+			GPX_COL_TIME_MOVING + " = ?, " +
+			GPX_COL_TOTAL_DISTANCE_MOVING + " = ?, " +
+			GPX_COL_DIFF_ELEVATION_UP + " = ?, " +
+			GPX_COL_DIFF_ELEVATION_DOWN + " = ?, " +
+			GPX_COL_AVG_ELEVATION + " = ?, " +
+			GPX_COL_MIN_ELEVATION + " = ?, " +
+			GPX_COL_MAX_ELEVATION + " = ?, " +
+			GPX_COL_MAX_SPEED + " = ?, " +
+			GPX_COL_AVG_SPEED + " = ?, " +
+			GPX_COL_POINTS + " = ?, " +
+			GPX_COL_WPT_POINTS + " = ?, " +
+			GPX_COL_FILE_LAST_MODIFIED_TIME + " = ?, " +
+			GPX_COL_WPT_CATEGORY_NAMES + " = ? ";
+
 	private OsmandApplication context;
 
 	public static class GpxDataItem {
@@ -140,6 +161,7 @@ public class GPXDatabase {
 			return file;
 		}
 
+		@Nullable
 		public GPXTrackAnalysis getAnalysis() {
 			return analysis;
 		}
@@ -456,26 +478,7 @@ public class GPXDatabase {
 			try {
 				String fileName = getFileName(item.file);
 				String fileDir = getFileDir(item.file);
-				db.execSQL("UPDATE " + GPX_TABLE_NAME + " SET " +
-								GPX_COL_TOTAL_DISTANCE + " = ?, " +
-								GPX_COL_TOTAL_TRACKS + " = ?, " +
-								GPX_COL_START_TIME + " = ?, " +
-								GPX_COL_END_TIME + " = ?, " +
-								GPX_COL_TIME_SPAN + " = ?, " +
-								GPX_COL_TIME_MOVING + " = ?, " +
-								GPX_COL_TOTAL_DISTANCE_MOVING + " = ?, " +
-								GPX_COL_DIFF_ELEVATION_UP + " = ?, " +
-								GPX_COL_DIFF_ELEVATION_DOWN + " = ?, " +
-								GPX_COL_AVG_ELEVATION + " = ?, " +
-								GPX_COL_MIN_ELEVATION + " = ?, " +
-								GPX_COL_MAX_ELEVATION + " = ?, " +
-								GPX_COL_MAX_SPEED + " = ?, " +
-								GPX_COL_AVG_SPEED + " = ?, " +
-								GPX_COL_POINTS + " = ?, " +
-								GPX_COL_WPT_POINTS + " = ?, " +
-								GPX_COL_FILE_LAST_MODIFIED_TIME + " = ?, " +
-								GPX_COL_WPT_CATEGORY_NAMES + " = ? " +
-								" WHERE " + GPX_COL_NAME + " = ? AND " + GPX_COL_DIR + " = ?",
+				db.execSQL(GPX_TABLE_UPDATE_ANALYSIS + " WHERE " + GPX_COL_NAME + " = ? AND " + GPX_COL_DIR + " = ?",
 						new Object[]{ a.totalDistance, a.totalTracks, a.startTime, a.endTime,
 								a.timeSpan, a.timeMoving, a.totalDistanceMoving, a.diffElevationUp,
 								a.diffElevationDown, a.avgElevation, a.minElevation, a.maxElevation,
@@ -489,6 +492,23 @@ public class GPXDatabase {
 		return false;
 	}
 
+	public boolean clearAnalysis(GpxDataItem item) {
+		SQLiteConnection db = openConnection(false);
+		if (db != null) {
+			try {
+				Object[] bindArgs = new Object[20];
+				bindArgs[16] = 0;
+				bindArgs[18] = getFileName(item.file);
+				bindArgs[19] = getFileDir(item.file);
+				db.execSQL(GPX_TABLE_UPDATE_ANALYSIS + " WHERE " + GPX_COL_NAME + " = ? AND " + GPX_COL_DIR + " = ?", bindArgs);
+			} finally {
+				db.close();
+			}
+			return true;
+		}
+		return false;
+	}
+
 	private GpxDataItem readItem(SQLiteCursor query) {
 		String fileName = query.getString(0);
 		String fileDir = query.getString(1);
diff --git a/OsmAnd/src/net/osmand/plus/NavigationService.java b/OsmAnd/src/net/osmand/plus/NavigationService.java
index f0c856a25c..a3dc7f5026 100644
--- a/OsmAnd/src/net/osmand/plus/NavigationService.java
+++ b/OsmAnd/src/net/osmand/plus/NavigationService.java
@@ -10,6 +10,7 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Binder;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -41,6 +42,7 @@ public class NavigationService extends Service implements LocationListener {
 	private int serviceOffInterval;
 	private String serviceOffProvider;
 	private int serviceError;
+	private long nextManualWakeup;
 	private OsmandSettings settings;
 	private Handler handler;
 
@@ -71,6 +73,14 @@ public class NavigationService extends Service implements LocationListener {
 		return serviceError;
 	}
 
+	public long getNextManualWakeup() {
+		return nextManualWakeup;
+	}
+
+	public void setNextManualWakeup(long value) {
+		nextManualWakeup = value;
+	}
+
 	public int getServiceOffInterval() {
 		return serviceOffInterval;
 	}
@@ -101,7 +111,7 @@ public class NavigationService extends Service implements LocationListener {
 		} else {
 			// Issue #3604
 			final OsmandApplication app = (OsmandApplication) getApplication();
-			if ((usedBy == 2) && !(app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get() < 30000) && (serviceOffInterval == 0)) {
+			if ((usedBy == 2) && (app.navigationServiceGpsInterval(app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get()) != 0) && (serviceOffInterval == 0)) {
 				serviceOffInterval = app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get();
 				// From onStartCommand:
 				serviceError = serviceOffInterval / 5;
@@ -111,7 +121,15 @@ public class NavigationService extends Service implements LocationListener {
 				app.setNavigationService(this);
 				AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
 				pendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(this, OnNavigationServiceAlarmReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT);
-				alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, serviceOffInterval, pendingIntent);
+				nextManualWakeup = SystemClock.elapsedRealtime() + serviceOffInterval;
+				if (Build.VERSION.SDK_INT >= 23) {
+					alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, pendingIntent);
+				} else if (Build.VERSION.SDK_INT >= 19) {
+					// setRepeating() became inexact starting with SDK 19
+					alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, pendingIntent);
+				} else {
+					alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, serviceOffInterval, pendingIntent);
+				}
 			}
 
 			app.getNotificationHelper().updateTopNotification();
@@ -159,7 +177,15 @@ public class NavigationService extends Service implements LocationListener {
 		} else {
 			AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
 			pendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(this, OnNavigationServiceAlarmReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT);
-			alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, serviceOffInterval, pendingIntent);
+			nextManualWakeup = SystemClock.elapsedRealtime() + serviceOffInterval;
+			if (Build.VERSION.SDK_INT >= 23) {
+				alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, pendingIntent);
+			} else if (Build.VERSION.SDK_INT >= 19) {
+				// setRepeating() became inexact starting with SDK 19
+				alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, pendingIntent);
+			} else {
+				alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, serviceOffInterval, pendingIntent);
+			}
 		}
 
 		// registering icon at top level
diff --git a/OsmAnd/src/net/osmand/plus/OnNavigationServiceAlarmReceiver.java b/OsmAnd/src/net/osmand/plus/OnNavigationServiceAlarmReceiver.java
index ece000af8c..b89fff7e03 100644
--- a/OsmAnd/src/net/osmand/plus/OnNavigationServiceAlarmReceiver.java
+++ b/OsmAnd/src/net/osmand/plus/OnNavigationServiceAlarmReceiver.java
@@ -1,22 +1,34 @@
 package net.osmand.plus;
 
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.location.LocationManager;
+import android.os.Build;
 import android.os.PowerManager.WakeLock;
+import android.os.SystemClock;
 
 public class OnNavigationServiceAlarmReceiver extends BroadcastReceiver {
 	@Override
 	public void onReceive(Context context, Intent intent) {
 		final WakeLock lock = NavigationService.getLock(context);
 		final NavigationService service = ((OsmandApplication) context.getApplicationContext()).getNavigationService();
+
 		// do not do nothing
-		if (lock.isHeld() || service == null) {
+		if (service == null) {
+			return;
+		} else if (lock.isHeld()) {
+			rescheduleAlarm(context);
 			return;
 		}
+
 		//
 		lock.acquire();
+		rescheduleAlarm(context);
+
 		// request location updates
 		final LocationManager locationManager = (LocationManager) service.getSystemService(Context.LOCATION_SERVICE);
 		try {
@@ -38,4 +50,22 @@ public class OnNavigationServiceAlarmReceiver extends BroadcastReceiver {
 		}
 	}
 
-}
\ No newline at end of file
+	private void rescheduleAlarm(Context context) {
+		//Unless setRepeating was used, manually re-schedule service to the next measurement point in the future
+		if (Build.VERSION.SDK_INT >= 19) {
+			NavigationService service = ((OsmandApplication) context.getApplicationContext()).getNavigationService();
+			// Avoid drift
+			while ((service.getNextManualWakeup() - SystemClock.elapsedRealtime()) < 0) {
+				service.setNextManualWakeup(service.getNextManualWakeup() + service.getServiceOffInterval());
+			}
+			AlarmManager alarmManager = (AlarmManager) service.getSystemService(Context.ALARM_SERVICE);
+			PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 1, new Intent(context, OnNavigationServiceAlarmReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT);
+			if (Build.VERSION.SDK_INT >= 23) {
+				alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, service.getNextManualWakeup(), pendingIntent);
+			} else {
+				alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, service.getNextManualWakeup(), pendingIntent);
+			}
+		}
+	}
+
+}
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
index 37f903958a..a47ca5dade 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
@@ -308,7 +308,7 @@ public class OsmAndAppCustomization {
 		if (params.getNewState() == 0) {
 			for (OsmandPlugin plugin : OsmandPlugin.getEnabledPlugins()) {
 				if (plugin.getId().equals(params.getPluginId())) {
-					plugin.setActive(false);
+					OsmandPlugin.enablePlugin(null, app, plugin, false);
 				}
 			}
 			return true;
@@ -317,7 +317,7 @@ public class OsmAndAppCustomization {
 		if (params.getNewState() == 1) {
 			for (OsmandPlugin plugin : OsmandPlugin.getAvailablePlugins()) {
 				if (plugin.getId().equals(params.getPluginId())) {
-					plugin.setActive(true);
+					OsmandPlugin.enablePlugin(null, app, plugin, true);
 				}
 			}
 			return true;
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
index ce58e4d218..d58cf173e4 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
@@ -168,12 +168,13 @@ public class OsmAndFormatter {
 	}
 
 	public static String getFormattedAzimuth(float bearing, OsmandApplication app) {
-		int azimuth;
-		if (bearing < 0.0) {
-			azimuth = (int) (360 + bearing);
-		} else {
-			azimuth = (int) bearing;
+		while(bearing < -180.0) {
+			bearing += 360;
 		}
+		while(bearing > 360.0) {
+			bearing -= 360;
+		}
+		int azimuth = (int) bearing;
 
 		if (app.getSettings().ANGULAR_UNITS.get() == AngularConstants.MILLIRADS) {
 			return (int) (azimuth * 17.4533) + " " + AngularConstants.MILLIRADS.getUnitSymbol();
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index 617f0354eb..f0a72c569f 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -848,7 +848,23 @@ public class OsmandApplication extends MultiDexApplication {
 			return 0;
 		}
 	}
-	
+
+
+	public int navigationServiceGpsInterval(int interval) {
+		// Issue 5632 Workaround: Keep GPS always on instead of using AlarmManager, as API>=19 restricts repeated AlarmManager reception
+		// Maybe do not apply to API=19 devices, many still behave acceptably (often restriction not worse than 1/min)
+		if ((Build.VERSION.SDK_INT > 19) && (getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get() < 5 * 60000)) {
+			return 0;
+		}
+		// Default: Save battery power by turning off GPS between measurements
+		if (interval >= 30000) {
+			return interval;
+		// GPS continuous
+		} else {
+			return 0;
+		}
+	}
+
 
 	public void startNavigationService(int intent, int interval) {
 		final Intent serviceIntent = new Intent(this, NavigationService.class);
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index dcde1af648..3339376f47 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -35,7 +35,6 @@ import net.osmand.plus.mapmarkers.CoordinateInputFormats.Format;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.render.RenderingRulesStorage;
-import net.osmand.search.core.ObjectType;
 import net.osmand.util.Algorithms;
 
 import java.io.File;
@@ -831,6 +830,7 @@ public class OsmandSettings {
 	public final CommonPreference<Boolean> SHOW_CARD_TO_CHOOSE_DRAWER = new BooleanPreference("show_card_to_choose_drawer", false).makeGlobal();
 	public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_START = new BooleanPreference("should_show_dashboard_on_start", false).makeGlobal();
 	public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_MAP_SCREEN = new BooleanPreference("show_dashboard_on_map_screen", false).makeGlobal();
+	public final CommonPreference<Boolean> SHOW_OSMAND_WELCOME_SCREEN = new BooleanPreference("show_osmand_welcome_screen", true).makeGlobal();
 
 	public final CommonPreference<String> API_NAV_DRAWER_ITEMS_JSON = new StringPreference("api_nav_drawer_items_json", "{}").makeGlobal();
 	public final CommonPreference<String> API_CONNECTED_APPS_JSON = new StringPreference("api_connected_apps_json", "[]").makeGlobal();
diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
index 961c14e01b..3de3b2a0b1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@@ -102,6 +102,8 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
 		contextMenuAdapter.addItem(createCategory(R.string.follow_us));
 		contextMenuAdapter.addItem(createSocialItem(R.string.twitter, R.string.twitter_address,
 				R.drawable.ic_action_social_twitter));
+	        contextMenuAdapter.addItem(createSocialItem(R.string.reddit, R.string.reddit_address,
+				R.drawable.ic_action_social_twitter));
 		contextMenuAdapter.addItem(createSocialItem(R.string.facebook, R.string.facebook_address,
 				R.drawable.ic_action_social_facebook));
 		contextMenuAdapter.addItem(createSocialItem(R.string.vk, R.string.vk_address,
@@ -235,4 +237,4 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
 			return false;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index f3a63fc76c..1aa6c4bb46 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -48,7 +48,6 @@ import net.osmand.StateChangedListener;
 import net.osmand.ValueHolder;
 import net.osmand.access.MapAccessibilityActions;
 import net.osmand.aidl.OsmandAidlApi.AMapPointUpdateListener;
-import net.osmand.aidl.contextmenu.ContextMenuButtonsParams;
 import net.osmand.aidl.map.ALatLon;
 import net.osmand.aidl.maplayer.point.AMapPoint;
 import net.osmand.core.android.AtlasMapRendererView;
@@ -123,7 +122,6 @@ import net.osmand.plus.search.QuickSearchDialogFragment;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchTab;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
 import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
-import net.osmand.plus.views.AidlMapLayer;
 import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.MapInfoLayer;
@@ -746,6 +744,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 		OsmandPlugin.onMapActivityResume(this);
 
+		boolean showOsmAndWelcomeScreen = true;
 		final Intent intent = getIntent();
 		if (intent != null) {
 			if (Intent.ACTION_VIEW.equals(intent.getAction())) {
@@ -775,6 +774,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 					}
 				}
 			}
+			if (intent.hasExtra(FirstUsageWelcomeFragment.SHOW_OSMAND_WELCOME_SCREEN)) {
+				showOsmAndWelcomeScreen = intent.getBooleanExtra(FirstUsageWelcomeFragment.SHOW_OSMAND_WELCOME_SCREEN, true);
+			}
 			if (intent.hasExtra(MapMarkersDialogFragment.OPEN_MAP_MARKERS_GROUPS)) {
 				Bundle openMapMarkersGroupsExtra = intent.getBundleExtra(MapMarkersDialogFragment.OPEN_MAP_MARKERS_GROUPS);
 				if (openMapMarkersGroupsExtra != null) {
@@ -825,8 +827,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms");
 		}
 
-		boolean showWelcomeScreen = ((app.getAppInitializer().isFirstTime() && Version.isDeveloperVersion(app))
-				|| !app.getResourceManager().isAnyMapInstalled()) && FirstUsageWelcomeFragment.SHOW;
+		boolean showWelcomeScreen = ((app.getAppInitializer().isFirstTime() && Version.isDeveloperVersion(app)) || !app.getResourceManager().isAnyMapInstalled())
+				&& FirstUsageWelcomeFragment.SHOW && settings.SHOW_OSMAND_WELCOME_SCREEN.get() && showOsmAndWelcomeScreen;
 
 		if (!showWelcomeScreen && !permissionDone && !app.getAppInitializer().isFirstTime()) {
 			if (!permissionAsked) {
@@ -862,7 +864,16 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			OsmLiveCancelledDialog.showInstance(getSupportFragmentManager());
 		}
 		FirstUsageWelcomeFragment.SHOW = false;
-
+		if (isFirstScreenShowing() && (!settings.SHOW_OSMAND_WELCOME_SCREEN.get() || !showOsmAndWelcomeScreen)) {
+			FirstUsageWelcomeFragment welcomeFragment = getFirstUsageWelcomeFragment();
+			if (welcomeFragment != null) {
+				welcomeFragment.closeWelcomeFragment();
+			}
+			FirstUsageWizardFragment wizardFragment = getFirstUsageWizardFragment();
+			if (wizardFragment != null) {
+				wizardFragment.closeWizard();
+			}
+		}
 		if (SecondSplashScreenFragment.SHOW) {
 			SecondSplashScreenFragment.SHOW = false;
 			SecondSplashScreenFragment.VISIBLE = true;
@@ -1687,6 +1698,15 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		}
 	}
 
+	public FirstUsageWelcomeFragment getFirstUsageWelcomeFragment() {
+		FirstUsageWelcomeFragment welcomeFragment = (FirstUsageWelcomeFragment) getSupportFragmentManager().findFragmentByTag(FirstUsageWelcomeFragment.TAG);
+		if (welcomeFragment != null && !welcomeFragment.isDetached()) {
+			return welcomeFragment;
+		} else {
+			return null;
+		}
+	}
+
 	public FirstUsageWizardFragment getFirstUsageWizardFragment() {
 		FirstUsageWizardFragment wizardFragment = (FirstUsageWizardFragment) getSupportFragmentManager().findFragmentByTag(FirstUsageWizardFragment.TAG);
 		if (wizardFragment != null && !wizardFragment.isDetached()) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
index 9473e93d06..5d29aa5b1f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
@@ -71,6 +71,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 	private long duration = 0;
 	private SelectedGpxFile currentTrack;
 	private int points;
+	private int trkPoints = 0;
 	
 	public SavingTrackHelper(OsmandApplication ctx){
 		super(ctx, DATABASE_NAME, null, DATABASE_VERSION);
@@ -250,6 +251,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 		distance = 0;
 		points = 0;
 		duration = 0;
+		trkPoints = 0;
 		ctx.getSelectedGpxHelper().clearPoints(currentTrack.getModifiableGpxFile());
 		currentTrack.getModifiableGpxFile().tracks.clear();
 		currentTrack.getModifiablePointsToDisplay().clear();
@@ -457,6 +459,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 		lastTimeUpdated = time;
 		WptPt pt = new GPXUtilities.WptPt(lat, lon, time, alt, speed, hdop);
 		addTrackPoint(pt, newSegment, time);
+		trkPoints++;
 	}
 	
 	private void addTrackPoint(WptPt pt, boolean newSegment, long time) {
@@ -632,6 +635,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 		distance = analysis.totalDistance;
 		points = analysis.wptPoints;
 		duration = analysis.timeSpan;
+		trkPoints = analysis.points;
 	}
 
 	private void prepareCurrentTrackForRecording() {
@@ -666,6 +670,10 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 		return points;
 	}
 	
+	public int getTrkPoints() {
+		return trkPoints;
+	}
+
 	public long getLastTimeUpdated() {
 		return lastTimeUpdated;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index e38dbcc950..5c067a468c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -234,7 +234,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 				"ast",
 				"az",
 				"be",
-				"be_BY",
+				//"be_BY",
 				"bg",
 				"ca",
 				"cs",
@@ -294,7 +294,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 				getString(R.string.lang_ast) + incompleteSuffix,
 				getString(R.string.lang_az),
 				getString(R.string.lang_be),
-				getString(R.string.lang_be_by),
+				// getString(R.string.lang_be_by),
 				getString(R.string.lang_bg),
 				getString(R.string.lang_ca),
 				getString(R.string.lang_cs),
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index a78c7f331b..6d06840297 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -337,10 +337,10 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 	}
 
 	public void backToLocationImpl() {
-		backToLocationImpl(15);
+		backToLocationImpl(15, true);
 	}
 
-	public void backToLocationImpl(int zoom) {
+	public void backToLocationImpl(int zoom, boolean forceZoom) {
 		if (mapView != null) {
 			OsmAndLocationProvider locationProvider = app.getLocationProvider();
 			if (!isMapLinkedToLocation()) {
@@ -348,7 +348,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 				net.osmand.Location lastKnownLocation = locationProvider.getLastKnownLocation();
 				if (lastKnownLocation != null) {
 					AnimateDraggingMapThread thread = mapView.getAnimatedDraggingThread();
-					int fZoom = mapView.getZoom() < zoom ? zoom : mapView.getZoom();
+					int fZoom = mapView.getZoom() < zoom && (forceZoom || app.getSettings().AUTO_ZOOM_MAP.get()) ? zoom : mapView.getZoom();
 					movingToMyLocation = true;
 					thread.startMoving(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude(),
 							fZoom, false, new Runnable() {
@@ -372,7 +372,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 			public void run() {
 				if (mapView != null && !isMapLinkedToLocation() && contextMenu == null) {
 					app.showToastMessage(R.string.auto_follow_location_enabled);
-					backToLocationImpl();
+					backToLocationImpl(15, false);
 				}
 			}
 		}, delay * 1000);
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index 0df53e0546..6be252d98d 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -161,15 +161,18 @@ public class ConfigureMapMenu {
 			for (GpxSelectionHelper.SelectedGpxFile file : selectedGpxFiles) {
 				files.add(file.getGpxFile().path);
 			}
-			Map<GPXUtilities.GPXFile, Long> fls = selectedGpxHelper.getSelectedGpxFilesBackUp();
-			for(Map.Entry<GPXUtilities.GPXFile, Long> f : fls.entrySet()) {
-				if(!Algorithms.isEmpty(f.getKey().path)) {
-					File file = new File(f.getKey().path);
-					if(file.exists() && !file.isDirectory()) {
-						files.add(f.getKey().path);
+			if (selectedGpxFiles.isEmpty()) {
+				Map<GPXUtilities.GPXFile, Long> fls = selectedGpxHelper.getSelectedGpxFilesBackUp();
+				for(Map.Entry<GPXUtilities.GPXFile, Long> f : fls.entrySet()) {
+					if(!Algorithms.isEmpty(f.getKey().path)) {
+						File file = new File(f.getKey().path);
+						if(file.exists() && !file.isDirectory()) {
+							files.add(f.getKey().path);
+						}
 					}
 				}
 			}
+
 			return files;
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
index b030063777..b5531598a9 100644
--- a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
@@ -1,16 +1,14 @@
 package net.osmand.plus.firstusage;
 
-import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.support.v7.widget.AppCompatButton;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.ImageView;
 
 import net.osmand.plus.R;
@@ -18,6 +16,7 @@ import net.osmand.plus.activities.MapActivity;
 
 public class FirstUsageWelcomeFragment extends Fragment {
 	public static final String TAG = "FirstUsageWelcomeFragment";
+	public static final String SHOW_OSMAND_WELCOME_SCREEN = "show_osmand_welcome_screen";
 	public static boolean SHOW = true;
 	@Nullable
 	@Override
@@ -51,4 +50,12 @@ public class FirstUsageWelcomeFragment extends Fragment {
 		super.onPause();
 		((MapActivity)getActivity()).enableDrawer();
 	}
+
+	public void closeWelcomeFragment() {
+		FragmentActivity activity = getActivity();
+		if (activity != null) {
+			activity.getSupportFragmentManager().beginTransaction()
+					.remove(FirstUsageWelcomeFragment.this).commit();
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
index 590de74cb1..f99e4daefd 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
@@ -23,6 +23,8 @@ import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.Toast;
 
+import net.osmand.GPXUtilities;
+import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.WptPt;
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
@@ -32,8 +34,7 @@ import net.osmand.plus.AppInitializer;
 import net.osmand.plus.AppInitializer.AppInitializeListener;
 import net.osmand.plus.AppInitializer.InitEvents;
 import net.osmand.plus.FavouritesDbHelper;
-import net.osmand.GPXUtilities;
-import net.osmand.GPXUtilities.GPXFile;
+import net.osmand.plus.GPXDatabase;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
@@ -50,6 +51,8 @@ import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.util.Algorithms;
 
+import org.apache.commons.logging.Log;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -65,7 +68,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.zip.ZipInputStream;
-import org.apache.commons.logging.Log;
 
 /**
  * @author Koen Rabaey
@@ -616,10 +618,21 @@ public class ImportHelper {
 			if (importDir.exists() && importDir.isDirectory() && importDir.canWrite()) {
 				final WptPt pt = gpxFile.findPointToShow();
 				final File toWrite = getFileToSave(fileName, importDir, pt);
+				boolean destinationExists = toWrite.exists();
 				Exception e = GPXUtilities.writeGpxFile(toWrite, gpxFile);
-				if(e == null) {
+				if (e == null) {
 					gpxFile.path = toWrite.getAbsolutePath();
-					app.getGpxDatabase().remove(new File(gpxFile.path));
+					File file = new File(gpxFile.path);
+					if (!destinationExists) {
+						GPXDatabase.GpxDataItem item = new GPXDatabase.GpxDataItem(file, gpxFile.getColor(0));
+						app.getGpxDatabase().add(item);
+					} else {
+						GPXDatabase.GpxDataItem item = app.getGpxDatabase().getItem(file);
+						if (item != null) {
+							app.getGpxDatabase().clearAnalysis(item);
+						}
+					}
+
 					warning = null;
 				} else {
 					warning = app.getString(R.string.error_reading_gpx);
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
index c8f14361de..662dc5c9dc 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
@@ -213,10 +213,12 @@ public class TrackDetailsMenu {
 		updateView(main);
 	}
 
-	private TrkSegment getTrackSegment(LineChart chart) {
+	@Nullable
+	private TrkSegment getTrackSegment(@NonNull LineChart chart) {
 		TrkSegment segment = this.segment;
 		if (segment == null) {
-			List<ILineDataSet> ds = chart.getLineData().getDataSets();
+			LineData lineData = chart.getLineData();
+			List<ILineDataSet> ds = lineData != null ? lineData.getDataSets() : null;
 			GpxDisplayItem gpxItem = getGpxItem();
 			if (ds != null && ds.size() > 0 && gpxItem != null) {
 				for (GPXUtilities.Track t : gpxItem.group.getGpx().tracks) {
@@ -236,12 +238,17 @@ public class TrackDetailsMenu {
 		return segment;
 	}
 
+	@Nullable
 	private LatLon getLocationAtPos(LineChart chart, float pos) {
 		LatLon latLon = null;
-		List<ILineDataSet> ds = chart.getLineData().getDataSets();
+		LineData lineData = chart.getLineData();
+		List<ILineDataSet> ds = lineData != null ? lineData.getDataSets() : null;
 		GpxDisplayItem gpxItem = getGpxItem();
 		if (ds != null && ds.size() > 0 && gpxItem != null) {
 			TrkSegment segment = getTrackSegment(chart);
+			if (segment == null) {
+				return null;
+			}
 			OrderedLineDataSet dataSet = (OrderedLineDataSet) ds.get(0);
 			if (gpxItem.chartAxisType == GPXDataSetAxisType.TIME ||
 					gpxItem.chartAxisType == GPXDataSetAxisType.TIMEOFDAY) {
@@ -295,52 +302,55 @@ public class TrackDetailsMenu {
 	private QuadRect getRect(LineChart chart, float startPos, float endPos) {
 		double left = 0, right = 0;
 		double top = 0, bottom = 0;
-		List<ILineDataSet> ds = chart.getLineData().getDataSets();
+		LineData lineData = chart.getLineData();
+		List<ILineDataSet> ds = lineData != null ? lineData.getDataSets() : null;
 		GpxDisplayItem gpxItem = getGpxItem();
 		if (ds != null && ds.size() > 0 && gpxItem != null) {
 			TrkSegment segment = getTrackSegment(chart);
-			OrderedLineDataSet dataSet = (OrderedLineDataSet) ds.get(0);
-			if (gpxItem.chartAxisType == GPXDataSetAxisType.TIME || gpxItem.chartAxisType == GPXDataSetAxisType.TIMEOFDAY) {
-				float startTime = startPos * 1000;
-				float endTime = endPos * 1000;
-				for (WptPt p : segment.points) {
-					if (p.time - gpxItem.analysis.startTime >= startTime && p.time - gpxItem.analysis.startTime <= endTime) {
-						if (left == 0 && right == 0) {
-							left = p.getLongitude();
-							right = p.getLongitude();
-							top = p.getLatitude();
-							bottom = p.getLatitude();
-						} else {
-							left = Math.min(left, p.getLongitude());
-							right = Math.max(right, p.getLongitude());
-							top = Math.max(top, p.getLatitude());
-							bottom = Math.min(bottom, p.getLatitude());
+			if (segment != null) {
+				OrderedLineDataSet dataSet = (OrderedLineDataSet) ds.get(0);
+				if (gpxItem.chartAxisType == GPXDataSetAxisType.TIME || gpxItem.chartAxisType == GPXDataSetAxisType.TIMEOFDAY) {
+					float startTime = startPos * 1000;
+					float endTime = endPos * 1000;
+					for (WptPt p : segment.points) {
+						if (p.time - gpxItem.analysis.startTime >= startTime && p.time - gpxItem.analysis.startTime <= endTime) {
+							if (left == 0 && right == 0) {
+								left = p.getLongitude();
+								right = p.getLongitude();
+								top = p.getLatitude();
+								bottom = p.getLatitude();
+							} else {
+								left = Math.min(left, p.getLongitude());
+								right = Math.max(right, p.getLongitude());
+								top = Math.max(top, p.getLatitude());
+								bottom = Math.min(bottom, p.getLatitude());
+							}
 						}
 					}
-				}
-			} else {
-				float startDistance = startPos * dataSet.getDivX();
-				float endDistance = endPos * dataSet.getDivX();
-				double previousSplitDistance = 0;
-				for (int i = 0; i < segment.points.size(); i++) {
-					WptPt currentPoint = segment.points.get(i);
-					if (i != 0) {
-						WptPt previousPoint = segment.points.get(i - 1);
-						if (currentPoint.distance < previousPoint.distance) {
-							previousSplitDistance += previousPoint.distance;
+				} else {
+					float startDistance = startPos * dataSet.getDivX();
+					float endDistance = endPos * dataSet.getDivX();
+					double previousSplitDistance = 0;
+					for (int i = 0; i < segment.points.size(); i++) {
+						WptPt currentPoint = segment.points.get(i);
+						if (i != 0) {
+							WptPt previousPoint = segment.points.get(i - 1);
+							if (currentPoint.distance < previousPoint.distance) {
+								previousSplitDistance += previousPoint.distance;
+							}
 						}
-					}
-					if (previousSplitDistance + currentPoint.distance >= startDistance && previousSplitDistance + currentPoint.distance <= endDistance) {
-						if (left == 0 && right == 0) {
-							left = currentPoint.getLongitude();
-							right = currentPoint.getLongitude();
-							top = currentPoint.getLatitude();
-							bottom = currentPoint.getLatitude();
-						} else {
-							left = Math.min(left, currentPoint.getLongitude());
-							right = Math.max(right, currentPoint.getLongitude());
-							top = Math.max(top, currentPoint.getLatitude());
-							bottom = Math.min(bottom, currentPoint.getLatitude());
+						if (previousSplitDistance + currentPoint.distance >= startDistance && previousSplitDistance + currentPoint.distance <= endDistance) {
+							if (left == 0 && right == 0) {
+								left = currentPoint.getLongitude();
+								right = currentPoint.getLongitude();
+								top = currentPoint.getLatitude();
+								bottom = currentPoint.getLatitude();
+							} else {
+								left = Math.min(left, currentPoint.getLongitude());
+								right = Math.max(right, currentPoint.getLongitude());
+								top = Math.max(top, currentPoint.getLatitude());
+								bottom = Math.min(bottom, currentPoint.getLatitude());
+							}
 						}
 					}
 				}
@@ -352,7 +362,7 @@ public class TrackDetailsMenu {
 	private void fitTrackOnMap(LineChart chart, LatLon location, boolean forceFit) {
 		QuadRect rect = getRect(chart, chart.getLowestVisibleX(), chart.getHighestVisibleX());
 		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
+		if (mapActivity != null && rect.left != 0 && rect.right != 0) {
 			RotatedTileBox tb = mapActivity.getMapView().getCurrentRotatedTileBox().copy();
 			int tileBoxWidthPx = 0;
 			int tileBoxHeightPx = 0;
@@ -454,17 +464,19 @@ public class TrackDetailsMenu {
 
 	private List<LatLon> getXAxisPoints(LineChart chart) {
 		float[] entries = chart.getXAxis().mEntries;
-		float maxXValue = chart.getLineData().getXMax();
-		if (entries.length >= 2) {
+		LineData lineData = chart.getLineData();
+		float maxXValue = lineData != null ? lineData.getXMax() : -1;
+		if (entries.length >= 2 && lineData != null) {
 			float interval = entries[1] - entries[0];
 			if (interval > 0) {
-				xAxisPoints = new ArrayList<>();
+				List<LatLon> xAxisPoints = new ArrayList<>();
 				float currentPointEntry = interval;
 				while (currentPointEntry < maxXValue) {
 					LatLon location = getLocationAtPos(chart, currentPointEntry);
 					xAxisPoints.add(location);
 					currentPointEntry += interval;
 				}
+				this.xAxisPoints = xAxisPoints;
 			}
 		}
 		return xAxisPoints;
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
index f6c385f771..f2960d523e 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
@@ -9,12 +9,12 @@ import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import net.osmand.IndexConstants;
-import net.osmand.plus.GPXDatabase;
-import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.GPXUtilities;
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.GPXTrackAnalysis;
+import net.osmand.IndexConstants;
+import net.osmand.plus.GPXDatabase;
+import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -58,7 +58,8 @@ public class AddTracksGroupBottomSheetDialogFragment extends AddGroupBottomSheet
 	@Override
 	protected void onItemClick(int position) {
 		GpxDataItem dataItem = gpxList.get(position - 1);
-		if (dataItem.getAnalysis().wptCategoryNames != null && dataItem.getAnalysis().wptCategoryNames.size() > 1) {
+		GPXTrackAnalysis analysis = dataItem.getAnalysis();
+		if (analysis != null && analysis.wptCategoryNames != null && analysis.wptCategoryNames.size() > 1) {
 			Bundle args = new Bundle();
 			args.putString(SelectWptCategoriesBottomSheetDialogFragment.GPX_FILE_PATH_KEY, dataItem.getFile().getAbsolutePath());
 
@@ -131,9 +132,11 @@ public class AddTracksGroupBottomSheetDialogFragment extends AddGroupBottomSheet
 					processGPXFolder(gpxFile, sub);
 				} else if (gpxFile.isFile() && gpxFile.getName().toLowerCase().endsWith(".gpx")) {
 					GpxDataItem item = processedDataFiles.get(gpxFile);
+					GPXTrackAnalysis itemAnalysis = item != null ? item.getAnalysis() : null;
 					if (item == null
 							|| item.getFileLastModifiedTime() != gpxFile.lastModified()
-							|| item.getAnalysis().wptCategoryNames == null) {
+							|| itemAnalysis == null
+							|| itemAnalysis.wptCategoryNames == null) {
 						GPXFile f = GPXUtilities.loadGPXFile(gpxFile);
 						GPXTrackAnalysis analysis = f.getAnalysis(gpxFile.lastModified());
 						if (item == null) {
@@ -144,7 +147,7 @@ public class AddTracksGroupBottomSheetDialogFragment extends AddGroupBottomSheet
 						}
 					}
 					processedDataFiles.put(gpxFile, item);
-					if (item.getAnalysis().wptPoints > 0) {
+					if (itemAnalysis != null && itemAnalysis.wptPoints > 0) {
 						gpxList.add(item);
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/TracksGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/TracksGroupsAdapter.java
index 154a96ea8a..93b8dae393 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/TracksGroupsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/TracksGroupsAdapter.java
@@ -5,6 +5,7 @@ import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import net.osmand.GPXUtilities.GPXTrackAnalysis;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.R;
 
@@ -32,7 +33,8 @@ public class TracksGroupsAdapter extends GroupsAdapter {
 			MapMarkersGroupViewHolder markersGroupViewHolder = (MapMarkersGroupViewHolder) holder;
 			markersGroupViewHolder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_polygom_dark));
 			markersGroupViewHolder.name.setText(gpx.getFile().getName().replace(".gpx", "").replace("/", " ").replace("_", " "));
-			markersGroupViewHolder.numberCount.setText(String.valueOf(gpx.getAnalysis().wptPoints));
+			GPXTrackAnalysis analysis = gpx.getAnalysis();
+			markersGroupViewHolder.numberCount.setText(analysis != null ? String.valueOf(analysis.wptPoints) : "");
 			String description = getDescription(gpx);
 			markersGroupViewHolder.description.setVisibility(description == null ? View.GONE : View.VISIBLE);
 			markersGroupViewHolder.description.setText(description);
@@ -46,7 +48,8 @@ public class TracksGroupsAdapter extends GroupsAdapter {
 
 	@Nullable
 	private String getDescription(GpxDataItem item) {
-		Set<String> categories = item.getAnalysis().wptCategoryNames;
+		GPXTrackAnalysis analysis = item.getAnalysis();
+		Set<String> categories = analysis != null ? analysis.wptCategoryNames : null;
 		if (categories != null && !categories.isEmpty() && !(categories.size() == 1 && categories.contains(""))) {
 			StringBuilder sb = new StringBuilder();
 			Iterator<String> it = categories.iterator();
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 5b4b46af54..2efa29c3bd 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -395,7 +395,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 				settings.SAVE_GLOBAL_TRACK_TO_GPX.set(true);
 				settings.SAVE_GLOBAL_TRACK_REMEMBER.set(choice.value);
 				int interval = settings.SAVE_GLOBAL_TRACK_INTERVAL.get();
-				app.startNavigationService(NavigationService.USED_BY_GPX, interval < 30000 ? 0 : interval);
+				app.startNavigationService(NavigationService.USED_BY_GPX, app.navigationServiceGpsInterval(interval));
 			}
 		};
 		if (choice.value || map == null) {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index 885c01fca8..9df5649701 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -44,6 +44,11 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import net.osmand.AndroidUtils;
+import net.osmand.GPXUtilities;
+import net.osmand.GPXUtilities.GPXFile;
+import net.osmand.GPXUtilities.GPXTrackAnalysis;
+import net.osmand.GPXUtilities.Track;
+import net.osmand.GPXUtilities.WptPt;
 import net.osmand.IndexConstants;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.ContextMenuAdapter;
@@ -51,21 +56,16 @@ import net.osmand.plus.ContextMenuAdapter.ItemClickListener;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.GPXDatabase;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
-import net.osmand.GPXUtilities;
-import net.osmand.GPXUtilities.GPXFile;
-import net.osmand.GPXUtilities.GPXTrackAnalysis;
-import net.osmand.GPXUtilities.Track;
-import net.osmand.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.UiUtilities;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.OsmandActionBarActivity;
 import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
@@ -1614,9 +1614,11 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 					processGPXFolder(gpxFile, sub);
 				} else if (gpxFile.isFile() && gpxFile.getName().toLowerCase().endsWith(".gpx")) {
 					GpxDataItem item = processedDataFiles.get(gpxFile);
+					GPXTrackAnalysis itemAnalysis = item != null ? item.getAnalysis() : null;
 					if (item == null
 							|| item.getFileLastModifiedTime() != gpxFile.lastModified()
-							|| item.getAnalysis().wptCategoryNames == null) {
+							|| itemAnalysis == null
+							|| itemAnalysis.wptCategoryNames == null) {
 						GPXFile f = GPXUtilities.loadGPXFile(gpxFile);
 						GPXTrackAnalysis analysis = f.getAnalysis(gpxFile.lastModified());
 						if (item == null) {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
index c78d07c49a..de6346b692 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
@@ -446,6 +446,7 @@ public class SplitSegmentDialogFragment extends DialogFragment {
 				overviewTextView.setTextColor(defaultTextColor);
 				overviewTextView.setText(app.getString(R.string.shared_string_overview));
 				if (currentGpxDisplayItem != null) {
+					overviewTextView.setText(app.getString(R.string.shared_string_overview)	+ "  (" + Integer.toString(currentGpxDisplayItem.analysis.points) + ")");
 					((TextView) convertView.findViewById(R.id.fragment_count_text)).setText(app.getString(R.string.shared_string_time_span) + ": " + Algorithms.formatDuration((int) (currentGpxDisplayItem.analysis.timeSpan / 1000), app.accessibilityEnabled()));
 				}
 			} else {
@@ -458,6 +459,7 @@ public class SplitSegmentDialogFragment extends DialogFragment {
 						overviewTextView.append(OsmAndFormatter.getFormattedDistance((float) metricStart, app));
 						overviewTextView.append(" - ");
 						overviewTextView.append(OsmAndFormatter.getFormattedDistance((float) currentGpxDisplayItem.analysis.metricEnd, app));
+						overviewTextView.append("  (" + Integer.toString(currentGpxDisplayItem.analysis.points) + ")");
 					} else if (currentGpxDisplayItem.group.isSplitTime()) {
 						overviewImageView.setImageDrawable(ic.getIcon(R.drawable.ic_action_time_span_16, app.getSettings().isLightContent() ? R.color.gpx_split_overview_light : R.color.gpx_split_overview_dark));
 						overviewTextView.setText("");
@@ -465,6 +467,7 @@ public class SplitSegmentDialogFragment extends DialogFragment {
 						overviewTextView.append(OsmAndFormatter.getFormattedDuration((int) metricStart, app));
 						overviewTextView.append(" - ");
 						overviewTextView.append(OsmAndFormatter.getFormattedDuration((int) currentGpxDisplayItem.analysis.metricEnd, app));
+						overviewTextView.append("  (" + Integer.toString(currentGpxDisplayItem.analysis.points) + ")");
 					}
 					((TextView) convertView.findViewById(R.id.fragment_count_text)).setText(app.getString(R.string.of, position, adapter.getCount() - 1));
 				}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 862e29a8b2..5fd79edb27 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -477,7 +477,8 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 
 		private TrkSegment getTrackSegment(LineChart chart) {
 			if (segment == null) {
-				List<ILineDataSet> ds = chart.getLineData().getDataSets();
+				LineData lineData = chart.getLineData();
+				List<ILineDataSet> ds = lineData != null ? lineData.getDataSets() : null;
 				if (ds != null && ds.size() > 0) {
 					for (GPXUtilities.Track t : gpxItem.group.getGpx().tracks) {
 						for (TrkSegment s : t.segments) {
@@ -497,7 +498,8 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 
 		private WptPt getPoint(LineChart chart, float pos) {
 			WptPt wpt = null;
-			List<ILineDataSet> ds = chart.getLineData().getDataSets();
+			LineData lineData = chart.getLineData();
+			List<ILineDataSet> ds = lineData != null ? lineData.getDataSets() : null;
 			if (ds != null && ds.size() > 0) {
 				TrkSegment segment = getTrackSegment(chart);
 				OrderedLineDataSet dataSet = (OrderedLineDataSet) ds.get(0);
diff --git a/OsmAnd/src/net/osmand/plus/notifications/GpxNotification.java b/OsmAnd/src/net/osmand/plus/notifications/GpxNotification.java
index 8e92748937..bd4c5087dc 100644
--- a/OsmAnd/src/net/osmand/plus/notifications/GpxNotification.java
+++ b/OsmAnd/src/net/osmand/plus/notifications/GpxNotification.java
@@ -136,6 +136,7 @@ public class GpxNotification extends OsmandNotification {
 				lastBuiltNoData = true;
 			}
 		}
+		notificationText = notificationText + "  (" + Integer.toString(app.getSavingTrackHelper().getTrkPoints()) + ")";
 
 		if ((wasNoDataDismissed || !app.getSettings().SHOW_TRIP_REC_NOTIFICATION.get()) && !ongoing) {
 			return null;
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteDetailsFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteDetailsFragment.java
index eebfa1eaae..d2b2e9cb66 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteDetailsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteDetailsFragment.java
@@ -382,7 +382,7 @@ public class RouteDetailsFragment extends ContextMenuFragment implements PublicT
 				addRouteCard(cardsContainer, routeSurfaceCard);
 
 				if (slopeDataSet != null) {
-					List<Incline> inclines = createInclinesAndAdd100MetersWith0Incline(slopeDataSet.getValues());
+					List<Incline> inclines = createInclinesAndAdd100MetersWith0Incline(slopeDataSet.getValues(), slopeDataSet.getDivX());
 					RouteInfoCard routeSteepnessCard = new RouteInfoCard(mapActivity, routeStatistics.getRouteSteepnessStatistic(inclines), analysis);
 					addRouteCard(cardsContainer, routeSteepnessCard);
 				}
@@ -1517,7 +1517,7 @@ public class RouteDetailsFragment extends ContextMenuFragment implements PublicT
 		((LinearLayout) view).addView(horizontalLine);
 	}
 
-	private List<Incline> createInclinesAndAdd100MetersWith0Incline(List<Entry> entries) {
+	private List<Incline> createInclinesAndAdd100MetersWith0Incline(List<Entry> entries, float divX) {
 		float minIncline = 0;
 		float maxIncline = 0;
 		int size = entries.size();
@@ -1527,7 +1527,7 @@ public class RouteDetailsFragment extends ContextMenuFragment implements PublicT
 			maxIncline = Math.max(inclineValue, maxIncline);
 			minIncline = Math.min(inclineValue, minIncline);
 
-			Incline incline = new Incline(inclineValue, entry.getX() * 1000);
+			Incline incline = new Incline(inclineValue, entry.getX() * divX);
 			inclines.add(incline);
 		}
 		for (int i = 0; i < 10; i++) {
@@ -1537,7 +1537,7 @@ public class RouteDetailsFragment extends ContextMenuFragment implements PublicT
 		if (slopeDataSet != null) {
 			float lastDistance = slopeDataSet.getEntryForIndex(size - 1).getX();
 			for (int i = 1; i <= 10; i++) {
-				float distance = lastDistance * 1000f + i * 5f;
+				float distance = lastDistance * divX + i * 5f;
 				inclines.add(new Incline(0f, distance));
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
index c75af6e540..2e492033b0 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -75,8 +75,6 @@ public class RouteProvider {
 
 	public enum RouteService {
 		OSMAND("OsmAnd (offline)"),
-		//ORS("OpenRouteService"), // disable ors due to no public rest service (testing2015 doesn't seem stable)
-		OSRM("OSRM (only car)"),
 		BROUTER("BRouter (offline)"),
 		STRAIGHT("Straight line");
 
@@ -312,8 +310,8 @@ public class RouteProvider {
 					res = findBROUTERRoute(params);
 //				} else if (params.type == RouteService.ORS) {
 //					res = findORSRoute(params);
-				} else if (params.type == RouteService.OSRM) {
-					res = findOSRMRoute(params);
+//				} else if (params.type == RouteService.OSRM) {
+//					res = findOSRMRoute(params);
 				} else if (params.type == RouteService.STRAIGHT){
 					res = findStraightRoute(params);
 				}
@@ -330,8 +328,6 @@ public class RouteProvider {
 				log.error("Failed to find route ", e); //$NON-NLS-1$
 			} catch (SAXException e) {
 				log.error("Failed to find route ", e); //$NON-NLS-1$
-			} catch (JSONException e) {
-				log.error("Failed to find route ", e); //$NON-NLS-1$
 			}
 		}
 		return new RouteCalculationResult(null);
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 7ca6119ebc..5b4861d281 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -705,7 +705,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				touchEvent = 0;
 				app.logEvent(mapActivity, "start_navigation");
 				app.getSettings().APPLICATION_MODE.set(routingHelper.getAppMode());
-				mapActivity.getMapViewTrackingUtilities().backToLocationImpl(17);
+				mapActivity.getMapViewTrackingUtilities().backToLocationImpl(17, true);
 				app.getSettings().FOLLOW_THE_ROUTE.set(true);
 				routingHelper.setFollowingMode(true);
 				routingHelper.setRoutePlanningMode(false);
diff --git a/build.gradle b/build.gradle
index 76cd4dc0e5..deac60b991 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,8 @@ buildscript {
 }
 
 allprojects {
+    group "net.osmand"
+    version "1.0"    
 
     repositories {
         ivy {