diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 4191272018..972f49a06a 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -74,8 +74,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">الإشارات المرجعية</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">الإشارات المرجعية والمسارات</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">أماكني</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 7f36cb7a9c..64feb15a15 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -74,8 +74,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Закладкі</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Закладкі i cцежкі</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мае месцы</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 60b9337292..92966d0e41 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -74,8 +74,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Отметки</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Отметки и пътеки</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мои места</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index 796d007545..8e7c3893c4 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -63,8 +63,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Marcadors</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Marcadors i traces</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Els meus llocs</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 87557f7901..a793883210 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Záložky</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Záložky a stopy</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Moje místa</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index f75a5f8edd..a87bb8fc73 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Bogmærker</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Bogmærker og ruter</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mine Steder</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 072cf246fa..a186019070 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Lesezeichen</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Lesezeichen und Strecken</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Meine Orte</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index c8a87bd7f3..1c1c0ce581 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -72,8 +72,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Αγαπημένα</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Αγαπημένα και διαδρομές</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Οι τοποθεσίες μου</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index b3a25cf34a..b7a8d48b2b 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Marcadores</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Marcadores y rutas</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mis lugares</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-et/strings.xml b/android/res/values-et/strings.xml
index 714138d574..4c684b717b 100644
--- a/android/res/values-et/strings.xml
+++ b/android/res/values-et/strings.xml
@@ -63,8 +63,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Järjehoidjad</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Järjehoidjad ja rajad</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Minu kohad</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index e7361d983c..aa8914d34a 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -71,8 +71,10 @@
 	<string name="bookmark_color">Markagailuaren kolorea</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Markagailuen zerrendaren izena</string>
-	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Markagailuak</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Markagailuak eta ibilbideak</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Nire tokiak</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 552389d1d5..113496af60 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -70,8 +70,10 @@
 	<string name="add_new_set">اضافه کردن مجموعه جدید</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">رنگ نشانه</string>
-	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">نشانه‌ها</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">نشانه‌ها و مسیر</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">مکان من</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 2c157fae7b..1b783bd873 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -73,8 +73,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Kirjanmerkit</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Kirjanmerkit ja reitit</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Paikkani</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index bb0d3418ea..e9447bea4c 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -73,8 +73,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Signets</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Signets et parcours</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mes endroits</string>
 	<!-- Add bookmark dialog - bookmark name -->
@@ -606,7 +608,7 @@
 	  <item quantity="other">%d lieux</item>
 	</plurals>
 	<plurals name="tracks">
-	  <item quantity="other">pistes %d</item>
+	  <item quantity="other">%d pistes</item>
 	</plurals>
 	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Paramètres de suivi</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 8da0d5bb24..fe953eaf9c 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Könyvjelzők</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Könyvjelzők és nyomvonalak</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Saját helyeim</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 99381fd5dd..41fa41c209 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -73,8 +73,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Penanda</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Penanda dan jalur</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Tempat-tempat Saya</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index ca285ed99b..e4e09e987b 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Luoghi preferiti</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Luoghi preferiti e percorsi</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">I miei luoghi</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index 69a651dbdf..95a91eeb32 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -67,8 +67,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">רשימות אתרים</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">רשימות אתרים ונתיבים</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">המקומות שלי</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 1f42732004..e81803f66d 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">ブックマーク</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">ブックマークとトラック</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">マイロケーション</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index ebab9da7cf..5da8c786d8 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">북마크</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">북마크 및 트랙</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">내 장소</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-mr/strings.xml b/android/res/values-mr/strings.xml
index 5b1fe23f24..942e05e838 100644
--- a/android/res/values-mr/strings.xml
+++ b/android/res/values-mr/strings.xml
@@ -63,8 +63,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">खूणपत्रे</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">खूणपत्रे आणि ट्रॅक</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">माझी ठिकाणे</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 008b321fdc..b75f906c9e 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -73,8 +73,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Bokmerker</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Bokmerker og ruter</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mine steder</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 24d9353e74..4b2be0cb4d 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Bladwijzers</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Bladwijzers en tracks</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mijn plaatsen</string>
 	<!-- Add bookmark dialog - bookmark name -->
@@ -598,7 +600,7 @@
 	  <item quantity="other">%d plaatsen</item>
 	</plurals>
 	<plurals name="tracks">
-	  <item quantity="other">%d routes</item>
+	  <item quantity="other">%d tracks</item>
 	</plurals>
 	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Tracking-instellingen</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index f7196cf2a5..c36629ef0d 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Zakładki</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Zakładki i trasy</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Moje miejsca</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index ca0df4e670..f1b42cf210 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -69,8 +69,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Favoritos</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Favoritos e trilhas</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Meus locais</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 3c9aa4468f..2e8321f086 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Favoritos</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Favoritos e trilhas</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Os meus locais</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 2c66e22be6..ad2e9616ef 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Locuri preferate</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Locuri preferate și trasee</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Locurile mele</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 2ec9f2f2e6..3cae93385f 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -74,8 +74,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Метки</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Метки и треки</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мои Метки</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index df39cc7149..e4ab5b2cb1 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Záložky</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Záložky a stopy</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Moje miesta</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index cadbdfb494..6530daf6dd 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Bokmärken</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Bokmärken och rutter</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mina Platser</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 2b68453e99..dd16af65ec 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -73,8 +73,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">บุ๊กมาร์ก</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">บุ๊กมาร์กและการติดตาม</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">สถานที่ของฉัน</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index cec3de1029..c03bb5f418 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -73,8 +73,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Yer İmleri</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Yer İmleri ve kayıtlar</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Yerlerim</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index e3668b94dd..a4fe17a02a 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -74,8 +74,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Мітки</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Мітки та маршрути</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мої Мітки</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 38256d09a4..91a19a2171 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Đánh dấu</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Đánh dấu và dấu vết</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Các Địa chỉ của Tôi</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 83c9535000..69e9bbb5e7 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">書籤</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">書籤和軌跡</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">我的地點</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 1e4010884b..232f996713 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -71,8 +71,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">书签</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">书签和轨迹</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">我的位置</string>
 	<!-- Add bookmark dialog - bookmark name -->
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 48ce37db9f..e962e4b1ac 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -74,8 +74,10 @@
 	<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, please also edit it in iphone/plist.txt -->
+	<!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
 	<string name="bookmarks">Bookmarks</string>
+	<!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
+	<string name="bookmarks_and_tracks">Bookmarks and Tracks</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">My Places</string>
 	<!-- Add bookmark dialog - bookmark name -->
@@ -768,6 +770,8 @@
 	<string name="translated_om_site_url">https://organicmaps.app/</string>
 	<!-- Link to OSM wiki for Editor, Profile and About pages -->
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
+	<!-- A number of bookmarks and a number of tracks, separated by comma, like: 1 bookmark, 5 tracks -->
+	<string name="comma_separated_pair">%1$s, %2$s</string>
 
 	<!-- SECTION: Types -->
 	<string name="type.addr_interpolation">Address/Block</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ar.lproj/InfoPlist.strings
index 63953802b5..b0efbd1345 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "البحث";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "الإشارات المرجعية";
+"bookmarks_and_tracks" = "الإشارات المرجعية والمسارات";
 
 /* Used in home screen quick actions. */
 "route" = "المسار";
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 94634d9e1c..8c3b1dfd58 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "قائمة الإشارات المرجعية";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "الإشارات المرجعية";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "الإشارات المرجعية والمسارات";
+
 /* Default bookmark list name */
 "core_my_places" = "أماكني";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings
index 8346bb6e19..64217a10f3 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Закладкі";
+"bookmarks_and_tracks" = "Закладкі i cцежкі";
 
 /* Used in home screen quick actions. */
 "route" = "Маршрут";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 4a2a9182c4..b4e5fc20eb 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Спісы закладак";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Закладкі";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Закладкі i cцежкі";
+
 /* Default bookmark list name */
 "core_my_places" = "Мае месцы";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/bg.lproj/InfoPlist.strings
index 08a89068ea..2ce917d502 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Търсене";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Отметки";
+"bookmarks_and_tracks" = "Отметки и пътеки";
 
 /* Used in home screen quick actions. */
 "route" = "Маршрут";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index aa45fe2707..7ee0cfd14c 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Отметки";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Отметки и пътеки";
+
 /* Default bookmark list name */
 "core_my_places" = "Мои места";
 
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings
index 3271b738bc..5734ae2881 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Marcadors";
+"bookmarks_and_tracks" = "Marcadors i traces";
 
 /* Used in home screen quick actions. */
 "route" = "Ruta";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 2f75452b37..d59551f602 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Llistes de marcadors";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Marcadors";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Marcadors i traces";
+
 /* Default bookmark list name */
 "core_my_places" = "Els meus llocs";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/cs.lproj/InfoPlist.strings
index d18cf74e1f..96987777e6 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Hledat";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Záložky";
+"bookmarks_and_tracks" = "Záložky a stopy";
 
 /* Used in home screen quick actions. */
 "route" = "Trasa";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 4e332b7d51..8a0f2fe10a 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Skupiny záložek";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Záložky";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Záložky a stopy";
+
 /* Default bookmark list name */
 "core_my_places" = "Moje místa";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings
index c6be9a727f..70e0fec6ff 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Søg";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bogmærker";
+"bookmarks_and_tracks" = "Bogmærker og ruter";
 
 /* Used in home screen quick actions. */
 "route" = "Rute";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 02cf9e5ac6..e8f30a8b94 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bogmærk sæt";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Bogmærker";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Bogmærker og ruter";
+
 /* Default bookmark list name */
 "core_my_places" = "Mine Steder";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings
index 9fe203c1cc..9eeec0960c 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" = "Lesezeichen";
+"bookmarks_and_tracks" = "Lesezeichen und Strecken";
 
 /* 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 6713410920..e5a2d0335d 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Lesezeichenmappe";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Lesezeichen";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Lesezeichen und Strecken";
+
 /* Default bookmark list name */
 "core_my_places" = "Meine Orte";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/el.lproj/InfoPlist.strings
index ff19fbc16b..0422b98ed2 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Αγαπημένα";
+"bookmarks_and_tracks" = "Αγαπημένα και διαδρομές";
 
 /* Used in home screen quick actions. */
 "route" = "Διαδρομή";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index e7883163b4..3fdc5052dd 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Σύνολα αγαπημένων";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Αγαπημένα";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Αγαπημένα και διαδρομές";
+
 /* Default bookmark list name */
 "core_my_places" = "Οι τοποθεσίες μου";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/InfoPlist.strings
index f1d2982e2a..e2699e87cf 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bookmarks";
+"bookmarks_and_tracks" = "Bookmarks and Tracks";
 
 /* Used in home screen quick actions. */
 "route" = "Route";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index c2358d7e0b..065fe42a89 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Bookmarks";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Bookmarks and Tracks";
+
 /* Default bookmark list name */
 "core_my_places" = "My Places";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings
index 97b2798006..5db2ada07f 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bookmarks";
+"bookmarks_and_tracks" = "Bookmarks and Tracks";
 
 /* Used in home screen quick actions. */
 "route" = "Route";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index b2ecad6a8b..3dab26d5c9 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Bookmarks";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Bookmarks and Tracks";
+
 /* Default bookmark list name */
 "core_my_places" = "My Places";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/InfoPlist.strings
index 04d283f83d..6a6b8dbf32 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Buscar";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Marcadores";
+"bookmarks_and_tracks" = "Marcadores y rutas";
 
 /* Used in home screen quick actions. */
 "route" = "Ruta";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 5466745143..592e252dd0 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Grupos de marcadores";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Marcadores";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Marcadores y rutas";
+
 /* Default bookmark list name */
 "core_my_places" = "Mis lugares";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings
index 2300ac3898..14eefcd92a 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Buscar";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Marcadores";
+"bookmarks_and_tracks" = "Marcadores y rutas";
 
 /* Used in home screen quick actions. */
 "route" = "Ruta";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 4e447efb50..6f3a08a4fb 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Grupos de marcadores";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Marcadores";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Marcadores y rutas";
+
 /* Default bookmark list name */
 "core_my_places" = "Mis lugares";
 
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings
index 67f1c4c21d..0779a4383c 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" = "Järjehoidjad";
+"bookmarks_and_tracks" = "Järjehoidjad ja rajad";
 
 /* Used in home screen quick actions. */
 "route" = "Marsruut";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index ea53cee2df..0614ac64b7 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Järjehoidjate loetelud";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Järjehoidjad";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Järjehoidjad ja rajad";
+
 /* Default bookmark list name */
 "core_my_places" = "Minu kohad";
 
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings
index 7c2d99dabe..a166eb0812 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Bilatu";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Markagailuak";
+"bookmarks_and_tracks" = "Markagailuak eta ibilbideak";
 
 /* Used in home screen quick actions. */
 "route" = "Ibilbidea";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 593490d423..08bec4e8e3 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Markagailuen zerrenda";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Markagailuak";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Markagailuak eta ibilbideak";
+
 /* Default bookmark list name */
 "core_my_places" = "Nire tokiak";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/fa.lproj/InfoPlist.strings
index 79f3b098f6..1f52b72ae4 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "نشانه ها";
+"bookmarks_and_tracks" = "نشانه‌ها و مسیر";
 
 /* Used in home screen quick actions. */
 "route" = "مسیر";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 5183ca18fb..7ff1814618 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "نشانه‌ها";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "نشانه‌ها و مسیر";
+
 /* Default bookmark list name */
 "core_my_places" = "مکان من";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/fi.lproj/InfoPlist.strings
index 77db01d06c..08ae18ed33 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Haku";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Kirjanmerkit";
+"bookmarks_and_tracks" = "Kirjanmerkit ja reitit";
 
 /* Used in home screen quick actions. */
 "route" = "Reitti";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 827e5221f1..42eabf40f5 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Kirjanmerkkivalikoimat";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Kirjanmerkit";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Kirjanmerkit ja reitit";
+
 /* Default bookmark list name */
 "core_my_places" = "Paikkani";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings
index 5f73fbe618..61518521df 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Recherche";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Signets";
+"bookmarks_and_tracks" = "Signets et parcours";
 
 /* Used in home screen quick actions. */
 "route" = "Itinéraire";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 23739640c6..cb1e0d22eb 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Groupes de signets";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Signets";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Signets et parcours";
+
 /* Default bookmark list name */
 "core_my_places" = "Mes endroits";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
index 808eaa22ae..17e5c9af27 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
@@ -71,7 +71,7 @@
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
       <key>other</key>
-      <string>pistes %d</string>
+      <string>%d pistes</string>
     </dict>
   </dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/he.lproj/InfoPlist.strings
index 6b4c3de3ab..8d4eb5a894 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "רשימות אתרים";
+"bookmarks_and_tracks" = "רשימות אתרים ונתיבים";
 
 /* Used in home screen quick actions. */
 "route" = "נתיב";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 634ea172e4..d1a58cf17d 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "רשימות אתרים";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "רשימות אתרים";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "רשימות אתרים ונתיבים";
+
 /* Default bookmark list name */
 "core_my_places" = "המקומות שלי";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings
index 0c9cd30f7c..234c57aa3f 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Keresés";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Könyvjelzők";
+"bookmarks_and_tracks" = "Könyvjelzők és nyomvonalak";
 
 /* Used in home screen quick actions. */
 "route" = "Útvonal";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 145ab1751c..abfabfc952 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Könyvjelzőcsoportok";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Könyvjelzők";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Könyvjelzők és nyomvonalak";
+
 /* Default bookmark list name */
 "core_my_places" = "Saját helyeim";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/id.lproj/InfoPlist.strings
index 2058a2ea32..17b380002d 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Cari";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Penanda";
+"bookmarks_and_tracks" = "Penanda dan jalur";
 
 /* Used in home screen quick actions. */
 "route" = "Rute";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index cf965d9552..c5092afbe5 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Set Penanda";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Penanda";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Penanda dan jalur";
+
 /* Default bookmark list name */
 "core_my_places" = "Tempat-tempat Saya";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
index 4c4856e770..e1177dd4b2 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" = "Luoghi preferiti";
+"bookmarks_and_tracks" = "Luoghi preferiti e percorsi";
 
 /* 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 d5e677e3cc..50db552c8e 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Elenchi di luoghi preferiti";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Luoghi preferiti";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Luoghi preferiti e percorsi";
+
 /* Default bookmark list name */
 "core_my_places" = "I miei luoghi";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ja.lproj/InfoPlist.strings
index 1aa336f8fa..71354e43f0 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "検索";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "ブックマーク";
+"bookmarks_and_tracks" = "ブックマークとトラック";
 
 /* Used in home screen quick actions. */
 "route" = "経路";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 5a4c1e0de2..42a43403b3 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "ブックマークセット";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "ブックマーク";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "ブックマークとトラック";
+
 /* Default bookmark list name */
 "core_my_places" = "マイロケーション";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ko.lproj/InfoPlist.strings
index 2d63f2aac5..64c0a8bd61 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "검색하기";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "북마크";
+"bookmarks_and_tracks" = "북마크 및 트랙";
 
 /* Used in home screen quick actions. */
 "route" = "경로";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index d692118fe6..e6a14d2ca1 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "세트를 즐겨찾기에 추가";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "북마크";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "북마크 및 트랙";
+
 /* Default bookmark list name */
 "core_my_places" = "내 장소";
 
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/mr.lproj/InfoPlist.strings
index c4cc7a6729..1a1920b44f 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "शोधा";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "खूणपत्रे";
+"bookmarks_and_tracks" = "खूणपत्रे आणि ट्रॅक";
 
 /* Used in home screen quick actions. */
 "route" = "मार्ग";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index a27baab3bc..d423e843c9 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "खूणपत्र याद्या";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "खूणपत्रे";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "खूणपत्रे आणि ट्रॅक";
+
 /* Default bookmark list name */
 "core_my_places" = "माझी ठिकाणे";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/nb.lproj/InfoPlist.strings
index a5cc28b75e..99da033898 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Søk";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bokmerker";
+"bookmarks_and_tracks" = "Bokmerker og ruter";
 
 /* Used in home screen quick actions. */
 "route" = "Rute";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 9291d9799c..d9d6887407 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bokmerk sett";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Bokmerker";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Bokmerker og ruter";
+
 /* Default bookmark list name */
 "core_my_places" = "Mine steder";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
index ed3320dd73..77e333318e 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Zoeken";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bladwijzers";
+"bookmarks_and_tracks" = "Bladwijzers en tracks";
 
 /* Used in home screen quick actions. */
 "route" = "Route";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index ac5d2b5e06..fbfd100d0d 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bladwijzergroepen";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Bladwijzers";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Bladwijzers en tracks";
+
 /* Default bookmark list name */
 "core_my_places" = "Mijn plaatsen";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict
index 2ef21ffe54..c6cda962a4 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict
@@ -67,7 +67,7 @@
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
       <key>other</key>
-      <string>%d routes</string>
+      <string>%d tracks</string>
     </dict>
   </dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/pl.lproj/InfoPlist.strings
index d9339080b3..73c78a86a9 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Szukaj";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Zakładki";
+"bookmarks_and_tracks" = "Zakładki i trasy";
 
 /* Used in home screen quick actions. */
 "route" = "Trasa";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 0d76b27281..b8e8f9c6b5 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Zestawy zakładek";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Zakładki";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Zakładki i trasy";
+
 /* Default bookmark list name */
 "core_my_places" = "Moje miejsca";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings
index a1a376cba1..5ae18e590c 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Buscar";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Favoritos";
+"bookmarks_and_tracks" = "Favoritos e trilhas";
 
 /* Used in home screen quick actions. */
 "route" = "Rota";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 32611441fd..86834dfca9 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Conjuntos de favoritos";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Favoritos";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Favoritos e trilhas";
+
 /* Default bookmark list name */
 "core_my_places" = "Meus locais";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/pt.lproj/InfoPlist.strings
index fa3c6c24af..6d02377f9e 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Procurar";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Favoritos";
+"bookmarks_and_tracks" = "Favoritos e trilhas";
 
 /* Used in home screen quick actions. */
 "route" = "Rota";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index ac8f0af133..fe3334e2c2 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Conjuntos de favoritos";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Favoritos";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Favoritos e trilhas";
+
 /* Default bookmark list name */
 "core_my_places" = "Os meus locais";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings
index f7267934e5..328e310ff8 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" = "Locuri preferate";
+"bookmarks_and_tracks" = "Locuri preferate și trasee";
 
 /* 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 f29a9c798f..a9c2c085e6 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Liste cu locuri preferate";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Locuri preferate";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Locuri preferate și trasee";
+
 /* Default bookmark list name */
 "core_my_places" = "Locurile mele";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ru.lproj/InfoPlist.strings
index 7015b883ec..8697e4c7a2 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Поиск";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Метки";
+"bookmarks_and_tracks" = "Метки и треки";
 
 /* Used in home screen quick actions. */
 "route" = "Маршрут";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 5750b9c0ac..add7953bba 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Списки меток";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Метки";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Метки и треки";
+
 /* Default bookmark list name */
 "core_my_places" = "Мои Метки";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/sk.lproj/InfoPlist.strings
index 34aac7493f..e5d915f660 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Hľadať";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Záložky";
+"bookmarks_and_tracks" = "Záložky a stopy";
 
 /* Used in home screen quick actions. */
 "route" = "Trasa";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 05751f3ad0..ac73cb6e5f 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Skupiny záložiek";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Záložky";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Záložky a stopy";
+
 /* Default bookmark list name */
 "core_my_places" = "Moje miesta";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/sv.lproj/InfoPlist.strings
index 8ac3910c38..ba910b2d27 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Sök";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bokmärken";
+"bookmarks_and_tracks" = "Bokmärken och rutter";
 
 /* Used in home screen quick actions. */
 "route" = "Rutt";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 7dd44d55e1..a6d7091858 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bokmärkessamlingar";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Bokmärken";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Bokmärken och rutter";
+
 /* Default bookmark list name */
 "core_my_places" = "Mina Platser";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/sw.lproj/InfoPlist.strings
index 52a69a1f53..c41284c9ef 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Search";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Bookmarks";
+"bookmarks_and_tracks" = "Bookmarks and Tracks";
 
 /* Used in home screen quick actions. */
 "route" = "Route";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 003a409e6e..734665b02a 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Bookmarks";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Bookmarks and Tracks";
+
 /* Default bookmark list name */
 "core_my_places" = "My Places";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/th.lproj/InfoPlist.strings
index 152d6174b6..5505c78063 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "ค้นหา";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "บุ๊กมาร์ก";
+"bookmarks_and_tracks" = "บุ๊กมาร์กและการติดตาม";
 
 /* Used in home screen quick actions. */
 "route" = "เส้นทาง";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 046829588e..0d074143d4 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "ชุดของบุ๊กมาร์ก";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "บุ๊กมาร์ก";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "บุ๊กมาร์กและการติดตาม";
+
 /* Default bookmark list name */
 "core_my_places" = "สถานที่ของฉัน";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/tr.lproj/InfoPlist.strings
index de0c0a9318..881bd4bf3c 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Ara";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Yer İmleri";
+"bookmarks_and_tracks" = "Yer İmleri ve kayıtlar";
 
 /* Used in home screen quick actions. */
 "route" = "Rota";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 588086513b..8b283fcdd8 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Yer İmi Listeleri";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Yer İmleri";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Yer İmleri ve kayıtlar";
+
 /* Default bookmark list name */
 "core_my_places" = "Yerlerim";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/uk.lproj/InfoPlist.strings
index f8738f347b..1227c3e1dc 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Пошук";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Мітки";
+"bookmarks_and_tracks" = "Мітки та маршрути";
 
 /* Used in home screen quick actions. */
 "route" = "Маршрут";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 03db9800ae..ace1ec36ed 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Списки мiток";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Мітки";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Мітки та маршрути";
+
 /* Default bookmark list name */
 "core_my_places" = "Мої Мітки";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/vi.lproj/InfoPlist.strings
index 663f155a64..4659c52619 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "Tìm kiếm";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "Đánh dấu";
+"bookmarks_and_tracks" = "Đánh dấu và dấu vết";
 
 /* Used in home screen quick actions. */
 "route" = "Tuyến đường";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 96afbd237f..05ab02a245 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Đánh dấu Bộ";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Đánh dấu";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "Đánh dấu và dấu vết";
+
 /* Default bookmark list name */
 "core_my_places" = "Các Địa chỉ của Tôi";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/InfoPlist.strings
index 8a0734cd37..1fc0672ac1 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "搜索";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "书签";
+"bookmarks_and_tracks" = "书签和轨迹";
 
 /* Used in home screen quick actions. */
 "route" = "路线";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 58369047b2..d478f4b340 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "书签集";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "书签";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "书签和轨迹";
+
 /* Default bookmark list name */
 "core_my_places" = "我的位置";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/InfoPlist.strings
index bc4d324fbc..ace6d54859 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/InfoPlist.strings
@@ -10,7 +10,7 @@
 "search" = "搜尋";
 
 /* Used in home screen quick actions. */
-"bookmarks" = "書籤";
+"bookmarks_and_tracks" = "書籤和軌跡";
 
 /* Used in home screen quick actions. */
 "route" = "路線";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 77c90da1e7..6968c0a7b2 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -71,9 +71,12 @@
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "收藏夾";
 
-/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
+/* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "書籤";
 
+/* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
+"bookmarks_and_tracks" = "書籤和軌跡";
+
 /* Default bookmark list name */
 "core_my_places" = "我的地點";