diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 5007582728..3388818651 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -291,7 +291,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">هل أنت واثق أنك تريد الاستمرار؟</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">المسارات</string>
+	<string name="tracks_title">المسارات</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">الطول</string>
 	<string name="share_my_location">مشاركة موقعي</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 40f1dbaf0f..46ba0afce3 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -286,7 +286,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Opravdu chcete pokračovat?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Stopy</string>
+	<string name="tracks_title">Stopy</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Délka</string>
 	<string name="share_my_location">Sdílet mé umístění</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index ba6987dd6a..cc408f0351 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -289,7 +289,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Er du sikker på, at du vil fortsætte?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Ruter</string>
+	<string name="tracks_title">Ruter</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Længde</string>
 	<string name="share_my_location">Del min lokation</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index eee092c901..690207cf23 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -293,7 +293,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Möchten Sie wirklich fortfahren?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Strecken</string>
+	<string name="tracks_title">Strecken</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Länge</string>
 	<string name="share_my_location">Meinen Standort teilen</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 4589fb3915..f0e703dd95 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -215,7 +215,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Θέλετε σίγουρα να συνεχίσετε?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Διαδρομές</string>
+	<string name="tracks_title">Διαδρομές</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Μήκος</string>
 	<string name="share_my_location">Κοινοποίηση της τοποθεσίας μου</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 90db4216f8..a5466e127c 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -278,7 +278,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">¿Seguro que desea continuar?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Tracks</string>
+	<string name="tracks_title">Tracks</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Longitud</string>
 	<string name="share_my_location">Compartir mi ubicación</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index fc5c186687..5993d10d49 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -285,7 +285,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Oletko varma että haluat jatkaa?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Reitit</string>
+	<string name="tracks_title">Reitit</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Pituus</string>
 	<string name="share_my_location">Jaa sijaintini</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index f448a2fab9..f2ff022e8f 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -290,7 +290,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Êtes-vous certain de vouloir continuer ?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Parcours</string>
+	<string name="tracks_title">Parcours</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Longueur</string>
 	<string name="share_my_location">Partager ma position</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 9d1c024cea..b1e5b35a08 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -286,7 +286,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Valóban folytatni akarja?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Csoportok</string>
+	<string name="tracks_title">Csoportok</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Hossz</string>
 	<string name="share_my_location">Helyzetem megosztása</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index a91a077228..755150a4f2 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -285,7 +285,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Apakah Anda yakin ingin melanjutkan?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Jalur</string>
+	<string name="tracks_title">Jalur</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Panjang</string>
 	<string name="share_my_location">Bagikan Lokasi Saya</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 8e1720aab0..d4e9cc8ca4 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -284,7 +284,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Sei sicuro di voler continuare?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Tracciati</string>
+	<string name="tracks_title">Tracciati</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Lunghezza</string>
 	<string name="share_my_location">Condividi la mia location</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 6ce90d5db1..604705c75b 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -278,7 +278,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">本当に続けますか?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">トラック</string>
+	<string name="tracks_title">トラック</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">距離</string>
 	<string name="share_my_location">位置情報を共有する</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index b6629bf4ee..e696c2b363 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -281,7 +281,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">계속하겠습니까?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">트랙</string>
+	<string name="tracks_title">트랙</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">길이</string>
 	<string name="share_my_location">내 위치 공유</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 9b5a206ec3..bdadb0b18c 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -285,7 +285,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Er du sikker på at du ønsker å fortsette?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Ruter</string>
+	<string name="tracks_title">Ruter</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Lengde</string>
 	<string name="share_my_location">Del posisjonen min</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 6fd6bc6323..2fb91b7b82 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -285,7 +285,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Weet u zeker dat u wilt doorgaan?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Tracks</string>
+	<string name="tracks_title">Tracks</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Lengte</string>
 	<string name="share_my_location">Deel mijn locatie</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index c9ffe377c8..58fa3771c6 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -288,7 +288,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Kontynuować?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Trasy</string>
+	<string name="tracks_title">Trasy</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Długość</string>
 	<string name="share_my_location">Udostępnij aktualne położenie</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index d266437777..943ddfe8ad 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -286,7 +286,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Tem a certeza de que pretende continuar?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Percursos</string>
+	<string name="tracks_title">Percursos</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Comprimento</string>
 	<string name="share_my_location">Partilhar a minha localização</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index caf61a827d..27af6fd05a 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -285,7 +285,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Sunteți sigur că doriți să continuați?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Rute</string>
+	<string name="tracks_title">Rute</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Lungime</string>
 	<string name="share_my_location">Partajează-mi poziția</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index ba2ae091ed..55faf892d4 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -294,7 +294,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Вы уверены, что хотите продолжить?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Треки</string>
+	<string name="tracks_title">Треки</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Длина</string>
 	<string name="share_my_location">Поделиться местоположением</string>
@@ -1357,21 +1357,25 @@
 	<plurals name="bookmarks_objects">
 	  <item quantity="one">%s объект</item>
 	  <item quantity="two">%d объекта</item>
+	  <item quantity="few">%d объекта</item>
 	  <item quantity="other">%s объектов</item>
 	</plurals>
 	<plurals name="objects">
 	  <item quantity="one">%d объект</item>
 	  <item quantity="two">%d объекта</item>
+	  <item quantity="few">%d объекта</item>
 	  <item quantity="other">%d объектов</item>
 	</plurals>
 	<plurals name="places">
 	  <item quantity="one">%d место</item>
 	  <item quantity="two">%d места</item>
+	  <item quantity="few">%d места</item>
 	  <item quantity="other">%d мест</item>
 	</plurals>
 	<plurals name="tracks">
 	  <item quantity="one">%d трек</item>
 	  <item quantity="two">%d трека</item>
+	  <item quantity="few">%d трека</item>
 	  <item quantity="other">%d треков</item>
 	</plurals>
 	<string name="subtittle_opt_out">Настройки сопровождения</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 18bee9c68e..4ca4c938d1 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -284,7 +284,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Naozaj chcete pokračovať?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Stopy</string>
+	<string name="tracks_title">Stopy</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Diaľka</string>
 	<string name="share_my_location">Zdielať moje umiestnenie</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index f264ed0f6f..86030ab429 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -287,7 +287,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Är du säker på att du vill fortsätta?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Rutter</string>
+	<string name="tracks_title">Rutter</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Längd</string>
 	<string name="share_my_location">Dela Min Plats</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 4e481135f9..6972f7d888 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -291,7 +291,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">คุณแน่ใจหรือไม่ว่าคุณต้องการดำเนินการต่อ?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">การติดตาม</string>
+	<string name="tracks_title">การติดตาม</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">ระยะเวลา</string>
 	<string name="share_my_location">แชร์ตำแหน่งที่ตั้งของฉัน</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index ed64a3767b..54dec5d587 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -291,7 +291,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Devam etmek istediğinizden emin misiniz?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Parçalar</string>
+	<string name="tracks_title">Parçalar</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Uzunluk</string>
 	<string name="share_my_location">Yerimi paylaş</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 0b269f4980..49801f83f0 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -291,7 +291,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Продовжити?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Маршрути</string>
+	<string name="tracks_title">Маршрути</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Довжина</string>
 	<string name="share_my_location">Поділитися моїм місцезнаходженням</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 7d4323e807..74232f7aab 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -285,7 +285,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Bạn có chắc muốn tiếp tục không?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Dấu vết</string>
+	<string name="tracks_title">Dấu vết</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Độ dài</string>
 	<string name="share_my_location">Chia sẻ Vị trí của tôi</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 698103ae83..dcafb26123 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -289,7 +289,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">確定要繼續嗎？</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">軌跡</string>
+	<string name="tracks_title">軌跡</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">長度</string>
 	<string name="share_my_location">分享我的位置</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index a8efd91b17..402982a421 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -287,7 +287,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">您确定要继续吗?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">轨迹</string>
+	<string name="tracks_title">轨迹</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">长度</string>
 	<string name="share_my_location">共享我的位置</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 77735fe20e..445ca2b2bc 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -296,7 +296,7 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Are you sure you want to continue?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks">Tracks</string>
+	<string name="tracks_title">Tracks</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Length</string>
 	<string name="share_my_location">Share My Location</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index c49c2cac8b..6fe7ecf48f 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "هل أنت واثق أنك تريد الاستمرار؟";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "المسارات";
+"tracks_title" = "المسارات";
 
 /* Length of track in cell that describes route */
 "length" = "الطول";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index df071d713e..9ab2f5952f 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Opravdu chcete pokračovat?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Stopy";
+"tracks_title" = "Stopy";
 
 /* Length of track in cell that describes route */
 "length" = "Délka";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 669c08ff9e..47a5fa79d7 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Er du sikker på, at du vil fortsætte?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Ruter";
+"tracks_title" = "Ruter";
 
 /* Length of track in cell that describes route */
 "length" = "Længde";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 66a7a229a8..b9faa7d827 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Möchten Sie wirklich fortfahren?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Strecken";
+"tracks_title" = "Strecken";
 
 /* Length of track in cell that describes route */
 "length" = "Länge";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index d49e405c58..d9e8430471 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Θέλετε σίγουρα να συνεχίσετε?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Διαδρομές";
+"tracks_title" = "Διαδρομές";
 
 /* Length of track in cell that describes route */
 "length" = "Μήκος";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index feb321f2f8..61177993da 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Are you sure you want to continue?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Tracks";
+"tracks_title" = "Tracks";
 
 /* Length of track in cell that describes route */
 "length" = "Length";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 385a96e634..92555496be 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Are you sure you want to continue?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Tracks";
+"tracks_title" = "Tracks";
 
 /* Length of track in cell that describes route */
 "length" = "Length";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 18b8173282..9aa7db0341 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "¿Seguro que desea continuar?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Tracks";
+"tracks_title" = "Tracks";
 
 /* Length of track in cell that describes route */
 "length" = "Longitud";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 2727626478..940b891172 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Oletko varma että haluat jatkaa?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Reitit";
+"tracks_title" = "Reitit";
 
 /* Length of track in cell that describes route */
 "length" = "Pituus";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 502a71c7ea..a419d6904d 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Êtes-vous certain de vouloir continuer ?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Parcours";
+"tracks_title" = "Parcours";
 
 /* Length of track in cell that describes route */
 "length" = "Longueur";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index a92d1208fc..989c1257af 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Valóban folytatni akarja?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Csoportok";
+"tracks_title" = "Csoportok";
 
 /* Length of track in cell that describes route */
 "length" = "Hossz";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index b4aa532a89..dfaa223fd0 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Apakah Anda yakin ingin melanjutkan?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Jalur";
+"tracks_title" = "Jalur";
 
 /* Length of track in cell that describes route */
 "length" = "Panjang";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 53e58ae648..dceea6ae6f 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Sei sicuro di voler continuare?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Tracciati";
+"tracks_title" = "Tracciati";
 
 /* Length of track in cell that describes route */
 "length" = "Lunghezza";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index a5a0168c07..fc88b4d903 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "本当に続けますか?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "トラック";
+"tracks_title" = "トラック";
 
 /* Length of track in cell that describes route */
 "length" = "距離";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index c02ed910ad..d59fe4d8ce 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "계속하겠습니까?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "트랙";
+"tracks_title" = "트랙";
 
 /* Length of track in cell that describes route */
 "length" = "길이";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 2c269b6849..57688a816d 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Er du sikker på at du ønsker å fortsette?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Ruter";
+"tracks_title" = "Ruter";
 
 /* Length of track in cell that describes route */
 "length" = "Lengde";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index a42480cfd9..9c652c02f2 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Weet u zeker dat u wilt doorgaan?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Tracks";
+"tracks_title" = "Tracks";
 
 /* Length of track in cell that describes route */
 "length" = "Lengte";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 74e949dcf7..0ca7ad1125 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Kontynuować?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Trasy";
+"tracks_title" = "Trasy";
 
 /* Length of track in cell that describes route */
 "length" = "Długość";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 4f85c4736a..204b05acda 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Tem a certeza de que pretende continuar?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Percursos";
+"tracks_title" = "Percursos";
 
 /* Length of track in cell that describes route */
 "length" = "Comprimento";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 5eef8f66b5..9c2923ca7d 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Sunteți sigur că doriți să continuați?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Rute";
+"tracks_title" = "Rute";
 
 /* Length of track in cell that describes route */
 "length" = "Lungime";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index ef9f84ce7a..9be3673921 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Вы уверены, что хотите продолжить?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Треки";
+"tracks_title" = "Треки";
 
 /* Length of track in cell that describes route */
 "length" = "Длина";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
index bfee952f70..f311c8f971 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
@@ -78,6 +78,8 @@
       <string>%s объект</string>
       <key>two</key>
       <string>%d объекта</string>
+      <key>few</key>
+      <string>%d объекта</string>
       <key>other</key>
       <string>%s объектов</string>
     </dict>
@@ -97,6 +99,8 @@
       <string>%d объект</string>
       <key>two</key>
       <string>%d объекта</string>
+      <key>few</key>
+      <string>%d объекта</string>
       <key>other</key>
       <string>%d объектов</string>
     </dict>
@@ -116,6 +120,8 @@
       <string>%d место</string>
       <key>two</key>
       <string>%d места</string>
+      <key>few</key>
+      <string>%d места</string>
       <key>other</key>
       <string>%d мест</string>
     </dict>
@@ -135,6 +141,8 @@
       <string>%d трек</string>
       <key>two</key>
       <string>%d трека</string>
+      <key>few</key>
+      <string>%d трека</string>
       <key>other</key>
       <string>%d треков</string>
     </dict>
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index e20a64c924..ef1382152e 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Naozaj chcete pokračovať?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Stopy";
+"tracks_title" = "Stopy";
 
 /* Length of track in cell that describes route */
 "length" = "Diaľka";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 2ab0a94e69..1922b9adcb 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Är du säker på att du vill fortsätta?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Rutter";
+"tracks_title" = "Rutter";
 
 /* Length of track in cell that describes route */
 "length" = "Längd";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 6089cea5ee..62b0b770e3 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "คุณแน่ใจหรือไม่ว่าคุณต้องการดำเนินการต่อ?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "การติดตาม";
+"tracks_title" = "การติดตาม";
 
 /* Length of track in cell that describes route */
 "length" = "ระยะเวลา";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 53e58a2563..3c2aa8793b 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Devam etmek istediğinizden emin misiniz?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Parçalar";
+"tracks_title" = "Parçalar";
 
 /* Length of track in cell that describes route */
 "length" = "Uzunluk";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index ac20358aa3..e9442944c7 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Продовжити?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Маршрути";
+"tracks_title" = "Маршрути";
 
 /* Length of track in cell that describes route */
 "length" = "Довжина";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 8ed4051452..ec5bd5a2ca 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "Bạn có chắc muốn tiếp tục không?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "Dấu vết";
+"tracks_title" = "Dấu vết";
 
 /* Length of track in cell that describes route */
 "length" = "Độ dài";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 1e62d3dc93..74ee1a2363 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "您确定要继续吗?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "轨迹";
+"tracks_title" = "轨迹";
 
 /* Length of track in cell that describes route */
 "length" = "长度";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 25f517f80f..da765e9dbb 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -457,7 +457,7 @@
 "are_you_sure" = "確定要繼續嗎？";
 
 /* Title for tracks category in bookmarks manager */
-"tracks" = "軌跡";
+"tracks_title" = "軌跡";
 
 /* Length of track in cell that describes route */
 "length" = "長度";