From: Seungyoun Ju <sy39.ju@samsung.com>
Date: Tue, 15 Jan 2013 07:16:45 +0000 (+0900)
Subject: Below changes are applied
X-Git-Tag: 2.1b_release~3^2~3
X-Git-Url: http://review.tizen.org/git/?p=apps%2Fnative%2Fug-mobile-ap.git;a=commitdiff_plain;h=c62e492260f4c442f65383a848fe1f96a051134f

Below changes are applied

- Fix : When device is rotated, guide text is displayed short time
- Fix : Security / Hide items are disabled sometimes
- Translation data is updated
- Pop-up scenario for USB tethering is implemented
- IMF is hided by focus out
- Wi-Fi tethering is enabled without checking enable state

Change-Id: Ic898044bea296bcb77b9d80c97abb678061efb72
---

diff --git a/include/mh_common_utility.h b/include/mh_common_utility.h
index 2e3003b..5549efe 100644
--- a/include/mh_common_utility.h
+++ b/include/mh_common_utility.h
@@ -35,7 +35,6 @@ Evas_Object *_create_bg(Evas_Object *parent, const char *style);
 Evas_Object *_create_win_layout(mh_appdata_t *ad);
 Evas_Object *_create_naviframe(Evas_Object *parent);
 void _handle_usb_mode_change(keynode_t *key, void *data);
-Eina_Bool _hide_imf(Evas_Object *entry);
 int _get_vconf_hotspot_mode(void);
 Eina_Bool _get_no_of_connected_device(tethering_h handle, int *no, tethering_type_e type);
 
diff --git a/include/mh_view_main.h b/include/mh_view_main.h
index d326fa4..f87084a 100644
--- a/include/mh_view_main.h
+++ b/include/mh_view_main.h
@@ -33,12 +33,6 @@ extern "C" {
 #define MH_KB			(1000)
 #define MH_MB			(MH_KB * MH_KB)
 
-#define MH_DEVICE_LIST_NO_NAME	"No name"
-#define MH_DEFAULT_DEVICE_NAME	"No name"
-
-#define MH_CONNECTED_DEVICE_WILL_BE_DISCONNECTED	"Connected device will be disconnected"
-#define MH_CONSUMES_MORE_BATTERY_POWER			"Tethering consumes more battery power and increases your data usage. Continue?"
-
 void ap_update_data_onoff(void *data);
 void ap_update_data_device(mh_appdata_t *ad);
 Eina_Bool ap_update_data_packet_usage(mh_appdata_t *ad);
diff --git a/include/mobile_hotspot.h b/include/mobile_hotspot.h
index 1cf8bbd..fb27abb 100644
--- a/include/mobile_hotspot.h
+++ b/include/mobile_hotspot.h
@@ -85,16 +85,10 @@ extern "C" {
 #define BT_ICON				"Bluetooth.png"
 #define USB_ICON			"USB.png"
 
-#define MH_DEFAULT_PASSWORD		"qwertyuiop"
-
 #define DEVICE_NAME_LENGTH_MAX		31
 #define WIFI_PASSPHRASE_LENGTH_MIN	8
 #define WIFI_PASSPHRASE_LENGTH_MAX	63
 #define MH_LABEL_LENGTH_MAX		1024
-#define FONT_SIZE_20			20
-#define FONT_SIZE_25			25
-#define FONT_SIZE_30			30
-#define FONT_SIZE_32			32
 
 #define _EDJ(obj)			elm_layout_edje_get(obj)
 
@@ -110,6 +104,7 @@ typedef enum {
 	MH_POP_WIFI_ON_CONF,
 	MH_POP_BT_ON_CONF,
 	MH_POP_USB_ON_CONF,
+	MH_POP_USB_ON_PREVCONN_CONF,
 	MH_POP_ENTER_TO_WIFI_SETUP_CONF,
 
 	/* One button pop-up */
@@ -162,7 +157,7 @@ typedef struct ap_app_main {
 	int				wifi_state;
 	int				bt_state;
 	int				usb_state;
-	bool				old_wifi_state;
+	bool				need_recover_wifi_tethering;
 } mh_main_view_t;
 
 typedef struct {
diff --git a/packaging/ug-setting-mobileap-efl.spec b/packaging/ug-setting-mobileap-efl.spec
index 8474428..94ec459 100644
--- a/packaging/ug-setting-mobileap-efl.spec
+++ b/packaging/ug-setting-mobileap-efl.spec
@@ -3,7 +3,7 @@
 
 Name:       ug-setting-mobileap-efl
 Summary:    Tethering UI Gadget Library
-Version:    0.1.158
+Version:    0.1.159
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Flora License Version 1.0
@@ -46,6 +46,14 @@ rm -rf %{buildroot}
 %{_ugdir}/lib/libug-setting-mobile-ap-ug.so
 
 %changelog
+* Tue Jan 15 2013 Seungyoun Ju <sy39.ju@samsung.com> 0.1.159-1
+- Fix : When device is rotated, guide text is displayed short time
+- Fix : Security / Hide items are disabled sometimes
+- Translation data is updated
+- Pop-up scenario for USB tethering is implemented
+- IMF is hided by focus out
+- Wi-Fi tethering is enabled without checking enable state
+
 * Fri Dec 07 2012 Seungyoun Ju <sy39.ju@samsung.com> 0.1.158-1
 - New winset is applied and some bugs are fixed
 
diff --git a/po/ar.po b/po/ar.po
index b28b805..68d10cd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -94,6 +94,9 @@ msgstr "توصيل إلى كابل USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "يجب ألا تقل كلمة المرور عن %d أحرف وألا تزيد عن %d حرفا"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "يستهلك التقييد الكثير من طاقة البطارية ويزيد من استخدام البيانات"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "سيتم قطع اتصال الجهاز المتصل"
 
diff --git a/po/az.po b/po/az.po
index a022f68..32f9973 100644
--- a/po/az.po
+++ b/po/az.po
@@ -94,6 +94,9 @@ msgstr "USB kabelini qoş"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Parol minimum %d simvol ehtiva etməlidir və uzunluğu %d simvoldan çox olmamalıdır"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Bağlanma daha çox batareyadan istifadə edir və verilənlərdən istifadənizi artırır"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Qoşulmuş cihazla əlaqə kəsiləcək"
 
diff --git a/po/bg.po b/po/bg.po
index db74f68..428a2a0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -94,6 +94,9 @@ msgstr "Свързване с USB кабел"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Паролата трябва да съдържа поне %d знака и да не е по-дълга от %d знака"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Привързването изразходва повече енергия от батерията и увеличава потреблението на данни"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Свързаното устройство ще бъде прекъснато"
 
diff --git a/po/ca.po b/po/ca.po
index 9d70a1f..f52d7a1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -94,6 +94,9 @@ msgstr "Connectar cable USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "La contrasenya ha de contenir al menys %d caràcters i no excedir els %d"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "El tethering consumeix més bateria i augmenta el consum de dades"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Es desconnectarà el dispositiu connectat"
 
diff --git a/po/cs.po b/po/cs.po
index 7eb7e42..5f9a6d2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -94,6 +94,9 @@ msgstr "Připojte USB kabel"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Heslo musí obsahovat nejméně %d znaků a maximálně %d znaků"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Sdílení připojení spotřebovává více energie z baterie a zvyšuje využívání dat"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Připojené zařízení bude odpojeno"
 
diff --git a/po/da.po b/po/da.po
index 732f3b4..df27258 100644
--- a/po/da.po
+++ b/po/da.po
@@ -94,6 +94,9 @@ msgstr "Tilslut USB-kabel"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Adgangskode skal indeholde mindst %d tegn og må ikke overstige %d tegn"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Internetdeling bruger mere batteri og forøger dit dataforbrug"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Tilsluttet enhed vil blive frakoblet"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index ba14c4a..001b5ff 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -94,6 +94,9 @@ msgstr "USB-Kabel anschließen"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Passwort muss mindestens %d, jedoch nicht mehr als %d Zeichen enthalten"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Tethering verbraucht mehr Akkuleistung und erhöht Ihre Datennutzung."
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Das angeschlossene Gerät wird getrennt."
 
diff --git a/po/el_GR.po b/po/el_GR.po
index bb3d294..71b21a2 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -94,6 +94,9 @@ msgstr "Συνδέστε το καλώδιο USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Ο κωδικός πρόσβασης πρέπει να περιέχει %d χαρακτήρες τουλάχιστον και να μην ξεπερνά τους %d χαρακτήρες"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Το tethering καταναλώνει περισσότερη ισχύ μπαταρίας και αυξάνει τη χρήση δεδομένων"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Η συνδεδεμένη συσκευή θα αποσυνδεθεί"
 
diff --git a/po/en.po b/po/en.po
index 40b7dbe..0dc7261 100644
--- a/po/en.po
+++ b/po/en.po
@@ -94,6 +94,9 @@ msgstr "Connect USB cable"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Password must contain at least %d characters and not exceed %d characters"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Tethering consumes more battery power and increases your data usage"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Connected device will be disconnected"
 
diff --git a/po/en_PH.po b/po/en_PH.po
index a48d50e..b854107 100644
--- a/po/en_PH.po
+++ b/po/en_PH.po
@@ -94,6 +94,9 @@ msgstr "Connect USB cable"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Password must contain at least %d characters and not exceed %d characters"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Tethering consumes more battery power and increases your data usage"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Connected device will be disconnected"
 
diff --git a/po/en_US.po b/po/en_US.po
index ec8a127..4c0f29b 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -94,6 +94,9 @@ msgstr "Connect USB cable"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Password must contain at least %d characters and not exceed %d characters"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Tethering consumes more battery power and increases your data usage"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Connected device will be disconnected"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 1979ac0..980b40b 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -94,6 +94,9 @@ msgstr "Conectar el cable USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "La contraseña debe contener al menos %d caracteres y no superar los %d caracteres"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "El anclaje a red consume mucha batería y aumenta el uso de datos"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Se desconectará del dispositivo conectado"
 
diff --git a/po/es_MX.po b/po/es_MX.po
index 3255637..cdfe15c 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -94,6 +94,9 @@ msgstr "Conectar cable USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "La contraseña debe contener al menos %d caracteres y no superar los %d caracteres"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "El anclaje consume más batería y aumenta el uso de datos"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Se desconectará del dispositivo conectado"
 
diff --git a/po/et.po b/po/et.po
index bdc6070..a8cfe08 100644
--- a/po/et.po
+++ b/po/et.po
@@ -94,6 +94,9 @@ msgstr "Ühenda USB-kaabel"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Parool peab sisaldama vähemalt %d tähemärki, kuid ei tohi olla pikem kui %d tähemärki"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Modemi kasutamine tarbib rohkem akutoidet ja suurendab andmekasutust"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Ühendatud seadme ühendus katkestatakse"
 
diff --git a/po/eu.po b/po/eu.po
index e3ca08a..9728993 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -94,6 +94,9 @@ msgstr "USB kablea konektatu"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Pasahitzak gutxienez %d karaktere izan behar ditu eta ezin ditu %d karaktereak gainditu"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Ainguraketak bateria gehiago kontsumitzen du eta zure datuen erabilera areagotzen du"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Konektatutako gailua deskonektatuko da"
 
diff --git a/po/fi.po b/po/fi.po
index 2c20232..861edf0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -94,6 +94,9 @@ msgstr "Liitä USB-kaapeli"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Salasanassa on oltava ainakin %d merkkiä eikä se saa olla yli %d merkkiä pitkä"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Yhteyden jakaminen kuluttaa enemmän virtaa ja lisää tietojen käyttöä"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Yhdistetyn laitteen yhteys katkaistaan"
 
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 20f2e98..8bb855b 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -94,6 +94,9 @@ msgstr "Branchez le câble USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Le mot de passe doit contenir au moins %d caractères et ne pas dépasser %d caractères"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Le modem consomme plus d'énergie et augmente l'utilisation des données"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Le périphérique connecté sera déconnecté"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 325f58f..70971c3 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -94,6 +94,9 @@ msgstr "Connecter le câble USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Le mot de passe doit contenir au moins %d caractères et ne pas dépasser %d caractères"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Le modem consomme plus d'énergie et augmente l'utilisation des données"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Le périphérique connecté sera déconnecté"
 
diff --git a/po/ga.po b/po/ga.po
index efbc2c1..7e16b08 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -94,6 +94,9 @@ msgstr "Ceangail cábla USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Ní mór %d carachtar ar a laghad a bheith sa phasfhocal agus gan %d carachtar a shárú"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Úsáideann nascaireacht níos mó cumhacht ceallra agus méadaíonn sé úsáid sonraí agat"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Dínascfar an gléas nasctha"
 
diff --git a/po/gl.po b/po/gl.po
index 7fc58fd..95fb573 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -94,6 +94,9 @@ msgstr "Conectar cable USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "O contrasinal ten que ter polo menos %d carácteres e non superar %d carácteres"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "A ancoraxe á rede consume máis batería e incrementa o uso de información"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "O dispositivo conectado desconectarase"
 
diff --git a/po/hi.po b/po/hi.po
index 56201f1..baa7500 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -94,6 +94,9 @@ msgstr "USB केबल कनेक्‍ट करें"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "पासवर्ड में कम से कम %d वर्ण होने जरूरी है और %d वर्ण से अधिक नहीं होना चाहिए"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "तेथरिंग बैटरी पॉवर की ज्यादा खपत करता है और आपके डेटा उपयोग को बढ़ाता है"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "कनेक्ट किया गया डिवाइस डिस्कनेक्ट हो जाएगा"
 
diff --git a/po/hr.po b/po/hr.po
index a7eafdf..809f81b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -94,6 +94,9 @@ msgstr "Spoji USB kabel"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Šifra mora sadržavati najmanje %d, a najviše %d znakova"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Dijeljenje povećava potrošnju baterije i količinu prijenosa podataka"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Spojeni uređaj će se odspojiti"
 
diff --git a/po/hu.po b/po/hu.po
index f187193..7eb5827 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -94,6 +94,9 @@ msgstr "Csatlakoztassa az USB-kábelt"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "A jelszónak legalább %d, legfeljebb %d karakterből kell állnia"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Az internetmegosztás használata gyorsan meríti az akkumulátort, és nagyobb adatforgalmat eredményez"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "A csatlakoztatott eszköz le lesz választva"
 
diff --git a/po/hy.po b/po/hy.po
index 209411a..2aa5d6d 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -94,6 +94,9 @@ msgstr "Միացնել USB մալուխը"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Գաղտնաբառը պետք է պարունակի առնվազն %d նիշ և չգերազանցի %d նիշը"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Տեղակապումը մարտկոցի ավելի շատ էներգիա է սպառում և ավելացնում է տվյալների օգտագործումը"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Կապակցված սարքը կանջատվի"
 
diff --git a/po/is.po b/po/is.po
index 81dcd99..dc56aeb 100644
--- a/po/is.po
+++ b/po/is.po
@@ -94,6 +94,9 @@ msgstr "Tengjast USB-snúru"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Lykilorðið verður að vera a.m.k. %d stafir og má ekki vera lengra en %d stafir"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Tjóðrun notar meiri orku og eykur gagnanotkun"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Tengt tæki verður aftengt"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 241d82d..1fa28f5 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -94,6 +94,9 @@ msgstr "Collegare cavo USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "La password deve contenere almeno %d caratteri e non superare %d caratteri"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Il tethering aumenta il consumo della batteria e l'utilizzo della connessione dati"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Il dispositivo connesso verrà disconnesso"
 
diff --git a/po/ja_JP.po b/po/ja_JP.po
index 5d8553b..cf54ef4 100644
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -94,6 +94,9 @@ msgstr "USBケーブルを接続してください"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "パスワードの長さは%d文字以上、%d文字以下である必要があります。"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "テザリングはより多くのバッテリーを消費し、データ使用量が増加します。"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "接続中のデバイスを切断します。"
 
diff --git a/po/ka.po b/po/ka.po
index fc58003..d381048 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -94,6 +94,9 @@ msgstr "USB კაბელის მიერთება"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "პაროლი უნდა შეიცავდეს მინიმუმ %d და მაქსიმუმ %d სიმბოლოს"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "მობილური ინტერნეტი ხარჯავს უფო მეტ ენერგიას და ზრდის მონაცემთა გამოყენებას"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "დაკავშირებულ მოწყობილობასთან კავშირი შეწყდა"
 
diff --git a/po/kk.po b/po/kk.po
index 9910f62..4a4d2ad 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -94,6 +94,9 @@ msgstr "USB кабелін қосу"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Құпиясөзде кемінде %d таңба болуы және %d таңбадан аспауы керек"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Байланыстыру батарея зарядын көп пайдаланып, деректеріңіздің пайдаланылуын арттырады"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Қосылған құрылғы ажыратылады"
 
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 709da38..33e2630 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -94,6 +94,9 @@ msgstr "USB 케이블을 연결하세요"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "비밀번호는 %d자 이상 %d자 이하여야 합니다"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "테더링을 사용하면 배터리가 더 많이 소모되며 데이터 사용량이 증가합니다"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "연결된 기기가 분리됩니다"
 
diff --git a/po/lt.po b/po/lt.po
index 0e78195..278446a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -94,6 +94,9 @@ msgstr "Prijungti USB kabelį"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Slaptažodį turi sudaryti ne mažiau kaip %d simboliai (-ių), bet ne daugiau kaip %d simboliai (-ių)"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Kai įjungtas siejimas, suvartojama daugiau akumuliatoriaus energijos ir padidėja duomenų naudojimas"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Prijungtas įrenginys bus atjungtas"
 
diff --git a/po/lv.po b/po/lv.po
index 09a3b9f..8a2fb38 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -94,6 +94,9 @@ msgstr "Pievienot USB kabeli"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Parolē ir jābūt vismaz %d rakstzīmēm, bet ne vairāk par %d"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Piesaiste patērē vairāk akumulatora enerģijas un palielina datu lietojumu"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Pievienotā ierīce tiks atvienota"
 
diff --git a/po/mk.po b/po/mk.po
index 23d0839..9a24b86 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -94,6 +94,9 @@ msgstr "Приклучете го USB кабелот"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Лозинката мора да содржи најмалку %d, а најмногу %d знаци"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Споделувањето троши повеќе батерија и го зголемува користењето податоци"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Ќе се прекине врската со поврзаниот уред"
 
diff --git a/po/nb.po b/po/nb.po
index eef7967..bace56a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -94,6 +94,9 @@ msgstr "Koble til USB-kabel"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Passordet må inneholde minst %d tegn og ikke overstige %d tegn"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Internettdeling forbruker mer batteristrøm og øker databruken"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Tilkoblet enhet blir koblet fra"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 18c86e0..9e05eaa 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -94,6 +94,9 @@ msgstr "USB-kabel aansluiten"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Wachtwoord moet ten minste %d tekens bevatten en mag niet langer zijn dan %d tekens"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Tethering verbruikt meer voeding en verhoogt uw gegevensgebruik"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Aangesloten apparaat wordt losgekoppeld"
 
diff --git a/po/pl.po b/po/pl.po
index 7227267..1b0388e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -94,6 +94,9 @@ msgstr "Podłącz kabel USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Hasło musi zawierać co najmniej %d znaków i nie przekraczać %d znaków"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Router zwiększa zużycie baterii i danych"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Podłączone urządzenie zostanie odłączone"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f76aa36..5df8818 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -94,6 +94,9 @@ msgstr "Conecte o cabo USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "A senha deve conter pelo menos %d caracteres e não exceder %d caracteres"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "O tethering consome mais bateria e aumenta sua utilização de dados"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "O dispositivo conectado será desconectado"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e0a0d2a..e5f1ab2 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -94,6 +94,9 @@ msgstr "Ligar cabo USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "A palavra-passe tem de incluir pelo menos %d caracteres e não exceder %d caracteres"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "A ancoragem consome mais bateria e aumenta a utilização de dados"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "O dispositivo ligado será desligado"
 
diff --git a/po/ro.po b/po/ro.po
index 6c5e039..23cc4e0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -94,6 +94,9 @@ msgstr "Conectaţi cablul USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Parola trebuie să conţină minimum %d caractere şi nu poate depăşi %d caractere"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Furnizarea accesului la internet consumă mai mult din energia bateriei şi creşte volumul de date utilizat"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Dispozitivul conectat va fi deconectat"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index d4ba4d7..269f25f 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -94,6 +94,9 @@ msgstr "Подключите USB-кабель"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Допустимое число символов в пароле: от %d до %d"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "При использовании модема быстро расходуется заряд батареи и увеличивается объем передаваемых данных"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Подключенное устройство будет отключено"
 
diff --git a/po/sk.po b/po/sk.po
index c28961b..ca49c41 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -94,6 +94,9 @@ msgstr "Pripojiť kábel USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Heslo musí obsahovať aspoň %d znakov a nesmie prekročiť %d znakov"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Zdieľanie pripojenia spotrebúva viac energie batérie a zvyšuje používanie dátových prenosov"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Pripojené zariadenie sa odpojí"
 
diff --git a/po/sl.po b/po/sl.po
index abc3b02..70dc1c3 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -94,6 +94,9 @@ msgstr "Priključite kabel USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Geslo mora vsebovati vsaj %d znakov in ne sme presegati %d znakov"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Uporaba telefona kot modema porabi več baterije in poveča porabo prenosa podatkov"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Povezava z napravo bo prekinjena"
 
diff --git a/po/sr.po b/po/sr.po
index c87988f..7178a02 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -94,6 +94,9 @@ msgstr "Priključi USB kabl"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Šifra mora da sadrži najmanje %d i najviše %d znakova"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Vezivanje troši više energije i povećava upotrebu podataka"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Povezani uređaj će biti isključen"
 
diff --git a/po/sv.po b/po/sv.po
index 0fb57ad..ee1b88c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -94,6 +94,9 @@ msgstr "Anslut USB-kabeln"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Lösenord måste innehålla minst %d tecken och inte överstiga %d tecken"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Internetdelning förbrukar mer batteri och ökar dataanvändningen"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Den anslutna enheten kommer att kopplas bort"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index c47d662..5c13b41 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -94,6 +94,9 @@ msgstr "USB kablosunu bağlayın"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Şifre en az %d karakter içermeli ve %d karakteri geçmemelidir"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Bağlanma daha fazla pil gücü tüketir ve veri kullanımınızı arttırır"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Bağlı cihazın bağlantısı kesilecek"
 
diff --git a/po/uk.po b/po/uk.po
index d9eaf87..39a0b3d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -94,6 +94,9 @@ msgstr "Підключити кабель USB"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Пароль має містити щонайменше %d символів і не перевищувати %d символів"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Прив'язка використовує більше заряду акумулятора та збільшує використання даних"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Підключений пристрій буде відключено"
 
diff --git a/po/uz.po b/po/uz.po
index aa2f8f0..c797c2c 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -94,6 +94,9 @@ msgstr "USB-kabelni ulash"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "Parol eng kamida %d belgidan iborat bo‘lishi hamda %d belgidan oshmasligi lozim"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Bog‘lanish batareya quvvatini ko‘proq sarflaydi va ma’lumot ishlatilishini oshiradi"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "Ulangan qurilma uziladi"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 89bd2ad..edf7a6c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -94,6 +94,9 @@ msgstr "连接 USB 线"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "密码必须至少包含%d个字符，并且不超过%d个字符"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "网络共享消耗更多电池电力并增加您的数据使用量"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "已连接的设备将断开"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4fd7d6a..8e9d3b7 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -94,6 +94,9 @@ msgstr "連接 USB 線"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "密碼必須包含至少%d個字元，但不可超過%d個字元"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "網路共享會消耗更多電力且增加數據使用量"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "將中斷已連接的裝置"
 
diff --git a/po/zh_SG.po b/po/zh_SG.po
index 02ff314..56e949d 100644
--- a/po/zh_SG.po
+++ b/po/zh_SG.po
@@ -94,6 +94,9 @@ msgstr "连结USB缆线"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "密码必须至少包含%d个字符，并且不超过%d个字符"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "网络共享消耗更多电池电力并增加您的数据使用量"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "已连接的设备将断开"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e223725..63b126f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -94,6 +94,9 @@ msgstr "連接 USB 纜線"
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
 msgstr "密碼必須包含至少%d個字符，並且不得超過%d個字符"
 
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "網路共享會消耗更多電力且增加數據使用量"
+
 msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
 msgstr "將中斷連接的裝置"
 
diff --git a/src/mh_common_utility.c b/src/mh_common_utility.c
index 84c2d43..2cb2ccf 100644
--- a/src/mh_common_utility.c
+++ b/src/mh_common_utility.c
@@ -153,6 +153,12 @@ static void __popup_resp_yes(void *data, Evas_Object *obj, void *event_info)
 			break;
 		}
 
+		_prepare_popup(ad, MH_POP_USB_ON_PREVCONN_CONF,
+				_("IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"));
+		_create_popup(ad);
+		break;
+
+	case MH_POP_USB_ON_PREVCONN_CONF:
 		ret = tethering_enable(ad->handle, TETHERING_TYPE_USB);
 		if (ret != TETHERING_ERROR_NONE) {
 			ERR("Error enable usb tethering : %d\n", ret);
@@ -164,10 +170,10 @@ static void __popup_resp_yes(void *data, Evas_Object *obj, void *event_info)
 		_update_wifi_item(ad, MH_STATE_PROCESS);
 		ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI);
 		if (ret != TETHERING_ERROR_NONE) {
-			ERR("wifi tethering off is failed : %d\n", ret);
+			ERR("Wi-Fi tethering off is failed : %d\n", ret);
 			_update_wifi_item(ad, MH_STATE_NONE);
 		} else
-			ad->main.old_wifi_state = true;
+			ad->main.need_recover_wifi_tethering = true;
 
 		mh_draw_wifi_setup_view(ad);
 		break;
@@ -212,6 +218,10 @@ static void __popup_resp_no(void *data, Evas_Object *obj, void *event_info)
 		_update_usb_item(ad, MH_STATE_NONE);
 		break;
 
+	case MH_POP_USB_ON_PREVCONN_CONF:
+		_update_usb_item(ad, MH_STATE_NONE);
+		break;
+
 	case MH_POP_ENTER_TO_WIFI_SETUP_CONF:
 		break;
 
@@ -352,14 +362,14 @@ Eina_Bool _create_popup(mh_appdata_t *ad)
 
 		btn = elm_button_add(ad->popup);
 		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_SK_YES"));
+		elm_object_text_set(btn, S_("IDS_COM_SK_OK"));
 		elm_object_part_content_set(ad->popup, "button1", btn);
 		evas_object_smart_callback_add(btn, "clicked",
 				__popup_resp_yes, (void *)ad);
 
 		btn = elm_button_add(ad->popup);
 		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_SK_NO"));
+		elm_object_text_set(btn, S_("IDS_COM_SK_CANCEL"));
 		elm_object_part_content_set(ad->popup, "button2", btn);
 		evas_object_smart_callback_add(btn, "clicked",
 				__popup_resp_no, (void *)ad);
@@ -368,6 +378,7 @@ Eina_Bool _create_popup(mh_appdata_t *ad)
 		break;
 
 	case MH_POP_USB_ON_CONF:
+	case MH_POP_USB_ON_PREVCONN_CONF:
 		ad->popup = elm_popup_add(ad->win);
 		evas_object_size_hint_weight_set(ad->popup,
 				EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -376,14 +387,14 @@ Eina_Bool _create_popup(mh_appdata_t *ad)
 
 		btn = elm_button_add(ad->popup);
 		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_SK_YES"));
+		elm_object_text_set(btn, S_("IDS_COM_SK_OK"));
 		elm_object_part_content_set(ad->popup, "button1", btn);
 		evas_object_smart_callback_add(btn, "clicked",
 				__popup_resp_yes, (void *)ad);
 
 		btn = elm_button_add(ad->popup);
 		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_SK_NO"));
+		elm_object_text_set(btn, S_("IDS_COM_SK_CANCEL"));
 		elm_object_part_content_set(ad->popup, "button2", btn);
 		evas_object_smart_callback_add(btn, "clicked",
 				__popup_resp_no, (void *)ad);
@@ -613,31 +624,6 @@ void _handle_usb_mode_change(keynode_t *key, void *data)
 	}
 }
 
-Eina_Bool _hide_imf(Evas_Object *entry)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	if (entry == NULL) {
-		ERR("Invalid param\n");
-		return EINA_FALSE;
-	}
-
-	Ecore_IMF_Context *context = NULL;
-
-	context = elm_entry_imf_context_get(entry);
-	if (context == NULL) {
-		ERR("context is NULL\n");
-		return EINA_FALSE;
-	}
-	ecore_imf_context_input_panel_hide(context);
-
-	elm_object_focus_set(entry, EINA_FALSE);
-
-	__MOBILE_AP_FUNC_EXIT__;
-
-	return EINA_TRUE;
-}
-
 int _get_vconf_hotspot_mode(void)
 {
 	int value = VCONFKEY_MOBILE_HOTSPOT_MODE_NONE;
diff --git a/src/mh_func_onoff.c b/src/mh_func_onoff.c
index 5f39665..770b669 100644
--- a/src/mh_func_onoff.c
+++ b/src/mh_func_onoff.c
@@ -99,7 +99,7 @@ static bool __is_connected_cellular_net(mh_appdata_t *ad)
 	ret = sim_get_state(&sim_state);
 	if (ret != SIM_ERROR_NONE) {
 		ERR("sim_get_state() is failed : %d\n", ret);
-		return -1;
+		return false;
 	}
 	DBG("SIM State : %d\n", sim_state);
 	if (sim_state != SIM_STATE_AVAILABLE) {
@@ -154,7 +154,7 @@ static int __create_wifi_hotspot_on_popup(mh_appdata_t *ad)
 static int __create_bt_tethering_on_popup(mh_appdata_t *ad)
 {
 	_prepare_popup(ad, MH_POP_BT_ON_CONF,
-			_(MH_CONSUMES_MORE_BATTERY_POWER));
+			_("IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"));
 	_create_popup(ad);
 
 	return 0;
@@ -162,21 +162,8 @@ static int __create_bt_tethering_on_popup(mh_appdata_t *ad)
 
 static int __create_usb_tethering_on_popup(mh_appdata_t *ad)
 {
-	char buf[MH_LABEL_LENGTH_MAX] = {0, };
-
-	if (_get_vconf_usb_state() != VCONFKEY_SYSMAN_USB_AVAILABLE) {
-		DBG("USB is not connected\n");
-		_prepare_popup(ad, MH_POP_USB_ON_CONF,
-				_(MH_CONSUMES_MORE_BATTERY_POWER));
-		_create_popup(ad);
-
-		return 0;
-	}
-
-	snprintf(buf, sizeof(buf), "%s.<br>%s",
-			_("IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"),
-			_(MH_CONSUMES_MORE_BATTERY_POWER));
-	_prepare_popup(ad, MH_POP_USB_ON_CONF, buf);
+	_prepare_popup(ad, MH_POP_USB_ON_CONF,
+			_("IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"));
 	_create_popup(ad);
 
 	return 0;
@@ -343,6 +330,8 @@ void _enabled_cb(tethering_error_e result, tethering_type_e type, bool is_reques
 
 	mh_appdata_t *ad = (mh_appdata_t *)user_data;
 
+	ad->main.need_recover_wifi_tethering = false;
+
 	if (!is_requested) {
 		if (NULL != ad->popup) {
 			evas_object_del(ad->popup);
@@ -373,6 +362,11 @@ void _disabled_cb(tethering_error_e result, tethering_type_e type, tethering_dis
 
 	mh_appdata_t *ad = (mh_appdata_t *)user_data;
 
+	if (ad->main.need_recover_wifi_tethering == true) {
+		DBG("Wi-Fi tethering will be turned on again\n");
+		return;
+	}
+
 	if (cause != TETHERING_DISABLED_BY_REQUEST) {
 		DBG("Tethering [%d] is disabled because of [%d]\n", type, cause);
 		if (NULL != ad->popup) {
@@ -548,8 +542,6 @@ int _handle_usb_onoff_change(mh_appdata_t *ad)
 		return -1;
 	}
 
-
-
 	__MOBILE_AP_FUNC_EXIT__;
 
 	return 0;
diff --git a/src/mh_main_ug.c b/src/mh_main_ug.c
index c934a6e..6bba6af 100644
--- a/src/mh_main_ug.c
+++ b/src/mh_main_ug.c
@@ -102,7 +102,7 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode,
 	ugd = (mh_ugdata_t *)priv;
 	ugd->ad = ad;
 	ugd->ug = ug;
-	ad->gadget= ugd;
+	ad->gadget = ugd;
 
 	ecore_imf_init();
 
diff --git a/src/mh_view_main.c b/src/mh_view_main.c
index 0b2ce48..f43f744 100644
--- a/src/mh_view_main.c
+++ b/src/mh_view_main.c
@@ -286,7 +286,7 @@ static void __read_setting(mh_appdata_t *ad)
 
 	ret = tethering_wifi_get_ssid(ad->handle, &ssid);
 	if (ret != TETHERING_ERROR_NONE || ssid == NULL) {
-		ERR("tethering_wifi_get_ssid is failed : %d %s\n", ret, ssid);
+		ERR("tethering_wifi_get_ssid is failed : %d\n", ret);
 		return;
 	}
 	g_strlcpy(ad->setup.device_name, ssid, sizeof(ad->setup.device_name));
@@ -294,7 +294,7 @@ static void __read_setting(mh_appdata_t *ad)
 
 	ret = tethering_wifi_get_passphrase(ad->handle, &passphrase);
 	if (ret != TETHERING_ERROR_NONE || passphrase == NULL) {
-		ERR("tethering_wifi_get_ssid is failed : %d %s\n", ret, ssid);
+		ERR("tethering_wifi_get_passphrase is failed : %d\n", ret);
 		return;
 	}
 	g_strlcpy(ad->setup.wifi_passphrase, passphrase,
@@ -452,7 +452,7 @@ void _update_main_view(mh_appdata_t *ad)
 
 	if (wifi_state || bt_state) {
 		if (ad->main.help_item) {
-			DBG("Just update genlist\n");
+			DBG("Just update help label item\n");
 			elm_genlist_item_update(ad->main.help_item);
 			return;
 		} else {
@@ -471,10 +471,7 @@ void _update_main_view(mh_appdata_t *ad)
 			ad->main.help_item = item;
 		}
 	} else {
-		if (!ad->main.help_item) {
-			DBG("No need to update\n");
-			return;
-		} else {
+		if (ad->main.help_item) {
 			DBG("Remove help item\n");
 			elm_object_item_del(ad->main.help_item);
 			ad->main.help_item = NULL;
@@ -563,10 +560,10 @@ static void __select_setup_item(void *data, Evas_Object *obj, void *event_info)
 		_update_wifi_item(ad, MH_STATE_PROCESS);
 		ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI);
 		if (ret != TETHERING_ERROR_NONE) {
-			ERR("wifi tethering off is failed : %d\n", ret);
+			ERR("Wi-Fi tethering off is failed : %d\n", ret);
 			_update_wifi_item(ad, MH_STATE_NONE);
 		} else
-			ad->main.old_wifi_state = true;
+			ad->main.need_recover_wifi_tethering = true;
 
 		mh_draw_wifi_setup_view(ad);
 	}
@@ -1051,7 +1048,7 @@ static char *__gl_get_dev_label(void *data, Evas_Object *obj, const char *part)
 		DBG("Device name : %s\n", name);
 
 		if (!strcmp(name, "UNKNOWN")) {
-			return strdup(_(MH_DEVICE_LIST_NO_NAME));
+			return strdup(S_("IDS_COM_BODY_NO_NAME"));
 		}
 
 		return name;
diff --git a/src/mh_view_wifi_setup.c b/src/mh_view_wifi_setup.c
index 9abf482..f61c5b2 100644
--- a/src/mh_view_wifi_setup.c
+++ b/src/mh_view_wifi_setup.c
@@ -24,12 +24,24 @@ static void __gl_realized(void *data, Evas_Object *obj, void *event_info);
 
 static void __input_panel_event_cb(void *data, Ecore_IMF_Context *ctx, int value)
 {
+	if (data == NULL) {
+		ERR("data is NULL\n");
+		return;
+	}
+
+	mh_wifi_setting_view_t *st = (mh_wifi_setting_view_t *)data;
+
+	if (st->navi_it == NULL) {
+		DBG("naviframe item is not pushed yet\n");
+		return;
+	}
+
 	if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
 		DBG("value == ECORE_IMF_INPUT_PANEL_STATE_SHOW\n");
-		elm_object_item_signal_emit(data, "elm,state,sip,shown", "");
+		elm_object_item_signal_emit(st->navi_it, "elm,state,sip,shown", "");
 	} else if(value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) {
 		DBG("value == ECORE_IMF_INPUT_PANEL_STATE_HIDE\n");
-		elm_object_item_signal_emit(data, "elm,state,sip,hidden", "");
+		elm_object_item_signal_emit(st->navi_it, "elm,state,sip,hidden", "");
 	}
 
 	return;
@@ -253,19 +265,6 @@ static Eina_Bool __save_wifi_passphrase(mh_appdata_t *ad)
 	mh_wifi_setting_view_t *st = &ad->setup;
 	int ret = 0;
 
-	if (g_strcmp0(st->wifi_passphrase, st->wifi_passphrase_new) == 0) {
-		DBG("Password is not changed\n");
-		return EINA_TRUE;
-	}
-
-	if (strlen(st->wifi_passphrase_new) < WIFI_PASSPHRASE_LENGTH_MIN) {
-		DBG("Password is shorter than %d\n", WIFI_PASSPHRASE_LENGTH_MIN);
-		_prepare_popup(ad, MH_POP_WIFI_PASSWORD_SHORT,
-				_("IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"));
-		_create_popup(ad);
-		return EINA_FALSE;
-	}
-
 	ret = tethering_wifi_set_passphrase(ad->handle, st->wifi_passphrase_new);
 	if (ret != TETHERING_ERROR_NONE) {
 		ERR("tethering_wifi_set_passphrase is failed : %d\n", ret);
@@ -298,9 +297,7 @@ static void __passphrase_maxlength_reached_cb(void *data, Evas_Object *obj,
 		return;
 	}
 
-	if (_hide_imf(ad->setup.pw_entry) == EINA_FALSE) {
-		ERR("_hide_imf is failed\n");
-	}
+	elm_object_focus_set(ad->setup.pw_entry, EINA_FALSE);
 
 	if (__save_wifi_passphrase(ad) == EINA_FALSE) {
 		ERR("__save_wifi_passphrase is failed\n");
@@ -329,9 +326,7 @@ static void __passphrase_activated_cb(void *data, Evas_Object *obj,
 
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 
-	if (_hide_imf(ad->setup.pw_entry) == EINA_FALSE) {
-		ERR("_hide_imf is failed\n");
-	}
+	elm_object_focus_set(ad->setup.pw_entry, EINA_FALSE);
 
 	if (__save_wifi_passphrase(ad) == EINA_FALSE) {
 		ERR("__save_wifi_passphrase is failed\n");
@@ -373,8 +368,9 @@ static void __pw_entry_changed_cb(void *data, Evas_Object *obj,
 		free(utf8_string);
 	}
 
-	if (!elm_object_focus_get(st->pw_layout))
+	if (!elm_object_focus_get(st->pw_layout)) {
 		return;
+	}
 
 	if (elm_entry_is_empty(st->pw_entry)) {
 		elm_object_signal_emit(st->pw_layout,
@@ -403,6 +399,8 @@ static void __pw_entry_focused_cb(void *data, Evas_Object *obj,
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	mh_wifi_setting_view_t *st = &ad->setup;
 
+	elm_entry_cursor_end_set(st->pw_entry);
+
 	if (!elm_entry_is_empty(st->pw_entry))
 		elm_object_signal_emit(st->pw_layout,
 				"elm,state,eraser,show", "elm");
@@ -519,7 +517,6 @@ static Evas_Object *__gl_pw_icon_get(void *data, Evas_Object *obj,
 		ptr = elm_entry_utf8_to_markup(st->wifi_passphrase);
 		if (ptr != NULL) {
 			elm_entry_entry_set(entry, ptr);
-			elm_entry_cursor_end_set(entry);
 			free(ptr);
 		} else {
 			ERR("elm_entry_utf8_to_markup is failed\n");
@@ -528,17 +525,15 @@ static Evas_Object *__gl_pw_icon_get(void *data, Evas_Object *obj,
 		/* Set editable mode */
 		elm_entry_input_panel_enabled_set(entry, EINA_FALSE);
 		elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
-		elm_object_item_disabled_set(st->pw_item, EINA_TRUE);
+		elm_object_disabled_set(entry, EINA_TRUE);
 	} else {
 		ptr = elm_entry_utf8_to_markup(st->wifi_passphrase_new);
 		if (ptr != NULL) {
 			elm_entry_entry_set(entry, ptr);
-			elm_entry_cursor_end_set(entry);
 			free(ptr);
 		} else {
 			ERR("elm_entry_utf8_to_markup is failed\n");
 		}
-		elm_object_item_disabled_set(st->pw_item, EINA_FALSE);
 	}
 
 	evas_object_smart_callback_add(entry, "maxlength,reached",
@@ -556,24 +551,24 @@ static Evas_Object *__gl_pw_icon_get(void *data, Evas_Object *obj,
 	if (imf_context)
 		ecore_imf_context_input_panel_event_callback_add(imf_context,
 				ECORE_IMF_INPUT_PANEL_STATE_EVENT,
-				__input_panel_event_cb, (void *)st->navi_it);
+				__input_panel_event_cb, (void *)st);
 
-	evas_object_show(entry);
+	if (!elm_entry_is_empty(entry)) {
+		elm_object_signal_emit(st->pw_layout,
+				"elm,state,guidetext,hide", "elm");
+	}
 
-	elm_object_part_content_set(st->pw_layout, "elm.swallow.content", entry);
 	elm_object_part_text_set(st->pw_layout, "elm.text",
 			_("IDS_MOBILEAP_BODY_PASSWORD"));
+	elm_object_part_content_set(st->pw_layout, "elm.swallow.content", entry);
 	elm_object_part_text_set(st->pw_layout, "elm.guidetext",
 			_("IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"));
 
-	if (!elm_entry_is_empty(entry))
-		elm_object_signal_emit(st->pw_layout,
-				"elm,state,guidetext,hide", "elm");
-
 	elm_object_signal_callback_add(st->pw_layout, "elm,eraser,clicked", "elm",
 			__pw_layout_eraser_clicked_cb, data);
 
-
+	evas_object_show(entry);
+	evas_object_show(st->pw_layout);
 
 	__MOBILE_AP_FUNC_EXIT__;
 
@@ -738,25 +733,35 @@ static void __back_btn_cb(void *data, Evas_Object *obj, void *event_info)
 	mh_wifi_setting_view_t *st = &ad->setup;
 	int ret;
 
-	if (_hide_imf(st->pw_entry) == EINA_FALSE) {
-		ERR("_hide_imf is failed\n");
-	}
+	elm_object_focus_set(st->pw_entry, EINA_FALSE);
 
-	if (__save_wifi_passphrase(ad) == EINA_FALSE) {
-		ERR("__save_wifi_passphrase is failed\n");
+	if (strlen(st->wifi_passphrase_new) < WIFI_PASSPHRASE_LENGTH_MIN) {
+		DBG("Password is shorter than %d\n", WIFI_PASSPHRASE_LENGTH_MIN);
+		_prepare_popup(ad, MH_POP_WIFI_PASSWORD_SHORT,
+				_("IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"));
+		_create_popup(ad);
 		return;
 	}
 
-	if (tethering_is_enabled(ad->handle, TETHERING_TYPE_WIFI) == false &&
-			ad->main.old_wifi_state == true) {
+	if (g_strcmp0(st->wifi_passphrase, st->wifi_passphrase_new) != 0) {
+		if (__save_wifi_passphrase(ad) == EINA_FALSE) {
+			ERR("__save_wifi_passphrase is failed\n");
+		}
+	}
+
+	if (ad->main.need_recover_wifi_tethering == true) {
+		DBG("Turn on Wi-Fi tethering again\n");
 		_update_wifi_item(ad, MH_STATE_PROCESS);
+		if (ad->main.help_item)
+			elm_genlist_item_update(ad->main.help_item);
+
 		ret = tethering_enable(ad->handle, TETHERING_TYPE_WIFI);
 		if (ret != TETHERING_ERROR_NONE) {
-			ERR("wifi tethering on is failed : %d\n", ret);
+			ERR("Wi-Fi tethering on is failed : %d\n", ret);
 			_update_wifi_item(ad, MH_STATE_NONE);
+			ad->main.need_recover_wifi_tethering = false;
 		}
 	}
-	ad->main.old_wifi_state = false;
 
 	__deconstruct_wifi_setup_view(st);
 
@@ -779,9 +784,7 @@ static void __title_back_btn_cb(void *data, Evas_Object *obj, void *event_info)
 
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 
-	if (_hide_imf(ad->setup.pw_entry) == EINA_FALSE) {
-		ERR("_hide_imf is failed\n");
-	}
+	elm_object_focus_set(ad->setup.pw_entry, EINA_FALSE);
 
 	if (__save_wifi_passphrase(ad) == EINA_FALSE) {
 		ERR("__save_wifi_passphrase is failed\n");
@@ -795,16 +798,26 @@ static void __title_back_btn_cb(void *data, Evas_Object *obj, void *event_info)
 
 static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
 {
+	__MOBILE_AP_FUNC_ENTER__;
+
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	mh_wifi_setting_view_t *st = &(ad->setup);
 	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
 
-	if (item == st->hide_item)
+	if (item == st->hide_item) {
+		DBG("Hide item is realized\n");
 		elm_object_item_signal_emit(item, "elm,state,top", "");
-	else if (item == st->security_item)
+	} else if (item == st->security_item) {
+		DBG("Security item is realized\n");
 		elm_object_item_signal_emit(item, "elm,state,center", "");
-	else if (item == st->pw_item)
+	} else if (item == st->pw_item) {
+		DBG("Password item is realized\n");
 		elm_object_item_signal_emit(item, "elm,state,bottom", "");
+	} else if (item == st->name_item) {
+		DBG("Name item is realized\n");
+	}
+
+	__MOBILE_AP_FUNC_EXIT__;
 
 	return;
 }
@@ -820,14 +833,15 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
 
 	void *data = (void *)ad;
 	mh_wifi_setting_view_t *st = &ad->setup;
-	Evas_Object *genlist = NULL;
-	Elm_Object_Item *item = NULL;
+	Evas_Object *genlist;
+	Elm_Object_Item *item;
 
 	genlist = elm_genlist_add(ad->naviframe);
 	if (genlist == NULL) {
 		ERR("genlist is NULL\n");
 		return NULL;
 	}
+
 	elm_object_style_set(genlist, "dialogue");
 	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
 	evas_object_smart_callback_add(genlist, "realized", __gl_realized, ad);
@@ -843,7 +857,6 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
 	st->security_item = elm_genlist_item_append(genlist, st->security_itc, data, NULL,
 			ELM_GENLIST_ITEM_NONE, __gl_security_item_sel, data);
 
-	DBG("security_type : %d\n", st->security_type);
 	st->pw_item = elm_genlist_item_append(genlist, st->pw_itc, data, NULL,
 			ELM_GENLIST_ITEM_NONE, NULL, NULL);
 	elm_genlist_item_select_mode_set(st->pw_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);