Fixed/added new localizations

22 files changed, 204 insertions, 214 deletions

diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 8e267afb56..4968a967bb 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: cs -->
 <resources>
 	<!-- SECTION: Strings -->
@@ -126,7 +126,7 @@
 	<string name="not_enough_memory">Nedostatek paměti ke spuštění aplikace</string>
 	<string name="free_space_for_country">Prosím uvolni nejprve %1$s v tvém zařízení, abys mohl/a stáhnout %2$s</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_resources">Program potřebuje stáhnout \n%1$.1f%2$s povinných zdrojů.</string>
+	<string name="download_resources">Program potřebuje stáhnout\n%1$.1f%2$s povinných zdrojů.</string>
 	<string name="getting_position">Získávání aktuální pozice</string>
 	<string name="download_resources_continue">Přejít na mapu</string>
 	<string name="downloading_country_can_proceed">Stahuji %s. Nyní můžeš \npoužít na mapě.</string>
@@ -180,8 +180,6 @@
 	<string name="remove_pin">Odstranit špendlík</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">Skupina</string>
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode"></string>
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">Přidej libovolné místo na mapě do záložek. Klepni na mapě na vybrané místo a podrž ho, dokud se nezobrazí kontextové menu.</string>
 	<!-- Settings button in system menu -->
@@ -194,4 +192,6 @@
 	<string name="wait_several_minutes">Tato akce může trvat několik minut.\nPočkejte prosím…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Viditelný</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">V plné verzi MapsWithMe jsou k dispozici záložky. Chcete ji pořídit hned teď?</string>
 </resources>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index dfef804b18..811514d570 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: de -->
 <resources>
 	<!-- SECTION: Strings -->
@@ -130,7 +130,7 @@
 	<string name="not_enough_memory">Nicht genügend Speicher um die Anwendung zu starten</string>
 	<string name="free_space_for_country">Bitte zuerst %1$s Platz schaffen um %2$s herunterzuladen</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_resources">Programm muss \n%1$.1f%2$s zwingend benötigte Daten herunterladen.</string>
+	<string name="download_resources">Programm muss\n%1$.1f%2$s zwingend benötigte Daten herunterladen.</string>
 	<string name="getting_position">Ermittle momentane Position</string>
 	<string name="download_resources_continue">Zur Karte</string>
 	<string name="downloading_country_can_proceed">Lade %s herunter. Sie können jetzt\nzur Karte weitergehen.</string>
@@ -184,9 +184,6 @@
 	<string name="remove_pin">Stecknadel entfernen</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">Gruppe</string>
-
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode"></string>
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">Fügen sie einen beliebigen Ort auf der Karte den Lesezeichen hinzu. Berühren sie dazu den Ort auf der Karte bis das Kontextmenü erscheint.</string>
 	<!-- Settings button in system menu -->
@@ -199,4 +196,6 @@
 	<string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen.\nBitte warten…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Sichtbar</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">Lesezeichen stehen in der Vollversion von MapsWithMe zur Verfügung. Jetzt sofort besorgen?</string>
 </resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 005d552a1a..98625709c7 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: es -->
 <resources>
 	<!-- SECTION: Strings -->
@@ -63,7 +63,7 @@
 	<!-- Leave Review dialog - Not now button (remind me later) -->
 	<string name="remind_me_later">Recordar mas tarde</string>
 	<!-- Update maps later/Buy pro version later button text -->
-	<string name="later">Mas tarde</string>
+	<string name="later">Luego</string>
 	<!-- Leave Review dialog - Complain button (goes to support site) -->
 	<string name="report_an_issue">Informar de un problema</string>
 	<!-- View and button titles for accessibility -->
@@ -111,7 +111,7 @@
 	<!-- Message to display at the center of the screen when the country download has failed -->
 	<string name="country_status_download_failed">Error durante la descarga\n^</string>
 	<!-- Button text for the button under the country_status_download_failed message -->
-	<string name="try_again">Inténtelo de nuevo</string>
+	<string name="try_again">Intentarlo otra vez</string>
 	<string name="about_menu_title">Sobre MapsWithMe</string>
 	<string name="downloading_touch_to_cancel">Descarga %d%%, apreté para cancelar</string>
 	<string name="downloaded_touch_to_delete">Descargado (%s), apreté para eliminar</string>
@@ -120,69 +120,66 @@
 	<string name="close">Cerrar</string>
 	<string name="unsupported_phone">Un hardware aceleró OpenGL se requiere. Desgraciadamente, el dispositivo móvil no es compatible.</string>
 	<string name="download">Descargar</string>
-	<string name="external_storage_is_not_available">SD tarjeta/USB almacenamiento con los mapas descargados no está disponible</string>
-	<string name="disconnect_usb_cable">Por favor, desconecte el cable USB o inserta la tarjeta de memoria para utilizar MapsWithMe</string>
-	<string name="not_enough_free_space_on_sdcard">Por favor, primero libere espacio en la SD tarjeta/USB almacenamiento para utilizar la aplicación</string>
-	<string name="not_enough_memory">No hay suficiente espacio para poner en marcha la aplicación</string>
-	<string name="free_space_for_country">Por favor, primero libere %1$s en tu dispositivo para descargar %2$s</string>
+	<string name="external_storage_is_not_available">La memoria SD/almacenamiento USB con los mapas descargados no está disponible</string>
+	<string name="disconnect_usb_cable">Por favor desconectar el cable USB o insertar la memoria SD para usar MapsWithMe</string>
+	<string name="not_enough_free_space_on_sdcard">Por favor libera espacio en la memoria SD/almacenamiento USB para usar la aplicación</string>
+	<string name="not_enough_memory">No hay suficiente memoria para iniciar la aplicación</string>
+	<string name="free_space_for_country">Por favor liberar %1$s primero para descargar %2$s</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_resources">El programa necesita descargar \n%1$.1f%2$s de los recursos obligatorios.</string>
-	<string name="getting_position">Obtener la posición actual</string>
+	<string name="download_resources">El programa necesita descaragar\n%1$.1f%2$s de recursos necesarios.</string>
+	<string name="getting_position">Buscando su ubicación actual</string>
 	<string name="download_resources_continue">Ir al mapa</string>
-	<string name="downloading_country_can_proceed">Descarga %s. Ahora puede\ncontinuar con el mapa.</string>
+	<string name="downloading_country_can_proceed">Descargando %s. Puede ahora\nproceder al mapa</string>
 	<string name="download_country_ask">Descargar %s?</string>
 	<string name="update_country_ask">Actualizar %s?</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_location_map_proposal">Puedes descargar el mapa\nde su ubicación actual</string>
+	<string name="download_location_map_proposal">Puede descargar el mapa de su ubicación actual</string>
 	<!-- REMOVE THIS_STRING AFTER REFACTORING -->
-	<string name="download_location_update_map_proposal">Puedes actulizar el mapa\nde su ubicación actual</string>
+	<string name="download_location_update_map_proposal">Puede actualizar el mapa de su ubicación actual</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_location_map_up_to_date">El mapa de su ubicación (%s) actual es actual</string>
+	<string name="download_location_map_up_to_date">El mapa de su ubicación\nactual (%s) está actualizado</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="pause">Pausa</string>
+	<string name="pause">Pausar</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
 	<string name="continue_download">Continuar</string>
-	<string name="downloaded_touch_to_update">Descargado (%s), pulse actualizar o eliminar</string>
+	<string name="downloaded_touch_to_update">Descargado (%s), tocar para actualizar o borrar</string>
 	<string name="update_mb_or_kb">Actualizar %s</string>
 	<!-- Show popup notification when we have downloaded countries without search (from Lite version) -->
-	<string name="search_update_maps">Necesita actualizar los mapas para la búsqueda</string>
+	<string name="search_update_maps">Necesita los mapas actualizados para la función de búsqueda</string>
 	<!-- Show popup notification on app start when we have out-of-date maps -->
-	<string name="advise_update_maps">Disponible la actualización de estos mapas:</string>
+	<string name="advise_update_maps">Hay actualizaciones disponibles para estos mapas:</string>
 	<!-- Show popup notification in Pro version that Lite can be deleted -->
-	<string name="suggest_uninstall_lite">No es necesario MapsWithMe Lite más, por lo que se puede desinstalar.</string>
+	<string name="suggest_uninstall_lite">Ahora no necesita MapsWithMe Lite, la puede desinstalar.</string>
 	<!-- Show popup notification on top of the map when country was downloaded. -->
-	<string name="download_country_success">%s descargado con exito</string>
+	<string name="download_country_success">%s se descargó exitosamente</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
-	<string name="download_country_failed">%s descarga ha fallado</string>
+	<string name="download_country_failed">%s la descarga ha fallado</string>
 	<!-- Add New Bookmark Set dialog title -->
-	<string name="add_new_set">Añadir nuevo grupo</string>
+	<string name="add_new_set">Agregar una agrupación nueva</string>
 	<!-- Place Page - Add To Bookmarks button -->
-	<string name="add_to_bookmarks">Añadir a marcadores</string>
+	<string name="add_to_bookmarks">Agregar a marcadores</string>
 	<!-- Bookmark Color dialog title -->
-	<string name="bookmark_color">Color de marcador</string>
+	<string name="bookmark_color">Color del marcador</string>
 	<!-- Add Bookmark Set dialog - hint when set name is empty -->
-	<string name="bookmark_set_name">Nombre del grupo</string>
+	<string name="bookmark_set_name">Nombre de la agrupación de marcadores</string>
 	<!-- Bookmark Sets dialog title -->
-	<string name="bookmark_sets">Grupos de marcadores</string>
+	<string name="bookmark_sets">Agrupación de marcadores</string>
 	<!-- Boormarks - dialog title -->
 	<string name="bookmarks">Marcadores</string>
 	<!-- Add bookmark dialog - bookmark color -->
 	<string name="color">Color</string>
 	<!-- Unknown Dropped Pin title, when name can't be determined -->
-	<string name="dropped_pin">Alfiler caída</string>
+	<string name="dropped_pin">Etiqueta colocada</string>
 	<!-- Default bookmarks set name -->
-	<string name="my_places">Mis marcadores</string>
+	<string name="my_places">Mis lugares</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nombre</string>
 	<!-- Add bookmark dialog - bookmark address -->
 	<string name="address">Dirección</string>
 	<!-- Place Page - Remove Pin button -->
-	<string name="remove_pin">Eliminar alfiler</string>
+	<string name="remove_pin">Quitar la etiqueta</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Grupo</string>
-
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode"></string>
+	<string name="set">Agrupación</string>
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">Añadir cualquier lugar en el mapa a favoritos. Para ello, toque un punto en el mapa y mantenga hasta que aparesca el menú contextual.</string>
 	<!-- Settings button in system menu -->
@@ -195,4 +192,6 @@
 	<string name="wait_several_minutes">Esto podría llevar algunos minutos.\nPor favor, espera…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Visible</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">En la versión completa de MapsWithMe, está disponible la opción de elegir favoritos. ¿Te lo quieres llevar ya?</string>
 </resources>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 38dc64b9c4..b9325f9ec6 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: fr -->
 <resources>
 	<!-- SECTION: Strings -->
@@ -122,7 +122,7 @@
 	<string name="not_enough_memory">Il ne suffit pas de memoire pour la mise en marche du programme</string>
 	<string name="free_space_for_country">Merci de faire  %1$s de la place disponible pour télécharger %2$s</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_resources">Merci de télécharger \n%1$.1f%2$s de ressources nécessaires pour la mise en marche du programme</string>
+	<string name="download_resources">Merci de télécharger\n%1$.1f%2$s de ressources nécessaires pour la mise en marche du programme.</string>
 	<string name="getting_position">Votre position est déterminé</string>
 	<string name="download_resources_continue">Passer sur la carte</string>
 	<string name="downloading_country_can_proceed">Téléchargement de %s.\nPasser sur la carte</string>
@@ -176,9 +176,6 @@
 	<string name="remove_pin">Effacer l\'épingle</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">Groupe</string>
-
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode"></string>
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">Ajoutez n\'importe quel endroit sur la carte à vos favoris. Pour cela, touchez un point sur la carte et maintenez appuyé jusqu\'à ce que le menu contextuel apparaisse.</string>
 	<!-- Settings button in system menu -->
@@ -191,4 +188,6 @@
 	<string name="wait_several_minutes">Cela peut prendre plusieurs minutes.\nVeuillez patienter…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Visible</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">Les marques-page sont disponibles dans la version complète de MapsWithMe. Se la procurer maintenant?</string>
 </resources>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 0efb4f40ea..5e9f1a6f3e 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: it -->
 <resources>
 	<!-- SECTION: Strings -->
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 7a2845ffa4..f3b2a21ba8 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: ja -->
 <resources>
 	<!-- SECTION: Strings -->
@@ -182,9 +182,6 @@
 	<string name="remove_pin">ピンを削除</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">セット</string>
-
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode"></string>
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">地図上のあらゆる場所をブックマークに追加できます。地図上の場所をタッチして、コンテキストメニューが表示されるまで長押しするだけです。</string>
 	<!-- Settings button in system menu -->
@@ -194,7 +191,9 @@
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">地図を移動しますか？</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
-	<string name="wait_several_minutes">数分かかる場合があります。\n お待ち下さい…</string>
+	<string name="wait_several_minutes">数分かかる場合があります。\nお待ち下さい…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">目に見える</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">ブックマークはMapsWithMeの完全版でご利用いただけます。いますぐ取得されますか？</string>
 </resources>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index d0ec0c8dca..84069c798b 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: ko -->
 <resources>
 	<!-- SECTION: Strings -->
@@ -124,7 +124,7 @@
 	<string name="not_enough_memory">응용 프로그램을 실행하기위한 메모리가 충분하지 않다</string>
 	<string name="free_space_for_country">%2$s를 다운로드하기 위해서는 먼저 장치에서 무료로 %1$s를주세요</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_resources">프로그램은 필수 자원의 \n%1$.1f%2$s 를 다운로드해야합니다.</string>
+	<string name="download_resources">프로그램은 필수 자원의\n%1$.1f%2$s 를 다운로드해야합니다.</string>
 	<string name="getting_position">현재 위치 얻기</string>
 	<string name="download_resources_continue">지도로 이동</string>
 	<string name="downloading_country_can_proceed">%s다운로드. 이제지도를 진행할 수 있습니다.</string>
@@ -178,9 +178,6 @@
 	<string name="remove_pin">핀 제거</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">집합</string>
-
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode"></string>
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">지도상의 어떤 장소든지 즐겨찾기에 추가할 수 있습니다. 이를 위해서는 컨텍스트 메뉴가 나타날 때까지 지도상의 장소를 오래 누르시면 됩니다.</string>
 	<!-- Settings button in system menu -->
@@ -193,4 +190,6 @@
 	<string name="wait_several_minutes">이 작업은 수 분 소요될 수 있습니다.\n잠시 기다리세요…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">눈에 보이는</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">MapsWithMe의 정식 버전에서는 즐겨찾기를 이용하실 수 있습니다. 지금 바로 구입하시겠습니까?</string>
 </resources>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 311a18b56f..e093eaa324 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: nl -->
 <resources>
 	<!-- SECTION: Strings -->
@@ -134,7 +134,7 @@
 	<string name="not_enough_memory">Not genoeg geheugen om app te starten</string>
 	<string name="free_space_for_country">Maak %1$s aan ruimte vrij op uw apparaat om %2$s te downloaden</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_resources">Programma moet \n%1$.1f%2$s downloaden.</string>
+	<string name="download_resources">Programma moet\n%1$.1f%2$s downloaden.</string>
 	<string name="getting_position">Huidige locatie opvragen</string>
 	<string name="download_resources_continue">Ga naar de Kaart</string>
 	<string name="downloading_country_can_proceed">%s aan het downloaden. U kunt doorgaan\nnaar de kaart</string>
@@ -188,9 +188,6 @@
 	<string name="remove_pin">Verwijder speld</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">Groep</string>
-
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode"></string>
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">Voeg een plaats naar keuze op de kaart toe aan de bladwijzers. Om dat te doen, drukt u op een plek op de kaart en houd u het ingedrukt tot het contextmenu verschijnt.</string>
 	<!-- Settings button in system menu -->
@@ -203,4 +200,6 @@
 	<string name="wait_several_minutes">Dit kan enkele minuten duren.\nEven geduld…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Zichtbaar</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">Bladwijzers zijn beschikbaar in de volledige versie van MapsWithMe. Wilt u die nu gelijk?</string>
 </resources>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 846df2bae4..f289ba91d2 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: ru -->
 <resources>
 	<!-- SECTION: Strings -->
 	<!-- Dialog text when paid version become available on the market. Showed only once. -->
-	<string name="pro_version_available">Больше возможностей в полной версии MapsWithMe с оффлайн поиском. Установите ее сейчас!</string>
+	<string name="pro_version_available">Больше возможностей в полной версии MapsWithMe с оффлайн поиском. Установить ее сейчас?</string>
 	<!-- About button text (should be short! @todo - fix french) -->
 	<string name="about">О программе</string>
 	<!-- Button text (should be short) -->
@@ -134,7 +134,7 @@
 	<string name="not_enough_memory">Недостаточно памяти для запуска программы</string>
 	<string name="free_space_for_country">Для загрузки %2$s нужно %1$s свободного места</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_resources">Для запуска программы нужно загрузить \n%1$.1f%2$s необходимых ресурсов.</string>
+	<string name="download_resources">Для запуска программы нужно загрузить\n%1$.1f%2$s необходимых ресурсов.</string>
 	<string name="getting_position">Получаем местоположение</string>
 	<string name="download_resources_continue">Перейти на карту</string>
 	<string name="downloading_country_can_proceed">Пока загружается %s \nвы можете пользоваться приложением.</string>
@@ -188,9 +188,6 @@
 	<string name="remove_pin">Удалить метку</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">Группа</string>
-
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode"></string>
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">Добавьте в избранное любое место на карте. Для этого нажмите на точку на карте и удерживайте, пока не появится контекстное меню.</string>
 	<!-- Settings button in system menu -->
@@ -203,4 +200,6 @@
 	<string name="wait_several_minutes">Это может занять несколько минут.\nПожалуйста, подождите…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Показывать на карте</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">Закладки доступны в полной верии MapsWithMe. Скачать ее прямо сейчас?</string>
 </resources>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index fb904f1847..fc1b1a528a 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: uk -->
 <resources>
 	<!-- SECTION: Strings -->
 	<!-- Dialog text when paid version become available on the market. Showed only once. -->
-	<string name="pro_version_available">Більше можливостей у повній версії MapsWithMe з оффлайн пошуком. Встановіть її зараз!</string>
+	<string name="pro_version_available">Більше можливостей у повній версії MapsWithMe з оффлайн пошуком. Встановіть її зараз?</string>
 	<!-- About button text (should be short! @todo - fix french) -->
 	<string name="about">Про програму</string>
 	<!-- Button text (should be short) -->
@@ -122,7 +122,7 @@
 	<string name="not_enough_memory">Недостатньо пам\'яті для запуску програми</string>
 	<string name="free_space_for_country">Для завантаження %2$s треба %1$s вільного місця</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_resources">Для запуску програми потрібно завантажити\n %1$.1f%2$s необхідних ресурсів.</string>
+	<string name="download_resources">Для запуску програми потрібно завантажити\n%1$.1f%2$s необхідних ресурсів.</string>
 	<string name="getting_position">Oтримуємо розташування</string>
 	<string name="download_resources_continue">Перейти на карту</string>
 	<string name="downloading_country_can_proceed">Поки завантажується %s \nви можете користуватися додатком.</string>
@@ -176,9 +176,6 @@
 	<string name="remove_pin">Видалити мітку</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">Група</string>
-
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode"></string>
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">Додайте будь-яке місце на карті в закладки. Щоб зробити це, натисніть місце на карті і утримувайте, поки з\'явиться контекстне меню.</string>
 	<!-- Settings button in system menu -->
@@ -191,4 +188,6 @@
 	<string name="wait_several_minutes">Це може зайняти кілька хвилин.\nЛаска, зачекайте…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Показувати</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">Закладки доступні у повній версії MapsWithMe. Отримати просто зараз?</string>
 </resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 5d8031de37..db91937c08 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 0.3.1 -->
+<!-- Generated by Twine 0.3.2 -->
 <!-- Language: en -->
 <resources>
 	<!-- SECTION: Strings -->
 	<!-- DO NOT TRANSLATE! Used only on Android for special purposes. -->
 	<string name="shared_user_label">Maps With Me</string>
 	<!-- Dialog text when paid version become available on the market. Showed only once. -->
-	<string name="pro_version_available">Navigate easier with the full version of MapsWithMe featuring offline search. Get it now!</string>
+	<string name="pro_version_available">Navigate easier with the full version of MapsWithMe featuring offline search. Get it right now!</string>
 	<!-- About button text (should be short! @todo - fix french) -->
 	<string name="about">About</string>
 	<!-- Button text (should be short) -->
@@ -192,9 +192,6 @@
 	<string name="remove_pin">Remove Pin</string>
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">Set</string>
-	<!-- Show popup notification in Pro version as a hint how to switch on the auto-follow mode. -->
-	<string name="suggest_auto_follow_mode">Tap the blue arrow to switch on the auto-follow mode</string>
-
 	<!-- Text hint in Bookmarks dialog, displayed if it's empty -->
 	<string name="bookmarks_usage_hint">Add any place on the map to bookmarks. To do that, touch a spot on the map and hold until the context menu appears.</string>
 	<!-- Settings button in system menu -->
@@ -207,4 +204,6 @@
 	<string name="wait_several_minutes">This can take several minutes.\nPlease wait…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Visible</string>
+	<!-- Proposal to download Pro version with Bookmarks -->
+	<string name="bookmarks_in_pro_version">Bookmarks are available in the full version of MapsWithMe. Get it right now?</string>
 </resources>
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 44249f7300..d476e9ff7e 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: de
  */
 
@@ -215,7 +215,7 @@
 "free_space_for_country" = "Bitte zuerst %1$@ Platz schaffen um %2$@ herunterzuladen";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Programm muss \n%.1f%@ zwingend benötigte Daten herunterladen.";
+"download_resources" = "Programm muss\n%.1f%@ zwingend benötigte Daten herunterladen.";
 
 "getting_position" = "Ermittle momentane Position";
 
@@ -300,9 +300,6 @@
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
 "set" = "Gruppe";
 
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "";
-
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "Fügen sie einen beliebigen Ort auf der Karte den Lesezeichen hinzu. Berühren sie dazu den Ort auf der Karte bis das Kontextmenü erscheint.";
 
@@ -320,3 +317,6 @@
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Sichtbar";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "Lesezeichen stehen in der Vollversion von MapsWithMe zur Verfügung. Jetzt sofort besorgen?";
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index bed4a99458..6cc582015d 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: en
  */
 
@@ -10,7 +10,7 @@
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
-"pro_version_available" = "Navigate easier with the full version of MapsWithMe featuring offline search. Get it now!";
+"pro_version_available" = "Navigate easier with the full version of MapsWithMe featuring offline search. Get it right now!";
 
 /* About button text (should be short! @todo - fix french) */
 "about" = "About";
@@ -300,9 +300,6 @@
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
 "set" = "Set";
 
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "Tap the blue arrow to switch on the auto-follow mode";
-
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "Add any place on the map to bookmarks. To do that, touch a spot on the map and hold until the context menu appears.";
 
@@ -320,3 +317,6 @@
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Visible";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "Bookmarks are available in the full version of MapsWithMe. Get it right now?";
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index 3a6994e9ca..759b8054e8 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: es
  */
 
@@ -109,7 +109,7 @@
 "remind_me_later" = "Recordar mas tarde";
 
 /* Update maps later/Buy pro version later button text */
-"later" = "Mas tarde";
+"later" = "Luego";
 
 /* Don't show some dialog any more */
 "never" = "Never";
@@ -184,7 +184,7 @@
 "country_status_download_failed" = "Error durante la descarga\n^";
 
 /* Button text for the button under the country_status_download_failed message */
-"try_again" = "Inténtelo de nuevo";
+"try_again" = "Intentarlo otra vez";
 
 "app_name" = "MapsWithMe";
 
@@ -204,77 +204,77 @@
 
 "download" = "Descargar";
 
-"external_storage_is_not_available" = "SD tarjeta/USB almacenamiento con los mapas descargados no está disponible";
+"external_storage_is_not_available" = "La memoria SD/almacenamiento USB con los mapas descargados no está disponible";
 
-"disconnect_usb_cable" = "Por favor, desconecte el cable USB o inserta la tarjeta de memoria para utilizar MapsWithMe";
+"disconnect_usb_cable" = "Por favor desconectar el cable USB o insertar la memoria SD para usar MapsWithMe";
 
-"not_enough_free_space_on_sdcard" = "Por favor, primero libere espacio en la SD tarjeta/USB almacenamiento para utilizar la aplicación";
+"not_enough_free_space_on_sdcard" = "Por favor libera espacio en la memoria SD/almacenamiento USB para usar la aplicación";
 
-"not_enough_memory" = "No hay suficiente espacio para poner en marcha la aplicación";
+"not_enough_memory" = "No hay suficiente memoria para iniciar la aplicación";
 
-"free_space_for_country" = "Por favor, primero libere %1$@ en tu dispositivo para descargar %2$@";
+"free_space_for_country" = "Por favor liberar %1$@ primero para descargar %2$@";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "El programa necesita descargar \n%.1f%@ de los recursos obligatorios.";
+"download_resources" = "El programa necesita descaragar\n%.1f%@ de recursos necesarios.";
 
-"getting_position" = "Obtener la posición actual";
+"getting_position" = "Buscando su ubicación actual";
 
 "download_resources_continue" = "Ir al mapa";
 
-"downloading_country_can_proceed" = "Descarga %@. Ahora puede\ncontinuar con el mapa.";
+"downloading_country_can_proceed" = "Descargando %@. Puede ahora\nproceder al mapa";
 
 "download_country_ask" = "Descargar %@?";
 
 "update_country_ask" = "Actualizar %@?";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_proposal" = "Puedes descargar el mapa\nde su ubicación actual";
+"download_location_map_proposal" = "Puede descargar el mapa de su ubicación actual";
 
 /* REMOVE THIS_STRING AFTER REFACTORING */
-"download_location_update_map_proposal" = "Puedes actulizar el mapa\nde su ubicación actual";
+"download_location_update_map_proposal" = "Puede actualizar el mapa de su ubicación actual";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_up_to_date" = "El mapa de su ubicación (%@) actual es actual";
+"download_location_map_up_to_date" = "El mapa de su ubicación\nactual (%@) está actualizado";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"pause" = "Pausa";
+"pause" = "Pausar";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
 "continue_download" = "Continuar";
 
-"downloaded_touch_to_update" = "Descargado (%@), pulse actualizar o eliminar";
+"downloaded_touch_to_update" = "Descargado (%@), tocar para actualizar o borrar";
 
 "update_mb_or_kb" = "Actualizar %@";
 
 /* Show popup notification when we have downloaded countries without search (from Lite version) */
-"search_update_maps" = "Necesita actualizar los mapas para la búsqueda";
+"search_update_maps" = "Necesita los mapas actualizados para la función de búsqueda";
 
 /* Show popup notification on app start when we have out-of-date maps */
-"advise_update_maps" = "Disponible la actualización de estos mapas:";
+"advise_update_maps" = "Hay actualizaciones disponibles para estos mapas:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "No es necesario MapsWithMe Lite más, por lo que se puede desinstalar.";
+"suggest_uninstall_lite" = "Ahora no necesita MapsWithMe Lite, la puede desinstalar.";
 
 /* Show popup notification on top of the map when country was downloaded. */
-"download_country_success" = "%@ descargado con exito";
+"download_country_success" = "%@ se descargó exitosamente";
 
 /* Show popup notification on top of the map when country download has failed. */
-"download_country_failed" = "%@ descarga ha fallado";
+"download_country_failed" = "%@ la descarga ha fallado";
 
 /* Add New Bookmark Set dialog title */
-"add_new_set" = "Añadir nuevo grupo";
+"add_new_set" = "Agregar una agrupación nueva";
 
 /* Place Page - Add To Bookmarks button */
-"add_to_bookmarks" = "Añadir a marcadores";
+"add_to_bookmarks" = "Agregar a marcadores";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Color de marcador";
+"bookmark_color" = "Color del marcador";
 
 /* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Nombre del grupo";
+"bookmark_set_name" = "Nombre de la agrupación de marcadores";
 
 /* Bookmark Sets dialog title */
-"bookmark_sets" = "Grupos de marcadores";
+"bookmark_sets" = "Agrupación de marcadores";
 
 /* Boormarks - dialog title */
 "bookmarks" = "Marcadores";
@@ -283,10 +283,10 @@
 "color" = "Color";
 
 /* Unknown Dropped Pin title, when name can't be determined */
-"dropped_pin" = "Alfiler caída";
+"dropped_pin" = "Etiqueta colocada";
 
 /* Default bookmarks set name */
-"my_places" = "Mis marcadores";
+"my_places" = "Mis lugares";
 
 /* Add bookmark dialog - bookmark name */
 "name" = "Nombre";
@@ -295,13 +295,10 @@
 "address" = "Dirección";
 
 /* Place Page - Remove Pin button */
-"remove_pin" = "Eliminar alfiler";
+"remove_pin" = "Quitar la etiqueta";
 
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Grupo";
-
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "";
+"set" = "Agrupación";
 
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "Añadir cualquier lugar en el mapa a favoritos. Para ello, toque un punto en el mapa y mantenga hasta que aparesca el menú contextual.";
@@ -320,3 +317,6 @@
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Visible";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "En la versión completa de MapsWithMe, está disponible la opción de elegir favoritos. ¿Te lo quieres llevar ya?";
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index 261ba03a61..2f41fad336 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: fr
  */
 
@@ -215,7 +215,7 @@
 "free_space_for_country" = "Merci de faire  %1$@ de la place disponible pour télécharger %2$@";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Merci de télécharger \n%.1f%@ de ressources nécessaires pour la mise en marche du programme";
+"download_resources" = "Merci de télécharger\n%.1f%@ de ressources nécessaires pour la mise en marche du programme.";
 
 "getting_position" = "Votre position est déterminé";
 
@@ -300,9 +300,6 @@
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
 "set" = "Groupe";
 
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "";
-
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "Ajoutez n'importe quel endroit sur la carte à vos favoris. Pour cela, touchez un point sur la carte et maintenez appuyé jusqu'à ce que le menu contextuel apparaisse.";
 
@@ -320,3 +317,6 @@
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Visible";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "Les marques-page sont disponibles dans la version complète de MapsWithMe. Se la procurer maintenant?";
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index 265f4e890a..cc3ff5301c 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: it
  */
 
@@ -10,7 +10,7 @@
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
-"pro_version_available" = "Navigate easier with the full version of MapsWithMe featuring offline search. Get it now!";
+"pro_version_available" = "Navigate easier with the full version of MapsWithMe featuring offline search. Get it right now!";
 
 /* About button text (should be short! @todo - fix french) */
 "about" = "About";
@@ -300,9 +300,6 @@
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
 "set" = "Set";
 
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "Tap the blue arrow to switch on the auto-follow mode";
-
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "Add any place on the map to bookmarks. To do that, touch a spot on the map and hold until the context menu appears.";
 
@@ -320,3 +317,6 @@
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Visible";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "Bookmarks are available in the full version of MapsWithMe. Get it right now?";
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index f0604bbb1d..6c470ca6a9 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: ja
  */
 
@@ -300,9 +300,6 @@
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
 "set" = "セット";
 
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "";
-
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "地図上のあらゆる場所をブックマークに追加できます。地図上の場所をタッチして、コンテキストメニューが表示されるまで長押しするだけです。";
 
@@ -316,7 +313,10 @@
 "move_maps" = "地図を移動しますか？";
 
 /* Ask to wait user several minutes (some long process in modal dialog). */
-"wait_several_minutes" = "数分かかる場合があります。\n お待ち下さい…";
+"wait_several_minutes" = "数分かかる場合があります。\nお待ち下さい…";
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "目に見える";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "ブックマークはMapsWithMeの完全版でご利用いただけます。いますぐ取得されますか？";
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index 299a8c6c2e..8f3e215533 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: ko
  */
 
@@ -215,7 +215,7 @@
 "free_space_for_country" = "%2$@를 다운로드하기 위해서는 먼저 장치에서 무료로 %1$@를주세요";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "프로그램은 필수 자원의 \n%.1f%@ 를 다운로드해야합니다.";
+"download_resources" = "프로그램은 필수 자원의\n%.1f%@ 를 다운로드해야합니다.";
 
 "getting_position" = "현재 위치 얻기";
 
@@ -300,9 +300,6 @@
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
 "set" = "집합";
 
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "";
-
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "지도상의 어떤 장소든지 즐겨찾기에 추가할 수 있습니다. 이를 위해서는 컨텍스트 메뉴가 나타날 때까지 지도상의 장소를 오래 누르시면 됩니다.";
 
@@ -320,3 +317,6 @@
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "눈에 보이는";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "MapsWithMe의 정식 버전에서는 즐겨찾기를 이용하실 수 있습니다. 지금 바로 구입하시겠습니까?";
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index 73f2bdd8ba..1138697a18 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: nl
  */
 
@@ -215,7 +215,7 @@
 "free_space_for_country" = "Maak %1$@ aan ruimte vrij op uw apparaat om %2$@ te downloaden";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Programma moet \n%.1f%@ downloaden.";
+"download_resources" = "Programma moet\n%.1f%@ downloaden.";
 
 "getting_position" = "Huidige locatie opvragen";
 
@@ -300,9 +300,6 @@
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
 "set" = "Groep";
 
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "";
-
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "Voeg een plaats naar keuze op de kaart toe aan de bladwijzers. Om dat te doen, drukt u op een plek op de kaart en houd u het ingedrukt tot het contextmenu verschijnt.";
 
@@ -320,3 +317,6 @@
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Zichtbaar";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "Bladwijzers zijn beschikbaar in de volledige versie van MapsWithMe. Wilt u die nu gelijk?";
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index b8479dc30a..5d3c21bbae 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: ru
  */
 
@@ -10,7 +10,7 @@
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
-"pro_version_available" = "Больше возможностей в полной версии MapsWithMe с оффлайн поиском. Установите ее сейчас!";
+"pro_version_available" = "Больше возможностей в полной версии MapsWithMe с оффлайн поиском. Установить ее сейчас?";
 
 /* About button text (should be short! @todo - fix french) */
 "about" = "О программе";
@@ -215,7 +215,7 @@
 "free_space_for_country" = "Для загрузки %2$@ нужно %1$@ свободного места";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Для запуска программы нужно загрузить \n%.1f%@ необходимых ресурсов.";
+"download_resources" = "Для запуска программы нужно загрузить\n%.1f%@ необходимых ресурсов.";
 
 "getting_position" = "Получаем местоположение";
 
@@ -300,9 +300,6 @@
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
 "set" = "Группа";
 
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "";
-
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "Добавьте в избранное любое место на карте. Для этого нажмите на точку на карте и удерживайте, пока не появится контекстное меню.";
 
@@ -320,3 +317,6 @@
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Показывать на карте";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "Закладки доступны в полной верии MapsWithMe. Скачать ее прямо сейчас?";
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index f69f42cfef..8cfb0860e6 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by Twine 0.3.1
+ * Generated by Twine 0.3.2
  * Language: uk
  */
 
@@ -10,7 +10,7 @@
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
-"pro_version_available" = "Більше можливостей у повній версії MapsWithMe з оффлайн пошуком. Встановіть її зараз!";
+"pro_version_available" = "Більше можливостей у повній версії MapsWithMe з оффлайн пошуком. Встановіть її зараз?";
 
 /* About button text (should be short! @todo - fix french) */
 "about" = "Про програму";
@@ -215,7 +215,7 @@
 "free_space_for_country" = "Для завантаження %2$@ треба %1$@ вільного місця";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Для запуску програми потрібно завантажити\n %.1f%@ необхідних ресурсів.";
+"download_resources" = "Для запуску програми потрібно завантажити\n%.1f%@ необхідних ресурсів.";
 
 "getting_position" = "Oтримуємо розташування";
 
@@ -300,9 +300,6 @@
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
 "set" = "Група";
 
-/* Show popup notification in Pro version as a hint how to switch on the auto-follow mode. */
-"suggest_auto_follow_mode" = "";
-
 /* Text hint in Bookmarks dialog, displayed if it's empty */
 "bookmarks_usage_hint" = "Додайте будь-яке місце на карті в закладки. Щоб зробити це, натисніть місце на карті і утримувайте, поки з'явиться контекстне меню.";
 
@@ -320,3 +317,6 @@
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Показувати";
+
+/* Proposal to download Pro version with Bookmarks */
+"bookmarks_in_pro_version" = "Закладки доступні у повній версії MapsWithMe. Отримати просто зараз?";
diff --git a/strings.txt b/strings.txt
index 90a9c8d049..6c3d84613a 100644
--- a/strings.txt
+++ b/strings.txt
@@ -4,15 +4,15 @@
 		tags = android
 		comment = DO NOT TRANSLATE! Used only on Android for special purposes.
 	[pro_version_available]
-		en = Navigate easier with the full version of MapsWithMe featuring offline search. Get it now!
+		en = Navigate easier with the full version of MapsWithMe featuring offline search. Get it right now!
 		comment = Dialog text when paid version become available on the market. Showed only once.
 		de = Mehr Möglichkeiten in der vollen Version MapsWithMe mit Offline-Suche. Jetzt herunterladen!
 		es = Mas facil navegar con la version completa MapsWithMe con el buscador offline. Bajalo ya!
 		fr = Plus de possibilités dans la version complète de MapsWithMe avec la recherche en hors ligne. Télécharger maintenant!
 		ja = MapsWithMe完全版ならオフラインサーチでさらにナビゲートが簡単です。今すぐご入手下さい！
 		ko = 오프라인 검색 기능의 MapsWithMe의 풀버젼으로 보다 쉽게 검색하세요. 지금 구매하세요!
-		ru = Больше возможностей в полной версии MapsWithMe с оффлайн поиском. Установите ее сейчас!
-		uk = Більше можливостей у повній версії MapsWithMe з оффлайн пошуком. Встановіть її зараз!
+		ru = Больше возможностей в полной версии MapsWithMe с оффлайн поиском. Установить ее сейчас?
+		uk = Більше можливостей у повній версії MapsWithMe з оффлайн пошуком. Встановіть її зараз?
 		cs = Více možností s plnou verzí MapsWithMe zahrnující hledání offline. Instalujte si ji teď!
 		nl = Navigeer makkelijker met MapsWithMe Pro met offline zoeken. Instelleer het nu!
 	[about]
@@ -386,7 +386,7 @@
 		en = Later
 		comment = Update maps later/Buy pro version later button text
 		de = Später
-		es = Mas tarde
+		es = Luego
 		fr = Plus tard
 		ja = 後で
 		ko = 후
@@ -681,7 +681,7 @@
 		en = Try Again
 		comment = Button text for the button under the country_status_download_failed message
 		de = Nochmals versuchen
-		es = Inténtelo de nuevo
+		es = Intentarlo otra vez
 		fr = Essayez encore une fois
 		ja = 再実行
 		ko = 다시 시도
@@ -782,7 +782,7 @@
 	[external_storage_is_not_available]
 		en = SD card/USB storage with downloaded maps is not available
 		de = SD Karte/USB Speicher mit geladenen Karten nicht verfügbar
-		es = SD tarjeta/USB almacenamiento con los mapas descargados no está disponible
+		es = La memoria SD/almacenamiento USB con los mapas descargados no está disponible
 		fr = Les cartes téléchargées sont indisponibles
 		ja = ダウンロード済みの地図はSDカード／USBストレージに保存する事はできません
 		ko = 다운로드된지도와 SD 카드 / USB 저장 장치를 사용할 수 없습니다
@@ -793,7 +793,7 @@
 	[disconnect_usb_cable]
 		en = Please disconnect USB cable or insert memory card to use MapsWithMe
 		de = Bitte USB Kabel entfernen oder Speicherkarte einsetzen um MapsWithMe zu verwenden
-		es = Por favor, desconecte el cable USB o inserta la tarjeta de memoria para utilizar MapsWithMe
+		es = Por favor desconectar el cable USB o insertar la memoria SD para usar MapsWithMe
 		fr = Débranchez le câble USB ou insérez la carte SD
 		ja = USBケーブルを抜くかMapsWithMeに使うメモリーカードを挿入してください
 		ko = MapsWithMe를 사용하려면 USB 케이블이나 삽입 메모리 카드를 분리하십시오
@@ -804,7 +804,7 @@
 	[not_enough_free_space_on_sdcard]
 		en = Please free some space on SD card/USB storage first in order to use the app
 		de = Bitte zuerst Speicherplatz auf SD Karte/USB Speicher freigeben um die Anwendung zu nutzen
-		es = Por favor, primero libere espacio en la SD tarjeta/USB almacenamiento para utilizar la aplicación
+		es = Por favor libera espacio en la memoria SD/almacenamiento USB para usar la aplicación
 		fr = L'espace disponible sur l'appareil est insuffisant pour l'utilisation du programme
 		ja = アプリを起動する前にSDカード/USBストレージの空き容量を増やしてください
 		ko = 응용 프로그램을 사용하기 위해서는 첫째 SD 카드 / USB 저장 장치에 여유 공간을 확보하십시오
@@ -815,7 +815,7 @@
 	[not_enough_memory]
 		en = Not enough memory to launch app
 		de = Nicht genügend Speicher um die Anwendung zu starten
-		es = No hay suficiente espacio para poner en marcha la aplicación
+		es = No hay suficiente memoria para iniciar la aplicación
 		fr = Il ne suffit pas de memoire pour la mise en marche du programme
 		ja = メモリ不足です。アプリを起動できません
 		ko = 응용 프로그램을 실행하기위한 메모리가 충분하지 않다
@@ -826,7 +826,7 @@
 	[free_space_for_country]
 		en = Please free %1$@ on your device first in order to download %2$@
 		de = Bitte zuerst %1$@ Platz schaffen um %2$@ herunterzuladen
-		es = Por favor, primero libere %1$@ en tu dispositivo para descargar %2$@
+		es = Por favor liberar %1$@ primero para descargar %2$@
 		fr = Merci de faire  %1$@ de la place disponible pour télécharger %2$@
 		ja = デバイス上で%1$@解放することで%2$@ダウンロードすることができます
 		ko = %2$@를 다운로드하기 위해서는 먼저 장치에서 무료로 %1$@를주세요
@@ -837,19 +837,19 @@
 	[download_resources]
 		en = Program needs to download \n%.1f%@ of mandatory resources.
 		comment = REMOVE THIS STRING AFTER REFACTORING
-		de = Programm muss \n%.1f%@ zwingend benötigte Daten herunterladen.
-		es = El programa necesita descargar \n%.1f%@ de los recursos obligatorios.
-		fr = Merci de télécharger \n%.1f%@ de ressources nécessaires pour la mise en marche du programme 
+		de = Programm muss\n%.1f%@ zwingend benötigte Daten herunterladen.
+		es = El programa necesita descaragar\n%.1f%@ de recursos necesarios.
+		fr = Merci de télécharger\n%.1f%@ de ressources nécessaires pour la mise en marche du programme.
 		ja = アプリは\n%.1f%@分の必須リソースをダウンロードする必要があります
-		ko = 프로그램은 필수 자원의 \n%.1f%@ 를 다운로드해야합니다.
-		ru = Для запуска программы нужно загрузить \n%.1f%@ необходимых ресурсов.
-		uk = Для запуску програми потрібно завантажити\n %.1f%@ необхідних ресурсів.
-		cs = Program potřebuje stáhnout \n%.1f%@ povinných zdrojů.
-		nl = Programma moet \n%.1f%@ downloaden.
+		ko = 프로그램은 필수 자원의\n%.1f%@ 를 다운로드해야합니다.
+		ru = Для запуска программы нужно загрузить\n%.1f%@ необходимых ресурсов.
+		uk = Для запуску програми потрібно завантажити\n%.1f%@ необхідних ресурсів.
+		cs = Program potřebuje stáhnout\n%.1f%@ povinných zdrojů.
+		nl = Programma moet\n%.1f%@ downloaden.
 	[getting_position]
 		en = Getting current position
 		de = Ermittle momentane Position
-		es = Obtener la posición actual
+		es = Buscando su ubicación actual
 		fr = Votre position est déterminé
 		ja = 現在地を取得中
 		ko = 현재 위치 얻기
@@ -871,7 +871,7 @@
 	[downloading_country_can_proceed]
 		en = Downloading %@. You can now\nproceed to the map.
 		de = Lade %@ herunter. Sie können jetzt\nzur Karte weitergehen.
-		es = Descarga %@. Ahora puede\ncontinuar con el mapa.
+		es = Descargando %@. Puede ahora\nproceder al mapa
 		fr = Téléchargement de %@.\nPasser sur la carte
 		ja = %@をダウンロード中\n地図に移動できます
 		ko = %@다운로드. 이제지도를 진행할 수 있습니다.
@@ -905,7 +905,7 @@
 		en = You can download the map\nof your current location.
 		comment = REMOVE THIS STRING AFTER REFACTORING
 		de = Sie können die Karte von\nihrem aktuellen Ort herunterladen.
-		es = Puedes descargar el mapa\nde su ubicación actual
+		es = Puede descargar el mapa de su ubicación actual
 		fr = Vous pouvez télécharger la carte\nde votre position actuelle.
 		ja = 現在地の地図を\nダウンロードできます
 		ko = 당신의 현재 위치의지도를 다운로드할 수 있습니다.
@@ -917,7 +917,7 @@
 		en = You can update the map\nof your current location.
 		comment = REMOVE THIS_STRING AFTER REFACTORING
 		de = Sie können die Karte von\nihrem aktuellen Ort aktualisieren.
-		es = Puedes actulizar el mapa\nde su ubicación actual
+		es = Puede actualizar el mapa de su ubicación actual
 		fr = Vous pouvez renouveler la carte\nde votre position actuelle.
 		ja = 現在地の地図を\n更新できます
 		ko = 귀하의 현재 위치의지도를 업데이트할 수 있습니다.
@@ -929,7 +929,7 @@
 		en = The map at your current\nlocation (%@) is up-to-date
 		comment = REMOVE THIS STRING AFTER REFACTORING
 		de = Die Karte von ihrem aktuellen\nOrt (%@) ist aktuell
-		es = El mapa de su ubicación (%@) actual es actual
+		es = El mapa de su ubicación\nactual (%@) está actualizado
 		fr = La carte de votre\nposition (%@) est déjà téléchargée
 		ja = 現在地の地図は\n最新です (%@)
 		ko = 현재 위치 (%@)\n에서지도는 최신이다
@@ -941,7 +941,7 @@
 		en = Pause
 		comment = REMOVE THIS STRING AFTER REFACTORING
 		de = Pause
-		es = Pausa
+		es = Pausar
 		fr = Pause
 		ja = 一時停止
 		ko = 중지
@@ -964,7 +964,7 @@
 	[downloaded_touch_to_update]
 		en = Downloaded (%@), touch to update or delete
 		de = Heruntergeladen (%@), berühren zum aktualisieren oder löschen
-		es = Descargado (%@), pulse actualizar o eliminar
+		es = Descargado (%@), tocar para actualizar o borrar
 		fr = (%@) est téléchargé, touchez pour renouveler ou effacer
 		ja = (%@)をダウンロードしました。タップして更新、削除できます
 		ko = 다운로드 (%@), 터치를 업데이 트하거나 삭제하는 방법
@@ -988,7 +988,7 @@
 		tags = android
 		comment = Show popup notification when we have downloaded countries without search (from Lite version)
 		de = Sie benötigen aktualisierte Karten für die Suchfunktion
-		es = Necesita actualizar los mapas para la búsqueda
+		es = Necesita los mapas actualizados para la función de búsqueda
 		fr = Merci d'effacer les cartes anciennes pour faire fonctionner la recherche
 		ja = 検索機能を利用するには地図を更新する必要があります
 		ko = 당신은 검색 기능에 대한 업데이트된지도 필요
@@ -1001,7 +1001,7 @@
 		tags = android
 		comment = Show popup notification on app start when we have out-of-date maps
 		de = Aktualisierung für diese Karten erhältlich:
-		es = Disponible la actualización de estos mapas:
+		es = Hay actualizaciones disponibles para estos mapas:
 		fr = Le renouvellement est disponible pour les cartes suivantes:
 		ja = こちらの地図が更新できます：
 		ko = 이지도에 사용할 수있는 업데이트 :
@@ -1015,7 +1015,7 @@
 		comment = Show popup notification in Pro version that Lite can be deleted
 		ru = MapsWithMe Lite больше не нужна. Рекомендуем ее удалить.
 		de = Sie benötigen MapsWithMe Lite nicht mehr, sie können es deinstallieren.
-		es = No es necesario MapsWithMe Lite más, por lo que se puede desinstalar.
+		es = Ahora no necesita MapsWithMe Lite, la puede desinstalar.
 		fr = Vous n'avez plus besoin de MapsWithMe Lite. Merci de l'effacer
 		ja = MapsWithMe Liteはもう必要ありませんので削除してもかまいません
 		ko = 당신은 더 이상 MapsWithMe 라이트는 필요 없어, 당신은 그것을 제거할 수 있습니다.
@@ -1028,7 +1028,7 @@
 		comment = Show popup notification on top of the map when country was downloaded.
 		ru = %@ успешно загружена
 		de = %@ erfolgreich heruntergeladen
-		es = %@ descargado con exito
+		es = %@ se descargó exitosamente
 		fr = Téléchargement de %@ est accompli avec succès 
 		ja = %@のダウンロードが成功しました
 		ko = %@이 성공적으로 다운로드
@@ -1041,7 +1041,7 @@
 		comment = Show popup notification on top of the map when country download has failed.
 		ru = Не удалось загрузить %@
 		de = %@ herunterladen fehlgeschlagen
-		es = %@ descarga ha fallado
+		es = %@ la descarga ha fallado
 		fr = Erreur de téléchargement de %@
 		ja = %@のダウンロードが失敗しました
 		ko = %@다운로드가 실패했습니다
@@ -1055,7 +1055,7 @@
 		ru = Добавить группу
 		de = Neue Gruppe hinzufügen
 		uk = Додати групу
-		es = Añadir nuevo grupo
+		es = Agregar una agrupación nueva
 		fr = Ajouter une groupe
 		ja = 新しいセットを追加
 		ko = 새로운 세트 추가
@@ -1068,7 +1068,7 @@
 		ru = Добавить в закладки
 		de = Zu Lesezeichen hinzufügen
 		uk = Додати в закладки
-		es = Añadir a marcadores
+		es = Agregar a marcadores
 		fr = Ajouter dans les signets
 		ja = ブックマークに追加
 		ko = 즐겨찾기에 추가
@@ -1081,7 +1081,7 @@
 		ru = Цвет закладки
 		de = Lesezeichen Farbe
 		uk = Колір закладки
-		es = Color de marcador
+		es = Color del marcador
 		fr = Couleur du signet
 		ja = ブックマークの色
 		ko = 색상 즐겨찾기에 추가
@@ -1094,7 +1094,7 @@
 		ru = Название группы
 		de = Name des Lesezeichens
 		uk = Назва групи
-		es = Nombre del grupo
+		es = Nombre de la agrupación de marcadores
 		fr = Nom de la groupe
 		ja = ブックマークセット名
 		ko = 집합 이름을 즐겨찾기에 추가
@@ -1107,7 +1107,7 @@
 		ru = Группы закладок
 		de = Lesezeichenmappe
 		uk = Групи закладок
-		es = Grupos de marcadores
+		es = Agrupación de marcadores
 		fr = Groupes de signets
 		ja = ブックマークセット
 		ko = 세트를 즐겨찾기에 추가
@@ -1146,7 +1146,7 @@
 		ru = Новая метка
 		de = Gesetzte Stecknadel
 		uk = Нова мітка
-		es = Alfiler caída
+		es = Etiqueta colocada
 		fr = L'épingle déplacée
 		ja = ドロップされたピン
 		ko = 알수 없는 핀
@@ -1159,7 +1159,7 @@
 		ru = Мои Закладки
 		de = Meine Orte
 		uk = Мої Закладки
-		es = Mis marcadores
+		es = Mis lugares
 		fr = Mes signets
 		ja = マイロケーション
 		ko = 내 장소
@@ -1198,7 +1198,7 @@
 		ru = Удалить метку
 		de = Stecknadel entfernen
 		uk = Видалити мітку
-		es = Eliminar alfiler
+		es = Quitar la etiqueta
 		fr = Effacer l'épingle
 		ja = ピンを削除
 		ko = 핀 제거
@@ -1211,26 +1211,12 @@
 		ru = Группа
 		de = Gruppe
 		uk = Група
-		es = Grupo
+		es = Agrupación
 		fr = Groupe
 		ja = セット
 		ko = 집합
 		cs = Skupina
 		nl = Groep
-
-	[suggest_auto_follow_mode]
-		en = Tap the blue arrow to switch on the auto-follow mode
-		tags = android
-		comment = Show popup notification in Pro version as a hint how to switch on the auto-follow mode.
-		ru = 
-		de = 
-		es = 
-		fr = 
-		ja = 
-		ko = 
-		cs = 
-		uk = 
-		nl = 
 	[bookmarks_usage_hint]
 		en = Add any place on the map to bookmarks. To do that, touch a spot on the map and hold until the context menu appears.
 		tags = ios
@@ -1292,7 +1278,7 @@
 		uk = Це може зайняти кілька хвилин.\nЛаска, зачекайте…
 		es = Esto podría llevar algunos minutos.\nPor favor, espera…
 		fr = Cela peut prendre plusieurs minutes.\nVeuillez patienter…
-		ja = 数分かかる場合があります。\n お待ち下さい…
+		ja = 数分かかる場合があります。\nお待ち下さい…
 		ko = 이 작업은 수 분 소요될 수 있습니다.\n잠시 기다리세요…
 		cs = Tato akce může trvat několik minut.\nPočkejte prosím…
 		nl = Dit kan enkele minuten duren.\nEven geduld…
@@ -1309,3 +1295,16 @@
 		ko = 눈에 보이는
 		cs = Viditelný
 		nl = Zichtbaar
+	[bookmarks_in_pro_version]
+		en = Bookmarks are available in the full version of MapsWithMe. Get it right now?
+		tags = ios
+		comment = Proposal to download Pro version with Bookmarks
+		ru = Закладки доступны в полной верии MapsWithMe. Скачать ее прямо сейчас?
+		de = Lesezeichen stehen in der Vollversion von MapsWithMe zur Verfügung. Jetzt sofort besorgen?
+		uk = Закладки доступні у повній версії MapsWithMe. Отримати просто зараз?
+		es = En la versión completa de MapsWithMe, está disponible la opción de elegir favoritos. ¿Te lo quieres llevar ya?
+		fr = Les marques-page sont disponibles dans la version complète de MapsWithMe. Se la procurer maintenant?
+		ja = ブックマークはMapsWithMeの完全版でご利用いただけます。いますぐ取得されますか？
+		ko = MapsWithMe의 정식 버전에서는 즐겨찾기를 이용하실 수 있습니다. 지금 바로 구입하시겠습니까?
+		cs = V plné verzi MapsWithMe jsou k dispozici záložky. Chcete ji pořídit hned teď?
+		nl = Bladwijzers zijn beschikbaar in de volledige versie van MapsWithMe. Wilt u die nu gelijk?