New strings translations.

17 files changed, 1114 insertions, 458 deletions

diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 971a1c89e0..e3b1295b9b 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -5,7 +5,7 @@
 <resources>
 	<!-- Strings -->
 	<!-- Dialog text when paid version become available on the market. Showed only once. -->
-	<string name="pro_version_available">Placená verze aplikace MapsWithMe, obsahující vyhledávání, je dostupná ke stažení. Chceš ji teď stáhnout?</string>
+	<string name="pro_version_available">Více možností s plnou verzí MapsWithMe zahrnující hledání offline. Instalujte si ji teď!</string>
 	<!-- About button text (should be short! @todo - fix french) -->
 	<string name="about">O programu</string>
 	<!-- Button text (should be short) -->
@@ -103,7 +103,7 @@
 	<!-- Search Suggestion -->
 	<string name="tourism">pamětihodnosti</string>
 	<!-- Message to display at the center of the screen when the country is added to the downloading queue -->
-	<string name="country_status_added_to_queue">^přidáno do \nfronty stahování.</string>
+	<string name="country_status_added_to_queue">^přidáno do\nfronty stahování.</string>
 	<!-- Message to display at the center of the screen when the country is downloading -->
 	<string name="country_status_downloading">Stahuji^ (^%)</string>
 	<!-- Button text for the button at the center of the screen when the country is not downloaded -->
@@ -144,6 +144,40 @@
 	<string name="continue_download">Pokračovat</string>
 	<string name="downloaded_touch_to_update">Staženo (%s), klepni pro smazání</string>
 	<string name="update_mb_or_kb">Aktualizace %s</string>
-	<!-- Show toast when we have countries without search index -->
+	<!-- Show popup notification when we have downloaded countries without search (from Lite version) -->
 	<string name="search_update_maps">Pro funkci vyhledávání musíš aktualizovat mapy:</string>
+	<!-- Show popup notification on app start when we have out-of-date maps -->
+	<string name="advise_update_maps">Aktualizace je k dispozici pro následující karty:</string>
+	<!-- Show popup notification in Pro version that Lite can be deleted -->
+	<string name="suggest_uninstall_lite">Nemusíte MapsWithMe Lite víc, takže si můžete odinstalovat.</string>
+	<!-- Show popup notification on top of the map when country was downloaded. -->
+	<string name="download_country_success">%s stáhnout úspěšně</string>
+	<!-- Show popup notification on top of the map when country download has failed. -->
+	<string name="download_country_failed">%s stahování se nezdařilo</string>
+	<!-- Add New Bookmark Set dialog title -->
+	<string name="add_new_set"></string>
+	<!-- Place Page - Add To Bookmarks button -->
+	<string name="add_to_bookmarks"></string>
+	<!-- Bookmark Color dialog title -->
+	<string name="bookmark_color"></string>
+	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<string name="bookmark_set_name"></string>
+	<!-- Bookmark Sets dialog title -->
+	<string name="bookmark_sets"></string>
+	<!-- Boormarks - dialog title -->
+	<string name="bookmarks"></string>
+	<!-- Add bookmark dialog - bookmark color -->
+	<string name="color"></string>
+	<!-- Unknown Dropped Pin title, when name can't be determined -->
+	<string name="dropped_pin"></string>
+	<!-- Default bookmarks set name -->
+	<string name="my_places"></string>
+	<!-- Add bookmark dialog - bookmark name -->
+	<string name="name"></string>
+	<!-- Add bookmark dialog - bookmark address -->
+	<string name="address"></string>
+	<!-- Place Page - Remove Pin button -->
+	<string name="remove_pin"></string>
+	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
+	<string name="set"></string>
 </resources>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index b4876134b7..a14b20f66a 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -5,7 +5,7 @@
 <resources>
 	<!-- Strings -->
 	<!-- Dialog text when paid version become available on the market. Showed only once. -->
-	<string name="pro_version_available">Die neue kostenpflichtige Version von MapsWithMe mit Suchfunktion ist erhältlich. Möchten Sie sie jetzt herunterladen?</string>
+	<string name="pro_version_available">Mehr Möglichkeiten in der vollen Version MapsWithMe mit Offline-Suche. Jetzt herunterladen!</string>
 	<!-- About button text (should be short! @todo - fix french) -->
 	<string name="about">Über Karten</string>
 	<!-- Button text (should be short) -->
@@ -62,6 +62,8 @@
 	<string name="free_disk_space_for_country_x">Kein Speicherplatz vorhanden. Löschen Sie bitte unnötige Karten oder Apps, um den Download durchführen zu können.</string>
 	<!-- Leave Review dialog - Not now button (remind me later) -->
 	<string name="remind_me_later">Errinern Sie mich später</string>
+	<!-- Update maps later/Buy pro version later button text -->
+	<string name="later">Später</string>
 	<!-- Leave Review dialog - Complain button (goes to support site) -->
 	<string name="report_an_issue">Problem melden</string>
 	<!-- View and button titles for accessibility -->
@@ -100,6 +102,16 @@
 	<string name="transport">Verkehr</string>
 	<!-- Search Suggestion -->
 	<string name="tourism">Sehenswürdigkeit</string>
+	<!-- Message to display at the center of the screen when the country is added to the downloading queue -->
+	<string name="country_status_added_to_queue">^wird zur\nDownload-Warteschleife hinzugefügt</string>
+	<!-- Message to display at the center of the screen when the country is downloading -->
+	<string name="country_status_downloading">Wird heruntergeladen^ (^%)</string>
+	<!-- Button text for the button at the center of the screen when the country is not downloaded -->
+	<string name="country_status_download">Herunterladen^</string>
+	<!-- Message to display at the center of the screen when the country download has failed -->
+	<string name="country_status_download_failed">Download^\nfehlgeschlagen</string>
+	<!-- Button text for the button under the country_status_download_failed message -->
+	<string name="try_again">Nochmals versuchen</string>
 	<string name="about_menu_title">Über MapsWithMe</string>
 	<string name="downloading_touch_to_cancel">Heruntergeladen %d%%. Berühren, um abzubrechen</string>
 	<string name="downloaded_touch_to_delete">Heruntergeladen (%s). Berühren, um zu löschen</string>
@@ -108,4 +120,64 @@
 	<string name="close">Schließen</string>
 	<string name="unsupported_phone">Das Programm braucht OpenGL um funktionnieren zu können. Leider wird ihr Gerät nicht unterschtüzt.</string>
 	<string name="download">Herunterladen</string>
+	<string name="external_storage_is_not_available">SD Karte/USB Speicher mit geladenen Karten nicht verfügbar</string>
+	<string name="disconnect_usb_cable">Bitte USB Kabel entfernen oder Speicherkarte einsetzen um MapsWithMe zu verwenden</string>
+	<string name="not_enough_free_space_on_sdcard">Bitte zuerst Speicherplatz auf SD Karte/USB Speicher freigeben um die Anwendung zu nutzen</string>
+	<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="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>
+	<string name="download_country_ask">%s herunterladen?</string>
+	<string name="update_country_ask">%s aktualisieren?</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="download_location_map_proposal">Sie können die Karte von\nihrem aktuellen Ort herunterladen.</string>
+	<!-- REMOVE THIS_STRING AFTER REFACTORING -->
+	<string name="download_location_update_map_proposal">Sie können die Karte von\nihrem aktuellen Ort aktualisieren.</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="download_location_map_up_to_date">Die Karte von ihrem aktuellen\nOrt (%s) ist aktuell</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="pause">Pause</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="continue_download">Fortfahren</string>
+	<string name="downloaded_touch_to_update">Heruntergeladen (%s), berühren zum aktualisieren oder löschen</string>
+	<string name="update_mb_or_kb">Aktualisiere %s</string>
+	<!-- Show popup notification when we have downloaded countries without search (from Lite version) -->
+	<string name="search_update_maps">Sie benötigen aktualisierte Karten für die Suchfunktion</string>
+	<!-- Show popup notification on app start when we have out-of-date maps -->
+	<string name="advise_update_maps">Aktualisierung für diese Karten erhältlich:</string>
+	<!-- Show popup notification in Pro version that Lite can be deleted -->
+	<string name="suggest_uninstall_lite">Sie benötigen MapsWithMe Lite nicht mehr, sie können es deinstallieren.</string>
+	<!-- Show popup notification on top of the map when country was downloaded. -->
+	<string name="download_country_success">%s erfolgreich heruntergeladen</string>
+	<!-- Show popup notification on top of the map when country download has failed. -->
+	<string name="download_country_failed">%s herunterladen fehlgeschlagen</string>
+	<!-- Add New Bookmark Set dialog title -->
+	<string name="add_new_set">Neue Gruppe hinzufügen</string>
+	<!-- Place Page - Add To Bookmarks button -->
+	<string name="add_to_bookmarks">Zu Lesezeichen hinzufügen</string>
+	<!-- Bookmark Color dialog title -->
+	<string name="bookmark_color">Lesezeichen Farbe</string>
+	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<string name="bookmark_set_name">Name des Lesezeichens</string>
+	<!-- Bookmark Sets dialog title -->
+	<string name="bookmark_sets"></string>
+	<!-- Boormarks - dialog title -->
+	<string name="bookmarks">Lesezeichengruppen</string>
+	<!-- Add bookmark dialog - bookmark color -->
+	<string name="color">Farbe</string>
+	<!-- Unknown Dropped Pin title, when name can't be determined -->
+	<string name="dropped_pin">Gesetzte Stecknadel</string>
+	<!-- Default bookmarks set name -->
+	<string name="my_places">Meine Orte</string>
+	<!-- Add bookmark dialog - bookmark name -->
+	<string name="name">Name</string>
+	<!-- Add bookmark dialog - bookmark address -->
+	<string name="address">Adresse</string>
+	<!-- Place Page - Remove Pin button -->
+	<string name="remove_pin">Stecknadel entfernen</string>
+	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
+	<string name="set">Gruppe</string>
 </resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 3c6c413e31..0ab8d7d53b 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -5,7 +5,7 @@
 <resources>
 	<!-- Strings -->
 	<!-- Dialog text when paid version become available on the market. Showed only once. -->
-	<string name="pro_version_available">Salió una nueva versión de pago, ¿quieres descargala ahora?</string>
+	<string name="pro_version_available">Mas facil navegar con la version completa MapsWithMe con el buscador offline. Bajalo ya!</string>
 	<!-- About button text (should be short! @todo - fix french) -->
 	<string name="about">Sobre</string>
 	<!-- Button text (should be short) -->
@@ -62,6 +62,8 @@
 	<string name="free_disk_space_for_country_x">No hay espacio suficiente para realizar la descarga</string>
 	<!-- 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>
 	<!-- 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 -->
@@ -100,6 +102,16 @@
 	<string name="transport">transporte</string>
 	<!-- Search Suggestion -->
 	<string name="tourism">turismo</string>
+	<!-- Message to display at the center of the screen when the country is added to the downloading queue -->
+	<string name="country_status_added_to_queue">^añadido a la cola\nde descarga</string>
+	<!-- Message to display at the center of the screen when the country is downloading -->
+	<string name="country_status_downloading">Descarga^ (^%)</string>
+	<!-- Button text for the button at the center of the screen when the country is not downloaded -->
+	<string name="country_status_download">Descargar^</string>
+	<!-- 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="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>
@@ -108,4 +120,64 @@
 	<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>
+	<!-- 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_continue">Ir al mapa</string>
+	<string name="downloading_country_can_proceed">Descarga %s. Ahora puede\ncontinuar con el 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>
+	<!-- REMOVE THIS_STRING AFTER REFACTORING -->
+	<string name="download_location_update_map_proposal">Puedes actulizar el mapa\nde 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>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="pause">Pausa</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="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>
+	<!-- 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>
+	<!-- 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>
+	<!-- Show popup notification on top of the map when country was downloaded. -->
+	<string name="download_country_success">%s descargado con exito</string>
+	<!-- Show popup notification on top of the map when country download has failed. -->
+	<string name="download_country_failed">%s descarga ha fallado</string>
+	<!-- Add New Bookmark Set dialog title -->
+	<string name="add_new_set"></string>
+	<!-- Place Page - Add To Bookmarks button -->
+	<string name="add_to_bookmarks"></string>
+	<!-- Bookmark Color dialog title -->
+	<string name="bookmark_color"></string>
+	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<string name="bookmark_set_name"></string>
+	<!-- Bookmark Sets dialog title -->
+	<string name="bookmark_sets"></string>
+	<!-- Boormarks - dialog title -->
+	<string name="bookmarks"></string>
+	<!-- Add bookmark dialog - bookmark color -->
+	<string name="color"></string>
+	<!-- Unknown Dropped Pin title, when name can't be determined -->
+	<string name="dropped_pin"></string>
+	<!-- Default bookmarks set name -->
+	<string name="my_places"></string>
+	<!-- Add bookmark dialog - bookmark name -->
+	<string name="name"></string>
+	<!-- Add bookmark dialog - bookmark address -->
+	<string name="address"></string>
+	<!-- Place Page - Remove Pin button -->
+	<string name="remove_pin"></string>
+	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
+	<string name="set"></string>
 </resources>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index d19f1cae8a..17589b3a82 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -5,7 +5,7 @@
 <resources>
 	<!-- Strings -->
 	<!-- Dialog text when paid version become available on the market. Showed only once. -->
-	<string name="pro_version_available">La nouvelle version payante de MapsWithMe est accessible. Voulez vous l\'installer maintenant?</string>
+	<string name="pro_version_available">Plus de possibilités dans la version complète de MapsWithMe avec la recherche en hors ligne. Télécharger maintenant!</string>
 	<!-- About button text (should be short! @todo - fix french) -->
 	<string name="about">Au sujet des cartes</string>
 	<!-- Button text (should be short) -->
@@ -60,6 +60,8 @@
 	<string name="free_disk_space_for_country_x">Le disque est plein, merci de faire de la place pour permettre le téléchargement</string>
 	<!-- Leave Review dialog - Not now button (remind me later) -->
 	<string name="remind_me_later">Rappelez moi plus tard</string>
+	<!-- Update maps later/Buy pro version later button text -->
+	<string name="later">Plus tard</string>
 	<!-- Leave Review dialog - Complain button (goes to support site) -->
 	<string name="report_an_issue">Signalez un problème</string>
 	<!-- View and button titles for accessibility -->
@@ -96,6 +98,16 @@
 	<string name="shop">magasin</string>
 	<!-- Search Suggestion -->
 	<string name="tourism">curiosités</string>
+	<!-- Message to display at the center of the screen when the country is added to the downloading queue -->
+	<string name="country_status_added_to_queue">^ajouté à son tour\nde télécharger</string>
+	<!-- Message to display at the center of the screen when the country is downloading -->
+	<string name="country_status_downloading">Téléchargement en cours^ (^%)</string>
+	<!-- Button text for the button at the center of the screen when the country is not downloaded -->
+	<string name="country_status_download">Charger^</string>
+	<!-- Message to display at the center of the screen when the country download has failed -->
+	<string name="country_status_download_failed">Erreur de téléchargement\n^</string>
+	<!-- Button text for the button under the country_status_download_failed message -->
+	<string name="try_again">Essayez encore une fois</string>
 	<string name="about_menu_title">Au sujet des cartes</string>
 	<string name="downloading_touch_to_cancel">Chargement en cours %d%%, toucher pour annuler</string>
 	<string name="downloaded_touch_to_delete">Elle est chargée (%s), Appuyer pour effacer</string>
@@ -104,4 +116,64 @@
 	<string name="close">Fermer</string>
 	<string name="unsupported_phone">Le programme a besoin d`OpenGL pour travailler. Votre appareil n`est pas appuyé maleuresement.</string>
 	<string name="download">Télécharger</string>
+	<string name="external_storage_is_not_available">Les cartes téléchargées sont indisponibles</string>
+	<string name="disconnect_usb_cable">Débranchez le câble USB ou insérez la carte SD</string>
+	<string name="not_enough_free_space_on_sdcard">L\'espace disponible sur l\'appareil est insuffisant pour l\'utilisation du programme</string>
+	<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="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>
+	<string name="download_country_ask">Télécharger %s?</string>
+	<string name="update_country_ask">Renouveler %s?</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="download_location_map_proposal">Vous pouvez télécharger la carte\nde votre position actuelle.</string>
+	<!-- REMOVE THIS_STRING AFTER REFACTORING -->
+	<string name="download_location_update_map_proposal">Vous pouvez renouveler la carte\nde votre position actuelle.</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="download_location_map_up_to_date">La carte de votre\nposition (%s) est déjà téléchargée</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="pause">Pause</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="continue_download">Continuer</string>
+	<string name="downloaded_touch_to_update">(%s) est téléchargé, touchez pour renouveler ou effacer</string>
+	<string name="update_mb_or_kb">Renouveler %s</string>
+	<!-- Show popup notification when we have downloaded countries without search (from Lite version) -->
+	<string name="search_update_maps">Merci d\'effacer les cartes anciennes pour faire fonctionner la recherche</string>
+	<!-- Show popup notification on app start when we have out-of-date maps -->
+	<string name="advise_update_maps">Le renouvellement est disponible pour les cartes suivantes:</string>
+	<!-- Show popup notification in Pro version that Lite can be deleted -->
+	<string name="suggest_uninstall_lite">Vous n\'avez plus besoin de MapsWithMe Lite. Merci de l\'effacer</string>
+	<!-- Show popup notification on top of the map when country was downloaded. -->
+	<string name="download_country_success">Téléchargement de %s est accompli avec succès</string>
+	<!-- Show popup notification on top of the map when country download has failed. -->
+	<string name="download_country_failed">Erreur de téléchargement de %s</string>
+	<!-- Add New Bookmark Set dialog title -->
+	<string name="add_new_set">Ajouter une groupe</string>
+	<!-- Place Page - Add To Bookmarks button -->
+	<string name="add_to_bookmarks">Ajouter dans les signets</string>
+	<!-- Bookmark Color dialog title -->
+	<string name="bookmark_color">Couleur du signet</string>
+	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<string name="bookmark_set_name">Nom de la groupe</string>
+	<!-- Bookmark Sets dialog title -->
+	<string name="bookmark_sets">Groupes de signets</string>
+	<!-- Boormarks - dialog title -->
+	<string name="bookmarks">Signets</string>
+	<!-- Add bookmark dialog - bookmark color -->
+	<string name="color">Couleur</string>
+	<!-- Unknown Dropped Pin title, when name can't be determined -->
+	<string name="dropped_pin">L\'épingle déplacée</string>
+	<!-- Default bookmarks set name -->
+	<string name="my_places">Mes signets</string>
+	<!-- Add bookmark dialog - bookmark name -->
+	<string name="name">Nom</string>
+	<!-- Add bookmark dialog - bookmark address -->
+	<string name="address">Adresse</string>
+	<!-- Place Page - Remove Pin button -->
+	<string name="remove_pin">Effacer l\'épingle</string>
+	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
+	<string name="set">Groupe</string>
 </resources>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index f9ea456743..3c0aadee7b 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -62,6 +62,8 @@
 	<string name="free_disk_space_for_country_x">位置情報サービスを有効にして下さい。</string>
 	<!-- Leave Review dialog - Not now button (remind me later) -->
 	<string name="remind_me_later">後でリマインド</string>
+	<!-- Update maps later/Buy pro version later button text -->
+	<string name="later">後で</string>
 	<!-- Leave Review dialog - Complain button (goes to support site) -->
 	<string name="report_an_issue">問題を報告</string>
 	<!-- View and button titles for accessibility -->
@@ -98,4 +100,82 @@
 	<string name="transport">輸送</string>
 	<!-- Search Suggestion -->
 	<string name="tourism">観光</string>
+	<!-- Message to display at the center of the screen when the country is added to the downloading queue -->
+	<string name="country_status_added_to_queue">^をダウンロードキューに\n追加しました</string>
+	<!-- Message to display at the center of the screen when the country is downloading -->
+	<string name="country_status_downloading">ダウンロード中^ (^%)</string>
+	<!-- Button text for the button at the center of the screen when the country is not downloaded -->
+	<string name="country_status_download">ダウンロード^</string>
+	<!-- Message to display at the center of the screen when the country download has failed -->
+	<string name="country_status_download_failed">ダウンロードに失敗しました\n^</string>
+	<!-- Button text for the button under the country_status_download_failed message -->
+	<string name="try_again">再実行</string>
+	<string name="about_menu_title">情報</string>
+	<string name="downloading_touch_to_cancel">%d%%をダウンロード中です。キャンセルするにはタッチして下さい。</string>
+	<string name="downloaded_touch_to_delete">(%s)をダウンロードしました。削除するにはタッチして下さい。</string>
+	<string name="connection_settings">接続設定</string>
+	<string name="download_mb_or_kb">%sをダウンロード</string>
+	<string name="close">閉じる</string>
+	<string name="unsupported_phone">ハードウェアアクセラレーションされたOpenGLが必要です。残念ながらご使用のデバイスはサポートされていません。</string>
+	<string name="download">ダウンロード</string>
+	<string name="external_storage_is_not_available">ダウンロード済みの地図はSDカード／USBストレージに保存する事はできません</string>
+	<string name="disconnect_usb_cable">USBケーブルを抜くかMapsWithMeに使うメモリーカードを挿入してください</string>
+	<string name="not_enough_free_space_on_sdcard">アプリを起動する前にSDカード/USBストレージの空き容量を増やしてください</string>
+	<string name="not_enough_memory">メモリ不足です。アプリを起動できません</string>
+	<string name="free_space_for_country">デバイス上で%1$s解放することで%2$sダウンロードすることができます</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<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>
+	<string name="download_country_ask">%sをダウンロードしますか？</string>
+	<string name="update_country_ask">%sを更新しますか？</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="download_location_map_proposal">現在地の地図を\nダウンロードできます</string>
+	<!-- REMOVE THIS_STRING AFTER REFACTORING -->
+	<string name="download_location_update_map_proposal">現在地の地図を\n更新できます</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="download_location_map_up_to_date">現在地の地図は\n最新です (%s)</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="pause">一時停止</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="continue_download">続行</string>
+	<string name="downloaded_touch_to_update">(%s)をダウンロードしました。タップして更新、削除できます</string>
+	<string name="update_mb_or_kb">%sを更新</string>
+	<!-- Show popup notification when we have downloaded countries without search (from Lite version) -->
+	<string name="search_update_maps">検索機能を利用するには地図を更新する必要があります</string>
+	<!-- Show popup notification on app start when we have out-of-date maps -->
+	<string name="advise_update_maps">こちらの地図が更新できます：</string>
+	<!-- Show popup notification in Pro version that Lite can be deleted -->
+	<string name="suggest_uninstall_lite">MapsWithMe Liteはもう必要ありませんので削除してもかまいません</string>
+	<!-- Show popup notification on top of the map when country was downloaded. -->
+	<string name="download_country_success">%sのダウンロードが成功しました</string>
+	<!-- Show popup notification on top of the map when country download has failed. -->
+	<string name="download_country_failed">%sのダウンロードが失敗しました</string>
+	<!-- Add New Bookmark Set dialog title -->
+	<string name="add_new_set">新しいセットを追加</string>
+	<!-- Place Page - Add To Bookmarks button -->
+	<string name="add_to_bookmarks">ブックマークに追加</string>
+	<!-- Bookmark Color dialog title -->
+	<string name="bookmark_color">ブックマークの色</string>
+	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<string name="bookmark_set_name">ブックマークセット名</string>
+	<!-- Bookmark Sets dialog title -->
+	<string name="bookmark_sets">ブックマークセット</string>
+	<!-- Boormarks - dialog title -->
+	<string name="bookmarks">ブックマーク</string>
+	<!-- Add bookmark dialog - bookmark color -->
+	<string name="color">色</string>
+	<!-- Unknown Dropped Pin title, when name can't be determined -->
+	<string name="dropped_pin">ドロップされたピン</string>
+	<!-- Default bookmarks set name -->
+	<string name="my_places">マイロケーション</string>
+	<!-- Add bookmark dialog - bookmark name -->
+	<string name="name">場所名</string>
+	<!-- Add bookmark dialog - bookmark address -->
+	<string name="address">住所</string>
+	<!-- Place Page - Remove Pin button -->
+	<string name="remove_pin">ピンを削除</string>
+	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
+	<string name="set">セット</string>
 </resources>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 1e72905b03..3e5f230698 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -62,6 +62,8 @@
 	<string name="free_disk_space_for_country_x">먼저 귀하의 장치에 어느 정도의 공간을 확보하여 %s를 다운로드하여 주십시요.</string>
 	<!-- Leave Review dialog - Not now button (remind me later) -->
 	<string name="remind_me_later">이후에 기억시키기</string>
+	<!-- Update maps later/Buy pro version later button text -->
+	<string name="later">후</string>
 	<!-- Leave Review dialog - Complain button (goes to support site) -->
 	<string name="report_an_issue">문제 보고하기</string>
 	<!-- View and button titles for accessibility -->
@@ -98,4 +100,82 @@
 	<string name="transport">수송</string>
 	<!-- Search Suggestion -->
 	<string name="tourism">관광</string>
+	<!-- Message to display at the center of the screen when the country is added to the downloading queue -->
+	<string name="country_status_added_to_queue">^는 다운로드 대기열에\n추가됩니다.</string>
+	<!-- Message to display at the center of the screen when the country is downloading -->
+	<string name="country_status_downloading">다운로드 중^ (^%)</string>
+	<!-- Button text for the button at the center of the screen when the country is not downloaded -->
+	<string name="country_status_download">다운로드^</string>
+	<!-- Message to display at the center of the screen when the country download has failed -->
+	<string name="country_status_download_failed">다운로드에 실패하였습니다\n^</string>
+	<!-- Button text for the button under the country_status_download_failed message -->
+	<string name="try_again">다시 시도</string>
+	<string name="about_menu_title">소개</string>
+	<string name="downloading_touch_to_cancel">%d%%를 다운로드 중, 두드려 취소하십시요</string>
+	<string name="downloaded_touch_to_delete">(%s)가 다운로드 되었습니다, 두드려 삭제하십시요.</string>
+	<string name="connection_settings">연결 설정</string>
+	<string name="download_mb_or_kb">%s 다운로드하기</string>
+	<string name="close">닫기</string>
+	<string name="unsupported_phone">하드웨어 촉진 OpenGL이 요구됩니다. 애석하게도 귀하의 장치는 지원되지 않습니다.</string>
+	<string name="download">다운로드</string>
+	<string name="external_storage_is_not_available">다운로드된지도와 SD 카드 / USB 저장 장치를 사용할 수 없습니다</string>
+	<string name="disconnect_usb_cable">MapsWithMe를 사용하려면 USB 케이블이나 삽입 메모리 카드를 분리하십시오</string>
+	<string name="not_enough_free_space_on_sdcard">응용 프로그램을 사용하기 위해서는 첫째 SD 카드 / USB 저장 장치에 여유 공간을 확보하십시오</string>
+	<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="getting_position">현재 위치 얻기</string>
+	<string name="download_resources_continue">지도로 이동</string>
+	<string name="downloading_country_can_proceed">%s다운로드. 이제지도를 진행할 수 있습니다.</string>
+	<string name="download_country_ask">%s다운로드?</string>
+	<string name="update_country_ask">%s업데이트?</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="download_location_map_proposal">당신의 현재 위치의지도를 다운로드할 수 있습니다.</string>
+	<!-- REMOVE THIS_STRING AFTER REFACTORING -->
+	<string name="download_location_update_map_proposal">귀하의 현재 위치의지도를 업데이트할 수 있습니다.</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="download_location_map_up_to_date">현재 위치 (%s)\n에서지도는 최신이다</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="pause">중지</string>
+	<!-- REMOVE THIS STRING AFTER REFACTORING -->
+	<string name="continue_download">계속</string>
+	<string name="downloaded_touch_to_update">다운로드 (%s), 터치를 업데이 트하거나 삭제하는 방법</string>
+	<string name="update_mb_or_kb">%s업데이트</string>
+	<!-- Show popup notification when we have downloaded countries without search (from Lite version) -->
+	<string name="search_update_maps">당신은 검색 기능에 대한 업데이트된지도 필요</string>
+	<!-- Show popup notification on app start when we have out-of-date maps -->
+	<string name="advise_update_maps">이지도에 사용할 수있는 업데이트 :</string>
+	<!-- Show popup notification in Pro version that Lite can be deleted -->
+	<string name="suggest_uninstall_lite">당신은 더 이상 MapsWithMe 라이트는 필요 없어, 당신은 그것을 제거할 수 있습니다.</string>
+	<!-- Show popup notification on top of the map when country was downloaded. -->
+	<string name="download_country_success">%s이 성공적으로 다운로드</string>
+	<!-- Show popup notification on top of the map when country download has failed. -->
+	<string name="download_country_failed">%s다운로드가 실패했습니다</string>
+	<!-- Add New Bookmark Set dialog title -->
+	<string name="add_new_set">새로운 세트 추가</string>
+	<!-- Place Page - Add To Bookmarks button -->
+	<string name="add_to_bookmarks">즐겨찾기에 추가</string>
+	<!-- Bookmark Color dialog title -->
+	<string name="bookmark_color">색상 즐겨찾기에 추가</string>
+	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<string name="bookmark_set_name">집합 이름을 즐겨찾기에 추가</string>
+	<!-- Bookmark Sets dialog title -->
+	<string name="bookmark_sets">세트를 즐겨찾기에 추가</string>
+	<!-- Boormarks - dialog title -->
+	<string name="bookmarks">북마크</string>
+	<!-- Add bookmark dialog - bookmark color -->
+	<string name="color"></string>
+	<!-- Unknown Dropped Pin title, when name can't be determined -->
+	<string name="dropped_pin"></string>
+	<!-- Default bookmarks set name -->
+	<string name="my_places"></string>
+	<!-- Add bookmark dialog - bookmark name -->
+	<string name="name"></string>
+	<!-- Add bookmark dialog - bookmark address -->
+	<string name="address"></string>
+	<!-- Place Page - Remove Pin button -->
+	<string name="remove_pin"></string>
+	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
+	<string name="set"></string>
 </resources>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 715f58d41a..4ab6540155 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -5,7 +5,7 @@
 <resources>
 	<!-- 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) -->
@@ -28,7 +28,7 @@
 	<!-- Settings/Downloader - Download confirmation button -->
 	<string name="download_x_mb">Загрузить %qu МБ</string>
 	<!-- Settings/Downloader - info for country when download fails -->
-	<string name="download_has_failed">Ошибка загрузки. Нажмите, чтобы повоторить попытку</string>
+	<string name="download_has_failed">Ошибка загрузки. Нажмите, чтобы повторить попытку</string>
 	<!-- Settings/Downloader - info for downloaded country -->
 	<string name="downloaded_x_y_touch_to_delete">Загружено (%1$qu %2$s), нажмите для удаления</string>
 	<!-- Settings/Downloader - country info current download progress -->
@@ -57,9 +57,9 @@
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Мили</string>
 	<!-- View and button titles for accessibility -->
-	<string name="my_position">Моё местоположение</string>
+	<string name="my_position">Мое местоположение</string>
 	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Отсутствует подключение к Интернету</string>
+	<string name="no_internet_connection_detected">Отсутствует подключение к интернету</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Нет WiFi соединения. Вы хотите скачать %s через сотового оператора (GPRS, EDGE или 3G)?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -70,14 +70,14 @@
 	<string name="remind_me_later">Напомнить позже</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Не сейчас</string>
-	<!-- Don't show some dialog anymore. -->
+	<!-- Don't show some dialog any more -->
 	<string name="never">Не показывать</string>
 	<!-- Leave Review dialog - Complain button (goes to support site) -->
 	<string name="report_an_issue">Сообщить о проблеме</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Поиск</string>
 	<!-- Search button pressed dialog title in the free version -->
-	<string name="search_available_in_pro_version">Поиск доступен только в Pro версии MapsWithMe. Установить ее прямо сейчас?</string>
+	<string name="search_available_in_pro_version">Поиск доступен только в Pro версии MapsWithMe. Установите ее прямо сейчас!</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Поиск на карте</string>
 	<!-- Settings/Downloader - No free space dialog title -->
@@ -117,7 +117,7 @@
 	<!-- Button text for the button at the center of the screen when the country is not downloaded -->
 	<string name="country_status_download">Загрузить^</string>
 	<!-- Message to display at the center of the screen when the country download has failed -->
-	<string name="country_status_download_failed">Ошибка загрузки^.</string>
+	<string name="country_status_download_failed">Ошибка загрузки\n^</string>
 	<!-- Button text for the button under the country_status_download_failed message -->
 	<string name="try_again">Попробуйте еще раз</string>
 	<string name="about_menu_title">О программе</string>
@@ -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>
@@ -152,16 +152,16 @@
 	<string name="continue_download">Продолжить</string>
 	<string name="downloaded_touch_to_update">Загружено (%s), нажмите для обновления или удаления</string>
 	<string name="update_mb_or_kb">Обновить %s</string>
-	<!-- Show toast when we have countries without search index -->
+	<!-- Show popup notification when we have downloaded countries without search (from Lite version) -->
 	<string name="search_update_maps">Для функции поиска необходимо обновить устаревшие карты:</string>
-	<!-- Show toast on start when we have out-of-date maps -->
+	<!-- Show popup notification on app start when we have out-of-date maps -->
 	<string name="advise_update_maps">Доступно обновление для следующих карт:</string>
-	<!-- Show toast in Pro version that Lite can be deleted -->
-	<string name="suggest_uninstall_lite">Maps With Me Lite больше не нужна. Рекомендуем ее удалить.</string>
-	<!-- Show toast when country has downloaded. -->
-	<string name="download_country_success">%s успешно загружена.</string>
-	<!-- Show toast when country downloading failed. -->
-	<string name="download_country_failed">Загрузка %s провалилась.</string>
+	<!-- Show popup notification in Pro version that Lite can be deleted -->
+	<string name="suggest_uninstall_lite">MapsWithMe Lite больше не нужна. Рекомендуем ее удалить.</string>
+	<!-- Show popup notification on top of the map when country was downloaded. -->
+	<string name="download_country_success">%s успешно загружена</string>
+	<!-- Show popup notification on top of the map when country download has failed. -->
+	<string name="download_country_failed">Не удалось загрузить %s</string>
 	<!-- Add New Bookmark Set dialog title -->
 	<string name="add_new_set">Добавить группу</string>
 	<!-- Place Page - Add To Bookmarks button -->
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 8f23b84c8c..78c0c051da 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -4,10 +4,10 @@
 <!-- Language: en -->
 <resources>
 	<!-- Strings -->
-	<!-- Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. -->
+	<!-- 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">A paid version of MapsWithMe, featuring search, is available for download. Would you like to get it now?</string>
+	<string name="pro_version_available">Navigate easier with the full version of MapsWithMe featuring offline search. Get it now!</string>
 	<!-- About button text (should be short! @todo - fix french) -->
 	<string name="about">About</string>
 	<!-- Button text (should be short) -->
@@ -23,8 +23,8 @@
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Do not ask me again</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
-	<string name="do_nothing">Do nothing</string>
-	<string name="download_maps">Download Maps</string>
+	<string name="do_nothing">Continue</string>
+	<string name="download_maps">Download maps</string>
 	<!-- Settings/Downloader - Download confirmation button -->
 	<string name="download_x_kb">Download %qu kB</string>
 	<!-- Settings/Downloader - Download confirmation button -->
@@ -73,14 +73,14 @@
 	<string name="remind_me_later">Remind me later</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Later</string>
-	<!-- Don't show some dialog anymore. -->
+	<!-- Don't show some dialog any more -->
 	<string name="never">Never</string>
 	<!-- Leave Review dialog - Complain button (goes to support site) -->
 	<string name="report_an_issue">Report an issue</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Search</string>
 	<!-- Search button pressed dialog title in the free version -->
-	<string name="search_available_in_pro_version">Search is only available in the Pro version of MapsWithMe. Would you like to get it now?</string>
+	<string name="search_available_in_pro_version">Search is only available in the Pro version of MapsWithMe. Get it right now!</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Search map</string>
 	<!-- Settings/Downloader - No free space dialog title -->
@@ -122,8 +122,8 @@
 	<!-- Message to display at the center of the screen when the country download has failed -->
 	<string name="country_status_download_failed">Downloading^\nhas failed</string>
 	<!-- Button text for the button under the country_status_download_failed message -->
-	<string name="try_again">Try Again</string>
-	<string name="app_name">Maps With Me</string>
+	<string name="try_again">Try again</string>
+	<string name="app_name">MapsWithMe</string>
 	<string name="about_menu_title">About MapsWithMe</string>
 	<string name="downloading_touch_to_cancel">Downloading %d%%, touch to cancel</string>
 	<string name="downloaded_touch_to_delete">Downloaded (%s), touch to delete</string>
@@ -156,26 +156,26 @@
 	<string name="continue_download">Continue</string>
 	<string name="downloaded_touch_to_update">Downloaded (%s), touch to update or delete</string>
 	<string name="update_mb_or_kb">Update %s</string>
-	<!-- Show toast when we have countries without search index -->
-	<string name="search_update_maps">You need to updated maps for search function:</string>
-	<!-- Show toast on start when we have out-of-date maps -->
+	<!-- Show popup notification when we have downloaded countries without search (from Lite version) -->
+	<string name="search_update_maps">You need updated maps for search function:</string>
+	<!-- Show popup notification on app start when we have out-of-date maps -->
 	<string name="advise_update_maps">Update available for these maps:</string>
-	<!-- Show toast in Pro version that Lite can be deleted -->
-	<string name="suggest_uninstall_lite">You don\'t need Maps With Me Lite any more, so you can uninstall it.</string>
-	<!-- Show toast when country has downloaded. -->
-	<string name="download_country_success">%s downloaded successfuly.</string>
-	<!-- Show toast when country downloading failed. -->
-	<string name="download_country_failed">Downloading of %s failed.</string>
+	<!-- Show popup notification in Pro version that Lite can be deleted -->
+	<string name="suggest_uninstall_lite">You don\'t need MapsWithMe Lite any more, so you can uninstall it.</string>
+	<!-- Show popup notification on top of the map when country was downloaded. -->
+	<string name="download_country_success">%s downloaded successfuly</string>
+	<!-- Show popup notification on top of the map when country download has failed. -->
+	<string name="download_country_failed">%s download has failed</string>
 	<!-- Add New Bookmark Set dialog title -->
-	<string name="add_new_set">Add New Set</string>
+	<string name="add_new_set">Add new set</string>
 	<!-- Place Page - Add To Bookmarks button -->
-	<string name="add_to_bookmarks">Add To Bookmarks</string>
+	<string name="add_to_bookmarks">Add to bookmarks</string>
 	<!-- Bookmark Color dialog title -->
-	<string name="bookmark_color">Bookmark Color</string>
+	<string name="bookmark_color">Bookmark color</string>
 	<!-- Add Bookmark Set dialog - hint when set name is empty -->
-	<string name="bookmark_set_name">Bookmark Set Name</string>
+	<string name="bookmark_set_name">Bookmark set name</string>
 	<!-- Bookmark Sets dialog title -->
-	<string name="bookmark_sets">Bookmark Sets</string>
+	<string name="bookmark_sets">Bookmark sets</string>
 	<!-- Boormarks - dialog title -->
 	<string name="bookmarks">Bookmarks</string>
 	<!-- Add bookmark dialog - bookmark color -->
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 4fbb95c362..20f0c86627 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -6,11 +6,11 @@
 
 /********** Strings **********/
 
-/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+/* DO NOT TRANSLATE! Used only on Android for special purposes. */
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
-"pro_version_available" = "Die neue kostenpflichtige Version von MapsWithMe mit Suchfunktion ist erhältlich. Möchten Sie sie jetzt herunterladen?";
+"pro_version_available" = "Mehr Möglichkeiten in der vollen Version MapsWithMe mit Offline-Suche. Jetzt herunterladen!";
 
 /* About button text (should be short! @todo - fix french) */
 "about" = "Über Karten";
@@ -109,9 +109,9 @@
 "remind_me_later" = "Errinern Sie mich später";
 
 /* Update maps later/Buy pro version later button text */
-"later" = "Later";
+"later" = "Später";
 
-/* Don't show some dialog anymore. */
+/* Don't show some dialog any more */
 "never" = "Never";
 
 /* Leave Review dialog - Complain button (goes to support site) */
@@ -172,21 +172,21 @@
 "tourism" = "Sehenswürdigkeit";
 
 /* Message to display at the center of the screen when the country is added to the downloading queue */
-"country_status_added_to_queue" = "^is added to the\ndownloading queue.";
+"country_status_added_to_queue" = "^wird zur\nDownload-Warteschleife hinzugefügt";
 
 /* Message to display at the center of the screen when the country is downloading */
-"country_status_downloading" = "Downloading^ (^%)";
+"country_status_downloading" = "Wird heruntergeladen^ (^%)";
 
 /* Button text for the button at the center of the screen when the country is not downloaded */
-"country_status_download" = "Download^";
+"country_status_download" = "Herunterladen^";
 
 /* Message to display at the center of the screen when the country download has failed */
-"country_status_download_failed" = "Downloading^\nhas failed";
+"country_status_download_failed" = "Download^\nfehlgeschlagen";
 
 /* Button text for the button under the country_status_download_failed message */
-"try_again" = "Try Again";
+"try_again" = "Nochmals versuchen";
 
-"app_name" = "Maps With Me";
+"app_name" = "MapsWithMe";
 
 "about_menu_title" = "Über MapsWithMe";
 
@@ -204,98 +204,98 @@
 
 "download" = "Herunterladen";
 
-"external_storage_is_not_available" = "SD card/USB storage with downloaded maps is not available";
+"external_storage_is_not_available" = "SD Karte/USB Speicher mit geladenen Karten nicht verfügbar";
 
-"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use MapsWithMe";
+"disconnect_usb_cable" = "Bitte USB Kabel entfernen oder Speicherkarte einsetzen um MapsWithMe zu verwenden";
 
-"not_enough_free_space_on_sdcard" = "Please free some space on SD card/USB storage first in order to use the app";
+"not_enough_free_space_on_sdcard" = "Bitte zuerst Speicherplatz auf SD Karte/USB Speicher freigeben um die Anwendung zu nutzen";
 
-"not_enough_memory" = "Not enough memory to launch app";
+"not_enough_memory" = "Nicht genügend Speicher um die Anwendung zu starten";
 
-"free_space_for_country" = "Please free %1$@ on your device first in order to download %2$@";
+"free_space_for_country" = "Bitte zuerst %1$@ Platz schaffen um %2$@ herunterzuladen";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Program needs to download \n%.1f%@ of mandatory resources.";
+"download_resources" = "Programm muss \n%.1f%@ zwingend benötigte Daten herunterladen.";
 
-"getting_position" = "Getting current position";
+"getting_position" = "Ermittle momentane Position";
 
-"download_resources_continue" = "Go to map";
+"download_resources_continue" = "Zur Karte";
 
-"downloading_country_can_proceed" = "Downloading %@. You can now\nproceed to the map.";
+"downloading_country_can_proceed" = "Lade %@ herunter. Sie können jetzt\nzur Karte weitergehen.";
 
-"download_country_ask" = "Download %@?";
+"download_country_ask" = "%@ herunterladen?";
 
-"update_country_ask" = "Update %@?";
+"update_country_ask" = "%@ aktualisieren?";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_proposal" = "You can download the map\nof your current location.";
+"download_location_map_proposal" = "Sie können die Karte von\nihrem aktuellen Ort herunterladen.";
 
 /* REMOVE THIS_STRING AFTER REFACTORING */
-"download_location_update_map_proposal" = "You can update the map\nof your current location.";
+"download_location_update_map_proposal" = "Sie können die Karte von\nihrem aktuellen Ort aktualisieren.";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_up_to_date" = "The map at your current\nlocation (%@) is up-to-date";
+"download_location_map_up_to_date" = "Die Karte von ihrem aktuellen\nOrt (%@) ist aktuell";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
 "pause" = "Pause";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"continue_download" = "Continue";
+"continue_download" = "Fortfahren";
 
-"downloaded_touch_to_update" = "Downloaded (%@), touch to update or delete";
+"downloaded_touch_to_update" = "Heruntergeladen (%@), berühren zum aktualisieren oder löschen";
 
-"update_mb_or_kb" = "Update %@";
+"update_mb_or_kb" = "Aktualisiere %@";
 
-/* Show toast when we have countries without search index */
-"search_update_maps" = "You need to updated maps for search function:";
+/* Show popup notification when we have downloaded countries without search (from Lite version) */
+"search_update_maps" = "Sie benötigen aktualisierte Karten für die Suchfunktion";
 
-/* Show toast on start when we have out-of-date maps */
-"advise_update_maps" = "Update available for these maps:";
+/* Show popup notification on app start when we have out-of-date maps */
+"advise_update_maps" = "Aktualisierung für diese Karten erhältlich:";
 
-/* Show toast in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "You don't need Maps With Me Lite any more, so you can uninstall it.";
+/* Show popup notification in Pro version that Lite can be deleted */
+"suggest_uninstall_lite" = "Sie benötigen MapsWithMe Lite nicht mehr, sie können es deinstallieren.";
 
-/* Show toast when country has downloaded. */
-"download_country_success" = "%@ downloaded successfuly.";
+/* Show popup notification on top of the map when country was downloaded. */
+"download_country_success" = "%@ erfolgreich heruntergeladen";
 
-/* Show toast when country downloading failed. */
-"download_country_failed" = "Downloading of %@ failed.";
+/* Show popup notification on top of the map when country download has failed. */
+"download_country_failed" = "%@ herunterladen fehlgeschlagen";
 
 /* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+"add_new_set" = "Neue Gruppe hinzufügen";
 
 /* Place Page - Add To Bookmarks button */
-"add_to_bookmarks" = "Add To Bookmarks";
+"add_to_bookmarks" = "Zu Lesezeichen hinzufügen";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Bookmark Color";
+"bookmark_color" = "Lesezeichen Farbe";
 
 /* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+"bookmark_set_name" = "Name des Lesezeichens";
 
 /* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+"bookmark_sets" = "";
 
 /* Boormarks - dialog title */
-"bookmarks" = "Bookmarks";
+"bookmarks" = "Lesezeichengruppen";
 
 /* Add bookmark dialog - bookmark color */
-"color" = "Color";
+"color" = "Farbe";
 
 /* Unknown Dropped Pin title, when name can't be determined */
-"dropped_pin" = "Dropped Pin";
+"dropped_pin" = "Gesetzte Stecknadel";
 
 /* Default bookmarks set name */
-"my_places" = "My Places";
+"my_places" = "Meine Orte";
 
 /* Add bookmark dialog - bookmark name */
 "name" = "Name";
 
 /* Add bookmark dialog - bookmark address */
-"address" = "Address";
+"address" = "Adresse";
 
 /* Place Page - Remove Pin button */
-"remove_pin" = "Remove Pin";
+"remove_pin" = "Stecknadel entfernen";
 
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+"set" = "Gruppe";
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index 112523bee0..53fcfda9f3 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -6,11 +6,11 @@
 
 /********** Strings **********/
 
-/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+/* DO NOT TRANSLATE! Used only on Android for special purposes. */
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
-"pro_version_available" = "A paid version of MapsWithMe, featuring search, is available for download. Would you like to get it now?";
+"pro_version_available" = "Navigate easier with the full version of MapsWithMe featuring offline search. Get it now!";
 
 /* About button text (should be short! @todo - fix french) */
 "about" = "About";
@@ -34,9 +34,9 @@
 "do_not_ask_me_again" = "Do not ask me again";
 
 /* Button "do not interrupt download" if user touched actively downloading country */
-"do_nothing" = "Do nothing";
+"do_nothing" = "Continue";
 
-"download_maps" = "Download Maps";
+"download_maps" = "Download maps";
 
 /* Settings/Downloader - Download confirmation button */
 "download_x_kb" = "Download %qu kB";
@@ -111,7 +111,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
-/* Don't show some dialog anymore. */
+/* Don't show some dialog any more */
 "never" = "Never";
 
 /* Leave Review dialog - Complain button (goes to support site) */
@@ -121,7 +121,7 @@
 "search" = "Search";
 
 /* Search button pressed dialog title in the free version */
-"search_available_in_pro_version" = "Search is only available in the Pro version of MapsWithMe. Would you like to get it now?";
+"search_available_in_pro_version" = "Search is only available in the Pro version of MapsWithMe. Get it right now!";
 
 /* Search box placeholder text */
 "search_map" = "Search map";
@@ -184,9 +184,9 @@
 "country_status_download_failed" = "Downloading^\nhas failed";
 
 /* Button text for the button under the country_status_download_failed message */
-"try_again" = "Try Again";
+"try_again" = "Try again";
 
-"app_name" = "Maps With Me";
+"app_name" = "MapsWithMe";
 
 "about_menu_title" = "About MapsWithMe";
 
@@ -246,35 +246,35 @@
 
 "update_mb_or_kb" = "Update %@";
 
-/* Show toast when we have countries without search index */
-"search_update_maps" = "You need to updated maps for search function:";
+/* Show popup notification when we have downloaded countries without search (from Lite version) */
+"search_update_maps" = "You need updated maps for search function:";
 
-/* Show toast on start when we have out-of-date maps */
+/* Show popup notification on app start when we have out-of-date maps */
 "advise_update_maps" = "Update available for these maps:";
 
-/* Show toast in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "You don't need Maps With Me Lite any more, so you can uninstall it.";
+/* Show popup notification in Pro version that Lite can be deleted */
+"suggest_uninstall_lite" = "You don't need MapsWithMe Lite any more, so you can uninstall it.";
 
-/* Show toast when country has downloaded. */
-"download_country_success" = "%@ downloaded successfuly.";
+/* Show popup notification on top of the map when country was downloaded. */
+"download_country_success" = "%@ downloaded successfuly";
 
-/* Show toast when country downloading failed. */
-"download_country_failed" = "Downloading of %@ failed.";
+/* Show popup notification on top of the map when country download has failed. */
+"download_country_failed" = "%@ download has failed";
 
 /* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+"add_new_set" = "Add new set";
 
 /* Place Page - Add To Bookmarks button */
-"add_to_bookmarks" = "Add To Bookmarks";
+"add_to_bookmarks" = "Add to bookmarks";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Bookmark Color";
+"bookmark_color" = "Bookmark color";
 
 /* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+"bookmark_set_name" = "Bookmark set name";
 
 /* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+"bookmark_sets" = "Bookmark sets";
 
 /* Boormarks - dialog title */
 "bookmarks" = "Bookmarks";
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index 5b3c363c5e..2091e5b04b 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -6,11 +6,11 @@
 
 /********** Strings **********/
 
-/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+/* DO NOT TRANSLATE! Used only on Android for special purposes. */
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
-"pro_version_available" = "Salió una nueva versión de pago, ¿quieres descargala ahora?";
+"pro_version_available" = "Mas facil navegar con la version completa MapsWithMe con el buscador offline. Bajalo ya!";
 
 /* About button text (should be short! @todo - fix french) */
 "about" = "Sobre";
@@ -109,9 +109,9 @@
 "remind_me_later" = "Recordar mas tarde";
 
 /* Update maps later/Buy pro version later button text */
-"later" = "Later";
+"later" = "Mas tarde";
 
-/* Don't show some dialog anymore. */
+/* Don't show some dialog any more */
 "never" = "Never";
 
 /* Leave Review dialog - Complain button (goes to support site) */
@@ -172,21 +172,21 @@
 "tourism" = "turismo";
 
 /* Message to display at the center of the screen when the country is added to the downloading queue */
-"country_status_added_to_queue" = "^is added to the\ndownloading queue.";
+"country_status_added_to_queue" = "^añadido a la cola\nde descarga";
 
 /* Message to display at the center of the screen when the country is downloading */
-"country_status_downloading" = "Downloading^ (^%)";
+"country_status_downloading" = "Descarga^ (^%)";
 
 /* Button text for the button at the center of the screen when the country is not downloaded */
-"country_status_download" = "Download^";
+"country_status_download" = "Descargar^";
 
 /* Message to display at the center of the screen when the country download has failed */
-"country_status_download_failed" = "Downloading^\nhas failed";
+"country_status_download_failed" = "Error durante la descarga\n^";
 
 /* Button text for the button under the country_status_download_failed message */
-"try_again" = "Try Again";
+"try_again" = "Inténtelo de nuevo";
 
-"app_name" = "Maps With Me";
+"app_name" = "MapsWithMe";
 
 "about_menu_title" = "Sobre MapsWithMe";
 
@@ -204,98 +204,98 @@
 
 "download" = "Descargar";
 
-"external_storage_is_not_available" = "SD card/USB storage with downloaded maps is not available";
+"external_storage_is_not_available" = "SD tarjeta/USB almacenamiento con los mapas descargados no está disponible";
 
-"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use MapsWithMe";
+"disconnect_usb_cable" = "Por favor, desconecte el cable USB o inserta la tarjeta de memoria para utilizar MapsWithMe";
 
-"not_enough_free_space_on_sdcard" = "Please free some space on SD card/USB storage first in order to use the app";
+"not_enough_free_space_on_sdcard" = "Por favor, primero libere espacio en la SD tarjeta/USB almacenamiento para utilizar la aplicación";
 
-"not_enough_memory" = "Not enough memory to launch app";
+"not_enough_memory" = "No hay suficiente espacio para poner en marcha la aplicación";
 
-"free_space_for_country" = "Please free %1$@ on your device first in order to download %2$@";
+"free_space_for_country" = "Por favor, primero libere %1$@ en tu dispositivo para descargar %2$@";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Program needs to download \n%.1f%@ of mandatory resources.";
+"download_resources" = "El programa necesita descargar \n%.1f%@ de los recursos obligatorios.";
 
-"getting_position" = "Getting current position";
+"getting_position" = "Obtener la posición actual";
 
-"download_resources_continue" = "Go to map";
+"download_resources_continue" = "Ir al mapa";
 
-"downloading_country_can_proceed" = "Downloading %@. You can now\nproceed to the map.";
+"downloading_country_can_proceed" = "Descarga %@. Ahora puede\ncontinuar con el mapa.";
 
-"download_country_ask" = "Download %@?";
+"download_country_ask" = "Descargar %@?";
 
-"update_country_ask" = "Update %@?";
+"update_country_ask" = "Actualizar %@?";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_proposal" = "You can download the map\nof your current location.";
+"download_location_map_proposal" = "Puedes descargar el mapa\nde su ubicación actual";
 
 /* REMOVE THIS_STRING AFTER REFACTORING */
-"download_location_update_map_proposal" = "You can update the map\nof your current location.";
+"download_location_update_map_proposal" = "Puedes actulizar el mapa\nde su ubicación actual";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_up_to_date" = "The map at your current\nlocation (%@) is up-to-date";
+"download_location_map_up_to_date" = "El mapa de su ubicación (%@) actual es actual";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"pause" = "Pause";
+"pause" = "Pausa";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"continue_download" = "Continue";
+"continue_download" = "Continuar";
 
-"downloaded_touch_to_update" = "Downloaded (%@), touch to update or delete";
+"downloaded_touch_to_update" = "Descargado (%@), pulse actualizar o eliminar";
 
-"update_mb_or_kb" = "Update %@";
+"update_mb_or_kb" = "Actualizar %@";
 
-/* Show toast when we have countries without search index */
-"search_update_maps" = "You need to updated maps for search function:";
+/* Show popup notification when we have downloaded countries without search (from Lite version) */
+"search_update_maps" = "Necesita actualizar los mapas para la búsqueda";
 
-/* Show toast on start when we have out-of-date maps */
-"advise_update_maps" = "Update available for these maps:";
+/* Show popup notification on app start when we have out-of-date maps */
+"advise_update_maps" = "Disponible la actualización de estos mapas:";
 
-/* Show toast in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "You don't need Maps With Me Lite any more, so you can uninstall it.";
+/* 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.";
 
-/* Show toast when country has downloaded. */
-"download_country_success" = "%@ downloaded successfuly.";
+/* Show popup notification on top of the map when country was downloaded. */
+"download_country_success" = "%@ descargado con exito";
 
-/* Show toast when country downloading failed. */
-"download_country_failed" = "Downloading of %@ failed.";
+/* Show popup notification on top of the map when country download has failed. */
+"download_country_failed" = "%@ descarga ha fallado";
 
 /* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+"add_new_set" = "";
 
 /* Place Page - Add To Bookmarks button */
-"add_to_bookmarks" = "Add To Bookmarks";
+"add_to_bookmarks" = "";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Bookmark Color";
+"bookmark_color" = "";
 
 /* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+"bookmark_set_name" = "";
 
 /* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+"bookmark_sets" = "";
 
 /* Boormarks - dialog title */
-"bookmarks" = "Bookmarks";
+"bookmarks" = "";
 
 /* Add bookmark dialog - bookmark color */
-"color" = "Color";
+"color" = "";
 
 /* Unknown Dropped Pin title, when name can't be determined */
-"dropped_pin" = "Dropped Pin";
+"dropped_pin" = "";
 
 /* Default bookmarks set name */
-"my_places" = "My Places";
+"my_places" = "";
 
 /* Add bookmark dialog - bookmark name */
-"name" = "Name";
+"name" = "";
 
 /* Add bookmark dialog - bookmark address */
-"address" = "Address";
+"address" = "";
 
 /* Place Page - Remove Pin button */
-"remove_pin" = "Remove Pin";
+"remove_pin" = "";
 
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+"set" = "";
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index 3610fd90c0..60d549006f 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -6,11 +6,11 @@
 
 /********** Strings **********/
 
-/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+/* DO NOT TRANSLATE! Used only on Android for special purposes. */
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
-"pro_version_available" = "La nouvelle version payante de MapsWithMe est accessible. Voulez vous l'installer maintenant?";
+"pro_version_available" = "Plus de possibilités dans la version complète de MapsWithMe avec la recherche en hors ligne. Télécharger maintenant!";
 
 /* About button text (should be short! @todo - fix french) */
 "about" = "Au sujet des cartes";
@@ -109,9 +109,9 @@
 "remind_me_later" = "Rappelez moi plus tard";
 
 /* Update maps later/Buy pro version later button text */
-"later" = "Later";
+"later" = "Plus tard";
 
-/* Don't show some dialog anymore. */
+/* Don't show some dialog any more */
 "never" = "Never";
 
 /* Leave Review dialog - Complain button (goes to support site) */
@@ -172,21 +172,21 @@
 "tourism" = "curiosités";
 
 /* Message to display at the center of the screen when the country is added to the downloading queue */
-"country_status_added_to_queue" = "^is added to the\ndownloading queue.";
+"country_status_added_to_queue" = "^ajouté à son tour\nde télécharger";
 
 /* Message to display at the center of the screen when the country is downloading */
-"country_status_downloading" = "Downloading^ (^%)";
+"country_status_downloading" = "Téléchargement en cours^ (^%)";
 
 /* Button text for the button at the center of the screen when the country is not downloaded */
-"country_status_download" = "Download^";
+"country_status_download" = "Charger^";
 
 /* Message to display at the center of the screen when the country download has failed */
-"country_status_download_failed" = "Downloading^\nhas failed";
+"country_status_download_failed" = "Erreur de téléchargement\n^";
 
 /* Button text for the button under the country_status_download_failed message */
-"try_again" = "Try Again";
+"try_again" = "Essayez encore une fois";
 
-"app_name" = "Maps With Me";
+"app_name" = "MapsWithMe";
 
 "about_menu_title" = "Au sujet des cartes";
 
@@ -204,98 +204,98 @@
 
 "download" = "Télécharger";
 
-"external_storage_is_not_available" = "SD card/USB storage with downloaded maps is not available";
+"external_storage_is_not_available" = "Les cartes téléchargées sont indisponibles";
 
-"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use MapsWithMe";
+"disconnect_usb_cable" = "Débranchez le câble USB ou insérez la carte SD";
 
-"not_enough_free_space_on_sdcard" = "Please free some space on SD card/USB storage first in order to use the app";
+"not_enough_free_space_on_sdcard" = "L'espace disponible sur l'appareil est insuffisant pour l'utilisation du programme";
 
-"not_enough_memory" = "Not enough memory to launch app";
+"not_enough_memory" = "Il ne suffit pas de memoire pour la mise en marche du programme";
 
-"free_space_for_country" = "Please free %1$@ on your device first in order to download %2$@";
+"free_space_for_country" = "Merci de faire  %1$@ de la place disponible pour télécharger %2$@";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Program needs to download \n%.1f%@ of mandatory resources.";
+"download_resources" = "Merci de télécharger \n%.1f%@ de ressources nécessaires pour la mise en marche du programme";
 
-"getting_position" = "Getting current position";
+"getting_position" = "Votre position est déterminé";
 
-"download_resources_continue" = "Go to map";
+"download_resources_continue" = "Passer sur la carte";
 
-"downloading_country_can_proceed" = "Downloading %@. You can now\nproceed to the map.";
+"downloading_country_can_proceed" = "Téléchargement de %@.\nPasser sur la carte";
 
-"download_country_ask" = "Download %@?";
+"download_country_ask" = "Télécharger %@?";
 
-"update_country_ask" = "Update %@?";
+"update_country_ask" = "Renouveler %@?";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_proposal" = "You can download the map\nof your current location.";
+"download_location_map_proposal" = "Vous pouvez télécharger la carte\nde votre position actuelle.";
 
 /* REMOVE THIS_STRING AFTER REFACTORING */
-"download_location_update_map_proposal" = "You can update the map\nof your current location.";
+"download_location_update_map_proposal" = "Vous pouvez renouveler la carte\nde votre position actuelle.";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_up_to_date" = "The map at your current\nlocation (%@) is up-to-date";
+"download_location_map_up_to_date" = "La carte de votre\nposition (%@) est déjà téléchargée";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
 "pause" = "Pause";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"continue_download" = "Continue";
+"continue_download" = "Continuer";
 
-"downloaded_touch_to_update" = "Downloaded (%@), touch to update or delete";
+"downloaded_touch_to_update" = "(%@) est téléchargé, touchez pour renouveler ou effacer";
 
-"update_mb_or_kb" = "Update %@";
+"update_mb_or_kb" = "Renouveler %@";
 
-/* Show toast when we have countries without search index */
-"search_update_maps" = "You need to updated maps for search function:";
+/* Show popup notification when we have downloaded countries without search (from Lite version) */
+"search_update_maps" = "Merci d'effacer les cartes anciennes pour faire fonctionner la recherche";
 
-/* Show toast on start when we have out-of-date maps */
-"advise_update_maps" = "Update available for these maps:";
+/* Show popup notification on app start when we have out-of-date maps */
+"advise_update_maps" = "Le renouvellement est disponible pour les cartes suivantes:";
 
-/* Show toast in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "You don't need Maps With Me Lite any more, so you can uninstall it.";
+/* Show popup notification in Pro version that Lite can be deleted */
+"suggest_uninstall_lite" = "Vous n'avez plus besoin de MapsWithMe Lite. Merci de l'effacer";
 
-/* Show toast when country has downloaded. */
-"download_country_success" = "%@ downloaded successfuly.";
+/* Show popup notification on top of the map when country was downloaded. */
+"download_country_success" = "Téléchargement de %@ est accompli avec succès";
 
-/* Show toast when country downloading failed. */
-"download_country_failed" = "Downloading of %@ failed.";
+/* Show popup notification on top of the map when country download has failed. */
+"download_country_failed" = "Erreur de téléchargement de %@";
 
 /* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+"add_new_set" = "Ajouter une groupe";
 
 /* Place Page - Add To Bookmarks button */
-"add_to_bookmarks" = "Add To Bookmarks";
+"add_to_bookmarks" = "Ajouter dans les signets";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Bookmark Color";
+"bookmark_color" = "Couleur du signet";
 
 /* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+"bookmark_set_name" = "Nom de la groupe";
 
 /* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+"bookmark_sets" = "Groupes de signets";
 
 /* Boormarks - dialog title */
-"bookmarks" = "Bookmarks";
+"bookmarks" = "Signets";
 
 /* Add bookmark dialog - bookmark color */
-"color" = "Color";
+"color" = "Couleur";
 
 /* Unknown Dropped Pin title, when name can't be determined */
-"dropped_pin" = "Dropped Pin";
+"dropped_pin" = "L'épingle déplacée";
 
 /* Default bookmarks set name */
-"my_places" = "My Places";
+"my_places" = "Mes signets";
 
 /* Add bookmark dialog - bookmark name */
-"name" = "Name";
+"name" = "Nom";
 
 /* Add bookmark dialog - bookmark address */
-"address" = "Address";
+"address" = "Adresse";
 
 /* Place Page - Remove Pin button */
-"remove_pin" = "Remove Pin";
+"remove_pin" = "Effacer l'épingle";
 
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+"set" = "Groupe";
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index c8f8ce5c32..431dbaeb3b 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -6,11 +6,11 @@
 
 /********** Strings **********/
 
-/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+/* DO NOT TRANSLATE! Used only on Android for special purposes. */
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
-"pro_version_available" = "A paid version of MapsWithMe, featuring search, is available for download. Would you like to get it now?";
+"pro_version_available" = "Navigate easier with the full version of MapsWithMe featuring offline search. Get it now!";
 
 /* About button text (should be short! @todo - fix french) */
 "about" = "About";
@@ -34,9 +34,9 @@
 "do_not_ask_me_again" = "Do not ask me again";
 
 /* Button "do not interrupt download" if user touched actively downloading country */
-"do_nothing" = "Do nothing";
+"do_nothing" = "Continue";
 
-"download_maps" = "Download Maps";
+"download_maps" = "Download maps";
 
 /* Settings/Downloader - Download confirmation button */
 "download_x_kb" = "Download %qu kB";
@@ -111,7 +111,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
-/* Don't show some dialog anymore. */
+/* Don't show some dialog any more */
 "never" = "Never";
 
 /* Leave Review dialog - Complain button (goes to support site) */
@@ -121,7 +121,7 @@
 "search" = "Search";
 
 /* Search button pressed dialog title in the free version */
-"search_available_in_pro_version" = "Search is only available in the Pro version of MapsWithMe. Would you like to get it now?";
+"search_available_in_pro_version" = "Search is only available in the Pro version of MapsWithMe. Get it right now!";
 
 /* Search box placeholder text */
 "search_map" = "Search map";
@@ -184,9 +184,9 @@
 "country_status_download_failed" = "Downloading^\nhas failed";
 
 /* Button text for the button under the country_status_download_failed message */
-"try_again" = "Try Again";
+"try_again" = "Try again";
 
-"app_name" = "Maps With Me";
+"app_name" = "MapsWithMe";
 
 "about_menu_title" = "About MapsWithMe";
 
@@ -246,35 +246,35 @@
 
 "update_mb_or_kb" = "Update %@";
 
-/* Show toast when we have countries without search index */
-"search_update_maps" = "You need to updated maps for search function:";
+/* Show popup notification when we have downloaded countries without search (from Lite version) */
+"search_update_maps" = "You need updated maps for search function:";
 
-/* Show toast on start when we have out-of-date maps */
+/* Show popup notification on app start when we have out-of-date maps */
 "advise_update_maps" = "Update available for these maps:";
 
-/* Show toast in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "You don't need Maps With Me Lite any more, so you can uninstall it.";
+/* Show popup notification in Pro version that Lite can be deleted */
+"suggest_uninstall_lite" = "You don't need MapsWithMe Lite any more, so you can uninstall it.";
 
-/* Show toast when country has downloaded. */
-"download_country_success" = "%@ downloaded successfuly.";
+/* Show popup notification on top of the map when country was downloaded. */
+"download_country_success" = "%@ downloaded successfuly";
 
-/* Show toast when country downloading failed. */
-"download_country_failed" = "Downloading of %@ failed.";
+/* Show popup notification on top of the map when country download has failed. */
+"download_country_failed" = "%@ download has failed";
 
 /* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+"add_new_set" = "Add new set";
 
 /* Place Page - Add To Bookmarks button */
-"add_to_bookmarks" = "Add To Bookmarks";
+"add_to_bookmarks" = "Add to bookmarks";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Bookmark Color";
+"bookmark_color" = "Bookmark color";
 
 /* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+"bookmark_set_name" = "Bookmark set name";
 
 /* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+"bookmark_sets" = "Bookmark sets";
 
 /* Boormarks - dialog title */
 "bookmarks" = "Bookmarks";
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index 965aea9954..876d81789e 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -6,7 +6,7 @@
 
 /********** Strings **********/
 
-/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+/* DO NOT TRANSLATE! Used only on Android for special purposes. */
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
@@ -109,9 +109,9 @@
 "remind_me_later" = "後でリマインド";
 
 /* Update maps later/Buy pro version later button text */
-"later" = "Later";
+"later" = "後で";
 
-/* Don't show some dialog anymore. */
+/* Don't show some dialog any more */
 "never" = "Never";
 
 /* Leave Review dialog - Complain button (goes to support site) */
@@ -172,130 +172,130 @@
 "tourism" = "観光";
 
 /* Message to display at the center of the screen when the country is added to the downloading queue */
-"country_status_added_to_queue" = "^is added to the\ndownloading queue.";
+"country_status_added_to_queue" = "^をダウンロードキューに\n追加しました";
 
 /* Message to display at the center of the screen when the country is downloading */
-"country_status_downloading" = "Downloading^ (^%)";
+"country_status_downloading" = "ダウンロード中^ (^%)";
 
 /* Button text for the button at the center of the screen when the country is not downloaded */
-"country_status_download" = "Download^";
+"country_status_download" = "ダウンロード^";
 
 /* Message to display at the center of the screen when the country download has failed */
-"country_status_download_failed" = "Downloading^\nhas failed";
+"country_status_download_failed" = "ダウンロードに失敗しました\n^";
 
 /* Button text for the button under the country_status_download_failed message */
-"try_again" = "Try Again";
+"try_again" = "再実行";
 
-"app_name" = "Maps With Me";
+"app_name" = "MapsWithMe";
 
-"about_menu_title" = "About MapsWithMe";
+"about_menu_title" = "情報";
 
-"downloading_touch_to_cancel" = "Downloading %d%%, touch to cancel";
+"downloading_touch_to_cancel" = "%d%%をダウンロード中です。キャンセルするにはタッチして下さい。";
 
-"downloaded_touch_to_delete" = "Downloaded (%@), touch to delete";
+"downloaded_touch_to_delete" = "(%@)をダウンロードしました。削除するにはタッチして下さい。";
 
-"connection_settings" = "Connection Settings";
+"connection_settings" = "接続設定";
 
-"download_mb_or_kb" = "Download %@";
+"download_mb_or_kb" = "%@をダウンロード";
 
-"close" = "Close";
+"close" = "閉じる";
 
-"unsupported_phone" = "A hardware accelerated OpenGL is required. Unfortunately, your device is not supported.";
+"unsupported_phone" = "ハードウェアアクセラレーションされたOpenGLが必要です。残念ながらご使用のデバイスはサポートされていません。";
 
-"download" = "Download";
+"download" = "ダウンロード";
 
-"external_storage_is_not_available" = "SD card/USB storage with downloaded maps is not available";
+"external_storage_is_not_available" = "ダウンロード済みの地図はSDカード／USBストレージに保存する事はできません";
 
-"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use MapsWithMe";
+"disconnect_usb_cable" = "USBケーブルを抜くかMapsWithMeに使うメモリーカードを挿入してください";
 
-"not_enough_free_space_on_sdcard" = "Please free some space on SD card/USB storage first in order to use the app";
+"not_enough_free_space_on_sdcard" = "アプリを起動する前にSDカード/USBストレージの空き容量を増やしてください";
 
-"not_enough_memory" = "Not enough memory to launch app";
+"not_enough_memory" = "メモリ不足です。アプリを起動できません";
 
-"free_space_for_country" = "Please free %1$@ on your device first in order to download %2$@";
+"free_space_for_country" = "デバイス上で%1$@解放することで%2$@ダウンロードすることができます";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Program needs to download \n%.1f%@ of mandatory resources.";
+"download_resources" = "アプリは\n%.1f%@分の必須リソースをダウンロードする必要があります";
 
-"getting_position" = "Getting current position";
+"getting_position" = "現在地を取得中";
 
-"download_resources_continue" = "Go to map";
+"download_resources_continue" = "地図に移動";
 
-"downloading_country_can_proceed" = "Downloading %@. You can now\nproceed to the map.";
+"downloading_country_can_proceed" = "%@をダウンロード中\n地図に移動できます";
 
-"download_country_ask" = "Download %@?";
+"download_country_ask" = "%@をダウンロードしますか？";
 
-"update_country_ask" = "Update %@?";
+"update_country_ask" = "%@を更新しますか？";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_proposal" = "You can download the map\nof your current location.";
+"download_location_map_proposal" = "現在地の地図を\nダウンロードできます";
 
 /* REMOVE THIS_STRING AFTER REFACTORING */
-"download_location_update_map_proposal" = "You can update the map\nof your current location.";
+"download_location_update_map_proposal" = "現在地の地図を\n更新できます";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_up_to_date" = "The map at your current\nlocation (%@) is up-to-date";
+"download_location_map_up_to_date" = "現在地の地図は\n最新です (%@)";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"pause" = "Pause";
+"pause" = "一時停止";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"continue_download" = "Continue";
+"continue_download" = "続行";
 
-"downloaded_touch_to_update" = "Downloaded (%@), touch to update or delete";
+"downloaded_touch_to_update" = "(%@)をダウンロードしました。タップして更新、削除できます";
 
-"update_mb_or_kb" = "Update %@";
+"update_mb_or_kb" = "%@を更新";
 
-/* Show toast when we have countries without search index */
-"search_update_maps" = "You need to updated maps for search function:";
+/* Show popup notification when we have downloaded countries without search (from Lite version) */
+"search_update_maps" = "検索機能を利用するには地図を更新する必要があります";
 
-/* Show toast on start when we have out-of-date maps */
-"advise_update_maps" = "Update available for these maps:";
+/* Show popup notification on app start when we have out-of-date maps */
+"advise_update_maps" = "こちらの地図が更新できます：";
 
-/* Show toast in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "You don't need Maps With Me Lite any more, so you can uninstall it.";
+/* Show popup notification in Pro version that Lite can be deleted */
+"suggest_uninstall_lite" = "MapsWithMe Liteはもう必要ありませんので削除してもかまいません";
 
-/* Show toast when country has downloaded. */
-"download_country_success" = "%@ downloaded successfuly.";
+/* Show popup notification on top of the map when country was downloaded. */
+"download_country_success" = "%@のダウンロードが成功しました";
 
-/* Show toast when country downloading failed. */
-"download_country_failed" = "Downloading of %@ failed.";
+/* Show popup notification on top of the map when country download has failed. */
+"download_country_failed" = "%@のダウンロードが失敗しました";
 
 /* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+"add_new_set" = "新しいセットを追加";
 
 /* Place Page - Add To Bookmarks button */
-"add_to_bookmarks" = "Add To Bookmarks";
+"add_to_bookmarks" = "ブックマークに追加";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Bookmark Color";
+"bookmark_color" = "ブックマークの色";
 
 /* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+"bookmark_set_name" = "ブックマークセット名";
 
 /* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+"bookmark_sets" = "ブックマークセット";
 
 /* Boormarks - dialog title */
-"bookmarks" = "Bookmarks";
+"bookmarks" = "ブックマーク";
 
 /* Add bookmark dialog - bookmark color */
-"color" = "Color";
+"color" = "色";
 
 /* Unknown Dropped Pin title, when name can't be determined */
-"dropped_pin" = "Dropped Pin";
+"dropped_pin" = "ドロップされたピン";
 
 /* Default bookmarks set name */
-"my_places" = "My Places";
+"my_places" = "マイロケーション";
 
 /* Add bookmark dialog - bookmark name */
-"name" = "Name";
+"name" = "場所名";
 
 /* Add bookmark dialog - bookmark address */
-"address" = "Address";
+"address" = "住所";
 
 /* Place Page - Remove Pin button */
-"remove_pin" = "Remove Pin";
+"remove_pin" = "ピンを削除";
 
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+"set" = "セット";
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index 3943ad54c1..c9d58d172e 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -6,7 +6,7 @@
 
 /********** Strings **********/
 
-/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+/* DO NOT TRANSLATE! Used only on Android for special purposes. */
 "shared_user_label" = "Maps With Me";
 
 /* Dialog text when paid version become available on the market. Showed only once. */
@@ -109,9 +109,9 @@
 "remind_me_later" = "이후에 기억시키기";
 
 /* Update maps later/Buy pro version later button text */
-"later" = "Later";
+"later" = "후";
 
-/* Don't show some dialog anymore. */
+/* Don't show some dialog any more */
 "never" = "Never";
 
 /* Leave Review dialog - Complain button (goes to support site) */
@@ -172,130 +172,130 @@
 "tourism" = "관광";
 
 /* Message to display at the center of the screen when the country is added to the downloading queue */
-"country_status_added_to_queue" = "^is added to the\ndownloading queue.";
+"country_status_added_to_queue" = "^는 다운로드 대기열에\n추가됩니다.";
 
 /* Message to display at the center of the screen when the country is downloading */
-"country_status_downloading" = "Downloading^ (^%)";
+"country_status_downloading" = "다운로드 중^ (^%)";
 
 /* Button text for the button at the center of the screen when the country is not downloaded */
-"country_status_download" = "Download^";
+"country_status_download" = "다운로드^";
 
 /* Message to display at the center of the screen when the country download has failed */
-"country_status_download_failed" = "Downloading^\nhas failed";
+"country_status_download_failed" = "다운로드에 실패하였습니다\n^";
 
 /* Button text for the button under the country_status_download_failed message */
-"try_again" = "Try Again";
+"try_again" = "다시 시도";
 
-"app_name" = "Maps With Me";
+"app_name" = "MapsWithMe";
 
-"about_menu_title" = "About MapsWithMe";
+"about_menu_title" = "소개";
 
-"downloading_touch_to_cancel" = "Downloading %d%%, touch to cancel";
+"downloading_touch_to_cancel" = "%d%%를 다운로드 중, 두드려 취소하십시요";
 
-"downloaded_touch_to_delete" = "Downloaded (%@), touch to delete";
+"downloaded_touch_to_delete" = "(%@)가 다운로드 되었습니다, 두드려 삭제하십시요.";
 
-"connection_settings" = "Connection Settings";
+"connection_settings" = "연결 설정";
 
-"download_mb_or_kb" = "Download %@";
+"download_mb_or_kb" = "%@ 다운로드하기";
 
-"close" = "Close";
+"close" = "닫기";
 
-"unsupported_phone" = "A hardware accelerated OpenGL is required. Unfortunately, your device is not supported.";
+"unsupported_phone" = "하드웨어 촉진 OpenGL이 요구됩니다. 애석하게도 귀하의 장치는 지원되지 않습니다.";
 
-"download" = "Download";
+"download" = "다운로드";
 
-"external_storage_is_not_available" = "SD card/USB storage with downloaded maps is not available";
+"external_storage_is_not_available" = "다운로드된지도와 SD 카드 / USB 저장 장치를 사용할 수 없습니다";
 
-"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use MapsWithMe";
+"disconnect_usb_cable" = "MapsWithMe를 사용하려면 USB 케이블이나 삽입 메모리 카드를 분리하십시오";
 
-"not_enough_free_space_on_sdcard" = "Please free some space on SD card/USB storage first in order to use the app";
+"not_enough_free_space_on_sdcard" = "응용 프로그램을 사용하기 위해서는 첫째 SD 카드 / USB 저장 장치에 여유 공간을 확보하십시오";
 
-"not_enough_memory" = "Not enough memory to launch app";
+"not_enough_memory" = "응용 프로그램을 실행하기위한 메모리가 충분하지 않다";
 
-"free_space_for_country" = "Please free %1$@ on your device first in order to download %2$@";
+"free_space_for_country" = "%2$@를 다운로드하기 위해서는 먼저 장치에서 무료로 %1$@를주세요";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_resources" = "Program needs to download \n%.1f%@ of mandatory resources.";
+"download_resources" = "프로그램은 필수 자원의 \n%.1f%@ 를 다운로드해야합니다.";
 
-"getting_position" = "Getting current position";
+"getting_position" = "현재 위치 얻기";
 
-"download_resources_continue" = "Go to map";
+"download_resources_continue" = "지도로 이동";
 
-"downloading_country_can_proceed" = "Downloading %@. You can now\nproceed to the map.";
+"downloading_country_can_proceed" = "%@다운로드. 이제지도를 진행할 수 있습니다.";
 
-"download_country_ask" = "Download %@?";
+"download_country_ask" = "%@다운로드?";
 
-"update_country_ask" = "Update %@?";
+"update_country_ask" = "%@업데이트?";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_proposal" = "You can download the map\nof your current location.";
+"download_location_map_proposal" = "당신의 현재 위치의지도를 다운로드할 수 있습니다.";
 
 /* REMOVE THIS_STRING AFTER REFACTORING */
-"download_location_update_map_proposal" = "You can update the map\nof your current location.";
+"download_location_update_map_proposal" = "귀하의 현재 위치의지도를 업데이트할 수 있습니다.";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"download_location_map_up_to_date" = "The map at your current\nlocation (%@) is up-to-date";
+"download_location_map_up_to_date" = "현재 위치 (%@)\n에서지도는 최신이다";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"pause" = "Pause";
+"pause" = "중지";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"continue_download" = "Continue";
+"continue_download" = "계속";
 
-"downloaded_touch_to_update" = "Downloaded (%@), touch to update or delete";
+"downloaded_touch_to_update" = "다운로드 (%@), 터치를 업데이 트하거나 삭제하는 방법";
 
-"update_mb_or_kb" = "Update %@";
+"update_mb_or_kb" = "%@업데이트";
 
-/* Show toast when we have countries without search index */
-"search_update_maps" = "You need to updated maps for search function:";
+/* Show popup notification when we have downloaded countries without search (from Lite version) */
+"search_update_maps" = "당신은 검색 기능에 대한 업데이트된지도 필요";
 
-/* Show toast on start when we have out-of-date maps */
-"advise_update_maps" = "Update available for these maps:";
+/* Show popup notification on app start when we have out-of-date maps */
+"advise_update_maps" = "이지도에 사용할 수있는 업데이트 :";
 
-/* Show toast in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "You don't need Maps With Me Lite any more, so you can uninstall it.";
+/* Show popup notification in Pro version that Lite can be deleted */
+"suggest_uninstall_lite" = "당신은 더 이상 MapsWithMe 라이트는 필요 없어, 당신은 그것을 제거할 수 있습니다.";
 
-/* Show toast when country has downloaded. */
-"download_country_success" = "%@ downloaded successfuly.";
+/* Show popup notification on top of the map when country was downloaded. */
+"download_country_success" = "%@이 성공적으로 다운로드";
 
-/* Show toast when country downloading failed. */
-"download_country_failed" = "Downloading of %@ failed.";
+/* Show popup notification on top of the map when country download has failed. */
+"download_country_failed" = "%@다운로드가 실패했습니다";
 
 /* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+"add_new_set" = "새로운 세트 추가";
 
 /* Place Page - Add To Bookmarks button */
-"add_to_bookmarks" = "Add To Bookmarks";
+"add_to_bookmarks" = "즐겨찾기에 추가";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Bookmark Color";
+"bookmark_color" = "색상 즐겨찾기에 추가";
 
 /* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+"bookmark_set_name" = "집합 이름을 즐겨찾기에 추가";
 
 /* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+"bookmark_sets" = "세트를 즐겨찾기에 추가";
 
 /* Boormarks - dialog title */
-"bookmarks" = "Bookmarks";
+"bookmarks" = "북마크";
 
 /* Add bookmark dialog - bookmark color */
-"color" = "Color";
+"color" = "";
 
 /* Unknown Dropped Pin title, when name can't be determined */
-"dropped_pin" = "Dropped Pin";
+"dropped_pin" = "";
 
 /* Default bookmarks set name */
-"my_places" = "My Places";
+"my_places" = "";
 
 /* Add bookmark dialog - bookmark name */
-"name" = "Name";
+"name" = "";
 
 /* Add bookmark dialog - bookmark address */
-"address" = "Address";
+"address" = "";
 
 /* Place Page - Remove Pin button */
-"remove_pin" = "Remove Pin";
+"remove_pin" = "";
 
 /* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+"set" = "";
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index 77d1796a7c..af028bea69 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -6,11 +6,11 @@
 
 /********** Strings **********/
 
-/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+/* DO NOT TRANSLATE! Used only on Android for special purposes. */
 "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" = "О картах";
@@ -45,7 +45,7 @@
 "download_x_mb" = "Загрузить %qu МБ";
 
 /* Settings/Downloader - info for country when download fails */
-"download_has_failed" = "Ошибка загрузки. Нажмите, чтобы повоторить попытку";
+"download_has_failed" = "Ошибка загрузки. Нажмите, чтобы повторить попытку";
 
 /* Settings/Downloader - info for downloaded country */
 "downloaded_x_y_touch_to_delete" = "Загружено (%1$qu %2$@), нажмите для удаления";
@@ -89,10 +89,10 @@
 "miles" = "Мили";
 
 /* View and button titles for accessibility */
-"my_position" = "Моё местоположение";
+"my_position" = "Мое местоположение";
 
 /* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Отсутствует подключение к Интернету";
+"no_internet_connection_detected" = "Отсутствует подключение к интернету";
 
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Нет WiFi соединения. Вы хотите скачать %@ через сотового оператора (GPRS, EDGE или 3G)?";
@@ -111,7 +111,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Не сейчас";
 
-/* Don't show some dialog anymore. */
+/* Don't show some dialog any more */
 "never" = "Не показывать";
 
 /* Leave Review dialog - Complain button (goes to support site) */
@@ -121,7 +121,7 @@
 "search" = "Поиск";
 
 /* Search button pressed dialog title in the free version */
-"search_available_in_pro_version" = "Поиск доступен только в Pro версии MapsWithMe. Установить ее прямо сейчас?";
+"search_available_in_pro_version" = "Поиск доступен только в Pro версии MapsWithMe. Установите ее прямо сейчас!";
 
 /* Search box placeholder text */
 "search_map" = "Поиск на карте";
@@ -181,12 +181,12 @@
 "country_status_download" = "Загрузить^";
 
 /* Message to display at the center of the screen when the country download has failed */
-"country_status_download_failed" = "Ошибка загрузки^.";
+"country_status_download_failed" = "Ошибка загрузки\n^";
 
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Попробуйте еще раз";
 
-"app_name" = "Maps With Me";
+"app_name" = "MapsWithMe";
 
 "about_menu_title" = "О программе";
 
@@ -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" = "Получаем местоположение";
 
@@ -246,20 +246,20 @@
 
 "update_mb_or_kb" = "Обновить %@";
 
-/* Show toast when we have countries without search index */
+/* Show popup notification when we have downloaded countries without search (from Lite version) */
 "search_update_maps" = "Для функции поиска необходимо обновить устаревшие карты:";
 
-/* Show toast on start when we have out-of-date maps */
+/* Show popup notification on app start when we have out-of-date maps */
 "advise_update_maps" = "Доступно обновление для следующих карт:";
 
-/* Show toast in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Maps With Me Lite больше не нужна. Рекомендуем ее удалить.";
+/* Show popup notification in Pro version that Lite can be deleted */
+"suggest_uninstall_lite" = "MapsWithMe Lite больше не нужна. Рекомендуем ее удалить.";
 
-/* Show toast when country has downloaded. */
-"download_country_success" = "%@ успешно загружена.";
+/* Show popup notification on top of the map when country was downloaded. */
+"download_country_success" = "%@ успешно загружена";
 
-/* Show toast when country downloading failed. */
-"download_country_failed" = "Загрузка %@ провалилась.";
+/* Show popup notification on top of the map when country download has failed. */
+"download_country_failed" = "Не удалось загрузить %@";
 
 /* Add New Bookmark Set dialog title */
 "add_new_set" = "Добавить группу";
diff --git a/strings.txt b/strings.txt
index 78ba87266d..2d2bbccb65 100644
--- a/strings.txt
+++ b/strings.txt
@@ -1,17 +1,18 @@
 [[Strings]]
 	[shared_user_label]
 		en = Maps With Me
-		comment = Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere.
+		tags = android
+		comment = DO NOT TRANSLATE! Used only on Android for special purposes.
 	[pro_version_available]
-		en = A paid version of MapsWithMe, featuring search, is available for download. Would you like to get it now?
+		en = Navigate easier with the full version of MapsWithMe featuring offline search. Get it now!
 		comment = Dialog text when paid version become available on the market. Showed only once.
-		de = Die neue kostenpflichtige Version von MapsWithMe mit Suchfunktion ist erhältlich. Möchten Sie sie jetzt herunterladen?
-		es = Salió una nueva versión de pago, ¿quieres descargala ahora?
-		fr = La nouvelle version payante de MapsWithMe est accessible. Voulez vous l'installer maintenant?
+		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 с поиском. Хотите установить её прямо сейчас?
-		cs = Placená verze aplikace MapsWithMe, obsahující vyhledávání, je dostupná ke stažení. Chceš ji teď stáhnout?
+		ru = Больше возможностей в полной версии MapsWithMe с оффлайн поиском. Установите ее сейчас!
+		cs = Více možností s plnou verzí MapsWithMe zahrnující hledání offline. Instalujte si ji teď!
 	[about]
 		en = About
 		comment = About button text (should be short! @todo - fix french)
@@ -83,7 +84,7 @@
 		ru = Больше не спрашивать
 		cs = Vícekrát nezobrazovat
 	[do_nothing]
-		en = Do nothing
+		en = Continue
 		comment = Button "do not interrupt download" if user touched actively downloading country
 		de = Download fortsetzen
 		es = Seguir descarga
@@ -93,7 +94,7 @@
 		ru = Продолжить загрузку
 		cs = Nic neprovádět
 	[download_maps]
-		en = Download Maps
+		en = Download maps
 		de = Landkarten herunterladen
 		es = Descargar mapas
 		fr = Télécharger les cartes
@@ -129,7 +130,7 @@
 		fr = Erreur de téléchargement. Merci de recommencer.
 		ja = ダウンロードに失敗しました。もう一度試すにはタッチして下さい。
 		ko = 다운로드에 실패하였습니다. 다시 두드려 시도하여 주십시요.
-		ru = Ошибка загрузки. Нажмите, чтобы повоторить попытку
+		ru = Ошибка загрузки. Нажмите, чтобы повторить попытку
 		cs = Stahování selhalo, zkus to znovu.
 	[downloaded_x_y_touch_to_delete]
 		en = Downloaded (%1$qu %2$@), touch to delete
@@ -259,7 +260,7 @@
 		fr = Ma position
 		ja = 現在地
 		ko = 나의 위치
-		ru = Моё местоположение
+		ru = Мое местоположение
 		cs = Moje poloha
 	[no_internet_connection_detected]
 		en = No Internet connection detected
@@ -269,7 +270,7 @@
 		fr = Pas de branchement internet
 		ja = インターネット接続が見つかりません
 		ko = 인터넷이 연결되지 않았습니다.
-		ru = Отсутствует подключение к Интернету
+		ru = Отсутствует подключение к интернету
 		cs = Nenalezeno připojení k Internetu
 	[no_wifi_ask_cellular_download]
 		en = No WiFi connection detected. Would you like to use cellular data (GPRS, EDGE or 3G) to download %@?
@@ -316,11 +317,16 @@
 	[later]
 		en = Later
 		comment = Update maps later/Buy pro version later button text
+		de = Später
+		es = Mas tarde
+		fr = Plus tard
+		ja = 後で
+		ko = 후
 		ru = Не сейчас
 		cs = Později
 	[never]
 		en = Never
-		comment = Don't show some dialog anymore.
+		comment = Don't show some dialog any more
 		ru = Не показывать
 	[report_an_issue]
 		en = Report an issue
@@ -343,14 +349,14 @@
 		ru = Поиск
 		cs = Hledat
 	[search_available_in_pro_version]
-		en = Search is only available in the Pro version of MapsWithMe. Would you like to get it now?
+		en = Search is only available in the Pro version of MapsWithMe. Get it right now!
 		comment = Search button pressed dialog title in the free version
 		de = Die Suche ist nur in der Pro Version vorhanden. Möchten Sie sie jetzt installieren?
 		es = Busca esta accesible solo en versión MapWithMe Pro. ¿Instalar ahora mismo?
 		fr = Seule la version Pro permet une recherche. Voulez-vous l'installer maintenant?
 		ja = サーチ機能はMapsWithMeのプロ版でのみご使用頂けます。今すぐご入手になりますか？
 		ko = 검색은 MapsWithMe의 프로 버젼에만 제공됩니다. 지금 받으시겠습니까?
-		ru = Поиск доступен только в Pro версии MapsWithMe. Установить ее прямо сейчас?
+		ru = Поиск доступен только в Pro версии MapsWithMe. Установите ее прямо сейчас!
 		cs = Vyhledávání je dostupné jen v placené verzi MapsWithMe. Chceš ji teď stáhnout?
 	[search_map]
 		en = Search map
@@ -518,35 +524,64 @@
 	[country_status_added_to_queue]
 		en = ^is added to the\ndownloading queue.
 		comment = Message to display at the center of the screen when the country is added to the downloading queue
+		de = ^wird zur\nDownload-Warteschleife hinzugefügt
+		es = ^añadido a la cola\nde descarga
+		fr = ^ajouté à son tour\nde télécharger
+		ja = ^をダウンロードキューに\n追加しました
+		ko = ^는 다운로드 대기열에\n추가됩니다.
 		ru = ^добавлено в очередь\nзагрузки.
-		cs = ^přidáno do \nfronty stahování.
+		cs = ^přidáno do\nfronty stahování.
 	[country_status_downloading]
 		en = Downloading^ (^%)
 		comment = Message to display at the center of the screen when the country is downloading
+		de = Wird heruntergeladen^ (^%)
+		es = Descarga^ (^%)
+		fr = Téléchargement en cours^ (^%)
+		ja = ダウンロード中^ (^%)
+		ko = 다운로드 중^ (^%)
+		ru = Загружается^ (^%)
+		cs = Stahování^ (^%)
 		ru = Загружается^ (^%)
 		cs = Stahuji^ (^%)
 	[country_status_download]
 		en = Download^
 		comment = Button text for the button at the center of the screen when the country is not downloaded
+    de = Herunterladen^
+    es = Descargar^
+    fr = Charger^
+		ja = ダウンロード^
+		ko = 다운로드^
 		ru = Загрузить^
 		cs = Stáhnout^
 	[country_status_download_failed]
 		en = Downloading^\nhas failed
 		comment = Message to display at the center of the screen when the country download has failed
-		ru = Ошибка загрузки^.
+		de = Download^\nfehlgeschlagen
+		es = Error durante la descarga\n^
+		fr = Erreur de téléchargement\n^
+		ja = ダウンロードに失敗しました\n^
+		ko = 다운로드에 실패하였습니다\n^
+		ru = Ошибка загрузки\n^
 		cs = Stahování^\nselhalo
 	[try_again]
-		en = Try Again
+		en = Try again
 		comment = Button text for the button under the country_status_download_failed message
+		de = Nochmals versuchen
+		es = Inténtelo de nuevo
+		fr = Essayez encore une fois
+		ja = 再実行
+		ko = 다시 시도
 		ru = Попробуйте еще раз
 		cs = Opakuj akci
 	[app_name]
-		en = Maps With Me
+		en = MapsWithMe
 	[about_menu_title]
 		en = About MapsWithMe
 		de = Über MapsWithMe
 		es = Sobre MapsWithMe
 		fr = Au sujet des cartes
+		ja = 情報
+		ko = 소개
 		ru = О программе
 		cs = O aplikaci MapsWithMe
 	[downloading_touch_to_cancel]
@@ -554,6 +589,8 @@
 		de = Heruntergeladen %d%%. Berühren, um abzubrechen
 		es = Descarga %d%%, apreté para cancelar
 		fr = Chargement en cours %d%%, toucher pour annuler
+		ja = %d%%をダウンロード中です。キャンセルするにはタッチして下さい。
+		ko =%d%%를 다운로드 중, 두드려 취소하십시요
 		ru = Загружается %d%%, нажмите, чтобы прервать
 		cs = Stahování %d%%, klepni pro zrušení
 	[downloaded_touch_to_delete]
@@ -561,6 +598,8 @@
 		de = Heruntergeladen (%@). Berühren, um zu löschen
 		es = Descargado (%@), apreté para eliminar
 		fr = Elle est chargée (%@), Appuyer pour effacer
+		ja = (%@)をダウンロードしました。削除するにはタッチして下さい。
+		ko = (%@)가 다운로드 되었습니다, 두드려 삭제하십시요.
 		ru = Загружено (%@), нажмите для удаления
 		cs = Staženo (%@), klepni pro smazání
 	[connection_settings]
@@ -568,6 +607,8 @@
 		de = Verbindungseinstellungen
 		es = Ajustes de conexión
 		fr = Paramètres de connexion
+		ja = 接続設定
+		ko = 연결 설정
 		ru = Настройки подключения
 		cs = Nastavení připojení
 	[download_mb_or_kb]
@@ -575,6 +616,8 @@
 		de = Herunterladen %@
 		es = Descargar %@
 		fr = Charger %@
+		ja = %@をダウンロード
+		ko = %@ 다운로드하기
 		ru = Загрузить %@
 		cs = Stáhnout %@
 	[close]
@@ -582,6 +625,8 @@
 		de = Schließen
 		es = Cerrar
 		fr = Fermer
+		ja = 閉じる
+		ko = 닫기
 		ru = Закрыть
 		cs = Zavřít
 	[unsupported_phone]
@@ -589,6 +634,8 @@
 		de = Das Programm braucht OpenGL um funktionnieren zu können. Leider wird ihr Gerät nicht unterschtüzt.
 		es = Un hardware aceleró OpenGL se requiere. Desgraciadamente, el dispositivo móvil no es compatible.
 		fr = Le programme a besoin d`OpenGL pour travailler. Votre appareil n`est pas appuyé maleuresement.
+		ja = ハードウェアアクセラレーションされたOpenGLが必要です。残念ながらご使用のデバイスはサポートされていません。
+		ko = 하드웨어 촉진 OpenGL이 요구됩니다. 애석하게도 귀하의 장치는 지원되지 않습니다.
 		ru = Для работы приложения необходим аппаратно ускоренный OpenGL. К сожалению, ваше устройство не поддерживается.
 		cs = Je vyžadována hardwarová akcelerace OpenGL. Bohužel, tvé zařízení není podporováno.
 	[download]
@@ -596,174 +643,373 @@
 		de = Herunterladen
 		es = Descargar
 		fr = Télécharger
+		ja = ダウンロード
+		ko = 다운로드
 		ru = Загрузить
 		cs = Stáhnout
 	[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
+		fr = Les cartes téléchargées sont indisponibles
+		ja = ダウンロード済みの地図はSDカード／USBストレージに保存する事はできません
+		ko = 다운로드된지도와 SD 카드 / USB 저장 장치를 사용할 수 없습니다
 		ru = Загруженные карты недоступны
 		cs = SD karta/USB uložiště s uloženými mapami není k dispozici
 	[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
+		fr = Débranchez le câble USB ou insérez la carte SD
+		ja = USBケーブルを抜くかMapsWithMeに使うメモリーカードを挿入してください
+		ko = MapsWithMe를 사용하려면 USB 케이블이나 삽입 메모리 카드를 분리하십시오
 		ru = Отключите USB кабель или вставьте SD-карту
 		cs = Prosím odpoj USB kabel nebo vlož paměťovou kartu pro použití s MapsWithMe
 	[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
+		fr = L'espace disponible sur l'appareil est insuffisant pour l'utilisation du programme
+		ja = アプリを起動する前にSDカード/USBストレージの空き容量を増やしてください
+		ko = 응용 프로그램을 사용하기 위해서는 첫째 SD 카드 / USB 저장 장치에 여유 공간을 확보하십시오
 		ru = Недостаточно свободного места на SD карте/в памяти устройства для использования программы
 		cs = Prosím uvolni nejprve nějaký prostor na SD kartě/USB uložišti
 	[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
+		fr = Il ne suffit pas de memoire pour la mise en marche du programme
+		ja = メモリ不足です。アプリを起動できません
+		ko = 응용 프로그램을 실행하기위한 메모리가 충분하지 않다
 		ru = Недостаточно памяти для запуска программы
 		cs = Nedostatek paměti ke spuštění aplikace
 	[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$@
+		fr = Merci de faire  %1$@ de la place disponible pour télécharger %2$@
+		ja = デバイス上で%1$@解放することで%2$@ダウンロードすることができます
+		ko = %2$@를 다운로드하기 위해서는 먼저 장치에서 무료로 %1$@를주세요
 		ru = Для загрузки %2$@ нужно %1$@ свободного места
 		cs = Prosím uvolni nejprve %1$@ v tvém zařízení, abys mohl/a stáhnout %2$@
 	[download_resources]
 		en = Program needs to download \n%.1f%@ of mandatory resources.
 		comment = REMOVE THIS STRING AFTER REFACTORING
-		ru = Для запуска программы нужно загрузить\n %.1f%@ необходимых ресурсов.
+		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
+		ja = アプリは\n%.1f%@分の必須リソースをダウンロードする必要があります
+		ko = 프로그램은 필수 자원의 \n%.1f%@ 를 다운로드해야합니다.
+		ru = Для запуска программы нужно загрузить \n%.1f%@ необходимых ресурсов.
 		cs = Program potřebuje stáhnout \n%.1f%@ povinných zdrojů.
 	[getting_position]
 		en = Getting current position
+		de = Ermittle momentane Position
+		es = Obtener la posición actual
+		fr = Votre position est déterminé
+		ja = 現在地を取得中
+		ko = 현재 위치 얻기
 		ru = Получаем местоположение
 		cs = Získávání aktuální pozice
 	[download_resources_continue]
 		en = Go to map
+		de = Zur Karte
+		es = Ir al mapa
+		fr = Passer sur la carte
+		ja = 地図に移動
+		ko = 지도로 이동
 		ru = Перейти на карту
 		cs = Přejít na mapu
 	[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.
+		fr = Téléchargement de %@.\nPasser sur la carte
+		ja = %@をダウンロード中\n地図に移動できます
+		ko = %@다운로드. 이제지도를 진행할 수 있습니다.
 		ru = Пока загружается %@ \nвы можете пользоваться приложением.
 		cs = Stahuji %@. Nyní můžeš \npoužít na mapě.
 	[download_country_ask]
 		en = Download %@?
+		de = %@ herunterladen?
+		es = Descargar %@?
+		fr = Télécharger %@?
+		ja = %@をダウンロードしますか？
+		ko = %@다운로드?
 		ru = Загрузить %@?
 		cs = Stáhnout %@?
 	[update_country_ask]
 		en = Update %@?
+		de = %@ aktualisieren?
+		es = Actualizar %@?
+		fr = Renouveler %@?
+		ja = %@を更新しますか？
+		ko = %@업데이트?
 		ru = Обновить %@?
 		cs = Aktualizovat %@?
 	[download_location_map_proposal]
 		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
+		fr = Vous pouvez télécharger la carte\nde votre position actuelle.
+		ja = 現在地の地図を\nダウンロードできます
+		ko = 당신의 현재 위치의지도를 다운로드할 수 있습니다.
 		ru = Вы можете загрузить карту\nвашего текущего местоположения.
 		cs = Můžeš stáhnout mapu\nof pro aktuální polohu.
 	[download_location_update_map_proposal]
 		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
+		fr = Vous pouvez renouveler la carte\nde votre position actuelle.
+		ja = 現在地の地図を\n更新できます
+		ko = 귀하의 현재 위치의지도를 업데이트할 수 있습니다.
 		ru = Вы можете обновить карту\nвашего текущего местоположения.
 		cs = Můžeš aktualizovat mapu\ntvé aktuální polohy.
 	[download_location_map_up_to_date]
 		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
+		fr = La carte de votre\nposition (%@) est déjà téléchargée
+		ja = 現在地の地図は\n最新です (%@)
+		ko = 현재 위치 (%@)\n에서지도는 최신이다
 		ru = Карта местности, в которой\nвы находитесь (%@) уже загружена.
 		cs = Mapa tvé aktuální\nlocation (%@) je aktuální.
 	[pause]
 		en = Pause
 		comment = REMOVE THIS STRING AFTER REFACTORING
+		de = Pause
+		es = Pausa
+		fr = Pause
+		ja = 一時停止
+		ko = 중지
 		ru = Приостановить
 		cs = Pauza
 	[continue_download]
 		en = Continue
 		comment = REMOVE THIS STRING AFTER REFACTORING
+		de = Fortfahren
+		es = Continuar
+		fr = Continuer
+		ja = 続行
+		ko = 계속
 		ru = Продолжить
 		cs = Pokračovat
 	[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
+		fr = (%@) est téléchargé, touchez pour renouveler ou effacer
+		ja = (%@)をダウンロードしました。タップして更新、削除できます
+		ko = 다운로드 (%@), 터치를 업데이 트하거나 삭제하는 방법
 		ru = Загружено (%@), нажмите для обновления или удаления
 		cs = Staženo (%@), klepni pro smazání
 	[update_mb_or_kb]
 		en = Update %@
+		de = Aktualisiere %@
+		es = Actualizar %@
+		fr = Renouveler %@
+		ja = %@を更新
+		ko = %@업데이트
 		ru = Обновить %@
 		cs = Aktualizace %@
 	[search_update_maps]
-		comment = Show toast when we have countries without search index
+		en = You need updated maps for search function:
 		tags = android
-		en = You need to updated maps for search function:
+		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
+		fr = Merci d'effacer les cartes anciennes pour faire fonctionner la recherche
+		ja = 検索機能を利用するには地図を更新する必要があります
+		ko = 당신은 검색 기능에 대한 업데이트된지도 필요
 		ru = Для функции поиска необходимо обновить устаревшие карты:
 		cs = Pro funkci vyhledávání musíš aktualizovat mapy:
 	[advise_update_maps]
-		comment = Show toast on start when we have out-of-date maps
-		tags = android
 		en = Update available for these maps:
+		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:
+		fr = Le renouvellement est disponible pour les cartes suivantes:
+		ja = こちらの地図が更新できます：
+		ko = 이지도에 사용할 수있는 업데이트 :
 		ru = Доступно обновление для следующих карт:
+		cs = Aktualizace je k dispozici pro následující karty:
 	[suggest_uninstall_lite]
-		comment = Show toast in Pro version that Lite can be deleted
+		en = You don't need MapsWithMe Lite any more, so you can uninstall it.
 		tags = android
-		en = You don't need Maps With Me Lite any more, so you can uninstall it.
-		ru = Maps With Me Lite больше не нужна. Рекомендуем ее удалить.
+		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.
+		fr = Vous n'avez plus besoin de MapsWithMe Lite. Merci de l'effacer
+		ja = MapsWithMe Liteはもう必要ありませんので削除してもかまいません
+		ko = 당신은 더 이상 MapsWithMe 라이트는 필요 없어, 당신은 그것을 제거할 수 있습니다.
+		cs = Nemusíte MapsWithMe Lite víc, takže si můžete odinstalovat.
 	[download_country_success]
-		comment = Show toast when country has downloaded.
+		en = %@ downloaded successfuly
 		tags = android
-		en = %@ downloaded successfuly.
-		ru = %@ успешно загружена.
+		comment = Show popup notification on top of the map when country was downloaded.
+		ru = %@ успешно загружена
+		de = %@ erfolgreich heruntergeladen
+		es = %@ descargado con exito
+		fr = Téléchargement de %@ est accompli avec succès
+		ja = %@のダウンロードが成功しました
+		ko = %@이 성공적으로 다운로드
+		cs = %@ stáhnout úspěšně
 	[download_country_failed]
-		comment = Show toast when country downloading failed.
+		en = %@ download has failed
 		tags = android
-		en = Downloading of %@ failed.
-		ru = Загрузка %@ провалилась.
+		comment = Show popup notification on top of the map when country download has failed.
+		ru = Не удалось загрузить %@
+		de = %@ herunterladen fehlgeschlagen
+		es = %@ descarga ha fallado
+		fr = Erreur de téléchargement de %@
+		ja = %@のダウンロードが失敗しました
+		ko = %@다운로드가 실패했습니다
+		cs = %@ stahování se nezdařilo
 	[add_new_set]
-		en = Add New Set
+		en = Add new set
 		tags = ios
 		comment = Add New Bookmark Set dialog title
 		ru = Добавить группу
+		de = Neue Gruppe hinzufügen
+		es =
+		fr = Ajouter une groupe
+		ja = 新しいセットを追加
+		ko = 새로운 세트 추가
+		cs =
 	[add_to_bookmarks]
-		en = Add To Bookmarks
+		en = Add to bookmarks
 		tags = ios
 		comment = Place Page - Add To Bookmarks button
 		ru = Добавить в закладки
+		de = Zu Lesezeichen hinzufügen
+		es =
+		fr = Ajouter dans les signets
+		ja = ブックマークに追加
+		ko = 즐겨찾기에 추가
+		cs =
 	[bookmark_color]
-		en = Bookmark Color
+		en = Bookmark color
 		tags = ios
 		comment = Bookmark Color dialog title
 		ru = Цвет закладки
-  [bookmark_set_name]
-    en = Bookmark Set Name
-    tags = ios
-    comment = Add Bookmark Set dialog - hint when set name is empty
-    ru = Название группы
-  [bookmark_sets]
-    en = Bookmark Sets
-    tags = ios
-    comment = Bookmark Sets dialog title
-    ru = Группы закладок
-  [bookmarks]
-    en = Bookmarks
-    tags = ios
-    comment = Boormarks - dialog title
-    ru = Закладки
-  [color]
-    en = Color
-    tags = ios
-    comment = Add bookmark dialog - bookmark color
-    ru = Цвет
-  [dropped_pin]
-    en = Dropped Pin
-    tags = ios
-    comment = Unknown Dropped Pin title, when name can't be determined
-    ru = Перемещенная булавка
-  [my_places]
-    en = My Places
-    tags = ios
-    comment = Default bookmarks set name
-    ru = Мои Закладки
-  [name]
-    en = Name
-    tags = ios
-    comment = Add bookmark dialog - bookmark name
-    ru = Имя
-  [address]
-    en = Address
-    tags = ios
-    comment = Add bookmark dialog - bookmark address
-    ru = Адрес
-  [remove_pin]
-    en = Remove Pin
-    tags = ios
-    comment = Place Page - Remove Pin button
-    ru = Удалить булавку
-  [set]
-    en = Set
-    tags = ios
-    comment = Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell
-    ru = Группа
+		de = Lesezeichen Farbe
+		es =
+		fr = Couleur du signet
+		ja = ブックマークの色
+		ko = 색상 즐겨찾기에 추가
+		cs =
+	[bookmark_set_name]
+		en = Bookmark set name
+		tags = ios
+		comment = Add Bookmark Set dialog - hint when set name is empty
+		ru = Название группы
+		de = Name des Lesezeichens
+		es =
+		fr = Nom de la groupe
+		ja = ブックマークセット名
+		ko = 집합 이름을 즐겨찾기에 추가
+		cs =
+	[bookmark_sets]
+		en = Bookmark sets
+		tags = ios
+		comment = Bookmark Sets dialog title
+		ru = Группы закладок
+		de =
+		es =
+		fr = Groupes de signets
+		ja = ブックマークセット
+		ko = 세트를 즐겨찾기에 추가
+		cs =
+	[bookmarks]
+		en = Bookmarks
+		tags = ios
+		comment = Boormarks - dialog title
+		ru = Закладки
+		de = Lesezeichengruppen
+		es =
+		fr = Signets
+		ja = ブックマーク
+		ko = 북마크
+    cs =
+	[color]
+		en = Color
+		tags = ios
+		comment = Add bookmark dialog - bookmark color
+		ru = Цвет
+		de = Farbe
+		es =
+		fr = Couleur
+		ja = 色
+		ko =
+		cs =
+	[dropped_pin]
+		en = Dropped Pin
+		tags = ios
+		comment = Unknown Dropped Pin title, when name can't be determined
+		ru = Перемещенная булавка
+		de = Gesetzte Stecknadel
+		es =
+		fr = L'épingle déplacée
+		ja = ドロップされたピン
+		ko =
+		cs =
+	[my_places]
+		en = My Places
+		tags = ios
+		comment = Default bookmarks set name
+		ru = Мои Закладки
+		de = Meine Orte
+		es =
+		fr = Mes signets
+		ja = マイロケーション
+		ko =
+		cs =
+	[name]
+		en = Name
+		tags = ios
+		comment = Add bookmark dialog - bookmark name
+		ru = Имя
+		de = Name
+		es =
+		fr = Nom
+		ja = 場所名
+		ko =
+		cs =
+	[address]
+		en = Address
+		tags = ios
+		comment = Add bookmark dialog - bookmark address
+		ru = Адрес
+		de = Adresse
+		es =
+		fr = Adresse
+		ja = 住所
+		ko =
+		cs =
+	[remove_pin]
+		en = Remove Pin
+		tags = ios
+		comment = Place Page - Remove Pin button
+		ru = Удалить булавку
+		de = Stecknadel entfernen
+		es =
+		fr = Effacer l'épingle
+		ja = ピンを削除
+		ko =
+		cs =
+	[set]
+		en = Set
+		tags = ios
+		comment = Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell
+		ru = Группа
+		de = Gruppe
+		es =
+		fr = Groupe
+		ja = セット
+		ko =
+		cs =