From e7299f51f3863b057ca267362801ffcf239afd2f Mon Sep 17 00:00:00 2001
From: Hinagiku Zeppeki <Zeppeki.Hinagiku@gmail.com>
Date: Sun, 18 Apr 2021 20:54:22 +0000
Subject: [PATCH 01/10] Translated using Weblate (Japanese)

Currently translated at 98.5% (3664 of 3717 strings)
---
 OsmAnd/res/values-ja/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index ce082a96a2..fdca4a0e3b 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -2818,9 +2818,9 @@ POIの更新は利用できません</string>
     <string name="osm_live_subscriptions">サブスクリプション</string>
     <string name="powered_by_osmand">By OsmAnd</string>
     <string name="osm_live_plan_pricing">プランと料金</string>
-    <string name="osm_live_payment_monthly_title">月間</string>
+    <string name="osm_live_payment_monthly_title">月毎</string>
     <string name="osm_live_payment_3_months_title">3ヶ月毎</string>
-    <string name="osm_live_payment_annual_title">年間</string>
+    <string name="osm_live_payment_annual_title">年毎</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / 月</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / 月</string>
     <string name="osm_live_payment_discount_descr">%1$s割引</string>

From 73b1adb16854185df20a33f96188b5383a5274ba Mon Sep 17 00:00:00 2001
From: Felix Wiemuth <felixwiemuth@hotmail.de>
Date: Mon, 19 Apr 2021 08:14:31 +0000
Subject: [PATCH 02/10] Translated using Weblate (German)

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

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index dae511a7f4..4a199996b5 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -3856,7 +3856,7 @@
 \nSie können sich mit der sicheren OAuth-Methode anmelden oder Ihren Benutzernamen und Ihr Passwort verwenden.</string>
     <string name="use_login_password">Benutzername und Passwort verwenden</string>
     <string name="login_account">Konto</string>
-    <string name="user_login">Benutzername</string>
+    <string name="user_login">Anmelden</string>
     <string name="markers_history">Historie der Marker</string>
     <string name="send_files_to_openstreetmap">GPX-Datei an OpenStreetMap senden</string>
     <string name="enter_text_separated">Geben Sie durch Komma getrennte Tags ein.</string>

From 608b44f213a9ae3d660f47beba15f064c10d409c Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Sun, 18 Apr 2021 08:42:06 +0000
Subject: [PATCH 03/10] Translated using Weblate (Slovak)

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

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 995426c282..77dc42838a 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -4006,7 +4006,7 @@
     <string name="routing_attr_driving_style_description">Zvoľte účel jazdy pre získanie kratšej, rýchlejšej alebo bezpečnejšej trasy</string>
     <string name="map_orientation_threshold_descr">Neotáčať mapu, ak je rýchlosť nižšia ako hranica</string>
     <string name="restart">Reštartovať</string>
-    <string name="shared_strings_all_regions">Všetky regióny</string>
+    <string name="shared_strings_all_regions">Všetky oblasti</string>
     <string name="delete_number_files_question">Zmazať %1$d súborov\?</string>
     <string name="track_recording_stop_without_saving">Zastaviť bez uloženia</string>
     <string name="track_recording_save_and_stop">Uložiť a zastaviť záznam</string>

From 4a22d257216535f1edc5fa644674f6f244ac9288 Mon Sep 17 00:00:00 2001
From: Guntis Ozols <jkrumings@gmail.com>
Date: Sun, 18 Apr 2021 14:27:26 +0000
Subject: [PATCH 04/10] Translated using Weblate (Latvian)

Currently translated at 61.3% (2279 of 3717 strings)
---
 OsmAnd/res/values-lv/strings.xml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 27ad892e50..5b04fd8c4b 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -1802,7 +1802,7 @@ failu(s)?
     <string name="first_usage_item">Sākt lietot</string>
     <string name="first_usage_item_description">Kā lejupielādēt kartes un pamatiestatījumu lietošana</string>
     <string name="navigation_item_description">Navigācija</string>
-    <string name="planning_trip_item">Ceļa plānošana</string>
+    <string name="planning_trip_item">Ceļojuma plānošana</string>
     <string name="faq_item">BUJ</string>
     <string name="faq_item_description">Biežāk uzdotie jautājumi</string>
     <string name="map_viewing_item">Kartes skatīšana</string>
@@ -2162,7 +2162,6 @@ Apraksta laukumu: %1$s x %2$s</string>
     <string name="shared_string_time">Laiks</string>
     <string name="total_distance">Maršruta garums</string>
     <string name="routing_attr_height_obstacles_name">Lietot elevācijas datus</string>
-
     <string name="relief_smoothness_factor_descr">Ieteicamais reljefs: līdzens vai kalnains.</string>
     <string name="shared_string_slope">Slīpums</string>
     <string name="lang_ber">Berberu</string>
@@ -2415,7 +2414,7 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="show_map">Rādīt karti</string>
     <string name="route_is_calculated">Maršruts aprēķināts</string>
     <string name="round_trip">Turp un atpakaļ</string>
-    <string name="plan_route_no_markers_toast">Jums vajag pievienot vismaz vienu marķieri, lai lietotu šo funkciju.</string>
+    <string name="plan_route_no_markers_toast">Lai lietotu šo funkciju, vajag pievienot vismaz vienu marķieri.</string>
     <string name="osn_modify_dialog_error">Piezīmei nevarēja veikt izmaiņas</string>
     <string name="osn_modify_dialog_title">Labot piezīmi</string>
     <string name="context_menu_item_modify_note">!abot OSM piezīmi</string>
@@ -2429,7 +2428,7 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="routing_attr_avoid_ice_roads_fords_name">No ledus ceļiem un brasla</string>
     <string name="routing_attr_avoid_ice_roads_fords_description">Izvairīties no ledus ceļiem un brasliem.</string>
     <string name="use_location">Lietot pozīciju</string>
-    <string name="add_location_as_first_point_descr">Pievienot jūsu atrašanās vietu kā sākuma punktu maršrutam.</string>
+    <string name="add_location_as_first_point_descr">Pievienot patreizējo atrašanās vietu kā sākuma punktu ideālā maršruta izveidei.</string>
     <string name="my_location">Mana pozīcija</string>
     <string name="shared_string_finish">Finišs</string>
     <string name="plan_route">Plānot maršrutu</string>
@@ -3333,4 +3332,19 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="select_items_for_import">Izvēlieties lietas, ko importēt.</string>
     <string name="use_dev_url_descr">Lietot dev.openstreetmap.org nevis openstreetmap.org OSM piezīmju/ POI / GPX augšuielādei un testēšanai.</string>
     <string name="use_dev_url">Lietot dev.openstreetmap.org</string>
+    <string name="plan_a_route">Plānot maršrutu</string>
+    <string name="plan_route_last_edited">Pēdējo reizi labots</string>
+    <string name="plan_route_import_track">Importēt treku</string>
+    <string name="plan_route_open_existing_track">Atvērt saglabāto treku</string>
+    <string name="plan_route_create_new_route">Veidot jaunu maršrutu</string>
+    <string name="plan_route_select_track_file_for_open">Izvēlieties treka failu atvēršanai.</string>
+    <string name="plan_route_exit_dialog_descr">Vai tiešām gribat atmest visas izmaiņas ieplānotajā maršrutā\?</string>
+    <string name="plan_route_trim_before">Griezt pirms</string>
+    <string name="plan_route_trim_after">Griezt pēc</string>
+    <string name="plan_route_change_route_type_before">Mainīt maršruta veidu pirms</string>
+    <string name="plan_route_change_route_type_after">Mainīt maršruta veidu pēc</string>
+    <string name="plan_route_join_segments">Pievienot segmentus</string>
+    <string name="plan_route_split_before">Sadalīt pirms</string>
+    <string name="plan_route_split_after">Sadalīt pēc</string>
+    <string name="plan_route_add_new_segment">Pievienot jaunu segmentu</string>
 </resources>
\ No newline at end of file

From e89a6ab502e896cf011cecf01d3c77e5822d22f9 Mon Sep 17 00:00:00 2001
From: Oliver <websites@posteo.de>
Date: Sun, 18 Apr 2021 19:42:27 +0000
Subject: [PATCH 05/10] Translated using Weblate (German)

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

diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 7f2a668260..433d3766aa 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -3927,4 +3927,5 @@
     <string name="poi_office_diplomatic">Diplomatische Vertretung</string>
     <string name="poi_bay_filter">Art der Bucht</string>
     <string name="poi_plateau">Plateau</string>
+    <string name="poi_club_social">Freizeitclub</string>
 </resources>
\ No newline at end of file

From f6245ebce3d9d4f3bc2d999826470d0b653a8945 Mon Sep 17 00:00:00 2001
From: Eduardo Addad de Oliveira <duduaddad@gmail.com>
Date: Mon, 19 Apr 2021 02:55:03 +0000
Subject: [PATCH 06/10] Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.9% (3926 of 3927 strings)
---
 OsmAnd/res/values-pt-rBR/phrases.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index bfd6941d61..12ab9fa85f 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -3918,4 +3918,13 @@
     <string name="poi_jiu_jitsu">Jiu-jitsu</string>
     <string name="poi_karate">Karatê</string>
     <string name="poi_hoops">Aros</string>
+    <string name="poi_club_social">Clube social</string>
+    <string name="poi_plateau">Planalto</string>
+    <string name="poi_office_diplomatic">Escritório diplomático</string>
+    <string name="poi_kickboxing">Kickboxe</string>
+    <string name="poi_cycle_polo">Polo de bicicleta</string>
+    <string name="poi_curling">Curling</string>
+    <string name="poi_cliff_diving">Mergulho de falésia</string>
+    <string name="poi_zurkhaneh_sport">Zurkhaneh</string>
+    <string name="poi_bay_filter">Tipo de baía</string>
 </resources>
\ No newline at end of file

From 6291b18fc30c787b47abe608b0cbb263b0803fa5 Mon Sep 17 00:00:00 2001
From: Shjosan <shjosan@kakmix.co>
Date: Sun, 18 Apr 2021 07:26:50 +0000
Subject: [PATCH 07/10] Translated using Weblate (Swedish)

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

diff --git a/OsmAnd/res/values-sv/phrases.xml b/OsmAnd/res/values-sv/phrases.xml
index a621b2a6d3..4e9ec5b680 100644
--- a/OsmAnd/res/values-sv/phrases.xml
+++ b/OsmAnd/res/values-sv/phrases.xml
@@ -3927,4 +3927,5 @@
     <string name="poi_office_diplomatic">Diplomatiskt kontor</string>
     <string name="poi_bay_filter">Typ av vik</string>
     <string name="poi_plateau">Platå</string>
+    <string name="poi_club_social">Social klubb</string>
 </resources>
\ No newline at end of file

From f6ebee979ad30ca733c4990f53c70865a53f50c2 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 19 Apr 2021 03:36:55 +0000
Subject: [PATCH 08/10] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (3927 of 3927 strings)
---
 OsmAnd/res/values-zh-rTW/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 3b6a127f11..caff9ec09b 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -3927,4 +3927,5 @@
     <string name="poi_office_diplomatic">外交部</string>
     <string name="poi_bay_filter">海灣類型</string>
     <string name="poi_plateau">高原</string>
+    <string name="poi_club_social">社交俱樂部</string>
 </resources>
\ No newline at end of file

From e6907b2153b4fd8acb417c1e771c94a3a7bc5a96 Mon Sep 17 00:00:00 2001
From: Hinagiku Zeppeki <Zeppeki.Hinagiku@gmail.com>
Date: Sun, 18 Apr 2021 07:33:06 +0000
Subject: [PATCH 09/10] Translated using Weblate (Japanese)

Currently translated at 89.2% (242 of 271 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/ja/
---
 OsmAnd-telegram/res/values-ja/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd-telegram/res/values-ja/strings.xml b/OsmAnd-telegram/res/values-ja/strings.xml
index 1829c1fcc9..57bf1c209e 100644
--- a/OsmAnd-telegram/res/values-ja/strings.xml
+++ b/OsmAnd-telegram/res/values-ja/strings.xml
@@ -22,7 +22,7 @@
     <string name="proxy_port">ポート</string>
     <string name="proxy_server">サーバー</string>
     <string name="shared_string_connection">接続</string>
-    <string name="shared_string_enable">有効</string>
+    <string name="shared_string_enable">有効化</string>
     <string name="proxy_type">プロキシタイプ</string>
     <string name="proxy_connected">接続しました</string>
     <string name="proxy_disconnected">切断しました</string>

From aa846ab405ffcc72953a83a2a942e147ff171982 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 19 Apr 2021 12:38:33 +0200
Subject: [PATCH 10/10] English name fix #11463

---
 OsmAnd-java/src/main/java/net/osmand/data/MapObject.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/data/MapObject.java b/OsmAnd-java/src/main/java/net/osmand/data/MapObject.java
index 79b3b8a349..e02b884e0a 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/MapObject.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/MapObject.java
@@ -183,7 +183,10 @@ public abstract class MapObject implements Comparable<MapObject> {
 	public String getName(String lang, boolean transliterate) {
 		if (lang != null && lang.length() > 0) {
 			if (lang.equals("en")) {
-				return getEnName(transliterate);
+				// for some objects like wikipedia, english name is stored 'name' tag
+				if (Algorithms.isEmpty(enName)) {
+					return getEnName(transliterate);
+				}
 			} else {
 				// get name
 				if (names != null) {