diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 0c5946194c..074c3a5cad 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -26,7 +26,7 @@
 	<string name="core_my_position">موقعي</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">ًلاحقا</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">البحث</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">ابحث في الخريطة</string>
@@ -63,7 +63,7 @@
 	<string name="bookmark_color">لون الإشارة المرجعية</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">اسم قائمة الإشارات المرجعية</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">الإشارات المرجعية</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">أماكني</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index d63cf401c7..8722bc14cf 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -26,7 +26,7 @@
 	<string name="core_my_position">Маё месцазнаходжанне</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Потым</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Шукаць</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Шукаць на мапе</string>
@@ -63,7 +63,7 @@
 	<string name="bookmark_color">Колер закладкі</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Назва спісу закладак</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Закладкі</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мае месцы</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 39e6d44291..ce438da4db 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -26,7 +26,7 @@
 	<string name="core_my_position">Мое местоположение</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">По-късно</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Търсене</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Търсене в карта</string>
@@ -63,7 +63,7 @@
 	<string name="bookmark_color">Цвят на отметка</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Име на група</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Отметки</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мои места</string>
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index 57493ea0ff..04256fe012 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">La meva posició</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Més tard</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Cerca</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Cerca en el mapa</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Color del marcador</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nom de la llista de marcadors</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Marcadors</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Els meus llocs</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 30cad6ca73..4acebfa224 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Moje poloha</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Později</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Hledat</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Prohledat mapu</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Barva záložky</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Název záložky</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Záložky</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Moje místa</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 112a13cbd5..fb56940f80 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Min position</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Senere</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Søg</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Søg kort</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Bogmærke Farve</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Indstil bogmærkenavn</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Bogmærker</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mine Steder</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 5ddcee6873..b62cc70cb3 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Mein Standort</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Später</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Suche</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Auf der Karte suchen</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Lesezeichenfarbe</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Name des Lesezeichens</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Lesezeichen</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Meine Orte</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 8fcda0ed33..3f26f294f7 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -24,7 +24,7 @@
 	<string name="core_my_position">Η θέση μου</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Αργότερα</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Αναζήτηση</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Αναζήτηση χάρτη</string>
@@ -61,7 +61,7 @@
 	<string name="bookmark_color">Χρώμα αγαπημένου</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Όνομα συνόλου αγαπημένων</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Αγαπημένα</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Οι τοποθεσίες μου</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 43cc8c66b3..6e8a7d5e25 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Mi posición</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Luego</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Buscar</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Buscar en el mapa</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Color del marcador</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nombre del grupo de marcadores</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Marcadores</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mis lugares</string>
diff --git a/android/res/values-et/strings.xml b/android/res/values-et/strings.xml
index 09cbf9f409..e7333c2dbd 100644
--- a/android/res/values-et/strings.xml
+++ b/android/res/values-et/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Minu asukoht</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Hiljem</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Otsi</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Otsi kaardilt</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Järjehoidja värv</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Järjehoidjate loetelu nimi</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Järjehoidjad</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Minu kohad</string>
@@ -534,7 +534,7 @@
 	<string name="on">Sees</string>
 	<string name="off">Väljas</string>
 	<string name="prefs_languages_information">Hääljuhiste jaoks kasutame TTS süsteemi. Paljud Android-seadmed kasutavad Google\'i TTS-i, saate selle alla laadida või värskendada teenusest Google Play (https:play.google.comstoreappsdetails?id=com.google.android.tts)</string>
-	<string name="prefs_languages_information_off">Mõne keele puhul peate paigaldama kõnesüntesaatori või täiendava keelepaketi rakenduste poest (Google Play, Galaxy Store, App Gallery, FDroid).\nAvage oma seadme seaded → Keel ja sisend → Kõne → Tekst kõneks väljund .\nSiin saate hallata kõnesünteesi seadeid (näiteks alla laadida keelepaketti võrguühenduseta kasutamiseks) ja valida mõne muu teksti kõneks muutmise mootori.</string>
+	<string name="prefs_languages_information_off">Mõne keele puhul peate paigaldama kõnesüntesaatori või täiendava keelepaketi rakenduste poest (Google Play, Galaxy Store, App Gallery, FDroid).\nAvage oma seadme seaded → Keel ja sisend → Kõne → Tekst kõneks väljund.\nSiin saate hallata kõnesünteesi seadeid (näiteks alla laadida keelepaketti võrguühenduseta kasutamiseks) ja valida mõne muu teksti kõneks muutmise mootori.</string>
 	<string name="prefs_languages_information_off_link">Lisainfo saamiseks palun vaadake seda juhist.</string>
 	<string name="transliteration_title">Transliteratsioon ladina keelde</string>
 	<string name="learn_more">Lisateave</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 1206828ee2..ad6218a9b0 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Nire posizioa</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Geroago</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Bilatu</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Bilatu mapan</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Markatzailearen kolorea</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Markatzaile taldearen izena</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Markagailuak</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Nire tokiak</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index d8ec9144d5..8efe12d03a 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -12,7 +12,7 @@
 	<string name="delete">حذف</string>
 	<string name="download_maps">دانلود نقشه ها</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 country which started downloading -->
 	<string name="downloading">درحال دانلود</string>
 	<!-- Choose measurement on first launch alert - choose metric system button -->
@@ -26,7 +26,7 @@
 	<string name="core_my_position">مکان من</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">بعداً</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">جست‌وجو</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">جست‌وجوی نقشه</string>
@@ -59,7 +59,7 @@
 	<string name="add_new_set">اضافه کردن مجموعه جدید</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">رنگ نشانه</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">نشانه ها</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">مکان من</string>
@@ -152,7 +152,7 @@
 	<!-- Share by email button text, also used in editor and About. -->
 	<string name="email">ایمیل</string>
 	<!-- Text for message when used successfully copied something -->
-	<string name="copied_to_clipboard">کپی در کلیپ برد :%1$s</string>
+	<string name="copied_to_clipboard">کپی در کلیپ برد: %1$s</string>
 	<!-- Used for bookmark editing -->
 	<string name="done">انجام شد</string>
 	<!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index b541673a73..ec1af0ccd1 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -25,7 +25,7 @@
 	<string name="core_my_position">Sijaintini</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Myöhemmin</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Haku</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Hae kartalta</string>
@@ -62,7 +62,7 @@
 	<string name="bookmark_color">Kirjanmerkin väri</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Kirjanmerkkivalikoiman nimi</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Kirjanmerkit</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Paikkani</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 059e6ab2ee..8362feaa1c 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -25,7 +25,7 @@
 	<string name="core_my_position">Ma position</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Plus tard</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Recherche</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Rechercher sur la carte</string>
@@ -62,7 +62,7 @@
 	<string name="bookmark_color">Couleur du signet</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nom du groupe de signets</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Signets</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mes endroits</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index cc7cb8f139..b9c03999bb 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Saját helyzet</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Később</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Keresés</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Keresés a térképen</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Könyvjelző színe</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Könyvjelzőcsoport neve</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Könyvjelzők</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Saját helyeim</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 9d9accd18f..871914b648 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -25,7 +25,7 @@
 	<string name="core_my_position">Posisi Saya</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Nanti</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Cari</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Cari Peta</string>
@@ -62,7 +62,7 @@
 	<string name="bookmark_color">Warna Penanda</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nama Set Penanda</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Penanda</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Tempat-tempat Saya</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index db594f0fb5..2ac45863c4 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">La mia posizione</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Più tardi</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Cerca</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Cerca sulla mappa</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Colore Luogo preferito</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nome dell\'elenco</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Luoghi preferiti</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">I miei luoghi</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index aa61b7f718..d48ef88bae 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -56,7 +56,7 @@
 	<string name="bookmark_color">צבע רשימת האתרים</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">שם רשימת האתרים</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">רשימות אתרים</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">המקומות שלי</string>
@@ -217,7 +217,7 @@
 	<string name="twentyfour_seven">יום ולילה</string>
 	<string name="login_osm">OpenStreetMap-ל סנכיה</string>
 	<string name="level">קוֹמָה</string>
-	<string name="osm_presentation">.םלועה יבחר לכב םישמתשמ ינוילימל תונימזל תוכפוה ןהו ,תומוקמ ךורעל וא ףיסוהל לו</string>
+	<string name="osm_presentation">כל נתוני המפה מגיעים מפרויקט OpenStreetMap. זה כמו ויקיפדיה למפות, שבה אתה יכול להוסיף או לערוך מקומות, והם הופכים לזמינים למיליוני משתמשים בכל רחבי העולם.</string>
 	<string name="editor_share_to_all_dialog_message_2">.ןהשלכ תולאש םהל שי םא רשק ךתיא ורציו םייונישה תא וקדבי OpenStreetMap יכרוע</string>
 	<!-- Text under the version number in the Help dialog. TODO: Synchronize other translations with English. -->
 	<string name="about_description">Organic Maps היא אפליקציית מפות לא מקוונות בחינם ובקוד פתוח. ללא פרסומות. אין מעקב. אם אתה רואה שגיאה במפה, אנא תקן אותה ב-OpenStreetMap. הפרויקט נוצר על ידי חובבים בזמננו הפנוי, אז אנו זקוקים למשוב ולתמיכה שלכם.</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index d2b400fc34..1c7ad261d5 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">現在地</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">次の機会に</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">検索</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">マップを検索</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">ブックマーク表示色</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">ブックマークセット名称</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">ブックマーク</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">マイロケーション</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 1f7465b8b1..a8de62490a 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">나의 위치</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">후</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">검색하기</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">지도 검색하기</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">색상 즐겨찾기에 추가</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">집합 이름을 즐겨찾기에 추가</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">북마크</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">내 장소</string>
diff --git a/android/res/values-mr/strings.xml b/android/res/values-mr/strings.xml
index 2d18e9c7a3..df6c04bd8e 100644
--- a/android/res/values-mr/strings.xml
+++ b/android/res/values-mr/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">माझे स्थान</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">नंतर</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">शोधा</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">नकाश्यात शोधा</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">खूणपत्र रंग</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">खूणपत्र यादीचे नाव</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">खूणपत्रे</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">माझी ठिकाणे</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 6ef70fe5b0..be87cecc24 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -25,7 +25,7 @@
 	<string name="core_my_position">Min posisjon</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Senere</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Søk</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Søk kart</string>
@@ -62,7 +62,7 @@
 	<string name="bookmark_color">Bokmerk farge</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Bokmerk settnavn</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Bokmerker</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mine steder</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 50a56ea85d..b03930eb15 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Mijn locatie</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Later</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Zoeken</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Op de kaart zoeken</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Bladwijzer-kleur</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Naam van bladwijzergroep</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Bladwijzers</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mijn plaatsen</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index b55728b36c..463c6cd911 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Moje położenie</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Później</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Wyszukaj</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Wyszukaj mapy</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Kolor zakładki</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nazwa zestawu zakładek</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Zakładki</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Moje miejsca</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index c1e9f4f443..87e655cfbf 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Minha posição</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Mais tarde</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Buscar</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Procurar mapa</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Cor do favorito</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nome do conjunto de favoritos</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Favoritos</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Meus locais</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 773331a440..6ad961a006 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">A minha posição</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Mais tarde</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Pesquisar</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Pesquisar mapa</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Cor do favorito</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nome do conjunto de favoritos</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Favoritos</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Os meus locais</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index c7a5b0868c..d357cd1db4 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Poziția mea</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Mai târziu</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Caută</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Caută pe hartă</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Culoare loc preferat</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Denumirea listei</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Locuri preferate</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Locurile mele</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index e800aedc30..efdaaf992b 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -26,7 +26,7 @@
 	<string name="core_my_position">Мое местоположение</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Не сейчас</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Поиск</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Поиск на карте</string>
@@ -63,7 +63,7 @@
 	<string name="bookmark_color">Цвет метки</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Название списка меток</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Метки</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мои Метки</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 6e30641a34..f941a4b2dd 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Moja poloha</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Neskôr</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Hľadať</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Prehľadať mapu</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Farba záložky</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Meno záložky</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Záložky</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Moje miesta</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 2af7ef5a9e..cb0b4411c5 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Min position</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Senare</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Sök</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Sök karta</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Bokmärkesfärg</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Bokmärkessamlingens namn</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Bokmärken</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mina Platser</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 4386b6d26b..508ff0d2e7 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -25,7 +25,7 @@
 	<string name="core_my_position">ตำแหน่งของฉัน</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">ภายหลัง</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">ค้นหา</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">ค้นหาแผนที่</string>
@@ -62,7 +62,7 @@
 	<string name="bookmark_color">สีของบุ๊กมาร์ก</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">ชื่อของชุดบุ๊กมาร์ก</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">บุ๊กมาร์ก</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">สถานที่ของฉัน</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 3af42f7a0d..aaf5b31328 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -25,7 +25,7 @@
 	<string name="core_my_position">Konumum</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Daha sonra</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Ara</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Haritada Ara</string>
@@ -62,7 +62,7 @@
 	<string name="bookmark_color">Yer İmi Rengi</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Yer İmi Listesi Adı</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Yer İmleri</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Yerlerim</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 80184a3662..08083805bf 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -26,7 +26,7 @@
 	<string name="core_my_position">Моє місцезнаходження</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Не зараз</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Пошук</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Пошук на мапі</string>
@@ -63,7 +63,7 @@
 	<string name="bookmark_color">Колір мiтки</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Назва списка мiток</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Мітки</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мої Мітки</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index d6cf5dbc78..48435444dd 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">Vị trí của Tôi</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Để sau</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Tìm kiếm</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Tìm kiếm Bản đồ</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">Đánh dấu Màu sắc</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Đánh dấu Tên Bộ</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Đánh dấu</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Các Địa chỉ của Tôi</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index fdf1357db6..f0b5fd0877 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">我的位置</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">稍後</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">搜尋</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">搜尋地圖</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">書籤顏色</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">收藏夾名稱</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">書籤</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">我的地點</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 00aff27593..c4076c920d 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -23,7 +23,7 @@
 	<string name="core_my_position">我的位置</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">稍后</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">搜索</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">搜索地图</string>
@@ -60,7 +60,7 @@
 	<string name="bookmark_color">书签颜色</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">书签集名称</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">书签</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">我的位置</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 610eeb6ebd..ceb004da1b 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -26,7 +26,7 @@
 	<string name="core_my_position">My Position</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Later</string>
-	<!-- View and button titles for accessibility -->
+	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Search</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Search Map</string>
@@ -63,7 +63,7 @@
 	<string name="bookmark_color">Bookmark Color</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Bookmark List Name</string>
-	<!-- "Bookmarks" dialog title -->
+	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Bookmarks</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">My Places</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index c5d41d1ad7..49236b61cc 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "ًلاحقا";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "البحث";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "قائمة الإشارات المرجعية";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "الإشارات المرجعية";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings
index aa1dcea8c1..ff0de53ea1 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings
@@ -10,16 +10,16 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bookmarks";
+"bookmarks" = "Закладкі";
 
 /* Used in home screen quick actions. */
-"route" = "Route";
+"route" = "Маршрут";
 
 
 /********** gps strings **********/
 
 /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */
-"NSLocationAlwaysUsageDescription" = "Detecting location in the background is necessary to fully enjoy the functionality of the app. It is used for navigation and saving your recently traveled track.";
+"NSLocationAlwaysUsageDescription" = "Вызначэнне месцазнаходжання ў фонавым рэжыме неабходна для поўнага выкарыстання функцыянальнасці праграмы. Яно выкарыстоўваецца для навігацыі і захавання вашага нядаўна пройдзенага шляху.";
 
 /* Needed to explain why we require access to GPS coordinates when the app is active. */
-"NSLocationWhenInUseUsageDescription" = "Determining your location is necessary for navigation and for saving your recently traveled track.";
+"NSLocationWhenInUseUsageDescription" = "Вызначэнне вашага месцазнаходжання неабходна для навігацыі і для захавання вашага нядаўна пройдзенага шляху.";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 4c946c2102..17de68d710 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Потым";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Шукаць";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Спісы закладак";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Закладкі";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index e3d5fcac2c..55a6f33f39 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "По-късно";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Търсене";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Отметки";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings
index 8a96274e60..9d639380b4 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings
@@ -10,16 +10,16 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bookmarks";
+"bookmarks" = "Marcadors";
 
 /* Used in home screen quick actions. */
-"route" = "Route";
+"route" = "Ruta";
 
 
 /********** gps strings **********/
 
 /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */
-"NSLocationAlwaysUsageDescription" = "Detecting location in the background is necessary to fully enjoy the functionality of the app. It is used for navigation and saving your recently traveled track.";
+"NSLocationAlwaysUsageDescription" = "La detecció de la ubicació en segon pla és necessària per gaudir plenament de la funcionalitat de l'aplicació. S'utilitza per a la navegació i desar la ruta feta recentment.";
 
 /* Needed to explain why we require access to GPS coordinates when the app is active. */
-"NSLocationWhenInUseUsageDescription" = "Determining your location is necessary for navigation and for saving your recently traveled track.";
+"NSLocationWhenInUseUsageDescription" = "Determinar la vostra ubicació és necessari per a la navegació i per desar el vostre recorregut recentment.";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 02af2af1ba..e90196613a 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Més tard";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Cerca";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Llistes de marcadors";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Marcadors";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 9d49c094e0..ef09f99797 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Později";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Hledat";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Skupiny záložek";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Záložky";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 88daf3c794..0b653f1ce8 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Senere";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Søg";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bogmærk sæt";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Bogmærker";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings
index 305d3a4df7..090d71bd6d 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Suche";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Lesezeichengruppen";
+"bookmarks" = "Lesezeichen";
 
 /* Used in home screen quick actions. */
 "route" = "Route";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index b198d90919..780e7a792b 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Später";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Suche";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Lesezeichenmappe";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Lesezeichen";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 53213e099d..9ea7ccd54d 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Αργότερα";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Αναζήτηση";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Σύνολα αγαπημένων";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Αγαπημένα";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 1295e7765a..7e9feeb0a1 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Search";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Bookmarks";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index a4d6a0c96e..ffdbf5a923 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Search";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Bookmarks";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 3768c80b6c..65991430a4 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Luego";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Buscar";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Grupos de marcadores";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Marcadores";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 5c29169c73..4fe1d3d45e 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Luego";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Buscar";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Grupos de marcadores";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Marcadores";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings
index 2671b9c944..0cff38ee65 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bookmarks";
+"bookmarks" = "Järjehoidjad";
 
 /* Used in home screen quick actions. */
 "route" = "Marsruut";
@@ -19,7 +19,7 @@
 /********** gps strings **********/
 
 /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */
-"NSLocationAlwaysUsageDescription" = "Detecting location in the background is necessary to fully enjoy the functionality of the app. It is used for navigation and saving your recently traveled track.";
+"NSLocationAlwaysUsageDescription" = "Rakenduse funktsionaalsuse täielikuks nautimiseks on vaja asukoha tuvastamist taustal. Seda kasutatakse navigeerimiseks ja hiljuti reisitud tee salvestamiseks.";
 
 /* Needed to explain why we require access to GPS coordinates when the app is active. */
-"NSLocationWhenInUseUsageDescription" = "Determining your location is necessary for navigation and for saving your recently traveled track.";
+"NSLocationWhenInUseUsageDescription" = "Teie asukoha määramine on vajalik navigeerimiseks ja hiljuti reisitud raja salvestamiseks.";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 73d98d3ccb..9eb1ddb472 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Hiljem";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Otsi";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Järjehoidjate loetelud";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Järjehoidjad";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 8b3ca37483..4ea69dfd60 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Geroago";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Bilatu";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Markagailu taldeak";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Markagailuak";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 0016c33f56..6bc556c8d9 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "بعداً";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "جست‌وجو";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "نشانه ها";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 6405ab59e8..a1266a99f7 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Myöhemmin";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Haku";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Kirjanmerkkivalikoimat";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Kirjanmerkit";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 2842cbdee0..488a5fb1a2 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Plus tard";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Recherche";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Groupes de signets";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Signets";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 430deb21f2..e9bbaa8589 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "מאוחר יותר";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Search";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "רשימות אתרים";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "רשימות אתרים";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 575ec6fea9..aec7990486 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Később";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Keresés";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Könyvjelzőcsoportok";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Könyvjelzők";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index b23700d099..6790254a24 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Nanti";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Cari";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Set Penanda";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Penanda";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
index f83d5956b1..2e7b4d33e7 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Cerca";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Segnalibri";
+"bookmarks" = "Luoghi preferiti";
 
 /* Used in home screen quick actions. */
 "route" = "Linea";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index f899e30e1d..f5e4f815a6 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Più tardi";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Cerca";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Elenchi di luoghi preferiti";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Luoghi preferiti";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 95c3581cb1..bf3a6b2d75 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "次の機会に";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "検索";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "ブックマークセット";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "ブックマーク";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 6be0fcd2de..9c464165a0 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "후";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "검색하기";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "세트를 즐겨찾기에 추가";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "북마크";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index b9b88373cc..3a18ab9907 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "नंतर";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "शोधा";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "खूणपत्र याद्या";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "खूणपत्रे";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 0ac6892bd8..2367f80508 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Senere";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Søk";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bokmerk sett";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Bokmerker";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 1ea085e45d..326e69ae0e 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Zoeken";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bladwijzergroepen";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Bladwijzers";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index a47fca80fa..54e617c093 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Później";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Wyszukaj";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Zestawy zakładek";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Zakładki";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 073a02e8c3..d41a0eadae 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Mais tarde";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Buscar";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Conjuntos de favoritos";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Favoritos";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 961628c1cc..67ae911d7d 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Mais tarde";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Pesquisar";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Conjuntos de favoritos";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Favoritos";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings
index 6468aae5b0..ab717d55b8 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Căutare";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Marcaje";
+"bookmarks" = "Locuri preferate";
 
 /* Used in home screen quick actions. */
 "route" = "Traseu";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 1250428c73..8aac8c34e0 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Mai târziu";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Caută";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Liste cu locuri preferate";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Locuri preferate";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 6dc7e81d0b..3f3272ad46 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Не сейчас";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Поиск";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Списки меток";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Метки";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index f851f9bc96..3e9c587096 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Neskôr";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Hľadať";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Skupiny záložiek";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Záložky";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index e03f93b52c..9cbf109207 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Senare";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Sök";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bokmärkessamlingar";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Bokmärken";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 2c55f9e615..f783a7cede 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Search";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Bookmarks";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 858ef397a2..13a561a56b 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "ภายหลัง";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "ค้นหา";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "ชุดของบุ๊กมาร์ก";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "บุ๊กมาร์ก";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 6800a33654..9bbeb7120f 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Daha sonra";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Ara";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Yer İmi Listeleri";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Yer İmleri";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 551d5f47e8..bb586d8e08 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Не зараз";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Пошук";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Списки мiток";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Мітки";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 95130bd6d9..5006f51bb8 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "Để sau";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Tìm kiếm";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Đánh dấu Bộ";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Đánh dấu";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 39258c3ba7..c856696c02 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "稍后";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "搜索";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "书签集";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "书签";
 
 /* Default bookmark list name */
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 52f6aa0c03..b44b88d6e0 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -35,7 +35,7 @@
 /* Update maps later/Buy pro version later button text */
 "later" = "稍後";
 
-/* View and button titles for accessibility */
+/* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "搜尋";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
@@ -71,7 +71,7 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "收藏夾";
 
-/* "Bookmarks" dialog title */
+/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "書籤";
 
 /* Default bookmark list name */