diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index f42ca1f592..7390282060 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -292,8 +292,6 @@
 	<string name="gray">رمادي</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">رمادي أزرق</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">نعم</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">عند اتباع المسار، يُرجى وضع ما يلي في الاعتبار:</string>
@@ -598,6 +596,14 @@
 	<string name="avoid_toll_roads_placepage">تجنب نقاط تحصيل الرسوم</string>
 	<string name="avoid_unpaved_roads_placepage">تجنب الطرق الغير ممهدة</string>
 	<string name="avoid_ferry_crossing_placepage">تجنب تقاطع العبارات</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">نعم</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">لا</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">نعم</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">لا</string>
 	<string name="ok">موافق</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">تريتب…</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 552550abaa..73667dd74d 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -300,8 +300,6 @@
 	<string name="gray">Шэры</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Блакітна-шэры</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Так</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Рухаючыся па маршруце, майце на ўвазе:</string>
@@ -616,6 +614,14 @@
 	<string name="avoid_toll_roads_placepage">Пазбягаць платных дарог</string>
 	<string name="avoid_unpaved_roads_placepage">Пазбягаць грунтовых дарог</string>
 	<string name="avoid_ferry_crossing_placepage">Пазбягаць паромных перапраў</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Так</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Не</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ёсць</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Няма</string>
 	<string name="ok">Ок</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Сартаваць…</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 0ad62e811d..54ca8b155c 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -281,8 +281,6 @@
 	<string name="brown">Кафяво</string>
 	<!-- pink color -->
 	<string name="pink">Розово</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Да</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Когато следвате маршрута, моля, имайте предвид:</string>
@@ -587,6 +585,14 @@
 	<string name="avoid_toll_roads_placepage">Избягване на платени пътища</string>
 	<string name="avoid_unpaved_roads_placepage">Избягвайте неасфалтирани пътища</string>
 	<string name="avoid_ferry_crossing_placepage">Избягване на преходи с ферибот</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Да</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Не</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Да</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Не</string>
 	<string name="ok">Ок</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Сортиране…</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 5ce9d3a445..927d0088ca 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -290,8 +290,6 @@
 	<string name="gray">Šedá</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Modrošedá</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Ano</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Při navigaci podle trasy mějte na paměti následující:</string>
@@ -598,6 +596,14 @@
 	<string name="avoid_toll_roads_placepage">Vyhnout se silnicím s mýtným</string>
 	<string name="avoid_unpaved_roads_placepage">Vyhnout se nezpevněným silnicím</string>
 	<string name="avoid_ferry_crossing_placepage">Vyhnout se přejezdům trajektů</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Ano</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Ne</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ano</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Ne</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Třídit…</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 96c5fd3c13..12a155fa68 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -290,8 +290,6 @@
 	<string name="gray">Grå</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Blågrå</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Ja</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Når du følger en rute, skal du være opmærksom på følgende:</string>
@@ -597,6 +595,14 @@
 	<string name="avoid_toll_roads_placepage">Undgå betalingsveje</string>
 	<string name="avoid_unpaved_roads_placepage">Undgå grusveje</string>
 	<string name="avoid_ferry_crossing_placepage">Undgå færgeoverfarter</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Ja</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Nej</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ja</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Nej</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sort…</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index fec6e01f19..a0b6911159 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -296,8 +296,6 @@
 	<string name="gray">Grau</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Graublau</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Ja</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Wenn Sie der Route folgen, beachten Sie bitte:</string>
@@ -610,6 +608,14 @@
 	<string name="avoid_toll_roads_placepage">Mautstraßen vermeiden</string>
 	<string name="avoid_unpaved_roads_placepage">Erdwege vermeiden</string>
 	<string name="avoid_ferry_crossing_placepage">Fährstellen vermeiden</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Ja</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Nein</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ja</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Nein</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sortieren…</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index bfa9c93419..9a54d67af5 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -291,8 +291,6 @@
 	<string name="gray">Γκρι</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Γκρίζο μπλε</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Ναι</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Όταν ακολουθείτε την διαδρομή, να θυμάστε:</string>
@@ -589,6 +587,14 @@
 	<string name="avoid_toll_roads_placepage">Αποφυγή των δρόμων με διόδια</string>
 	<string name="avoid_unpaved_roads_placepage">Αποφυγή των χωματόδρομων</string>
 	<string name="avoid_ferry_crossing_placepage">Αποφυγή των πορθμείων</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Ναι</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Όχι</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ναι</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Όχι</string>
 	<string name="ok">Καλώς</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Ταξινόμηση</string>
diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index ace0a8fbb9..bc48b7a48c 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -129,6 +129,14 @@
 	<string name="avoid_toll_roads_placepage">Evitar las carreteras de peaje</string>
 	<string name="avoid_unpaved_roads_placepage">Evitar los caminos de tierra</string>
 	<string name="avoid_ferry_crossing_placepage">Evitar los trasbordadores de ferri</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Sí</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">No</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Sí</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">No</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Ordenar…</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 042e98d298..25da0067ca 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -295,8 +295,6 @@
 	<string name="gray">Gris</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Gris azulado</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Sí</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Al seguir la ruta, tenga en cuenta:</string>
@@ -611,6 +609,14 @@
 	<string name="avoid_toll_roads_placepage">Evitar las carreteras con pago de peaje</string>
 	<string name="avoid_unpaved_roads_placepage">Evitar los caminos sin pavimento</string>
 	<string name="avoid_ferry_crossing_placepage">Evitar ferries</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Sí</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">No</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Sí</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">No</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Ordenar…</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 140ec4dcd8..eceb42d2c7 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -284,8 +284,6 @@
 	<string name="gray">خاکستری</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">خاکستری کبود</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">بلی</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">زمانی که مسیری را دنبال می کنید لطفا به یاد داشته باشید:</string>
@@ -596,6 +594,14 @@
 	<string name="avoid_toll_roads_placepage">اجتناب از جاده های دارای عوارض</string>
 	<string name="avoid_unpaved_roads_placepage">اجتناب از جاده های آسفالت نشده</string>
 	<string name="avoid_ferry_crossing_placepage">اجتناب از گذرگاه های کشتی</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">بله</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">خیر</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">بلی</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">خیر</string>
 	<string name="ok">موافقت کردن</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">مرتب سازی…</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index fda0fc917e..aa5dda3132 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -296,8 +296,6 @@
 	<string name="gray">Harmaa</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Harmaan sininen</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Kyllä</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Muista seuraavat asiat seuratessasi reittiä:</string>
@@ -603,6 +601,14 @@
 	<string name="avoid_toll_roads_placepage">Vältä maksullisia teitä</string>
 	<string name="avoid_unpaved_roads_placepage">Vältä maanteitä</string>
 	<string name="avoid_ferry_crossing_placepage">Vältä lautan käyttöä</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Kyllä</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Ei</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Kyllä</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Ei</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Järjestä…</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index d52850c4aa..ebf7d51869 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -297,8 +297,6 @@
 	<string name="gray">Gris</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Gris-bleu</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Oui</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Lorsque vous suivez l\'itinéraire, gardez à l\'esprit les points suivants :</string>
@@ -611,6 +609,14 @@
 	<string name="avoid_toll_roads_placepage">Éviter les routes à péage</string>
 	<string name="avoid_unpaved_roads_placepage">Éviter les routes non revêtues</string>
 	<string name="avoid_ferry_crossing_placepage">Éviter les traversées en ferry</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Oui</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Non</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Oui</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Non</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Trier…</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 2a23ce075b..7abd6181a8 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -290,8 +290,6 @@
 	<string name="gray">Szürke</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Kékes Szürke</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Igen</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Az útvonal követése során, kérjük, vegye figyelembe az alábbiakat:</string>
@@ -595,6 +593,14 @@
 	<string name="avoid_toll_roads_placepage">Fizetős utak elkerülése</string>
 	<string name="avoid_unpaved_roads_placepage">Kövezetlen utak elkerülése</string>
 	<string name="avoid_ferry_crossing_placepage">Kompátkelők elkerülése</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Igen</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Nem</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Igen</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Nem</string>
 	<string name="ok">Oké</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Rendezd…</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index ea4d39143e..9495dd702d 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -290,8 +290,6 @@
 	<string name="gray">Abu-abu</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Biru Keabu-abuan</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Ya</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Saat mengikuti rute, harap diingat:</string>
@@ -595,6 +593,14 @@
 	<string name="avoid_toll_roads_placepage">Hindari jalan tol</string>
 	<string name="avoid_unpaved_roads_placepage">Hindari jalan tanah</string>
 	<string name="avoid_ferry_crossing_placepage">Hindari penyeberangan kapal feri</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Ya</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Tidak</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ya</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Tidak</string>
 	<string name="ok">Oke</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Urutkan…</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 8b0544304f..a2f9fd676c 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -293,8 +293,6 @@
 	<string name="gray">Grigio</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Grigiazzurro</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Sì</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Quando segui il percorso, ricorda che:</string>
@@ -612,6 +610,14 @@
 	<string name="avoid_toll_roads_placepage">Evitare strade a pedaggio</string>
 	<string name="avoid_unpaved_roads_placepage">Evitare le strade non asfaltate</string>
 	<string name="avoid_ferry_crossing_placepage">Evitare i traghetti</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Sì</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">No</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Sì</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">No</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Ordina…</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index 0edb26b896..4d6ceea9db 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -179,8 +179,6 @@
 	<string name="downloader_delete_map">מחק מפה</string>
 	<!-- Item in context menu. -->
 	<string name="downloader_update_map">עדכן מפה</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">כן</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">בעת נסיעה לאורך המסלול, שים לב לדברים הבאים:</string>
@@ -215,6 +213,8 @@
 	<!-- Text under the version number in the Help dialog. TODO: Synchronize other translations with English. -->
 	<string name="about_description">Organic Maps היא אפליקציית מפות לא מקוונות בחינם ובקוד פתוח. ללא פרסומות. אין מעקב. אם אתה רואה שגיאה במפה, אנא תקן אותה ב-OpenStreetMap. הפרויקט נוצר על ידי חובבים בזמננו הפנוי, אז אנו זקוקים למשוב ולתמיכה שלכם.</string>
 	<string name="transliteration_title">תעתיק ללטינית</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">כן</string>
 
 	<!-- SECTION: Bookmark types used for sorting -->
 	<string name="enable_screen_sleep">אפשר למסך לישון</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 4778183c79..d9b9134dd7 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -288,8 +288,6 @@
 	<string name="gray">グレイ</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">ブルーグレイ</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">はい</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">案内ルートに従う際は、以下の点にご留意ください：</string>
@@ -592,6 +590,14 @@
 	<string name="avoid_toll_roads_placepage">有料道路を回避</string>
 	<string name="avoid_unpaved_roads_placepage">未舗装道路を回避</string>
 	<string name="avoid_ferry_crossing_placepage">フェリー航路を回避</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">はい</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">いいえ</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">はい</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">いいえ</string>
 	<string name="ok">OK</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">並び替え中…</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 6dd21e7c22..897382e40e 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -290,8 +290,6 @@
 	<string name="gray">회색</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">청회색</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">네</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">경로를 따라갈 때는 다음 사항에 주의해 주세요:</string>
@@ -594,6 +592,14 @@
 	<string name="avoid_toll_roads_placepage">유료 도로 피하기</string>
 	<string name="avoid_unpaved_roads_placepage">비포장 도로 피하기</string>
 	<string name="avoid_ferry_crossing_placepage">여객선 횡단길 피하기</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">네</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">아니오</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">네</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">아니오</string>
 	<string name="ok">OK</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">분류…</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index c3821c17d4..465c8d2331 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -292,8 +292,6 @@
 	<string name="gray">Grå</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Gråblå</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Ja</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Husk følgende når du følger ruten:</string>
@@ -595,6 +593,14 @@
 	<string name="avoid_toll_roads_placepage">Unngå bompengeveier</string>
 	<string name="avoid_unpaved_roads_placepage">Unngå uasfalterte veier</string>
 	<string name="avoid_ferry_crossing_placepage">Unngå fergeoverganger</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Ja</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Nei</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ja</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Nei</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sortere…</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index fa551638aa..71b7168b9d 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -292,8 +292,6 @@
 	<string name="gray">Grijs</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Grijsblauw</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Ja</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Belangrijk bij het volgen van een route:</string>
@@ -597,6 +595,14 @@
 	<string name="avoid_toll_roads_placepage">Tolwegen vermijden</string>
 	<string name="avoid_unpaved_roads_placepage">Aardewegen vermijden</string>
 	<string name="avoid_ferry_crossing_placepage">Ferries vermijden</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Ja</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Nee</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ja</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Nee</string>
 	<string name="ok">Goed</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sorteer…</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 656d99f55f..e68fd3e0d8 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -295,8 +295,6 @@
 	<string name="gray">Szary</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Szaroniebieski</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Tak</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Jadąc wyznaczoną trasą, pamiętaj, że:</string>
@@ -608,6 +606,14 @@
 	<string name="avoid_toll_roads_placepage">Unikać dróg płatnych</string>
 	<string name="avoid_unpaved_roads_placepage">Unikać dróg gruntowych</string>
 	<string name="avoid_ferry_crossing_placepage">Unikać przepraw promowych</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Tak</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Nie</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Tak</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Nie</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sortuj…</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 9af39bc430..d9ac0e59bb 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -291,8 +291,6 @@
 	<string name="gray">Cinza</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Azul escuro</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Sim</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Ao seguir a rota, lembre-se de que:</string>
@@ -601,6 +599,14 @@
 	<string name="avoid_toll_roads_placepage">Evitar pedágios</string>
 	<string name="avoid_unpaved_roads_placepage">Evitar pistas sem pavimentação</string>
 	<string name="avoid_ferry_crossing_placepage">Evitar balsas</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Sim</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Não</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Sim</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Não</string>
 	<string name="ok">Tudo bem</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Ordenar…</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 015db01ea6..647b22c23e 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -295,8 +295,6 @@
 	<string name="gray">Cinza</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Azul-cinza</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Sim</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Ao seguir a rota, lembre-se que:</string>
@@ -607,6 +605,14 @@
 	<string name="avoid_toll_roads_placepage">Evitar estradas com portagem</string>
 	<string name="avoid_unpaved_roads_placepage">Evitar estradas não pavimentadas</string>
 	<string name="avoid_ferry_crossing_placepage">Evitar ferrys</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Sim</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Não</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Sim</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Não</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Ordenar…</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 32f6516555..9cc9652152 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -297,8 +297,6 @@
 	<string name="gray">Gri</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Gri albăstriu</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Da</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Când parcurgi traseul, ai în vedere următoarele:</string>
@@ -616,6 +614,14 @@
 	<string name="avoid_toll_roads_placepage">Evită drumurile cu plată</string>
 	<string name="avoid_unpaved_roads_placepage">Evită drumurile neasfaltate</string>
 	<string name="avoid_ferry_crossing_placepage">Evită trecerile cu bac</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Da</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Nu</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Da</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Nu</string>
 	<string name="ok">Bine</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sortare…</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index b731e70c87..450414d261 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -300,8 +300,6 @@
 	<string name="gray">Серый</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Серо-голубой</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Есть</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">При движении по маршруту помните:</string>
@@ -626,6 +624,14 @@
 	<string name="avoid_toll_roads_placepage">Избегать платных дорог</string>
 	<string name="avoid_unpaved_roads_placepage">Избегать грунтовых дорог</string>
 	<string name="avoid_ferry_crossing_placepage">Избегать паромных переправ</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Да</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Нет</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Есть</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Нет</string>
 	<string name="ok">Ок</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Сортировать…</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 464e4e77fc..01d499dca7 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -288,8 +288,6 @@
 	<string name="gray">Sivá</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Modro sivá</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Áno</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Pri sledovaní trasy majte na pamäti nasledujúce:</string>
@@ -594,6 +592,14 @@
 	<string name="avoid_toll_roads_placepage">Vyhnúť sa spoplatneným cestám</string>
 	<string name="avoid_unpaved_roads_placepage">Vyhnúť sa nespevneným cestám</string>
 	<string name="avoid_ferry_crossing_placepage">Vyhnúť sa prechodom na trajekte</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Áno</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Nie</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Áno</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Nie</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Zoradiť…</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 783566b81b..71f512bd4f 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -288,8 +288,6 @@
 	<string name="gray">Grå</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Ljusblå grå</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Ja</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">När du följer vägen, kom ihåg att:</string>
@@ -593,6 +591,14 @@
 	<string name="avoid_toll_roads_placepage">Undvik betalvägar</string>
 	<string name="avoid_unpaved_roads_placepage">Undvik kärrvägar</string>
 	<string name="avoid_ferry_crossing_placepage">Undvik färjetrafik</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Ja</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Nej</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ja</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Nej</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sortera…</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index ece049a7a7..f8cbe2cf4e 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -157,6 +157,14 @@
 	<string name="avoid_toll_roads_placepage">Epuka barabara za kulipia</string>
 	<string name="avoid_unpaved_roads_placepage">Epuka barabara za vumbi</string>
 	<string name="avoid_ferry_crossing_placepage">Epuka vivuko vya feri</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Ndio</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Hapana</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Ndio</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Hapana</string>
 	<string name="ok">Sawa</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Ainisha…</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 51abeff155..b1740d5b94 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -292,8 +292,6 @@
 	<string name="gray">สีเทา</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">สีฟ้าอมเทา</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">ใช่</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">ขณะกำลังเดินทางตามเส้นทาง โปรดจำไว้ว่า:</string>
@@ -596,6 +594,14 @@
 	<string name="avoid_toll_roads_placepage">เลี่ยงทางที่ต้องเสียเงินทั้งหมด</string>
 	<string name="avoid_unpaved_roads_placepage">เลี่ยงถนนดินทั้งหมด</string>
 	<string name="avoid_ferry_crossing_placepage">เลี่ยงการข้ามฟากด้วยเรือ</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">ใช่</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">ไม่ใช่</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">ใช่</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">ไม่ใช่</string>
 	<string name="ok">โอเค</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">เรียง…</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 489c145b5c..b83bb6cd9e 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -299,8 +299,6 @@
 	<string name="gray">Gri</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Mavi Gri</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Var</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Rotanızı takip ederken şunları lütfen unutmayın:</string>
@@ -617,6 +615,14 @@
 	<string name="avoid_toll_roads_placepage">Paralı yollardan kaçın</string>
 	<string name="avoid_unpaved_roads_placepage">Asfaltsız yollardan kaçın</string>
 	<string name="avoid_ferry_crossing_placepage">Feribot geçişlerinden kaçın</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Evet</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Hayır</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Var</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Yok</string>
 	<string name="ok">Tamam</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sırala…</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index b1866ac344..1a073d60eb 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -295,8 +295,6 @@
 	<string name="gray">Сірий</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Сіро-блакитний</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Так</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Під час руху за маршрутом пам\'ятайте:</string>
@@ -612,6 +610,14 @@
 	<string name="avoid_toll_roads_placepage">Уникати платних доріг</string>
 	<string name="avoid_unpaved_roads_placepage">Уникати ґрунтових доріг</string>
 	<string name="avoid_ferry_crossing_placepage">Уникати поромних переправ</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Так</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Ні</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Так</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Ні</string>
 	<string name="ok">Ок</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Сортувати</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 152d2a343e..cc592ee193 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -290,8 +290,6 @@
 	<string name="gray">Xám</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Xám xanh da trời</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Có</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Khi đi theo tuyến đường, hãy lưu ý:</string>
@@ -595,6 +593,14 @@
 	<string name="avoid_toll_roads_placepage">Tránh đường trả phí</string>
 	<string name="avoid_unpaved_roads_placepage">Tránh đường đất</string>
 	<string name="avoid_ferry_crossing_placepage">Tránh bến phà</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Có</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">Không</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Có</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">Không</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sắp xếp…</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 2a9bd250c9..ffe59d4bd1 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -301,8 +301,6 @@
 	<string name="gray">灰色</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">藍灰色</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">是</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">依照路線行進時，請牢記：</string>
@@ -614,6 +612,14 @@
 	<string name="avoid_toll_roads_placepage">規避收費公路</string>
 	<string name="avoid_unpaved_roads_placepage">規避土路</string>
 	<string name="avoid_ferry_crossing_placepage">規避渡輪渡口</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">是</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">否</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">是</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">否</string>
 	<string name="ok">好</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">分類……</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index ff30ff5b43..b61b8eb028 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -298,8 +298,6 @@
 	<string name="gray">灰色</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">蓝灰色</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">是</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">按照路线行进时，请谨记：</string>
@@ -604,6 +602,14 @@
 	<string name="avoid_toll_roads_placepage">规避收费公路</string>
 	<string name="avoid_unpaved_roads_placepage">规避土路</string>
 	<string name="avoid_ferry_crossing_placepage">规避渡輪渡口</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">是</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">否</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">是</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">否</string>
 	<string name="ok">好的</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">分类……</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 9bd8978642..f28cfa38f8 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -318,8 +318,6 @@
 	<string name="gray">Gray</string>
 	<!-- blue gray color -->
 	<string name="blue_gray">Blue Gray</string>
-	<!-- Wi-Fi available -->
-	<string name="WiFi_available">Yes</string>
 
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">When following the route, please keep in mind:</string>
@@ -640,6 +638,14 @@
 	<string name="avoid_toll_roads_placepage">Avoid toll roads</string>
 	<string name="avoid_unpaved_roads_placepage">Avoid unpaved roads</string>
 	<string name="avoid_ferry_crossing_placepage">Avoid ferry crossings</string>
+	<!-- A generic "Yes" button in dialogs -->
+	<string name="yes">Yes</string>
+	<!-- A generic "No" button in dialogs -->
+	<string name="no">No</string>
+	<!-- E.g. "WiFi:Yes" -->
+	<string name="yes_available">Yes</string>
+	<!-- E.g. "WiFi:No" -->
+	<string name="no_available">No</string>
 	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sort…</string>
diff --git a/data/sound-strings/it.json/localize.json b/data/sound-strings/it.json/localize.json
index 70410c21f5..026713ae59 100644
--- a/data/sound-strings/it.json/localize.json
+++ b/data/sound-strings/it.json/localize.json
@@ -29,7 +29,7 @@
 "in_2_kilometers":"Tra due chilometri",
 "in_2_5_kilometers":"Tra due chilometri e mezzo",
 "in_3_kilometers":"Tra tre chilometri",
-"then":"Quindi",
+"then":"Poi",
 "take_the_1_exit":"Prendi la prima uscita.",
 "take_the_2_exit":"Prendi la seconda uscita.",
 "take_the_3_exit":"Prendi la terza uscita.",
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 26ee9b67a3..78be2c9b91 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "رمادي أزرق";
 
-/* Wi-Fi available */
-"WiFi_available" = "نعم";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "هل تريد إعادة تحديد الطريق?";
 
-"redirect_route_yes" = "نعم";
+/* A generic "Yes" button in dialogs */
+"yes" = "نعم";
 
-"redirect_route_no" = "لا";
+/* A generic "No" button in dialogs */
+"no" = "لا";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "نعم";
+
+/* E.g. "WiFi:No" */
+"no_available" = "لا";
 
 "trip_finished" = "لقد وصلت!";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 0a1fc46df7..24283e96d2 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Блакітна-шэры";
 
-/* Wi-Fi available */
-"WiFi_available" = "Так";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Хочаце перапракласці маршрут?";
 
-"redirect_route_yes" = "Так";
+/* A generic "Yes" button in dialogs */
+"yes" = "Так";
 
-"redirect_route_no" = "Не";
+/* A generic "No" button in dialogs */
+"no" = "Не";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ёсць";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Няма";
 
 "trip_finished" = "Вы прыбылі!";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index c79d8e27e2..22f8aadf54 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Blue Gray";
 
-/* Wi-Fi available */
-"WiFi_available" = "Да";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Do you want to rebuild the route?";
 
-"redirect_route_yes" = "Yes";
+/* A generic "Yes" button in dialogs */
+"yes" = "Да";
 
-"redirect_route_no" = "No";
+/* A generic "No" button in dialogs */
+"no" = "Не";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Да";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Не";
 
 "trip_finished" = "You have arrived!";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index b5858bc14b..7ca851ef55 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Modrošedá";
 
-/* Wi-Fi available */
-"WiFi_available" = "Ano";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Chcete přestavět trasu?";
 
-"redirect_route_yes" = "Ano";
+/* A generic "Yes" button in dialogs */
+"yes" = "Ano";
 
-"redirect_route_no" = "Ne";
+/* A generic "No" button in dialogs */
+"no" = "Ne";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ano";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Ne";
 
 "trip_finished" = "Přijeli jste!";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index e48b2b583a..63153d3f48 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Blågrå";
 
-/* Wi-Fi available */
-"WiFi_available" = "Ja";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Vil du genopbygge en rute igen?";
 
-"redirect_route_yes" = "Ja";
+/* A generic "Yes" button in dialogs */
+"yes" = "Ja";
 
-"redirect_route_no" = "Nej";
+/* A generic "No" button in dialogs */
+"no" = "Nej";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ja";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Nej";
 
 "trip_finished" = "Du er ankommet!";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 35b5bfd399..ab871ecd68 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Graublau";
 
-/* Wi-Fi available */
-"WiFi_available" = "Ja";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Möchten Sie die Route neu erstellen?";
 
-"redirect_route_yes" = "Ja";
+/* A generic "Yes" button in dialogs */
+"yes" = "Ja";
 
-"redirect_route_no" = "Nein";
+/* A generic "No" button in dialogs */
+"no" = "Nein";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ja";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Nein";
 
 "trip_finished" = "Sie sind angekommen!";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index e07e901b92..bbc8d3f301 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Γκρίζο μπλε";
 
-/* Wi-Fi available */
-"WiFi_available" = "Ναι";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Θα θέλατε να τροποποιήσετε τη διαδρομή;";
 
-"redirect_route_yes" = "Ναι";
+/* A generic "Yes" button in dialogs */
+"yes" = "Ναι";
 
-"redirect_route_no" = "Όχι";
+/* A generic "No" button in dialogs */
+"no" = "Όχι";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ναι";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Όχι";
 
 "trip_finished" = "Έχετε φτάσει!";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index d579a2ea71..436caf316f 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Blue Gray";
 
-/* Wi-Fi available */
-"WiFi_available" = "Yes";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Do you want to rebuild the route?";
 
-"redirect_route_yes" = "Yes";
+/* A generic "Yes" button in dialogs */
+"yes" = "Yes";
 
-"redirect_route_no" = "No";
+/* A generic "No" button in dialogs */
+"no" = "No";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Yes";
+
+/* E.g. "WiFi:No" */
+"no_available" = "No";
 
 "trip_finished" = "You have arrived!";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index c8525d37f3..9d01b861bd 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Blue Gray";
 
-/* Wi-Fi available */
-"WiFi_available" = "Yes";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Do you want to rebuild the route?";
 
-"redirect_route_yes" = "Yes";
+/* A generic "Yes" button in dialogs */
+"yes" = "Yes";
 
-"redirect_route_no" = "No";
+/* A generic "No" button in dialogs */
+"no" = "No";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Yes";
+
+/* E.g. "WiFi:No" */
+"no_available" = "No";
 
 "trip_finished" = "You have arrived!";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 26e008e847..67e6f5c31c 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Gris azulado";
 
-/* Wi-Fi available */
-"WiFi_available" = "Sí";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "¿Quiere reconstruir la ruta?";
 
-"redirect_route_yes" = "Si";
+/* A generic "Yes" button in dialogs */
+"yes" = "Sí";
 
-"redirect_route_no" = "No";
+/* A generic "No" button in dialogs */
+"no" = "No";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Sí";
+
+/* E.g. "WiFi:No" */
+"no_available" = "No";
 
 "trip_finished" = "¡Ya llegó!";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 658aa03ce7..c85e66e649 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Gris azulado";
 
-/* Wi-Fi available */
-"WiFi_available" = "Sí";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "¿Quieres reconstruir la ruta?";
 
-"redirect_route_yes" = "Si";
+/* A generic "Yes" button in dialogs */
+"yes" = "Sí";
 
-"redirect_route_no" = "No";
+/* A generic "No" button in dialogs */
+"no" = "No";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Sí";
+
+/* E.g. "WiFi:No" */
+"no_available" = "No";
 
 "trip_finished" = "¡Llegaste!";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 56cbef6de1..095f3f0742 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "خاکستری کبود";
 
-/* Wi-Fi available */
-"WiFi_available" = "بلی";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "آیا می خواهید مسیر را دوباره ایجاد کنید?";
 
-"redirect_route_yes" = "بله";
+/* A generic "Yes" button in dialogs */
+"yes" = "بله";
 
-"redirect_route_no" = "خیر";
+/* A generic "No" button in dialogs */
+"no" = "خیر";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "بلی";
+
+/* E.g. "WiFi:No" */
+"no_available" = "خیر";
 
 "trip_finished" = "شما به مقصد رسیدید!";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 516523bde8..2623a2fc1e 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Harmaan sininen";
 
-/* Wi-Fi available */
-"WiFi_available" = "Kyllä";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Haluatko luoda reitin uudelleen?";
 
-"redirect_route_yes" = "Kyllä";
+/* A generic "Yes" button in dialogs */
+"yes" = "Kyllä";
 
-"redirect_route_no" = "Ei";
+/* A generic "No" button in dialogs */
+"no" = "Ei";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Kyllä";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Ei";
 
 "trip_finished" = "Olet saapunut!";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index d2953aa6c8..d61489ca78 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Gris-bleu";
 
-/* Wi-Fi available */
-"WiFi_available" = "Oui";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Voulez-vous reconstruire l'itinéraire ?";
 
-"redirect_route_yes" = "Oui";
+/* A generic "Yes" button in dialogs */
+"yes" = "Oui";
 
-"redirect_route_no" = "Non";
+/* A generic "No" button in dialogs */
+"no" = "Non";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Oui";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Non";
 
 "trip_finished" = "Vous êtes arrivé !";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 2fd6fd778f..474a077c0f 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Blue Gray";
 
-/* Wi-Fi available */
-"WiFi_available" = "כן";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Do you want to rebuild the route?";
 
-"redirect_route_yes" = "Yes";
+/* A generic "Yes" button in dialogs */
+"yes" = "Yes";
 
-"redirect_route_no" = "No";
+/* A generic "No" button in dialogs */
+"no" = "No";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "כן";
+
+/* E.g. "WiFi:No" */
+"no_available" = "No";
 
 "trip_finished" = "You have arrived!";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 80a39f1f5e..eba420d69c 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Kékes Szürke";
 
-/* Wi-Fi available */
-"WiFi_available" = "Igen";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Szeretnél újratervezni egy útvonalat?";
 
-"redirect_route_yes" = "Igen";
+/* A generic "Yes" button in dialogs */
+"yes" = "Igen";
 
-"redirect_route_no" = "Nem";
+/* A generic "No" button in dialogs */
+"no" = "Nem";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Igen";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Nem";
 
 "trip_finished" = "Megérkeztél!";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 0576ea2451..12f60f4c00 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Biru Keabu-abuan";
 
-/* Wi-Fi available */
-"WiFi_available" = "Ya";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Anda ingin membuat ulang rute?";
 
-"redirect_route_yes" = "Ya";
+/* A generic "Yes" button in dialogs */
+"yes" = "Ya";
 
-"redirect_route_no" = "Tidak";
+/* A generic "No" button in dialogs */
+"no" = "Tidak";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ya";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Tidak";
 
 "trip_finished" = "Anda telah tiba!";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 0b2e11fc55..a99433de61 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Grigiazzurro";
 
-/* Wi-Fi available */
-"WiFi_available" = "Sì";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Vuoi ricalcolare il percorso?";
 
-"redirect_route_yes" = "Sì";
+/* A generic "Yes" button in dialogs */
+"yes" = "Sì";
 
-"redirect_route_no" = "No";
+/* A generic "No" button in dialogs */
+"no" = "No";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Sì";
+
+/* E.g. "WiFi:No" */
+"no_available" = "No";
 
 "trip_finished" = "Sei arrivato!";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 36cc639126..00b2277c72 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "ブルーグレイ";
 
-/* Wi-Fi available */
-"WiFi_available" = "はい";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "ルートを再構築しますか?";
 
-"redirect_route_yes" = "はい";
+/* A generic "Yes" button in dialogs */
+"yes" = "はい";
 
-"redirect_route_no" = "いいえ";
+/* A generic "No" button in dialogs */
+"no" = "いいえ";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "はい";
+
+/* E.g. "WiFi:No" */
+"no_available" = "いいえ";
 
 "trip_finished" = "到着しました!";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index ed61971352..ea1ec4fc9b 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "청회색";
 
-/* Wi-Fi available */
-"WiFi_available" = "네";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "루트를 재구축하길 원하시나요?";
 
-"redirect_route_yes" = "네";
+/* A generic "Yes" button in dialogs */
+"yes" = "네";
 
-"redirect_route_no" = "아니오";
+/* A generic "No" button in dialogs */
+"no" = "아니오";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "네";
+
+/* E.g. "WiFi:No" */
+"no_available" = "아니오";
 
 "trip_finished" = "도착했습니다!";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 9bcd65cd41..07d84687d6 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Gråblå";
 
-/* Wi-Fi available */
-"WiFi_available" = "Ja";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Vil du planlegge en rute på nytt?";
 
-"redirect_route_yes" = "Ja";
+/* A generic "Yes" button in dialogs */
+"yes" = "Ja";
 
-"redirect_route_no" = "Nei";
+/* A generic "No" button in dialogs */
+"no" = "Nei";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ja";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Nei";
 
 "trip_finished" = "Du har ankommet!";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index f885c0e575..fb2c405e2b 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Grijsblauw";
 
-/* Wi-Fi available */
-"WiFi_available" = "Ja";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Wilt u de route wijzigen?";
 
-"redirect_route_yes" = "Ja";
+/* A generic "Yes" button in dialogs */
+"yes" = "Ja";
 
-"redirect_route_no" = "Nee";
+/* A generic "No" button in dialogs */
+"no" = "Nee";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ja";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Nee";
 
 "trip_finished" = "U bent aangekomen!";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index f5c0f90726..057d9d045e 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Szaroniebieski";
 
-/* Wi-Fi available */
-"WiFi_available" = "Tak";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Czy chcesz przebudować trasę?";
 
-"redirect_route_yes" = "Tak";
+/* A generic "Yes" button in dialogs */
+"yes" = "Tak";
 
-"redirect_route_no" = "Nie";
+/* A generic "No" button in dialogs */
+"no" = "Nie";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Tak";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Nie";
 
 "trip_finished" = "Jesteś na miejscu!";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 3ff7245798..4785fcc380 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Azul escuro";
 
-/* Wi-Fi available */
-"WiFi_available" = "Sim";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Você deseja retraçar a rota?";
 
-"redirect_route_yes" = "Sim";
+/* A generic "Yes" button in dialogs */
+"yes" = "Sim";
 
-"redirect_route_no" = "Não";
+/* A generic "No" button in dialogs */
+"no" = "Não";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Sim";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Não";
 
 "trip_finished" = "Você chegou!";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index cff7a3b665..1f0cc3850e 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Azul-cinza";
 
-/* Wi-Fi available */
-"WiFi_available" = "Sim";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Quer recalcular o percurso?";
 
-"redirect_route_yes" = "Sim";
+/* A generic "Yes" button in dialogs */
+"yes" = "Sim";
 
-"redirect_route_no" = "Não";
+/* A generic "No" button in dialogs */
+"no" = "Não";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Sim";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Não";
 
 "trip_finished" = "Chegou ao destino!";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 21aaf887ac..770447bf00 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Gri albăstriu";
 
-/* Wi-Fi available */
-"WiFi_available" = "Da";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Vrei să refaci traseul?";
 
-"redirect_route_yes" = "Da";
+/* A generic "Yes" button in dialogs */
+"yes" = "Da";
 
-"redirect_route_no" = "Nu";
+/* A generic "No" button in dialogs */
+"no" = "Nu";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Da";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Nu";
 
 "trip_finished" = "Ai ajuns!";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index b878a689d4..7035eb132f 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Серо-голубой";
 
-/* Wi-Fi available */
-"WiFi_available" = "Есть";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Хотите перестроить маршрут?";
 
-"redirect_route_yes" = "Да";
+/* A generic "Yes" button in dialogs */
+"yes" = "Да";
 
-"redirect_route_no" = "Нет";
+/* A generic "No" button in dialogs */
+"no" = "Нет";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Есть";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Нет";
 
 "trip_finished" = "Вы прибыли!";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 3a4a6a39da..28904de957 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Modro sivá";
 
-/* Wi-Fi available */
-"WiFi_available" = "Áno";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Chcete znova vytvoriť trasu?";
 
-"redirect_route_yes" = "Áno";
+/* A generic "Yes" button in dialogs */
+"yes" = "Áno";
 
-"redirect_route_no" = "Nie";
+/* A generic "No" button in dialogs */
+"no" = "Nie";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Áno";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Nie";
 
 "trip_finished" = "Prišli ste do cieľa!";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 22bd5f75f4..f9e3c194c2 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Ljusblå grå";
 
-/* Wi-Fi available */
-"WiFi_available" = "Ja";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Räknar om rutten?";
 
-"redirect_route_yes" = "Ja";
+/* A generic "Yes" button in dialogs */
+"yes" = "Ja";
 
-"redirect_route_no" = "Nej";
+/* A generic "No" button in dialogs */
+"no" = "Nej";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ja";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Nej";
 
 "trip_finished" = "Du är framme!";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index feb4f2e3a8..6d0e4749cb 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Kijivu Buluu";
 
-/* Wi-Fi available */
-"WiFi_available" = "Yes";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Je, unataka kuunda upya njia?";
 
-"redirect_route_yes" = "Ndio";
+/* A generic "Yes" button in dialogs */
+"yes" = "Ndio";
 
-"redirect_route_no" = "Hapana";
+/* A generic "No" button in dialogs */
+"no" = "Hapana";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Ndio";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Hapana";
 
 "trip_finished" = "Umefika!";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 8f321883c0..d024db020a 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "สีฟ้าอมเทา";
 
-/* Wi-Fi available */
-"WiFi_available" = "ใช่";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "ต้องการสร้างเส้นทางใหม่หรือไม่";
 
-"redirect_route_yes" = "ใช่";
+/* A generic "Yes" button in dialogs */
+"yes" = "ใช่";
 
-"redirect_route_no" = "ไม่ใช่";
+/* A generic "No" button in dialogs */
+"no" = "ไม่ใช่";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "ใช่";
+
+/* E.g. "WiFi:No" */
+"no_available" = "ไม่ใช่";
 
 "trip_finished" = "คุณมาถึงแล้ว!";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 928f2fafdb..3406fc0aec 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Mavi Gri";
 
-/* Wi-Fi available */
-"WiFi_available" = "Var";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Yeniden bir rota oluşturmak ister misiniz?";
 
-"redirect_route_yes" = "Evet";
+/* A generic "Yes" button in dialogs */
+"yes" = "Evet";
 
-"redirect_route_no" = "Hayır";
+/* A generic "No" button in dialogs */
+"no" = "Hayır";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Var";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Yok";
 
 "trip_finished" = "Vardınız!";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 7e8bbbb2a6..77d3f64e5f 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Сіро-блакитний";
 
-/* Wi-Fi available */
-"WiFi_available" = "Так";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Бажаєте перебудувати маршрут?";
 
-"redirect_route_yes" = "Так";
+/* A generic "Yes" button in dialogs */
+"yes" = "Так";
 
-"redirect_route_no" = "Ні";
+/* A generic "No" button in dialogs */
+"no" = "Ні";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Так";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Ні";
 
 "trip_finished" = "Ви прибули!";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index ecfaae8f2a..9972db1ada 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "Xám xanh da trời";
 
-/* Wi-Fi available */
-"WiFi_available" = "Có";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "Bạn có muốn tạo lại tuyến không?";
 
-"redirect_route_yes" = "Có";
+/* A generic "Yes" button in dialogs */
+"yes" = "Có";
 
-"redirect_route_no" = "Không";
+/* A generic "No" button in dialogs */
+"no" = "Không";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "Có";
+
+/* E.g. "WiFi:No" */
+"no_available" = "Không";
 
 "trip_finished" = "Bạn đã tới nơi!";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 79b61ffb7c..a26c2a5f8b 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "蓝灰色";
 
-/* Wi-Fi available */
-"WiFi_available" = "是";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "想重建路线?";
 
-"redirect_route_yes" = "是";
+/* A generic "Yes" button in dialogs */
+"yes" = "是";
 
-"redirect_route_no" = "否";
+/* A generic "No" button in dialogs */
+"no" = "否";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "是";
+
+/* E.g. "WiFi:No" */
+"no_available" = "否";
 
 "trip_finished" = "您已到达!";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 87dc01d714..c0eea710f7 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -419,9 +419,6 @@
 /* blue gray color */
 "blue_gray" = "藍灰色";
 
-/* Wi-Fi available */
-"WiFi_available" = "是";
-
 
 /********** Routing dialogs strings **********/
 
@@ -1026,9 +1023,17 @@
 
 "redirect_route_alert" = "想重建路線?";
 
-"redirect_route_yes" = "是";
+/* A generic "Yes" button in dialogs */
+"yes" = "是";
 
-"redirect_route_no" = "否";
+/* A generic "No" button in dialogs */
+"no" = "否";
+
+/* E.g. "WiFi:Yes" */
+"yes_available" = "是";
+
+/* E.g. "WiFi:No" */
+"no_available" = "否";
 
 "trip_finished" = "您已經到達了!";