diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index bc51530bfd..5a772e84c2 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -655,7 +655,11 @@
     <string name="bookmark_lists_hide_all">إخفاء الكل</string>
     <string name="bookmark_lists_show_all">إظهار الكل</string>
     <plurals name="bookmarks_places">
-        <item quantity="other">%d من الإشارات المرجعية</item>
+        <item quantity="one">%d إشارة مرجعية</item>
+        <item quantity="two">%d إشارتان مرجعيتان</item>
+        <item quantity="few">%d إشارات مرجعية</item>
+        <item quantity="many">%d إشارةً مرجعيةً</item>
+        <item quantity="other">%d إشارةً مرجعيةً</item>
     </plurals>
     <string name="bookmarks_create_new_group">إنشاء قائمة جديدة</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
@@ -672,11 +676,19 @@
     <string name="phone_number">رقم الهاتف</string>
     <string name="profile">ملف الشخصي على خريطة الشارع المفتوحة</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="other">تم العثور على %d ملفات. سوف تراهم بعد التحويل.</item>
+        <item quantity="one">تم العثور على %d ملف. يمكنك رؤيته بعد التحويل.</item>
+        <item quantity="two">تم العثور على %d ملفين. يمكنك رؤيتهما بعد التحويل.</item>
+        <item quantity="few">تم العثور على %d ملفات. يمكنك رؤيتها بعد التحويل.</item>
+        <item quantity="many">تم العثور على %d ملفًا. يمكنك رؤيتها بعد التحويل.</item>
+        <item quantity="other">تم العثور على %d ملفًا. يمكنك رؤيتها بعد التحويل.</item>
     </plurals>
     <string name="restore">استعادة</string>
     <plurals name="tracks">
-        <item quantity="other">مسار %d</item>
+        <item quantity="one">%d مسار</item>
+        <item quantity="two">%d مساران</item>
+        <item quantity="few">%d مسارات</item>
+        <item quantity="many">%d مسارًا</item>
+        <item quantity="other">%d مسارًا</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">خصوصية</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 7418e2b8bc..05a0d20248 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -642,7 +642,8 @@
     <string name="bookmark_lists_hide_all">Hamısını gizlət</string>
     <string name="bookmark_lists_show_all">Hamısını göstər</string>
     <plurals name="bookmarks_places">
-        <item quantity="other">%d əlfəcin</item>
+        <item quantity="one">%d əlfəcin</item>
+        <item quantity="other">%d əlfəcinlər</item>
     </plurals>
     <string name="bookmarks_create_new_group">Yeni siyahı yaradın</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
@@ -659,10 +660,12 @@
     <string name="phone_number">Telefon nömrəsi</string>
     <string name="profile">OpenStreetMap profili</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="other">%d fayl tapıldı. Dönüşümdən sonra onları görəcəksiniz.</item>
+        <item quantity="one">%d fayl tapıldı. Onu dönüşümdən sonra görəcəksiniz.</item>
+        <item quantity="other">%d fayl tapıldı. Onları dönüşümdən sonra görəcəksiniz.</item>
     </plurals>
     <string name="restore">Bərpa</string>
     <plurals name="tracks">
+        <item quantity="one">%d istiqamət</item>
         <item quantity="other">%d istiqamətlər</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index 56682b4ac9..be326e97ce 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -661,7 +661,7 @@
     <string name="profile">Perfil d\'OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">S\'ha trobat %d fitxer. Podeu veure\'l després de la conversió.</item>
-        <item quantity="other">S\'han trobat %d fiters. Podeu veure\'ls després de la conversió.</item>
+        <item quantity="other">S\'han trobat %d fitxers. Podeu veure\'ls després de la conversió.</item>
     </plurals>
     <string name="restore">Restaura</string>
     <plurals name="tracks">
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 4294f97ac3..5a04284507 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -611,6 +611,7 @@
     <string name="bookmark_lists_hide_all">Skrýt vše</string>
     <string name="bookmark_lists_show_all">Zobrazit vše</string>
     <plurals name="bookmarks_places">
+        <item quantity="one">%d záložka</item>
         <item quantity="other">%d záložek</item>
     </plurals>
     <string name="bookmarks_create_new_group">Vytvořte nový seznam</string>
@@ -628,12 +629,13 @@
     <string name="phone_number">Telefonní číslo</string>
     <string name="profile">Profil OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="one">%d soubor byl nalezen. Uvidíte ji po konverzi.</item>
-        <item quantity="few">%d byly nalezeny soubory. Uvidíte je po konverzi.</item>
+        <item quantity="one">%d soubor byl nalezen. Uvidíte ho po konverzi.</item>
+        <item quantity="few">%d soubory byly nalezeny. Uvidíte je po konverzi.</item>
         <item quantity="other">Bylo nalezeno %d souborů. Uvidíte je po konverzi.</item>
     </plurals>
     <string name="restore">Obnovit</string>
     <plurals name="tracks">
+        <item quantity="one">%d cesta</item>
         <item quantity="other">%d cest</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 8b1f0a122b..0e726d81a6 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -602,6 +602,7 @@
     <string name="bookmark_lists_hide_all">Skjul alle</string>
     <string name="bookmark_lists_show_all">Vis alle</string>
     <plurals name="bookmarks_places">
+        <item quantity="one">%d bogmærke</item>
         <item quantity="other">%d bogmærker</item>
     </plurals>
     <string name="bookmarks_create_new_group">Opret ny liste</string>
@@ -620,10 +621,11 @@
     <string name="profile">OpenStreetMap profil</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">%d fil blev fundet. Du vil se det efter konvertering.</item>
-        <item quantity="other">Der er fundet %d filer. Du vil se dem efter konvertering.</item>
+        <item quantity="other">%d filer blev fundet. Du vil se dem efter konvertering.</item>
     </plurals>
     <string name="restore">Gendan</string>
     <plurals name="tracks">
+        <item quantity="one">%d rute</item>
         <item quantity="other">%d ruter</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 1dae8fb644..46d8b0ab75 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -657,7 +657,7 @@
     <string name="profile">Προφίλ OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">Βρέθηκε %d αρχείο. Θα το δείτε μετά τη μετατροπή.</item>
-        <item quantity="other">έχουν βρεθεί %d αρχεία. Θα τα δείτε μετά τη μετατροπή.</item>
+        <item quantity="other">Βρέθηκαν %d αρχεία. Θα τα δείτε μετά τη μετατροπή.</item>
     </plurals>
     <string name="restore">Επαναφορά</string>
     <plurals name="tracks">
diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml
index f3ba624c38..05da80eda4 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -83,6 +83,7 @@
     <string name="bookmark_lists_hide_all">Ocultar todo</string>
     <string name="bookmark_lists_show_all">Mostrar todo</string>
     <plurals name="bookmarks_places">
+        <item quantity="one">%d marcador</item>
         <item quantity="other">%d marcadores</item>
     </plurals>
     <string name="bookmarks_create_new_group">Crear lista nueva</string>
@@ -102,6 +103,7 @@
     </plurals>
     <string name="restore">Restaurar</string>
     <plurals name="tracks">
+        <item quantity="one">%d rastreo</item>
         <item quantity="other">%d rastreos</item>
     </plurals>
     <string name="privacy_policy">Política de Privacidad</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index acbbafd9d9..767d017656 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -638,6 +638,7 @@
     <string name="bookmark_lists_hide_all">Ocultar todo</string>
     <string name="bookmark_lists_show_all">Mostrar todo</string>
     <plurals name="bookmarks_places">
+        <item quantity="one">%d marcador</item>
         <item quantity="other">%d marcadores</item>
     </plurals>
     <string name="bookmarks_create_new_group">Crear nueva lista</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index e58e689679..2fd884e17b 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -657,6 +657,7 @@
     </plurals>
     <string name="restore">Taasta</string>
     <plurals name="tracks">
+        <item quantity="one">%d rada</item>
         <item quantity="other">%d rada</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 56d96b019f..6495dd6814 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -638,7 +638,8 @@
     <string name="bookmark_lists_hide_all">Ezkutatu guztiak</string>
     <string name="bookmark_lists_show_all">Erakutsi guztiak</string>
     <plurals name="bookmarks_places">
-        <item quantity="other">%d markagailu</item>
+        <item quantity="one">%d markagailu</item>
+        <item quantity="other">%d markagailuak</item>
     </plurals>
     <string name="bookmarks_create_new_group">Sortu zerrenda berria</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
@@ -660,8 +661,8 @@
     </plurals>
     <string name="restore">Berreskuratu</string>
     <plurals name="tracks">
-        <item quantity="one">arrasto %d</item>
-        <item quantity="other">%d arrasto</item>
+        <item quantity="one">%d arrasto</item>
+        <item quantity="other">%d arrastos</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Pribatutasuna</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 2a05695f9f..99cc7644c0 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -616,8 +616,8 @@
     <string name="phone_number">شماره تلفن</string>
     <string name="profile">OpenStreetMap نمایه</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="one">%d فایل پیدا شد. بعد از تبدیل آن را می‌بینید.</item>
-        <item quantity="other">%d فایل پیدا شد. بعد از تبدیل آن‌ها را می‌بینید.</item>
+        <item quantity="one">%d فایل پیدا شد. بعد از تبدیل آن را خواهید دید.</item>
+        <item quantity="other">%d فایل پیدا شد. بعد از تبدیل آنها را خواهید دید.</item>
     </plurals>
     <string name="restore">بازیابی</string>
     <plurals name="tracks">
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 7888a1e3cb..cd1b2c7e38 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -668,6 +668,7 @@
     </plurals>
     <string name="restore">Restaurer</string>
     <plurals name="tracks">
+        <item quantity="one">%d piste</item>
         <item quantity="other">%d pistes</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 5bfe0043a0..d437201da2 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -617,7 +617,8 @@
     <string name="bookmark_lists_hide_all">Összes elrejtése</string>
     <string name="bookmark_lists_show_all">Összes megjelenítése</string>
     <plurals name="bookmarks_places">
-        <item quantity="other">könyvjelzők %d</item>
+        <item quantity="one">%d könyvjelző</item>
+        <item quantity="other">%d könyvjelzők</item>
     </plurals>
     <string name="bookmarks_create_new_group">Új lista létrehozása</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
@@ -634,12 +635,13 @@
     <string name="phone_number">Telefonszám</string>
     <string name="profile">OpenStreetMap profil</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="one">%d fájlt találtunk. Látni fogja őket a konvertálás után.</item>
-        <item quantity="other">%d fájl található. Látni fogja őket a konvertálás után.</item>
+        <item quantity="one">%d fájl található. Látni fogod azt a konvertálás után.</item>
+        <item quantity="other">%d fájl található. Látni fogod őket a konvertálás után.</item>
     </plurals>
     <string name="restore">Visszaállítás</string>
     <plurals name="tracks">
-        <item quantity="other">%d út</item>
+        <item quantity="one">%d út</item>
+        <item quantity="other">%d útvonalak</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Adatvédelem</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 43caefcff5..2a430f21a7 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -624,10 +624,11 @@
     <string name="phone_number">Nomor telepon</string>
     <string name="profile">Profil OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="other">%d file telah ditemukan. Anda akan melihatnya setelah konversi.</item>
+        <item quantity="other">%d file ditemukan. Anda akan melihatnya setelah konversi.</item>
     </plurals>
     <string name="restore">Mengembalikan</string>
     <plurals name="tracks">
+        <item quantity="one">trek %d</item>
         <item quantity="other">trek %d</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index a2e4b52d79..00a7e1cc21 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -645,7 +645,7 @@
     <string name="profile">Profilo OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">%d file è stato trovato. Lo vedrai dopo la conversione.</item>
-        <item quantity="other">%d file trovati. Li vedrai dopo la conversione.</item>
+        <item quantity="other">%d file sono stati trovati. Li vedrai dopo la conversione.</item>
     </plurals>
     <string name="restore">Ripristina</string>
     <plurals name="tracks">
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 7211a3b409..d0623abe7f 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -652,8 +652,8 @@
     <string name="phone_number">מספר טלפון</string>
     <string name="profile">פרופיל OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="one">נמצא קובץ %d. יהיה ניתן לראות אותו לאחר ההמרה.</item>
-        <item quantity="other">נמצאו %d קבצים. יהיה ניתן לראות אותם לאחר ההמרה.</item>
+        <item quantity="one">נמצא %d קובץ. תוכלו לראות אותו לאחר ההמרה.</item>
+        <item quantity="other">נמצאו %d קבצים. תוכלו לראות אותם לאחר ההמרה.</item>
     </plurals>
     <string name="restore">שחזור</string>
     <plurals name="tracks">
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index a7e134ccb0..7abddc92e6 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -660,11 +660,13 @@
     <string name="phone_number">電話番号</string>
     <string name="profile">OpenStreetMap プロフィール</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="other">%d ファイルが見つかりました。 あなたは変換後にそれらを見るでしょう。</item>
+        <item quantity="one">%d ファイルが見つかりました。変換後にそれを見ることができます。</item>
+        <item quantity="other">%d ファイルが見つかりました。変換後にそれを見ることができます。</item>
     </plurals>
     <string name="restore">復元</string>
     <plurals name="tracks">
-        <item quantity="other">%dの追跡</item>
+        <item quantity="one">%d の追跡</item>
+        <item quantity="other">%d の追跡</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">プライバシー</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 83f357c6ac..d6e4fa580f 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -622,10 +622,11 @@
     <string name="phone_number">전화 번호</string>
     <string name="profile">OpenStreetMap 프로필</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="other">%d 파일을 찾았습니다. 회심 후 그들을 볼 수 있습니다.</item>
+        <item quantity="other">%d 개의 파일이 발견되었습니다. 변환 후 확인할 수 있습니다.</item>
     </plurals>
     <string name="restore">복원</string>
     <plurals name="tracks">
+        <item quantity="one">%d 추적</item>
         <item quantity="other">%d 추적</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index b3b33b17d5..dd05fc7071 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -630,6 +630,7 @@
     </plurals>
     <string name="restore">पूर्ववत् करा</string>
     <plurals name="tracks">
+        <item quantity="one">%d ट्रॅक</item>
         <item quantity="other">%d ट्रॅक</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 5f57554734..dbc0f2573d 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -639,6 +639,7 @@
     <string name="bookmark_lists_hide_all">Skjul alle</string>
     <string name="bookmark_lists_show_all">Vis alle</string>
     <plurals name="bookmarks_places">
+        <item quantity="one">%d bokmerke</item>
         <item quantity="other">%d bokmerker</item>
     </plurals>
     <string name="bookmarks_create_new_group">Opprett ny liste</string>
@@ -656,11 +657,12 @@
     <string name="phone_number">Telefonnummer</string>
     <string name="profile">OpenStreetMap profil</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="one">%d filen ble funnet. Du vil se dem etter konverteringen.</item>
+        <item quantity="one">%d fil funnet. Du vil se den etter konverteringen.</item>
         <item quantity="other">%d filer funnet. Du vil se dem etter konverteringen.</item>
     </plurals>
     <string name="restore">Restaurere</string>
     <plurals name="tracks">
+        <item quantity="one">%d sti</item>
         <item quantity="other">%d stier</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index ff430b6cc7..fa7932800c 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -639,6 +639,7 @@
     <string name="bookmark_lists_hide_all">Verberg alles</string>
     <string name="bookmark_lists_show_all">Toon alles</string>
     <plurals name="bookmarks_places">
+        <item quantity="one">%d bladwijzer</item>
         <item quantity="other">%d bladwijzers</item>
     </plurals>
     <string name="bookmarks_create_new_group">Maak een nieuwe lijst</string>
@@ -657,10 +658,11 @@
     <string name="profile">OpenStreetMap-profiel</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">%d bestand gevonden. Je ziet het na het converteren.</item>
-        <item quantity="other">Er zijn %d bestanden gevonden. Je zult ze na de conversie zien.</item>
+        <item quantity="other">%d bestanden gevonden. Je zult ze na de conversie zien.</item>
     </plurals>
     <string name="restore">Zet terug</string>
     <plurals name="tracks">
+        <item quantity="one">%d track</item>
         <item quantity="other">%d tracks</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 385bd2a36f..a87e7089bf 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -660,8 +660,8 @@
     <string name="phone_number">Numer telefonu</string>
     <string name="profile">Profil OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="one">Znaleziono %d plik. Zobaczysz to po konwersji.</item>
-        <item quantity="two">Znaleziono %d pliki. Zobaczysz je po konwersji.</item>
+        <item quantity="one">Znaleziono %d plik. Zobaczysz go po konwersji.</item>
+        <item quantity="few">Znaleziono %d pliki. Zobaczysz je po konwersji.</item>
         <item quantity="other">Znaleziono %d plików. Zobaczysz je po konwersji.</item>
     </plurals>
     <string name="restore">Przywróć</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index d2b5d7ef37..f2b43c524b 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -638,6 +638,7 @@
     <string name="bookmark_lists_hide_all">Skryť všetko</string>
     <string name="bookmark_lists_show_all">Zobraziť všetko</string>
     <plurals name="bookmarks_places">
+        <item quantity="one">%d záložka</item>
         <item quantity="other">%d záložiek</item>
     </plurals>
     <string name="bookmarks_create_new_group">Vytvoriť nový zoznam</string>
@@ -655,12 +656,13 @@
     <string name="phone_number">Telefónne číslo</string>
     <string name="profile">Profil OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="one">Bol nájdený %d súbor. Uvidíte to po konverzii.</item>
+        <item quantity="one">Bol nájdený %d súbor. Uvidíte ho po konverzii.</item>
         <item quantity="few">Boli nájdené %d súbory. Uvidíte ich po konverzii.</item>
         <item quantity="other">Bolo nájdených %d súborov. Uvidíte ich po konverzii.</item>
     </plurals>
     <string name="restore">Obnoviť</string>
     <plurals name="tracks">
+        <item quantity="one">%d sledovanie</item>
         <item quantity="other">%d sledovania</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index 7b46cd03ba..81511efb2a 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -628,6 +628,7 @@
     <string name="bookmark_lists_show_all">Прикажи све</string>
     <plurals name="bookmarks_places">
         <item quantity="one">%d маркер</item>
+        <item quantity="few">%d маркери</item>
         <item quantity="other">%d маркера</item>
     </plurals>
     <string name="bookmarks_create_new_group">Креирај нову листу</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index b9fed724ad..14f001a022 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -604,6 +604,7 @@
     <string name="bookmark_lists_hide_all">Dölj alla</string>
     <string name="bookmark_lists_show_all">Visa alla</string>
     <plurals name="bookmarks_places">
+        <item quantity="one">%d bokmärke</item>
         <item quantity="other">%d bokmärken</item>
     </plurals>
     <string name="bookmarks_create_new_group">Skapa ny lista</string>
@@ -622,7 +623,7 @@
     <string name="profile">OpenStreetMap profil</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">%d fil hittades. Du kommer att se den efter omvandlingen.</item>
-        <item quantity="other">%d filer har hittats. Du kommer att se dem efter omvandlingen.</item>
+        <item quantity="other">%d filer hittades. Du kommer att se dem efter omvandlingen.</item>
     </plurals>
     <string name="restore">Återställa</string>
     <plurals name="tracks">
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 2a6528ed6f..46ea999129 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -184,7 +184,7 @@
     <string name="bookmark_lists_hide_all">Ficha zote</string>
     <string name="bookmark_lists_show_all">Onyesha zote</string>
     <plurals name="bookmarks_places">
-        <item quantity="other">Alamisho %d</item>
+        <item quantity="other">%d alamisho</item>
     </plurals>
     <string name="bookmarks_create_new_group">Unda orodha mpya</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
@@ -201,10 +201,11 @@
     <string name="phone_number">Nambari ya simu</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">Faili %d ilipatikana. Utaiona baada ya uongofu.</item>
-        <item quantity="other">Files %d zimepatikana. Utawaona baada ya uongofu.</item>
+        <item quantity="other">Files %d zimepatikana. Utaziona baada ya uongofu.</item>
     </plurals>
     <string name="restore">Rejesha</string>
     <plurals name="tracks">
+        <item quantity="one">Njia %d</item>
         <item quantity="other">Njia %d</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index e8c335e113..1db99bb36d 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -625,10 +625,12 @@
     <string name="phone_number">หมายเลขโทรศัพท์</string>
     <string name="profile">โปรไฟล์ OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="other">%d ไฟล์ที่ค้นพบ คุณจะเห็นพวกเขาหลังจากการแปลง</item>
+        <item quantity="one">พบ %d ไฟล์ คุณจะเห็นมันหลังจากการแปลง</item>
+        <item quantity="other">พบ %d ไฟล์ คุณจะเห็นพวกเขาหลังจากการแปลง</item>
     </plurals>
     <string name="restore">ฟื้นฟู</string>
     <plurals name="tracks">
+        <item quantity="one">%d ติดตาม</item>
         <item quantity="other">%d ติดตามต่าง ๆ</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index bb41d08b54..e7ff1904a9 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -643,7 +643,8 @@
     <string name="bookmark_lists_hide_all">Tümünü gizle</string>
     <string name="bookmark_lists_show_all">Tümünü göster</string>
     <plurals name="bookmarks_places">
-        <item quantity="other">%d yer imi</item>
+        <item quantity="one">%d yer imi</item>
+        <item quantity="other">%d yer imleri</item>
     </plurals>
     <string name="bookmarks_create_new_group">Yeni liste oluştur</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
@@ -660,11 +661,13 @@
     <string name="phone_number">Telefon numarası</string>
     <string name="profile">OpenStreetMap profili</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="other">%d dosya bulundu. Dönüşümden sonra onları göreceksiniz.</item>
+        <item quantity="one">%d dosya bulundu. Dönüştürmeden sonra onu görebilirsiniz.</item>
+        <item quantity="other">%d dosya bulundu. Dönüştürmeden sonra onları görebilirsiniz.</item>
     </plurals>
     <string name="restore">Geri al</string>
     <plurals name="tracks">
-        <item quantity="other">%d rota</item>
+        <item quantity="one">%d rota</item>
+        <item quantity="other">%d rotalar</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Gizlilik</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 9d3866a051..a44421bf2d 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -622,12 +622,10 @@
     <string name="please_wait">Vui lòng chờ…</string>
     <string name="phone_number">Số điện thoại</string>
     <string name="profile">Hồ sơ OpenStreetMap</string>
-    <plurals name="bookmarks_detect_message">
-        <item quantity="other">%d tập tin đã được tìm thấy. Bạn sẽ thấy chúng sau khi chuyển đổi.</item>
-    </plurals>
     <string name="restore">Khôi phục</string>
     <plurals name="tracks">
-        <item quantity="other">%d các chặn đường</item>
+        <item quantity="one">%d chặng đường</item>
+        <item quantity="other">%d các chặng đường</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Sự riêng tư</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 8351461d4f..db51392b17 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -670,7 +670,8 @@
     <string name="phone_number">電話號碼</string>
     <string name="profile">OpenStreetMap 資料</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="other">找到 %d 個文件，轉換後您才能看到它們。</item>
+        <item quantity="one">找到 %d 個文件，轉換後您可以看到它。</item>
+        <item quantity="other">找到 %d 個文件，轉換後您可以看到它們。</item>
     </plurals>
     <string name="restore">恢復</string>
     <plurals name="tracks">
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index c9bab3eef2..ab348bc2af 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -670,7 +670,8 @@
     <string name="phone_number">电话号码</string>
     <string name="profile">OpenStreetMap 资料</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="other">找到 %d 个文件，转换后您才能看到它们。</item>
+        <item quantity="one">找到 %d 个文件，转换后您可以看到它。</item>
+        <item quantity="other">找到 %d 个文件，转换后您可以看到它们。</item>
     </plurals>
     <string name="restore">恢复</string>
     <plurals name="tracks">
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict
index 33ffa191c3..fcc53f1a1a 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict
@@ -15,8 +15,16 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d إشارة مرجعية</string>
+			<key>two</key>
+			<string>%d إشارتان مرجعيتان</string>
+			<key>few</key>
+			<string>%d إشارات مرجعية</string>
+			<key>many</key>
+			<string>%d إشارةً مرجعيةً</string>
 			<key>other</key>
-			<string>%d من الإشارات المرجعية</string>
+			<string>%d إشارةً مرجعيةً</string>
 		</dict>
 	</dict>
 
@@ -30,8 +38,16 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>تم العثور على %d ملف. يمكنك رؤيته بعد التحويل.</string>
+			<key>two</key>
+			<string>تم العثور على %d ملفين. يمكنك رؤيتهما بعد التحويل.</string>
+			<key>few</key>
+			<string>تم العثور على %d ملفات. يمكنك رؤيتها بعد التحويل.</string>
+			<key>many</key>
+			<string>تم العثور على %d ملفًا. يمكنك رؤيتها بعد التحويل.</string>
 			<key>other</key>
-			<string>تم العثور على %d ملفات. سوف تراهم بعد التحويل.</string>
+			<string>تم العثور على %d ملفًا. يمكنك رؤيتها بعد التحويل.</string>
 		</dict>
 	</dict>
 
@@ -45,8 +61,16 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d مسار</string>
+			<key>two</key>
+			<string>%d مساران</string>
+			<key>few</key>
+			<string>%d مسارات</string>
+			<key>many</key>
+			<string>%d مسارًا</string>
 			<key>other</key>
-			<string>مسار %d</string>
+			<string>%d مسارًا</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.stringsdict
index c326c329f4..6c9f8d1de2 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.stringsdict
@@ -15,8 +15,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>other</key>
+			<key>one</key>
 			<string>%d əlfəcin</string>
+			<key>other</key>
+			<string>%d əlfəcinlər</string>
 		</dict>
 	</dict>
 
@@ -30,8 +32,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d fayl tapıldı. Onu dönüşümdən sonra görəcəksiniz.</string>
 			<key>other</key>
-			<string>%d fayl tapıldı. Dönüşümdən sonra onları görəcəksiniz.</string>
+			<string>%d fayl tapıldı. Onları dönüşümdən sonra görəcəksiniz.</string>
 		</dict>
 	</dict>
 
@@ -45,6 +49,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d istiqamət</string>
 			<key>other</key>
 			<string>%d istiqamətlər</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.stringsdict
index 6bb2e7cb4a..d6d10733c1 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.stringsdict
@@ -35,7 +35,7 @@
 			<key>one</key>
 			<string>S'ha trobat %d fitxer. Podeu veure'l després de la conversió.</string>
 			<key>other</key>
-			<string>S'han trobat %d fiters. Podeu veure'ls després de la conversió.</string>
+			<string>S'han trobat %d fitxers. Podeu veure'ls després de la conversió.</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict
index 20b78d3a8d..ad3505f41d 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict
@@ -15,6 +15,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d záložka</string>
 			<key>other</key>
 			<string>%d záložek</string>
 		</dict>
@@ -31,9 +33,9 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%d soubor byl nalezen. Uvidíte ji po konverzi.</string>
+			<string>%d soubor byl nalezen. Uvidíte ho po konverzi.</string>
 			<key>few</key>
-			<string>%d byly nalezeny soubory. Uvidíte je po konverzi.</string>
+			<string>%d soubory byly nalezeny. Uvidíte je po konverzi.</string>
 			<key>other</key>
 			<string>Bylo nalezeno %d souborů. Uvidíte je po konverzi.</string>
 		</dict>
@@ -49,6 +51,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d cesta</string>
 			<key>other</key>
 			<string>%d cest</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict
index ca4645ed84..6e101cfed4 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict
@@ -15,6 +15,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d bogmærke</string>
 			<key>other</key>
 			<string>%d bogmærker</string>
 		</dict>
@@ -33,7 +35,7 @@
 			<key>one</key>
 			<string>%d fil blev fundet. Du vil se det efter konvertering.</string>
 			<key>other</key>
-			<string>Der er fundet %d filer. Du vil se dem efter konvertering.</string>
+			<string>%d filer blev fundet. Du vil se dem efter konvertering.</string>
 		</dict>
 	</dict>
 
@@ -47,6 +49,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d rute</string>
 			<key>other</key>
 			<string>%d ruter</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict
index cc7c2dd63b..ae98696e39 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict
@@ -35,7 +35,7 @@
 			<key>one</key>
 			<string>Βρέθηκε %d αρχείο. Θα το δείτε μετά τη μετατροπή.</string>
 			<key>other</key>
-			<string>έχουν βρεθεί %d αρχεία. Θα τα δείτε μετά τη μετατροπή.</string>
+			<string>Βρέθηκαν %d αρχεία. Θα τα δείτε μετά τη μετατροπή.</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.stringsdict
index 71d7c728ff..67352eecc0 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.stringsdict
@@ -15,6 +15,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d marcador</string>
 			<key>other</key>
 			<string>%d marcadores</string>
 		</dict>
@@ -47,6 +49,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d rastreo</string>
 			<key>other</key>
 			<string>%d rastreos</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict
index ef250bcf5b..dd37ebaae0 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict
@@ -15,6 +15,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d marcador</string>
 			<key>other</key>
 			<string>%d marcadores</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.stringsdict
index d34c9a6fe8..22a77605d9 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.stringsdict
@@ -49,6 +49,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d rada</string>
 			<key>other</key>
 			<string>%d rada</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict
index 7700e00743..f2f298cfe5 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict
@@ -15,8 +15,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>other</key>
+			<key>one</key>
 			<string>%d markagailu</string>
+			<key>other</key>
+			<string>%d markagailuak</string>
 		</dict>
 	</dict>
 
@@ -48,9 +50,9 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>arrasto %d</string>
-			<key>other</key>
 			<string>%d arrasto</string>
+			<key>other</key>
+			<string>%d arrastos</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict
index 3f70b83477..94dd0692db 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict
@@ -33,9 +33,9 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%d فایل پیدا شد. بعد از تبدیل آن را می‌بینید.</string>
+			<string>%d فایل پیدا شد. بعد از تبدیل آن را خواهید دید.</string>
 			<key>other</key>
-			<string>%d فایل پیدا شد. بعد از تبدیل آن‌ها را می‌بینید.</string>
+			<string>%d فایل پیدا شد. بعد از تبدیل آنها را خواهید دید.</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
index cab38d1dc8..4643cc610c 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
@@ -49,6 +49,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d piste</string>
 			<key>other</key>
 			<string>%d pistes</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.stringsdict
index b78c168eb3..af00a16cac 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.stringsdict
@@ -33,9 +33,9 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>נמצא קובץ %d. יהיה ניתן לראות אותו לאחר ההמרה.</string>
+			<string>נמצא %d קובץ. תוכלו לראות אותו לאחר ההמרה.</string>
 			<key>other</key>
-			<string>נמצאו %d קבצים. יהיה ניתן לראות אותם לאחר ההמרה.</string>
+			<string>נמצאו %d קבצים. תוכלו לראות אותם לאחר ההמרה.</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
index d767583bd2..70a63c0a2d 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
@@ -15,8 +15,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d könyvjelző</string>
 			<key>other</key>
-			<string>könyvjelzők %d</string>
+			<string>%d könyvjelzők</string>
 		</dict>
 	</dict>
 
@@ -31,9 +33,9 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%d fájlt találtunk. Látni fogja őket a konvertálás után.</string>
+			<string>%d fájl található. Látni fogod azt a konvertálás után.</string>
 			<key>other</key>
-			<string>%d fájl található. Látni fogja őket a konvertálás után.</string>
+			<string>%d fájl található. Látni fogod őket a konvertálás után.</string>
 		</dict>
 	</dict>
 
@@ -47,8 +49,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>other</key>
+			<key>one</key>
 			<string>%d út</string>
+			<key>other</key>
+			<string>%d útvonalak</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict
index 5e425a440f..7c91dfbab3 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict
@@ -31,7 +31,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>other</key>
-			<string>%d file telah ditemukan. Anda akan melihatnya setelah konversi.</string>
+			<string>%d file ditemukan. Anda akan melihatnya setelah konversi.</string>
 		</dict>
 	</dict>
 
@@ -45,6 +45,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>trek %d</string>
 			<key>other</key>
 			<string>trek %d</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
index 9cf0ed9434..46d571244d 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
@@ -35,7 +35,7 @@
 			<key>one</key>
 			<string>%d file è stato trovato. Lo vedrai dopo la conversione.</string>
 			<key>other</key>
-			<string>%d file trovati. Li vedrai dopo la conversione.</string>
+			<string>%d file sono stati trovati. Li vedrai dopo la conversione.</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict
index 1274e7491f..5c23d5df16 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict
@@ -30,8 +30,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d ファイルが見つかりました。変換後にそれを見ることができます。</string>
 			<key>other</key>
-			<string>%d ファイルが見つかりました。 あなたは変換後にそれらを見るでしょう。</string>
+			<string>%d ファイルが見つかりました。変換後にそれを見ることができます。</string>
 		</dict>
 	</dict>
 
@@ -45,8 +47,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d の追跡</string>
 			<key>other</key>
-			<string>%dの追跡</string>
+			<string>%d の追跡</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict
index 8a75854b70..2603bf4c49 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict
@@ -31,7 +31,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>other</key>
-			<string>%d 파일을 찾았습니다. 회심 후 그들을 볼 수 있습니다.</string>
+			<string>%d 개의 파일이 발견되었습니다. 변환 후 확인할 수 있습니다.</string>
 		</dict>
 	</dict>
 
@@ -45,6 +45,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d 추적</string>
 			<key>other</key>
 			<string>%d 추적</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.stringsdict
index 13b8c4f608..490ad81126 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.stringsdict
@@ -49,6 +49,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d ट्रॅक</string>
 			<key>other</key>
 			<string>%d ट्रॅक</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
index 8b7832357c..7a2d953559 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
@@ -15,6 +15,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d bokmerke</string>
 			<key>other</key>
 			<string>%d bokmerker</string>
 		</dict>
@@ -31,7 +33,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%d filen ble funnet. Du vil se dem etter konverteringen.</string>
+			<string>%d fil funnet. Du vil se den etter konverteringen.</string>
 			<key>other</key>
 			<string>%d filer funnet. Du vil se dem etter konverteringen.</string>
 		</dict>
@@ -47,6 +49,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d sti</string>
 			<key>other</key>
 			<string>%d stier</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict
index ad9dd89626..5ee5e0e1be 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict
@@ -15,6 +15,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d bladwijzer</string>
 			<key>other</key>
 			<string>%d bladwijzers</string>
 		</dict>
@@ -33,7 +35,7 @@
 			<key>one</key>
 			<string>%d bestand gevonden. Je ziet het na het converteren.</string>
 			<key>other</key>
-			<string>Er zijn %d bestanden gevonden. Je zult ze na de conversie zien.</string>
+			<string>%d bestanden gevonden. Je zult ze na de conversie zien.</string>
 		</dict>
 	</dict>
 
@@ -47,6 +49,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d track</string>
 			<key>other</key>
 			<string>%d tracks</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict
index e5ae93e5d4..e915e7583a 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict
@@ -35,8 +35,8 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>Znaleziono %d plik. Zobaczysz to po konwersji.</string>
-			<key>two</key>
+			<string>Znaleziono %d plik. Zobaczysz go po konwersji.</string>
+			<key>few</key>
 			<string>Znaleziono %d pliki. Zobaczysz je po konwersji.</string>
 			<key>other</key>
 			<string>Znaleziono %d plików. Zobaczysz je po konwersji.</string>
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict
index 658be9413e..202074ca94 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict
@@ -15,6 +15,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d záložka</string>
 			<key>other</key>
 			<string>%d záložiek</string>
 		</dict>
@@ -31,7 +33,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>Bol nájdený %d súbor. Uvidíte to po konverzii.</string>
+			<string>Bol nájdený %d súbor. Uvidíte ho po konverzii.</string>
 			<key>few</key>
 			<string>Boli nájdené %d súbory. Uvidíte ich po konverzii.</string>
 			<key>other</key>
@@ -49,6 +51,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d sledovanie</string>
 			<key>other</key>
 			<string>%d sledovania</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.stringsdict
index ec6819ce9d..d3c4408b01 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.stringsdict
@@ -17,6 +17,8 @@
 			<string>d</string>
 			<key>one</key>
 			<string>%d маркер</string>
+			<key>few</key>
+			<string>%d маркери</string>
 			<key>other</key>
 			<string>%d маркера</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict
index 8b64d8ff39..2acde4d29d 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict
@@ -15,6 +15,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d bokmärke</string>
 			<key>other</key>
 			<string>%d bokmärken</string>
 		</dict>
@@ -33,7 +35,7 @@
 			<key>one</key>
 			<string>%d fil hittades. Du kommer att se den efter omvandlingen.</string>
 			<key>other</key>
-			<string>%d filer har hittats. Du kommer att se dem efter omvandlingen.</string>
+			<string>%d filer hittades. Du kommer att se dem efter omvandlingen.</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.stringsdict
index 58c21cf1db..c06d9a94a5 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.stringsdict
@@ -16,7 +16,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>other</key>
-			<string>Alamisho %d</string>
+			<string>%d alamisho</string>
 		</dict>
 	</dict>
 
@@ -33,7 +33,7 @@
 			<key>one</key>
 			<string>Faili %d ilipatikana. Utaiona baada ya uongofu.</string>
 			<key>other</key>
-			<string>Files %d zimepatikana. Utawaona baada ya uongofu.</string>
+			<string>Files %d zimepatikana. Utaziona baada ya uongofu.</string>
 		</dict>
 	</dict>
 
@@ -47,6 +47,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>Njia %d</string>
 			<key>other</key>
 			<string>Njia %d</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict
index 13b4efdbdd..75cb11fc0d 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict
@@ -30,8 +30,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>พบ %d ไฟล์ คุณจะเห็นมันหลังจากการแปลง</string>
 			<key>other</key>
-			<string>%d ไฟล์ที่ค้นพบ คุณจะเห็นพวกเขาหลังจากการแปลง</string>
+			<string>พบ %d ไฟล์ คุณจะเห็นพวกเขาหลังจากการแปลง</string>
 		</dict>
 	</dict>
 
@@ -45,6 +47,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d ติดตาม</string>
 			<key>other</key>
 			<string>%d ติดตามต่าง ๆ</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
index 9caa74de12..a360c6fcd5 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
@@ -15,8 +15,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>other</key>
+			<key>one</key>
 			<string>%d yer imi</string>
+			<key>other</key>
+			<string>%d yer imleri</string>
 		</dict>
 	</dict>
 
@@ -30,8 +32,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d dosya bulundu. Dönüştürmeden sonra onu görebilirsiniz.</string>
 			<key>other</key>
-			<string>%d dosya bulundu. Dönüşümden sonra onları göreceksiniz.</string>
+			<string>%d dosya bulundu. Dönüştürmeden sonra onları görebilirsiniz.</string>
 		</dict>
 	</dict>
 
@@ -45,8 +49,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>other</key>
+			<key>one</key>
 			<string>%d rota</string>
+			<key>other</key>
+			<string>%d rotalar</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict
index 7e01158395..5329e8b879 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict
@@ -31,7 +31,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>other</key>
-			<string>%d tập tin đã được tìm thấy. Bạn sẽ thấy chúng sau khi chuyển đổi.</string>
+			<string>%d files were found. You can see them after conversion.</string>
 		</dict>
 	</dict>
 
@@ -45,8 +45,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d chặng đường</string>
 			<key>other</key>
-			<string>%d các chặn đường</string>
+			<string>%d các chặng đường</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict
index 8cd4ac4493..b995285947 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict
@@ -30,8 +30,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>找到 %d 个文件，转换后您可以看到它。</string>
 			<key>other</key>
-			<string>找到 %d 个文件，转换后您才能看到它们。</string>
+			<string>找到 %d 个文件，转换后您可以看到它们。</string>
 		</dict>
 	</dict>
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict
index d15f932827..7eabd7e85d 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict
@@ -30,8 +30,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>找到 %d 個文件，轉換後您可以看到它。</string>
 			<key>other</key>
-			<string>找到 %d 個文件，轉換後您才能看到它們。</string>
+			<string>找到 %d 個文件，轉換後您可以看到它們。</string>
 		</dict>
 	</dict>