diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 435a819e81..5e4178250e 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -252,9 +252,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Tvá poloha zatím nebyla určena</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Stahování země (%s) tvé aktuální polohy</string>
+	<string name="download_location_country">Stahování země tvé aktuální polohy (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Stahování země (%s), v níž hledáš</string>
+	<string name="download_viewport_country_to_search">Stahování země, v níž hledáš (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Promiň, nastavení uložení map je dočasně nedostupné.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 90d503403d..af08751e80 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -246,9 +246,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Ihr Standort wurde bisher noch nicht bestimmt</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Land (%s) Ihres derzeitigen Standorts herunterladen</string>
+	<string name="download_location_country">Land Ihres derzeitigen Standorts herunterladen (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Land (%s) herunterladen, von dem aus Sie suchen</string>
+	<string name="download_viewport_country_to_search">Land herunterladen, von dem aus Sie suchen (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Es tut uns leid, die Einstellungen der Kartenspeicherung sind deaktiviert.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 46e264b6ac..e20774598b 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -242,9 +242,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Tu ubicación aún no ha sido determinada</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Descargar país (%s) de tu ubicación actual</string>
+	<string name="download_location_country">Descargar país de tu ubicación actual (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Descargar país (%s) en el que estás buscando</string>
+	<string name="download_viewport_country_to_search">Descargar país en el que estás buscando (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Lo sentimos, la configuración de Guardar Mapa está desactivada.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 727cd637df..dd4c269243 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -257,9 +257,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Votre position n\&#39;a pas encore été déterminée</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Télécharger le pays (%s) de votre position actuelle</string>
+	<string name="download_location_country">Télécharger le pays de votre position actuelle (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Télécharger le pays (%s) que vous recherchez sur</string>
+	<string name="download_viewport_country_to_search">Télécharger le pays que vous recherchez sur (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Désolé, les paramètres de stockage des cartes sont désactivés.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index a67b588380..3785aaa3b6 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -252,9 +252,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">La tua posizione non è stata ancora stabilita</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Scarica il paese (%s) della tua posizione attuale</string>
+	<string name="download_location_country">Scarica il paese della tua posizione attuale (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Scarica il paese (%s) che stai cercando</string>
+	<string name="download_viewport_country_to_search">Scarica il paese che stai cercando (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Siamo spiacenti, ma le impostazioni di archiviazione delle mappe sono disabilitate.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 60001f78eb..ad05efb2d3 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -248,9 +248,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">現在の座標が未確定です</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">現在の地域(%s)をダウンロード</string>
+	<string name="download_location_country">現在の地域をダウンロード(%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">現在マップで検索している国(%s)をダウンロード</string>
+	<string name="download_viewport_country_to_search">現在マップで検索している国をダウンロード(%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">恐れ入ります、マップストレージ設定が無効になっています。</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index fbb64ab7be..6f73922b8e 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -244,9 +244,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">귀하의 위치를 아직 알아내지 못 했습니다</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">귀하께서 현재 계신 국가인 (%s)을(를) 다운로드</string>
+	<string name="download_location_country">귀하께서 현재 계신 국가인 을(를) 다운로드 (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">귀하께서 검색 중인 국가인 (%s)을(를) 다운로드</string>
+	<string name="download_viewport_country_to_search">귀하께서 검색 중인 국가인 을(를) 다운로드 (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">죄송합니다, 지도 스토리지 설정이 비활성화되어 있습니다.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 8c1eff8b3e..2192114479 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -241,9 +241,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Je plaats werd nog niet vastgesteld</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Download land (%s) waar je nu bent</string>
+	<string name="download_location_country">Download land waar je nu bent (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Download land (%s) waar je op wilt zoeken</string>
+	<string name="download_viewport_country_to_search">Download land waar je op wilt zoeken (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Sorry, instellingen voor kaartopslag uitgeschakeld.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 403556262d..5c4638e6e6 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -255,9 +255,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Twoja lokalizacja nie została jeszcze określona</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Pobierz mapę kraju (%s), w którym aktualnie przebywasz</string>
+	<string name="download_location_country">Pobierz mapę kraju, w którym aktualnie przebywasz (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Pobierz mapę kraju (%s), którego aktualnie poszukujesz</string>
+	<string name="download_viewport_country_to_search">Pobierz mapę kraju, którego aktualnie poszukujesz (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Przepraszamy, ustawienia pamięci mapy są aktualnie wyłączone.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index bceea3821d..35b7c3cb92 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -253,9 +253,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">A sua localização ainda não foi determinada</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Descarregue o país (%s) da sua localização atual</string>
+	<string name="download_location_country">Descarregue o país da sua localização atual (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Descarregue o país (%s) em que está a fazer a procura</string>
+	<string name="download_viewport_country_to_search">Descarregue o país em que está a fazer a procura (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Lamentamos, as definições do Map Storage estão atualmente desativadas.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 3f1352ddd7..17b15556e7 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -256,9 +256,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Ваше местоположение еще не определено</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Скачайте страну (%s) вашего текущего местоположения</string>
+	<string name="download_location_country">Скачайте страну вашего текущего местоположения (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Скачайте страну (%s), на которой вы ищете</string>
+	<string name="download_viewport_country_to_search">Скачайте страну, на которой вы ищете (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Извините, настройки места хранения карт сейчас недоступны.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 1e7881f195..1a5174e52b 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -256,9 +256,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Ваше місце розташування не визначено</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Завантажити країну (%s) вашого поточного місця розташування</string>
+	<string name="download_location_country">Завантажити країну вашого поточного місця розташування (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Завантажити країну (%s), в якій ви шукаєте</string>
+	<string name="download_viewport_country_to_search">Завантажити країну, в якій ви шукаєте (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Вибачте, налаштування папки з картами зараз недоступні.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 9fbbd67769..9b5f7fec93 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -252,9 +252,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">您的位置尚未定未完成</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">下載您目前所在位置的國家 (%s) 地圖</string>
+	<string name="download_location_country">下載您目前所在位置的國家 地圖 (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">下載您正在搜尋的國家 (%s) 地圖</string>
+	<string name="download_viewport_country_to_search">下載您正在搜尋的國家 地圖 (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">很抱歉, 地圖儲存設定目前是停用的狀態!</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index fcea6a496c..9cbb7830d6 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -260,9 +260,9 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Your location hasn\&#39;t been determined yet</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
-	<string name="download_location_country">Download the country (%s) of your current location</string>
+	<string name="download_location_country">Download the country of your current location (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
-	<string name="download_viewport_country_to_search">Download the country (%s) you are searching on</string>
+	<string name="download_viewport_country_to_search">Download the country you are searching on (%s)</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Sorry, Map Storage settings are currently disabled.</string>
 	<!-- Alert message that downloading is in progress. -->
diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings
index 552f5396db..9778268d89 100644
--- a/iphone/Maps/cs.lproj/Localizable.strings
+++ b/iphone/Maps/cs.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "Tvá poloha zatím nebyla určena";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Stahování země (%@) tvé aktuální polohy";
+"download_location_country" = "Stahování země tvé aktuální polohy (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Stahování země (%@), v níž hledáš";
+"download_viewport_country_to_search" = "Stahování země, v níž hledáš (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Promiň, nastavení uložení map je dočasně nedostupné.";
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index ff15dc43f3..575388b5ae 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "Ihr Standort wurde bisher noch nicht bestimmt";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Land (%@) Ihres derzeitigen Standorts herunterladen";
+"download_location_country" = "Land Ihres derzeitigen Standorts herunterladen (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Land (%@) herunterladen, von dem aus Sie suchen";
+"download_viewport_country_to_search" = "Land herunterladen, von dem aus Sie suchen (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Es tut uns leid, die Einstellungen der Kartenspeicherung sind deaktiviert.";
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index b2c0add74f..fe2e692238 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "Your location hasn't been determined yet";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Download the country (%@) of your current location";
+"download_location_country" = "Download the country of your current location (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Download the country (%@) you are searching on";
+"download_viewport_country_to_search" = "Download the country you are searching on (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Sorry, Map Storage settings are currently disabled.";
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index 013e9261db..b240e6e443 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "Tu ubicación aún no ha sido determinada";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Descargar país (%@) de tu ubicación actual";
+"download_location_country" = "Descargar país de tu ubicación actual (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Descargar país (%@) en el que estás buscando";
+"download_viewport_country_to_search" = "Descargar país en el que estás buscando (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Lo sentimos, la configuración de Guardar Mapa está desactivada.";
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index ba09021566..8847ed3891 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "Votre position n'a pas encore été déterminée";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Télécharger le pays (%@) de votre position actuelle";
+"download_location_country" = "Télécharger le pays de votre position actuelle (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Télécharger le pays (%@) que vous recherchez sur";
+"download_viewport_country_to_search" = "Télécharger le pays que vous recherchez sur (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Désolé, les paramètres de stockage des cartes sont désactivés.";
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index 22ed29bfe8..15ee89dc6b 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "La tua posizione non è stata ancora stabilita";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Scarica il paese (%@) della tua posizione attuale";
+"download_location_country" = "Scarica il paese della tua posizione attuale (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Scarica il paese (%@) che stai cercando";
+"download_viewport_country_to_search" = "Scarica il paese che stai cercando (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Siamo spiacenti, ma le impostazioni di archiviazione delle mappe sono disabilitate.";
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index e155f1027d..f088567c67 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "現在の座標が未確定です";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "現在の地域(%@)をダウンロード";
+"download_location_country" = "現在の地域をダウンロード(%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "現在マップで検索している国(%@)をダウンロード";
+"download_viewport_country_to_search" = "現在マップで検索している国をダウンロード(%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "恐れ入ります、マップストレージ設定が無効になっています。";
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index 55d4d4c92b..4f1304d5e7 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "귀하의 위치를 아직 알아내지 못 했습니다";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "귀하께서 현재 계신 국가인 (%@)을(를) 다운로드";
+"download_location_country" = "귀하께서 현재 계신 국가인 을(를) 다운로드 (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "귀하께서 검색 중인 국가인 (%@)을(를) 다운로드";
+"download_viewport_country_to_search" = "귀하께서 검색 중인 국가인 을(를) 다운로드 (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "죄송합니다, 지도 스토리지 설정이 비활성화되어 있습니다.";
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index 52df6727f4..71b0aed5d3 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "Je plaats werd nog niet vastgesteld";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Download land (%@) waar je nu bent";
+"download_location_country" = "Download land waar je nu bent (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Download land (%@) waar je op wilt zoeken";
+"download_viewport_country_to_search" = "Download land waar je op wilt zoeken (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Sorry, instellingen voor kaartopslag uitgeschakeld.";
diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings
index cdf12e56cd..33966dbee9 100644
--- a/iphone/Maps/pl.lproj/Localizable.strings
+++ b/iphone/Maps/pl.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "Twoja lokalizacja nie została jeszcze określona";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Pobierz mapę kraju (%@), w którym aktualnie przebywasz";
+"download_location_country" = "Pobierz mapę kraju, w którym aktualnie przebywasz (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Pobierz mapę kraju (%@), którego aktualnie poszukujesz";
+"download_viewport_country_to_search" = "Pobierz mapę kraju, którego aktualnie poszukujesz (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Przepraszamy, ustawienia pamięci mapy są aktualnie wyłączone.";
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index 125cf173e2..9fe46d5a18 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "A sua localização ainda não foi determinada";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Descarregue o país (%@) da sua localização atual";
+"download_location_country" = "Descarregue o país da sua localização atual (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Descarregue o país (%@) em que está a fazer a procura";
+"download_viewport_country_to_search" = "Descarregue o país em que está a fazer a procura (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Lamentamos, as definições do Map Storage estão atualmente desativadas.";
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index d775e3630f..c31729876c 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "Ваше местоположение еще не определено";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Скачайте страну (%@) вашего текущего местоположения";
+"download_location_country" = "Скачайте страну вашего текущего местоположения (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Скачайте страну (%@), на которой вы ищете";
+"download_viewport_country_to_search" = "Скачайте страну, на которой вы ищете (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Извините, настройки места хранения карт сейчас недоступны.";
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index 9d91424ce4..3b994a7c80 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "Ваше місце розташування не визначено";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "Завантажити країну (%@) вашого поточного місця розташування";
+"download_location_country" = "Завантажити країну вашого поточного місця розташування (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "Завантажити країну (%@), в якій ви шукаєте";
+"download_viewport_country_to_search" = "Завантажити країну, в якій ви шукаєте (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "Вибачте, налаштування папки з картами зараз недоступні.";
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index ec035cb8c6..f8023e3831 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -402,10 +402,10 @@
 "unknown_current_position" = "您的位置尚未定未完成";
 
 /* Warning message when location country isn't downloaded during search (see also download_location_map_proposal). */
-"download_location_country" = "下載您目前所在位置的國家 (%@) 地圖";
+"download_location_country" = "下載您目前所在位置的國家 地圖 (%@)";
 
 /* Warning message when viewport country isn't downloaded during search */
-"download_viewport_country_to_search" = "下載您正在搜尋的國家 (%@) 地圖";
+"download_viewport_country_to_search" = "下載您正在搜尋的國家 地圖 (%@)";
 
 /* Alert message that we can't run Map Storage settings due to some reasons. */
 "cant_change_this_setting" = "很抱歉, 地圖儲存設定目前是停用的狀態!";
diff --git a/strings.txt b/strings.txt
index af9c3735f0..5f85ca2516 100644
--- a/strings.txt
+++ b/strings.txt
@@ -2348,40 +2348,40 @@
     pt = A sua localização ainda não foi determinada
     hu = Még nem határoztuk meg az aktuális helyzetét
   [download_location_country]
-    en = Download the country (%@) of your current location
+    en = Download the country of your current location (%@)
     tags = ios,android
     comment = Warning message when location country isn't downloaded during search (see also download_location_map_proposal).
-    cs = Stahování země (%@) tvé aktuální polohy
-    de = Land (%@) Ihres derzeitigen Standorts herunterladen
-    es = Descargar país (%@) de tu ubicación actual
-    fr = Télécharger le pays (%@) de votre position actuelle
-    it = Scarica il paese (%@) della tua posizione attuale
-    ja = 現在の地域(%@)をダウンロード
-    ko = 귀하께서 현재 계신 국가인 (%@)을(를) 다운로드
-    nl = Download land (%@) waar je nu bent
-    ru = Скачайте страну (%@) вашего текущего местоположения
-    uk = Завантажити країну (%@) вашого поточного місця розташування
-    zh-Hant = 下載您目前所在位置的國家 (%@) 地圖
-    pl = Pobierz mapę kraju (%@), w którym aktualnie przebywasz
-    pt = Descarregue o país (%@) da sua localização atual
+    cs = Stahování země tvé aktuální polohy (%@)
+    de = Land Ihres derzeitigen Standorts herunterladen (%@)
+    es = Descargar país de tu ubicación actual (%@)
+    fr = Télécharger le pays de votre position actuelle (%@)
+    it = Scarica il paese della tua posizione attuale (%@)
+    ja = 現在の地域をダウンロード(%@)
+    ko = 귀하께서 현재 계신 국가인 을(를) 다운로드 (%@)
+    nl = Download land waar je nu bent (%@)
+    ru = Скачайте страну вашего текущего местоположения (%@)
+    uk = Завантажити країну вашого поточного місця розташування (%@)
+    zh-Hant = 下載您目前所在位置的國家 地圖 (%@)
+    pl = Pobierz mapę kraju, w którym aktualnie przebywasz (%@)
+    pt = Descarregue o país da sua localização atual (%@)
     hu = Töltse le az aktuális helyzet országát (%@)
   [download_viewport_country_to_search]
-    en = Download the country (%@) you are searching on
+    en = Download the country you are searching on (%@)
     tags = ios,android
     comment = Warning message when viewport country isn't downloaded during search
-    cs = Stahování země (%@), v níž hledáš
-    de = Land (%@) herunterladen, von dem aus Sie suchen
-    es = Descargar país (%@) en el que estás buscando
-    fr = Télécharger le pays (%@) que vous recherchez sur
-    it = Scarica il paese (%@) che stai cercando
-    ja = 現在マップで検索している国(%@)をダウンロード
-    ko = 귀하께서 검색 중인 국가인 (%@)을(를) 다운로드
-    nl = Download land (%@) waar je op wilt zoeken
-    ru = Скачайте страну (%@), на которой вы ищете
-    uk = Завантажити країну (%@), в якій ви шукаєте
-    zh-Hant = 下載您正在搜尋的國家 (%@) 地圖
-    pl = Pobierz mapę kraju (%@), którego aktualnie poszukujesz
-    pt = Descarregue o país (%@) em que está a fazer a procura
+    cs = Stahování země, v níž hledáš (%@)
+    de = Land herunterladen, von dem aus Sie suchen (%@)
+    es = Descargar país en el que estás buscando (%@)
+    fr = Télécharger le pays que vous recherchez sur (%@)
+    it = Scarica il paese che stai cercando (%@)
+    ja = 現在マップで検索している国をダウンロード(%@)
+    ko = 귀하께서 검색 중인 국가인 을(를) 다운로드 (%@)
+    nl = Download land waar je op wilt zoeken (%@)
+    ru = Скачайте страну, на которой вы ищете (%@)
+    uk = Завантажити країну, в якій ви шукаєте (%@)
+    zh-Hant = 下載您正在搜尋的國家 地圖 (%@)
+    pl = Pobierz mapę kraju, którego aktualnie poszukujesz (%@)
+    pt = Descarregue o país em que está a fazer a procura (%@)
     hu = Töltse le a keresés országát (%@)
   [cant_change_this_setting]
     en = Sorry, Map Storage settings are currently disabled.