diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index afba1c249a..1050afc17b 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -393,7 +393,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">معايرة البوصلة</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">واي فاي/الإنترنت</string>
+	<string name="wifi">واي فاي</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">يرجى تحديث الخريطة لإنشاء مسار.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 5e6260a155..4865719a4a 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -396,7 +396,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Kalibrace kompasu</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Pro funkci vytváření tras je nutné aktualizovat mapu.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 0c1b2216d2..d91bb3d8c0 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -391,7 +391,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Kalibrering af kompas</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Venligst opdatér kortet for at oprette en rute.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 06aeb3a4e3..ba95df7d0c 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -384,7 +384,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Kompass-Kalibrierung</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Bitte aktualisieren Sie die Karte, um eine Route zu erzeugen.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index b972d121bb..ef7e515b92 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -380,7 +380,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Calibrado de la brújula</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Por favor, actualiza el mapa para crear una ruta.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 36fdcd58de..56df841036 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -400,7 +400,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Étalonnage de la boussole</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Veuillez mettre à jour la carte pour créer un itinéraire.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 7e7bffa353..6f257eee37 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -390,7 +390,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Iránytű kalibrálás</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Kérjük, útvonal létrehozásához frissítsd a térképet.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index dd61b1868f..7f3b307813 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -386,7 +386,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Calibrazione del compasso</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Aggiorna la mappa per creare un itinerario.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 1c7931f5cc..bf4f6fdfc6 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -386,7 +386,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">コンパスの調整</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">無線LAN/インターネット</string>
+	<string name="wifi">無線LAN</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">ルートを作成するためにマップを更新してください。</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 5e0054c0a1..d7e82941c7 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -377,7 +377,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">나침반 보정</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi 인터넷/인터넷</string>
+	<string name="wifi">WiFi 인터넷</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">경로를 생성하도록 지도를 업데이트하십시오.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index a0f3ee6ede..44b2957845 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -381,7 +381,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Kompascalibratie</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Werk de kaart bij om een route te maken.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index b9ff031ccc..a826618a6f 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -390,7 +390,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Kalibracja kompasu</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Proszę zaktualizować mapę, by utworzyć trasę.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index b3b2c315cb..1f6e5c6acd 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -386,7 +386,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Calibração de bússola</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Por favor, atualize o mapa para criar uma rota.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 926b315b22..059911ed3e 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -400,7 +400,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Калибровка компаса</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Интернет</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Пожалуйста, обновите карту для того, чтобы проложить маршрут.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 7a76832c0d..6e3a9aa80f 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -394,7 +394,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Compass kalibrácia</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Pre vytvorenie trasy si, prosím, aktualizujte mapu.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 3e14ccd5e2..99f8d975fa 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -391,7 +391,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">การปรับเทียบเข็มทิศ</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/อินเทอร์เน็ต</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">โปรดอัปเดตแผนที่เพื่อสร้างเส้นทาง</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 61457ab25d..68355f6cf2 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -393,7 +393,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Pusula kalibrasyonu</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/İnternet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Yeni bir rota oluşturmak için lütfen haritayı güncelleyin.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 3c1cddeb27..fa30444fa3 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -394,7 +394,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Калібрування компаса</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Інтернет</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Будь ласка, оновіть карту, щоб прокласти маршрут.</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 3d29e1346a..2dc8b882ea 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -379,7 +379,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">指南針校準</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">無線網絡/互聯網</string>
+	<string name="wifi">無線網絡</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">請更新地圖以創建一條路線。</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 80a0eabae5..edb1b6cf17 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -395,7 +395,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">指南针校准</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">无线网络/互联网</string>
+	<string name="wifi">无线网络</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">请更新地图以创建一条路线。</string>
 	<!-- Update maps suggestion -->
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 316d0109cb..5a7dcf3bcc 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -402,7 +402,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Compass calibration</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">WiFi/Internet</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Please update the map to create a route</string>
 	<!-- Update maps suggestion -->
diff --git a/data/categories.txt b/data/categories.txt
index 40f2b3528c..07b33e73ec 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -2781,28 +2781,28 @@ tr:okyanus
 sv:ocean
 
 internet_access|internet_access-wlan
-en:Wi-Fi|wifi|3Internet
-cs:Wi-Fi|wifi|3Internet
-sk:Wi-Fi|wifi|3Internet
-de:Wi-Fi|wifi|3Internet
-es:Wi-Fi|wifi|3Internet
-fr:Wi-Fi|wifi|3Internet
-it:Wi-Fi|wifi|3Internet
-ja:無線LAN|3インターネット|Wi-Fi|wifi|3Internet
-ko:Wi-Fi 인터넷|3인터넷|wifi|3Internet
-nl:Wi-Fi|wifi|3Internet
-ru:Wi-Fi|3Интернет|вайфай|wifi|Internet
-uk:Wi-Fi|3Інтернет|wifi|Internet
-zh-Hant:無線網絡|3互聯網|Wi-Fi|wifi|3Internet
-pl:Wi-Fi|wifi|3Internet
-pt:Wi-Fi|wifi|3Internet
-hu:Wi-Fi|wifi|3Internet
-th:Wi-Fi|3อินเทอร์เน็ต|wifi|3Internet
-zh-Hans:无线网络|3互联网|Wi-Fi|wifi|3Internet
-ar:واي فاي|الإنترنت|Wi-Fi|wifi|3Internet
-da:Wi-Fi|wifi|3Internet
-tr:Wi-Fi|wifi|3Internet
-sv:Wi-Fi|wifi|3Internet
+en:WiFi|3Internet
+cs:WiFi|3Internet
+sk:WiFi|3Internet
+de:WiFi|3Internet
+es:WiFi|3Internet
+fr:WiFi|3Internet
+it:WiFi|3Internet
+ja:無線LAN|3インターネット|WiFi|3Internet
+ko:WiFi 인터넷|3인터넷|3Internet
+nl:WiFi|3Internet
+ru:WiFi|3Интернет|вайфай|Internet
+uk:WiFi|3Інтернет|Internet
+zh-Hant:無線網絡|3互聯網|WiFi|3Internet
+pl:WiFi|3Internet
+pt:WiFi|3Internet
+hu:WiFi|3Internet
+th:WiFi|3อินเทอร์เน็ต|3Internet
+zh-Hans:无线网络|3互联网|WiFi|3Internet
+ar:واي فاي|الإنترنت|WiFi|3Internet
+da:WiFi|3Internet
+tr:WiFi|3Internet
+sv:WiFi|3Internet
 
 natural-beach
 en:beach
diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings
index 7bdf6d3bf8..ccfd347736 100644
--- a/iphone/Maps/ar.lproj/Localizable.strings
+++ b/iphone/Maps/ar.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "معايرة البوصلة";
 
 /* Search Suggestion */
-"wifi" = "واي فاي/الإنترنت";
+"wifi" = "واي فاي";
 
 /* Update map suggestion */
 "routing_map_outdated" = "يرجى تحديث الخريطة لإنشاء مسار.";
diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings
index 5da1f502b1..6e088cba9c 100644
--- a/iphone/Maps/cs.lproj/Localizable.strings
+++ b/iphone/Maps/cs.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Kalibrace kompasu";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Pro funkci vytváření tras je nutné aktualizovat mapu.";
diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings
index a8a83a4c44..42049dc793 100644
--- a/iphone/Maps/da.lproj/Localizable.strings
+++ b/iphone/Maps/da.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Kalibrering af kompas";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Venligst opdatér kortet for at oprette en rute.";
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 7036c0c8d6..00f7185dba 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Kompass-Kalibrierung";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Bitte aktualisieren Sie die Karte, um eine Route zu erzeugen.";
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index 637eaa7f59..bbd74b4ce9 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Compass calibration";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Please update the map to create a route";
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index eb5818af4c..ddb8898c73 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Calibrado de la brújula";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Por favor, actualiza el mapa para crear una ruta.";
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index 9587e9b41f..7fb704a597 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Étalonnage de la boussole";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Veuillez mettre à jour la carte pour créer un itinéraire.";
diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings
index 072a75c3d7..9c1b894074 100644
--- a/iphone/Maps/hu.lproj/Localizable.strings
+++ b/iphone/Maps/hu.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Iránytű kalibrálás";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Kérjük, útvonal létrehozásához frissítsd a térképet.";
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index 6fa817c3cb..85e64e026c 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Calibrazione del compasso";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Aggiorna la mappa per creare un itinerario.";
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index bb368cca8a..c4efc935b1 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "コンパスの調整";
 
 /* Search Suggestion */
-"wifi" = "無線LAN/インターネット";
+"wifi" = "無線LAN";
 
 /* Update map suggestion */
 "routing_map_outdated" = "ルートを作成するためにマップを更新してください。";
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index bcec38b3e4..68a304d285 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "나침반 보정";
 
 /* Search Suggestion */
-"wifi" = "WiFi 인터넷/인터넷";
+"wifi" = "WiFi 인터넷";
 
 /* Update map suggestion */
 "routing_map_outdated" = "경로를 생성하도록 지도를 업데이트하십시오.";
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index f5c0af6a88..3f237143d0 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Kompascalibratie";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Werk de kaart bij om een route te maken.";
diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings
index 407a93e35f..589c66033a 100644
--- a/iphone/Maps/pl.lproj/Localizable.strings
+++ b/iphone/Maps/pl.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Kalibracja kompasu";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Proszę zaktualizować mapę, by utworzyć trasę.";
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index 4ed7343bb6..a3b29a4a45 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Calibração de bússola";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Por favor, atualize o mapa para criar uma rota.";
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index 35f177cc28..64de5610f9 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Калибровка компаса";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Интернет";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Пожалуйста, обновите карту для того, чтобы проложить маршрут.";
diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings
index 2d8113b2c6..6f57c89515 100644
--- a/iphone/Maps/sk.lproj/Localizable.strings
+++ b/iphone/Maps/sk.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Compass kalibrácia";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Pre vytvorenie trasy si, prosím, aktualizujte mapu.";
diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings
index 97358df3bf..eead1976db 100644
--- a/iphone/Maps/sv.lproj/Localizable.strings
+++ b/iphone/Maps/sv.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Compass calibration";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Internet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Uppdatera kartan för att skapa en rutt.";
diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings
index 719959c288..968b12315d 100644
--- a/iphone/Maps/th.lproj/Localizable.strings
+++ b/iphone/Maps/th.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "การปรับเทียบเข็มทิศ";
 
 /* Search Suggestion */
-"wifi" = "WiFi/อินเทอร์เน็ต";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "โปรดอัปเดตแผนที่เพื่อสร้างเส้นทาง";
diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings
index 18048da92e..a5ea494d06 100644
--- a/iphone/Maps/tr.lproj/Localizable.strings
+++ b/iphone/Maps/tr.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Pusula kalibrasyonu";
 
 /* Search Suggestion */
-"wifi" = "WiFi/İnternet";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Yeni bir rota oluşturmak için lütfen haritayı güncelleyin.";
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index bfa208aefd..6ca963965e 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "Калібрування компаса";
 
 /* Search Suggestion */
-"wifi" = "WiFi/Інтернет";
+"wifi" = "WiFi";
 
 /* Update map suggestion */
 "routing_map_outdated" = "Будь ласка, оновіть карту, щоб прокласти маршрут.";
diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings
index 60b9da2f8b..e4fd949754 100644
--- a/iphone/Maps/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "指南针校准";
 
 /* Search Suggestion */
-"wifi" = "无线网络/互联网";
+"wifi" = "无线网络";
 
 /* Update map suggestion */
 "routing_map_outdated" = "请更新地图以创建一条路线。";
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index 1a3d2c2ced..ac1144c780 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -620,7 +620,7 @@
 "pref_calibration_title" = "指南針校準";
 
 /* Search Suggestion */
-"wifi" = "無線網絡/互聯網";
+"wifi" = "無線網絡";
 
 /* Update map suggestion */
 "routing_map_outdated" = "請更新地圖以創建一條路線。";
diff --git a/strings.txt b/strings.txt
index 2275eceee1..25a33786a8 100644
--- a/strings.txt
+++ b/strings.txt
@@ -5456,27 +5456,27 @@
   [wifi]
     tags = ios,android,tizen
     comment = Search Suggestion
-    en = WiFi/Internet
-    cs = WiFi/Internet
-    sk = WiFi/Internet
-    de = WiFi/Internet
-    es = WiFi/Internet
-    fr = WiFi/Internet
-    it = WiFi/Internet
-    ja = 無線LAN/インターネット
-    ko = WiFi 인터넷/인터넷
-    nl = WiFi/Internet
-    ru = WiFi/Интернет
-    uk = WiFi/Інтернет
-    zh-Hant = 無線網絡/互聯網
-    pl = WiFi/Internet
-    pt = WiFi/Internet
-    hu = WiFi/Internet
-    th = WiFi/อินเทอร์เน็ต
-    zh-Hans = 无线网络/互联网
-    ar = واي فاي/الإنترنت
-    da = WiFi/Internet
-    tr = WiFi/İnternet
+    en = WiFi
+    cs = WiFi
+    sk = WiFi
+    de = WiFi
+    es = WiFi
+    fr = WiFi
+    it = WiFi
+    ja = 無線LAN
+    ko = WiFi 인터넷
+    nl = WiFi
+    ru = WiFi
+    uk = WiFi
+    zh-Hant = 無線網絡
+    pl = WiFi
+    pt = WiFi
+    hu = WiFi
+    th = WiFi
+    zh-Hans = 无线网络
+    ar = واي فاي
+    da = WiFi
+    tr = WiFi
 
   [routing_map_outdated]
     tags = ios,android,tizen
diff --git a/tizen/MapsWithMe/res/ces-CZ.xml b/tizen/MapsWithMe/res/ces-CZ.xml
index 33ddd5d95b..38d7f7b739 100644
--- a/tizen/MapsWithMe/res/ces-CZ.xml
+++ b/tizen/MapsWithMe/res/ces-CZ.xml
@@ -112,7 +112,7 @@
 	<!-- Show on first launch -->
 	<text id="IDS_DISAGREE">Nesouhlasím</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Internet</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Pro funkci vytváření tras je nutné aktualizovat mapu.</text>
 	<!-- Update maps suggestion -->
diff --git a/tizen/MapsWithMe/res/deu-DE.xml b/tizen/MapsWithMe/res/deu-DE.xml
index eb758b406e..6c6ab41453 100644
--- a/tizen/MapsWithMe/res/deu-DE.xml
+++ b/tizen/MapsWithMe/res/deu-DE.xml
@@ -104,7 +104,7 @@
 	<text id="IDS_PREF_ZOOM_TITLE">Zoom-Tasten</text>
 	<text id="IDS_PREF_ZOOM_SUMMARY">Auf dem Bildschirm anzeigen</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Internet</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Bitte aktualisieren Sie die Karte, um eine Route zu erzeugen.</text>
 	<!-- Update maps suggestion -->
diff --git a/tizen/MapsWithMe/res/eng-GB.xml b/tizen/MapsWithMe/res/eng-GB.xml
index 6142ab5225..4d154164d8 100644
--- a/tizen/MapsWithMe/res/eng-GB.xml
+++ b/tizen/MapsWithMe/res/eng-GB.xml
@@ -114,7 +114,7 @@
 	<!-- Show on first launch -->
 	<text id="IDS_DISAGREE">I disagree</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Internet</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Please update the map to create a route</text>
 	<!-- Update maps suggestion -->
diff --git a/tizen/MapsWithMe/res/fra-FR.xml b/tizen/MapsWithMe/res/fra-FR.xml
index a7780191ee..c8b705dcc3 100644
--- a/tizen/MapsWithMe/res/fra-FR.xml
+++ b/tizen/MapsWithMe/res/fra-FR.xml
@@ -114,7 +114,7 @@
 	<!-- Show on first launch -->
 	<text id="IDS_DISAGREE">Je ne suis pas d\&#39;accord</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Internet</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Veuillez mettre à jour la carte pour créer un itinéraire.</text>
 	<!-- Update maps suggestion -->
diff --git a/tizen/MapsWithMe/res/ita-IT.xml b/tizen/MapsWithMe/res/ita-IT.xml
index 78035deb05..346e340906 100644
--- a/tizen/MapsWithMe/res/ita-IT.xml
+++ b/tizen/MapsWithMe/res/ita-IT.xml
@@ -106,7 +106,7 @@
 	<text id="IDS_PREF_ZOOM_TITLE">Pulsanti per lo zoom</text>
 	<text id="IDS_PREF_ZOOM_SUMMARY">Condividi la mia location</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Internet</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Aggiorna la mappa per creare un itinerario.</text>
 	<!-- Update maps suggestion -->
diff --git a/tizen/MapsWithMe/res/pol-PL.xml b/tizen/MapsWithMe/res/pol-PL.xml
index 4a3c5e3bea..ed0ab1bfbf 100644
--- a/tizen/MapsWithMe/res/pol-PL.xml
+++ b/tizen/MapsWithMe/res/pol-PL.xml
@@ -106,7 +106,7 @@
 	<text id="IDS_PREF_ZOOM_TITLE">Przyciski powiększania</text>
 	<text id="IDS_PREF_ZOOM_SUMMARY">Wyświetl na ekranie</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Internet</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Proszę zaktualizować mapę, by utworzyć trasę.</text>
 	<!-- Update maps suggestion -->
diff --git a/tizen/MapsWithMe/res/por-PT.xml b/tizen/MapsWithMe/res/por-PT.xml
index c9636414b4..87761df3b3 100644
--- a/tizen/MapsWithMe/res/por-PT.xml
+++ b/tizen/MapsWithMe/res/por-PT.xml
@@ -106,7 +106,7 @@
 	<text id="IDS_PREF_ZOOM_TITLE">Botões de zoom</text>
 	<text id="IDS_PREF_ZOOM_SUMMARY">Mostrar no ecrã</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Internet</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Por favor, atualize o mapa para criar uma rota.</text>
 	<!-- Update maps suggestion -->
diff --git a/tizen/MapsWithMe/res/rus-RU.xml b/tizen/MapsWithMe/res/rus-RU.xml
index b120b54566..2d7d88a48f 100644
--- a/tizen/MapsWithMe/res/rus-RU.xml
+++ b/tizen/MapsWithMe/res/rus-RU.xml
@@ -114,7 +114,7 @@
 	<!-- Show on first launch -->
 	<text id="IDS_DISAGREE">Я не согласен</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Интернет</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Пожалуйста, обновите карту для того, чтобы проложить маршрут.</text>
 	<!-- Update maps suggestion -->
diff --git a/tizen/MapsWithMe/res/spa-ES.xml b/tizen/MapsWithMe/res/spa-ES.xml
index 04ffa9fc2e..7bbb473820 100644
--- a/tizen/MapsWithMe/res/spa-ES.xml
+++ b/tizen/MapsWithMe/res/spa-ES.xml
@@ -102,7 +102,7 @@
 	<text id="IDS_PREF_ZOOM_TITLE">Botones de zoom</text>
 	<text id="IDS_PREF_ZOOM_SUMMARY">Visualización en la pantalla</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Internet</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Por favor, actualiza el mapa para crear una ruta.</text>
 	<!-- Update maps suggestion -->
diff --git a/tizen/MapsWithMe/res/ukr-UA.xml b/tizen/MapsWithMe/res/ukr-UA.xml
index 3891e1f553..ed2d3c9dff 100644
--- a/tizen/MapsWithMe/res/ukr-UA.xml
+++ b/tizen/MapsWithMe/res/ukr-UA.xml
@@ -108,7 +108,7 @@
 	<text id="IDS_PREF_ZOOM_TITLE">Кнопки трансфокації</text>
 	<text id="IDS_PREF_ZOOM_SUMMARY">Відображення на екрані</text>
 	<!-- Search Suggestion -->
-	<text id="IDS_WIFI">WiFi/Інтернет</text>
+	<text id="IDS_WIFI">WiFi</text>
 	<!-- Update map suggestion -->
 	<text id="IDS_ROUTING_MAP_OUTDATED">Будь ласка, оновіть карту, щоб прокласти маршрут.</text>
 	<!-- Update maps suggestion -->