tizen 2.3 releasetizen_2.3_releasesubmit/tizen_2.3/20150202.053621tizen_2.3

111 files changed, 15810 insertions, 6243 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d85adf..c361c5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,10 +4,11 @@ PROJECT(ug-setting-mobileap-efl C)
 SET(PACKAGE ${PROJECT_NAME})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(RESDIR "${PREFIX}/res")
-SET(LOCALEDIR "${RESDIR}/locale")
+SET(LOCALEDIR "/usr/ug/res/locale")
 SET(EDJDIR "${RESDIR}/edje/${PROJECT_NAME}")
-SET(IMGDIR "${RESDIR}/images/${PROJECT_NAME}")
+SET(IMGDIR "/usr/ug/res/images/${PROJECT_NAME}")
 SET(LIBDIR "${PREFIX}/lib")
+SET(TABLEDIR "/usr/apps/ug-setting-mobileap-efl/shared/res/tables")
 
 SET(SRCS
 	src/mh_main_ug.c
@@ -15,15 +16,20 @@ SET(SRCS
 	src/mh_view_wifi_setup.c
 	src/mh_func_onoff.c
 	src/mh_common_utility.c
+	src/mh_popup.c
+	src/mh_device_rename.c
+	src/mh_connected_client.c
 )
 
+IF (TIZEN_DUALSIM_ENABLE)
+	ADD_DEFINITIONS(-DTIZEN_DUALSIM_ENABLE)
+ENDIF (TIZEN_DUALSIM_ENABLE)
+
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-SET(dependents "elementary efl-assist evas ui-gadget-1 wifi-direct capi-network-tethering capi-network-connection capi-network-wifi capi-telephony-sim notification")
+SET(dependents "elementary efl-assist utilX evas ui-gadget-1 capi-network-tethering capi-network-connection capi-network-wifi notification")
 
-IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	SET(CMAKE_BUILD_TYPE "Release")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
+SET(CMAKE_BUILD_TYPE "Release")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED ${dependents})
@@ -45,9 +51,17 @@ ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"")
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/ug-setting-mobileap-efl/lib/ug)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ug-setting-mobileap-efl.efl DESTINATION /etc/smack/accesses.d)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ug-setting-mobileap-efl.xml DESTINATION /usr/share/packages/)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/images/tethering.png DESTINATION ${IMGDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help_setting_tethering.xml DESTINATION /usr/apps/ug-setting-mobileap-efl/res/help/ug-setting-mobileap-efl/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/images/org.tizen.tethering.png DESTINATION ${IMGDIR})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/images/ DESTINATION ${IMGDIR}
+			FILES_MATCHING
+			PATTERN "noti_tethering_*.png"
+			)
+
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tables/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
 
 ADD_SUBDIRECTORY(po)
 ADD_SUBDIRECTORY(resources)
diff --git a/LICENSE.Flora b/LICENSE.Flora
index 571fe79..917b21e 100644
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,8 +1,8 @@
 Flora License
 
-Version 1.1, April, 2013
+Version 1.0, May, 2012
 
-http://floralicense.org/license/
+http://www.tizenopensource.org/license
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -67,8 +67,8 @@ on behalf of whom a Contribution has been received by Licensor and
 subsequently incorporated within the Work.
 
 "Tizen Certified Platform" shall mean a software platform that complies
-with the standards set forth in the Tizen Compliance Specification
-and passes the Tizen Compliance Tests as defined from time to time
+with the standards set forth in the Compatibility Definition Document
+and passes the Compatibility Test Suite as defined from time to time
 by the Tizen Technical Steering Group and certified by the Tizen
 Association or its designated agent.
 
@@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions:
      Derivative Works; or, within a display generated by the Derivative Works,
      if and wherever such third-party notices normally appear.
      The contents of the NOTICE file are for informational purposes only
-     and do not modify the License. You may add Your own attribution notices 
-     within Derivative Works that You distribute, alongside or as an addendum 
-     to the NOTICE text from the Work, provided that such additional attribution 
-     notices cannot be construed as modifying the License. You may add Your own
-     copyright statement to Your modifications and may provide additional or
-     different license terms and conditions for use, reproduction, or
-     distribution of Your modifications, or for any such Derivative Works
-     as a whole, provided Your use, reproduction, and distribution of
-     the Work otherwise complies with the conditions stated in this License
-     and your own copyright statement or terms and conditions do not conflict
-     the conditions stated in the License including section 3.
+     and do not modify the License.
+
+You may add Your own attribution notices within Derivative Works
+that You distribute, alongside or as an addendum to the NOTICE text
+from the Work, provided that such additional attribution notices
+cannot be construed as modifying the License. You may add Your own
+copyright statement to Your modifications and may provide additional or
+different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works
+as a whole, provided Your use, reproduction, and distribution of
+the Work otherwise complies with the conditions stated in this License.
 
 5. Submission of Contributions. Unless You explicitly state otherwise,
 any Contribution intentionally submitted for inclusion in the Work
@@ -192,11 +192,11 @@ identification within third-party archives.
 
    Copyright [yyyy] [name of copyright owner]
 
-   Licensed under the Flora License, Version 1.1 (the "License");
+   Licensed under the Flora License, Version 1.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://floralicense.org/license/
+       http://www.tizenopensource.org/license
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/NOTICE b/NOTICE
index 94d56df..3997999 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,4 @@
-Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.1
-Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.
+Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.
+Please, see the LICENSE file for Flora License terms and conditions.
+
diff --git a/help_setting_tethering.xml b/help_setting_tethering.xml
new file mode 100644
index 0000000..bf8509e
--- /dev/null
+++ b/help_setting_tethering.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<help package="ug-setting-mobileap-efl" version="0.0.1">
+	<label id="IDS_MOBILEAP_BODY_TETHERING">Tethering</label>
+	<summary id="IDS_HELP_BODY_SHARE_MOBILE_NETWORK_CONNECTION_WITH_OTHER_DEVICES_ABB">Share mobile network connection with other devices</summary>
+		<items>
+			<item>
+				<title id="IDS_MOBILEAP_MBODY_WI_FI_TETHERING">Wi-Fi tethering</title>
+				<contents>
+					<![CDATA[
+					<br>
+					<text id="IDS_HELP_BODY_YOU_CAN_ENABLE_WI_FI_TETHERING_ON_YOUR_DEVICE_TO_SHARE_ITS_INTERNET_CONNECTION_WITH_COMPUTERS_OR_OTHER_DEVICES">You can turn on Wi-Fi tethering on your device to share its Internet connection with computers or other devices.</text>
+					<br>
+					<br>
+					<text id="IDS_HELP_BODY_YOU_CANNOT_USE_DEVICE_APPLICATIONS_TO_ACCESS_THE_INTERNET_VIA_A_WI_FI_CONNECTION_WHILE_THE_DEVICE_IS_TETHERING_VIA_WI_FI">- You cannot use device applications to access the Internet via a Wi-Fi connection while the device is tethering via Wi-Fi.</text>
+					<br>
+					<br>
+					<text id="IDS_HELP_BODY_YOU_CAN_CONFIGURE_PORTABLE_WI_FI_TETHERING_IN_WI_FI_TETHERING_SETTINGS">- You can configure portable Wi-Fi tethering in Wi-Fi tethering settings.</text>
+					]]>
+				</contents>
+			</item>
+			<item>
+				<title id="IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING">Bluetooth tethering</title>
+				<contents>
+					<![CDATA[
+					<br>
+					<text id="IDS_HELP_BODY_YOU_CAN_SHARE_YOUR_DEVICES_INTERNET_CONNECTION_WITH_YOUR_COMPUTER_BY_TETHERING_THEM_TOGETHER_VIA_A_BLUETOOTH_CONNECTION">You can share your device's Internet connection with your computer by tethering them together via a Bluetooth connection.</text>
+					<br>
+					<br>
+					<text id="IDS_HELP_BODY_BLUETOOTH_TETHERING_WORKS_WITH_ANY_COMPUTER_OR_DEVICE_THAT_CAN_ACCESS_INTERNET_VIA_BLUETOOTH">- Bluetooth tethering works with any computer or device that can access Internet via Bluetooth.</text>
+					]]>
+				</contents>
+			</item>
+			<item>
+				<title id="IDS_MOBILEAP_MBODY_USB_TETHERING">USB tethering</title>
+				<contents>
+					<![CDATA[
+					<br>
+					<text id="IDS_HELP_BODY_YOU_CAN_SHARE_YOUR_DEVICES_INTERNET_CONNECTION_WITH_YOUR_COMPUTER_BY_TETHERING_THEM_TOGETHER_VIA_A_USB_CABLE">You can share your device's Internet connection with your computer by tethering them together via a USB cable.</text>
+					<br>
+					<br>
+					<text id="IDS_HELP_BODY_TETHERING_WORKS_WITH_WINDOWS_7_WINDOWS_VISTA_AND_LINUX">- Tethering works with Windows 7, Windows Vista, and Linux.</text>
+					<br>
+					<br>
+					<text id="IDS_HELP_BODY_YOU_CANNOT_CONNECT_TO_THE_DEVICE_MEMORY_OR_SD_CARD_FROM_YOUR_COMPUTER_WHEN_IT_IS_TETHERED_VIA_USB">- You cannot connect to the device memory or SD card from your computer when it is tethered via USB.</text>
+					]]>
+				</contents>
+			</item>
+	</items>
+</help>
diff --git a/include/mh_common_utility.h b/include/mh_common_utility.h
index 333a643..3697c64 100644
--- a/include/mh_common_utility.h
+++ b/include/mh_common_utility.h
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,20 +27,37 @@ extern "C" {
 #include "mobile_hotspot.h"
 #include "mh_view_main.h"
 
-#define MH_POPUP_TIMEOUT	2.0f
+#define QP_SIGNAL_PROGRESS_ON	"progress_on"
+#define QP_SIGNAL_PROGRESS_OFF	"progress_off"
+#define QP_SIGNAL_PROGRESS_RESET	"progress_reset"
 
-void _prepare_popup_with_content(int type, Evas_Object *obj);
-void _prepare_popup(int type, const char *str);
-Eina_Bool _create_popup(mh_appdata_t *ad);
-void _destroy_popup(mh_appdata_t *ad);
+Evas_Object *_create_progressbar(Evas_Object *parent, const char *style);
 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);
+Evas_Object *_create_button(Evas_Object *parent, const char *text, const char *part,
+		Evas_Smart_Cb func, void *user_data);
+void _handle_usb_status_change(keynode_t *key, void *data);
 int _get_vconf_hotspot_mode(void);
-Eina_Bool _get_no_of_connected_device(tethering_h handle, int *no, tethering_type_e type);
-Evas_Object *_create_label(Evas_Object *parent, const char *text);
-Evas_Object *_create_slide_title(Evas_Object *parent, const char *text);
+Eina_Bool _get_no_of_connected_device(mh_appdata_t *ad, int *no, tethering_type_e type);
+
+void _append_list_client_handle(mh_appdata_t *ad, tethering_client_h client);
+void _release_list_client_handle(mh_appdata_t *ad);
+void _delete_list_client_handle(mh_appdata_t *ad, const char *mac_addr);
+int _get_list_clients_count(mh_appdata_t *ad);
+void _get_list_clients_informations(mh_appdata_t *ad);
+void _free_genlist_item(Elm_Object_Item **item);
+void _free_genlist_itc(Elm_Genlist_Item_Class **itc);
+int _get_sim_state(void);
+connection_cellular_state_e _get_cellular_state(void);
+int _get_checkbox_status(tethering_type_e type);
+bool _set_checkbox_status(tethering_type_e type, int value);
+int _send_signal_qp(const char *cmd);
+void _device_name_changed_cb(keynode_t *key, void *data);
+bool _set_vconf_prev_wifi_state(bool value);
+bool _get_vconf_prev_wifi_state();
+void _handle_network_cellular_state_changed_cb(keynode_t *key, void *data);
+void _handle_mobileap_syspopup_popup_response(keynode_t *key, void *data);
 
 #ifdef __cplusplus
 }
diff --git a/include/mh_func_onoff.h b/include/mh_func_onoff.h
index d755b20..5f3a4f6 100644
--- a/include/mh_func_onoff.h
+++ b/include/mh_func_onoff.h
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,15 +32,28 @@ int _get_vconf_usb_state(void);
 void _enabled_cb(tethering_error_e result, tethering_type_e type, bool is_requested, void *user_data);
 void _disabled_cb(tethering_error_e result, tethering_type_e type, tethering_disabled_cause_e cause, void *user_data);
 void _connection_changed_cb(tethering_client_h client, bool opened, void *user_data);
+
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 void _data_usage_cb(tethering_error_e result, unsigned long long received_data, unsigned long long sent_data, void *user_data);
+#endif
 
+void _visibility_changed_cb(bool is_visible, void *user_data);
+void _security_type_changed_cb(tethering_wifi_security_type_e changed_type, void *user_data);
+void _passphrase_changed_cb(void *user_data);
 int _handle_wifi_onoff_change(mh_appdata_t *ad);
 int _handle_bt_onoff_change(mh_appdata_t *ad);
 int _handle_usb_onoff_change(mh_appdata_t *ad);
-int _turn_off_wifi(mh_appdata_t *ad);
 int _turn_on_wifi(void);
 bool _is_wifi_direct_on(void);
-int _turn_off_wifi_direct(mh_appdata_t *ad);
+void _wifi_state_changed_cb(wifi_device_state_e state, void *user_data);
+void _wifi_tethering_checkbox_popup_status_set(bool value);
+bool _wifi_tethering_checkbox_popup_status_get(void);
+gboolean _ps_recheck_timeout_cb(gpointer data);
+int _create_wifi_hotspot_on_popup(mh_appdata_t *ad);
+int _create_bt_tethering_on_popup(mh_appdata_t *ad);
+int _create_usb_tethering_on_popup(mh_appdata_t *ad);
+void _update_tethering_item(mh_appdata_t * ad, mh_state_e state);
+void _update_tethering_enabling_item(mh_appdata_t *ad, tethering_type_e type, mh_state_e state);
 
 #ifdef __cplusplus
 }
diff --git a/include/mh_popup.h b/include/mh_popup.h
new file mode 100644
index 0000000..36025ce
--- /dev/null
+++ b/include/mh_popup.h
@@ -0,0 +1,43 @@
+/*
+* ug-mobile-ap
+*
+* Copyright 2012  Samsung Electronics Co., Ltd
+
+* Licensed under the Flora License, Version 1.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+
+* http://www.tizenopensource.org/license
+
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+#ifndef __APP_MH_POPUP_H_
+#define __APP_MH_POPUP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "mobile_hotspot.h"
+#include "mh_view_main.h"
+
+#define MH_POPUP_TIMEOUT	2.0f
+
+void _prepare_popup_with_content(int type, Evas_Object *obj);
+void _prepare_popup(int type, const char *str);
+Eina_Bool _create_popup(mh_appdata_t *ad);
+void _destroy_popup(mh_appdata_t *ad);
+void _teth_on(mh_appdata_t* ad);
+void _prepare_popup_type(int type);
+void _handle_mobile_data_onoff(mh_appdata_t *ad);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/include/mh_string.h b/include/mh_string.h
new file mode 100644
index 0000000..5b28387
--- /dev/null
+++ b/include/mh_string.h
@@ -0,0 +1,118 @@
+/*
+* ug-mobile-ap
+*
+* Copyright 2012  Samsung Electronics Co., Ltd
+
+* Licensed under the Flora License, Version 1.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+
+* http://www.tizenopensource.org/license
+
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+
+#ifndef __MH_STRING_H_
+#define __MH_STRING_H_
+
+#include "mobile_hotspot.h"
+
+#ifdef S_
+#undef S_
+#endif
+#define S_(str)			dgettext("sys_string", str)
+
+#ifdef N_
+#undef N_
+#endif
+#define N_(str)			gettext_noop(str)
+
+#ifdef _
+#undef _
+#endif
+#define _(str)			dgettext(MH_TEXT_DOMAIN, str)
+
+#define STR_CONN_USB_CABLE		_("IDS_POPSYNC_BODY_CONNECT_YOUR_MOBILE_DEVICE_TO_THE_PC_VIA_USB_CABLE_T_HELP")
+#define STR_NO_SHOW_AGAIN		("IDS_BR_OPT_DO_NOT_SHOW_AGAIN")
+#define STR_TETH_ON_DESC_1		_("IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD")
+#define STR_TETH_ON_DESC_2		_("IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD")
+#define STR_TETH_ON_DESC_3		_("IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE")
+#define STR_TETH_ON_DESC_4		_("IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION")
+#define STR_WIFI_AP_CONTROLLED_ANOTHER_APP		("IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED")
+#define STR_CLOSE_INTERNET_Q		("IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q")
+#define STR_INSERT_SIM_TO_USE_TETH		("IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING")
+#define STR_DISABLE_FLIGHT_MODE_MSG		("IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE")
+#define STR_NO_DATA_SERVICE		("IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE")
+#define STR_CONN_MOBILE_DATA_TO_USE_TETH	("IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS")
+#define STR_NO_NET_CONN_MSG		("IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN")
+#define STR_CONN_NET_TO_USE_TETH		_("IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK")
+#define STR_UNABLE_TO_USE_TETH		("IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING")
+#define STR_WIFI_TETH		_("IDS_MOBILEAP_MBODY_WI_FI_TETHERING")
+#define STR_WIFI_TETH_SETTING		_("IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS")
+#define IDS_WIFI_TETH_SETTING		"IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+#define STR_BLUETOOTH_TETH		_("IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING")
+#define STR_USB_TETH		_("IDS_MOBILEAP_MBODY_USB_TETHERING")
+#define STR_SECURITY_TYPE_PS		_("IDS_ST_BODY_SECURITY_TYPE_C_PS")
+#define STR_WIFI_TETH_HIDDEN		_("IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN")
+#define STR_DEV_NAME		_("IDS_MOBILEAP_BODY_DEVICE_NAME")
+#define STR_PASSWORD		_("IDS_MOBILEAP_BODY_PASSWORD")
+#define STR_PASSWORD_FOR_WIFI_TETH	_("IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING")
+#define STR_CONNECTED_DEV	_("IDS_MOBILEAP_BODY_CONNECTED_DEVICE")
+#define STR_MB	_("IDS_MOBILEAP_BODY_PD_MB")
+#define STR_KB	_("IDS_MOBILEAP_BODY_PD_KB")
+#define STR_BYTE		_("IDS_MOBILEAP_BODY_PD_BYTES")
+#define STR_DATA_USED	_("IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB")
+#define STR_DATA_USAGE		_("IDS_MOBILEAP_MBODY_DATA_USAGE")
+#define STR_TETH	("IDS_MOBILEAP_BODY_TETHERING")
+#define IDS_TETH	"IDS_MOBILEAP_BODY_TETHERING"
+#define STR_MY_DEVICE_NAME _("IDS_ST_HEADER_MY_DEVICE_NAME")
+#define STR_HIDE_MY_DEV	_("IDS_MOBILEAP_BODY_HIDE_MY_DEVICE")
+#define STR_SECURITY_TYPE		_("IDS_MOBILEAP_BODY_SECURITY")
+#define STR_ABT_PHONE	_("IDS_ST_BODY_ABOUT_PHONE")
+#define STR_DEV_NAME_CAN_BE_CHANGE		_("IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS")
+#define STR_PASSWORD_8_CHAR		_("IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS")
+#define STR_PASSWORD_MIN_MAX		_("IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS")
+#define STR_RENAME_DEVICE_HEADER		_("IDS_ST_HEADER_RENAME_DEVICE")
+#define STR_RENAME_DEVICE_MSG	_("IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG")
+#define STR_RENAME_WARN_MSG		"You can use only letters, numbers, and special characters in your device name."
+#define STR_RENAME_DEVICE		("IDS_ST_SK_RENAME")
+#define STR_MAX_CHAR_LENGTH_REACHED _("IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED")
+#define STR_DEVICE_NAME		("IDS_MOBILEAP_BODY_DEVICE_NAME")
+#define STR_NO_NET_CONN		("IDS_MSG_HEADER_NO_NETWORK_CONNECTION")
+#define STR_CONN_NET	("IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK")
+#define STR_INSERT_SIM_CARD		_("IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB")
+#define STR_DISABLE_AIRPLANE_MODE		_("IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB")
+#define STR_CONN_TO_MOB_NET		("IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB")
+#define STR_ENABLE		("IDS_ST_BUTTON_ENABLE_M_USE")
+#define STR_TETH_FAILED		("IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB")
+#define STR_UNABLE_TO_USE_TETH_HEADER		("IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB")
+#define STR_CONNECT_USB		("IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB")
+#define STR_CONN_DEVICES ("IDS_WIFI_HEADER_CONNECTED_DEVICES")
+#define STR_SIM_CARD_ERROR ("MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB")
+#define STR_PW_GUIDE_TEXT _("IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB")
+#define STR_PW_MAX_LEN_WARN_MSG _("IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED")
+#define STR_TURN_OFF ("IDS_COM_BODY_TURN_OFF")
+#define STR_FLIGHT_MODE_HEADER ("IDS_ST_MBODY_FLIGHT_MODE_ABB")
+#define STR_CONNECT_USB_MSG ("IDS_MOBILEAP_POP_CONNECT_USB_CABLE")
+#define STR_DATA_USAGE_LIMIT_REACHED ("IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2")
+
+/* System string */
+#define STR_YES		_("IDS_BR_SK_YES")
+#define STR_NO		_("IDS_BR_SK_NO")
+#define STR_OK		("IDS_COM_SK_OK")
+#define STR_NAVI_CANCEL "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+#define STR_NAVI_DONE	"IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+#define STR_CANCEL		("IDS_BR_SK_CANCEL")
+#define STR_SAVE		S_("IDS_COM_SK_SAVE")
+#define STR_NO_NAME		S_("IDS_COM_BODY_NO_NAME")
+#define STR_HELP		S_("IDS_COM_BODY_HELP")
+#define STR_SETTING		"IDS_ST_BODY_SETTINGS"
+#define STR_ENTER_PASSWORD	S_("IDS_COM_BODY_ENTER_PASSWORD")
+
+#endif
diff --git a/include/mh_view_main.h b/include/mh_view_main.h
index 8716756..bd69fdc 100644
--- a/include/mh_view_main.h
+++ b/include/mh_view_main.h
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,21 +29,39 @@ extern "C" {
 #include "mh_common_utility.h"
 #include "mh_view_wifi_setup.h"
 
+#define PKGNAME "ug-setting-mobileap-efl"
+
 #define MH_UPDATE_INTERVAL	5	/* 5 Sec */
-#define MH_KB			(1000)
+#define MH_KB			(1000LLU)
 #define MH_MB			(MH_KB * MH_KB)
+#define FILE_PATH_OF_EDC "/usr/apps/ug-setting-mobileap-efl/res/edje/ug-setting-mobileap-efl/tethering.edj"
+#define PS_RECHECK_INTERVAL		500
+#define PS_RECHECK_COUNT_MAX	5
 
-void ap_update_data_onoff(void *data);
 void ap_update_data_device(mh_appdata_t *ad);
+
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 Eina_Bool ap_update_data_packet_usage(mh_appdata_t *ad);
 void _start_update_data_packet_usage(mh_appdata_t *ad);
 void _stop_update_data_packet_usage(mh_appdata_t *ad);
-void ap_draw_contents(mh_appdata_t *ad);
-void ap_callback_del(mh_appdata_t *ad);
+#endif
+
 void _update_wifi_item(mh_appdata_t *ad, int wifi_state);
 void _update_bt_item(mh_appdata_t *ad, int bt_state);
 void _update_usb_item(mh_appdata_t *ad, int usb_state);
-void _update_main_view(mh_appdata_t *ad);
+void _update_main_view(mh_appdata_t *ad, tethering_type_e type);
+void _start_update_device_conn_time(mh_appdata_t *ad);
+void _stop_update_device_conn_time(mh_appdata_t *ad);
+void _main_draw_contents(mh_appdata_t *ad);
+void _main_callback_del(mh_appdata_t *ad);
+void _main_free_genlist_itc(mh_appdata_t *ad);
+void _create_rename_device_popup(void *data);
+void _hadnle_rename_popup_rotation(Eina_Bool is_portrait);
+void _rotate_adjust_rename_popup(void);
+void _select_connected_dev(void *data, Evas_Object *obj, void *event_info);
+void _genlist_update_device_item(mh_appdata_t *ad);
+void _update_conn_clients(mh_appdata_t *ad);
+void _create_connected_client_view(mh_appdata_t *ad);
 
 #ifdef __cplusplus
 }
diff --git a/include/mh_view_wifi_setup.h b/include/mh_view_wifi_setup.h
index 932f9e7..58fdbcc 100644
--- a/include/mh_view_wifi_setup.h
+++ b/include/mh_view_wifi_setup.h
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,7 @@ extern "C" {
 #include "mh_common_utility.h"
 
 void mh_draw_wifi_setup_view(mh_appdata_t *ad);
+Eina_Bool _setting_back_btn_cb(void *data, Elm_Object_Item *navi_item);
 
 #ifdef __cplusplus
 }
diff --git a/include/mobile_hotspot.h b/include/mobile_hotspot.h
index acf07d8..d2df0f0 100644
--- a/include/mobile_hotspot.h
+++ b/include/mobile_hotspot.h
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,97 +29,95 @@ extern "C" {
 #endif
 
 #if !defined(LOCALEDIR)
-#define	LOCALEDIR "/usr/ug/res/locale"
+#define	LOCALEDIR "/usr/apps/ug-setting-mobileap-efl/res/locale"
 #endif
 
 #if !defined(EDJDIR)
-#define EDJDIR "/usr/ug/res/edje/ug-setting-mobileap-efl"
+#define EDJDIR "/usr/apps/ug-setting-mobileap-efl/res/edje/ug-setting-mobileap-efl"
 #endif
 
 #if !defined(PREFIX)
 #define PREFIX "/usr/ug"
 #endif
 
+#define TETHERING_EDJ "tethering.edj"
+#define POPUP_EDJ_PATH EDJDIR"/"TETHERING_EDJ
+
 #include <sys/time.h>
 #include <glib.h>
 #include <Elementary.h>
+#include <efl_assist.h>
 #include <vconf.h>
 #include <ui-gadget-module.h>
 #include <wifi.h>
 #include <net_connection.h>
-#include <sim.h>
 #include <tethering.h>
 #include <dlog.h>
+#include <notification.h>
 
 #define MH_TEXT_DOMAIN				PACKAGE
 #define MH_LOCALEDIR				LOCALEDIR
 
-#ifdef S_
-#undef S_
-#endif
-#define S_(str)					dgettext("sys_string", str)
 
-#ifdef N_
-#undef N_
-#endif
-#define N_(str)					gettext_noop(str)
+#define VCONF_MOBILE_AP_PREV_WIFI_STATUS	"db/private/libug-setting-mobileap-efl/prev_wifi_status"
+#define VCONF_MOBILE_AP_WIFI_POPUP_CHECKBOX_STATUS "file/private/libug-setting-mobileap-efl/wifi_popup_check_box_status"
+#define VCONF_MOBILE_AP_BT_POPUP_CHECKBOX_STATUS "file/private/libug-setting-mobileap-efl/bt_popup_check_box_status"
+#define VCONF_MOBILE_AP_USB_POPUP_CHECKBOX_STATUS "file/private/libug-setting-mobileap-efl/usb_popup_check_box_status"
+#define VCONF_MOBILE_AP_CONNECT_USB_POPUP_STATUS "memory/private/libug-setting-mobileap-efl/trying_usb_tethering"
+#define COLOR_TABLE "/usr/apps/ug-setting-mobileap-efl/shared/res/tables/ug-setting-mobileap-efl_ChangeableColorInfo.xml"
+#define FONT_TABLE "/usr/apps/ug-setting-mobileap-efl/shared/res/tables/ug-setting-mobileap-efl_fontInfoTable.xml"
+
+#define VCONF_KEY_MOBILEAP_SYSPOPUP_RESPONSE "memory/private/libug-setting-mobileap-efl/mobileap_syspopup_user_response"
 
-#ifdef _
-#undef _
+#ifdef LOG_TAG
+#undef LOG_TAG
 #endif
-#define _(str)					dgettext(MH_TEXT_DOMAIN, str)
 
-#define VCONF_MOBILE_AP_PREV_WIFI_STATUS	"db/private/libug-setting-mobileap-efl/prev_wifi_status"
+#define LOG_TAG				"UG_SETTING_MOBILEAP_EFL"
 
-#define MOBILE_AP_TAG					"mobile_ap"
-#define DBG(fmt, args...) LOG(LOG_DEBUG, MOBILE_AP_TAG, "[%s()][Ln:%d] "fmt, \
-						__func__, __LINE__, ##args)
-#define ERR(fmt, args...) LOG(LOG_ERROR, MOBILE_AP_TAG, "[%s()][Ln:%d] "fmt, \
-						__func__, __LINE__, ##args)
+#define DBG(fmt, args...)		LOGD(fmt, ##args)
+#define INFO(fmt, args...)		LOGI(fmt, ##args)
+#define ERR(fmt, args...)		LOGE(fmt, ##args)
+#define SDBG(fmt, args...)		SECURE_LOGD(fmt, ##args)
+#define SERR(fmt, args...)		SECURE_LOGE(fmt, ##args)
 
 #define __MOBILE_AP_FUNC_ENTER__	DBG("Entering: +\n")
-#define __MOBILE_AP_FUNC_EXIT__ 	DBG("Exit: -\n")
+#define __MOBILE_AP_FUNC_EXIT__		DBG("Exit: -\n")
 
 #define TETHERING_IMAGES_EDJ		"tethering_images.edj"
-#define WIFI_ICON			"Wifi.png"
-#define BT_ICON				"Bluetooth.png"
-#define USB_ICON			"USB.png"
+#define WIFI_ICON			"A01-5_device_WIFI.png"
+#define BT_ICON				"A01-5_device_bluetooth.png"
+#define USB_ICON			"A01-5_device_USB_icon.png"
 
-#define DEVICE_NAME_LENGTH_MAX		31
+#define DEVICE_NAME_LENGTH_MAX		32
 #define WIFI_PASSPHRASE_LENGTH_MIN	8
 #define WIFI_PASSPHRASE_LENGTH_MAX	63
 #define MH_LABEL_LENGTH_MAX		1024
 
 #define _EDJ(obj)			elm_layout_edje_get(obj)
 
-#define TETHERING_WIFI_MAX_CONNECTED_STA	8
-#define TETHERING_BT_MAX_CONNECTED_STA		7
-#define TETHERING_USB_MAX_CONNECTED_STA		1
-#define TETHERING_MAX_CONNECTED_STA \
-	(TETHERING_WIFI_MAX_CONNECTED_STA + TETHERING_BT_MAX_CONNECTED_STA + TETHERING_USB_MAX_CONNECTED_STA)
+#define TETHERING_WIFI_MAX_CONNECTED_STA	10
+#define TETHERING_BT_MAX_CONNECTED_STA		4
+#define MAX_CONNECTED_STA 15
 
 /* This is from tethering_private.h */
 #define TETHERING_TYPE_MAX		4	/**< All, USB, Wi-Fi, BT */
 
 typedef enum {
 	MH_POPUP_NONE,
-
-	/* Two buttons pop-up */
-	MH_POP_WIFI_OFF_CONF,
-	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 */
-	MH_POP_INFORMATION,
-	MH_POP_USB_CONNECT,
-
-	/* No button & timeout pop-up */
-	MH_POP_INFORMATION_WO_BUTTON,
-
-	MH_POPUP_TYPE_MAX
+	MH_POPUP_WIFI_ON_CHECKBOX,
+	MH_POPUP_BT_ON_CHECKBOX,
+	MH_POPUP_USB_ON_CHECKBOX,
+	MH_POPUP_WIFI_AP_OFF,
+	MH_POPUP_NO_SIM,
+	MH_POPUP_FLIGHT_MODE,
+	MH_POPUP_MOBILE_DATA_OFF,
+	MH_POPUP_CANCEL_MOBILE_DATA_ON,
+	MH_POPUP_NETWORK_OUT_OF_RANGE,
+	MH_POPUP_WIFI_OFF,
+	MH_POPUP_TETH_ENABLING_FAILED,
+	MH_POPUP_SPECIAL_LETTER_WARN,
+	MH_POPUP_MAX
 } mh_popup_type_e;
 
 typedef enum {
@@ -129,110 +127,138 @@ typedef enum {
 } mh_state_e;
 
 typedef struct ap_app_main {
-	Evas_Object			*genlist;
-
-	Evas_Object			*back_btn;
-	Evas_Object 			*wifi_btn;
-	Evas_Object 			*bt_btn;
-	Evas_Object 			*usb_btn;
+	Evas_Object		*genlist;
+	Evas_Object		*back_btn;
+	Evas_Object		*check_popup_ly;
+
+	Elm_Genlist_Item_Class	*sp_itc;
+	Elm_Genlist_Item_Class	*sp2_itc;
+	Elm_Genlist_Item_Class	*wifi_itc;
+	Elm_Genlist_Item_Class	*setup_itc;
+	Elm_Genlist_Item_Class	*bt_itc;
+	Elm_Genlist_Item_Class	*usb_itc;
+	Elm_Genlist_Item_Class	*help_itc;
+	Elm_Genlist_Item_Class	*device_itc;
+	Elm_Genlist_Item_Class	*device0_itc;
+	Elm_Genlist_Item_Class	*popup_descp_itc;
+	Elm_Genlist_Item_Class	*popup_check_itc;
+
+	Elm_Object_Item		*sp_item[4];
+	Elm_Object_Item		*help_sp_item;
+	Elm_Object_Item		*wifi_item;
+	Elm_Object_Item		*setup_item;
+	Elm_Object_Item		*bt_item;
+	Elm_Object_Item		*usb_item;
+	Elm_Object_Item		*device_item;
+	Elm_Object_Item		*help_item;
+	Elm_Object_Item		*popup_descp_item;
+	Elm_Object_Item		*popup_check_item;
+
+#ifdef TETHERING_DATA_USAGE_SUPPORT
+	Elm_Genlist_Item_Class	*usage_itc;
+	Elm_Object_Item		*usage_item;
+#endif
 
-	Elm_Genlist_Item_Class		*sp_itc;
-	Elm_Genlist_Item_Class		*end_sp_itc;
-	Elm_Genlist_Item_Class		*wifi_itc;
-	Elm_Genlist_Item_Class		*setup_itc;
-	Elm_Genlist_Item_Class		*bt_itc;
-	Elm_Genlist_Item_Class		*usb_itc;
-	Elm_Genlist_Item_Class		*help_itc;
-
-	Elm_Genlist_Item_Class		*device_itc;
-	Elm_Genlist_Item_Class		*device0_itc;
-	Elm_Genlist_Item_Class		*usage_itc;
-	Elm_Genlist_Item_Class		*dev_itc[TETHERING_TYPE_MAX];
-
-	Elm_Object_Item			*sp_item[4];
-	Elm_Object_Item			*wifi_item;
-	Elm_Object_Item			*setup_item;
-	Elm_Object_Item			*bt_item;
-	Elm_Object_Item			*usb_item;
-	Elm_Object_Item			*device_item;
-	Elm_Object_Item			*usage_item;
-	Elm_Object_Item			*help_item;
-
-	int 				hotspot_mode;
-	int				wifi_state;
-	int				bt_state;
-	int				usb_state;
-	bool				need_recover_wifi_tethering;
+	int		hotspot_mode;
+	int		wifi_state;
+	int		bt_state;
+	int		usb_state;
 } mh_main_view_t;
 
 typedef struct {
-	Elm_Object_Item			*navi_it;
+	Elm_Object_Item		*navi_it;
 	Evas_Object			*genlist;
-
-	Evas_Object			*back_btn;
-	Evas_Object			*title_back_btn;
-	Evas_Object 			*hide_btn;
-	Evas_Object 			*security_btn;
-	Evas_Object 	 		*pw_entry;
+	Evas_Object			*rename_genlist;
+	Evas_Object		*hide_btn;
+	Evas_Object		*security_btn;
+	Evas_Object		*pw_entry;
+	Evas_Object		*popup_passphrase;
+	Evas_Object		*save_button;
+	Evas_Object		*cancel_button;
 
 	Elm_Genlist_Item_Class		*sp_itc;
-	Elm_Genlist_Item_Class		*end_sp_itc;
+	Elm_Genlist_Item_Class		*sp2_itc;
 	Elm_Genlist_Item_Class		*hide_itc;
 	Elm_Genlist_Item_Class		*security_itc;
 	Elm_Genlist_Item_Class		*pw_itc;
 	Elm_Genlist_Item_Class		*name_itc;
-
-	Elm_Object_Item			*sp_item[2];
-	Elm_Object_Item			*hide_item;
-	Elm_Object_Item			*security_item;
-	Elm_Object_Item			*pw_item;
-	Elm_Object_Item			*name_item;
-
-	bool 				visibility;
+	Elm_Genlist_Item_Class		*rename_entry_itc;
+	Elm_Genlist_Item_Class		*rename_descp_itc;
+
+	Elm_Object_Item		*sp_item[2];
+	Elm_Object_Item		*hide_item;
+	Elm_Object_Item		*security_item;
+	Elm_Object_Item		*pw_item;
+	Elm_Object_Item		*name_item;
+	Elm_Object_Item		*pw_guide_item;
+	Elm_Object_Item		*rename_entry_item;
+	Elm_Object_Item		*rename_descp_item;
+
+	bool	visibility;
+	bool	visibility_new;
 	tethering_wifi_security_type_e	security_type;
+	tethering_wifi_security_type_e	security_type_new;
 
-	char 				device_name[DEVICE_NAME_LENGTH_MAX + 1];
-	char 				wifi_passphrase[WIFI_PASSPHRASE_LENGTH_MAX + 1];
-	char 				wifi_passphrase_new[WIFI_PASSPHRASE_LENGTH_MAX + 1];
+	char	device_name[DEVICE_NAME_LENGTH_MAX + 1];
+	char	wifi_passphrase[WIFI_PASSPHRASE_LENGTH_MAX + 1];
+	char	wifi_passphrase_new[WIFI_PASSPHRASE_LENGTH_MAX + 1];
 } mh_wifi_setting_view_t;
 
 typedef struct {
-	int number;
-	tethering_client_h handle[TETHERING_MAX_CONNECTED_STA];
-} mh_clients_t;
-
-typedef struct {
-	bool			is_updated;
+	bool	is_updated;
 	unsigned long long	pdp_total_sent;
 	unsigned long long	pdp_total_receive;
 } mh_data_usage_t;
 
 typedef struct {
-	void				*gadget;
-	tethering_h			handle;
-	connection_h			conn_handle;
-
-	Evas_Object 			*win;
-	Evas_Object			*layout;
-	Evas_Object			*bg;
-
-	Evas_Object 			*naviframe;
-	Evas_Object 			*popup;
+	Elm_Object_Item *navi_it;
+	Evas_Object *genlist;
 
-	Ecore_Timer			*update_statistics_handle;
+	Elm_Genlist_Item_Class *dev_itc[TETHERING_TYPE_MAX];
+	Elm_Object_Item *dev_item;
+	Elm_Object_Item		*station_items[MAX_CONNECTED_STA];
+	int no_of_clients;
+} mh_conn_client_view_t;
 
-	mh_main_view_t			main;
-	mh_wifi_setting_view_t		setup;
-
-	mh_data_usage_t			data_statistics;
-	mh_clients_t			clients;
-
-	enum ug_event			rotate_state;
-	Ecore_IMF_Input_Panel_State	imf_state;
+typedef struct {
+	void	*gadget;
+	GSList	*client_list;
+	bool	is_foreground;
+
+	tethering_h		handle;
+	connection_h	conn_handle;
+	tethering_type_e	type;
+
+	Evas_Object		*win;
+	Evas_Object		*layout;
+	Evas_Object		*bg;
+	Evas_Object		*naviframe;
+	Evas_Object		*popup_checkbox;
+	Evas_Object		*popup;
+	Evas_Object		*rename_entry;
+	Ecore_Timer		*update_statistics_handle;
+	Ecore_Timer		*update_conn_time_handle;
+	Evas_Object		*ctxpopup;
+	Evas_Object		*rename_popup;
+	Evas_Object		*rename_button;
+	Elm_Object_Item		*navi_item;
+
+	Ea_Theme_Color_Table * color_table;
+	Ea_Theme_Font_Table * font_table;
+
+	int		ps_recheck_timer_id;
+	int		is_wifi_teth_enabling;
+	int		is_usb_teth_enabling;
+	int		is_bt_teth_enabling;
+
+	mh_main_view_t	main;
+	mh_wifi_setting_view_t	setup;
+	mh_data_usage_t		data_statistics;
+	mh_conn_client_view_t connected_device;
 } mh_appdata_t;
 
 typedef struct {
-	mh_appdata_t		*ad;
+	mh_appdata_t	*ad;
 	ui_gadget_h		ug;
 } mh_ugdata_t;
 
diff --git a/packaging/ug-setting-mobileap-efl.spec b/packaging/ug-setting-mobileap-efl.spec
index fcd8b2c..1f048c8 100644
--- a/packaging/ug-setting-mobileap-efl.spec
+++ b/packaging/ug-setting-mobileap-efl.spec
@@ -1,28 +1,27 @@
 %define _usrdir /usr
-%define _ugdir  %{_usrdir}/ug
-%define SHARE /usr/share
-
-Name:       ug-setting-mobileap-efl
-Summary:    Tethering UI Gadget Library
-Version:    0.1.170
-Release:    1
-Group:      TO_BE/FILLED_IN
-License:    Flora License Version 1.0
-Source0:    %{name}-%{version}.tar.gz
-Requires(post): /usr/bin/vconftool
-BuildRequires: cmake
-BuildRequires: edje-bin
-BuildRequires: gettext-tools
-BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(efl-assist)
-BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(ui-gadget-1)
-BuildRequires: pkgconfig(wifi-direct)
-BuildRequires: pkgconfig(capi-network-tethering)
-BuildRequires: pkgconfig(capi-network-connection)
-BuildRequires: pkgconfig(capi-network-wifi)
-BuildRequires: pkgconfig(capi-telephony-sim)
-BuildRequires: pkgconfig(notification)
+%define _ugdir  %{_usrdir}/apps/ug-setting-mobileap-efl
+
+Name:		ug-setting-mobileap-efl
+Summary:	Tethering UI Gadget Library
+Version:	1.0.88
+Release:	1
+Group:		App/Network
+License:	Flora License Version 1.0
+Source0:	%{name}-%{version}.tar.gz
+BuildRequires:	pkgconfig(evas)
+BuildRequires:	pkgconfig(utilX)
+BuildRequires:	pkgconfig(elementary)
+BuildRequires:	pkgconfig(efl-assist)
+BuildRequires:	pkgconfig(ui-gadget-1)
+BuildRequires:	pkgconfig(capi-network-wifi)
+BuildRequires:	pkgconfig(capi-network-tethering)
+BuildRequires:	pkgconfig(capi-network-connection)
+BuildRequires:	pkgconfig(notification)
+BuildRequires:	cmake
+BuildRequires:	edje-bin
+BuildRequires:	gettext-tools
+BuildRequires:	model-build-features
+Requires(post):	/usr/bin/vconftool
 
 %description
 Tethering UI Gadget Library
@@ -31,28 +30,40 @@ Tethering UI Gadget Library
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX="%{_ugdir}"
-make %{?jobs:-j%jobs}
+cmake -DCMAKE_INSTALL_PREFIX="%{_ugdir}"  \
+%if 0%{?model_build_feature_network_dsds} == 1
+	-DTIZEN_DUALSIM_ENABLE=1 \
+%endif
+	.
+
+make %{?_smp_mflags}
+
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-#License
-mkdir -p %{buildroot}%{SHARE}/license
-cp LICENSE.Flora %{buildroot}%{SHARE}/license/ug-setting-mobileap-efl
-
 %post
-/usr/bin/vconftool set -t bool db/private/libug-setting-mobileap-efl/prev_wifi_status 0 -u 5000 -f
-mkdir -p /usr/ug/bin/
-ln -sf /usr/bin/ug-client /usr/ug/bin/setting-mobileap-efl
+/usr/bin/vconftool set -t bool db/private/libug-setting-mobileap-efl/prev_wifi_status 0 -u 5000 -f -s ug-setting-mobileap-efl
+/usr/bin/vconftool set -t int file/private/libug-setting-mobileap-efl/wifi_popup_check_box_status 0 -u 5000 -i -f -s ug-setting-mobileap-efl
+/usr/bin/vconftool set -t int file/private/libug-setting-mobileap-efl/bt_popup_check_box_status 0 -u 5000 -i -f -s ug-setting-mobileap-efl
+/usr/bin/vconftool set -t int file/private/libug-setting-mobileap-efl/usb_popup_check_box_status 0 -u 5000 -i -f -s ug-setting-mobileap-efl
+/usr/bin/vconftool set -t int file/private/libug-setting-mobileap-efl/is_device_rename_local 0 -u 5000 -i -f -s ug-setting-mobileap-efl
+/usr/bin/vconftool set -t int memory/private/libug-setting-mobileap-efl/trying_usb_tethering 0 -u 5000 -i -f -s ug-setting-mobileap-efl
+
+mkdir -p /usr/apps/ug-setting-mobileap-efl/bin/ -m 777
+chown -R 5000:5000 /usr/apps/ug-setting-mobileap-efl/bin/
+chsmack -a "_" /usr/apps/ug-setting-mobileap-efl/bin/
 
 %files
 %manifest ug-setting-mobileap-efl.manifest
+/etc/smack/accesses.d/ug-setting-mobileap-efl.efl
 %defattr(-,root,root,-)
+/usr/ug/res/locale/*/LC_MESSAGES/ug-setting-mobileap-efl*
+/usr/ug/res/images/ug-setting-mobileap-efl/*.png
 %{_ugdir}/res/edje/ug-setting-mobileap-efl/*.edj
-%{_ugdir}/res/locale/*/LC_MESSAGES/*
-%{_ugdir}/res/images/ug-setting-mobileap-efl/*.png
-%{SHARE}/license/ug-setting-mobileap-efl
-%{_ugdir}/lib/libug-setting-mobileap-efl.so
+%{_ugdir}/res/help/ug-setting-mobileap-efl/help_setting_tethering.xml
+%{_ugdir}/lib/ug/libug-setting-mobileap-efl.so
 /usr/share/packages/ug-setting-mobileap-efl.xml
+/usr/apps/ug-setting-mobileap-efl/shared/res/tables/ug-setting-mobileap-efl_ChangeableColorInfo.xml
+/usr/apps/ug-setting-mobileap-efl/shared/res/tables/ug-setting-mobileap-efl_fontInfoTable.xml
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 0632ebb..6ef3573 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,6 +1,6 @@
 # for i18n
 
-SET(POFILES ar.po az.po bg.po ca.po cs.po da.po de_DE.po el_GR.po en.po en_PH.po en_US.po es_ES.po es_MX.po et.po eu.po fi.po fr_CA.po fr_FR.po ga.po gl.po hi.po hr.po hu.po hy.po is.po it_IT.po ja_JP.po ka.po kk.po ko_KR.po lt.po lv.po mk.po nb.po nl_NL.po pl.po pt_BR.po pt_PT.po ro.po ru_RU.po sk.po sl.po sr.po sv.po tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_SG.po zh_TW.po)
+SET(POFILES ar.po az.po bg.po ca.po cs.po da.po de.po el_GR.po en_PH.po en.po en_US.po es_ES.po es_US.po et.po eu.po fi.po fr_CA.po fr.po ga.po gl.po hi.po hr.po hu.po hy.po is.po it_IT.po ja_JP.po ka.po kk.po ko_KR.po lt.po lv.po mk.po nb.po nl.po pl.po pt_BR.po pt_PT.po ro.po ru_RU.po sk.po sl.po sr.po sv.po tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_TW.po)
 
 SET(MSGFMT "/usr/bin/msgfmt")
 
diff --git a/po/ar.po b/po/ar.po
index 4233825..a4bdfca 100644..100755
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "تخص كلمة المرور هذه تقييد Wi-Fi فقط"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "إلغاء"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "إخفاء تقييد Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "موافق"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "تقييد Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "سوف يؤدي تشغيل شبكة Wi-Fi إلى إلغاء تفعيل Mobile Hotspot. هل تريد المتابعة؟"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "إعدادات تقييد Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "استخدام البيانات"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "مستقبلة:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "تقييد"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "مرسلة:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "عدم العرض مرة أخرى"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "اسم الجهاز"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "سيؤدي تشغيل شبكة Wi-Fi إلى إلغاء تفعيل الربط باستخدام Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "كلمة المرور"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "تم الوصول إلى الحد الأقصى من عدد الأحرف %d"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "يمكن تغيير اسم الجهاز في %s"
+msgid "IDS_COM_SK_NO"
+msgstr "لا"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "إخفاء جهازي"
+msgid "IDS_BR_SK_YES"
+msgstr "نعم"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "استخدام البيانات"
+msgid "IDS_BR_SK_NO"
+msgstr "لا"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "تقييد USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "تمت"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "سيؤدي إلغاء تفعيل التقييد إلى منع وصول الأجهزة المرتبطة من الوصول إلى الإنترنت. هل تريد المتابعة؟"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "إلغاء"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "إدخال بطاقة SIM وإعادة تشغيل الجهاز لاستخدام التقييد"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "يتعذر استخدام تقييد البلوتوث أثناء الاتصال بشبكة Wi-Fi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "يتعذر استخدام التقييد"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "إعادة تسمية الجهاز"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "يتعذر استخدام التقييد في وضع الطيران. لاستخدام التقييد، قم بإلغاء تفعيل وضع الطيران"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "اسم الجهاز"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "حول الهاتف"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "أدخل كلمة المرور."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "الجهاز المتصل"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "تم"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "إلغاء"
+
+msgid "IDS_COM_SK_YES"
+msgstr "نعم"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "حفظ"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "الضبط"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "تقييد البلوتوث"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "الحماية"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "الجهاز المتصل"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "تقييد"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "تاريخ الاستخدام: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "أدخل كلمة مرور تتألف من 8 أحرف على الأقل"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "اسم الجهاز"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "سيؤدي تفعيل تقييد USB إلى فصل اتصال USB السابق"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "يمكن تغيير اسم الجهاز في %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "اسم الجهاز: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "أدخل %d حروف على الأقل."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "إخفاء جهازي"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "كلمة المرور"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d بايت"
@@ -76,54 +100,171 @@ msgstr "‎%d KB‎"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "يتعذر استخدام خدمة الحزمة. خارج نطاق التغطية"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "الحماية"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "انقر لتهيئة التقييد"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "التقييد نشط"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "يتم التحكم حاليا في التقييد بواسطة تطبيق آخر. لضبط التقييد، سيتم إلغاء تفعيل هذا التطبيق."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "تخص كلمة المرور هذه تقييد Wi-Fi فقط."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "تم إخفاء تقييد Wi-Fi."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "الاتصال بشبكة المحمول"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "توصيل كابل USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "إلغاء تفعيل وضع الطيران"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "إدخال بطاقة SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "فشل التقييد"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "يتعذر استخدام التقييد"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "تقييد USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "تقييد Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "إعدادات تقييد Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "الأجهزة المتصلة: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "سيتم قطع اتصال الجهاز المتصل."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "توصيل إلى كابل USB"
+msgstr "قم بتوصيل إلى كابل USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "سيؤدي إلغاء تفعيل التقييد إلى منع وصول الأجهزة المرتبطة من الوصول إلى الإنترنت. هل تريد المتابعة؟"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "سيؤدي تفعيل تقييد USB إلى فصل اتصال USB السابق."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "أدخل بطاقة SIM وإعادة تشغيل الجهاز لاستخدام التقييد."
 
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "يجب ألا تقل كلمة المرور عن %d أحرف وألا تزيد عن %d حرفا"
+msgstr "يجب ألا تقل كلمة المرور عن %d أحرف وألا تزيد عن %d حرفا."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "اسم الجهاز: %s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "يستهلك التقييد الكثير من طاقة البطارية ويزيد من استخدام البيانات."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "التقييد نشط"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "لتفعيل وظيفة التقييد، اتصل بهاتف محمول أو بشبكة Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "يتم التحكم حاليا في التقييد بواسطة تطبيق آخر. لضبط التقييد، سيتم إلغاء تفعيل هذا التطبيق"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "يتعذر استخدام التقييد."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "نوع الأمان: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "يتعذر استخدام التقييد في وضع الطيران. لاستخدام التقييد، قم بإلغاء تفعيل وضع الطيران."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "لاستخدام التقييد، قم بالتوصيل بشبكات المحمول"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "انتهاء مهلة الاتصال المقيد"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "مهلة الاتصال"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "انتهت مهلة الاتصال المقيد."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "تاريخ الاستخدام: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "تم إلغاء تفعيل بيانات الهاتف المحمول. قم بتفعيل بيانات الهاتف المحمول، ثم أعد المحاولة."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "انقر لتهيئة التقييد"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "الاتصال بشبكة المحمول"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "عدم العرض مرة أخرى"
+
+msgid "IDS_BR_SK_OK"
+msgstr "موافق"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "%d أحرف على الأقل"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "إلغاء تفعيل التقييد"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "لا يوجد اسم"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "تم تمكين التقييد."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "إيقاف تشغيل"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "لا يوجد اتصال بالشبكة"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
 msgstr "انتهت مهلة رؤية البلوتوث‬. قد لا يتم العثور على جهازك"
 
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "مهلة الاتصال."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "أدخل كلمة مرور تتألف من ٨ أحرف على الأقل."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "نوع الأمان: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "الضبط"
+
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "يؤدي التقييد إلى استهلاك المزيد من طاقة البطارية وزيادة استخدام البيانات. الحد الأقصى لعدد الأجهزة المقيدة المسموح بها هو %d"
+msgstr "يؤدي التقييد إلى استهلاك المزيد من طاقة البطارية وزيادة استخدام البيانات. الحد الأقصى لعدد الأجهزة المقيدة المسموح بها هو %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "تم تمكين التقييد."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "‏‫سيتم قطع اتصال شبكة Wi-Fi. يؤدي التقييد إلى استهلاك المزيد من طاقة البطارية وزيادة استخدام البيانات. الحد الأقصى لعدد الأجهزة المقيدة المسموح بها هو %d"
+msgstr "‏‫سيتم قطع اتصال شبكة Wi-Fi. يؤدي التقييد إلى استهلاك المزيد من طاقة البطارية وزيادة استخدام البيانات. الحد الأقصى لعدد الأجهزة المقيدة المسموح بها هو %d."
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "يستهلك التقييد الكثير من طاقة البطارية ويزيد من استخدام البيانات"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "تفعيل"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "سيتم قطع اتصال الجهاز المتصل"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "تم بلوغ حد استخدام البيانات"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "الأجهزة المتصلة: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "وضع الطيران"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "تعرض أسماء الأجهزة لتمييز كل جهاز متوفر في قائمة الأجهزة القريبة، عبر البلوتوث ومباشر Wi-Fi وغيرها من الطرق."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "لاستخدام التقييد، قم بالتوصيل بشبكات المحمول"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "تغيير الاسم"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "الأجهزة المتصلة"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "حدث خطأ في بطاقة SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "يتعذر استخدام خدمة الحزمة. خارج نطاق التغطية."
 
diff --git a/po/az.po b/po/az.po
index f970500..e7eda4a 100644..100755
--- a/po/az.po
+++ b/po/az.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Bu parol yalnız Wi-Fi bağlanma üçündür"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Ləğv et"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi bağlanma gizlədilib"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi bağlanma"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fi yandırılması mobil giriş nöqtəsini qeyri-aktiv edəcək. Davam edilsin?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi bağlanma param-i"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "İnternet istifadəsi"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Qəbul edildi:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Bağlanma"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Göndərilmişdir:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Bir daha göstərmə"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Cihazın adı"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi-ın yandırılması Wi-Fi bağlantısını qeyri-aktiv edəcək."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Şifrə"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Simvolların sayı maksimuma %d çatıb"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Cihazın adını %s-da dəyişdirmək olar"
+msgid "IDS_COM_SK_NO"
+msgstr "Xeyr"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Mənim cihazımı gizlədin"
+msgid "IDS_BR_SK_YES"
+msgstr "Bəli"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Məlumat istifadəsi"
+msgid "IDS_BR_SK_NO"
+msgstr "Xeyr"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB bağlanma"
+msgid "IDS_BR_SK_DONE"
+msgstr "Bitdi"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Bağlanmanın qeyri-aktiv edilməsi əlaqəli cihazların İnternetə daxil olmasına imkan verməyəcək. Davam etsin?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Ləğv et"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "SIM kartı daxil edin və bağlanmadan istifadə etmək üçün cihazı yenidən başladın"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Wi-Fi şəbəkəsinə qoşulduqda Bluetooth bağlantısından istifadə mümkün deyil."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Bağlanmadan istifadə mümkün deyil"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Cihazın adını dəyiş"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Uçuş rejimində bağlanmadan istifadə etmək mümkün deyil. Bağlantıdan istifadə etmək üçün Uçuş rejimini qeyri-aktiv edin"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Qurğumun adı"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Telefon haqqında"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Kodu daxil et."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Qoşulmuş cihaz"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "HAZIR"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "LƏĞV ET"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Bəli"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Yaddaşa yaz"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Parametrlər"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth bağlanması"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Təhlükəsizlik"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Qoşulmuş cihaz"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Bağlanma"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "İst.edilmiş mlmtlr: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Minimum 8 simvollu parol daxil et"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Cihazın adı"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB bağlanmasını aktivləşdirmək əvvəlki USB bağlantısını kəsəcək"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Cihazın adını %s-da dəyişdirmək olar."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Cihazın adı: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Ən azı %d simvol daxil edin."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Mənim cihazımı gizlədin"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Şifrə"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Bayt"
@@ -76,17 +100,11 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Paket xidmətindən istifadə etmək mümkün deyil. Əhatə dairəsindən xaricdədir"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-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_BODY_SECURITY"
+msgstr "Təhlükəsizlik"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Cihazın adı: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Bağlanmanı konfiqurasiya etmək üçün vurun."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Bağlama aktivdir"
@@ -94,36 +112,159 @@ msgstr "Bağlama aktivdir"
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "Bağlanma hazırda başqa bir proqram tərəfindən idarə edilir. Bağlanmaya davam etmək üçün həmin proqram deaktiv ediləcək"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Təhlükəsizlik növü: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Bu parol yalnız Wi-Fi bağlanma üçündür."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Bağlanmadan istifadə etmək üçün mobil şəbəkələrə qoşulun"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi bağlanma gizlədilib."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Bağlantı fasiləsi"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Mobil şəbəkəyə qoşul"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "İst.edilmiş mlmtlr: %s"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USB naqili qoş"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Bağlanmanı konfiqurasiya etmək üçün vurun"
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Uçuş rejimini qeyri-aktiv et"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "SIM kartı daxil et"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Bağlantı alınmadı"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Bağlan istif mümkün deyil"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB bağlanma"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi bağlanma"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi bağlanma param-i"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Qoşulmuş cihazlar: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Qoşulmuş cihazla əlaqə kəsiləcək."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "USB kabelini qoş."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Bağlanmanın qeyri-aktiv edilməsi əlaqəli cihazların İnternetə daxil olmasına imkan verməyəcək. Davam etsin?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB bağlanmasını aktivləşdirmək əvvəlki USB bağlantısını kəsəcək."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "SIM kartı daxil edin və bağlanmadan istifadə etmək üçün cihazı yenidən başladın."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Bu bağlantı funksiyasını aktivləşdirmək üçün mobil və ya Wi-Fi şəbəkəsinə qoşulun"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Bağlanmadan istifadə mümkün deyil."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Uçuş rejimində bağlanmadan istifadə etmək mümkün deyil. Bağlantıdan istifadə etmək üçün Uçuş rejimini qeyri-aktiv edin."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Bağlantının vaxtı bitdi"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Bağlantının vaxtı bitdi."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobil məlumatlar qeyri-aktiv edilib. Mobil məlumatları aktivləşdirin və yenidən cəhd edin."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Mobil şəbəkəyə qoşul"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Bir daha göstərmə"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Ən azı %d simvol"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Bağlantını qeyri-aktiv et"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Ad yoxdur"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Bağlanma aktiv edildi."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Söndürün"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Şəbəkə bağlantısı yoxdur"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth-un görünməsinin vaxtı bitmişdir. Sizin cihaz ola bilər ki tapılmasın"
+msgstr "Bluetooth-un görünməsinin vaxtı bitmişdir. Sizin cihaz ola bilər ki tapılmasın."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Bağlantı fasiləsi."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Minimum 8 simvollu parol daxil et."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Təhlükəsizlik növü: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Parametrlər"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Bağlanma daha çox batareyadan istifadə edir və verilənlərdən istifadənizi artırır. Bağlanan cihazların icazə verilən maksimum sayı %d-dir"
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Bağlanma aktiv edildi."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Wi-Fi şəbəkəsi ilə əlaqə kəsiləcək. Bağlanma daha çox batareyadan istifadə edir və verilənlərdən istifadənizi artırır. Bağlanan cihazların icazə verilən maksimum sayı %d-dir"
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Qoş"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Qoşulmuş cihazla əlaqə kəsiləcək"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Tarifdən ist limit çat"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Qoşulmuş cihazlar: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Uçuş rejimi"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Bluetooth, Wi-Fi Direct və digər metodları vasitəsilə cihaz adları yaxınlıqdakı cihaz siyahısında mövcud olan cihazlardan hər birini ayırd etmək üçün göstərilir."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Bağlanmadan istifadə etmək üçün mobil şəbəkələrə qoşulun."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Adını dəyişdir"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Qoşulmuş cihazlar"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM kart səhvi baş verdi"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Paket xidmətindən istifadə etmək mümkün deyil. Əhatə dairəsindən xaricdədir."
 
diff --git a/po/bg.po b/po/bg.po
index dada488..2e54b0c 100644..100755
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Тази парола е само за Wi-Fi привързване"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Отмени"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi привързването е скрито"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi привързване"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Включването на Wi-Fi ще деактивира Mobile Hotspot. Продължаване?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Наст. за Wi-Fi привързв."
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Ползване на данни"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Получено:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Привързване"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Изпратен:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Не показвай отново"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Име устройство"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Включването на Wi-Fi ще деактивира Wi-Fi привързване."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Парола"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Достигнат е максималният брой знаци %d."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Името на устройството може да бъде променено в %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Не"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Скрий моето устройство"
+msgid "IDS_BR_SK_YES"
+msgstr "Да"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Ползване на данни"
+msgid "IDS_BR_SK_NO"
+msgstr "Не"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Сдвояване през USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Готово"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Деактивирането на привързването ще предотврати достъпа на свързаните устройства до интернет. Продължаване?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Отмени"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Поставете SIM карта и рестартирайте устройството, за да използвате привързване"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Не може да се използва Bluetooth привързване, докато сте свързани към Wi-Fi мрежа."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Не може да се използва привързване"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Преименуване на устройството"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Привързването не може да се използва в режим Полет. За да използвате привързване, деактивирайте режим Полет"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Име на моето устройство"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Относно телефона"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Въвеждане на парола"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Свързано устройство"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "ГОТОВО"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ОТКАЗ"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Да"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Запази"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Настройки"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth привързване"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Защита"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Свързано устройство"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Привързване"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Дата на използване: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Въведете парола с поне 8 знака"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Име устройство"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Разрешаването на сдвояването през USB ще изключи предишната USB връзка"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Името на устройството може да бъде променено в %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Име на устройството: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Въведете поне %d знака."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Скрий моето устройство"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Парола"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d байта"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Не може да се използва пакетна услуга. Извън покритие"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Защита"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Чукнете, за да конфигурирате привързване."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Привързв.активно"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Привързването в момента се управлява от друго приложение. За да конфигурирате привързването, приложението ще бъде деактивирано."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Тази парола е само за Wi-Fi привързване."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi привързването е скрито."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Свързване към мобилна мрежа"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Свързване на USB кабел"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Деактивиране режим Полет"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Поставете SIM карта"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Тетърингът е неуспешен"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Не може да се ползва тетъринг"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Сдвояване през USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi привързване"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Наст. за Wi-Fi привързв."
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Свързани устройства: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Свързаното устройство ще бъде прекъснато."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
 msgstr "Свързване с USB кабел"
 
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Деактивирането на привързването ще предотврати достъпа на свързаните устройства до интернет. Продължаване?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Разрешаването на сдвояването през USB ще изключи предишната USB връзка."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Поставете SIM карта и рестартирайте устройството, за да използвате привързване."
+
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "Паролата трябва да съдържа поне %d знака и да не е по-дълга от %d знака"
+msgstr "Паролата трябва да съдържа поне %d знака и да не е по-дълга от %d знака."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Име на устройството: %s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Привързването изразходва повече енергия от батерията и увеличава потреблението на данни."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Привързв.активно"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "За да активирате тази функция за привързване, свържете се към мобилна или Wi-Fi мрежа"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Привързването в момента се управлява от друго приложение. За да конфигурирате привързването, приложението ще бъде деактивирано"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Не може да се използва привързване."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Тип защита: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Привързването не може да се използва в режим Полет. За да използвате привързване, деактивирайте режим Полет."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "За да използвате привързване, свържете се към мобилни мрежи"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Времето на тетъринга изтече"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Изтекло време на изчакване на връзка"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Времето на тетъринг връзката изтече."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Дата на използване: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Мобилните данни са деактивирани. Активирайте мобилните данни и опитайте отново."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Чукнете, за да конфигурирате привързване"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Свързв. към мобилна мрежа"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Не показвай повече"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Поне %d знака"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Деактивиране на тетъринг"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Без име"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Привързването е активирано."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Изключване"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Няма връзка с мрежата"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Видимостта на Bluetooth изтече. Вашето устройство може да не бъде открито"
+msgstr "Видимостта на Bluetooth изтече. Вашето устройство може да не бъде открито."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Изтекло време на изчакване на връзка."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Въведете парола с поне 8 знака."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Тип защита: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Настройки"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Привързването консумира повече енергия от батерията и увеличава потреблението на данни. Максималният позволен брой привързани устройства е %d"
+msgstr "Привързването консумира повече енергия от батерията и увеличава потреблението на данни. Максималният позволен брой привързани устройства е %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Привързването е активирано."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi мрежата ще бъде прекъсната. Привързването консумира повече енергия от батерията и увеличава потреблението на данни. Максималният позволен брой привързани устройства е %d"
+msgstr "Wi-Fi мрежата ще бъде прекъсната. Привързването консумира повече енергия от батерията и увеличава потреблението на данни. Максималният позволен брой привързани устройства е %d."
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "Привързването изразходва повече енергия от батерията и увеличава потреблението на данни"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Разрешаване"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Свързаното устройство ще бъде прекъснато"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Лимит изп. данни достиг."
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Свързани устройства: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Режим Полет"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Имената на устройствата са показани, за да се различава всяко от устройствата, налични в списъка с устройства наблизо, и през Bluetooth, Wi-Fi Direct и други методи."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "За да използвате привързване, свържете се към мобилни мрежи."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Ново име"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Свързани устройства"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Възникна грешка в SIM картата"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Не може да се използва пакетна услуга. Извън покритие."
 
diff --git a/po/ca.po b/po/ca.po
index 16be0b5..46f8de5 100644..100755
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Aquesta contrasenya només és pel tethering Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Tethering Wi-Fi amagat"
+msgid "IDS_COM_SK_OK"
+msgstr "Acceptar"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Tethering Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Se activa el Wi-Fi, es deshabilitarà Punt d'accés mòbil. Continuar?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Ajustam tethering Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Ús de dades"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Rebut:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Enviat:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "No ho tornis a mostrar."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nom dispositiu"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Si activa el Wi-Fi, es deshabilitarà el tethering Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Contrasenya"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "S'ha assolit el nombre màxim de %d caràcters."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "El nom del dispositiu es pot canviar a %s"
+msgid "IDS_COM_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Ocultar el meu dispositiu"
+msgid "IDS_BR_SK_YES"
+msgstr "Sí"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Ús de dades"
+msgid "IDS_BR_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Tethering USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Fet"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Si deshabilita el tethering, impedirà que els dispositius vinculats accedeixin a Internet. Continuar?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Insereixi una targeta SIM i reiniciï el dispositiu per utilitzar tethering"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "No es pot utilitzar el tethering Bluetooth mentre està connectat a una xarxa Wi-Fi"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "No es pot utilitzar el tethering"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Canviar el nom del dispositiu"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "No es pot utilitzar tethering en mode Vol. Per utilitzar tethering, desactivi el mode Vol"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "El nom del meu dispositiu"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Sobre el telèfon"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Introduir contrasenya"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Dispositiu connectat"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "REALITZAT"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CANCEL·LAR"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Sí"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Desar"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Ajustaments"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Tethering Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Seguretat"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Dispositiu connectat"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Dades utilitzades: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Introdueixi una contrasenya d'almenys 8 caràcters"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nom dispositiu"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Si habilita el tethering USB, es desconnectaran les connexions USB prèvies"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "El nom del dispositiu es pot canviar a %s"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nom de dispositiu: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Introdueixi almenys %d caràcters"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Ocultar el meu dispositiu"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Contrasenya"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Bytes"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "No es pot utilitzar el servei de paquets. Fora de cobertura"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Seguretat"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Toqui per configurar tethering"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Tethering actiu"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "El tethering està controlat actualment per una altra aplicació. Per configurar-lo, cal deshabilitar aquesta aplicació."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Aquesta contrasenya només és pel tethering Wi-Fi"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Tethering Wi-Fi amagat"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Connectar a xarxa mòbil"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Connectar cable USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Deshabilitar mode Vol"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Inserir targeta SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Error d'Ancoratge a xarxa"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "No es pot utilit Ancor a xarxa"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Ancoratge a xarxa USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Ancoratge a xarxa Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Ajust Ancor a xarxa Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Dispositius connectats: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Es desconnectarà el dispositiu connectat"
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
 msgstr "Connectar cable USB"
 
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Si deshabilita el tethering, impedirà que els dispositius vinculats accedeixin a Internet. Continuar?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Si habilita el tethering USB, es desconnectaran les connexions USB prèvies"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Insereixi una targeta SIM i reiniciï el dispositiu per utilitzar tethering"
+
 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_BODY_DEVICE_NAME_C_PS"
-msgstr "Nom de dispositiu: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Tethering actiu"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Per habilitar aquesta funció de tethering, connecti a una xarxa mòbil o Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "El tethering està controlat actualment per una altra aplicació. Per configurar-lo, cal deshabilitar aquesta aplicació"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "No es pot utilitzar el tethering"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Tipus de seguretat: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "No es pot utilitzar tethering en mode Vol. Per utilitzar tethering, desactivi el mode Vol."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Per utilitzar tethering, connecti a xarxes mòbils"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Connexió Ancorat xarxa esgotada"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Temps d'espera de connexió"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Connexió d'Ancoratge a xarxa esgotada."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Dades utilitzades: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Les dades mòbils estan deshabilitades. Habiliti-les i torni-ho a intentar."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Toqui per configurar tethering"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Connectar a xarxa mòbil"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "No tornar a mostrar"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Acceptar"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Almenys %d caràcters"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Deshabilitar tethering"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Sense nom"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Tethering habilitat"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Apagar"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Sense connexió de xarxa"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
 msgstr "Ha caducat la visibilitat Bluetooth. No es pot trobar el seu dispositiu"
 
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Temps d'espera de connexió"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Introdueixi una contrasenya d'almenys 8 caràcters"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Tipus de seguretat: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Ajustaments"
+
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "El tethering consumeix més bateria i augmenta el consum de dades. El nombre màxim de dispositius connectats amb tethering permesos és %d"
+msgstr "El tethering consumeix més bateria i augmenta el consum de dades. El nombre màxim de dispositius connectats amb tethering permesos és %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Tethering habilitat"
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Es desconnectarà la xarxa Wi-Fi. El tethering consumeix més bateria i augmenta el consum de dades. El nombre màxim de dispositius connectats amb tethering permesos és %d"
+msgstr "Es desconnectarà la xarxa Wi-Fi. El tethering consumeix més bateria i augmenta el consum de dades. El nombre màxim de dispositius connectats amb tethering permesos és %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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Activar"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Es desconnectarà el dispositiu connectat"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Límit ús de dades assolit"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Dispositius connectats: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Mode Vol"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Els noms de dispositius es mostren per distingir cadascun dels dispositius disponibles a la llista de dispositius propers, i mitjançant Bluetooth, Wi-Fi Direct i altres mètodes."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Per utilitzar tethering, connecti a xarxes mòbils"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Canv. nom"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Dispositius connectats"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "S'ha produït error targeta SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "No es pot utilitzar el servei de paquets. Fora de cobertura."
 
diff --git a/po/cs.po b/po/cs.po
index c575e8a..19b280b 100644..100755
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Heslo platí pouze pro sdílení připojení Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Zrušit"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Sdílení připojení Wi-Fi je skryto"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Sdílení připojení Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Zapnutím Wi-Fi vypnete Mobile Hotspot. Chcete pokračovat?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Nast. sdílení přip. Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Použití dat"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Přijato:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Sdílení internetového připojení"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Odesláno:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Znovu nezobrazovat"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Jméno zařízení"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Zapnutím Wi-Fi vypnete sdílení připojení k Internetu pomocí Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Heslo"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Bylo dosaženo maximálního počtu znaků %d."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Název zařízení je možné změnit v %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Skrýt mé zařízení"
+msgid "IDS_BR_SK_YES"
+msgstr "Ano"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Použití dat"
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Sdílení přip. přes USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Hotovo"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Vypnutím sdílení připojení zabráníte připojeným zařízením v přístupu k Internetu. Chcete pokračovat?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Zrušit"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Chcete-li použít sdílení připojení, vložte SIM kartu a restartujte zařízení"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Během připojení k síti Wi-Fi nelze použít sdílení připojení pomocí Bluetooth."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Sdílení připojení nelze použít"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Přejmenovat zařízení"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Sdílené připojení k Internetu nelze v režimu Letadlo použít. Chcete-li použít sdílené připojení k Internetu, vypněte režim Letadlo"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Název zařízení"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "O telefonu"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Zadejte heslo."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Připojené zařízení"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "HOTOVO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ZRUŠIT"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Ano"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Uložit"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Nastavení"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Sdílení připojení Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Zabezpečení"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Připojené zařízení"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Sdílení internetového připojení"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Objem dat: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Zadejte heslo o délce alespoň 8 znaků"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Jméno zařízení"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Zapnutím sdílení připojení k Internetu přes USB odpojíte předchozí připojení přes USB"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Název zařízení je možné změnit v %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Název zařízení: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Zadejte nejméně %d znaků."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Skrýt mé zařízení"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Heslo"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d B"
@@ -76,54 +100,171 @@ msgstr "%d kB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Nelze používat službu paketových přenosů. Mimo pokrytí"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Zabezpečení"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Klepněte a nakonfigurujte sdílení připojení k Internetu."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Sdíl. přip. akt."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Sdílení připojení k Internetu je nyní ovládáno jinou aplikací. Abyste ho mohli nakonfigurovat, aplikace bude vypnuta."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Heslo platí pouze pro sdílení připojení Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Sdílení připojení Wi-Fi je skryto."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Připojit k mobilní síti"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Připojte kabel USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Vypnout režim Letadlo"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Vložte SIM kartu"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Sdílení připojení se nezdařilo"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Sdílení připojení nelze použít"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Sdílení přip. přes USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Sdílení připojení Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Nast. sdílení přip. Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Připojená zařízení: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Připojené zařízení bude odpojeno."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Připojte USB kabel"
+msgstr "Připojte USB kabel."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Vypnutím sdílení připojení zabráníte připojeným zařízením v přístupu k Internetu. Chcete pokračovat?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Zapnutím sdílení připojení k Internetu přes USB odpojíte předchozí připojení přes USB."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Chcete-li použít sdílení připojení, vložte SIM kartu a restartujte zařízení."
 
 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ů"
+msgstr "Heslo musí obsahovat nejméně %d znaků a maximálně %d znaků."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Název zařízení: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Sdíl. přip. akt."
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Chcete-li zapnout tuto funkci sdílení připojení k Internetu, připojte zařízení k mobilní síti nebo k síti Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Sdílení připojení k Internetu je nyní ovládáno jinou aplikací. Abyste ho mohli nakonfigurovat, aplikace bude vypnuta"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Sdílení připojení nelze použít."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Typ zabezpečení: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Sdílené připojení k Internetu nelze v režimu Letadlo použít. Chcete-li použít sdílené připojení k Internetu, vypněte režim Letadlo."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Chcete-li použít sdílení připojení k Internetu, připojte se k mobilním sítím"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Časový limit sdílení připojení"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Časový limit připojení"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Vypršel časový limit sdílení připojení k Internetu."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Objem dat: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobilní data jsou vypnutá. Zapněte mobilní data a opakujte akci."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Klepněte a nakonfigurujte sdílení připojení k Internetu"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Připojit k mobilní síti"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Znovu nezobrazovat"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Alespoň %d znaků"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Vypnout sdílení připojení"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Žádný název"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Sdílení připojení zapnuto."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Vypnout"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Žádné síťové připojení"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Platnost viditelnosti Bluetooth vypršela. Zařízení pravděpodobně nebude nalezeno"
+msgstr "Platnost viditelnosti Bluetooth vypršela. Zařízení pravděpodobně nebude nalezeno."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Časový limit připojení."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Zadejte heslo o délce alespoň 8 znaků."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Typ zabezpečení: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Nastavení"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Sdílení připojení k Internetu spotřebovává více energie z baterie a zvyšuje využívání dat. Maximální povolený počet zařízení sdílejících připojení k Internetu je %d"
+msgstr "Sdílení připojení k Internetu spotřebovává více energie z baterie a zvyšuje využívání dat. Maximální povolený počet zařízení sdílejících připojení k Internetu je %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Sdílení připojení zapnuto."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Síť Wi-Fi bude odpojena. Sdílení připojení k Internetu spotřebovává více energie z baterie a zvyšuje využívání dat. Maximální povolený počet zařízení sdílejících připojení k Internetu je %d"
+msgstr "Síť Wi-Fi bude odpojena. Sdílení připojení k Internetu spotřebovává více energie z baterie a zvyšuje využívání dat. Maximální povolený počet zařízení sdílejících připojení k Internetu je %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Povolit"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Připojené zařízení bude odpojeno"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Dosažen limit využití dat"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Připojená zařízení: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "R. Letadlo"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Jsou zobrazeny názvy zařízení, aby se odlišila jednotlivá zařízení dostupná v seznamu nedalekých zařízení, a dostupná prostřednictvím Bluetooth, Wi-Fi Direct a dalších metod."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Chcete-li použít sdílení připojení k Internetu, připojte se k mobilním sítím."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Přejmenovat"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Připojená zařízení"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Došlo k chybě SIM karty"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Nelze používat službu paketových přenosů. Mimo pokrytí."
 
diff --git a/po/da.po b/po/da.po
index bd80b12..8735b94 100644..100755
--- a/po/da.po
+++ b/po/da.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Denne adgangskode er kun til Wi-Fi-deling"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annullér"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi-deling skjult"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi-deling"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Aktivering af Wi-Fi deaktiverer Mobile Hotspot. Fortsæt?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Indstilling. Wi-Fi-deling"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Databrug"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Modtaget:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Internetdeling"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Sendt:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Vis ikke igen"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Enhedsnavn"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Aktivering af Wi-Fi vil deaktivere Wi-Fi-internetdeling."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Adgangskode"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Det maksimale antal tegn %d er nået."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Enhedsnavnet kan ændres i %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Nej"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Skjul min telefon"
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Databrug"
+msgid "IDS_BR_SK_NO"
+msgstr "Nej"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-internetdeling"
+msgid "IDS_BR_SK_DONE"
+msgstr "Udført"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Deaktivering af deling forhindrer kædede enheder i at gå på internettet. Fortsæt?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annullér"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Isæt SIM-kort, og genstart enhed for at bruge deling"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Kan ikke bruge Bluetooth-internetdeling, mens Wi-Fi er tilsluttet."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Kan ikke anvende deling"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Omdøb enhed"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Kan ikke bruge internetdeling i Flytilstand. For at bruge internetdeling skal du deaktivere Flytilstand"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Mit enhedsnavn"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Om enheden"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Angiv adgangskode."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Forbundet enhed"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "UDFØRT"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ANNULLER"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Gem"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Indstillinger"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth-internetdeling"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Sikkerhed"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Forbundet enhed"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Internetdeling"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Data brugt: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Angiv adgangskode på mindst otte tegn"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Enhedsnavn"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Aktivering af USB-internetdeling vil frakoble den tidligere USB-forbindelse"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Enhedsnavnet kan ændres i %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Enhedsnavn: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Indtast mindst %d tegn."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Skjul min telefon"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Adgangskode"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d bytes"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Kan ikke anvende pakketjeneste. Uden for dækning"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Sikkerhed"
 
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Tryk for at konfigurere deling."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Deling aktiv"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Internetdeling styres i øjeblikket af et andet program. For at konfigurere internetdeling vil nævnte program blive deaktiveret."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Denne adgangskode er kun til Wi-Fi-deling."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi-deling skjult."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Opret forb. til mobilt netværk"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
 msgstr "Tilslut USB-kabel"
 
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Deaktivér Flytilstand"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Isæt SIM-kort"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Deling mislykkedes"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Kan ikke anvende deling"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-internetdeling"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi-deling"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Indstilling. Wi-Fi-deling"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Tilsluttede enheder: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Tilsluttet enhed vil blive frakoblet."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Tilslut USB-kabel."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Deaktivering af deling forhindrer kædede enheder i at gå på internettet. Fortsæt?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Aktivering af USB-deling vil frakoble den tidligere USB-forbindelse."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Isæt SIM-kort, og genstart enhed for at bruge deling."
+
 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"
+msgstr "Adgangskode skal indeholde mindst %d tegn og må ikke overstige %d tegn."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Enhedsnavn: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Deling aktiv"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "For at aktivere denne internetdelingsfunktion skal du oprette forbindelse til et mobilt netværk eller Wi-Fi-netværk."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Internetdeling styres i øjeblikket af et andet program. For at konfigurere internetdeling vil nævnte program blive deaktiveret"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Kan ikke anvende deling."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Sikkerhedstype: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Kan ikke bruge internetdeling i Flytilstand. For at bruge internetdeling skal du deaktivere Flytilstand."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Du skal oprette forbindelse til mobilt netværk for at bruge deling"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Internetdeling fik timeout"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Forbindelses-timeout"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Forbindelse til internetdeling fik timeout."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Data brugt: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobile data er deaktiveret. Aktivér mobile data, og prøv igen."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Tryk for at konfigurere deling"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Slut til mobilt netværk"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Vis ikke igen"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Mindst %d tegn"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Deaktivér Deling"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Intet navn"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Internetdeling aktiveret."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Deaktivér"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Ingen netværksforbindelse"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth-synlighed fik timeout. Din enhed er muligvis ikke blevet fundet"
+msgstr "Bluetooth-synlighed fik timeout. Din enhed er muligvis ikke blevet fundet."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Forbindelses-timeout."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Angiv adgangskode på mindst otte tegn."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Sikkerhedstype: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Indstillinger"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Internetdeling bruger mere batteri og øger dit dataforbrug. Det maksimalt tilladte antal af enheder til internetdeling er %d."
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Internetdeling aktiveret."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Wi-Fi-netværk vil blive frakoblet. Internetdeling bruger mere batteri og øger dit dataforbrug. Det maksimalt tilladte antal af enheder til internetdeling er %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Aktivér"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Tilsluttet enhed vil blive frakoblet"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Brugsgrænse for data nået"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Tilsluttede enheder: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Flytilstand"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Enhedsnavne vises for at identificere hver enkelt af de tilgængelige enheder i forhold til andre enheder i nærheden og via Bluetooth, Wi-Fi Direct og andre metoder."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Du skal oprette forbindelse til mobilt netværk for at bruge deling."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Omdøb"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Tilsluttede enheder"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Der opstod fejl med SIM-kortet"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Kan ikke anvende pakketjeneste. Uden for dækning."
 
diff --git a/po/de_DE.po b/po/de.po
index cfbe6b1..3ae359c 100644..100755
--- a/po/de_DE.po
+++ b/po/de.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Dieses Passwort gilt nur für WLAN-Tethering."
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Abbrechen"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "WLAN-Tethering ausgeblendet"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "WLAN-Tethering"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Durch das Einschalten von WLAN wird Mobile Hotspot deaktiviert. Fortfahren?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "WLAN-Tethering-Einstell."
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Datennutzung"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Empfangen:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Gesendet:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Nicht mehr anzeigen"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Gerätename"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Durch das Einschalten von WLAN wird WLAN-Tethering deaktiviert."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Passwort"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximale Anzahl %d von Zeichen erreicht."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Gerätename kann in %s geändert werden."
+msgid "IDS_COM_SK_NO"
+msgstr "Nein"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Mein Gerät ausblenden"
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Datennutzung"
+msgid "IDS_BR_SK_NO"
+msgstr "Nein"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-Tethering"
+msgid "IDS_BR_SK_DONE"
+msgstr "Fertig"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Das Deaktivieren von Tethering verhindert den Zugriff verbundener Geräte auf das Internet. Fortfahren?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Abbrechen"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "SIM-Karte einsetzen und Gerät neu starten, um Tethering zu verwenden."
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Verwendung von Bluetooth-Tethering bei Verbindung über WLAN-Netzwerk nicht möglich"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Tethering kann nicht verwendet werden"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Gerätenamen ändern"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Tethering kann im Offline-Modus nicht verwendet werden. Um Tethering zu verwenden, deaktivieren Sie den Offline-Modus."
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Name meines Geräts"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Telefoninfo"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Passwort eingeben"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Verbundenes Gerät"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "FERTIG"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ABBRECHEN"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Speichern"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Einstellungen"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth-Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Sicherheit"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Verbundenes Gerät"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Verbrauchte Daten: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Geben Sie ein Passwort mit mindestens 8 Zeichen ein"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Gerätename"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Das Aktivieren des USB-Tethering beendet die vorherige USB-Verbindung."
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Gerätename kann in %s geändert werden."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Gerätename: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Geben Sie mindestens %d Zeichen ein."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Mein Gerät ausblenden"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Passwort"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Byte"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Paketdienst kann nicht verwendet werden. Außerhalb des Abdeckungsbereichs"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Sicherheit"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Tippen, um Tethering zu konfigurieren"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Tethering aktiv"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Tethering wird gerade von einer anderen Anwendung gesteuert. Diese Anwendung wird zur Konfiguration von Tethering deaktiviert."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Dieses Passwort gilt nur für WLAN-Tethering."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "WLAN-Tethering ausgeblendet"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Mit mobilem Netzwerk verbinden"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Anschluß eines USB-Kabel"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Deaktivieren des Offline-Modus"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "SIM-Karte einlegen"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Tethering schlug fehl"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Tethering nicht möglich"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-Tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "WLAN-Tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "WLAN-Tethering-Einstell."
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Verbundene Geräte: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Das angeschlossene Gerät wird getrennt."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
 msgstr "USB-Kabel anschließen"
 
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Das Deaktivieren von Tethering verhindert den Zugriff verbundener Geräte auf das Internet. Fortfahren?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Das Aktivieren des USB-Tethering beendet die vorherige USB-Verbindung."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "SIM-Karte einsetzen und Gerät neu starten, um Tethering zu verwenden."
+
 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_BODY_DEVICE_NAME_C_PS"
-msgstr "Gerätename: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Tethering aktiv"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Wenn Sie die Tethering-Funktion aktivieren möchten, stellen Sie eine Verbindung mit einem WLAN oder einem mobilen Netz her."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Tethering wird gerade von einer anderen Anwendung gesteuert. Diese Anwendung wird zur Konfiguration von Tethering deaktiviert."
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Tethering kann nicht verwendet werden"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Sicherheitstyp: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Tethering kann im Offline-Modus nicht verwendet werden. Um Tethering zu verwenden, deaktivieren Sie den Offline-Modus."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Wenn Sie Tethering verwenden möchten, müssen Sie mit mobilen Netzwerken verbunden sein."
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tethering-Verbindungs-Timeout"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Verbindung getrennt"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Timeout bei der Tethering-Verbindung."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Verbrauchte Daten: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobile Daten sind deaktiviert. Aktivieren Sie mobile Daten und versuchen Sie es dann erneut."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Tippen, um Tethering zu konfigurieren"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Mit Mobilnetz verbinden"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Nicht erneut anzeigen"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Mindestens %d Zeichen"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Deaktivieren von Tethering"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Kein Name"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Tethering aktiviert"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Ausschalten"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Keine Netzverbindung"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
 msgstr "Die Bluetooth-Sichtbarkeit ist abgelaufen. Ihr Gerät wird möglicherweise nicht gefunden."
 
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Verbindung getrennt"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Nicht erneut anzeigen"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Geben Sie ein Passwort mit mindestens 8 Zeichen ein"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Sicherheitstyp: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Einstellungen"
+
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Tethering verbraucht mehr Akkuleistung und erhöht Ihr Datenvolumen. Für Tethering sind maximal %d Geräte erlaubt."
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Tethering aktiviert"
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Die WLAN-Verbindung wird getrennt. Tethering verbraucht mehr Akkuleistung und erhöht Ihr Datenvolumen. Für Tethering sind maximal %d Geräte erlaubt."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Aktivieren"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Das angeschlossene Gerät wird getrennt."
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Max. Datennutzg. erreicht"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Verbundene Geräte: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Offl.-Modus"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Gerätenamen werden angezeigt um jedes Gerät unterscheiden zu können, das über die Liste naher Geräte, Bluetooth, Wi-Fi Direct oder andere Methoden verfügbar ist."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Wenn Sie Tethering verwenden möchten, müssen Sie mit mobilen Netzwerken verbunden sein."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Umbenennen"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Verbundene Geräte"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM-Karten-Fehler aufgetreten"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Paketdienst kann nicht verwendet werden. Außerhalb des Abdeckungsbereichs"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index d57f5fb..de12f38 100644..100755
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Αυτός ο κωδικός πρόσβασης ισχύει μόνο για το tethering μέσω Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Άκυρο"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Απόκρυψη tethering μέσω Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Tethering μέσω Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Η ενεργοποίηση του Wi-Fi θα απενεργοποιήσει το Mobile Hotspot. Συνέχεια;"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Ρυθμίσεις tethering Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Χρήση δεδομένων"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Ελήφθη:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Εστάλη:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Να μην εμφανιστεί ξανά"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Όνομα συσκευής"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Η ενεργοποίηση του Wi-Fi θα απενεργοποιήσει το tethering μέσω Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Κωδικός πρόσβασης"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Συμπληρώθηκε ο μέγιστος αριθμός %d χαρακτήρων."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Μπορείτε να αλλάξετε το όνομα της συσκευής από το %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Όχι"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Απόκρυψη της συσκευής μου"
+msgid "IDS_BR_SK_YES"
+msgstr "Ναι"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Χρήση δεδομένων"
+msgid "IDS_BR_SK_NO"
+msgstr "Όχι"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Tethering μέσω USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Ok"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Η απενεργοποίηση του tethering θα εμποδίσει την πρόσβαση των συνδεδεμένων συσκευών στο Internet. Συνέχεια;"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Άκυρο"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Εισαγάγετε την κάρτα SIM και επανεκκινήστε τη συσκευή για να χρησιμοποιήσετε τη λειτουργία tethering"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Δεν είναι δυνατή η χρήση tethering μέσω Bluetooth κατά τη σύνδεση σε δίκτυο Wi-Fi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Δεν είναι δυνατή η χρήση tethering"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Μετονομασία συσκευής"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Δεν είναι δυνατή η χρήση του tethering στη λειτουργία πτήσης. Για να χρησιμοποιήσετε το tethering, απενεργοποιήστε τη λειτουργία πτήσης"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Το όνομα της συσκευής μου"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Πληροφορίες σχετικά με το τηλέφωνο"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Εισαγωγή κωδικού."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Συνδεδεμένη συσκευή"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "ΤΕΛΟΣ"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ΑΚΥΡΟ"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Ναι"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Αποθ/ση"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Ρυθμίσεις"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Tethering μέσω Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Ασφάλεια"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Συνδεδεμένη συσκευή"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Δεδομένα σε χρήση: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Εισαγάγετε έναν κωδικό πρόσβασης με 8 χαρακτήρες τουλάχιστον"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Όνομα συσκευής"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Με την ενεργοποίηση της λειτουργίας tethering μέσω USB θα αποσυνδεθεί η προηγούμενη σύνδεση USB"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Μπορείτε να αλλάξετε το όνομα της συσκευής από το %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Όνομα συσκευής: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Εισαγάγετε τουλάχιστον %d χαρακτήρες."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Απόκρυψη της συσκευής μου"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Κωδικός πρόσβασης"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Bytes"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Δεν είναι δυνατή η χρήση της υπηρεσίας πακέτων. Εκτός δικτύου κάλυψης"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Ασφάλεια"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Πατήστε για να κάνετε διαμόρφωση του tethering."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Tethering ενεργό"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Η λειτουργία tethering ελέγχεται από άλλη εφαρμογή αυτήν τη στιγμή. Η εν λόγω εφαρμογή θα απενεργοποιηθεί, για να πραγματοποιήσετε διαμόρφωση της λειτουργίας tethering."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Αυτός ο κωδικός πρόσβασης ισχύει μόνο για το tethering μέσω Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Απόκρυψη tethering μέσω Wi-Fi."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Σύνδεση σε δίκτυο κιν. τηλεφ."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Συνδέστε καλώδιο USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Απενεργοποίηση λειτ. πτήσης"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Εισαγάγετε κάρτα SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Το tethering απέτυχε"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Αδύνατη η χρήση του tethering"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Tethering μέσω USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Tethering μέσω Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Ρυθμίσεις tethering Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Συνδεδεμένες συσκευές: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Η συνδεδεμένη συσκευή θα αποσυνδεθεί."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Συνδέστε το καλώδιο USB"
+msgstr "Συνδέστε το καλώδιο USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Η απενεργοποίηση του tethering θα εμποδίσει την πρόσβαση των συνδεδεμένων συσκευών στο Internet. Συνέχεια;"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Με την ενεργοποίηση της λειτουργίας tethering μέσω USB θα αποσυνδεθεί η προηγούμενη σύνδεση USB."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Εισαγάγετε την κάρτα SIM και επανεκκινήστε τη συσκευή για να χρησιμοποιήσετε τη λειτουργία tethering."
 
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "Ο κωδικός πρόσβασης πρέπει να περιέχει %d χαρακτήρες τουλάχιστον και να μην ξεπερνά τους %d χαρακτήρες"
+msgstr "Ο κωδικός πρόσβασης πρέπει να περιέχει %d χαρακτήρες τουλάχιστον και να μην ξεπερνά τους %d χαρακτήρες."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Όνομα συσκευής: %s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Το tethering καταναλώνει περισσότερη ισχύ μπαταρίας και αυξάνει τη χρήση δεδομένων."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Tethering ενεργό"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Για την ενεργοποίηση της λειτουργίας tethering, συνδεθείτε σε ένα δίκτυο κινητής τηλεφωνίας ή Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Η λειτουργία tethering ελέγχεται από άλλη εφαρμογή αυτήν τη στιγμή. Η εν λόγω εφαρμογή θα απενεργοποιηθεί, για να πραγματοποιήσετε διαμόρφωση της λειτουργίας tethering"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Δεν είναι δυνατή η χρήση tethering."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Τύπος ασφάλειας: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Δεν είναι δυνατή η χρήση του tethering στη λειτουργία πτήσης. Για να χρησιμοποιήσετε το tethering, απενεργοποιήστε τη λειτουργία πτήσης."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Για τη χρήση της λειτουργίας tethering, συνδεθείτε σε δίκτυα κινητής τηλεφωνίας"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Ο χρόνος σύνδ. tethering έληξε"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Λήξη χρόνου σύνδεσης"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Ο χρόνος σύνδεσης tethering έληξε."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Δεδομένα σε χρήση: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Τα δεδομένα κινητής τηλεφωνίας είναι απενεργοποιημένα. Ενεργοποιήστε τα δεδομένα κιν. τηλεφ. και δοκιμάστε ξανά."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Πατήστε για να κάνετε διαμόρφωση του tethering"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Σύνδ. σε δίκτ. κιν. τηλ."
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Να μην εμφανιστεί ξανά"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Τουλάχιστον %d χαρακτήρες"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Απενεργοποίηση tethering"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Κανένα όνομα"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Ενεργοποιήθηκε το tethering."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Απενεργοποίηση"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Χωρίς σύνδεση δικτύου"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Το χρονικό όριο της ορατότητας Bluetooth έληξε. Η συσκευή σας ενδέχεται να μην βρεθεί"
+msgstr "Το χρονικό όριο της ορατότητας Bluetooth έληξε. Η συσκευή σας ενδέχεται να μην βρεθεί."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Λήξη χρόνου σύνδεσης."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Εισαγάγετε έναν κωδικό πρόσβασης με 8 χαρακτήρες τουλάχιστον."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Τύπος ασφάλειας: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Ρυθμίσεις"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Το tethering καταναλώνει περισσότερη ισχύ μπαταρίας και αυξάνει τη χρήση δεδομένων. Ο μέγιστος αριθμός συσκευών με tethering που επιτρέπεται είναι %d"
+msgstr "Το tethering καταναλώνει περισσότερη ισχύ μπαταρίας και αυξάνει τη χρήση δεδομένων. Ο μέγιστος αριθμός συσκευών με tethering που επιτρέπεται είναι %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Ενεργοποιήθηκε το tethering."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Το δίκτυο Wi-Fi θα αποσυνδεθεί. Το tethering καταναλώνει περισσότερη ισχύ μπαταρίας και αυξάνει τη χρήση δεδομένων. Ο μέγιστος αριθμός συσκευών με tethering που επιτρέπεται είναι %d"
+msgstr "Το δίκτυο Wi-Fi θα αποσυνδεθεί. Το tethering καταναλώνει περισσότερη ισχύ μπαταρίας και αυξάνει τη χρήση δεδομένων. Ο μέγιστος αριθμός συσκευών με tethering που επιτρέπεται είναι %d."
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "Το tethering καταναλώνει περισσότερη ισχύ μπαταρίας και αυξάνει τη χρήση δεδομένων"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Ενεργό"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Η συνδεδεμένη συσκευή θα αποσυνδεθεί"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Συμπλ. ορίου χρήσης δεδ."
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Συνδεδεμένες συσκευές: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Λειτ. πτήσ."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Τα αρχεία συσκευής εμφανίζονται για την αναγνώριση των διαθέσιμων συσκευών στη λίστα των κοντινών συσκευών και των συσκευών που είναι διαθέσιμες μέσω Bluetooth, Wi-Fi Direct και άλλων μεθόδων."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Για τη χρήση της λειτουργίας tethering, συνδεθείτε σε δίκτυα κινητής τηλεφωνίας."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Μετονομασία"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Συνδεδεμένες συσκευές"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Προέκυψε σφάλμα κάρτας SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Δεν είναι δυνατή η χρήση της υπηρεσίας πακέτων. Εκτός δικτύου κάλυψης."
 
diff --git a/po/en.po b/po/en.po
index baa528e..a3aca34 100644..100755
--- a/po/en.po
+++ b/po/en.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "This password is only for Wi-Fi tethering"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi tethering hidden"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi tethering"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Turning on Wi-Fi will disable Mobile Hotspot. Continue?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi tethering settings"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Data usage"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Received:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Sent:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Do not show again."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Device name"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Turning on Wi-Fi will disable Wi-Fi tethering."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Password"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximum number of characters %d reached."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Device name can be changed in %s"
+msgid "IDS_COM_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Hide my device"
+msgid "IDS_BR_SK_YES"
+msgstr "Yes"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Data usage"
+msgid "IDS_BR_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB tethering"
+msgid "IDS_BR_SK_DONE"
+msgstr "Done"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Disabling tethering will prevent linked devices from accessing the Internet. Continue?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Insert SIM card and restart device to use tethering"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Unable to use Bluetooth tethering while connected to Wi-Fi network."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Unable to use tethering"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Rename device"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Unable to use tethering in Flight mode. To use tethering, disable Flight mode."
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "My device name"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "About phone"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Enter password."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Connected device"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "DONE"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CANCEL"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Yes"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Save"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Settings"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth tethering"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Security"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Connected device"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Data used: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Enter password of at least 8 characters"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Device name"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Enabling USB tethering will disconnect previous USB connection"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Device name can be changed in %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Device name: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Enter at least %d characters."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Hide my device"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Password"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d bytes"
@@ -76,17 +100,11 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Unable to use packet data service. Out of coverage."
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-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_BODY_SECURITY"
+msgstr "Security"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Device name: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Tap to configure tethering."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Tethering active"
@@ -94,36 +112,159 @@ msgstr "Tethering active"
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "Tethering is currently being controlled by another application. To configure tethering, that application will be disabled."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Security type: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "This password is only for Wi-Fi tethering."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "To use tethering, connect to a mobile networks"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi tethering hidden."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Connection timeout"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Connect to mobile network"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Data used: %s"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Connect USB cable"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Tap to configure tethering"
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Disable Flight mode"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Insert SIM card"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Tethering failed"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Unable to use tethering"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi tethering settings"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Connected devices: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Connected device will be disconnected."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Connect USB cable."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Disabling tethering will prevent linked devices from accessing the Internet. Continue?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Enabling USB tethering will disconnect previous USB connection."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Insert SIM card and restart device to use tethering."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "To enable this tethering function, connect to a mobile or Wi-Fi network."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Unable to use tethering."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Unable to use tethering in Flight mode. To use tethering, disable Flight mode."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tethering connection timed out"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tethering connection timed out."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobile data is disabled. Enable mobile data and try again."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Connect to mobile network"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Do not show again"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "At least %d characters"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Disable Tethering"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "No name"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Tethering enabled."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Turn Off"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "No network connection"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth visibility has timed out. Your device might not be found"
+msgstr "Bluetooth visibility has timed out. Your device might not be found."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Connection timeout."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Enter password of at least 8 characters."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Security type: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Settings"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Tethering consumes more battery power and increases your data usage. The maximum number of tethered devices allowed is %d."
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Tethering enabled."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Wi-Fi network will be disconnected. Tethering consumes more battery power and increases your data usage. The maximum number of tethered devices allowed is %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Enable"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Connected device will be disconnected"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Data usage limit reached"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Connected devices: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Flight mode"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Device names are displayed to distinguish each of the devices available in the nearby devices list, and via Bluetooth, Wi-Fi Direct, and other methods."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "To use tethering, connect to a mobile networks."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Rename"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Connected devices"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM card error occurred"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Unable to use packet data service. Out of coverage."
 
diff --git a/po/en_PH.po b/po/en_PH.po
index 831251f..82ace92 100644..100755
--- a/po/en_PH.po
+++ b/po/en_PH.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "This password is only for Wi-Fi tethering"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi tethering hidden"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi tethering"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Turning on Wi-Fi will disable Mobile Hotspot. Continue?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi tethering settings"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Data usage"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Received:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Sent:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Do not show again."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Device name"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Turning on Wi-Fi will disable Wi-Fi tethering."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Password"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximum number of characters %d reached."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Device name can be changed in %s"
+msgid "IDS_COM_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Hide my device"
+msgid "IDS_BR_SK_YES"
+msgstr "Yes"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Data usage"
+msgid "IDS_BR_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB tethering"
+msgid "IDS_BR_SK_DONE"
+msgstr "Done"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Disabling tethering will prevent linked devices from accessing the Internet. Continue?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Insert SIM card and restart device to use tethering"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Unable to use Bluetooth tethering while connected to Wi-Fi network."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Unable to use tethering"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Rename device"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Unable to use tethering in Flight mode. To use tethering, disable Flight mode"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "My device name"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "About phone"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Enter password"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Connected device"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "DONE"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CANCEL"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Yes"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Save"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Settings"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth tethering"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Security"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Connected device"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Data used: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Enter password of at least 8 characters"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Device name"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Enabling USB tethering will disconnect previous USB connection"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Device name can be changed in %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Device name: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Enter at least %d characters."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Hide my device"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Password"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d bytes"
@@ -76,17 +100,11 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Unable to use packet service. Out of coverage"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-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_BODY_SECURITY"
+msgstr "Security"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Device name: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Tap to configure tethering."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Tethering active"
@@ -94,36 +112,159 @@ msgstr "Tethering active"
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "Tethering is currently being controlled by another application. In order to configure tethering, another application will be disabled."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Security type: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "This password is only for Wi-Fi tethering."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "To use tethering, connect to a mobile networks"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi tethering hidden."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Connection time-out"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Connect to mobile network"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Data used: %s"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Connect USB cable"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Tap to configure tethering"
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Disable Flight mode"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Insert SIM card"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Tethering failed"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Unable to use tethering"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi tethering settings"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Connected devices: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Connected device will be disconnected."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Connect USB cable."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Disabling tethering will prevent linked devices from accessing the Internet. Continue?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Enabling USB tethering will disconnect previous USB connection."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Insert SIM card and restart device to use tethering."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "To enable this tethering function, connect to a mobile or Wi-Fi network"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Unable to use tethering."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Unable to use tethering in Flight mode. To use tethering, disable Flight mode"
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tethering connection timed out"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tethering connection timed out."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobile data is disabled. Enable mobile data and try again"
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Connect to mobile network"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Do not show again"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "At least %d characters"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Disable Tethering"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "No name"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Tethering enabled."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Turn Off"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "No network connection"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth visibility has timed out. Your device might not be found"
+msgstr "Bluetooth visibility has timed out. Your device might not be found."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Connection time-out."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Enter password of at least 8 characters."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Security type: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Settings"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Tethering consumes more battery power and increases your data usage. The maximum number of tethered devices allowed is %d."
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Tethering enabled."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Wi-Fi network will be disconnected. Tethering consumes more battery power and increases your data usage. The maximum number of tethered devices allowed is %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Enable"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Connected device will be disconnected"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Data usage limit reached"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Connected devices: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Flight mode"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Device names are displayed to distinguish each of the devices available in the nearby devices list, and via Bluetooth, Wi-Fi Direct, and other methods."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "To use tethering, connect to a mobile networks."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Rename"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Connected devices"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM card error occurred"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Unable to use packet service. Out of coverage."
 
diff --git a/po/en_US.po b/po/en_US.po
index 46702b1..25dab68 100644..100755
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "This password is only for Wi-Fi tethering"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi tethering hidden"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi tethering"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Turning on Wi-Fi will turn off Mobile Hotspot. Continue?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi tethering settings"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Data usage"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Received:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Sent:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Do not show again"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Device name"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Turning on Wi-Fi will turn off Wi-Fi tethering."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Password"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximum number of characters %d reached."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Device name can be changed in %s"
+msgid "IDS_COM_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Hide my device"
+msgid "IDS_BR_SK_YES"
+msgstr "Yes"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Data usage"
+msgid "IDS_BR_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB tethering"
+msgid "IDS_BR_SK_DONE"
+msgstr "Done"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Disabling tethering will prevent linked devices from accessing the Internet. Continue?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Insert SIM card and restart device to use tethering"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Unable to use Bluetooth tethering while connected to Wi-Fi network."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Unable to use tethering"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Rename device"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Unable to use tethering in Flight mode. To use tethering, disable Flight mode."
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "My device name"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "About phone"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Enter password"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Connected device"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "DONE"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CANCEL"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Yes"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Save"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Settings"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth tethering"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Security"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Connected device"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Data used: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Enter password of at least 8 characters"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Device name"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Enabling USB tethering will disconnect previous USB connection"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Device name can be changed in %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Device name: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Enter at least %d characters."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Hide my device"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Password"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Bytes"
@@ -76,17 +100,11 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Unable to use packet service. Out of coverage."
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-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_BODY_SECURITY"
+msgstr "Security"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Device name: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Tap to configure tethering."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Tethering active"
@@ -94,36 +112,159 @@ msgstr "Tethering active"
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "Tethering is currently being controlled by another application. To configure tethering, that application will be turned off."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Security type: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "This password is only for Wi-Fi tethering."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "To use tethering, connect to a mobile network"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi tethering hidden."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Connection timeout"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Connect to mobile network"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Data used: %s"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Connect USB cable"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Tap to configure tethering"
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Turn off Airplane mode"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Insert SIM card"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Tethering failed"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Unable to use tethering"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi tethering settings"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Connected devices: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Connected device will be disconnected."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Connect USB cable."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Disabling tethering will prevent linked devices from accessing the Internet. Continue?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Enabling USB tethering will disconnect previous USB connection."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Insert SIM card and restart device to use tethering."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "To turn on this tethering function, connect to a mobile or Wi-Fi network."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Unable to use tethering."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Unable to use tethering in Airplane mode. To use tethering, turn off Airplane mode."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tethering connection timed out"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tethering connection timed out."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobile data is turned off. Turn on mobile data and try again."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Connect to mobile network"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Do not show again"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "At least %d characters"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Turn off Tethering"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "No name"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Tethering enabled."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Turn Off"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "No network connection"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
 msgstr "Bluetooth visibility has timed out. Your device might not be found."
 
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Connection timeout."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Enter password of at least 8 characters."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Security type: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Settings"
+
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Tethering consumes more battery power and increases your data usage. The maximum number of tethered devices allowed is %d."
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Tethering enabled."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Wi-Fi network will be disconnected. Tethering consumes more battery power and increases your data usage. The maximum number of tethered devices allowed is %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Enable"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Connected device will be disconnected"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Data usage limit reached"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Connected devices: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Airplane mode"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Device names are displayed to distinguish each of the devices available in the nearby devices list, and via Bluetooth, Wi-Fi Direct, and other methods."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "To use tethering, connect to a mobile network."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Rename"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Connected devices"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM card error occurred"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Unable to use packet service. Out of coverage."
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 53ef0c8..cd902b9 100644..100755
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Esta contraseña es solo para el anclaje a red Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Anclaje a red Wi-Fi oculto"
+msgid "IDS_COM_SK_OK"
+msgstr "Aceptar"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Anclaje a red Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Si activa Wi-Fi, se desactivará Mobile Hotspot. ¿Continuar?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Ajustes anclaje red Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Uso de datos"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Recibido:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Módem USB"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Enviado:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "No mostrar de nuevo"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nombre del dispositivo"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Si activa la red Wi-Fi, se desactivará la Zona Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Contraseña"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Se ha alcanzado el número máximo de caracteres %d."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "El nombre del dispositivo se puede cambiar en %s"
+msgid "IDS_COM_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "No mostrar mi dispositivo"
+msgid "IDS_BR_SK_YES"
+msgstr "Sí"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Uso de datos"
+msgid "IDS_BR_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Módem USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Finalizado"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Si desactiva el anclaje a red, impedirá que los dispositivos vinculados accedan a Internet. ¿Continuar?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Introduzca la tarjeta SIM y reinicie el dispositivo para utilizar anclaje a red"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "No se puede utilizar el módem Bluetooth mientras está conectado a una red Wi-Fi"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "No se puede usar anclaje a red"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Cambiar nombre"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "No se puede usar anclaje a red en modo Avión. Para usar anclaje a red, desactive el modo Avión"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nombre de mi dispositivo"
+
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Introducir contraseña"
+
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "FINALIZADO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CANCELAR"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Acerca del teléfono"
+msgid "IDS_COM_SK_YES"
+msgstr "Sí"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Guardar"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Ajustes"
+
+msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
+msgstr "Módem Bluetooth"
 
 msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
 msgstr "Dispositivo conectado"
 
-msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
-msgstr "Modem por bluetooth"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Datos usados: %s"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Seguridad"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nombre del dispositivo"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Módem USB"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "El nombre del dispositivo se puede cambiar en %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Introduzca una contraseña de 8 caracteres como mínimo"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nombre del dispositivo: %s"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Si permite el módem USB, se desconectará la conexión USB previa"
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Introduzca al menos %d caracteres"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "No mostrar mi dispositivo"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Contraseña"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Bytes"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "No se puede usar servicio de paquetes. Fuera de cobertura"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Seguridad"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Pulse para configurar el módem USB/Bluetooth"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Aclaje activo"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Otra aplicación está controlando actualmente el módem USB/Bluetooth. Para configurarlo, se desactivará esa aplicación."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Esta contraseña es solo para la Zona Wi-Fi"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Zona Wi-Fi oculta"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Conectarse a red móvil"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Conectar cable USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Desactivar modo Avión"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Insertar tarjeta SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Error de módem USB/Bluetooth"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "No disp. módem USB/Bluetooth"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Módem USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Zona Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Ajustes anclaje red Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Dispositivos conectados: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Se desconectará del dispositivo conectado"
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
 msgstr "Conectar el cable USB"
 
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Si desactiva el módem USB/Bluetooth, impedirá que los dispositivos vinculados accedan a Internet. ¿Continuar?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Si permite el módem USB, se desconectará la conexión USB previa"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Introduzca la tarjeta SIM y reinicie el dispositivo para utilizar módem USB/Bluetooth"
+
 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_BODY_DEVICE_NAME_C_PS"
-msgstr "Nombre del dispositivo: %s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "módem USB/Bluetooth consume mucha batería y aumenta el uso de datos"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Aclaje activo"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Para activar esta función de módem USB/Bluetooth, conéctese a una red móvil o Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Otra aplicación está controlando actualmente el anclaje a red. Para configurarlo, se desactivará esa aplicación"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "No se puede usar módem USB/Bluetooth"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Tipo de seguridad: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "No se puede usar módem USB/Bluetooth en modo Avión. Para usar anclaje a red, desactive el modo Avión."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Para usar anclaje a red, conecte a redes móviles"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tiem espera anclaje red agotado"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Tiempo de espera de conexión"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "El tiempo espera de módem USB/Bluetooth se ha agotado."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Datos usados: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Los datos móviles están desactivados. Actívelos e inténtelo de nuevo."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Pulse para configurar el anclaje a red"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Conectarse a red móvil"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "No volver a mostrar"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Aceptar"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Al menos %d caracteres"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Desactivar módem USB/Bluetooth"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Sin nombre"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Conexión a red habilitada"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Apagar"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "No hay conexión de red"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
 msgstr "Ha caducado la visibilidad Bluetooth. No se puede encontrar su dispositivo"
 
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Tiempo de espera de conexión"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Introduzca una contraseña de 8 caracteres como mínimo"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Tipo de seguridad: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Ajustes"
+
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "El anclaje a red consume más batería y aumenta el uso de datos. El número máximo de dispositivos anclados es %d"
+msgstr "módem USB/Bluetooth consume más batería y aumenta el uso de datos. El número máximo de dispositivos anclados es %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Conexión a red habilitada"
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Se desconectará la red Wi-Fi. El anclaje a red consume más batería y aumenta el uso de datos. El número máximo de dispositivos anclados es %d"
+msgstr "Se desconectará la red Wi-Fi. módem USB/Bluetooth consume más batería y aumenta el uso de datos. El número máximo de dispositivos anclados es %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Habilitar"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Se desconectará del dispositivo conectado"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Lím uso datos alcanzado"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Dispositivos conectados: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Modo Avión"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Los nombres de dispositivo se muestran para diferenciar cada uno de los dispositivos disponibles en la lista de dispositivos cercanos y mediante Bluetooth, Wi-Fi Direct y otros métodos."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Para usar módem USB/Bluetooth, conecte a redes móviles"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Camb. nom"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Dispositivos conectados"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Error en la tarjeta SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "No se puede usar servicio de paquetes. Fuera de cobertura."
 
diff --git a/po/es_MX.po b/po/es_MX.po
deleted file mode 100644
index 80ed6ac..0000000
--- a/po/es_MX.po
+++ /dev/null
@@ -1,129 +0,0 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Esta contraseña es solo para anclaje a red de Wi-Fi"
-
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Anclaje a red de Wi-Fi oculta"
-
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Anclaje a red de Wi-Fi"
-
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Con. anclaje a red Wi-Fi"
-
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Recibido:"
-
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Enviado:"
-
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nombre del dispositivo"
-
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Contraseña"
-
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "El nombre del dispositivo puede cambiarse en %s"
-
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Ocultar mi dispositivo"
-
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Uso de datos"
-
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Anclaje a red USB"
-
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Desactivar la redirección evitará que los dispositivos vinculados accedan a Internet. ¿Continuar?"
-
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Inserte tarjeta SIM y reinicie el dispositivo para usar anclaje a red"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "No se puede usar redirección"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "No se puede usar anclaje a red en el perfil Fuera de línea. Para usar anclaje a red desactive el perfil Fuera de línea"
-
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Acerca del teléfono"
-
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Dispositivo conectado"
-
-msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
-msgstr "Conexión a red Bluetooth"
-
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Seguridad"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Anclaje a red"
-
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Introducir una contraseña de 8 caracteres como mínimo"
-
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "La activación de anclaje a red de USB desconectará la conexión USB anterior"
-
-msgid "IDS_MOBILEAP_BODY_PD_BYTES"
-msgstr "%d Bytes"
-
-msgid "IDS_MOBILEAP_BODY_PD_KB"
-msgstr "%d KB"
-
-msgid "IDS_MOBILEAP_BODY_PD_MB"
-msgstr "%d MB"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "No se puede usar servicio de paquetes. Fuera de cobertura."
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-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_BODY_DEVICE_NAME_C_PS"
-msgstr "Nombre del dispositivo: %s"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Anclaje a red act."
-
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "El anclaje a red está siendo controlada por otra aplicación. Para configurar el anclaje a red, se desactivará esa aplicación"
-
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Tipo de seguridad: %s"
-
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Para usar el anclaje a red, conéctese a red móvil"
-
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Tiempo de inactividad de conexión"
-
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Uso de datos: %s"
-
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Pulse para configurar el anclaje a red"
-
-msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Expiró la visibilidad de Bluetooth. Puede que su dispositivo no se encuentre"
-
-msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "La redirección consume más batería y aumenta el uso de datos.El número máximo de dispositivos redireccionados permitidos es %d"
-
-msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Se desconectará la red Wi-Fi. La redirección consume más batería y aumenta el uso de datos. El número máximo de dispositivos redireccionados permitidos es %d"
-
-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"
-
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Dispositivos conectados: %d"
-
diff --git a/po/es_US.po b/po/es_US.po
new file mode 100755
index 0000000..ecb78d7
--- /dev/null
+++ b/po/es_US.po
@@ -0,0 +1,270 @@
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_COM_SK_OK"
+msgstr "Aceptar"
+
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "La activación de Wi-Fi desactivará la Mobile Hotspot. ¿Continuar?"
+
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Uso de datos"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Anclaje a red"
+
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "No volver a mostrar"
+
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "La activación de Wi-Fi desactivará el anclaje a red Wi-Fi."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Se alcanzó el número máximo de caracteres (%d)."
+
+msgid "IDS_COM_SK_NO"
+msgstr "No"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Sí"
+
+msgid "IDS_BR_SK_NO"
+msgstr "No"
+
+msgid "IDS_BR_SK_DONE"
+msgstr "Realizado"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "No es posible usar el anclaje a red vía Bluetooth al estar conectado a una red Wi-Fi."
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Renombrar dispositivo"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nombre del dispositivo"
+
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Introducir contraseña."
+
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "REALIZADO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CANCELAR"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Sí"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Guardar"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Ajustes"
+
+msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
+msgstr "Anclaje a red Bluetooth"
+
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Dispositivo conectado"
+
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Uso de datos: %s"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nombre del dispositivo"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "El nombre del dispositivo puede cambiarse en %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nombre del dispositivo: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Introducir al menos %d caracteres."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Ocultar mi dispositivo"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Contraseña"
+
+msgid "IDS_MOBILEAP_BODY_PD_BYTES"
+msgstr "%d Bytes"
+
+msgid "IDS_MOBILEAP_BODY_PD_KB"
+msgstr "%d KB"
+
+msgid "IDS_MOBILEAP_BODY_PD_MB"
+msgstr "%d MB"
+
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Seguridad"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Pulse para configurar el anclaje a red."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Anclaje a red act."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "El anclaje a red está siendo controlada por otra aplicación. Para configurar el anclaje a red, se desactivará esa aplicación."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Esta contraseña es solo para anclaje a red de Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Anclaje a red de Wi-Fi oculta."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Conectar a red móvil"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Conectar cable USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Desact. perfil Fuera de línea"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Inserte la tarjeta SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Error de anclaje a red"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "No es pos. usar el ancl. a red"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Anclaje a red USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Anclaje a red de Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Con. anclaje a red Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Dispositivos conectados: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Se desconectará el dispositivo conectado."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Conectar cable USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Desactivar la redirección evitará que los dispositivos vinculados accedan a Internet. ¿Continuar?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "La activación de anclaje a red de USB desactivará la conexión USB anterior."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Inserte tarjeta SIM y reinicie el dispositivo para usar anclaje a red."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Para activar esta función de anclaje a red, conéctese a una red móvil o Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "No es posible usar redirección."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "No se puede usar anclaje a red en perfil Fuera de línea. Para usar anclaje a red desactive el perfil Fuera de línea."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Conex. de anclaje a red caduc."
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Ha caducado la conexión de anclaje a red."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Dato móviles desactivados. Active los datos móviles e inténtelo de nuevo."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Conectar a red móvil"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "No volver a mostrar"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Aceptar"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Al menos %d caracteres"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Desactivar anclaje a red"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Sin nombre"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Conexión a red activada."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Apagar"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Sin conexión de red"
+
+msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
+msgstr "Caducó la visibilidad Bluetooth. Es posible que su dispositivo no sea encontrado."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Tiempo de inactividad de conexión."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "No volver a mostrar"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Introducir una contraseña de 8 caracteres como mínimo."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Tipo de seguridad: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Ajustes"
+
+msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
+msgstr "El anclaje consume más batería y aumenta el uso de datos. El número máximo de dispositivos anclados permitidos es %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Conexión a red activada."
+
+msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
+msgstr "Se desconectará la red Wi-Fi. El anclaje consume más batería y aumenta el uso de datos. El número máximo de dispositivos anclados permitidos es %d."
+
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Activado"
+
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Se alc. lím. de uso de datos"
+
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Perfil Fuera de línea"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Los nombres de dispositivo se muestran para diferenciar cada uno de los dispositivos disponibles en la lista de dispositivos cercanos y vía Bluetooth, Wi-Fi Directo y otros métodos."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Para usar el anclaje a red, conéctese a red móvil."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Renombrar"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Dispositivos conectados"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Ocurrió un error con tarj. SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "No se puede usar servicio de paquetes. Fuera de cobertura."
+
diff --git a/po/et.po b/po/et.po
index 30f6af5..c4ece9c 100644..100755
--- a/po/et.po
+++ b/po/et.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "See parool on ainult Wi-Fi kaudu vahendamise jaoks"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Tühista"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi kaudu vahendamine on peidetud"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi kaudu vahendamine"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fi sisselülitamine desaktiveerib mobiilse kuumkoha. Kas jätkata?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi-vahendamise seaded"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Andmekasutus"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Vastuvõetud:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Mobiilse internetiga ühendamine"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Saadetud:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ära näita uuesti"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Seadme nimi"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi sisselulitamine desaktiveerib Wi-Fi modemi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Parool"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maksimaalne tähemärkide arv (%d) on saavutatud"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Seadme nime saab muuta menüüs %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Ei"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Peida minu seade"
+msgid "IDS_BR_SK_YES"
+msgstr "Jah"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Andmekasutus"
+msgid "IDS_BR_SK_NO"
+msgstr "Ei"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-modem"
+msgid "IDS_BR_SK_DONE"
+msgstr "Valmis"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Vahendamise keelamine takistab lingitud seadmetel Internetile juurdepääsu. Kas jätkata?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Tühista"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Vahendamiseks sisestage SIM-kaart ja taaskäivitage seade"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Bluetooth-modemit ei saa kasutada, kui olete ühendatud Wi-Fi võrguga."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Vahendamist ei saa kasutada"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Nimeta seade ümber"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Modemit ei saa lennurežiimis kasutada. Modemi kasutamiseks desaktiveerige lennurežiim"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Minu seadme nimi"
+
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Sisestage parool."
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Teave telefoni kohta"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "VALMIS"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "TÜHISTA"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Jah"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Salvesta"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Seaded"
+
+msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
+msgstr "Bluetooth-jagamine"
 
 msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
 msgstr "Ühendatud seade"
 
-msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
-msgstr "Bluetooth-modem"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Kasutatud andmed: %s"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Turvalisus"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Seadme nimi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Mobiilse internetiga ühendamine"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Seadme nime saab muuta menuus %s."
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Sisestage vähemalt 8 tähemärgi pikkune parool"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Seadme nimi: %s"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB-modemi aktiveerimisel katkestatakse eelmine USB-ühendus"
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Sisestage vahemalt %d tahemarki."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Peida minu seade"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Parool"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d baiti"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Pakettandmeside teenust ei saa kasutada. Levialast väljas"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Turvalisus"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Toksake, et konfigureerida modemit."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Modem aktiivne"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Modemit juhib hetkel teine rakendus. Modemi konfigureerimiseks desaktiveeritakse see rakendus."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "See parool on ainult Wi-Fi kaudu vahendamise jaoks."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi kaudu vahendamine on peidetud."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Loo ühendus mobiilsidevõrguga"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Ühendage USB-kaabel"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Desaktiveeri lennurežiim"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Paigaldage SIM-kaart"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Modemiühendus nurjus"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Modemit ei saa kasutada"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-modem"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi kaudu vahendamine"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi-vahendamise seaded"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Ühendatud seadmed: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Uhendatud seadme uhendus katkestatakse."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Ühenda USB-kaabel"
+msgstr "Uhenda USB-kaabel."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Vahendamise keelamine takistab lingitud seadmetel Internetile juurdepääsu. Kas jätkata?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB-modemi aktiveerimisel katkestatakse eelmine USB-uhendus."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Vahendamiseks sisestage SIM-kaart ja taaskaivitage seade."
 
 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"
+msgstr "Parool peab sisaldama vahemalt %d tahemarki, kuid ei tohi olla pikem kui %d tahemarki."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Seadme nimi: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Modem aktiivne"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Selle modemifunktsiooni aktiveerimiseks looge ühendus mobiilside- või Wi-Fi võrguga"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Modemit juhib hetkel teine rakendus. Modemi konfigureerimiseks desaktiveeritakse see rakendus"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Vahendamist ei saa kasutada."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Turvalisuse tüüp: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Modemit ei saa lennurežiimis kasutada. Modemi kasutamiseks desaktiveerige lennurežiim."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Modemi kasutamiseks looge ühendus mobiilsidevõrkudega"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Modemiühendus on aegunud"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Ühenduse ajalõpp"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Modemiühendus on aegunud."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Kasutatud andmed: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobiilne andmeside on desaktiveeritud. Aktiveerige mobiilne andmeside ja proovige uuesti."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Toksake, et konfigureerida modemit"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Loo ühendus mob.võrguga"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ära enam kuva"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Vähemalt %d tähemärki"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Desaktiveeri modem"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Nimi puudub"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Modem aktiveeritud."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Lülita välja"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Võrguühendus puudub"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth-ühenduse nähtavus on aegunud. Teie seade ei pruugi olla leitav"
+msgstr "Bluetooth-uhenduse nahtavus on aegunud. Teie seade ei pruugi olla leitav."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Ühenduse ajalõpp."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Sisestage vahemalt 8 tahemargi pikkune parool."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Turvalisuse tüüp: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Seaded"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Modemi kasutamine tarbib rohkem akutoidet ja suurendab andmekasutust. Maksimaalne lubatud modemiseadmete arv on %d"
+msgstr "Modemi kasutamine tarbib rohkem akutoidet ja suurendab andmekasutust. Maksimaalne lubatud modemiseadmete arv on %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Modem aktiveeritud."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi-võrgu ühendus katkestatakse. Modemi kasutamine tarbib rohkem akutoidet ja suurendab andmekasutust. Maksimaalne lubatud modemiseadmete arv on %d"
+msgstr "Wi-Fi-võrgu ühendus katkestatakse. Modemi kasutamine tarbib rohkem akutoidet ja suurendab andmekasutust. Maksimaalne lubatud modemiseadmete arv on %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Luba"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Ühendatud seadme ühendus katkestatakse"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "And.kas. piir. saavutatud"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Ühendatud seadmed: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Lennurežiim"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Seadmete nimed kuvatakse selleks, et eristada iga lähedalasuva seadme loendis ja Bluetoothi, Wi-Fi Directi ja muude meetodite kaudu saadaolevat seadet."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Modemi kasutamiseks looge uhendus mobiilsidevorkudega."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Nim. ümb."
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Ühendatud seadmed"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Ilmnes SIM-kaardi tõrge"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Pakettandmeside teenust ei saa kasutada. Levialast valjas."
 
diff --git a/po/eu.po b/po/eu.po
index 63ba312..c0f9860 100644..100755
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Pasahitz hau Wi-Fi ainguraketarako bakarrik da"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Ezeztatu"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi ainguraketa ezkutatuta"
+msgid "IDS_COM_SK_OK"
+msgstr "Ados"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi ainguraketa"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fi pizteak Mobile Hotspot ezgaituko du. Jarraitu?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi aingur. ezarpenak"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Datuen erabilera"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Jasoa:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Sare ainguraketa"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Bidalia:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ez erakutsi berriro"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Gailuaren izena"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi piztuz gero Wi-Fi ainguraketa ezgaituko du"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Pasahitza"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "%d gehienezko karaktere kopurura iritsi zara."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Gailuaren izen alda daiteke %s-(a)n"
+msgid "IDS_COM_SK_NO"
+msgstr "Ez"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Ezkutatu nire gailua"
+msgid "IDS_BR_SK_YES"
+msgstr "Bai"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Datuen erabilera"
+msgid "IDS_BR_SK_NO"
+msgstr "Ez"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB ainguraketa"
+msgid "IDS_BR_SK_DONE"
+msgstr "Amaituta"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Ainguraketa ezgaitzean horri lotutako gailuak ezingo dira Internetera sartu. Jarraitu?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Ezeztatu"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Sartu SIM txartela eta berrabiarazi gailua ainguraketa erabiltzeko"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Ezin da Bluetooth ainguraketa erabili Wi-Fi konektatuta bazaude"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Ezin izan da ainguraketa erabili"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Berrizendatu gailua"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Ezin da tethering erabili hegaldi moduan. Tethering erabiltzeko, desgaitu hegaldi modua"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nire gailuaren izena"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Telefonoari buruz"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Pasahitza idatzi"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Konektatutako gailua"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "EGINA"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "UTZI"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Bai"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Gorde"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Ezarpenak"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth ainguraketa"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Segurtasuna"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Konektatutako gailua"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Sare ainguraketa"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Erabilitako datuak: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Idatzi gutxienez 8 karaktereko pasahitza"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Gailuaren izena"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB ainguraketa gaitzeak lehenagoko USB konexioak deskonektatuko ditu"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Gailuaren izen alda daiteke %s-(a)n"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Gailuaren izena: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Adierazi gutxienez %d karaktere"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Ezkutatu nire gailua"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Pasahitza"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Byte"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Ezin da pakete zerbitzua erabili. Ez dago estaldurarik"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Segurtasuna"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Ukitu ainguraketa konfiguratzeko"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Aingurak. aktibo"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Beste aplikazio batek ainguraketa kontrolatzen du orain. Ainguraketa konfiguratzeko, aplikazio hori ezgaituko da."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Pasahitz hau Wi-Fi ainguraketarako bakarrik da"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi ainguraketa ezkutatuta"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Konektatu sare mugikorrera"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Konektatu USB kablea"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Ezgaitu Hegaldi modua"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Sartu SIM txartela"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Ainguraketak huts egin du"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Ezin izan da aingurak. erabili"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB ainguraketa"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi ainguraketa"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi aingur. ezarpenak"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Konektatutako gailuak: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Konektatutako gailua deskonektatuko da"
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
 msgstr "USB kablea konektatu"
 
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Ainguraketa ezgaitzean horri lotutako gailuak ezingo dira Internetera sartu. Jarraitu?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB ainguraketa gaitzeak lehenagoko USB konexioak deskonektatuko ditu"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Sartu SIM txartela eta berrabiarazi gailua ainguraketa erabiltzeko"
+
 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_BODY_DEVICE_NAME_C_PS"
-msgstr "Gailuaren izena: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Aingurak. aktibo"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Ainguraketa funtzio hau gaitzeko, konektatu mugikor edo Wi-Fi sare batera"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Beste aplikazio batek ainguraketa kontrolatzen du orain. Ainguraketa konfiguratzeko, aplikazio hori ezgaituko da"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Ezin izan da ainguraketa erabili"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Segurtasuna mota: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Ezin da tethering erabili hegaldi moduan. Tethering erabiltzeko, desgaitu hegaldi modua."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Ainguraketa erabiltzeko, konektatu sare mugikorrak"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Ainguraketa konexioa iraungita"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Konexio denbora igaro da"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Ainguraketa konexioa iraungi da."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Erabilitako datuak: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Datu mugikorrak desgaituta daude. Gaitu datu mugikorrak eta saiatu berriro."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Ukitu ainguraketa konfiguratzeko"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Konektatu sare mugikorrera"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ez erakutsi berriz"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Ados"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Gutxienez %d karaktere"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Ezgaitu ainguraketa"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Izenik gabe"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Ainguraketa gaituta"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Itzali"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Sare konexiorik ez"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
 msgstr "Bluetooth-en ikusgaitasuna denboraz kanpo dago. Baliteke besteek zure gailua ez aurkitzea"
 
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Konexio denbora igaro da"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Idatzi gutxienez 8 karaktereko pasahitza"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Segurtasuna mota: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Ezarpenak"
+
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Ainguraketak bateria gehiago kontsumitzen du eta zure datuen erabilera areagotzen du. Ainguratutako gehieneko gailu kopurua %d da"
+msgstr "Ainguraketak bateria gehiago kontsumitzen du eta zure datuen erabilera areagotzen du. Ainguratutako gehieneko gailu kopurua %d da."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Ainguraketa gaituta"
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi sarea deskonektatuko da. Ainguraketak bateria gehiago kontsumitzen du eta zure datuen erabilera areagotzen du. Ainguratutako gehieneko gailu kopurua %d da"
+msgstr "Wi-Fi sarea deskonektatuko da. Ainguraketak bateria gehiago kontsumitzen du eta zure datuen erabilera areagotzen du. Ainguratutako gehieneko gailu kopurua %d da."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Gaitu"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Konektatutako gailua deskonektatuko da"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Datu er. mugara helduta"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Konektatutako gailuak: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Hegal. mod."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Gertuko gailuen zerrendan eta Bluetooth, Wi-Fi Direct eta beste metodo batzuen bidez erabilgarri dauden gailuen izenak erakusten dira."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Ainguraketa erabiltzeko, konektatu sare mugikorrak"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Berrizendatu"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Konektatutako gailuak"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM txartel errorea gertatu da"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Ezin da pakete zerbitzua erabili. Ez dago estaldurarik."
 
diff --git a/po/fi.po b/po/fi.po
index b651b4d..b503f11 100644..100755
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Tämä salasana on tarkoitettu vain Wi-Fi-yhteyden jakamista varten"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Peruuta"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi-yhteyden jakaminen piilotettu"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi-yhteyden jakaminen"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Jos otat Wi-Fi-yhteyden käyttöön, mobiilitukiasema poistetaan käytöstä. Jatketaanko?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi-yht. jaon asetukset"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Datan käyttö"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Vastaanotettu:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Yhteyden jako"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Lähetetty:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Älä näytä uudestaan"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Laitteen nimi"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi-yhteyden ottaminen käyttöön poistaa Wi-Fi-yhteyden jakamisen käytöstä."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Salasana"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Merkkien enimmäismäärä %d on saavutettu."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Laitteen nimi voidaan muuttaa kohdassa %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Ei"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Piilota oma laite"
+msgid "IDS_BR_SK_YES"
+msgstr "Kyllä"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Datan käyttö"
+msgid "IDS_BR_SK_NO"
+msgstr "Ei"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-yhteys"
+msgid "IDS_BR_SK_DONE"
+msgstr "Valmis"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Yhteyden jakamisen lopettaminen estää yhdistettyjä laitteita muodostamasta Internet-yhteyttä. Jatketaanko?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Peruuta"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Aseta SIM-kortti ja käynnistä laite uudelleen yhteyden jakamista varten"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Bluetooth-yhteyttä ei voi käyttää, kun Wi-Fi-verkkoyhteys on muodostettu."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Yhteyttä ei voi jakaa"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Nimeä laite uudelleen"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Yhteyttä ei voi jakaa lentotilassa. Jos haluat jakaa yhteyden, poista lentotila käytöstä"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Oman laitteen nimi"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Tietoja puhelimesta"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Kirjoita salasana."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Yhdistetty laite"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "VALMIS"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "PERUUTA"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Kyllä"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Tallenna"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Asetukset"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth-liitos"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Turvallisuus"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Yhdistetty laite"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Yhteyden jako"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Käyttöpäivä: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Anna vähintään 8 merkkiä pitkä salasana"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Laitteen nimi"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB-yhteyden ottaminen käyttöön poistaa edellisen USB-yhteyden käytöstä"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Laitteen nimi voidaan muuttaa kohdassa %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Laitteen nimi: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Anna vähintään %d merkkiä."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Piilota oma laite"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Salasana"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d tavua"
@@ -76,54 +100,171 @@ msgstr "%d kt"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d Mt"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Pakettipalvelua ei voi käyttää. Peittoalueen ulkopuolella"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Turvallisuus"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Määritä yhteys napauttamalla."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Yhteyden jak. k."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Yhteyttä hallitaan tällä hetkellä toisella sovelluksella. Sovellus on yhteyden määrittämiseksi poistettava käytöstä."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Tämä salasana on tarkoitettu vain Wi-Fi-yhteyden jakamista varten."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi-yhteyden jakaminen piilotettu."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Yhdistä matkapuhelinverkkoon"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Kytke USB-kaapeli"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Poista lentotila käytöstä"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Aseta SIM-kortti"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Yhteyden jako epäonnistui"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Yhteyttä ei voi jakaa"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-yhteys"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi-yhteyden jakaminen"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi-yht. jaon asetukset"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Yhdistetyt laitteet: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Yhdistetyn laitteen yhteys katkaistaan."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Liitä USB-kaapeli"
+msgstr "Liitä USB-kaapeli."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Yhteyden jakamisen lopettaminen estää yhdistettyjä laitteita muodostamasta Internet-yhteyttä. Jatketaanko?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB-yhteyden ottaminen käyttöön poistaa edellisen USB-yhteyden käytöstä."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Aseta SIM-kortti ja käynnistä laite uudelleen yhteyden jakamista varten."
 
 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ä"
+msgstr "Salasanassa on oltava ainakin %d merkkiä eikä se saa olla yli %d merkkiä pitkä."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Laitteen nimi: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Yhteyden jak. k."
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Voit ottaa tämän yhteyden jakamistoiminnon käyttöön muodostamalla yhteyden matkapuhelin- tai Wi-Fi-verkkoon."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Yhteyttä hallitaan tällä hetkellä toisella sovelluksella. Sovellus on yhteyden määrittämiseksi poistettava käytöstä"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Yhteyttä ei voi jakaa."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Suojaustyyppi: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Yhteyttä ei voi jakaa lentotilassa. Jos haluat jakaa yhteyden, poista lentotila käytöstä."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Jos haluat käyttää yhteyttä, muodosta yhteys mobiiliverkkoihin"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Jaettu yhteys aikakatkaistu"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Jaettu yhteys aikakatkaistu."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobiilidata on poistettu käytöstä. Ota mobiilidata käyttöön ja yritä uudelleen."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Yhdistä matkapuh.verkkoon"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Älä näytä uudelleen"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Vähintään %d merkkiä"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Poista yhteyden jako käytöstä"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Ei nimeä"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Internet-yhteyden jako käytössä."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Poista käytöstä"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Ei verkkoyhteyttä"
+
+msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
+msgstr "Bluetooth-näkyvyys on aikakatkaistu. Laitetta ei ehkä löydy."
 
 msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
 msgstr "Yhteyden aikakatkaisu"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Käyttöpäivä: %s"
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Määritä yhteys napauttamalla"
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Anna vähintään 8 merkkiä pitkä salasana."
 
-msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth-näkyvyys on aikakatkaistu. Laitetta ei ehkä löydy"
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Suojaustyyppi: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Asetukset"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Yhdistäminen kuluttaa enemmän virtaa ja lisää datan käyttöä. Yhdistettyjen laitteiden suurin sallittu määrä on %d"
+msgstr "Yhdistäminen kuluttaa enemmän virtaa ja lisää datan käyttöä. Yhdistettyjen laitteiden suurin sallittu määrä on %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Internet-yhteyden jako käytössä."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi-verkkoyhteys katkaistaan. Yhdistäminen kuluttaa enemmän virtaa ja lisää datan käyttöä. Yhdistettyjen laitteiden suurin sallittu määrä on %d"
+msgstr "Wi-Fi-verkkoyhteys katkaistaan. Yhdistäminen kuluttaa enemmän virtaa ja lisää datan käyttöä. Yhdistettyjen laitteiden suurin sallittu määrä on %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Päälle"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Yhdistetyn laitteen yhteys katkaistaan"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Datankäyttöraj. saavut."
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Yhdistetyt laitteet: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Lentotila"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Laitteiden nimet näytetään, jotta käytettävissä olevat laitteet voidaan erottaa lähellä olevien laitteiden luettelossa sekä Bluetoothia, Wi-Fi Directia ja muita yhteystapoja käytettäessä."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Jos haluat käyttää yhteyttä, muodosta yhteys mobiiliverkkoihin."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Nim. uud."
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Yhdistetyt laitteet"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM-korttivirhe"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Pakettipalvelua ei voi käyttää. Peittoalueen ulkopuolella."
 
diff --git a/po/fr.po b/po/fr.po
new file mode 100755
index 0000000..4f3bf3f
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,270 @@
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annuler"
+
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
+
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "L'activation du Wi-Fi va désactiver le point d'accès mobile. Continuer ?"
+
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Utilisation des données"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Fonction modem"
+
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ne plus afficher"
+
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "L'activation du Wi-Fi va désactiver le modem Wi-Fi."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Le nombre maximum de caractères (%d) est atteint."
+
+msgid "IDS_COM_SK_NO"
+msgstr "Non"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Oui"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Non"
+
+msgid "IDS_BR_SK_DONE"
+msgstr "Effectué"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annuler"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Impossible d'utiliser le modem Bluetooth si une connexion au réseau Wi-Fi est en cours."
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Renommer le périphérique"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nom de mon périphérique"
+
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Saisir le mot de passe."
+
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "OK"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ANNULER"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Oui"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Sauveg."
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Paramètres"
+
+msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
+msgstr "Modem Bluetooth"
+
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Appareil(s) connecté(s)"
+
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Données utilisées : %s"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nom de l'appareil"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Le nom de l'appareil peut être modifié sous %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nom de l'appareil : %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Entrez au moins %d caractères."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Masquer mon appareil"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Mot de passe"
+
+msgid "IDS_MOBILEAP_BODY_PD_BYTES"
+msgstr "%d octet(s)"
+
+msgid "IDS_MOBILEAP_BODY_PD_KB"
+msgstr "%d ko"
+
+msgid "IDS_MOBILEAP_BODY_PD_MB"
+msgstr "%d Mo"
+
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Sécurité"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Appuyez pour configurer le modem."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Modem actif"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Le modem est actuellement contrôlé par une autre application. Pour configurer le modem, cette application va être désactivée."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Ce mot de passe est uniquement pour le modem Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Modem Wi-Fi masqué"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Connexion au réseau mobile"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Brancher un câble USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Désactiver le mode Hors-ligne"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Insérer la carte SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Échec du modem"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Impossible d'utiliser le modem"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Modem USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Modem Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Paramètres du modem Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Périphériques connectés : %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Le périphérique connecté sera déconnecté."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Connectez le câble USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "La désactivation du modem empêchera les appareils associés d'accéder à Internet. Continuer ?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "L'activation du modem USB va interrompre la connexion USB précédente."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Insérez une carte SIM et redémarrez l'appareil pour utiliser le modem."
+
+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 "L'utilisation du modem sollicite davantage la batterie et augmente l'utilisation des données."
+
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Pour activer la fonction de modem, connectez-vous à un réseau mobile ou Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Impossible d'utiliser le modem."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Impossible d'utiliser le modem en mode Hors-ligne. Pour utiliser le modem, désactivez le mode Hors-ligne."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Connexion au modem expirée"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "La connexion au modem a expiré."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Les données mobiles sont désactivées. Activez les données mobiles et réessayez."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Connexion au réseau mob."
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ne plus afficher"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Au moins %d caractères"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Désactiver le modem"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Aucun nom"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Modem activé"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Désactiver"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Aucune connexion réseau"
+
+msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
+msgstr "La visibilité Bluetooth a expiré. Votre appareil risque de ne pas être détecté."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Connexion expirée"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Ne plus afficher"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Entrez un mot de passe contenant au moins 8 caractères."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Type de sécurité : %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Paramètres"
+
+msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
+msgstr "L'utilisation du modem sollicite davantage la batterie et augmente l'utilisation des données. Le nombre maximum d'appareils connectés est limité à %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Modem activé"
+
+msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
+msgstr "La connexion au réseau Wi-Fi va être interrompue. L'utilisation du modem consomme davantage de batterie et augmente l'utilisation des données. Le nombre maximum d'appareils connectés est limité à %d."
+
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Activer"
+
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Limite données atteinte"
+
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "M. Hs-ligne"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Les noms des appareils sont affichés pour vous permettre de distinguer les appareils disponibles dans la liste des appareils à proximité, ainsi que via Bluetooth, Wi-Fi Direct ou par d'autres méthodes."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Pour utiliser le modem, connectez-vous aux réseaux mobiles."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Renommer"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Périphériques connectés"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Erreur de carte SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Impossible d'utiliser les connexions de données. Hors zone de couverture"
+
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 8571697..d0f1a75 100644..100755
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Ce mot de passe est uniquement pour le modem Wifi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annuler"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Modem Wifi masqué"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Modem Wifi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "L'activation du Wifi va désactiver Point d'accès mobile. Continuer ?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Paramètres du modem Wifi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Utilisation des données"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Reçu :"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Fonction modem"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Envoyé :"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ne plus afficher"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nom de périphérique"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "L'activation du Wifi va désactiver le modem Wifi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Mot de passe"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Le nombre maximum de caractères (%d) est atteint."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Le nom de l'appareil ne peut pas être remplacé par %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Non"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Masquer mon périphérique"
+msgid "IDS_BR_SK_YES"
+msgstr "Oui"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Utilisation des données"
+msgid "IDS_BR_SK_NO"
+msgstr "Non"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Modem USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "La désactivation du modem empêchera les appareils associés d'accéder à Internet. Continuer ?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annuler"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Insérez une carte SIM et redémarrez l'appareil pour utiliser le modem"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Impossible d'utiliser le modem Bluetooth si une connexion au réseau Wifi est en cours."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Impossible d'utiliser le modem"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Renommer l'appareil"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Impossible d'utiliser le modem en mode Hors-ligne. Pour utiliser le modem, désactivez le mode Hors-ligne"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nom de mon périphérique"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "À propos du téléphone"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Saisir le mot de passe."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Périphérique connecté"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "OK"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ANNULER"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Oui"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Sauv."
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Réglages"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Modem Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Sécurité"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Périphérique connecté"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Fonction modem"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Données utilisées : %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Entrez un mot de passe contenant au moins 8 caractères"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nom d'appareil"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "L'activation du modem USB va déconnecter la connexion USB précédente"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Le nom de l'appareil ne peut pas être remplacé par %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nom de l'appareil : %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Entrez au moins %d caractères."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Masquer mon périphérique"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Mot de passe"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d octets"
@@ -76,54 +100,171 @@ msgstr "%d Ko"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d Mo"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Impossible d'utiliser le service de paquets. Hors zone de couverture"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Sécurité"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Touchez pour configurer le modem."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Modem actif"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Le modem est actuellement contrôlé par une autre application. Pour configurer le modem, cette application va être désactivée."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Ce mot de passe est uniquement pour le modem Wifi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Modem Wifi masqué"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Connexion au réseau mobile"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Brancher un câble USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Désactiver le mode Hors-ligne"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Insérer la carte SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Échec du modem"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Impossible d'utiliser le modem"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Modem USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Modem Wifi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Paramètres du modem Wifi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Périphériques connectés : %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Le périphérique connecté sera déconnecté."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Branchez le câble USB"
+msgstr "Branchez le câble USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "La désactivation du modem empêchera les appareils associés d'accéder à Internet. Continuer ?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "L'activation du modem USB va déconnecter la connexion USB précédente."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Insérez une carte SIM et redémarrez l'appareil pour utiliser le modem."
 
 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"
+msgstr "Le mot de passe doit contenir au moins %d caractères et ne pas dépasser %d caractères."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Nom de l'appareil : %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Modem actif"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Pour activer la fonction de modem, connectez-vous à un réseau mobile ou Wifi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Le modem est actuellement contrôlé par une autre application. Pour configurer le modem, cette application va être désactivée"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Impossible d'utiliser le modem."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Type de sécurité : %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Impossible d'utiliser le modem en mode Hors-ligne. Pour utiliser le modem, désactivez le mode Hors-ligne."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Pour utiliser le modem, connectez-vous aux réseaux mobiles"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Connexion au modem expirée"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Connexion expirée"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "La connexion au modem a expiré."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Données utilisées : %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Les données mobiles sont désactivées. Activez les données mobiles et réessayez."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Touchez pour configurer le modem"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Connexion au réseau mob."
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ne plus afficher"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Au moins %d caractères"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Désactiver le modem"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Aucun nom"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Modem activé."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Désactiver"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Aucune connexion réseau"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "La visibilité Bluetooth a expiré. Votre appareil risque de ne pas être détecté"
+msgstr "La visibilité Bluetooth a expiré. Votre appareil risque de ne pas être détecté."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Connexion expirée."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Ne plus afficher"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Saisissez un mot de passe contenant au moins 8 caractères."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Type de sécurité : %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Réglages"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "L'utilisation du modem est énergivore et augmente l'utilisation des données. Le nombre maximum d'appareils connectés est limité à %d"
+msgstr "L'utilisation du modem est énergivore et augmente l'utilisation des données. Le nombre maximum d'appareils connectés est limité à %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Modem activé."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "La connexion au réseau Wifi va être interrompue. L'utilisation du modem est énergivore et augmente l'utilisation des données. Le nombre maximum d'appareils connectés est limité à %d"
+msgstr "La connexion au réseau Wifi va être interrompue. L'utilisation du modem est énergivore et augmente l'utilisation des données. Le nombre maximum d'appareils connectés est limité à %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Activer"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Le périphérique connecté sera déconnecté"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Limite données atteinte"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Périphériques connectés : %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "M. Hs-ligne"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Les noms des appareils sont affichés pour vous permettre de distinguer les appareils disponibles dans la liste des appareils à proximité, ainsi que via Bluetooth, Wifi Direct ou par d'autres méthodes."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Pour utiliser le modem, connectez-vous aux réseaux mobiles."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Renommer"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Périphériques connectés"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Erreur de carte SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Impossible d'utiliser le service de paquets. Hors zone de couverture."
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
deleted file mode 100644
index 29eddfc..0000000
--- a/po/fr_FR.po
+++ /dev/null
@@ -1,129 +0,0 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Ce mot de passe est uniquement pour le modem Wi-Fi"
-
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Modem Wi-Fi masqué"
-
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Modem Wi-Fi"
-
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Paramètres du modem Wi-Fi"
-
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Reçu :"
-
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Envoyé :"
-
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nom de l'appareil"
-
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Mot de passe"
-
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Le nom de l'appareil peut être modifié sous %s"
-
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Masquer mon appareil"
-
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Utilisation des données"
-
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Modem USB"
-
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "La désactivation du modem empêchera les appareils associés d'accéder à Internet. Continuer ?"
-
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Insérez une carte SIM et redémarrez l'appareil pour utiliser le modem"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Impossible d'utiliser le modem"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Impossible d'utiliser le modem en mode Hors-ligne. Pour utiliser le modem, désactivez le mode Hors-ligne"
-
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "A propos du téléphone"
-
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Appareils connectés"
-
-msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
-msgstr "Modem Bluetooth"
-
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Sécurité"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Fonction modem"
-
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Entrez un mot de passe contenant au moins 8 caractères"
-
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "L'activation du modem USB va interrompre la connexion USB précédente"
-
-msgid "IDS_MOBILEAP_BODY_PD_BYTES"
-msgstr "%d octet(s)"
-
-msgid "IDS_MOBILEAP_BODY_PD_KB"
-msgstr "%d ko"
-
-msgid "IDS_MOBILEAP_BODY_PD_MB"
-msgstr "%d Mo"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Impossible d'utiliser les connexions de données. Hors zone de couverture"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Connectez 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_BODY_DEVICE_NAME_C_PS"
-msgstr "Nom du périphérique : %s"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Modem actif"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Le modem est actuellement contrôlé par une autre application. Pour configurer le modem, cette application va être désactivée"
-
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Type de sécurité : %s"
-
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Pour utiliser le modem, connectez-vous aux réseaux mobiles"
-
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Connexion expirée"
-
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Données utilisées : %s"
-
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Appuyez pour configurer le modem"
-
-msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "La visibilité Bluetooth a expiré. Votre appareil risque de ne pas être détecté"
-
-msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "L'utilisation du modem sollicite davantage la batterie et augmente l'utilisation des données. Le nombre maximum d'appareils connectés est limité à %d"
-
-msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "La connexion au réseau Wi-Fi va être interrompue. L'utilisation du modem consomme davantage de batterie et augmente l'utilisation des données. Le nombre maximum d'appareils connectés est limité à %d"
-
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "L'utilisation du modem sollicite davantage la batterie 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é"
-
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Périphériques connectés : %d"
-
diff --git a/po/ga.po b/po/ga.po
index 0fd7b5a..f2b929a 100644..100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Is le nascaireacht Wi-Fi amháin an pasfhocal seo"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cuir ar ceal"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Nascaireacht Wi-Fi folaithe"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Nascaireacht Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Díchumasófar Ball Te Móibíleach má chastar Wi-Fi air. Ar aghaidh?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Soc. nascaireachta Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Úsáid sonraí"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Faighte:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Ag déanamh teaghráin"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Seolta:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ná taispeáin arís"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Ainm an ghléis"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Díchumasófar nascaireacht Wi-Fi má chastar Wi-Fi air"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Pasfhocal"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Uaslíon na gcarachtar %d bainte amach."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Is féidir ainm an ghléis a athrú i %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Ná déan é"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Folaigh mo ghléas"
+msgid "IDS_BR_SK_YES"
+msgstr "Déan é"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Úsáid sonraí"
+msgid "IDS_BR_SK_NO"
+msgstr "Ná déan é"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Nascaireacht USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Déanta"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Má dhíchumasaítear nascaireacht ní bheidh gléasanna nasctha in ann an tIdirlíon a rochtain. Ar aghaidh?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cuir ar ceal"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Ionsáigh cárta SIM agus atosaigh an gléas le nascaireacht a úsáid"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Ní féidir nascaireacht Bluetooth a úsáid agus tú nasctha le líonra Wi-Fi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Ní féidir nascaireacht a úsáid"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Athainmnigh an gléas"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Ní féidir nascaireacht a úsáid sa mhód Eitilte. Díchumasaigh mód Eitilte le nascaireacht a úsáid"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Ainm mo ghléis"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Eolas faoin bhfóin"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Iontráil pasfhocal"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Gléas nasctha"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "DÉANTA"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CUIR AR CEAL"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Déan é"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Sábháil"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Socruithe"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Nascaireacht Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Slándáil"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Gléas nasctha"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Ag déanamh teaghráin"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Sonraí úsáidte: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Iontráil pasfhocal 8 gcarachtar ar a laghad"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Ainm an ghléis"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Dícheanglaítear an nasc USB roimhe seo má dhéantar nascaireacht USB a chumasú"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Is féidir ainm an ghléis a athrú i %s"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Ainm an ghléis: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Iontráil %d carachtar ar a laghad"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Folaigh mo ghléas"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Pasfhocal"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d beart"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Ní féidir seirbhís paicéid a úsáid. As raon clúdaigh"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Slándáil"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Tapáil le nascaireacht a chumrú"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Nascaireacht air"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Tá nascaireacht á rialú ag feidhmchlár eile faoi láthair. D'fhonn nascaireacht a chumrú, díchumasófar an feidhmchlár sin."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Is le nascaireacht Wi-Fi amháin an pasfhocal seo"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Nascaireacht Wi-Fi folaithe."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Nasc le líonra móibíleach"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Ceangail  cábla USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Díchumasaigh Mód eitilte"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Ionsáigh cárta SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Theip ar nascaireacht"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Ní féidir nascaireacht a úsáid"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Nascaireacht USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Nascaireacht Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Soc. nascaireachta Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Gléasanna nasctha: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Dínascfar an gléas nasctha"
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
 msgstr "Ceangail cábla USB"
 
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Má dhíchumasaítear nascaireacht ní bheidh gléasanna nasctha in ann an tIdirlíon a rochtain. Ar aghaidh?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Dícheanglaítear an nasc USB roimhe seo má dhéantar nascaireacht USB a chumasú"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Ionsáigh cárta SIM agus atosaigh an gléas le nascaireacht a úsáid"
+
 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_BODY_DEVICE_NAME_C_PS"
-msgstr "Ainm an ghléis: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Nascaireacht air"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Leis an bhfeidhm nascaireachta seo a chumasú, nasc le líonra móibíleach nó Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Tá nascaireacht á rialú ag feidhmchlár eile faoi láthair. D'fhonn nascaireacht a chumrú, díchumasófar an feidhmchlár sin."
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Ní féidir nascaireacht a úsáid."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Cineál slándála: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Ní féidir nascaireacht a úsáid sa mhód Eitilte. Díchumasaigh mód Eitilte le nascaireacht a úsáid."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Le nascaireacht a úsáid, nasc le líonraí móibíleacha"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Am ist. don nasc nascaireachta"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Am istigh don nasc"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Am ist. don nasc nascaireachta."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Sonraí úsáidte: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Tá sonraí móibíleacha díchumasaithe. Cumasaigh sonraí móibíleacha agus triail arís é."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Tapáil le nascaireacht a chumrú"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Nasc le líonra móibíleach"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ná taispeáin arís"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "%d carachtar ar a laghad"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Díchumasaigh Nascaireacht"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Níl ainm ann"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Nascaireacht cumasaithe."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Cas As"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Níl nasc líonra ann"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
 msgstr "Tá an t-am istigh d'infheictheacht Bluetooth. Is féidir nár aimsíodh do ghléas."
 
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Am istigh don nasc."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Iontráil pasfhocal 8 gcarachtar ar a laghad"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Cineál slándála: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Socruithe"
+
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Ídítear tuilleadh cumhacht ceallra le nascaireacht agus méadaítear úsáid sonraí agat. Is iad %d uaslíon na ngléasanna ar a bhfuil nascaireacht ceadaithe."
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Nascaireacht cumasaithe."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Déanfar líonra Wi-Fi dínascadh. Ídítear tuilleadh cumhacht ceallra le nascaireacht agus méadaítear úsáid sonraí agat. Is iad %d uaslíon na ngléasanna ar a bhfuil nascaireacht ceadaithe."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Cumasaigh"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Dínascfar an gléas nasctha"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Teor. sonraí bainte amach"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Gléasanna nasctha: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Mód eitilte"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Taispeántar ainmneacha gléasanna le hidirdhealú a dhéanamh idir na gléasanna atá ar fáil i liosta na ngléasanna in aice láimhe, agus trí Bluetooth, Wi-Fi Direct, agus modhanna eile."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Le nascaireacht a úsáid, nasc le líonraí móibíleacha"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Athainmnigh"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Gléasanna nasctha"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Tharla earráid cárta SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Ní féidir seirbhís paicéid a úsáid. As raon clúdaigh."
 
diff --git a/po/gl.po b/po/gl.po
index 48885f2..cf960e6 100644..100755
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Este contrasinal só é para a ancoraxe á rede Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Ancoraxe á rede Wi-Fi oculta"
+msgid "IDS_COM_SK_OK"
+msgstr "Aceptar"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Ancoraxe á rede Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "A activación da Wi-Fi desactivará Mobile Hotspot. Desexas continuar?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Axus. ancoraxe rede Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Uso dos datos"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Recibida:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Ancoraxe á rede"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Enviada:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Non volver mostrar"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nome do dispositivo"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "A activación da Wi-Fi desactivará a ancoraxe á rede Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Contrasinal"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Alcanzouse o número máximo de carácteres %d."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "O nome do dispositivo pode cambiarse en %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Non"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Ocultar o meu dispositivo"
+msgid "IDS_BR_SK_YES"
+msgstr "Si"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Uso dos datos"
+msgid "IDS_BR_SK_NO"
+msgstr "Non"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Ancoraxe á rede USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Finalizado"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "A desactivación da ancoraxe á rede impedirá que os dispositivos ligados accedan á Internet. Desexas continuar?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Insire a tarxeta SIM e reinicia o dispositivo para usar a ancoraxe á rede"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Non se pode usar a ancoraxe á rede do Bluetooth mentres estás conectado á rede Wi-Fi"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Non se pode empregar a ancoraxe á rede"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Cambiar nome do dispositivo"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Non se pode usar a ancoraxe á rede no modo de Avión. Para usar a ancoraxe á rede, desactiva o modo de Avión"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nome do meu dispositivo"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Acerca do teléfono"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Introduza o contrasinal"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Dispositivo conectado"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "FEITO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CANCELAR"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Si"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Gardar"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Axustes"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Ancoraxe á rede do Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Seguridade"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Dispositivo conectado"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Ancoraxe á rede"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Datos usados: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Introduce un contrasinal que conteña polo menos 8 carácteres"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nome do dispositivo"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "A activación da ancoraxe á rede USB desconectará a conexión USB anterior"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "O nome do dispositivo pode cambiarse en %s"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nome do dispositivo: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Introduce polo menos %d carácteres"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Ocultar o meu dispositivo"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Contrasinal"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Bytes"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Non se pode usar o paquete de servizos. Fóra de cobertura"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Seguridade"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Toca para configurar a ancoraxe á rede"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Ancoraxe activa"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "A ancoraxe á rede está a ser controlada actualmente por outra aplicación. Para configurar a ancoraxe á rede, esa aplicación desactivarase."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Este contrasinal só é para a ancoraxe á rede Wi-Fi"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Ancoraxe á rede Wi-Fi oculta"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Conéctate a unha rede móbil"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Conectar cable USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Desactivar modo Avión"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Inserir tarxeta SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Erro na ancoraxe á rede"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Imposible usar ancoraxe á rede"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Ancoraxe á rede USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Ancoraxe á rede Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Axus. ancoraxe rede Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Dispositivos conectados: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "O dispositivo conectado desconectarase"
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
 msgstr "Conectar cable USB"
 
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "A desactivación da ancoraxe á rede impedirá que os dispositivos ligados accedan á Internet. Desexas continuar?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "A activación da ancoraxe á rede USB desconectará a conexión USB anterior"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Insire a tarxeta SIM e reinicia o dispositivo para usar a ancoraxe á rede"
+
 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_BODY_DEVICE_NAME_C_PS"
-msgstr "Nome do dispositivo: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Ancoraxe activa"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Para activar esta función de ancoraxe á rede, conéctate a unha rede móbil ou Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "A ancoraxe á rede está a ser controlada actualmente por outra aplicación. Para configurar a ancoraxe á rede, esa aplicación desactivarase"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Non se pode empregar a ancoraxe á rede"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Tipo de seguridade: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Non se pode usar a ancoraxe á rede no modo de Avión. Para usar a ancoraxe á rede, desactiva o modo de Avión."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Para usar a ancoraxe á rede, conéctate a unha rede móbil"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tempo espera conexión ancoraxe"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Superouse o tempo de espera da conexión"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Superouse o tempo de espera da conexión de ancoraxe."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Datos usados: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "A itinerancia de datos móbiles está desactivada. Activa a itinerancia de datos móbiles e téntao de novo."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Toca para configurar a ancoraxe á rede"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Conéctate a rede móbil"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Non amosar outra vez"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Aceptar"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Polo menos %d carácteres"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Desactivar ancoraxe á rede"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Sen nome"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Ancoraxe á rede activada"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Desactivar"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Sen conexión de rede"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
 msgstr "Esgotouse o tempo de espera da visibilidade do Bluetooth. É posible que o teu dispositivo non se atope"
 
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Superouse o tempo de espera da conexión"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Introduce un contrasinal que conteña polo menos 8 carácteres"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Tipo de seguridade: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Axustes"
+
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "A ancoraxe á rede consume máis batería e incrementa o uso de datos. O número máximo de dispositivos ancorados á rede permitido é de %d"
+msgstr "A ancoraxe á rede consume máis batería e incrementa o uso de datos. O número máximo de dispositivos ancorados á rede permitido é de %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Ancoraxe á rede activada"
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "A rede Wi-Fi desconectarase. A ancoraxe á rede consume máis batería e incrementa o uso de datos. O número máximo de dispositivos ancorados á rede permitido é de %d"
+msgstr "A rede Wi-Fi desconectarase. A ancoraxe á rede consume máis batería e incrementa o uso de datos. O número máximo de dispositivos ancorados á rede permitido é de %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Activar"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "O dispositivo conectado desconectarase"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Alcanzouse lím. uso datos"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Dispositivos conectados: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Modo Avión"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Os nomes dos dispositivos amósanse para distinguir cada un dos dispositivos dispoñibles na lista de dispositivos próximos e a través de Bluetooth, Wi-Fi Direct e outros métodos."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Para usar a ancoraxe á rede, conéctate a unha rede móbil"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Cam. nome"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Dispositivos conectados"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Produciuse un erro tarxeta SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Non se pode usar o paquete de servizos. Fóra de cobertura."
 
diff --git a/po/hi.po b/po/hi.po
index 2d86606..1f8ef17 100644..100755
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "यह पासवर्ड केवल Wi-Fi टेथरिंग के लिए है"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "रद्द"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi टेथरिंग छुपाएँ"
+msgid "IDS_COM_SK_OK"
+msgstr "ओके"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi टेथरिंग"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fi चालू करने पर मोबाइल हॉटस्पॉट अक्षम हो जाएगा। जारी रखें?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi टेथरिंग सेटिंग्स"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "डाटा उपयोग"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "प्राप्‍त:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "टेथरिंग"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "भेजा गया:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "दोबारा न दिखाएँ।"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "डिवाइस नाम"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi चालू करने पर Wi-Fi टेथरिंग अक्षम हो जाएगा"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "पासवर्ड"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "वर्णों की अधिकतम संख्या %d तक पहुँच गई।"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "डिवाइस नाम %s में बदला जा सकता है"
+msgid "IDS_COM_SK_NO"
+msgstr "नहीं"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "मेरा डिवाइस छुपाएँ"
+msgid "IDS_BR_SK_YES"
+msgstr "हाँ"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "डेटा उपयोग"
+msgid "IDS_BR_SK_NO"
+msgstr "नहीं"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB तेथरिंग"
+msgid "IDS_BR_SK_DONE"
+msgstr "पूर्ण"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "टेथरिंग अक्षम करने पर लिंक किए गए डिवाइसों का इंटरनेट ऍक्सेस प्रतिबंधित हो जाएगा। जारी रखें?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "रद्द"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "टेथरिंग का उपयोग करने के लिए SIM कार्ड सम्मिलित करें और डिवाइस रीस्टार्ट करें"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Wi-Fi नेटवर्क से कनेक्ट होने के दौरान ब्लूटूथ टेथरिंग उपयोग करने में असमर्थ।"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "टेथरिंग का उपयोग करने में अक्षम"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "डिवाइस का नाम बदलें"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "फ़्लाइट मोड में टेथरिंग उपयोग करने में अक्षम। टेथरिंग का उपयोग करने के लिए फ़्लाइट मोड अक्षम करें"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "मेरे डिवाइस का नाम"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "फ़ोन के बारे में"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "पासवर्ड प्रविष्ट करें"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "जोड़ा गया डिवाइस"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "पूर्ण"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "रद्द करें"
+
+msgid "IDS_COM_SK_YES"
+msgstr "हाँ"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "सुरक्षित"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "सेटिंग्स"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "ब्लूटूथ टेथरिंग"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "सुरक्षा"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "कनेक्ट हुआ डिवाइस"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "टेथरिंग"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "उपयोग किया गया डाटा: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "कम से कम 8 वर्णों का पासवर्ड दर्ज करें"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "डिवाइस का नाम"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB तेथरिंग सक्षम करने से पिछला USB कनेक्‍शन डिस्कनेक्ट किया जाएगा"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "डिवाइस नाम %s में बदला जा सकता है"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "डिवाइस का नाम: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "कम से कम %d वर्ण प्रविष्ट करें।"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "मेरी डिवाइस छिपाएँ"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "पासवर्ड"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d बाइट्स"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "पैकेट सेवा का उपयोग करने में अक्षम। कवरेज़ से बाहर"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "सुरक्षा"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "टेथरिंग कॉन्फ़िगर करने के लिए टैप करें"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "टेथरिंग सक्रिय"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "वर्तमान में टेथरिंग को अन्य एप्लीकेशन द्वारा नियंत्रित किया गया है। टेथरिंग कॉन्फ़िगर करने के लिए, उस एप्लिकेशन को अक्षम किया जाएगा।"
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "यह पासवर्ड केवल Wi-Fi टेथरिंग के लिए है"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi टेथरिंग छिपी।"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "मोबाइल नेटवर्क से कनेक्ट करें"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USB केबल कनेक्‍ट करें"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "फ्लाइट मोड अक्षम करें"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "SIM कार्ड डालें"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "टेथरिंग विफल"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "टेथरिंग उपयोग करने में असमर्थ"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB टेथरिंग"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi टेथरिंग"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi टेथरिंग सेटिंग्स"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "कनेक्ट किए गए डिवाइसेस: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "कनेक्ट किया गया डिवाइस डिस्कनेक्ट हो जाएगा।"
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
 msgstr "USB केबल कनेक्‍ट करें"
 
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "टेथरिंग अक्षम करने पर लिंक किए गए डिवाइसों का इंटरनेट उपयोग प्रतिबंधित हो जाएगा। जारी रखें?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB तेथरिंग सक्षम करने से पिछला USB कनेक्‍शन डिस्कनेक्ट किया जाएगा"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "टेथरिंग का उपयोग करने के लिए SIM कार्ड डालें और डिवाइस पुनः चालू करें"
+
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "पासवर्ड में कम से कम %d वर्ण होने जरूरी है और %d वर्ण से अधिक नहीं होना चाहिए"
+msgstr "पासवर्ड में कम से कम %d वर्ण होने जरूरी है और %d वर्ण से अधिक नहीं होने चाहिए।"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "साधन नाम: %s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "टेथरिंग बैटरी पॉवर की ज्यादा खपत करता है और आपके डेटा उपयोग को बढ़ाता है"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "तेथरिंग सक्रिय"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "यह टेथरिंग फ़ंक्शन सक्षम करने के लिए, किसी मोबाइल या Wi-Fi नेटवर्क से कनेक्ट करें"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "वर्तमान में टेथरिंग को अन्य एप्लीकेशन द्वारा नियंत्रित किया गया है। टेथरिंग कॉन्फ़िगर करने के लिए, उस एप्लिकेशन को अक्षम किया जाएगा।"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "टेथरिंग का उपयोग करने में असमर्थ।"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "सुरक्षा प्रकार: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "फ़्लाइट मोड में टेथरिंग उपयोग करने में असमर्थ। टेथरिंग का उपयोग करने के लिए फ़्लाइट मोड अक्षम करें।"
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "टेथरिंग का उपयोग करने के लिए, किसी मोबाइल नेटवर्क से केनक्ट करें"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "टेथरिंग कनेक्शन का समय समाप्त"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "कनेक्शन समय समाप्ति"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "टेथरिंग कनेक्शन का समय समाप्त हुआ।"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "उपयोग किया गया डाटा: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "मोबाइल डाटा अक्षम है। मोबाइल डाटा सक्षम करें और फिर से प्रयास करें।"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "टेथरिंग कॉन्फ़िगर करने के लिए टैप करें"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "मोबाइल नेटवर्क से कनेक्ट करें"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "दोबारा न दिखाएँ"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ओके"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "कम से कम %d वर्ण"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "टेथरिंग अक्षम करें"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "नाम नहीं"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "टेथरिंग सक्षम किया गया"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "बंद करें"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "कोई नेटवर्क कनेक्शन नहीं"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "ब्लूटूथ दृश्‍यता समय-सीमा समाप्त हो गई है। शायद आपका डिवाइस खोजा न जा सके"
+msgstr "ब्लूटूथ दृश्‍यता समय-सीमा समाप्त हो गई है। शायद आपका डिवाइस खोजा न जा सके।"
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "कनेक्शन समय समाप्ति।"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "कम से कम 8 वर्णों का पासवर्ड प्रविष्ट करें।"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "सुरक्षा प्रकार: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "सेटिंग्स"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "टेथरिंग बैटरी पावर की ज्यादा खपत करता है और आपका डाटा उपयोग बढ़ाता है। अनुमति प्राप्त टेथर किए गए डिवाइसों की अधिकतम संख्या %d है।"
+msgstr "टेथरिंग बैटरी पॉवर की ज्यादा खपत करता है और आपका डाटा उपयोग बढ़ाता है। अनुमति प्राप्त टेथर किए गए डिवाइसों की अधिकतम संख्या %d है।"
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "टेथरिंग सक्षम किया गया"
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi नेटवर्क डिस्कनेक्ट किया जाएगा। टेथरिंग बैटरी पावर की ज्यादा खपत करता है और आपका डाटा उपयोग बढ़ाता है। अनुमति प्राप्त टेथर किए गए डिवाइसों की अधिकतम संख्या %d है।"
+msgstr "Wi-Fi नेटवर्क डिस्कनेक्ट किया जाएगा। टेथरिंग बैटरी पॉवर की ज्यादा खपत करता है और आपका डाटा उपयोग बढ़ाता है। अनुमति प्राप्त टेथर किए गए डिवाइसों की अधिकतम संख्या %d है।"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "तेथरिंग बैटरी पॉवर की ज्यादा खपत करता है और आपके डेटा उपयोग को बढ़ाता है"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "सक्षम करें"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "कनेक्ट किया गया डिवाइस डिस्कनेक्ट हो जाएगा"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "डाटा उपयोग सीमा तक पहुँच गया"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "कनेक्ट किए गए साधन: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "फ्लाइट मोड"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ब्लूटूथ, Wi-Fi Direct और किसी अन्य पद्धतियों के माध्यम से, निकटवर्ती डिवाइसों की सूची में उपलब्ध प्रत्येक डिवाइसों को पहचानने के लिए डिवाइस नाम प्रदर्शित होते हैं।"
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "टेथरिंग का उपयोग करने के लिए, किसी मोबाइल नेटवर्क से केनक्ट करें"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "नाम बदलें"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "कनेक्ट किए गए डिवाइसेस"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM कार्ड त्रुटि उत्पन्न हुई"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "पैकेट डाटा सेवा का उपयोग करने में असमर्थ। कवरेज से बाहर।"
 
diff --git a/po/hr.po b/po/hr.po
index 45c8308..1960e42 100644..100755
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Ova je lozinka samo za Wi-Fi dijeljenje"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Prekid"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi dijeljenje skriveno"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi dijeljenje"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Uključivanjem Wi-Fi isključit će se mobilna pristupna točka. Nastavak?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Postavke Wi-Fi dijeljenja"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Korištenje podataka"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Primljeno:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Dijeljenje veze"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Poslano:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ne prikazuj više"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Naziv uređaja"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Uključivanjem Wi-Fi isključit će se Wi-Fi dijeljenje."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Lozinka"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Dosegnut maksimalan broj znakova %d."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Naziv uređaja može se promijeniti u %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Sakrij moj uređaj"
+msgid "IDS_BR_SK_YES"
+msgstr "Da"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Korištenje podataka"
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB dijeljenje"
+msgid "IDS_BR_SK_DONE"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Ako isključite dijeljenje, spriječit ćete da povezani uređaji pristupaju internetu. Nastavak?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Prekid"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Umetnite SIM karticu i pokrenite uređaj da biste koristili dijeljenje"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Nemoguće koristiti Bluetooth dijeljenje dok ste spojeni na Wi-Fi mrežu."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Nemoguće koristiti dijeljenje"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Preimenuj uređaj"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Nemoguće koristiti dijeljenje u profilu Bez mreže. Za korištenje dijeljenja isključite profil Bez mreže"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Naziv mog uređaja"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "O telefonu"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Unesite lozinku."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Spojeni uređaj"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "GOTOVO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ODUSTANI"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Da"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Spremi"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Postavke"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth dijeljenje"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Sigurnost"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Spojeni uređaj"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Dijeljenje veze"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Korišteni podaci: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Unesite lozinku s min. 8 znakova"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Naziv uređaja"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Uključivanje USB dijeljenja prekinut će prethodnu USB vezu"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Naziv uređaja može se promijeniti u %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Naziv uređaja: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Unesite min. %d znakova."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Sakrij moj uređaj"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Šifra"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Bytes"
@@ -76,54 +100,171 @@ msgstr "%d kB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Nemoguće koristiti paketnu uslugu. Nema mreže"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Sigurnost"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Dodirnite za konfiguraciju dijeljenja."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Dijeli se"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Dijeljenjem veze trenutačno upravlja druga aplikacija. Da biste konfigurirali dijeljenje veze, ta će se aplikacija isključiti."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Ova je lozinka samo za Wi-Fi dijeljenje."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi dijeljenje skriveno."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Spoji na mobilnu mrežu"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Spojite USB kabel"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Isključi Profil bez mreže"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Umetnite SIM karticu"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Dijeljenje nije uspjelo"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Nije mog. koristiti dijeljenje"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB dijeljenje"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi dijeljenje"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Postavke Wi-Fi dijeljenja"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Spojeni uređaji: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Spojeni uređaj će se odspojiti."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Spoji USB kabel"
+msgstr "Spoji USB kabel."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Ako isključite dijeljenje, spriječit ćete da povezani uređaji pristupaju internetu. Nastavak?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Uključivanje USB dijeljenja prekinut će prethodnu USB vezu."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Umetnite SIM karticu i pokrenite uređaj da biste koristili dijeljenje."
 
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "Lozinka mora sadržavati najmanje %d, a najviše %d znakova"
+msgstr "Lozinka mora sadržavati najmanje %d, a najviše %d znakova."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Naziv uređaja: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Dijeli se"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Za uključivanje funkcije dijeljenja spojite se na mobilnu ili Wi-Fi mrežu."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Dijeljenjem veze trenutačno upravlja druga aplikacija. Da biste konfigurirali dijeljenje veze, ta će se aplikacija isključiti"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Nemoguće koristiti dijeljenje."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Vrsta sigurnosti: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Nemoguće koristiti dijeljenje u profilu Bez mreže. Za korištenje dijeljenja isključite profil Bez mreže."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Da biste koristili dijeljenje, spojite se na mobilne mreže"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Dijeljenje veze je isteklo"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Istek veze"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Dijeljenje veze je isteklo."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Korišteni podaci: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobilni podaci su isključeni. Uključite mobilne podatke i pokušajte ponovno."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Dodirnite za konfiguraciju dijeljenja"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Spoji na mobilnu mrežu"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ne prikazuj više"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Najmanje %d znakova"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Isključi Dijeljenje"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Nema imena"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Dijeljenje uključeno."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Isključi"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Nema mrežne veze"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Vidljivost Bluetootha je istekla. Vaš uređaj možda neće biti pronađen"
+msgstr "Vidljivost Bluetootha je istekla. Vaš uređaj možda neće biti pronađen."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Istek veze."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Unesite lozinku s min. 8 znakova."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Vrsta sigurnosti: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Postavke"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Dijeljenje veze povećava potrošnju baterije i količinu prijenosa podataka. Maksimalan dopušten broj uređaja za dijeljenje veze je %d"
+msgstr "Dijeljenje veze povećava potrošnju baterije i količinu prijenosa podataka. Maksimalan dopušten broj uređaja za dijeljenje veze je %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Dijeljenje uključeno."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi veza će se odspojiti. Dijeljenje veze povećava potrošnju baterije i količinu prijenosa podataka. Maksimalan dopušten broj uređaja za dijeljenje veze je %d"
+msgstr "Wi-Fi veza će se odspojiti. Dijeljenje veze povećava potrošnju baterije i količinu prijenosa podataka. Maksimalan dopušten broj uređaja za dijeljenje veze je %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Uključi"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Spojeni uređaj će se odspojiti"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Dosegn. ogr. korišt. pod."
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Spojeni uređaji: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Bez mreže"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Nazivi uređaja prikazani su radi razlikovanja pojedinih uređaja dostupnih na listi najbližih uređaja, putem Bluetootha, Wi-Fi Directa te na druge načine."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Da biste koristili dijeljenje, spojite se na mobilne mreže."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Preimenuj"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Spojeni uređaji"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Greška na SIM kartici"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Nemoguće koristiti paketnu uslugu. Nema mreže."
 
diff --git a/po/hu.po b/po/hu.po
index 0ef4204..c969579 100644..100755
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Ez a jelszó csak a Wi-Fi internetmegosztáshoz használható"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Mégse"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi internetmegosztás elrejtve"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi internetmegosztás"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "A Wi-Fi bekapcsolásával letiltja a Mobile Hotspotot. Folytatja?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi int.megosztás beá."
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Adathasználat"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Fogadva:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Internetmegosztás"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Elküldve:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ne jelenjen meg ismét"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Eszköz név"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "A Wi-Fi bekapcsolásával letiltja a Wi-Fi internetmegosztást."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Jelszó"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Elérte a karakterek maximális számát (%d)."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Az eszköz neve itt módosítható: %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Nem"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Saját eszköz elrejtése"
+msgid "IDS_BR_SK_YES"
+msgstr "Igen"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Adathasználat"
+msgid "IDS_BR_SK_NO"
+msgstr "Nem"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-internetmegosztás"
+msgid "IDS_BR_SK_DONE"
+msgstr "Kész"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Az internetmegosztás letiltása esetén megszűnik a csatolt eszközök internetkapcsolata. Folytatja?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Mégse"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Az internetmegosztás használatához helyezzen be SIM kártyát, és indítsa újra az eszközt"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Amíg Wi-Fi hálózathoz kapcsolódik, a Bluetooth-internetmegosztás nem használható."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Nem használható az internetmegosztás"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Eszköz átnevezése"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Repülő üzemmódban nem használható az internetmegosztás. Az internetmegosztás használatához tiltsa le a Repülő üzemmódot"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Saját eszköz neve"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "A telefon névjegye"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Írja be a jelszót."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Csatlakoztatott eszköz"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "KÉSZ"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "MÉGSE"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Igen"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Ment"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Beállítások"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth internetmegosztás"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Biztonság"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Csatlakoztatott eszköz"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Internetmegosztás"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Adathasználat: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Legalább 8 karakterből álló jelszót írjon be"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Eszköznév"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Az USB-internetmegosztás engedélyezése esetén az előző USB-kapcsolat megszakad"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Az eszköz neve itt módosítható: %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Eszköz neve: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Írjon be legalább %d karaktert."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Saját eszköz elrejtése"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Jelszó"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d bájt"
@@ -76,54 +100,171 @@ msgstr "%d kB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Nem használható csomagalapú szolgáltatás. Nincs lefedettség"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Biztonság"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Érintse meg az internetmegosztás konfigurálásához."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Int.mego. aktív"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Az internetmegosztást jelenleg egy másik alkalmazás vezérli. Az internetmegosztás konfigurálásához ez az alkalmazás le lesz tiltva."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Ez a jelszó csak a Wi-Fi internetmegosztáshoz használható."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi internetmegosztás elrejtve."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Kapcsolódás mobilhálózathoz"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USB-kábel csatlakoztatása"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Repülő üzemmód letiltása"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Helyezzen be SIM kártyát"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Sikertelen internetmegosztás"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Int.megosztás nem használható"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-internetmegosztás"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi internetmegosztás"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi int.megosztás beá."
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Csatlakoztatott eszközök: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "A csatlakoztatott eszköz le lesz választva."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Csatlakoztassa az USB-kábelt"
+msgstr "Csatlakoztassa az USB-kábelt."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Az internetmegosztás letiltása esetén megszűnik a csatolt eszközök internetkapcsolata. Folytatja?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Az USB-internetmegosztás engedélyezése esetén az előző USB-kapcsolat megszakad."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Az internetmegosztás használatához helyezzen be SIM kártyát, és indítsa újra az eszközt."
 
 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"
+msgstr "A jelszónak legalább %d, legfeljebb %d karakterből kell állnia."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Eszköz neve: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Int.mego. aktív"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Ennek az internetmegosztási funkciónak az engedélyezéséhez kapcsolódjon mobil- vagy Wi-Fi hálózathoz."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Az internetmegosztást jelenleg egy másik alkalmazás vezérli. Az internetmegosztás konfigurálásához ez az alkalmazás le lesz tiltva"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Nem használható az internetmegosztás."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Biztonság típusa: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Repülő üzemmódban nem használható az internetmegosztás. Az internetmegosztás használatához tiltsa le a Repülő üzemmódot."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Az internetmegosztás használatához létesítsen mobilhálózati kapcsolatot"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Lejárt az int.mego. kapcs. ideje"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Kapcsolat időtúllépése"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Lejárt az internetmegosztásos kapcsolat ideje."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Adathasználat: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "A mobil internetkapcsolat le van tiltva. Engedélyezze a mobil internetkapcsolatot, és próbálja újra."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Érintse meg az internetmegosztás konfigurálásához"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Kapcsolódás mobilhál.hoz"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ne jelenjen meg újra"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Legalább %d karakter"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Internetmegosztás letiltása"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Nincs név"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Internetmegosztás engedélyezve."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Kikapcsolás"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Nincs hálózati kapcsolat"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "A Bluetooth láthatóság ideje lejárt. Az eszközt nem lehet megtalálni"
+msgstr "A Bluetooth láthatóság ideje lejárt. Az eszközt nem lehet megtalálni."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Kapcsolat időtúllépése."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Legalább 8 karakterből álló jelszót írjon be."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Biztonság típusa: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Beállítások"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Az internetmegosztás használata gyorsan meríti az akkumulátort, és nagyobb adatforgalmat eredményez. Az internetmegosztásban részt vevő eszközök maximális megengedett száma %d"
+msgstr "Az internetmegosztás használata gyorsan meríti az akkumulátort, és nagyobb adatforgalmat eredményez. Az internetmegosztásban részt vevő eszközök maximális megengedett száma %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Internetmegosztás engedélyezve."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Megszűnik a Wi-Fi hálózati kapcsolat. Az internetmegosztás használata gyorsan meríti az akkumulátort, és nagyobb adatforgalmat eredményez. Az internetmegosztásban részt vevő eszközök maximális megengedett száma %d"
+msgstr "Megszűnik a Wi-Fi hálózati kapcsolat. Az internetmegosztás használata gyorsan meríti az akkumulátort, és nagyobb adatforgalmat eredményez. Az internetmegosztásban részt vevő eszközök maximális megengedett száma %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Engedélyezés"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "A csatlakoztatott eszköz le lesz választva"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Elérte az adatkorlátot"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Csatlakoztatott eszközök: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Repülő ü.m."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Megjelennek az eszköznevek, hogy meg lehessen különböztetni a közeli eszközök listáján szereplő, illetve Bluetooth, Wi-Fi Direct vagy egyéb módszer használatával elérhető egyes eszközöket."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Az internetmegosztás használatához létesítsen mobilhálózati kapcsolatot."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Átnevez"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Csatlakoztatott eszközök"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM-hiba történt"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Nem használható csomagalapú szolgáltatás. Nincs lefedettség."
 
diff --git a/po/hy.po b/po/hy.po
index 6a9038b..c639113 100644..100755
--- a/po/hy.po
+++ b/po/hy.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Այս գաղտնաբառը միայն Wi-Fi տեղակապման համար է"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Չեղարկել"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi տեղակապումը թաքցված է"
+msgid "IDS_COM_SK_OK"
+msgstr "Ընդունել"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi տեղակապում"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fi միացնելը կկասեցնի Շարժական թեժ կետը. շարունակե՞լ:"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi տեղակապ. դրվածքներ"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Տվյալների օգտագործում"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Ստացված."
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Տեղակապում"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Ուղարկված՝"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Չցուցադրել կրկին"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Սարքի Անունը"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi-ը միացնելը կկասեցնի Wi-Fi տեղակապումը:"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Գաղտնաբառ"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Հասել է նիշերի առավելագույն քանակին՝ %d"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Սարքի անունը կարող է փոխվել %sում"
+msgid "IDS_COM_SK_NO"
+msgstr "Ոչ"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Թաքցնել իմ սարքը"
+msgid "IDS_BR_SK_YES"
+msgstr "Այո"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Տվյալների օգտագործում"
+msgid "IDS_BR_SK_NO"
+msgstr "Ոչ"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB տեղակապում"
+msgid "IDS_BR_SK_DONE"
+msgstr "Պատրաստ"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Տեղակապումը կասեցնելը կապված սարքերին թույլ չի տա մուտք գործել ինտերնետ. շարունակե՞լ:"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Չեղարկել"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Մտցնել SIM քարտ և վերագործարկել սարքը՝ տեղակապում օգտագործելու համար"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Անհնար է Bluetooth տեղակապում օգտագործել Wi-Fi ցանցին միացված ժամանակ:"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Անհնար է օգտագործել տեղակապում:"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Վերանվանել սարքը"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Անհնար է տեղակապումն օգտագործել Թռիչքային ռեժիմում: Տեղակապումից օգտվելու համար կասեցնել Թռիչքային ռեժիմը"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Իմ սարքի անունը"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Հեռախոսի մասին"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Մուտքագրեք գաղտնաբառը:"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Միացված սարք"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "ԱՐՎԱԾ"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ԴԱԴԱՐԵՑՆԵԼ"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Այո"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Պահել"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Պարամետրեր"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth տեղակապում"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Անվտանգություն"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Միացված սարք"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Տեղակապում"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Օգտագործ. տվյալներ` %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Մուտքագրել առնվազն 8-նիշանի գաղտնաբառ"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Սարքի Անունը"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB տեղակապման ընձեռումը կանջատի նախորդ USB միացումը"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Սարքի անունը կարող է փոխվել %sում:"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Սարքի անվանումը՝ %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Մուտքագրել առնվազն %d նիշ:"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Թաքցնել իմ սարքը"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Գաղտնաբառ"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Բայտ"
@@ -76,17 +100,11 @@ msgstr "%d Կբ"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d Մբ"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Անհնար է օգտագործել Ձայնային հրամայող: Ծածկույթից դուրս"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Միացնել USB մալուխը"
-
-msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "Գաղտնաբառը պետք է պարունակի առնվազն %d նիշ և չգերազանցի %d նիշը"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Անվտանգություն"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Սարքի անվանումը՝ %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Թակել՝ տեղակապումը կազմաձևելու համար:"
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Տեղակապ. ակտիվ է"
@@ -94,36 +112,159 @@ msgstr "Տեղակապ. ակտիվ է"
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "Ներկա պահին տեղակապումը վերահսկվում է այլ ծրագրի կողմից: Տեղակապումը կազմաձևելու համար այդ ծրագիրը կկասեցվի"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Անվտանգության տիպը՝ %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Այս գաղտնաբառը միայն Wi-Fi տեղակապման համար է:"
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Տեղակապում օգտագործելու համար միացեք շարժական կապի ցանցերին"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi տեղակապումը թաքցված է:"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Միացման պարապուրդ"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Միանալ շարժական կապի ցանցին"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Օգտագործ. տվյալներ` %s"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Միացնել USB լարը"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Թակել՝ տեղակապումը կազմաձևելու համար"
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Կասեցնել Թռիչքային ռեժիմը"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Մտցրեք SIM քարտ"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Տեղակապումը ձախողվեց"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Անհնար է օգտագործել տեղակապում"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB տեղակապում"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi տեղակապում"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi տեղակապ. դրվածքներ"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Միացված սարքեր՝ %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Կապակցված սարքը կանջատվի:"
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Միացնել USB մալուխը:"
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Տեղակապումը կասեցնելը կապված սարքերին թույլ չի տա մուտք գործել ինտերնետ. շարունակե՞լ:"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB տեղակապման ընձեռումը կանջատի նախորդ USB միացումը:"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Մտցնել SIM քարտ և վերագործարկել սարքը՝ տեղակապում օգտագործելու համար:"
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Տեղակապման գործառույթն ընձեռելու համար միացեք շարժական կամ Wi-Fi ցանցի"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Անհնար է օգտագործել տեղակապում:"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Անհնար է տեղակապումն օգտագործել Թռիչքային ռեժիմում: Տեղակապումից օգտվելու համար կասեցնել Թռիչքային ռեժիմը:"
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Տեղակապման միացման ժկ սպառվել է"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Տեղակապման միացման ժամանակը սպառվել է:"
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Շարժական տվյալները կասեցված են: Ընձեռեք շարժական տվյալները և նորից փորձեք:"
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Միանալ շարժական ցանցին"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Այլևս ցույց չտալ"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Ընդունել"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Առնվազն %d նիշ"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Կասեցնել Տեղակապումը"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Անուն չկա"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Տեղակապումն ընձեռված է:"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Անջատել"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Ցանցային միացում չկա"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth տեսանելիության համար հատկացված ժամանակը սպառվել է: Ձեր սարքը գուցե չգտնվի"
+msgstr "Bluetooth տեսանելիության համար հատկացված ժամանակը սպառվել է: Ձեր սարքը գուցե չգտնվի:"
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Միացման պարապուրդ:"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Մուտքագրել առնվազն 8-նիշանի գաղտնաբառ:"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Անվտանգության տիպը՝ %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Պարամետրեր"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Տեղակապումը մարտկոցի ավելի շատ էներգիա է սպառում և ավելացնում է տվյալների օգտագործումը: Տեղակապված սարքերի առավելագույն թույլատրված քանակը %d է"
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Տեղակապումն ընձեռված է:"
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Wi-Fi ցանցը կանջատվի: Տեղակապումը մարտկոցի ավելի շատ էներգիա է սպառում և ավելացնում է տվյալների օգտագործումը: Տեղակապված սարքերի առավելագույն թույլատրված քանակը %d է"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "Տեղակապումը մարտկոցի ավելի շատ էներգիա է սպառում և ավելացնում է տվյալների օգտագործումը"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Ակտիվացնլ"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Կապակցված սարքը կանջատվի"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Հասել է տվ. օգտ. սհմնչափ"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Միացված սարքեր՝ %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Թռչք. ռեժիմ"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Սարքի անունները ցուցադրվում են, որպեսզի տարբերվի մոտակա սարքերի ցանկում առկա և Bluetooth, Wi-Fi Direct ու այլ եղանակներով մատչելի սարքերից յուրաքանչյուրը:"
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Տեղակապում օգտագործելու համար միացեք շարժական կապի ցանցերին:"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Վրանվանել"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Միացված սարքեր"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM քարտի սխալ է տեղի ունեցել"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Անհնար է օգտագործել Ձայնային հրամայող: Ծածկույթից դուրս:"
 
diff --git a/po/is.po b/po/is.po
index 6f335c0..3807c5f 100644..100755
--- a/po/is.po
+++ b/po/is.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Þetta lykilorð er aðeins fyrir Wi-Fi tjóðrun"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Hætta við"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi tjóðrun falin"
+msgid "IDS_COM_SK_OK"
+msgstr "Í lagi"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi tjóðrun"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Ef þú kveikir á Wi-Fi slokknar á Mobile Hotspot. Halda áfram?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi tjóðrunarstillingar"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Gagnanotkun"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Móttekið:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Sími sem netaðgangsstaður"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Sent:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ekki birta aftur"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Heiti tækis"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Ef kveikt er á Wi-Fi verður slökkt á Wi-Fi tjóðrun."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Aðgangsorð"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Hámarksfjölda stafa (%d) hefur verið náð."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Heiti tækis má breyta í %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Nei"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Fela tækið mitt"
+msgid "IDS_BR_SK_YES"
+msgstr "Já"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Gagnanotkun"
+msgid "IDS_BR_SK_NO"
+msgstr "Nei"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-tjóðrun"
+msgid "IDS_BR_SK_DONE"
+msgstr "Lokið"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Ef slökkt er á tjóðrun missa tengd tæki netsamband. Halda áfram?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Hætta við"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Settu inn SIM-kort og endurræstu tækið til að nota tjóðrun"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Ekki er hægt að nota Bluetooth tjóðrun þegar tengst er við þráðlaust net (Wi-Fi)."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Ekki hægt að nota tjóðrun"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Endurnefna tæki"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Ekki er hægt að nota tjóðrun í flugstillingu. Slökktu á flugstillingu til að nota tjóðrun"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Heiti tækisins"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Um símann"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Rita aðgangsorð."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Tengt tæki"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "LOKIÐ"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "HÆTTA VIÐ"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Já"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Vista"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Stillingar"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth-tjóðrun"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Öryggi"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Tengt tæki"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Sími sem netaðgangsstaður"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Notuð gögn: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Sláðu inn minnst 8 stafa lykilorð"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Heiti tækis"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Með því að kveikja á USB-tjóðrun slokknar á fyrri USB-tengingu"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Heiti tækis má breyta í %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Heiti tækis: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Sláðu inn minnst %d stafi."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Fela tækið mitt"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Aðgangsorð"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Bæti"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Það er ekki hægt að nota pakkagagnaþjónustu. Síminn er utan þjónustusvæðis"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Öryggi"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Pikkaðu til að stilla tjóðrun."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Tjóðrun er virk"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Annað forrit er að stjórna tjóðrun. Slökkt verður á því forriti til að stilla tjóðrun."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Þetta lykilorð er aðeins fyrir Wi-Fi tjóðrun."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi tjóðrun falin."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Tengjast farsímakerfi"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Tengdu USB-snúru"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Slökkva á flugstillingu"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Settu inn SIM-kort"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Mistókst að tjóðra"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Ekki er hægt að nota tjóðrun"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-tjóðrun"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi tjóðrun"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi tjóðrunarstillingar"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Tengd tæki: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Tengt tæki verður aftengt."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Tengjast USB-snúru"
+msgstr "Tengjast USB-snúru."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Ef slökkt er á tjóðrun missa tengd tæki netsamband. Halda áfram?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Með því að kveikja á USB-tjóðrun slokknar á fyrri USB-tengingu."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Settu inn SIM-kort og endurræstu tækið til að nota tjóðrun."
 
 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"
+msgstr "Lykilorðið verður að vera a.m.k. %d stafir og má ekki vera lengra en %d stafir."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Heiti tækis: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Tjóðrun er virk"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Tengdu við farsímakerfi eða Wi-Fi net til að kveikja á þessum tjóðrunareiginleika"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Annað forrit er að stjórna tjóðrun. Slökkt verður á því forriti til að stilla tjóðrun"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Ekki hægt að nota tjóðrun."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Öryggisgerð: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Ekki er hægt að nota tjóðrun í flugstillingu. Slökktu á flugstillingu til að nota tjóðrun."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Tengstu farsímakerfum til að nota tjóðrun"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tjóðrunartenging rann út á tíma"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Tenging útrunnin"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tjóðrunartenging rann út á tíma."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Notuð gögn: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Slökkt er á farsímagögnum. Virkjaðu farsímagögn og reyndu aftur."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Pikkaðu til að stilla tjóðrun"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Tengjast farsímakerfi"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ekki sýna aftur"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Í lagi"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Minnst %d stafir"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Slökkva á tjóðrun"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Ekkert heiti"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Netaðgangsstaður virkur."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Slökkva"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Ekkert netsamband"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth-sýnileiki rann út á tíma. Ekki er víst að tækið finnist"
+msgstr "Bluetooth-sýnileiki rann út á tíma. Ekki er víst að tækið finnist."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Tenging útrunnin."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Sláðu inn minnst 8 stafa lykilorð."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Öryggisgerð: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Stillingar"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Tjóðrun notar meiri orku og eykur gagnanotkun. Leyfilegur hámarksfjöldi tjóðraðra tækja er %d"
+msgstr "Tjóðrun notar meiri orku og eykur gagnanotkun. Leyfilegur hámarksfjöldi tjóðraðra tækja er %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Netaðgangsstaður virkur."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi netið verður aftengt. Tjóðrun notar meiri orku og eykur gagnanotkun. Leyfilegur hámarksfjöldi tjóðraðra tækja er %d"
+msgstr "Wi-Fi netið verður aftengt. Tjóðrun notar meiri orku og eykur gagnanotkun. Leyfilegur hámarksfjöldi tjóðraðra tækja er %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Gera virkt"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Tengt tæki verður aftengt"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Hámarksgagnanotkun náð"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Tengd tæki: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Flugstill."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Heiti tækja eru birt til að greina tiltæk tæki í sundur á listanum yfir nálæg tæki, með Bluetooth, Wi-Fi Direct og öðrum aðferðum."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Tengstu farsímakerfum til að nota tjóðrun."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Endurnefna"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Tengd tæki"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Villa kom upp á SIM-korti"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Það er ekki hægt að nota pakkagagnaþjónustu. Síminn er utan þjónustusvæðis."
 
diff --git a/po/it_IT.po b/po/it_IT.po
index fecc097..109b967 100644..100755
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Password valida solo per tethering Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annulla"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Tethering Wi-Fi nascosto"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Tethering Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "L'attivazione del Wi-Fi disattiva il Router Wi-Fi. Continuare?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Impost. tethering Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Utilizzo dati"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Ricevuto:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Inviato:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Non mostrare più"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nome dispositivo"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "L'attivazione del Wi-Fi causa la disattivazione del tethering Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Password"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "È stato raggiunto il numero massimo di caratteri (%d)."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Il nome dispositivo può essere modificato in %s"
+msgid "IDS_COM_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Nascondi rete generata"
+msgid "IDS_BR_SK_YES"
+msgstr "Sì"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Utilizzo dati"
+msgid "IDS_BR_SK_NO"
+msgstr "No"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Tethering USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Fatto"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Disattivando il tethering i dispositivi collegati non potranno accedere più a Internet. Continuare?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annulla"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Inserire la scheda SIM e riavviare il dispositivo per utilizzare il tethering"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Impossibile utilizzare tethering Bluetooth se connessi a una rete Wi-Fi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Impossibile utilizzare il tethering"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Rinomina il dispositivo"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Impossibile utilizzare il tethering in modalità Offline. Disattivare la modalità per utilizzare il tethering"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nome mio dispositivo"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Info sul dispositivo"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Inserisci password."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Dispositivo connesso"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "FATTO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ANNULLA"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Sì"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Salva"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Impostazioni"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Tethering Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Sicurezza"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Dispositivo connesso"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Dati utilizzati: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Immettere password di almeno 8 caratteri"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nome dispositivo"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Attivando il tethering USB verranno interrotte le connessioni USB precedenti"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Il nome dispositivo può essere modificato in %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nome dispositivo: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Immettere almeno %d caratteri."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Nascondi rete generata"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Password"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d byte"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Impossibile utilizzare servizio a pacchetti. Fuori da copertura"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Sicurezza"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Toccate per configurare il tethering."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Tethering attivo"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Il tethering è attualmente controllato da un'altra applicazione. Per configurare il tethering, l'applicazione verrà disattivata."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Password valida solo per tethering Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Tethering Wi-Fi nascosto."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Connetti con rete mobile"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Collegate il cavo USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Disattiva Modalità offline"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Inserisci scheda SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Tethering non riuscito"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Impossibile usare il tethering"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Tethering USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Tethering Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Impost. tethering Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Dispositivi connessi: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Il dispositivo connesso verrà disconnesso."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Collegare cavo USB"
+msgstr "Collegare cavo USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Disattivando il tethering i dispositivi collegati non potranno accedere più a Internet. Continuare?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Attivando il tethering USB verranno interrotte le connessioni USB precedenti."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Inserire la scheda SIM e riavviare il dispositivo per utilizzare il tethering."
 
 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"
+msgstr "La password deve contenere almeno %d caratteri e non superare %d caratteri."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Nome dispositivo: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Tethering attivo"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Per attivare questa funzione di tethering, connettetevi a una rete mobile o Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Il tethering è attualmente controllato da un'altra applicazione. Per configurare il tethering, l'applicazione verrà disattivata"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Impossibile utilizzare il tethering."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Tipo di protezione: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Impossibile utilizzare il tethering in Modalità offline. Disattivare la modalità per utilizzare il tethering."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Per utilizzare il tethering, connettetevi a una rete mobile"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Connessione tethering scaduta"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Timeout connessione"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Connessione tethering scaduta."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Dati utilizzati: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Connessione dati disattiva. Connettetevi ad una rete Wi-Fi o attivate la connessione dati e riprovate."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Toccate per configurare il tethering"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Connetti alla rete mobile"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Non mostrare più"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Almeno %d caratteri"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Disattiva tethering"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Nessun nome"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Tethering attivato."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Disattiva"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Connessione di rete assente"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "La visibilità Bluetooth è scaduta. Il dispositivo in uso potrebbe non essere trovato"
+msgstr "La visibilità Bluetooth è scaduta. Il dispositivo in uso potrebbe non essere trovato."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Timeout connessione."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Non mostrare più"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Immettete password di almeno 8 caratteri."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Tipo di protezione: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Impostazioni"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Il tethering aumenta il consumo della batteria e l'uso dei dati. Il numero massimo consentito di dispositivi collegati tramite tethering è %d"
+msgstr "Il tethering aumenta il consumo della batteria e l'uso dei dati. Il numero massimo consentito di dispositivi collegati tramite tethering è %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Tethering attivato."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "La rete Wi-Fi verrà disconnessa. Il tethering aumenta il consumo della batteria e l'uso dei dati. Il numero massimo consentito di dispositivi collegati tramite tethering è %d"
+msgstr "La rete Wi-Fi verrà disconnessa. Il tethering aumenta il consumo della batteria e l'uso dei dati. Il numero massimo consentito di dispositivi collegati tramite tethering è %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Attiva"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Il dispositivo connesso verrà disconnesso"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Limite utiliz. dati ragg."
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Dispositivi connessi: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Mod. offl."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "I nomi dei dispositivi consentono di distinguere ciascun dispositivo vicino presente in elenco e quelli connessi con Bluetooth, Wi-Fi Direct e altri metodi."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Per utilizzare il tethering, connettetevi a una rete mobile."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Rinomina"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Dispositivi connessi"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Errore scheda SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Impossibile utilizzare servizio a pacchetti. Fuori da copertura."
 
diff --git a/po/ja_JP.po b/po/ja_JP.po
index 8809fad..13aaaae 100644..100755
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -1,129 +1,270 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "このパスワードはWi-Fiテザリングのみに使用します。"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "キャンセル"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fiテザリング非表示"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fiテザリング"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-FiをONにすると、モバイルホットスポットが無効になります。続行しますか？"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fiテザリング設定"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "データ​使用量"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "テザリング"
+
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "今後表示しない"
+
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-FiをONにすると、Wi-Fiテザリングが無効になります。"
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "最大文字数(%d文字)に達しました。"
+
+msgid "IDS_COM_SK_NO"
+msgstr "いいえ"
+
+msgid "IDS_BR_SK_YES"
+msgstr "はい"
+
+msgid "IDS_BR_SK_NO"
+msgstr "いいえ"
+
+msgid "IDS_BR_SK_DONE"
+msgstr "完了"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "キャンセル"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Wi-Fiネットワークに接続中は、Bluetoothテザリングを使用できません。"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "受信済み："
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "デバイス名称を変更"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "送信："
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "マイデバイス名"
+
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "パスワードを入力"
+
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "完了"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "キャンセル"
+
+msgid "IDS_COM_SK_YES"
+msgstr "はい"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "保存"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "設定"
+
+msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
+msgstr "Bluetoothテザリング"
+
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "接続中のデバイス"
+
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "データ使用量: %s"
 
 msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
 msgstr "デバイス名称"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "パスワード"
-
 msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
 msgstr "端末名は%sで変更できます。"
 
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "デバイス名称： %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "%d文字以上入力してください。"
+
 msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
 msgstr "マイデバイスを非表示"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "データ使用量"
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "パスワード"
+
+msgid "IDS_MOBILEAP_BODY_PD_BYTES"
+msgstr "%d Bytes"
+
+msgid "IDS_MOBILEAP_BODY_PD_KB"
+msgstr "%d KB"
+
+msgid "IDS_MOBILEAP_BODY_PD_MB"
+msgstr "%dMB"
+
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "セキュリティ"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "テザリングを設定するにはタップしてください。"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "テザリング中..."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "現在、テザリングは他のアプリケーションによってコントロールされています。テザリングを設定すると、他のアプリケーションは無効になります。"
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "このパスワードはWi-Fiテザリングのみに使用します。"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fiテザリング非表示"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "モバイルネットワークに接続"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USBケーブルを接続"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "機内モードを無効にする"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "SIMカードを挿入"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "テザリングに失敗"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "テザリング使用不可"
 
 msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
 msgstr "USBテザリング"
 
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fiテザリング"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fiテザリング設定"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "接続デバイス:%d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "接続中のデバイスを切断します。"
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "USBケーブルを接続してください。"
+
 msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
 msgstr "テザリングを無効にすると、インターネットにアクセスしている端末の接続を停止します。続行しますか？"
 
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USBテザリングを有効にすると、USB接続が切断されます。"
+
 msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
 msgstr "テザリングを使用するには、SIMカードを挿入し、端末を再起動してください。"
 
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "テザリング機能を有効にするには、モバイルネットワークまたはWi-Fiに接続してください。"
+
 msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
 msgstr "テザリングを使用できません。"
 
 msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
 msgstr "機内モードではテザリングを使用できません。テザリングを使用するには、機内モードを無効にしてください。"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "端末情報"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "テザリング接続がタイムアウト"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "接続中のデバイス"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "テザリング接続がタイムアウトになりました。"
 
-msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
-msgstr "Bluetoothテザリング"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "モバイルデータが無効です。モバイルデータを有効にしてから、再度実行してください。"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "セキュリティ"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "ﾓﾊﾞｲﾙﾈｯﾄﾜｰｸに接続"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "テザリング"
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "今後表示しない"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "8文字以上でパスワードを入力してください。"
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USBテザリングを有効にすると、USB接続が切断されます。"
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "%d文字以上必要です。"
 
-msgid "IDS_MOBILEAP_BODY_PD_BYTES"
-msgstr "%d Bytes"
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "テザリングを無効にする"
 
-msgid "IDS_MOBILEAP_BODY_PD_KB"
-msgstr "%d KB"
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "名前なし"
 
-msgid "IDS_MOBILEAP_BODY_PD_MB"
-msgstr "%dMB"
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "テザリングが有効です。"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "圏外です。パケットデータサービスを使用できません。"
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "OFF"
 
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "USBケーブルを接続してください。"
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "ネットワーク接続不可"
 
-msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "パスワードの長さは%d文字以上、%d文字以下である必要があります。"
+msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
+msgstr "Bluetooth公開設定がOFFになっています。この端末は検出されない可能性があります。"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "デバイス名称： %s"
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "接続タイムアウト"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "テザリング中"
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "現在、テザリングは他のアプリケーションによってコントロールされています。テザリングを設定すると、他のアプリケーションは無効になります。"
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "8文字以上でパスワードを入力してください。"
 
 msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
 msgstr "セキュリティタイプ: %s"
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "テザリングを使用するには、モバイルネットワークに接続してください。"
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "設定"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "接続タイムアウト"
+msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
+msgstr "テザリングを有効にするとバッテリー消費量とデータ使用量が増加します。テザリング端末は最大%d台まで接続できます。"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "データ使用量: %s"
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "テザリングが有効です。"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "テザリングを設定するにはタップしてください。"
+msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
+msgstr "Wi-Fiネットワークの接続が解除されます。テザリングを有効にするとバッテリー消費量とデータ使用量が増加します。テザリング端末は最大%d台まで接続できます。"
 
-msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth公開設定がタイムアウトになりました。この端末は検出されない可能性があります。"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "有効"
 
-msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "テザリングはより多くのバッテリーを消費し、データ使用量を増加させます。テザリング端末の最大数は%d台です。"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "データ使用制限に到達"
 
-msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fiネットワークの接続が解除されます。テザリングはより多くのバッテリーを消費し、データ使用量を増加させます。テザリング端末の最大数は%dです。"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "機内モード"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "テザリングはより多くのバッテリーを消費し、データ使用量が増加します。"
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "近くのデバイス、Bluetooth、Wi-Fi Directなどで表示される利用可能なデバイスリストに、デバイスの名前を表示して、簡単に区別することができます。"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "接続中のデバイスを切断します。"
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "テザリングを使用するには、モバイルネットワークに接続してください。"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "デバイス​に​接続​しました:​%d"
+msgid "IDS_ST_SK_RENAME"
+msgstr "名前変更"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "接続デバイス"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIMカードエラー発生"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "圏外です。パケットデータサービスを使用できません。"
 
diff --git a/po/ka.po b/po/ka.po
index 7f663f0..dbe6ac2 100644..100755
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "ეს პაროლი არის მხოლოდ Wi-Fi მობილური ინტერნეტისთვის"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "გაუქმება"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi მობილური ინტერნეტი დამალულია"
+msgid "IDS_COM_SK_OK"
+msgstr "კი"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi მობილური ინტერნეტი"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fi-ის ჩართვით გაითიშება მობილური ცხელი წერტილი. განაგრძობთ?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi ინტერნეტის პარამეტ."
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "მონაცემთა გამოყენება"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "მიღებულია:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "მიბმა"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "გაგზავნილი:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "აღარ მაჩვენო"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "მოწყობილობის სახელი"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "თუ ჩართავთ Wi-Fi-ს, გამოირთვება Wi-Fi მობილური ინტერნეტი კომპიუტერში."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "პაროლი"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა %d"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "თუ გსურთ შეცვალოთ აპარატის სახელი, გახსენით %s"
+msgid "IDS_COM_SK_NO"
+msgstr "არა"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "დაიმალოს ჩემი მოწყობილობა"
+msgid "IDS_BR_SK_YES"
+msgstr "კი"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "მონაცემთა გამოყენება"
+msgid "IDS_BR_SK_NO"
+msgstr "არა"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "მობილური ქსელი USB-თი"
+msgid "IDS_BR_SK_DONE"
+msgstr "შესრულდა"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "კომპიუტერით მობილური ინტერნეტის გამორთვა არ მისცემს საშუალებას დაკავშირებულ მოწყობილობებს დაუკავშირდნენ ინტერნეტს. განაგრძობთ?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "გაუქმება"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "ჩადეთ SIM და გადატვირთეთ აპარატი, რომ გამოიყენოთ მობილური ინტერნეტი კომპიუტერში"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Bluetooth-ით მობილურ ინტერნეტს ვერ გამოიყენებთ კომპიუტერში, როდესაც კავშირი დამყარებულია Wi-Fi ქსელთან."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "კომპიუტერით მობილური ინტერნეტის გამოყენება შეუძლებელია"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "მოწყობილობის სახელის შეცვლა"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "ნოუთბუქით მობილურ ინტერნეტ–კავშირს ვერ გამოიყენებთ ფრენის რეჟიმში. მობილური ინტერნეტის გამოსაყენებლად, გამორთეთ ფრენის რეჟიმი"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "ჩემი მოწყობილობის სახელი"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "ტელეფონის შესახებ"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "პაროლის შეყვანა."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "დაკავშირებული მოწყობილობა"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "მზადაა"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "გაუქმება"
+
+msgid "IDS_COM_SK_YES"
+msgstr "კი"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "შენახვა"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "პარამეტრები"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "მობილური ინტერნეტის გაზიარება Bluetooth-ით"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "უსაფრთხოება"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "დაკავშირებული მოწყობილობა"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "მიბმა"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "გამოყენებულია: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "ჩაწერეთ მინიმუმ 8 სიმბოლოსგან შედგენილი პაროლი"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "მოწყობილობის სახელი"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "თუ ნოუთბუქში ჩართავთ მობილურ ინტერნეტს USB-თი, წინა USB კავშირი გაითიშება"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "თუ გსურთ შეცვალოთ აპარატის სახელი, გახსენით %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "მოწყობილობის სახელი: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "ჩაწერეთ მინიმუმ %d სიმბოლო."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "დაიმალოს ჩემი მოწყობილობა"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "პაროლი"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d ბაიტი"
@@ -76,17 +100,11 @@ msgstr "%d კბ."
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d მბ"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "პაკეტის სერვისს ვერ გამოიყენებთ. დაფარვის ზონის გარეთ"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "USB კაბელის მიერთება"
-
-msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "პაროლი უნდა შეიცავდეს მინიმუმ %d და მაქსიმუმ %d სიმბოლოს"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "უსაფრთხოება"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "მოწყობილობის სახელი: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "შეეხეთ და აირჩიეთ კომპიუტერში მობილური ინტერნეტის კონფიგურაცია."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "მობ. ქსელი ჩართ."
@@ -94,36 +112,159 @@ msgstr "მობ. ქსელი ჩართ."
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "კომპიუტერში მობილურ ინტერნეტს ამჟამად აკონტროლებს სხვა პროგრამა. კომპიუტერში მობილურ ინტერნეტის კონფიგურაციის შერჩევისთვის ეს პროგრამა გამოირთვება"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "დაცვის ტიპი: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "ეს პაროლი არის მხოლოდ Wi-Fi მობილური ინტერნეტისთვის."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "კომპიუტერში მობილური ინტერნეტის გამოსაყენებლად, დაუკავშირდით მობილურ ქსელებს"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi მობილური ინტერნეტი დამალულია."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "კავშირს დრო გაუვიდა"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "მობილურ ქსელთან დაკავშირება"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "გამოყენებულია: %s"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USB სადენის მიერთება"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "შეეხეთ და აირჩიეთ კომპიუტერში მობილური ინტერნეტის კონფიგურაცია"
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "ფრენის რეჟიმის გამორთვა"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "ჩადეთ SIM ბარათი"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "მობილური ინტერნეტი ვერ ჩაირთო"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "მობ. ინტერნეტს ვერ გამოიყენებთ"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "მობილური ქსელი USB-თი"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi მობილური ინტერნეტი"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi ინტერნეტის პარამეტ."
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "დაკავშირებული მოწყობილობები: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "დაკავშირებულ მოწყობილობასთან კავშირი შეწყდა."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "USB კაბელის მიერთება."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "კომპიუტერით მობილური ინტერნეტის გამორთვა არ მისცემს საშუალებას დაკავშირებულ მოწყობილობებს დაუკავშირდნენ ინტერნეტს. განაგრძობთ?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "თუ ნოუთბუქში ჩართავთ მობილურ ინტერნეტს USB-თი, წინა USB კავშირი გაითიშება."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "ჩადეთ SIM და გადატვირთეთ აპარატი, რომ გამოიყენოთ მობილური ინტერნეტი კომპიუტერში."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "კომპიუტერში მობილური ინტერნეტის ფუნქციის გასააქტიურებლად, დაუკავშირდით მობილურ ან Wi-Fi ქსელს"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "კომპიუტერით მობილური ინტერნეტის გამოყენება შეუძლებელია."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "ნოუთბუქით მობილურ ინტერნეტ–კავშირს ვერ გამოიყენებთ ფრენის რეჟიმში. მობილური ინტერნეტის გამოსაყენებლად, გამორთეთ ფრენის რეჟიმი."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "ქსელის გაზიარების დრო გავიდა"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "მობილური ინტერნეტის გაზიარების დრო გავიდა."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "მობილური მონაცემები გამორთულია. ჩართეთ მობილურ მონაცემთა გადაცემა და ისევ ცადეთ."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "მობილურ ქსელთან კავშირი"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "აღარ მაჩვენო"
+
+msgid "IDS_BR_SK_OK"
+msgstr "კი"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "მინიმუმ %d სიმბოლო"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "მობილური ინტერნეტის გამორთვა"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "უსახელო"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "მობილური ინტერნეტის გაზიარება ჩართულია."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "გამორთვა"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "ქსელთან კავშირი არ არის"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth ხილვადობის დრო გავიდა. თქვენი მოწყობილობა შეიძლება ვერ მოიძებნოს"
+msgstr "Bluetooth ხილვადობის დრო გავიდა. თქვენი მოწყობილობა შეიძლება ვერ მოიძებნოს."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "კავშირს დრო გაუვიდა."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "ჩაწერეთ მინიმუმ 8 სიმბოლოსგან შედგენილი პაროლი."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "დაცვის ტიპი: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "პარამეტრები"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "მობილური ინტერნეტი ხარჯავს უფო მეტ ენერგიას და ზრდის მონაცემთა გამოყენებას. გაზიარებული მობილური ინტერნეტის მქონე მოწყობილობების დასაშვები მაქსიმალური რაოდენობაა %d"
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "მობილური ინტერნეტის გაზიარება ჩართულია."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Wi-Fi ქსელი გაითიშება. მობილური ინტერნეტი ხარჯავს უფო მეტ ენერგიას და ზრდის მონაცემთა გამოყენებას. გაზიარებული მობილური ინტერნეტის მქონე მოწყობილობების დასაშვები მაქსიმალური რაოდენობაა %d"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "მობილური ინტერნეტი ხარჯავს უფო მეტ ენერგიას და ზრდის მონაცემთა გამოყენებას"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "გააქტიურება"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "დაკავშირებულ მოწყობილობასთან კავშირი შეწყდა"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "შეივსო მონაცემთა ლიმიტი"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "დაკავშირებული მოწყობილობები: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "ფრენის რეჟ."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ნაჩვენებია მოწყობილობების სახელები, რათა განასხვაოთ ახლომდებარე მოწყობილობების სიაში მყოფი თითოეული მათგანი, რომელთანაც შეიძლება კავშირის დამყარება Bluetooth-ით, Wi-Fi Direct-ითა და სხვა მეთოდებით."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "კომპიუტერში მობილური ინტერნეტის გამოსაყენებლად, დაუკავშირდით მობილურ ქსელებს."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "გადარქმ."
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "დაკავშირებული მოწყობილობები"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "მოხდა SIM ბარათის შეცდომა"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "პაკეტის სერვისს ვერ გამოიყენებთ. დაფარვის ზონის გარეთ."
 
diff --git a/po/kk.po b/po/kk.po
index b640258..fbb6bd2 100644..100755
--- a/po/kk.po
+++ b/po/kk.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Бұл құпиясөз тек Wi-Fi байланыстыруына арналған"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Тоқтату"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi байланыстыру жасырулы"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi байланыстыру"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fi қосылғанда ұялы жедел нүкте өшеді. Жалғастыру керек пе?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi байл. параметрлері"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Деректер пайдалану"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Қабылданды:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Шектеу"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Жіберілді:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Қайта көрсетпеңіз"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Құрылғының аты"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi қосу Wi-Fi байланыстыруды өшіреді."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Кілтсөз"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Ең көп таңбалар санына (%d) жетті"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Құрылғы атауын %s кейін ауыстыруға болады"
+msgid "IDS_COM_SK_NO"
+msgstr "Жоқ"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Менің құрылғымды жасыру"
+msgid "IDS_BR_SK_YES"
+msgstr "Иә"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Деректер пайдалану"
+msgid "IDS_BR_SK_NO"
+msgstr "Жоқ"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB тіркеу"
+msgid "IDS_BR_SK_DONE"
+msgstr "Дайын"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Байланыстыруды өшіру байланыстырылған құрылғыларды интернетке кіргізбейді. Жалғастыру керек пе?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Тоқтату"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "SIM картасын салып, байланыстыруды пайдалану үшін құрылғыны өшіріп қосыңыз"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Wi-Fi желісіне қосылған кезде Bluetooth бекітуді пайдалану мүмкін емес."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Байланыстыруды пайдалану мүмкін емес"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Құрылғы атын өзгерту"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Ұшу режимінде байланыстыруды пайдалану мүмкін емес. Байланыстыруды пайдалану үшін ұшу режимін өшіріңіз"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Менің құрылғымның аты"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Телефон туралы"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Кілтсөз енгізіңіз."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Қосылған құрылғы"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "ДАЙЫН"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "БАС ТАРТУ"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Иә"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Сақтау"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Қондырғылар"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth бекіту"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Қауіпсіздік"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Қосылған құрылғы"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Шектеу"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Пайдал-ған деректер: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Кемінде 8 таңбадан тұратын құпиясөз енгізіңіз"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Құрылғының аты"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB тіркеу қосылғанда алдыңғы USB байланысы ажырайды"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Құрылғы атауын %s кейін ауыстыруға болады."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Құрылғы аты: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Кемінде %d таңба енгізіңіз."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Менің құрылғымды жасыру"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Кілтсөз"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Байт"
@@ -76,17 +100,11 @@ msgstr "%d KБ"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d МБ"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Пакеттік қызметті пайдалану мүмкін емес. Қолдану аясынан тыс жерде"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "USB кабелін қосу"
-
-msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "Құпиясөзде кемінде %d таңба болуы және %d таңбадан аспауы керек"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Қауіпсіздік"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Құрылғы аты: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Байланыстыруды конфигурациялау үшін түртіңіз."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Байл-тыру қосулы"
@@ -94,36 +112,159 @@ msgstr "Байл-тыру қосулы"
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "Байланыстыру басқа бағдарламамен пайдалануда. Байланыстыруды конфигурациялау үшін, осы бағдарлама өшіріледі"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Қорғаныс түрі: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Бұл құпиясөз тек Wi-Fi байланыстыруына арналған."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Байланыстыруды пайдалану үшін, ұялы желілерге қосылыңыз"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi байланыстыру жасырулы."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Мобильді желіге қосылу"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USB кабелін қосу"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Ұшу режимін өшіру"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "SIM картасын салу"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Байланыстыру сәтсіз аяқталды"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Байланыст-ды пайд. мүмкін емес"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB тіркеу"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi байланыстыру"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi байл. параметрлері"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Қосылған құрылғылар: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Қосылған құрылғы ажыратылады."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "USB кабелін қосу."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Байланыстыруды өшіру байланыстырылған құрылғыларды интернетке кіргізбейді. Жалғастыру керек пе?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB тіркеу қосылғанда алдыңғы USB байланысы ажырайды."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "SIM картасын салып, байланыстыруды пайдалану үшін құрылғыны өшіріп қосыңыз."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Бұл шектеу функциясын іске қосу үшін мобильді немесе Wi-Fi желісіне қосылыңыз"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Байланыстыруды пайдалану мүмкін емес."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Ұшу режимінде байланыстыруды пайдалану мүмкін емес. Байланыстыруды пайдалану үшін ұшу режимін өшіріңіз."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Байланыс-у қосыл-ң уақыты бітті"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Байланыстыру қосылымының уақыты бітті."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Ұялы деректер өшірілді. Ұялы деректерді қосып, әрекетті қайталау."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Мобильді желіге қосылу"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Қайтадан көрсетпеу"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Кемінде %d таңба"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Байланыстыруды өшіру"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Ондай есім жоқ"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Байланыстыру қосылды."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Өшіру"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Желіге қосылым жоқ"
+
+msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
+msgstr "Bluetooth көрінуінің уақыты бітті. Құрылғыңыз табылмауы мүмкін."
 
 msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
 msgstr "Байланыс уақыты бітті"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Пайдал-ған деректер: %s"
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Байланыстыруды конфигурациялау үшін түртіңіз"
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Кемінде 8 таңбадан тұратын құпиясөз енгізіңіз."
 
-msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth көрінуінің уақыты бітті. Құрылғыңыз табылмауы мүмкін"
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Қорғаныс түрі: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Қондырғылар"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Байланыстыру батарея зарядын көп пайдаланып, деректеріңіздің пайдаланылуын арттырады. Рұқсат етілген байланыстыру құрылғылардың ең көп саны — %d"
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Байланыстыру қосылды."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Wi-Fi желісі ажыратылады. Байланыстыру батарея зарядын көп пайдаланып, деректеріңіздің пайдаланылуын арттырады. Рұқсат етілген байланыстыру құрылғылардың ең көп саны — %d"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "Байланыстыру батарея зарядын көп пайдаланып, деректеріңіздің пайдаланылуын арттырады"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Қосу"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Қосылған құрылғы ажыратылады"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Дер-рді пайд.шегіне жетті"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Қосылған құрылғылар: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Ұшу режимі"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Құрылғы атаулары жақын құрылғылар тізімінде қол жетімді құрылғылар ақылы көрсетіледі."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Байланыстыруды пайдалану үшін, ұялы желілерге қосылыңыз."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Бсқш атау"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Қосылған құрылғылар"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM карта қатесі орын алды"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Пакеттік қызметті пайдалану мүмкін емес. Қолдану аясынан тыс жерде."
 
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 21b7b41..b31522c 100644..100755
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "이 비밀번호는 Wi-Fi 테더링 전용입니다"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "취소"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi 테더링이 표시되지 않습니다"
+msgid "IDS_COM_SK_OK"
+msgstr "확인"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi 테더링"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fi를 실행하면 [모바일 핫스팟]은 해제됩니다. 계속할까요?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi 테더링 설정"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "데이터 사용"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "수신 시간:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "테더링"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "발신 시간:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "다시 보지 않기"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "디바이스 이름"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi를 실행하면 Wi-Fi 테더링을 연결 해제합니다."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "비밀번호"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "최대 글자 수 %d자에 도달하였습니다."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "%s에서 디바이스 이름을 변경할 수 있습니다"
+msgid "IDS_COM_SK_NO"
+msgstr "아니요"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "내 디바이스 숨기기"
+msgid "IDS_BR_SK_YES"
+msgstr "예"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "데이터 사용량"
+msgid "IDS_BR_SK_NO"
+msgstr "아니요"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB 테더링"
+msgid "IDS_BR_SK_DONE"
+msgstr "완료"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "테더링을 해제하면 연결된 기기가 인터넷에 접속할 수 없게 됩니다. 계속할까요?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "취소"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "테더링을 이용하려면 SIM 카드를 삽입하고 디바이스를 다시 시작하세요"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Wi-Fi 네트워크에 연결된 경우에는 [블루투스 테더링]을 사용할 수 없습니다."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "테더링을 사용할 수 없습니다"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "디바이스 이름 변경"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "비행기 탑승 모드에서 테더링을 사용할 수 없습니다. 테더링을 사용하려면 비행기 탑승 모드를 해제하세요."
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "내 디바이스 이름"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "휴대폰 정보"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "비밀번호를 입력하세요."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "연결된 기기"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "완료"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "취소"
+
+msgid "IDS_COM_SK_YES"
+msgstr "예"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "저장"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "설정"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "블루투스 테더링"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "보안"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "연결된 디바이스"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "테더링"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "데이터 사용량: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "8자 이상으로 된 비밀번호를 입력하세요"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "디바이스 이름"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB 테더링을 실행하면 이전 USB 연결이 해제됩니다"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "%s에서 디바이스 이름을 변경할 수 있습니다."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "디바이스 이름: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "최소 %d자 이상 입력하세요."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "내 디바이스 숨기기"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "비밀번호"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d바이트"
@@ -76,54 +100,171 @@ msgstr "%dKB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%dMB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "서비스 지역을 벗어나 패킷 데이터 서비스를 사용할 수 없습니다"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "보안"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "테더링을 구성하려면 누르세요."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "테더링 실행 중"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "다른 애플리케이션이 테더링을 제어하고 있습니다. 구성을 위해 다른 애플리케이션 실행을 해제합니다."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "이 비밀번호는 Wi-Fi 테더링 전용입니다."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi 테더링이 표시되지 않습니다."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "모바일 네트워크에 연결"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USB 케이블 연결"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "비행기 탑승 모드 해제"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "SIM 카드 삽입"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "테더링 안 됨"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "테더링 사용할 수 없음"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB 테더링"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi 테더링"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi 테더링 설정"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "연결된 디바이스: %d개"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "연결된 디바이스가 분리됩니다."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "USB 케이블을 연결하세요"
+msgstr "USB 케이블을 연결하세요."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "테더링을 해제하면 연결된 디바이스가 인터넷에 접속할 수 없습니다. 계속할까요?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB 테더링을 실행하면 이전 USB 연결이 해제됩니다."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "테더링을 이용하려면 SIM 카드를 삽입하고 디바이스를 다시 시작하세요."
 
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "비밀번호는 %d자 이상 %d자 이하여야 합니다"
+msgstr "비밀번호는 최소 %d자 이상, %d자 이하의 문자 또는 숫자를 포함해야 합니다."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "디바이스 이름: %s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "테더링을 사용하면 배터리 및 데이터 사용량이 증가합니다."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "테더링 실행 중"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "테더링 기능을 실행하려면 모바일 네트워크 또는 Wi-Fi에 연결하세요"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "다른 애플리케이션이 테더링을 제어하고 있습니다. 설정을 위해 다른 애플리케이션을 비활성화합니다."
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "테더링을 사용할 수 없습니다."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "보안 형식: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "[비행기 탑승 모드]에서 테더링을 사용할 수 없습니다. 테더링을 사용하려면 [비행기 탑승 모드]를 해제하세요."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "테터링을 사용하려면 모바일 네트워크에 연결하세요"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "테더링 연결 시간 초과"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "연결 시간을 초과하였습니다"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "테더링 연결 시간을 초과하였습니다."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "데이터 사용량: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "[모바일 데이터]가 해제된 상태입니다. [모바일 데이터]를 실행한 후 다시 시도하세요."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "테더링을 설정하려면 누르세요"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "모바일 네트워크에 연결"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "다시 보지 않기"
+
+msgid "IDS_BR_SK_OK"
+msgstr "확인"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "최소 %d자 이상"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "테더링 해제"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "이름이 없습니다"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "[테더링]을 실행하였습니다."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "해제"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "연결된 네트워크 없음"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "블루투스 검색 허용 시간이 초과되어 디바이스가 검색되지 않을 수 있습니다"
+msgstr "블루투스 검색 허용 시간을 초과하여 디바이스가 검색되지 않을 수 있습니다."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "연결 시간을 초과하였습니다."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "다시 보지 않기"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "8자 이상으로 된 비밀번호를 입력하세요."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "보안 방식: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "설정"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "테더링을 사용하면 배터리가 더 많이 소모되며 데이터 사용량이 증가합니다. 테더링할 수 있는 최대 기기 수는 %d개입니다."
+msgstr "테더링을 사용하면 배터리 및 데이터 사용량이 증가합니다. 테더링할 수 있는 최대 디바이스 수는 %d개입니다."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "[테더링]을 실행하였습니다."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi 네트워크 연결이 끊어집니다. 테더링을 사용하면 배터리가 더 많이 소모되며 데이터 사용량이 증가합니다. 테더링할 수 있는 최대 기기 수는 %d개입니다."
+msgstr "Wi-Fi 네트워크 연결을 해제합니다. 테더링을 사용하면 배터리와 데이터 사용량이 증가합니다. 테더링할 수 있는 최대 디바이스 수는 %d개입니다."
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "테더링을 사용하면 배터리가 더 많이 소모되며 데이터 사용량이 증가합니다"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "사용"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "연결된 기기가 분리됩니다"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "데이터 사용 한도 도달"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "연결된 기기: %d개"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "비행기 탑승 모드"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "주변 디바이스, 블루투스, Wi-Fi 다이렉트 및 기타 다른 디바이스 목록에 이름을 표시하여 각 디바이스를 쉽게 구별할 수 있습니다."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "테터링을 사용하려면 모바일 네트워크에 연결하세요."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "이름 변경"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "연결된 디바이스"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM 카드 오류 발생"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "서비스 지역을 벗어나 패킷 데이터 서비스를 사용할 수 없습니다."
 
diff --git a/po/lt.po b/po/lt.po
index e34738d..a64a402 100644..100755
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Šis slaptažodis skirtas tik „Wi-Fi“ siejimui"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Atšaukti"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "„Wi-Fi“ siejimas paslėptas"
+msgid "IDS_COM_SK_OK"
+msgstr "Gerai"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "„Wi-Fi“ siejimas"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Įjungus „Wi-Fi“ bus išjungta mobilioji saitvietė. Tęsti?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "„Wi-Fi“ siej. nustatymai"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Duomenų naudojimas"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Gauta:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Siejama"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Išsiųsta:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Daugiau nerodyti"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Įrenginio vardas"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Įjungus „Wi-Fi“ bus išjungtas „Wi-Fi“ siejimas."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Slaptažodis"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Pasiektas didžiausias simbolių skaičius: %d"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Įrenginio pavadinimas gali būti pakeistas į %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Slėpti mano įrenginį"
+msgid "IDS_BR_SK_YES"
+msgstr "Taip"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Duomenų naudojimas"
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB siejimas"
+msgid "IDS_BR_SK_DONE"
+msgstr "Atlikta"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Išjungus siejimą, susietiems įrenginiams nebus leidžiama pasiekti interneto. Tęsti?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Atšaukti"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Norėdami naudoti siejimą, įdėkite SIM kortelę ir paleiskite įrenginį iš naujo"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Negalima naudoti „Bluetooth“ siejimo, kai prisijungta prie „Wi-Fi“ tinklo."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Negalima naudoti siejimo"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Pervardyti įrenginį"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Skrydžio režimu negalima naudoti siejimo. Jei norite naudoti siejimą, išjunkite skrydžio režimą"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Mano įrenginio pavadinimas"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Apie telefoną"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Įvesti slaptažodį."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Prijungtas įrenginys"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "ATLIKTA"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ATŠAUKTI"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Taip"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Išsaug."
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Nustatymai"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "„Bluetooth“ siejimas"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Sauga"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Prijungtas įrenginys"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Siejama"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Naudojami duomenys: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Įveskite slaptažodį bent iš 8 simbolių"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Įrenginio vardas"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Įjungus USB siejimą, bus atjungtas ankstesnis USB ryšys"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Įrenginio pavadinimas gali būti pakeistas į %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Įrenginio pavadinimas: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Įveskite bent %d simbolius (-ių)."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Slėpti mano įrenginį"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Slaptažodis"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d baitai (-ų)"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Neįmanoma naudoti paketinių duomenų paslaugos. Ne ryšio zonoje"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Sauga"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Bakstelėkite, kad sukonfigūruotumėte siejimą."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Siejimas įjungt."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Siejimą dabar kontroliuoja kita programa. Konfigūruojant siejimą programa bus išjungta."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Šis slaptažodis skirtas tik „Wi-Fi“ siejimui."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "„Wi-Fi“ siejimas paslėptas."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Jungtis prie mobiliojo tinklo"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Jungti USB laidą"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Išjungti skrydžio režimą"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Įdėkite SIM kortelę"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Siejimas nepavyko"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Negalima naudoti siejimo"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB siejimas"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "„Wi-Fi“ siejimas"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "„Wi-Fi“ siej. nustatymai"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Prijungti įrenginiai: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Prijungtas įrenginys bus atjungtas."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Prijungti USB kabelį"
+msgstr "Prijungti USB kabelį."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Išjungus siejimą, susietiems įrenginiams nebus leidžiama pasiekti interneto. Tęsti?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Įjungus USB siejimą, bus atjungtas ankstesnis USB ryšys."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Norėdami naudoti siejimą, įdėkite SIM kortelę ir paleiskite įrenginį iš naujo."
 
 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ų)"
+msgstr "Slaptažodį turi sudaryti ne mažiau kaip %d simboliai (-ių), bet ne daugiau kaip %d simboliai (-ių)."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Įrenginio pavadinimas: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Siejimas įjungt."
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Norėdami įjungti šią siejimo funkciją, prisijunkite prie mobiliojo arba „Wi-Fi“ tinklo"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Siejimą dabar kontroliuoja kita programa. Konfigūruojant siejimą programa bus išjungta"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Negalima naudoti siejimo."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Saugos tipas: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Skrydžio režimu negalima naudoti siejimo. Jei norite naudoti siejimą, išjunkite skrydžio režimą."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Norėdami naudoti siejimo funkciją prisijunkite prie mobiliųjų tinklų"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Baigėsi siejimo ryšio laikas"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Baigėsi prisijungimui skirtas laikas"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Baigėsi siejimo ryšio laikas."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Naudojami duomenys: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobiliojo telefono duomenys išjungti. Įjunkite mobiliojo telefono duomenis ir bandykite dar kartą."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Bakstelėkite, kad sukonfigūruotumėte siejimą"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Jungtis prie mob. tinklo"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Neberodyti"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Gerai"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Bent %d simbolis (-ių)"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Išjungti siejimą"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Nėra vardo"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Siejimas įjungtas."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Išjungti"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Nėra ryšio su tinklu"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "„Bluetooth“ pasiekiamumo laikas baigėsi. Jūsų įrenginys gali būti nerastas"
+msgstr "„Bluetooth“ pasiekiamumo laikas baigėsi. Jūsų įrenginys gali būti nerastas."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Baigėsi prisijungimui skirtas laikas."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Įveskite slaptažodį bent iš 8 simbolių."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Saugos tipas: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Nustatymai"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Kai įjungtas siejimas, suvartojama daugiau akumuliatoriaus energijos ir padidėja duomenų naudojimas. Didžiausias leistinas susietų įrenginių skaičius yra %d"
+msgstr "Kai įjungtas siejimas, suvartojama daugiau akumuliatoriaus energijos ir padidėja duomenų naudojimas. Didžiausias leistinas susietų įrenginių skaičius yra %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Siejimas įjungtas."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "„Wi-Fi“ tinklas bus atjungtas. Kai įjungtas siejimas, suvartojama daugiau akumuliatoriaus energijos ir padidėja duomenų naudojimas. Didžiausias leistinas susietų įrenginių skaičius yra %d"
+msgstr "„Wi-Fi“ tinklas bus atjungtas. Kai įjungtas siejimas, suvartojama daugiau akumuliatoriaus energijos ir padidėja duomenų naudojimas. Didžiausias leistinas susietų įrenginių skaičius yra %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Įjungti"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Prijungtas įrenginys bus atjungtas"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Pasiekta duom. naud. riba"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Prijungti įrenginiai: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Skryd. rež."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Įrenginių pavadinimai rodomi, kad būtų galima išskirti kiekvieną įrenginį netoliese esančių įrenginių sąraše naudojant „Bluetooth“, „Wi-Fi Direct“ ir kitus metodus."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Norėdami naudoti siejimo funkciją prisijunkite prie mobiliųjų tinklų."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Pervardyti"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Prijungti įrenginiai"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Įvyko SIM kortelės klaida"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Neįmanoma naudoti paketinių duomenų paslaugos. Ne ryšio zonoje."
 
diff --git a/po/lv.po b/po/lv.po
index b45dcc9..e1dae77 100644..100755
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Šī parole ir paredzēta tikai Wi-Fi piesaistei"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Atcelt"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi piesaiste ir paslēpta"
+msgid "IDS_COM_SK_OK"
+msgstr "Labi"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi piesaiste"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Ieslēdzot Wi-Fi, tiks deaktivizēts mobilais tīklājs. Vai turpināt?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi piesaistes iestat."
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Datu lietošana"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Saņemts:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Ierīces piesaiste tālrunim"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Nosūtīta:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Nerādīt vēlreiz"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Ierīces nosaukums"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Aktivizējot Wi-Fi, tiks deaktivizēta Wi-Fi piesaiste."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Parole"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Sasniegts maksimālais rakstzīmju skaits (%d)"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Ierīces nosaukumu var mainīt izvēlnē %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Nē"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Slēpt manu ierīci"
+msgid "IDS_BR_SK_YES"
+msgstr "Jā"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Datu lietošana"
+msgid "IDS_BR_SK_NO"
+msgstr "Nē"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB piesaiste"
+msgid "IDS_BR_SK_DONE"
+msgstr "Gatavs"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Izslēdzot piesaisti, tālrunim pievienotās ierīces nevarēs piekļūt internetam. Vai turpināt?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Atcelt"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Lai lietotu piesaisti, Ievietojiet SIM karti un restartējiet tālruni"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Nevar izmantot Bluetooth piesaisti, ja ir izveidots savienojums ar Wi-Fi tīklu."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Nevar izmantot piesaisti"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Pārdēvēt ierīci"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Lidojuma režīmā piesaisti nevar lietot. Lai lietotu piesaisti, deaktivizējiet lidojuma režīmu"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Manas ierīces nosaukums"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Par tālruni"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Ievadiet paroli."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Pievienotā ierīce"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "GATAVS"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ATCELT"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Jā"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Saglabāt"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Iestatījumi"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth piesaiste"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Drošība"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Pievienotā ierīce"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Ierīces piesaiste tālrunim"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Izmantotie dati: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Ievadiet paroli, kurā ir vismaz 8 rakstzīmes"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Ierīces nosaukums"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Aktivizējot USB piesaisti, tiks pārtraukts iepriekšējais USB savienojums"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Ierīces nosaukumu var mainīt izvēlnē %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Ierīces nosaukums: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Ievadiet vismaz %d rakstzīmes."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Slēpt manu ierīci"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Parole"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d baiti"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Nevar lietot pakešu pakalpojumu. Nav pārklājuma"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Drošība"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Pieskarieties, lai konfigurētu piesaisti."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Piesaiste aktīva"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Piesaisti pašreiz pārvalda cita programma. Lai konfigurētu piesaisti, šī programma tiks deaktivizēta."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Šī parole ir paredzēta tikai Wi-Fi piesaistei."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi piesaiste ir paslēpta."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Veidot savien. ar mobilo tīklu"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Pievienojiet USB kabeli"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Deaktivizēt lidojuma režīmu"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Ievietojiet SIM karti"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Piesaiste neizdevās"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Nevar izmantot piesaisti"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB piesaiste"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi piesaiste"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi piesaistes iestat."
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Pievienotas ierīces: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Pievienotā ierīce tiks atvienota."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Pievienot USB kabeli"
+msgstr "Pievienot USB kabeli."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Izslēdzot piesaisti, tālrunim pievienotās ierīces nevarēs piekļūt internetam. Vai turpināt?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Aktivizējot USB piesaisti, tiks pārtraukts iepriekšējais USB savienojums."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Lai lietotu piesaisti, Ievietojiet SIM karti un restartējiet tālruni."
 
 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"
+msgstr "Parolē ir jābūt vismaz %d rakstzīmēm, bet ne vairāk par %d."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Ierīces nosaukums: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Piesaiste aktīva"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Lai aktivizētu šo piesaistes funkciju, izveidojiet savienojumu ar mobilo vai Wi-Fi tīklu"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Piesaisti pašreiz pārvalda cita programma. Lai konfigurētu piesaisti, šī programma tiks deaktivizēta"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Nevar izmantot piesaisti."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Drošības veids: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Lidojuma režīmā piesaisti nevar lietot. Lai lietotu piesaisti, deaktivizējiet lidojuma režīmu."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Lai lietotu piesaisti, izveidojiet savienojumu ar mobilajiem tīkliem"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Piesaistes savienojuma taimauts"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Savienojuma taimauts"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Piesaistes savienojuma taimauts."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Izmantotie dati: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobilie dati ir deaktivizēti. Aktivizējiet mobilos datus un mēģiniet vēlreiz."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Pieskarieties, lai konfigurētu piesaisti"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Veidot sav. ar mob. tīklu"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Vairs nerādīt"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Labi"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Vismaz %d rakstzīmes"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Piesaistes deaktivizēšana"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Nav vārda"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Piesaiste ir aktivizēta."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Izslēgt"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Nav savienojuma ar tīklu"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth redzamībai iestājās taimauts. Jūsu ierīce var nebūt atrodama"
+msgstr "Bluetooth redzamībai iestājās taimauts. Jūsu ierīce var nebūt atrodama."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Savienojuma taimauts."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Ievadiet paroli, kurā ir vismaz 8 rakstzīmes."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Drošības veids: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Iestatījumi"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Piesaiste patērē vairāk akumulatora enerģijas un palielina datu lietojumu. Maksimālais piesaistīto ierīču skaits ir %d"
+msgstr "Piesaiste patērē vairāk akumulatora enerģijas un palielina datu lietojumu. Maksimālais piesaistīto ierīču skaits ir %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Piesaiste ir aktivizēta."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi tīkls tiks atvienots. Piesaiste patērē vairāk akumulatora enerģijas un palielina datu lietojumu. Maksimālais piesaistīto ierīču skaits ir %d"
+msgstr "Wi-Fi tīkls tiks atvienots. Piesaiste patērē vairāk akumulatora enerģijas un palielina datu lietojumu. Maksimālais piesaistīto ierīču skaits ir %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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Aktivizēt"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Pievienotā ierīce tiks atvienota"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Sasn. datu liet. ierob."
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Pievienotas ierīces: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Lid. režīms"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Tiek parādīti ierīču nosaukumi, lai atšķirtu katru ierīci, kas pieejama tuvējo ierīču sarakstā vai izmantojot Bluetooth, Wi-Fi Direct un citas metodes."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Lai lietotu piesaisti, izveidojiet savienojumu ar mobilajiem tīkliem."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Pārdēvēt"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Pievienotās ierīces"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Radās SIM kartes kļūda"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Nevar lietot pakešu pakalpojumu. Nav pārklājuma."
 
diff --git a/po/mk.po b/po/mk.po
index 2cd1599..5259da5 100644..100755
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Оваа лозинка е само за делење Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Откажи"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Скриено делење Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Делење Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Вклучувањето на Wi-Fi ќе го исклучи Mobile Hotspot. Продолжи?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Опции за делење Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Користење податоци"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Примено на:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Споделување"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Пратено на:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Не прикажувај веќе"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Име на уред"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Вклучувањето Wi-Fi ќе го исклучи поврзувањето Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Лозинка"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Достигнат е максималниот број знаци %d."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Името на уредот може да се смени во %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Не"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Прикриј го мојот уред"
+msgid "IDS_BR_SK_YES"
+msgstr "Да"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Користење податоци"
+msgid "IDS_BR_SK_NO"
+msgstr "Не"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Делење преку USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Готово"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Со исклучување на делењето ќе се исклучи врската со интернет на поврзаните уреди. Продолжи?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Откажи"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Вметнете SIM-картичка и рестартирајте го уредот за да го користите делењето"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Не може да се користи поврзувањето Bluetooth додека е поврзана мрежа Wi-Fi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Не може да се користи делење"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Преименувај го уредот"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Не може да се користи делење во режим за летало. За да користите делење, исклучете го режимот за летало"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Име на мојот уред"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "За телефонот"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Внесете лозинка."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Поврзан уред"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "ГОТОВО"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ОТКАЖИ"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Да"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Сочувај"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Опции"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Делење опсег Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Сигурност"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Поврзан уред"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Споделување"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Употребени податоци: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Внесете лозинка од барем 8 знаци"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Име на уред"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Со вклучување на делење преку USB ќе се прекине претходното поврзување USB"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Името на уредот може да се смени во %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Име на уредот: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Внесете барем %d знаци."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Прикриј го мојот уред"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Лозинка"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d бајти"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Не може да се користи пакетната услуга. Надвор од опсегот"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Сигурност"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Допрете за конфигурирање на поврзувањето."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Активно делење"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Делењето моментално го контролира друга апликација. За да го конфигурирате делењето, таа апликација ќе се исклучи."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Оваа лозинка е само за делење Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Скриено делење Wi-Fi."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Поврзи со мобилна мрежа"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Поврзете кабел USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Исклучи режим за летало"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Вметнете SIM-картичка"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Споделување не успеа"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Не може да се користи делење"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Делење преку USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Делење Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Опции за делење Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Поврзани уреди: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Ќе се прекине врската со поврзаниот уред."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Приклучете го USB кабелот"
+msgstr "Приклучете го USB кабелот."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Со исклучување на делењето ќе се исклучи врската со интернет на поврзаните уреди. Продолжи?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Со вклучување на делење преку USB ќе се прекине претходното поврзување USB."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Вметнете SIM-картичка и рестартирајте го уредот за да го користите делењето."
 
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "Лозинката мора да содржи најмалку %d, а најмногу %d знаци"
+msgstr "Лозинката мора да содржи најмалку %d, а најмногу %d знаци."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Име на уредот: %s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "Споделувањето троши повеќе батерија и го зголемува користењето податоци."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Активно делење"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "За да се овозможи оваа функција за поврзување, поврзете се со мобилна или мрежа Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Делењето моментално го контролира друга апликација. За да го конфигурирате делењето, таа апликација ќе се исклучи"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Не може да се користи делење."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Тип безбедност: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Не може да се користи делење во режим за летало. За да користите делење, исклучете го режимот за летало."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "За да користите делење, поврзете се со мобилни мрежи"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Застој на споделувањето"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Застој на врската"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Застој на споделувањето."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Употребени податоци: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Мобилните податоци се исклучени. Вклучете мобилни податоци и обидете се повторно."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Допрете за конфигурирање на поврзувањето"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Поврзи со мобилна мрежа"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Не прикажувај веќе"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Барем %d знаци"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Исклучи споделување"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Нема име"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Вклучено е делење опсег."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Исклучи"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Нема мрежно поврзување"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Истече времето на видливоста Bluetooth. Уредот не може да се најде"
+msgstr "Истече времето на видливоста Bluetooth. Уредот не може да се најде."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Застој на врската."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Внесете лозинка од барем 8 знаци."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Тип безбедност: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Опции"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Делењето троши повеќе батерија и го зголемува користењето податоци. Максималниот дозволен број уреди за делење е %d"
+msgstr "Делењето троши повеќе батерија и го зголемува користењето податоци. Максималниот дозволен број уреди за делење е %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Вклучено е делење опсег."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Ќе се прекине врската со мрежата Wi-Fi. Делењето троши повеќе батерија и го зголемува користењето податоци. Максималниот дозволен број уреди за делење е %d"
+msgstr "Ќе се прекине врската со мрежата Wi-Fi. Делењето троши повеќе батерија и го зголемува користењето податоци. Максималниот дозволен број уреди за делење е %d."
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "Споделувањето троши повеќе батерија и го зголемува користењето податоци"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Вклучи"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Ќе се прекине врската со поврзаниот уред"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Дост.е огран.за кор.под."
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Поврзани уреди: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Реж.за лет."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Имињата на уредите се прикажани за да се разликува секој уред од уредите достапни на листата блиски уреди, како и преку Bluetooth, Wi-Fi Direct и други начини."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "За да користите делење, поврзете се со мобилни мрежи."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Преименувај"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Поврзани уреди"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Дојде до грешка на SIM-карт."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Не може да се користи пакетната услуга. Надвор од опсегот."
 
diff --git a/po/nb.po b/po/nb.po
index 8b7b856..fdb5ddb 100644..100755
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Dette passordet gjelder bare for Wi-Fi-Internettdeling"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Avbryt"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi-Internettdeling skjult"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi-Internettdeling"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Når Wi-Fi slås på, vil Mobile Hotspot deaktiveres. Fortsette?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi-Internettdel.innst."
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Databruk"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Mottatt:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Internettdeling"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Sendt:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ikke vis igjen"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Enhetsnavn"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Hvis du slår på Wi-Fi, vil Wi-Fi-internettdeling deaktiveres."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Passord"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maksimalt antall tegn %d er nådd."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Enhetsnavnet kan endres i %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Nei"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Skjul min enhet"
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Databruk"
+msgid "IDS_BR_SK_NO"
+msgstr "Nei"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-internettdeling"
+msgid "IDS_BR_SK_DONE"
+msgstr "Utført"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Deaktivering av Internettdeling hindrer tilkoblede enheter i å få tilgang til Internett. Fortsette?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Avbryt"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Sett inn SIM-kort og start enheten på nytt for å bruke Internettdeling"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Kan ikke bruke Internettdeling via Bluetooth mens et Wi-Fi-nettverk er koblet til."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Kan ikke bruke Internettdeling"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Gi nytt navn til enhet"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Kan ikke bruke Internettdeling i Flymodus. For å bruke Internettdeling må Flymodus deaktiveres"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Mitt enhetsnavn"
+
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Angi passord."
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Om telefonen"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "FULLFØRT"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "AVBRYT"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Lagre"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Innstillinger"
+
+msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
+msgstr "Internettdeling via Bluetooth"
 
 msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
 msgstr "Tilkoblet enhet"
 
-msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
-msgstr "Bluetooth-internettdeling"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Data brukt: %s"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Sikkerhet"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Enhetsnavn"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Internettdeling"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Enhetsnavnet kan endres i %s."
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Angi et passord på minst 8 tegn"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Enhetsnavn: %s"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Aktivering av USB-internettdeling vil koble fra tidligere USB-tilkobling"
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Angi minst %d tegn."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Skjul min enhet"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Passord"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Byte"
@@ -76,54 +100,171 @@ msgstr "%d kB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Kan ikke bruke pakketjeneste. Utenfor dekningsområdet"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Sikkerhet"
 
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Trykk for å konfigurere Internettdeling."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Deling aktiv"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Internettdeling kontrolleres for øyeblikket av en annen app. Du må deaktivere denne appen før du kan konfigurere Internettdeling."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Dette passordet gjelder bare for Wi-Fi-internettdeling."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi-internettdeling skjult."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Koble til mobilnett"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
 msgstr "Koble til USB-kabel"
 
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Deaktiver Flymodus"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Sett inn SIM-kort"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Internettdeling mislyktes"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Kan ikke bruke Internettdeling."
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-internettdeling"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi-Internettdeling"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi-Internettdel.innst."
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Tilkoblede enheter: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Tilkoblet enhet blir koblet fra."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Koble til USB-kabel."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Deaktivering av Internettdeling hindrer tilkoblede enheter i å få tilgang til Internett. Fortsette?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Aktivering av USB-internettdeling vil koble fra tidligere USB-tilkobling."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Sett inn SIM-kort og start enheten på nytt for å bruke Internettdeling."
+
 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"
+msgstr "Passordet må inneholde minst %d tegn og ikke overstige %d tegn."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Enhetsnavn: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Deling aktiv"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Koble til et mobil- eller Wi-Fi-nettverk for å aktivere denne funksjonen for Internettdeling."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Internettdeling kontrolleres for øyeblikket av et annet program. Du må deaktivere dette programmet før du kan konfigurere Internettdeling"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Kan ikke bruke Internettdeling."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Sikkerhetstype: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Kan ikke bruke Internettdeling i Flymodus. For å bruke Internettdeling må Flymodus deaktiveres."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Hvis du vil bruke Internettdeling, må du koble til mobilnettverk"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Intern.del.forbind. tidsavbrutt"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Tidsavbrudd for tilkobling"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Internettdelingsforbindelse ble tidsavbrutt."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Data brukt: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobildata er deaktivert. Aktiver mobildata, og prøv på nytt."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Trykk for å konfigurere Internettdeling"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Koble til mobilnett"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ikke vis igjen"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Minst %d tegn"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Deaktiver Internettdeling"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Ingen navn"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Internettdeling aktivert."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Slå av"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Ingen nettverksforbindelse"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth-synligheten har blitt tidsavbrutt. Enheten din vil kanskje ikke kunne oppdages"
+msgstr "Bluetooth-synligheten har blitt tidsavbrutt. Enheten din vil kanskje ikke kunne oppdages."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Tidsavbrudd for tilkobling."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Angi et passord på minst 8 tegn."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Sikkerhetstype: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Innstillinger"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Internettdeling bruker mer batteristrøm og øker dataforbruket. Maksimalt antall tillatte enheter som kan bruke Internettdeling, er %d"
+msgstr "Internettdeling bruker mer batteristrøm og øker dataforbruket. Maksimalt antall tillatte enheter som kan bruke Internettdeling, er %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Internettdeling aktivert."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi-nettverket vil bli frakoblet. Internettdeling bruker mer batteristrøm og øker dataforbruket. Maksimalt antall tillatte enheter som kan bruke Internettdeling, er %d"
+msgstr "Wi-Fi-nettverket vil bli frakoblet. Internettdeling bruker mer batteristrøm og øker dataforbruket. Maksimalt antall tillatte enheter som kan bruke Internettdeling, er %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Aktiver"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Tilkoblet enhet blir koblet fra"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Databruksgrense er nådd"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Tilkoblede enheter: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Flymodus"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Enhetsnavn vises for å skille hver enhet som er tilgjengelig, på listen over enheter i nærheten og via Bluetooth, Wi-Fi Direct og andre metoder."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Hvis du vil bruke Internettdeling, må du koble til mobilnett."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Endre navn"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Tilkoblede enheter"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Det oppstod en SIM-kortfeil"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Kan ikke bruke pakketjeneste. Utenfor dekningsområdet."
 
diff --git a/po/nl.po b/po/nl.po
new file mode 100755
index 0000000..db809f7
--- /dev/null
+++ b/po/nl.po
@@ -0,0 +1,270 @@
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annuleren"
+
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
+
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Als u Wi-Fi inschakelt, wordt Mobiele hotspot uitgeschakeld. Doorgaan?"
+
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Gegevensgebruik"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
+
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Niet meer tonen"
+
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Als u Wi-Fi inschakelt, wordt Wi-Fi-tethering uitgeschakeld."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximumaantal tekens %d bereikt."
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nee"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nee"
+
+msgid "IDS_BR_SK_DONE"
+msgstr "Gereed"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annuleren"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Kan Bluetooth-tethering niet gebruiken bij verbinding met Wi-Fi-netwerk."
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Naam apparaat wijzigen"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Mijn apparaatnaam"
+
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Wachtwoord invoeren"
+
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "GEREED"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ANNULEREN"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Opslaan"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Instellingen"
+
+msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
+msgstr "Bluetooth-tethering"
+
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Aangesloten apparaat"
+
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Gebruikte gegevens: %s"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Naam apparaat"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Apparaatnaam kan worden gewijzigd in %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Apparaatnaam: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Voer ten minste %d tekens in."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Mijn apparaat verbergen"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Wachtwoord"
+
+msgid "IDS_MOBILEAP_BODY_PD_BYTES"
+msgstr "%d bytes"
+
+msgid "IDS_MOBILEAP_BODY_PD_KB"
+msgstr "%d kB"
+
+msgid "IDS_MOBILEAP_BODY_PD_MB"
+msgstr "%d MB"
+
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Beveiliging"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Tik om tethering te configureren."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Tethering actief"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Tethering wordt momenteel bediend door een andere applicatie. Als u tethering wilt configureren, wordt die applicatie uitgeschakeld."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Dit wachtwoord geldt alleen voor Wi-Fi-tethering."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi-tethering verborgen."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Verbinden met mobiel netwerk"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USB-kabel aansluiten"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Vliegtuigstand uit"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "SIM-kaart plaatsen"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Tethering mislukt"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Kan tethering niet gebruiken"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi-tethering"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Instell. Wi-Fi-tethering"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Aangesloten apparaten: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Aangesloten apparaat wordt losgekoppeld."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "USB-kabel aansluiten"
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Als u tethering uitschakelt, hebben gekoppelde apparaten geen toegang tot internet. Doorgaan?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Als u USB-tethering inschakelt, wordt eerdere USB-verbinding verbroken."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "SIM-kaart plaatsen en apparaat opnieuw opstarten om tethering te gebruiken."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Als u deze tetheringfunctie wilt inschakelen, moet u verbinding maken met een mobiel of Wi-Fi-netwerk"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Kan tethering niet gebruiken."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Kan tethering niet gebruiken in vliegtuigstand. Schakel vliegtuigstand uit om tethering te gebruiken."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Time-out tetheringverbinding"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Time-out tetheringverbinding."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobiele gegevens is uitgeschakeld. Schakel mobiele gegevens in en probeer het opnieuw."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Verbind met mob. netwerk"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Niet meer tonen"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Ten minste %d tekens"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Tethering uitschakelen"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Geen naam"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Tethering ingeschakeld."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Uitschakelen"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Geen netwerkverbinding"
+
+msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
+msgstr "Time-out voor Bluetooth-zichtbaarheid. Uw apparaat wordt mogelijk niet gevonden."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Verbindingstime-out."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Typ wachtwoord van ten minste 8 tekens."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Beveiligingstype: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Instellingen"
+
+msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
+msgstr "Tethering verbruikt meer voeding en verhoogt uw gegevensgebruik. Het maximumaantal toegestane apparaten met tethering is %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Tethering ingeschakeld."
+
+msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
+msgstr "Verbinding met Wi-Fi-netwerk wordt verbroken. Tethering verbruikt meer voeding en verhoogt uw gegevensgebruik. Het maximumaantal toegestane apparaten met tethering is %d."
+
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Aanzetten"
+
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Limiet geg.gebrk bereikt"
+
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Vliegstand"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Apparaatnamen worden weergegeven om onderscheid te maken tussen de apparaten die beschikbaar zijn in de lijst met apparaten in de buurt, en via Bluetooth, Wi-Fi Direct en andere methoden."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Als u tethering wilt gebruiken, maakt u verbinding met een mobiel netwerk."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Hernoemen"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Verbonden apparaten"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Fout met simkaart opgetreden"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Kan pakketservice niet gebruiken. Geen dekking."
+
diff --git a/po/nl_NL.po b/po/nl_NL.po
deleted file mode 100644
index b1d69c5..0000000
--- a/po/nl_NL.po
+++ /dev/null
@@ -1,129 +0,0 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Dit wachtwoord geldt alleen voor Wi-Fi-tethering"
-
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi-tethering verborgen"
-
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi-tethering"
-
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Instell. Wi-Fi-tethering"
-
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Ontvangen:"
-
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Verzonden:"
-
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Naam apparaat"
-
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Wachtwoord"
-
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Apparaatnaam kan worden gewijzigd in %s"
-
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Mijn apparaat verbergen"
-
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Gegevensgebruik"
-
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-tethering"
-
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Als u tethering uitschakelt, hebben gekoppelde apparaten geen toegang tot internet. Doorgaan?"
-
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "SIM-kaart plaatsen en apparaat opnieuw opstarten om tethering te gebruiken"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Kan tethering niet gebruiken"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Kan tethering niet gebruiken in vliegtuigstand. Schakel vliegtuigstand uit om tethering te gebruiken"
-
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Over het toestel"
-
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Aangesloten apparaat"
-
-msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
-msgstr "Bluetooth-tethering"
-
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Beveiliging"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
-
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Typ wachtwoord van ten minste 8 tekens"
-
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Als u USB-tethering inschakelt, wordt eerdere USB-verbinding verbroken"
-
-msgid "IDS_MOBILEAP_BODY_PD_BYTES"
-msgstr "%d bytes"
-
-msgid "IDS_MOBILEAP_BODY_PD_KB"
-msgstr "%d KB"
-
-msgid "IDS_MOBILEAP_BODY_PD_MB"
-msgstr "%d MB"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Kan pakketservice niet gebruiken. Geen dekking"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-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_BODY_DEVICE_NAME_C_PS"
-msgstr "Apparaatnaam: %s"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Tethering actief"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Tethering wordt momenteel bediend door een andere applicatie. Als u tethering wilt configureren, wordt die applicatie uitgeschakeld"
-
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Beveiligingstype: %s"
-
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Als u tethering wilt gebruiken, maakt u verbinding met een mobiel netwerk"
-
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Verbindingstime-out"
-
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Gebruikte gegevens: %s"
-
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Tik om tethering te configureren"
-
-msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Time-out voor Bluetooth-zichtbaarheid. Uw apparaat wordt mogelijk niet gevonden"
-
-msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Tethering verbruikt meer voeding en verhoogt uw gegevensgebruik. Het maximumaantal toegestane apparaten met tethering is %d"
-
-msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Verbinding met Wi-Fi-netwerk wordt verbroken. Tethering verbruikt meer voeding en verhoogt uw gegevensgebruik. Het maximumaantal toegestane apparaten met tethering is %d"
-
-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"
-
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Aangesloten apparaten: %d"
-
diff --git a/po/pl.po b/po/pl.po
index ecafc35..ed6525d 100644..100755
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "To hasło jest tylko do routera Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Anuluj"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Router Wi-Fi ukryty"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Router Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Włączenie sieci Wi-Fi spowoduje wyłączenie Mobile Hotspot. Kontynuować?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Ustawienia routera Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Licznik danych"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Odebrano:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Udost. poł. internetowego"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Wysłano:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Nie wyświetlaj ponownie"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nazwa urządzenia"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Włączenie sieci Wi-Fi spowoduje wyłączenie udostępniania przez tę sieć."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Hasło"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Osiągnięto maksymalną liczbę znaków: %d."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Nazwę urządzenia można zmienić w następującej lokalizacji: %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Nie"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Ukryj urządzenie"
+msgid "IDS_BR_SK_YES"
+msgstr "Tak"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Licznik danych"
+msgid "IDS_BR_SK_NO"
+msgstr "Nie"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Router USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Gotowe"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Wyłączenie routera uniemożliwi podłączonym urządzeniom łączenie się z Internetem. Kontynuować?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Anuluj"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Włóż kartę SIM i uruchom urządzenie ponownie, aby korzystać z udostępniania"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Nie można korzystać z routera Bluetooth przy połączeniu z siecią Wi-Fi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Nie można użyć routera"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Zmień nazwę urządzenia"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Nie można korzystać z udostępniania w trybie Offline. Aby korzystać z udostępniania, wyłącz tryb Offline"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nazwa mojego urządzenia"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "O telefonie"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Wpisz hasło."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Podłączone urządzenie"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "GOTOWE"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ANULUJ"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Tak"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Zapisz"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Ustawienia"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Router Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Bezpieczeństwo"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Podłączone urządzenie"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Udost. poł. internetowego"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Użyte dane: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Wprowadź hasło składające się co najmniej z 8 znaków"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nazwa urządzenia"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Włączenie routera USB spowoduje rozłączenie poprzedniego połączenia USB"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Nazwę urządzenia można zmienić w następującej lokalizacji: %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nazwa urządzenia: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Wprowadź co najmniej znaków: %d."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Ukryj urządzenie"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Hasło"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "Bajtów: %d"
@@ -76,54 +100,171 @@ msgstr "%d kB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Nie można włączyć usługi pakietowej. Brak zasięgu"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Bezpieczeństwo"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Dotknij, aby skonfigurować udostępnianie."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Udostęp. aktywne"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Router jest aktualnie sterowany przez inną aplikację. Aby skonfigurować router, ta aplikacja zostanie wyłączona."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "To hasło jest tylko do routera Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Router Wi-Fi ukryty."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Połączenie z siecią komórkową"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Podłączanie kabla USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Wyłączanie trybu Offline"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Włóż kartę SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Błąd routera"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Nie można użyć routera"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Router USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Router Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Ustawienia routera Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Podłączone urządzenia: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Podłączone urządzenie zostanie odłączone."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Podłącz kabel USB"
+msgstr "Podłącz kabel USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Wyłączenie routera uniemożliwi podłączonym urządzeniom łączenie się z Internetem. Kontynuować?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Włączenie routera USB spowoduje rozłączenie poprzedniego połączenia USB."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Włóż kartę SIM i uruchom urządzenie ponownie, aby korzystać z udostępniania."
 
 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"
+msgstr "Hasło musi zawierać co najmniej %d znaków i nie przekraczać %d znaków."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Nazwa urządzenia: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Udostęp. aktywne"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Aby włączyć tę funkcję routera, połącz się z siecią komórkową lub Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Router jest aktualnie sterowany przez inną aplikację. Aby skonfigurować router, ta aplikacja zostanie wyłączona"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Nie można użyć routera."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Typ zabezpieczeń: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Nie można korzystać z udostępniania w trybie Offline. Aby korzystać z udostępniania, wyłącz tryb Offline."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Aby używać routera, skorzystaj z sieci telefonii komórkowych"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Minął czas połączen. z routerem"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Limit czasu połączenia"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Przekroczono limit czasu połączenia z routerem."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Użyte dane: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Transmisja danych po sieci jest wyłączona. Włącz transmisję danych po sieci i spróbuj ponownie."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Dotknij, aby skonfigurować udostępnianie"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Połącz z siecią komórkową"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Nie pokazuj ponownie"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Co najmniej znaków: %d"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Wyłączanie routera"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Bez nazwy"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Router włączony."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Wyłącz"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Brak połączenia sieciowego"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Upłynął limit czasu widoczności Bluetooth. Nie można znaleźć urządzenia"
+msgstr "Upłynął limit czasu widoczności Bluetooth. Nie można znaleźć urządzenia."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Limit czasu połączenia."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Wprowadź hasło składające się co najmniej z 8 znaków."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Typ zabezpieczeń: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Ustawienia"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Router zużywa dodatkową energię baterii i zwiększa użycie danych. Maksymalna dozwolona liczba udostępnianych urządzeń to: %d"
+msgstr "Router zużywa dodatkową energię baterii i zwiększa użycie danych. Maksymalna dozwolona liczba udostępnianych urządzeń to: %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Router włączony."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Sieć Wi-Fi zostanie rozłączona. Router zużywa dodatkową energię baterii i zwiększa użycie danych. Maksymalna dozwolona liczba udostępnianych urządzeń to: %d"
+msgstr "Sieć Wi-Fi zostanie rozłączona. Router zużywa dodatkową energię baterii i zwiększa użycie danych. Maksymalna dozwolona liczba udostępnianych urządzeń to: %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Włącz"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Podłączone urządzenie zostanie odłączone"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Osiąg. limit użycia dan."
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Podłączone urządzenia: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Tr. Offline"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Nazwy urządzeń są wyświetlane w celu rozróżnienia poszczególnych urządzeń dostępnych na liście urządzeń w pobliżu lub dostępnych przez Bluetooth, Wi-Fi Direct oraz innymi metodami."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Aby używać routera, skorzystaj z sieci telefonii komórkowych."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Zmień nazwę"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Podłączone urządzenia"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Wystąpił błąd karty SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Nie można włączyć usługi pakietowej. Brak zasięgu."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9dee932..c805992 100644..100755
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Esta senha é apenas para a ancoragem Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Ancoragem Wi-Fi oculta"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Ancoragem Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Ativar o Wi-Fi desativará o ponto de acesso Mobile. Continuar?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Config. ancoragem Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Uso de dados"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Recebido:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Ancoragem"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Enviado:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Não mostrar novamente"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nome do dispositivo"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Ligar o Wi-Fi desativará o compartilhamento Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Senha"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Número máximo de %d caracteres atingido."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "O nome do dispositivo pode ser alterado em %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Não"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Ocultar o meu dispositivo"
+msgid "IDS_BR_SK_YES"
+msgstr "Sim"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Uso de dados"
+msgid "IDS_BR_SK_NO"
+msgstr "Não"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Ancoragem via USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Concluir"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "A desativação da ancoragem evitará que dispositivos vinculados acessem a Internet. Continuar?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Insira o cartão SIM e reinicie o dispositivo para usar a ancoragem"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Não é possível usar a ancoragem Bluetooth enquanto a rede Wi-Fi está conectada."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Não é possível usar a ancoragem"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Renomear dispositivo"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Não é possível usar a ancoragem em modo Offline. Para usar a ancoragem, desative o modo Offline"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nome do meu dispositivo"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Sobre o telefone"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Insira senha."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Dispositivo conectado"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "CONCLUÍDO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CANCELAR"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Sim"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Salvar"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Configurações"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Ancoragem Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Segurança"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Dispositivo conectado"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Ancoragem"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Dados usados: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Inserir senha com pelo menos 8 caracteres"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nome do dispositivo"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Ativar a ancoragem via USB irá desconectar a conexão USB anterior"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "O nome do dispositivo pode ser alterado em %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nome do dispositivo: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Inserir pelo menos %d caracteres."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Ocultar o meu dispositivo"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Senha"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d bytes"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Impossível utilizar serviço por pacotes. Fora da cobertura"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Segurança"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Toque para configurar a ligação tethering."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Ancoragem ativa"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "A ancoragem está sendo controlada no momento por outro aplicativo. Para configurar a ancoragem, o aplicativo será desativado."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Esta senha é apenas para a ancoragem Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Ancoragem Wi-Fi oculta."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Conectar à rede móvel"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Conectar cabo USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Desativar Modo Offline"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Insira cartão SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Falha no roteamento"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Impossível usar o roteamento"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Ancoragem via USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Ancoragem Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Config. ancoragem Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Dispositivos conectados: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "O dispositivo conectado será desconectado."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Conecte o cabo USB"
+msgstr "Conecte o cabo USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "A desativação da ancoragem evitará que dispositivos vinculados acessem a Internet. Continuar?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Ativar a ancoragem via USB irá desconectar a conexão USB anterior."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Insira o cartão SIM e reinicie o dispositivo para usar a ancoragem."
 
 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"
+msgstr "A senha deve conter pelo menos %d caracteres e não exceder %d caracteres."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Nome do dispositivo: %s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "A ancoragem consome mais bateria e aumenta sua utilização de dados."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Ancoragem ativa"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Para ativar esta função de roteamento, conecte-se a uma rede móvel ou Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "A ancoragem está sendo controlada no momento por outro aplicativo. Para configurar a ancoragem, o aplicativo será desativado"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Não é possível usar a ancoragem."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Tipo de segurança: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Não é possível usar a ancoragem em modo Offline. Para usar a ancoragem, desative o modo Offline."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Para usar a ancoragem, conecte-se a uma rede móvel"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Roteamento da conexão encerrado"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Tempo de conexão esgotado"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Roteamento da conexão encerrado."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Dados usados: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "A rede de dados móveis está desativada. Ative os dados móveis e tente novamente."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Toque para configurar a ligação tethering"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Conectar à rede móvel"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Não exibir novamente"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Pelo menos %d caracteres"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Desative o Roteamento"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Sem nome"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Ancoragem ativada."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Desligar"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Sem conexão de rede"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "O período de visibilidade do Bluetooth expirou. Seu dispositivo não pode ser localizado"
+msgstr "O período de visibilidade do Bluetooth expirou. Seu dispositivo não pode ser localizado."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Tempo de conexão esgotado."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Inserir senha com pelo menos 8 caracteres."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Tipo de segurança: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Configurações"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "A conexão tethering consome mais bateria e aumenta sua utilização de dados. O número máximo de dispositivo conectados permitidos é de %d"
+msgstr "A conexão tethering consome mais bateria e aumenta sua utilização de dados. O número máximo de dispositivo conectados permitidos é de %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Ancoragem ativada."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "A rede Wi-Fi será desconectada. A conexão tethering consome mais bateria e aumenta sua utilização de dados. O número máximo de dispositivo conectados permitidos é de %d"
+msgstr "A rede Wi-Fi será desconectada. A conexão tethering consome mais bateria e aumenta sua utilização de dados. O número máximo de dispositivo conectados permitidos é de %d."
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "A ancoragem consome mais bateria e aumenta sua utilização de dados"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Ativar"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "O dispositivo conectado será desconectado"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Limite uso dados atingido"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Dispositivos conectados: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Modo de voo"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Os nomes dos dispositivos são exibidos para distinguir cada um dos dispositivos disponíveis na lista de dispositivos próximos e por Bluetooth, Wi-Fi Direct e outros métodos."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Para usar a ancoragem, conecte-se a uma rede móvel."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Renomear"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Dispositivos conectados"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Erro no cartão SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Impossível utilizar serviço por pacotes. Fora da cobertura."
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 960c9cf..2bad877 100644..100755
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Esta palavra-passe é apenas para a ancoragem Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Ancoragem Wi-Fi oculta"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Ancoragem Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Ligar o Wi-Fi irá desactivar o PA Móvel. Continuar?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Defs. ancoragem Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Utilização de dados"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Recebido:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Partilha de Internet"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Enviado:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Não mostrar novamente"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nome do dispositivo"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Ligar o Wi-Fi irá desactivar a ancoragem Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Palavra-passe"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Número máximo de caracteres %d atingido."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "O nome do dispositivo pode ser alterado em %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Não"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Ocultar o meu dispositivo"
+msgid "IDS_BR_SK_YES"
+msgstr "Sim"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Utilização de dados"
+msgid "IDS_BR_SK_NO"
+msgstr "Não"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Ancoragem USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Concluído"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "A desactivação da ancoragem impede os dispositivos ligados de acederem à Internet. Continuar?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Inserir cartão SIM e reiniciar o dispositivo para utilizar a ancoragem"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Impossível utilizar a ancoragem Bluetooth durante a ligação à rede Wi-Fi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Impossível utilizar a ancoragem"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Mudar o nome do dispositivo"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Impossível utilizar a ancoragem no modo de Voo. Para utilizar a ancoragem, desactive o modo de Voo"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nome do meu dispositivo"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Acerca do telefone"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Introduzir palavra-passe."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Dispositivo ligado"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "CONCLUÍDO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "CANCELAR"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Sim"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Guardar"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Definições"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Ancoragem Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Segurança"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Dispositivo ligado"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Partilha de Internet"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Dados utilizados: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Introduzir palavra-passe com pelo menos 8 caracteres"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nome do dispositivo"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "A activação da ancoragem USB irá desligar a ligação USB anterior"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "O nome do dispositivo pode ser alterado em %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nome do dispositivo: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Introduzir pelo menos %d caracteres."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Ocultar o meu dispositivo"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Palavra-passe"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d bytes"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Impossível utilizar serviço por pacotes. Fora de cobertura"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-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_BODY_SECURITY"
+msgstr "Segurança"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Nome do dispositivo: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Toque para configurar a ancoragem."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Ancor. activa"
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "A ancoragem está a ser controlada actualmente por outra aplicação. Para configurar a ancoragem, essa aplicação será desactivada"
+msgstr "A ancoragem está a ser controlada actualmente por outra aplicação. Para configurar a ancoragem, essa aplicação será desactivada."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Tipo de segurança: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Esta palavra-passe é apenas para a ancoragem Wi-Fi."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Para utilizar a ancoragem, ligue a redes móveis"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Ancoragem Wi-Fi oculta."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Ligar a rede móvel"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Ligar cabo USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Desactivar Modo de voo"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Inserir cartão SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Ancoragem falhou"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Impossível utilizar ancoragem"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Ancoragem USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Ancoragem Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Defs. ancoragem Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Dispositivos ligados: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "O dispositivo ligado será desligado."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Ligar cabo USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "A desactivação da ancoragem impede os dispositivos ligados de acederem à Internet. Continuar?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "A activação da ancoragem USB irá desligar a ligação USB anterior."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Inserir cartão SIM e reiniciar o dispositivo para utilizar a ancoragem."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Para activar a função de ancoragem, ligue a uma rede móvel ou Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Impossível utilizar a ancoragem."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Impossível utilizar a ancoragem no modo de Voo. Para utilizar a ancoragem, desactive o modo de Voo."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
 msgstr "Tempo de ligação esgotado"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Dados utilizados: %s"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tempo de ligação de ancoragem esgotado."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Toque para configurar a ancoragem"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Os dados móveis estão desactivados. Active os dados móveis e tente novamente."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Ligar a rede móvel"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Não mostrar novamente"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Pelo menos %d caracteres"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Desactivar Ancoragem"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Sem nome"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Ancoragem activada."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Desligar"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Nenhuma ligação de rede"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Tempo de visibilidade Bluetooth esgotado. O seu dispositivo pode não ser encontrado"
+msgstr "Tempo de visibilidade Bluetooth esgotado. O seu dispositivo pode não ser encontrado."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Tempo de ligação esgotado."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Introduzir palavra-passe com pelo menos 8 caracteres."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Tipo de segurança: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Definições"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "A ancoragem consome mais bateria e aumenta a utilização de dados. O número máximo de dispositivos ancorados permitido é %d"
+msgstr "A ancoragem consome mais bateria e aumenta a utilização de dados. O número máximo de dispositivos ancorados permitido é %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Ancoragem activada."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "A rede Wi-Fi vai ser desligada. A ancoragem consome mais bateria e aumenta a utilização de dados. O número máximo de dispositivos ancorados permitido é %d"
+msgstr "A rede Wi-Fi vai ser desligada. A ancoragem consome mais bateria e aumenta a utilização de dados. O número máximo de dispositivos ancorados permitido é %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Activar"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "O dispositivo ligado será desligado"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Limite dados atingido"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Dispositivos ligados: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Modo de voo"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Os nomes dos dispositivos são apresentados para os distinguir dos dispositivos disponíveis na lista de dispositivos próximos e via Bluetooth, Wi-Fi Direct e outros métodos."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Para utilizar a ancoragem, ligue a redes móveis."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Mudar nome"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Dispositivos ligados"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Ocorreu um erro de cartão SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Impossível utilizar serviço por pacotes. Fora de cobertura."
 
diff --git a/po/ro.po b/po/ro.po
index b5c3556..bb9a5e0 100644..100755
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Această parolă este numai pentru furnizarea accesului la Internet prin Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Anulare"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Furnizarea de acces la Internet prin Wi-Fi a fost ascunsă"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Furn. acc. Internet Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Activarea Wi-Fi va dezactiva Mobile Hotspot. Continuaţi?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Set. furn. ac. Int. Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Utilizare date"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Primit:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Trimis:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Nu se mai afişează"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Nume dispozitiv"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Activarea Wi-Fi va dezactiva furnizarea accesului la internet prin Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Parolă"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "S-a atins numărul maxim de %d caractere."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Numele dispozitivului poate fi modificat în %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Nu"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Ascundere dispozitiv"
+msgid "IDS_BR_SK_YES"
+msgstr "Da"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Utilizare date"
+msgid "IDS_BR_SK_NO"
+msgstr "Nu"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Partajare conex. Internet"
+msgid "IDS_BR_SK_DONE"
+msgstr "Gata"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Prin dezactivarea furnizării accesului la Internet, nu se va permite accesul la Internet al dispozitivelor conectate. Continuaţi?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Anulare"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Introduceţi cartela SIM şi reporniţi dispozitivul pentru a utiliza furnizarea accesului la Internet"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Nu se poate utiliza furnizarea accesului la Internet prin Bluetooth în timp ce sunteţi conectat la reţeaua Wi-Fi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Imposibil de utilizat furnizarea de acces la Internet"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Redenumire dispozitiv"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Imposibil de utilizat furnizarea accesului la Internet în modul Avion. Pentru a utiliza furnizarea accesului la Internet, dezactivaţi modul Avion"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Numele dispozitivului meu"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Despre telefon"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Introduceţi parola."
+
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "EFECTUAT"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ANULARE"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Da"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Salvare"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Setări"
+
+msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
+msgstr "Tethering prin Bluetooth"
 
 msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
 msgstr "Dispozitiv conectat"
 
-msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
-msgstr "Furnizare acces la Internet prin Bluetooth"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Date utilizate: %s"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Securitate"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Nume dispozitiv"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Numele dispozitivului poate fi modificat în %s."
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Introduceţi o parolă de minimum 8 caractere"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Nume dispozitiv: %s"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Activarea furnizării accesului la Internet prin USB va determina deconectarea conexiunii USB anterioare"
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Introduceţi minimum %d caractere."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Ascundere dispozitiv"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Parolă"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d octeţi"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Imposibil de utilizat serviciul de transfer de pachete. În afara ariei de acoperire"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Securitate"
 
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Atingeţi pentru a configura furnizarea accesului la internet."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Acces internet activ"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Furnizarea accesului la internet este controlată în prezent de o altă aplicaţie. Pentru a configura furnizarea accesului la internet, aplicaţia respectivă va fi dezactivată."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Această parolă este numai pentru furnizarea accesului la Internet prin Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Furnizarea de acces la Internet prin Wi-Fi a fost ascunsă."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Conectare la reţeaua mobilă"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
 msgstr "Conectaţi cablul USB"
 
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Dezactivare mod Avion"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Introduceţi cartela SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Tetheringul nu a reuşit"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Nu se poate util. tetheringul"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Partajare conex. Internet"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Furn. acc. Internet Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Set. furn. ac. Int. Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Dispozitive conectate: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Dispozitivul conectat va fi deconectat."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Conectaţi cablul USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Prin dezactivarea furnizării accesului la Internet, nu se va permite accesul la Internet al dispozitivelor conectate. Continuaţi?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Activarea furnizării accesului la Internet prin USB va determina deconectarea conexiunii USB anterioare."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Introduceţi cartela SIM şi reporniţi dispozitivul pentru a utiliza furnizarea accesului la Internet."
+
 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"
+msgstr "Parola trebuie să conţină minimum %d caractere şi nu poate depăşi %d caractere."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Nume dispozitiv: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Acces internet activ"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Pentru a activa această funcţie de tethering, conectaţi-vă la o reţea mobilă sau Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Furnizarea accesului la internet este controlată în prezent de o altă aplicaţie. Pentru a configura furnizarea accesului la internet, aplicaţia respectivă va fi dezactivată"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Imposibil de utilizat furnizarea de acces la Internet"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Tip de securitate: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Imposibil de utilizat furnizarea accesului la Internet în modul Avion. Pentru a utiliza furnizarea accesului la Internet, dezactivaţi modul Avion."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Pentru a utiliza furnizarea accesului la internet, conectaţi-vă la reţele mobile"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Conex. de tethering a expirat"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Conexiunea de tethering a expirat."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Datele mobile sunt dezactivate. Activaţi datele mobile şi încercaţi din nou."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Conect. la reţea mobilă"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Nu se afişează din nou"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Cel puţin %d caractere"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Dezactivaţi tetheringul"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Nici un nume"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Furnizare acces la Internet activată"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Oprire"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Nicio conexiune la reţea"
+
+msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
+msgstr "Vizibilitatea Bluetooth a expirat. Este posibil ca dispozitivul dvs. să nu poată fi găsit."
 
 msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
 msgstr "Expirare conexiune"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Date utilizate: %s"
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Atingeţi pentru a configura furnizarea accesului la internet"
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Introduceţi o parolă de minimum 8 caractere."
 
-msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Vizibilitatea Bluetooth a expirat. Este posibil ca dispozitivul dvs. să nu poată fi găsit"
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Tip de securitate: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Setări"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Furnizarea accesului la internet consumă mai mult din energia bateriei şi creşte volumul de date utilizat. Numărul maxim de dispozitive cărora li se poate furniza acces la internet este %d"
+msgstr "Furnizarea accesului la internet consumă mai mult din energia bateriei şi creşte volumul de date utilizat. Numărul maxim de dispozitive cărora li se poate furniza acces la internet este %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Furnizare acces la Internet activată"
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Reţeaua Wi-Fi va fi deconectată. Furnizarea accesului la internet consumă mai mult din energia bateriei şi creşte volumul de date utilizat. Numărul maxim de dispozitive cărora li se poate furniza acces la internet este %d"
+msgstr "Reţeaua Wi-Fi va fi deconectată. Furnizarea accesului la internet consumă mai mult din energia bateriei şi creşte volumul de date utilizat. Numărul maxim de dispozitive cărora li se poate furniza acces la internet este %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Activare"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Dispozitivul conectat va fi deconectat"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Lim. utiliz. date atinsă"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Dispozitive conectate: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Modul Zbor"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Numele dispozitivelor sunt afişate pentru a diferenţia dispozitivele disponibile pe lista de dispozitive din apropiere, dar şi prin Bluetooth, Wi-Fi Direct şi alte metode."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Pentru a utiliza furnizarea accesului la internet, conectaţi-vă la reţele mobile."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Redenumire"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Dispozitive conectate"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Eroare de cartelă SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Imposibil de utilizat serviciul de transfer de pachete. În afara ariei de acoperire."
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 8f33827..92cff33 100644..100755
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Этот пароль подходит только для модема Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Отмена"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Модем Wi-Fi скрыт"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Модем Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "При включении Wi-Fi мобильная точка доступа будет отключена. Продолжить?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Параметры модема Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Использование данных"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Получено:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Модем"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Отправлено:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Не показывать снова"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Имя устройства"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "При включении Wi-Fi модем Wi-Fi будет отключен."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Пароль"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Достигнуто максимальное число символов (%d)"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Имя устройства можно изменить в %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Нет"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Скрыть устройство"
+msgid "IDS_BR_SK_YES"
+msgstr "Да"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Использование данных"
+msgid "IDS_BR_SK_NO"
+msgstr "Нет"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-модем"
+msgid "IDS_BR_SK_DONE"
+msgstr "Готово"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "При отключении модема связанные устройства не смогут получать доступ к Интернету. Продолжить?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Отмена"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Чтобы воспользоваться модемом, вставьте SIM-карту и перезагрузите устройство"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "При подключении к сети Wi-Fi воспользоваться Bluetooth-модемом невозможно."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Невозможно использовать модем"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Переименовать устройство"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Невозможно использовать модем в автономном режиме. Чтобы использовать модем, отключите автономный режим"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Имя устройства"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Сведения о телефоне"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Введите пароль."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Подключенное устройство"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "ГОТОВО"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ОТМЕНА"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Да"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Соxранить"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Настройки"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth-модем"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Безопасность"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Подключенное устройство"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Модем"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Использов. данных: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Введите пароль длиной не менее 8 символов"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Имя устройства"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "При включении USB-модема предыдущее USB-подключение будет отключено"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Имя устройства можно изменить в %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Имя устройства: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Минимальное число символов: %d"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Скрыть устройство"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Пароль"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d байт(а)"
@@ -74,19 +98,13 @@ msgid "IDS_MOBILEAP_BODY_PD_KB"
 msgstr "%d Кб"
 
 msgid "IDS_MOBILEAP_BODY_PD_MB"
-msgstr "%d Мб"
+msgstr "%d МБ"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Невозможно использовать услугу передачи пакетов. Вне зоны покрытия"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Подключите USB-кабель"
-
-msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "Допустимое число символов в пароле: от %d до %d"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Безопасность"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Имя устройства: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Коснитесь для настройки модема."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Модем активен"
@@ -94,36 +112,159 @@ msgstr "Модем активен"
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "Модемом сейчас управляет другое приложение. Чтобы настроить его, это приложение будет отключено"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Тип защиты: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Этот пароль подходит только для модема Wi-Fi."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Чтобы использовать модем, подключитесь к мобильной сети"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Модем Wi-Fi скрыт."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Тайм-аут подключения"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Подключение к мобильной сети"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Использов. данных: %s"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Подключить USB-кабель"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Коснитесь для настройки модема"
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Отключить автономный режим"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Вставьте SIM-карту"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Сбой модема"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Невозможно использовать модем"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-модем"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Модем Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Параметры модема Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Подключенные устройства: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Подключенное устройство будет отключено."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Подключите USB-кабель."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "При отключении модема связанные устройства не смогут получать доступ к Интернету. Продолжить?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "При включении USB-модема предыдущее USB-подключение будет отключено."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Чтобы воспользоваться модемом, вставьте SIM-карту и перезагрузите устройство."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Чтобы включить эту функцию модема, подключитесь к мобильной сети или Wi-Fi."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Невозможно использовать модем."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Невозможно использовать модем в автономном режиме. Чтобы использовать модем, отключите автономный режим."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Тайм-аут подкл. для модема"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Тайм-аут подключения для режима модема."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Мобильные данные отключены. Включите их и повторите попытку."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Подключение к мобил. сети"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Больше не показывать"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Не менее %d символов"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Отключить модем"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Нет имени"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Модем включен."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Выключить"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Отсутствует подключение к сети"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Тайм-аут видимости Bluetooth. Вероятно, ваше устройство невозможно обнаружить"
+msgstr "Тайм-аут видимости Bluetooth. Вероятно, ваше устройство невозможно обнаружить."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Тайм-аут подключения."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Введите пароль длиной не менее 8 символов."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Тип защиты: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Настройки"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "При использовании модема быстро расходуется заряд батареи и увеличивается объем передаваемых данных. Максимальное число подключенных устройств: %d"
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Модем включен."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Сеть Wi-Fi будет отключена. При использовании модема быстро расходуется заряд батареи и увеличивается объем передаваемых данных. Максимальное число подключенных устройств: %d"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "При использовании модема быстро расходуется заряд батареи и увеличивается объем передаваемых данных"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Включено"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Подключенное устройство будет отключено"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Дост. огран.на испол.дан."
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Подключенные устройства: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Автон. реж."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Имена устройств позволяют различать доступные устройства в списке устройств поблизости, а также при подключении через Bluetooth, Wi-Fi Direct и другими способами."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Чтобы использовать модем, подключитесь к мобильной сети."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Переименовать"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Подключенные устройства"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Произошла ошибка SIM-карты"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Невозможно использовать услугу передачи пакетов. Вне зоны покрытия."
 
diff --git a/po/sk.po b/po/sk.po
index c27b950..b94349f 100644..100755
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Toto heslo slúži iba na zdieľanie pripojenia Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Zrušiť"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Zdieľanie pripojenia Wi-Fi je skryté"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Zdieľanie pripoj. Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Zapnutím siete Wi-Fi sa vypne mobilný prístupový bod. Pokračovať?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Nast. zdieľ. prip. Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Využitie dát"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Prijaté:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Zdieľanie pripojenia"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Odoslané:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Už nezobrazovať"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Meno zariadenia"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Zapnutím pripojenia Wi-Fi sa vypne zdieľanie pripojenia cez Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Heslo"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Dosiahol sa maximálny počet znakov (%d)."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Názov zariadenia možno zmeniť v %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Nie"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Skryť moje zariadenie"
+msgid "IDS_BR_SK_YES"
+msgstr "Áno"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Využitie dát"
+msgid "IDS_BR_SK_NO"
+msgstr "Nie"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Zdieľ. pripojenia cez USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Hotovo"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Vypnutím zdieľania pripojenia zabránite pripojeným zariadeniam v prístupe na internet. Pokračovať?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Zrušiť"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Pred použitím zdieľania pripojenia vložte kartu SIM a reštartujte zariadenie"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Počas pripojenia k sieti Wi-Fi nemožno použiť zdieľanie pripojenia cez Bluetooth."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Nedá sa použiť zdieľanie pripojenia"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Premenovať zariadenie"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Zdieľanie pripojenia sa nedá použiť v letovom režime. Ak chcete použiť zdieľanie pripojenia, vypnite letový režim"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Názov môjho zariadenia"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "O telefóne"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Zadajte heslo."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Pripojené zariadenie"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "HOTOVO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "ZRUŠIŤ"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Áno"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Uložiť"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Nastavenia"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Zdieľanie pripojenia Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Zabezpečenie"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Pripojené zariadenie"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Zdieľanie pripojenia"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Použité údaje: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Zadajte heslo obsahujúce aspoň 8 znakov"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Meno zariadenia"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Zapnutie zdieľania pripojenia cez USB odpojí predchádzajúce pripojenie cez USB"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Názov zariadenia možno zmeniť v %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Názov zariadenia: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Zadajte aspoň %d znakov."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Skryť moje zariadenie"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Heslo"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d B"
@@ -76,54 +100,171 @@ msgstr "%d kB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Nedá sa použiť paketová služba. Mimo pokrytia"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Zabezpečenie"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Ťuknutím môžete konfigurovať zdieľanie pripojenia."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Zdieľ. pr. akt."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Zdieľanie pripojenia momentálne ovláda iná aplikácia. Ak chcete konfigurovať zdieľanie pripojenia, daná aplikácia sa vypne."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Toto heslo slúži iba na zdieľanie pripojenia Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Zdieľanie pripojenia Wi-Fi je skryté."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Pripojenie k mobilnej sieti"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Pripojte kábel USB"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Vypnutie letového režimu"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Vložte kartu SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Zdieľanie pripojenia zlyhalo"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Zdieľ. pripoj. sa nedá použiť"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Zdieľ. pripojenia cez USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Zdieľanie pripoj. Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Nast. zdieľ. prip. Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Pripojené zariadenia: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Pripojené zariadenie sa odpojí."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
 msgstr "Pripojiť kábel USB"
 
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Vypnutím zdieľania pripojenia zabránite pripojeným zariadeniam v prístupe na internet. Pokračovať?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Zapnutie zdieľania pripojenia cez USB odpojí predchádzajúce pripojenie cez USB."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Pred použitím zdieľania pripojenia vložte kartu SIM a reštartujte zariadenie."
+
 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"
+msgstr "Heslo musí obsahovať aspoň %d znakov a nesmie prekročiť %d znakov."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Názov zariadenia: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Zdieľ. pr. akt."
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Ak chcete zapnúť túto funkciu zdieľania pripojenia, pripojte sa k mobilnej sieti alebo k sieti Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Zdieľanie pripojenia momentálne ovláda iná aplikácia. Ak chcete konfigurovať zdieľanie pripojenia, daná aplikácia sa vypne"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Nedá sa použiť zdieľanie pripojenia."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Typ zabezpečenia: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Zdieľanie pripojenia sa nedá použiť v letovom režime. Ak chcete použiť zdieľanie pripojenia, vypnite letový režim."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Ak chcete použiť zdieľanie pripojenia, pripojte sa k mobilným sieťam"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Uplynul čas. limit zdieľ. prip."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Časový limit pripojenia"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Uplynul časový limit zdieľania pripojenia."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Použité údaje: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobilné dátové pripojenie je vypnuté. Zapnite mobilné dátové pripojenie a skúste to znova."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Ťuknutím môžete konfigurovať zdieľanie pripojenia"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Pripojiť k mobilnej sieti"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Nezobrazovať znova"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Aspoň %d znakov"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Vypnúť zdieľanie pripojenia"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Žiadny názov"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Zdieľanie pripojenia povolené."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Vypnúť"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Žiadne sieťové pripojenie"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Uplynul časový limit viditeľnosti pre Bluetooth. Vaše zariadenie sa nemusí nájsť"
+msgstr "Uplynul časový limit viditeľnosti pre Bluetooth. Vaše zariadenie sa nemusí nájsť."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Časový limit pripojenia."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Zadajte heslo obsahujúce aspoň 8 znakov."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Typ zabezpečenia: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Nastavenia"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Zdieľanie pripojenia spotrebúva viac energie batérie a zvyšuje používanie dátových prenosov. Maximálny povolený počet zariadení zdieľajúcich pripojenie je %d"
+msgstr "Zdieľanie pripojenia spotrebúva viac energie batérie a zvyšuje používanie dátových prenosov. Maximálny povolený počet zariadení zdieľajúcich pripojenie je %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Zdieľanie pripojenia povolené."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Sieť Wi-Fi sa odpojí. Zdieľanie pripojenia spotrebúva viac energie batérie a zvyšuje používanie dátových prenosov. Maximálny povolený počet zariadení zdieľajúcich pripojenie je %d"
+msgstr "Sieť Wi-Fi sa odpojí. Zdieľanie pripojenia spotrebúva viac energie batérie a zvyšuje používanie dátových prenosov. Maximálny povolený počet zariadení zdieľajúcich pripojenie je %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Povoliť"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Pripojené zariadenie sa odpojí"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Dosiahol sa limit pr. dát"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Pripojené zariadenia: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Let. režim"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Názvy zariadení sa zobrazujú na odlíšenie každého dostupného zariadenia v zozname blízkych zariadení a cez Bluetooth, Wi-Fi Direct a ďalšie spôsoby pripojenia."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Ak chcete použiť zdieľanie pripojenia, pripojte sa k mobilným sieťam."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Premenovať"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Pripojené zariadenia"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Vyskytla sa chyba karty SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Nedá sa použiť paketová služba. Mimo pokrytia."
 
diff --git a/po/sl.po b/po/sl.po
index 209a981..edc336b 100644..100755
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "To geslo velja samo za uporabo telefona kot modema prek omrežja Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Prekliči"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Uporaba telefona kot modema prek omrežja Wi-Fi je skrita"
+msgid "IDS_COM_SK_OK"
+msgstr "V redu"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Up.tel. kot mod. po Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Vklop funkcije Wi-Fi bo onemogočil Mobile Hotspot. Želite nadaljevati?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Nas.tel. kot mod.po Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Poraba podatkov"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Prejeto:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Tethering"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Poslano:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ne kaži več"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Ime naprave"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Vklop vmesnika Wi-Fi bo onemogočil privezovanje prek Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Geslo"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Doseženo je največje dovoljeno število znakov %d."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Ime naprave lahko spremenite v %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Skrij mojo napravo"
+msgid "IDS_BR_SK_YES"
+msgstr "Da"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Poraba podatkov"
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB modem"
+msgid "IDS_BR_SK_DONE"
+msgstr "Končano"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Če onemogočite uporabo telefona kot modema, boste povezanim napravam preprečili dostop do interneta. Želite nadaljevati?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Prekliči"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Vstavite kartico SIM in znova zaženite napravo, če želite uporabljati telefon kot modem"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Če ste povezani z omrežjem Wi-Fi, uporaba interneta prek vmesnika Bluetooth ni možna."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Uporaba telefona kot modema ni mogoča"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Preimenujte napravo"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Uporaba telefona kot modema ni mogoča v načinu letenja. Če želite uporabiti to možnost, onemogočite način letenja"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Ime moje naprave"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Vizitka telefona"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Vnesite geslo."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Povezana naprava"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "KONČANO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "PREKLIČI"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Da"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Shrani"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Nastavitve"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Internet prek vmesnika Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Varnost"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Povezana naprava"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Tethering"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Porabljeni podatki: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Vnesite vsaj 8 znakov dolgo geslo"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Ime naprave"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Če omogočite uporabo telefona kot modema po vmesniku USB, bodo vse prejšnje povezave USB prekinjene"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Ime naprave lahko spremenite v %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Ime naprave: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Vnesite vsaj %d znakov."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Skrij mojo napravo"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Geslo"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d B"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Ni mogoče uporabiti paketnega prenosa podatkov. Ni pokritosti s signalom"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Varnost"
 
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Pritisnite za konfiguracijo uporabe telefona kot modema."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Int. po tel. ak."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Privezovanje trenutno upravlja druga aplikacija. Če želite konfigurirati privezovanje, bo ta aplikacija onemogočena."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "To geslo velja samo za uporabo telefona kot modema prek omrežja Wi-Fi."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Uporaba telefona kot modema prek omrežja Wi-Fi je skrita."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Povezava z mobilnim omrežjem"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
 msgstr "Priključite kabel USB"
 
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Onemogočite način letenja"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Vstavite kartico SIM"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Privezovanje ni uspelo"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Uporaba privezovanja ni mogoča"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB modem"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Up.tel. kot mod. po Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Nas.tel. kot mod.po Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Povezane naprave: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Povezava z napravo bo prekinjena."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Priključite kabel USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Če onemogočite uporabo telefona kot modema, boste povezanim napravam preprečili dostop do interneta. Želite nadaljevati?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Če omogočite uporabo telefona kot modema po vmesniku USB, bodo vse prejšnje povezave USB prekinjene."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Vstavite kartico SIM in znova zaženite napravo, če želite uporabljati telefon kot modem."
+
 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"
+msgstr "Geslo mora vsebovati vsaj %d znakov in ne sme presegati %d znakov."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Ime naprave: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Int. po tel. ak."
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Če želite omogočiti to funkcijo privezovanja, se povežite z mobilnim omrežjem ali omrežjem Wi-Fi"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Privezovanje trenutno upravlja druga aplikacija. Če želite konfigurirati privezovanje, bo ta aplikacija onemogočena"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Uporaba telefona kot modema ni mogoča."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Vrsta varnosti: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Uporaba telefona kot modema ni mogoča v načinu letenja. Če želite uporabiti to možnost, onemogočite način letenja."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Če želite internet dati v skupno rabo, se povežite z enim od mobilnih omrežij"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Povez. za privezovanje potekla"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Povezava je bila predolgo neaktivna"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Povezava za privezovanje je potekla."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Porabljeni podatki: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobilni podatki so onemogočeni. Omogočite jih in poskusite znova."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Pritisnite za konfiguracijo uporabe telefona kot modema"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Poveži z mobil. omrežjem"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ne pokaži znova"
+
+msgid "IDS_BR_SK_OK"
+msgstr "V redu"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Vsaj %d znakov"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Onemogočite privezovanje"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Brez imena"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Uporaba telefona kot modem omogočena."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Izklopi"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Ni omrežne povezave"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Časovna omejitev vidnosti za Bluetooth je potekla. Naprave ne bo mogoče poiskati"
+msgstr "Časovna omejitev vidnosti za Bluetooth je potekla. Naprave ne bo mogoče poiskati."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Povezava je bila predolgo neaktivna."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Vnesite vsaj 8 znakov dolgo geslo."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Vrsta varnosti: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Nastavitve"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Uporaba telefona kot modema porabi več baterije in poveča porabo podatkov. Največje dovoljeno število naprav za uporabo kot modem je %d"
+msgstr "Uporaba telefona kot modema porabi več baterije in poveča porabo podatkov. Največje dovoljeno število naprav za uporabo kot modem je %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Uporaba telefona kot modem omogočena."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Povezava z omrežjem Wi-Fi bo prekinjena. Uporaba telefona kot modema porabi več baterije in poveča porabo podatkov. Največje dovoljeno število naprav za uporabo kot modem je %d"
+msgstr "Povezava z omrežjem Wi-Fi bo prekinjena. Uporaba telefona kot modema porabi več baterije in poveča porabo podatkov. Največje dovoljeno število naprav za uporabo kot modem je %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Omogoči"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Povezava z napravo bo prekinjena"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Omej. por. pod. dosežena"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Povezane naprave: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Letenje"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Imena naprav so prikazana, da lahko ločite naprave, ki so na voljo na seznamu naprav v bližini, prek povezav Bluetooth in Wi-Fi Direct, ali na druge načine."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Če želite internet dati v skupno rabo, se povežite z enim od mobilnih omrežij."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Preimenuj"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Povezane naprave"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Napake kartice SIM"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Ni mogoče uporabiti paketnega prenosa podatkov. Ni pokritosti s signalom."
 
diff --git a/po/sr.po b/po/sr.po
index 34dfa79..b4f9de8 100644..100755
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Ova lozinka je samo za Wi-Fi vezivanje"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Otkaži"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi vezivanje je skriveno"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi vezivanje"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Uključivanje Wi-Fi-ja će onemogućiti Mobile Hotspot. Nastaviti?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Podeš. Wi-Fi povezivanja"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Upotreba podataka"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Primljeno:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Vezivanje"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Poslato:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Ne prikazuj ponovo"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Ime uređaja"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Uključivanje Wi-Fi veze će onemogućiti Wi-Fi vezivanje."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Šifra"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Dostignut je maksimalan broj od %d karaktera."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Ime uređaja može da se promeni u %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Sakrij moj uređaj"
+msgid "IDS_BR_SK_YES"
+msgstr "Da"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Upotreba podataka"
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB vezivanje"
+msgid "IDS_BR_SK_DONE"
+msgstr "Gotovo"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Onemogućavanje vezivanja će sprečiti da povezani uređaji pristupe Internetu. Nastaviti?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Otkaži"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Ubaci SIM karticu i restartuj uređaj da bi koristio/la vezivanje"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Nije moguće koristiti Bluetooth vezivanje kada je uspostavljena veza sa Wi-Fi mrežom."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Nije moguće koristiti vezivanje"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Preimenuj uređaj"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Vezivanje ne može da se koristi u režimu letenja. Da bi koristio/la vezivanje, onemogući režim letenja"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Naziv mog uređaja"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "O telefonu"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Unesi šifru."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Povezani uređaj"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "GOTOVO"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "OTKAŽI"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Da"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Sačuvaj"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Podešavanja"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Deljenje preko vezivanja"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Bezbednost"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Povezani uređaj"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Vezivanje"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Iskorišćeni podaci: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Unesi šifru dužine bar 8 karaktera"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Ime uređaja"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Omogućavanje USB vezivanja prekinuće sve prethodne USB veze"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Ime uređaja može da se promeni u %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Naziv uređaja: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Unesi bar %d karaktera."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Sakrij moj uređaj"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Lozinka"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d bajtova"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Nemoguće koristiti uslugu prenosa podataka. Van dometa"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Zaštita"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Kucni za konfigurisanje vezivanja."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Delj. veze akt."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Vezivanje trenutno kontroliše druga aplikacija. Da bi konfigurisao/la vezivanje, ta aplikacija će biti onemogućena."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Ova lozinka je samo za Wi-Fi vezivanje."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi vezivanje je skriveno."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Pov. na mrežu mobi. telefonije"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Poveži USB kabl"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Onemogući režim letenja"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Ubaci SIM karticu"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Neuspešno vezivanje"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Nemoguće koristiti vezivanje"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB vezivanje"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi vezivanje"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Podeš. Wi-Fi povezivanja"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Povezano uređaja: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Povezani uređaj će biti isključen."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Priključi USB kabl"
+msgstr "Priključi USB kabl."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Onemogućavanje vezivanja će sprečiti da povezani uređaji pristupe Internetu. Nastaviti?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Omogućavanje USB vezivanja prekinuće sve prethodne USB veze."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Ubaci SIM karticu i restartuj uređaj da bi koristio/la vezivanje."
 
 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"
+msgstr "Šifra mora da sadrži najmanje %d i najviše %d znakova."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Naziv uređaja: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Delj. veze akt."
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Da bi omogućio/la ovu funkciju vezivanja, poveži se na mobilnu ili Wi-Fi mrežu"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Vezivanje trenutno kontroliše druga aplikacija. Da bi konfigurisao/la vezivanje, ta aplikacija će biti onemogućena"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Nije moguće koristiti vezivanje."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Tip bezbednosti: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Vezivanje ne može da se koristi u režimu letenja. Da bi koristio/la vezivanje, onemogući režim letenja."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Za korišćenje vezivanja, poveži se na mreže mobilne telefonije"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Vreme vezivanja isteklo"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Vremensko prekoračenje veze"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Vreme vezivanja je isteklo."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Iskorišćeni podaci: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Podaci o mobilnom telefonu nisu omogućeni. Omogući ih i pokušaj ponovo."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Kucni za konfigurisanje vezivanja"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Poveži se na mobil. mrežu"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Ne prikazuj ponovo"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Najmanje %d karaktera"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Onemogući vezivanje"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Nema imena"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Vezivanje je omogućeno."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Isključi"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Nema veze sa mrežom"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth vidljivost je istekla. Tvoj uređaj možda neće biti pronađen"
+msgstr "Bluetooth vidljivost je istekla. Tvoj uređaj možda neće biti pronađen."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Vremensko prekoračenje veze."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Unesi lozinku od bar 8 karaktera."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Tip bezbednosti: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Podešavanja"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Vezivanje troši više energije i povećava upotrebu podataka. Maksimalni dozvoljeni broj povezanih uređaja je %d"
+msgstr "Vezivanje troši više energije i povećava upotrebu podataka. Maksimalni dozvoljeni broj povezanih uređaja je %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Vezivanje je omogućeno."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Veza sa Wi-Fi mrežom će biti prekinuta. Vezivanje troši više energije i povećava upotrebu podataka. Maksimalni dozvoljeni broj povezanih uređaja je %d"
+msgstr "Veza sa Wi-Fi mrežom će biti prekinuta. Vezivanje troši više energije i povećava upotrebu podataka. Maksimalni dozvoljeni broj povezanih uređaja je %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Omogući"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Povezani uređaj će biti isključen"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Granica podat. dostignuta"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Povezano uređaja: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Rež. letenja"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Nazivi uređaja se prikazuju u cilju razlikovanja svakog pojedinačnog uređaja u okviru liste uređaja u blizini koji su dostupni putem Bluetooth-a, Wi-Fi Direct-a i drugih načina."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Za korišćenje vezivanja, poveži se na mreže mobilne telefonije."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Preimenuj"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Povezani uređaji"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Došlo je do greške SIM kartice"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Nemoguće koristiti uslugu prenosa podataka. Van dometa."
 
diff --git a/po/sv.po b/po/sv.po
index b3733bf..37bc09e 100644..100755
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Der här lösenordet är gäller endast för Wi-Fi-internetdelning"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Avbryt"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi-internetdelning är dolt"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi-internetdelning"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Om du slår på Wi-Fi inaktiveras Mobile Hotspot. Fortsätta?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Inst. f. Wi-Fi-internetd."
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Dataanvändning"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Mottaget:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Internetdelning"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Skickat:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Visa inte igen"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Enhetsnamn"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Om du slår på Wi-Fi inaktiveras Wi-Fi-internetdelning."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Lösenord"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Högsta antal tecken %d har uppnåtts."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Enhetsnamnet kan ändras i %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Nej"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Dölj min enhet"
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Dataanvändning"
+msgid "IDS_BR_SK_NO"
+msgstr "Nej"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB-internetdelning"
+msgid "IDS_BR_SK_DONE"
+msgstr "Klar"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Genom att inaktivera Internetdelning förhindras länkade enheter att nå Internet. Fortsätta?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Avbryt"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Sätt i ett SIM-kort och starta om enheten för att använda Internetdelning"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Det går inte att använda Bluetooth-internetdelning vid anslutning till ett Wi-Fi-nätverk."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Det går inte att använda Internetdelning"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Byt namn på enhet"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Det går inte att använda Internetdelning i Flygläget. Inaktivera Flygläget om du vill använda Internetdelning"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Namn för min enhet"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Om telefonen"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Ange lösenord."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Ansluten enhet"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "KLAR"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "AVBRYT"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Spara"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Inställningar"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth-internetdelning"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Säkerhet"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Ansluten enhet"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Internetdelning"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Använda data :%s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Ange ett lösenord med minst 8 tecken"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Enhetsnamn"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Om du aktiverar USB-internetdelning inaktiveras den tidigare USB-anslutningen"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Enhetsnamnet kan ändras i %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Enhetsnamn: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Ange minst %d tecken."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Dölj min enhet"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Lösenord"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d byte"
@@ -76,54 +100,171 @@ msgstr "%d kB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Det går inte att använda pakettjänsten. Ingen täckning"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Säkerhet"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Tryck för att konfigurera internetdelning."
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Internetdeln akt"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Internetdelning kontrolleras för närvarande av ett annat program. Om du vill konfigurera internetdelning måste du inaktivera programmet."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Der här lösenordet är gäller endast för Wi-Fi-internetdelning."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi-internetdelning är dolt."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Anslut till mobila nätverk"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Anslut USB-kabel"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Inaktivera Flygläge"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Sätt i SIM-kort"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Internetdelning misslyckades"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Kan inte använda Internetdeln."
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-internetdelning"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi-internetdelning"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Inst. f. Wi-Fi-internetd."
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Anslutna enheter: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Den anslutna enheten kommer att kopplas bort."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Anslut USB-kabeln"
+msgstr "Anslut USB-kabeln."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Genom att inaktivera Internetdelning förhindras länkade enheter att nå Internet. Fortsätta?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Om du aktiverar USB-internetdelning inaktiveras den tidigare USB-anslutningen."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Sätt i ett SIM-kort och starta om enheten för att använda Internetdelning."
 
 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"
+msgstr "Lösenord måste innehålla minst %d tecken och inte överstiga %d tecken."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Enhetsnamn: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Internetdeln akt"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Om du vill aktivera internetdelningsfunktionen ska du ansluta till ett mobilnät eller Wi-Fi-nätverk."
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Internetdelning kontrolleras för närvarande av ett annat program. Om du vill konfigurera internetdelning måste du inaktivera programmet"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Det går inte att använda Internetdelning."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Säkerhetstyp: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Det går inte att använda Internetdelning i Flygläge. Inaktivera Flygläge om du vill använda Internetdelning."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Anslut till mobila nätverk om du vill använda Internetdelning"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tidsgr. f Internetdeln. överskr"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Anslutningstimeout"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Tidsgränsen för Internetdelning har överskridits."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Använda data :%s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobila data är inaktiverat. Aktivera mobila data och försök igen."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Tryck för att konfigurera internetdelning"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Anslut t. mobilt nätverk"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Visa inte igen"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Minst %d tecken"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Inaktivera Internetdelning"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Inget namn"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Internetdelning aktiverat."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Stäng av"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Ingen nätverksanslutning"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Timeout för Bluetooth-synlighet. Det kanske inte går att hitta din enhet"
+msgstr "Timeout för Bluetooth-synlighet. Det kanske inte går att hitta din enhet."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Anslutningstimeout."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Ange ett lösenord med minst 8 tecken."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Säkerhetstyp: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Inställningar"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Internetdelning förbrukar mer batteri och dataanvändningen ökar. Högst %d enheter kan dela Internetanslutningen"
+msgstr "Internetdelning förbrukar mer batteri och dataanvändningen ökar. Högst %d enheter kan dela Internetanslutningen."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Internetdelning aktiverat."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi-nätverket kopplas från. Internetdelning förbrukar mer batteri och dataanvändningen ökar. Högst %d enheter kan dela Internetanslutningen"
+msgstr "Wi-Fi-nätverket kopplas från. Internetdelning förbrukar mer batteri och dataanvändningen ökar. Högst %d enheter kan dela Internetanslutningen."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Aktivera"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Den anslutna enheten kommer att kopplas bort"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Dataanv.gräns uppnådd"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Anslutna enheter: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Flygläge"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Enhetsnamnen visas för att urskilja var och en av de tillgängliga enheterna i listan över närliggande enheter och via Bluetooth, Wi-Fi Direct och andra åtgärder."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Anslut till mobila nätverk om du vill använda Internetdelning."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Byt namn"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Anslutna enheter"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Ett SIM-kortfel inträffade"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Det går inte att använda pakettjänsten. Ingen täckning."
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index b03ff8b..44bd9f8 100644..100755
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Bu şifre sadece Wi-Fi bağlantısı içindir"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "İptal"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi bağlantısı gizli"
+msgid "IDS_COM_SK_OK"
+msgstr "Tamam"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi bağlantısı"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fi'yi açmak Mobile Hotspot devre dışı bırakacak. Devam edilsin mi?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi bağlantısı ayarları"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Veri kullanımı"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Alındı:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Bağlantı"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Gönderildi:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Bir daha gösterme"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Cihaz adı"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi'yi açmak Wi-Fi tethering'i devre dışı bırakır."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Şifre"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maksimum karakter sayısına %d ulaşıldı"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Cihaz adı %s konumunda değiştirilebilir"
+msgid "IDS_COM_SK_NO"
+msgstr "Hayır"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Cihazımı gizle"
+msgid "IDS_BR_SK_YES"
+msgstr "Evet"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Veri kullanımı"
+msgid "IDS_BR_SK_NO"
+msgstr "Hayır"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB bağlanıyor"
+msgid "IDS_BR_SK_DONE"
+msgstr "Tamam"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Bağlantının devre dışı bırakılması bağlı cihazların internete erişmesine engel olur. Devam edilsin mi?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "İptal"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Bağlantıyı kullanmak için SIM kartı takın ve cihazı tekrar başlatın"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Wi-Fi ağına bağlıyken Bluetooth bağlanma kullanılamıyor."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Bağlantı kullanılamıyor"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Cihazı yeniden adlandır"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Uçuş modu sırasında bağlanma kullanılamıyor. Bağlanma kullanmak için, Uçuş modunu devre dışı bırakın"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Cihazımın adı"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Telefon hakkında"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Şifreyi girin."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Bağlı cihaz"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "BİTTİ"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "İPTAL"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Evet"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Kaydet"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Ayarlar"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth bağlantısı"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Güvenlik"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Bağlı cihaz"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Bağlantı"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Kullanılan veri: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "En az 8 karakter içeren bir şifre girin"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Cihaz adı"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB bağlantısını etkinleştirmek önceki USB bağlantısını koparacak"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Cihaz adı %s konumunda değiştirilebilir."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Cihaz adı: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "En az %d karakter girin."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Cihazımı gizle"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Şifre"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d Bayt"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Paket servisi kullanılamıyor. Kapsama alanı dışında"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Güvenlik"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Bağlanmayı yapılandırmak için dokunun"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "Bağlantı etkin"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "Bağlanma şu anda bir başka uygulama tarafından kullanılıyor. Bağlanmayı yapılandırmak için uygulama devre dışı bırakılacak."
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Bu şifre sadece Wi-Fi bağlantısı içindir."
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi bağlantısı gizli."
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Mobil ağa bağlan"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USB kablosunu bağla"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Uçuş modunu devre dışı bırak"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "SIM kartı takın"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "İnternet paylaşımı başarısız"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "İnternet paylaşımı kullanlamyr"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB bağlanıyor"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi bağlantısı"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi bağlantısı ayarları"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Bağlı cihazlar: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Bağlı cihazın bağlantısı kesilecek."
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "USB kablosunu bağlayın"
+msgstr "USB kablosunu bağlayın."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Bağlantının devre dışı bırakılması bağlı cihazların internete erişmesine engel olur. Devam edilsin mi?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB bağlantısını etkinleştirmek önceki USB bağlantısını koparacak."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Bağlantıyı kullanmak için SIM kartı takın ve cihazı tekrar başlatı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"
+msgstr "Şifre en az %d karakter içermeli ve %d karakteri geçmemelidir."
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Cihaz adı: %s"
+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_BODY_TETHERING_ACTIVE_ABB"
-msgstr "Bağlantı etkin"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Bu internet paylaşımı işlevini etkinleştirmek için bir mobil veya Wi-Fi ağına bağlanın"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "Bağlanma şu anda bir başka uygulama tarafından kullanılıyor. Bağlanmayı yapılandırmak için, uygulama devre dışı bırakılacak"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Bağlantı kullanılamıyor."
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Güvenlik tipi: %s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Uçuş modu sırasında bağlanma kullanılamıyor. Bağlanma kullanmak için Uçuş modunu devre dışı bırakın."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Bağlantı kullanmak için, mobil ağlara bağlanın"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "İnt. paylş. bğ. zmn aşmna uğrdı"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Bağlantı zaman aşımı"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "İnternet paylaşımı bağlantısı zaman aşımına uğradı."
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Kullanılan veri: %s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobil veri devre dışı. Mobil veriyi etkinleştirin ve tekrar deneyin."
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Bağlanmayı yapılandırmak için dokunun"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Mobil ağa bağlan"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Tekrar gösterme"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Tamam"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "En az %d karakter"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "İnt. paylaşmnı devre dşı bırak"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "İsim yok"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Bağlanma etkin."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Kapat"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Ağ bağlantısı yok"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
 msgstr "Bluetooth keşfedilebilirliğinin süresi doldu. Cihazınız bulunamayabilir"
 
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Bağlantı zaman aşımına uğradı."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "En az 8 karakter içeren bir şifre girin."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Güvenlik tipi: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Ayarlar"
+
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Bağlantı daha fazla pil gücü tüketir ve veri kullanımınızı arttırır. İzin verilen maksimum bağlı cihaz sayısı: %d"
+msgstr "Bağlantı daha fazla pil gücü tüketir ve veri kullanımınızı arttırır. İzin verilen maksimum bağlı cihaz sayısı: %d."
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Bağlanma etkin."
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi ağının bağlantısı kesilecektir. Bağlantı daha fazla pil gücü tüketir ve veri kullanımınızı arttırır. İzin verilen maksimum bağlı cihaz sayısı: %d"
+msgstr "Wi-Fi ağının bağlantısı kesilecektir. Bağlantı daha fazla pil gücü tüketir ve veri kullanımınızı arttırır. İzin verilen maksimum bağlı cihaz sayısı: %d."
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Etkin"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Bağlı cihazın bağlantısı kesilecek"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Vri kllnm sınırına ulşldı"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Bağlı cihazlar: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Uçuş modu"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Uygun cihazların her birini ayırt edebilmek için cihaz adları yakındaki cihazlar listesinde ve Bluetooth, Wi-Fi Direct ve diğer yöntemler yoluyla gösterilir."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Bağlantı kullanmak için, mobil ağlara bağlanın"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Yen. ad."
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Bağlı cihazlar"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM kartı hatası oluştu"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Paket servisi kullanılamıyor. Kapsama alanı dışında."
 
diff --git a/po/uk.po b/po/uk.po
index 64a5318..56df8e7 100644..100755
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Цей пароль може використовуватися лише для прив’язки Wi-Fi"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Скасувати"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Прив'язку Wi-Fi приховано"
+msgid "IDS_COM_SK_OK"
+msgstr "ОК"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Прив’язка Wi-Fi"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Увімкнення Wi-Fi призведе до вимкнення мобільної точки доступу. Продовжити?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Установки прив'язки Wi-Fi"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Використання даних"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Отримано:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Прив’язка"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Надіслано:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Більше не показувати"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Ім'я пристрою"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Увімкнення мережі Wi-Fi призведе до вимкнення прив'язки Wi-Fi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Пароль"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Досягнуто максимальної кількості символів: %d"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Ім’я пристрою можна змінити у %s"
+msgid "IDS_COM_SK_NO"
+msgstr "Ні"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Приховати мій пристрій"
+msgid "IDS_BR_SK_YES"
+msgstr "Так"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Використання даних"
+msgid "IDS_BR_SK_NO"
+msgstr "Ні"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "Прив’язка USB"
+msgid "IDS_BR_SK_DONE"
+msgstr "Готово"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "У разі вимкнення прив'язки зв’язані пристрої не зможуть отримувати доступ до Інтернету. Продовжити?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Скасувати"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Вставте SIM-картку та перезавантажте пристрій, щоб скористатися прив'язкою"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Неможливо використовувати прив'язку Bluetooth під час підключення до мережі Wi-Fi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Неможливо використати прив’язку"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Перейменувати пристрій"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Неможливо використовувати прив’язку в режимі без зв’язку. Для використання прив'язки вимкніть режим без зв’язку"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Ім’я мого пристрою"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Відомості про телефон"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Введіть пароль."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Підключений пристрій"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "ГОТОВО"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "СКАСУВАТИ"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Так"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Зберегти"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Налаштування"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Прив’язка Bluetooth"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Безпека"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Підключений пристрій"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Прив’язка"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Використано даних: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Введіть пароль принаймні 8 символів завдовжки"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Ім'я пристрою"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Увімкнення прив’язки USB призведе до відключення попереднього USB-з’єднання"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Ім’я пристрою можна змінити у %s."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Ім’я пристрою: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Введіть принаймні таку кількість символів: %d"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Приховати мій пристрій"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Пароль"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d байт"
@@ -76,17 +100,11 @@ msgstr "%d Kb"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d Мб"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Неможливо скористатися пакетною послугою. Поза зоною покриття"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "Підключити кабель USB"
-
-msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "Пароль має містити щонайменше %d символів і не перевищувати %d символів"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "Безпека"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Ім’я пристрою: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Натисніть, щоб настроїти прив'язку."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Прив’язка актив."
@@ -94,36 +112,159 @@ msgstr "Прив’язка актив."
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "Прив’язка наразі керується іншою програмою. Щоб настроїти прив'язку, потрібно вимкнути цю програму"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Тип захисту: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Цей пароль може використовуватися лише для прив’язки Wi-Fi."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Щоб скористатися прив'язкою, встановіть підключення до мобільних мереж"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Прив'язку Wi-Fi приховано."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Час очікування підключення"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Підключ. до мобільної мережі"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Використано даних: %s"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "Підключити кабель USB"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Натисніть, щоб настроїти прив'язку"
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Вимкнути режим без зв’язку"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "Вставте SIM-карту"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Збій прив’язки"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Неможл. використати прив’язку"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "Прив’язка USB"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Прив’язка Wi-Fi"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Установки прив'язки Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Підключені пристрої: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Підключений пристрій буде відключено."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "Підключити кабель USB."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "У разі вимкнення прив'язки зв’язані пристрої не зможуть отримувати доступ до Інтернету. Продовжити?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "Увімкнення прив’язки USB призведе до відключення попереднього USB-з’єднання."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Вставте SIM-карту та перезавантажте пристрій, щоб скористатися прив'язкою."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Щоб увімкнути цю функцію прив’язки, підключіться до мобільної мережі або мережі Wi-Fi"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Неможливо використати прив’язку."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Неможливо використовувати прив’язку в режимі без зв’язку. Для використання прив'язки вимкніть режим без зв’язку."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Час очік.підкл.до прив’яз.минув"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Час очікування підключення до прив’язки минув."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Використання мобільних даних вимкнено. Увімкніть використання мобільних даних і спробуйте ще раз."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Підключ. до мобіл. мережі"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Більше не показувати"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ОК"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Принаймні %d символів"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Вимкнути прив’язку"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Немає імені"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Прив’язку ввімкнено."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "Вимкнути"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Немає підключення до мережі"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Час видимості Bluetooth вичерпано. Пристрій не буде знайдено"
+msgstr "Час видимості Bluetooth вичерпано. Пристрій не буде знайдено."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Час очікування підключення."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Введіть пароль принаймні 8 символів завдовжки."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Тип захисту: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Налаштування"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Прив'язка використовує більше заряду акумулятора та збільшує використання даних. Максимальна кількість дозволених пристроїв, які можна прив'язати: %d"
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Прив’язку ввімкнено."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Мережу Wi-Fi буде відключено. Прив'язка використовує більше заряду акумулятора та збільшує використання даних. Максимальна кількість дозволених пристроїв, які можна прив'язати: %d"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "Прив'язка використовує більше заряду акумулятора та збільшує використання даних"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "Увімкнути"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Підключений пристрій буде відключено"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Досягн.обмеж.на вик.даних"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Підключені пристрої: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Без зв’яз."
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Імена дають змогу відрізняти один від одного різні пристрої, які відображаються в списку наявних поблизу пристроїв, а також знайдені через Bluetooth, Wi-Fi Direct тощо."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Щоб скористатися прив'язкою, встановіть підключення до мобільних мереж."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Перейменувати"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Підключені пристрої"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "Сталася помилка SIM-картки"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Неможливо скористатися пакетною послугою. Поза зоною покриття."
 
diff --git a/po/update-po.sh b/po/update-po.sh
index 34d436d..34d436d 100644..100755
--- a/po/update-po.sh
+++ b/po/update-po.sh
diff --git a/po/uz.po b/po/uz.po
index e62a165..cb19923 100644..100755
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "Ushbu parol faqat Wi-Fi bog‘lanish uchun"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Bekor qilish"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi bog‘lanish yashirilgan"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi bog‘lanish"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "Wi-Fini yoqish Mobil faol nuqtani o‘chiradi. Davom ettirilsinmi?"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi bog‘lan. parametri"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "Ma’lumotdan foydalanish"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "Qabul qilindi:"
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "Bog‘lash"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "Yuborilgan:"
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "Boshqa ko‘rsatilmasin"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "Qurilma nomi"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fini yoqish Wi-Fi bog‘lanishni o‘chiradi."
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "Parol"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Belgilar soni ruxsat etilgan maksimal miqdorga %d yetdi"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Qurilma nomi %sda o‘zgartirilishi mumkin"
+msgid "IDS_COM_SK_NO"
+msgstr "Yo‘q"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "Mening qurilmamni yashirish"
+msgid "IDS_BR_SK_YES"
+msgstr "Ha"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "Ma’lumotdan foydalanish"
+msgid "IDS_BR_SK_NO"
+msgstr "Yo‘q"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB bog‘lanish"
+msgid "IDS_BR_SK_DONE"
+msgstr "Bajarildi"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "Bog‘lanishni o‘chirish bog‘langan qurilmalarga Internet orqali ulanishni oldini oladi. Davom ettirilsinmi?"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Bekor qilish"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "Bog‘lanishdan foydalanish uchun, SIM-kartani kiriting va qurilmani qayta ishga tushiring"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "Wi-Fi tarmoqqa ulanganda, Bluetooth bog‘lanishidan foydalanib bo‘lmaydi."
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "Bog‘lanishdan foydalanib bo‘lmaydi"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Qurilma nomini o'zgartirish"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "Uchish rejimida bog‘lanishdan foydalanib bo‘lmaydi. Bog‘lanishdan foydalanish uchun, Uchish rejimini o‘chiring"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Qurilmam nomi"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "Telefon haqida"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "Parol kiriting."
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "Ulangan qurilma"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "BAJARILDI"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "BEKOR QILISH"
+
+msgid "IDS_COM_SK_YES"
+msgstr "Ha"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "Saqlash"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "Parametrlar"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "Bluetooth bog‘lanishi"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "Xavfsizlik"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "Ulangan qurilma"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "Bog‘lash"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "Ishlatil. ma’lumot: %s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "Kamida 8 belgidan iborat parol kiriting"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "Qurilma nomi"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "USB bog‘lanishni yoqish avvalgi USB ulanishini o‘chiradi"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "Qurilma nomi %sda o‘zgartirilishi mumkin."
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "Qurilma nomi: %s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "Eng kamida %d belgi kiriting."
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "Mening qurilmamni yashirish"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "Parol"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d bayt"
@@ -76,17 +100,11 @@ msgstr "%d Kb"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d Mb"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "Paketli ma’l. xizmatidan foydal. bo‘lmaydi. Xizmat ko‘rsatish doirasidan tashqarida"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-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_BODY_SECURITY"
+msgstr "Xavfsizlik"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "Qurilma nomi: %s"
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "Bog‘lanishni sozlash uchun cherting."
 
 msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
 msgstr "Bog‘lanish faol"
@@ -94,36 +112,159 @@ msgstr "Bog‘lanish faol"
 msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
 msgstr "Bog‘lanish hozirda boshqa ilova tomonidan nazorat qilinmoqda. Bog‘lanishni sozlash uchun o‘sha ilova o‘chiriladi"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "Xavfsizlik turi: %s"
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "Ushbu parol faqat Wi-Fi bog‘lanish uchun."
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "Bog‘lanishdan foydalanish uchun mobil tarmoqlarga ulaning"
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi bog‘lanish yashirilgan."
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "Ulanish vaqti o‘tdi"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "Mobil tarmoqqa ulanish"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "Ishlatil. ma’lumot: %s"
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "USB-kabelni ulash"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "Bog‘lanishni sozlash uchun cherting"
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "Parvoz rejimini o‘chirish"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "SIM-kartani kiriting"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "Bog‘lab bo‘lmadi"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "Bog‘lanishdan foydal. bo‘lmadi"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB-modem"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi bog‘lanish"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi bog‘lan. parametri"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "Ulangan qurilmalar: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "Ulangan qurilma uziladi."
+
+msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
+msgstr "USB-kabelni ulash."
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "Bog‘lanishni o‘chirish bog‘langan qurilmalarga Internet orqali ulanishni oldini oladi. Davom ettirilsinmi?"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "USB bog‘lanishni yoqish avvalgi USB ulanishini o‘chiradi."
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "Bog‘lanishdan foydalanish uchun, SIM-kartani kiriting va qurilmani qayta ishga tushiring."
+
+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_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "Ushbu bog‘lash funksiyasini yoqish uchun mobil yoki Wi-Fi tarmoqqa ulaning"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "Bog‘lanishdan foydalanib bo‘lmaydi."
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "Parvoz rejimida bog‘lanishdan foydalanib bo‘lmaydi. Bog‘lanishdan foydalanish uchun Parvoz rejimini o‘chiring."
+
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Bog‘lanish ulanish vaqti tugadi"
+
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "Bog‘lanish ulanishi vaqti tugadi."
+
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "Mobil ma’lumot o‘chirilgan. Mobil ma’lumotni yoqing va qayta urinib ko‘ring."
+
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "Mobil tarmoqqa ulanish"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "Boshqa ko‘rsatilmasin"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "Kamida %dta belgi"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "Bog‘lanishni o‘chirish"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "Nom yo‘q"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "Bog‘lash yoqildi."
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "O‘chirish"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "Tarmoq ulanishi yo‘q"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "Bluetooth ko‘rinish imkoniyatining vaqti o‘tdi. Qurilmangizni topib bo‘lmadi"
+msgstr "Bluetooth ko‘rinish imkoniyatining vaqti o‘tdi. Qurilmangizni topib bo‘lmadi."
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "Ulanish vaqti o‘tdi."
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "Kamida 8 belgidan iborat parol kiriting."
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "Xavfsizlik turi: %s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "Parametrlar"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Bog‘lanish ko‘proq batareya quvvatini sarflaydi va ma’lumot ishlatilishini oshiradi. Bog‘lanish mumkin bo‘lgan qurilmalarning ruxsat etilgan maksimal miqdori: %d"
 
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "Bog‘lash yoqildi."
+
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
 msgstr "Wi-Fi tarmoq uziladi. Bog‘lanish ko‘proq batareya quvvatini sarflaydi va ma’lumot ishlatilishini oshiradi. Bog‘lanish mumkin bo‘lgan qurilmalarning ruxsat etilgan maksimal miqdori: %d"
 
-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_ST_BUTTON_ENABLE_M_USE"
+msgstr "Yoqish"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "Ulangan qurilma uziladi"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "Trafik chekloviga yetildi"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "Ulangan qurilmalar: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "Parvoz rjm"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Yaqin-atrofdagi qurilmalar ro‘yxatidagi qurilmalarni Bluetooth, Wi-Fi Direct va boshqalar orqali ajratib olish uchun qurilma nomlari ko‘rsatiladi."
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "Bog‘lanishdan foydalanish uchun mobil tarmoqlarga ulaning."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Nom o‘zg."
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "Ulangan qurilmalar"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "SIM-karta xatosi yuzaga keldi"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "Paketli ma’l. xizmatidan foydal. bo‘lmaydi. Xizmat ko‘rsatish doirasidan tashqarida."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a102dbe..b92742a 100644..100755
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "该密码仅用于 Wi-Fi 网络共享"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "取消"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "Wi-Fi 网络共享已隐藏"
+msgid "IDS_COM_SK_OK"
+msgstr "确定"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi 网络共享"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "打开 Wi-Fi 将禁用移动热点。是否继续？"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi 网络共享设置"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "数据使用"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "已接收："
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "网络分享"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "已发送："
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "不要再显示"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "设备名称"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "打开 Wi-Fi 将禁用 Wi-Fi 网络共享。"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "密码"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "达到的最大字符数 %d"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "可在 %s 中更改设备名称"
+msgid "IDS_COM_SK_NO"
+msgstr "否"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "隐藏我的设备"
+msgid "IDS_BR_SK_YES"
+msgstr "是"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "数据使用"
+msgid "IDS_BR_SK_NO"
+msgstr "否"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB 网络共享"
+msgid "IDS_BR_SK_DONE"
+msgstr "完成"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "禁用网络共享将阻止链接的设备访问互联网。是否继续？"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "取消"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "插入 SIM 卡并重启设备以使用网络共享"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "连接至 Wi-Fi 网络时无法使用蓝牙网络共享。"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "无法使用网络共享"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "重命名设备"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "飞行模式下无法使用网络共享。若要使用网络共享，禁用飞行模式"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "我的设备名称"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "关于手机"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "输入密码"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "连接的设备"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "完成"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "取消"
+
+msgid "IDS_COM_SK_YES"
+msgstr "是"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "保存"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "设定"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "蓝牙网络分享"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "安全"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "连接的设备"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "网络分享"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "已使用的数据：%s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "密码需要至少8个字符"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "设备名称"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "启用USB 网络共享将断开原有 USB 连接"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "可在 %s 中更改设备名称。"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "设备名称：%s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "输入至少%d字符。"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "隐藏我的设备"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "密码"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d 字节"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "无法使用信息包服务。在覆盖范围之外"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "安全"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "轻敲以配置网络共享。"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "网络分享激活"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "网络共享当前受控于另一应用程序。若要配置网络共享，将禁用该应用程序。"
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "该密码仅用于 Wi-Fi 网络共享。"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "Wi-Fi 网络共享已隐藏。"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "连接至移动网络"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "连接 USB 数据线"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "禁用飞行模式"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "插入 SIM 卡"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "网络共享失败"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "无法使用网络共享"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB 网络共享"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi 网络共享"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi 网络共享设置"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "连接的设备：%d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "已连接的设备将断开。"
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "连接 USB 线"
+msgstr "连接 USB 线。"
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "禁用网络共享将阻止链接的设备访问互联网。是否继续？"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "启用USB 网络共享将断开原有 USB 连接。"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "插入 SIM 卡并重启设备以使用网络共享。"
 
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "密码必须至少包含%d个字符，并且不超过%d个字符"
+msgstr "密码必须至少包含%d个字符，并且不超过%d个字符。"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "设备名称：%s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "网络共享消耗更多电池电力并增加您的数据使用量。"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "网络分享激活"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "若要启用该网络共享功能，请连接至移动或 Wi-Fi 网络"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "网络共享当前受控于另一应用程序。若要配置网络共享，将禁用该应用程序"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "无法使用网络共享。"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "安全类型：%s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "飞行模式下无法使用网络共享。若要使用网络共享，禁用飞行模式。"
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "若要使用网络共享，请连接至移动网络"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "网络共享连接已超时"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "连接超时"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "网络共享连接已超时"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "已使用的数据：%s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "移动数据已禁用。启用移动数据并重试。"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "轻敲以配置网络共享"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "连接至移动网络"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "不再显示"
+
+msgid "IDS_BR_SK_OK"
+msgstr "确定"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "至少 %d 个字符"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "删除网络共享"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "无名字"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "已启动网络共享。"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "关闭"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "无网络连接"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "蓝牙可见性已超时。可能找不到您的设备"
+msgstr "蓝牙可见性已超时。可能找不到您的设备。"
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "连接超时。"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "不再显示"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "密码需要至少8个字符。"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "安全类型：%s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "设定"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "网络共享会消耗更多电池电量且增加您的数据使用量。允许的最大网络共享设备数为 %d"
+msgstr "网络共享会消耗更多电池电量且增加您的数据使用量。允许的最大网络共享设备数为 %d。"
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "已启动网络共享。"
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi 网络将断开。网络共享会消耗更多电池电量且增加您的数据使用量。允许的最大网络共享设备数为 %d"
+msgstr "Wi-Fi 网络将断开。网络共享会消耗更多电池电量且增加您的数据使用量。允许的最大网络共享设备数为 %d。"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "网络共享消耗更多电池电力并增加您的数据使用量"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "启动"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "已连接的设备将断开"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "已达到数据使用量限制"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "连接的设备：%d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "飞行模式"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "显示设备名称以区分附近设备列表中可用的、以及通过蓝牙、Wi-Fi 直连及其他方式可用的各个设备。"
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "若要使用网络共享，请连接至移动网络。"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "重命名"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "已连接设备"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "发生 SIM 卡错误"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "无法使用信息包服务。在覆盖范围之外。"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 71dda6a..a33be24 100644..100755
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "密碼僅可用於 Wi-Fi 網絡共用"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "取消"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "已隱藏 Wi-Fi 網絡共用"
+msgid "IDS_COM_SK_OK"
+msgstr "確定"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi 網絡共用"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "開啟 Wi-Fi 將停用流動熱點。繼續嗎？"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi 網絡共用設定"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "數據使用量"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "已接收："
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "網絡共享"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "已發送："
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "不再顯示"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "裝置名稱"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "開啟 Wi-Fi 將停用 Wi-Fi 網絡共享。"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "密碼"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "已達字元數量上限  %d"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "裝置名稱可於 %s 中更改"
+msgid "IDS_COM_SK_NO"
+msgstr "否"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "隱藏我的裝置"
+msgid "IDS_BR_SK_YES"
+msgstr "是"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "數據使用量"
+msgid "IDS_BR_SK_NO"
+msgstr "否"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB 網絡共用"
+msgid "IDS_BR_SK_DONE"
+msgstr "完成"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "停用網絡共用將阻止連接的裝置存取互聯網。繼續嗎？"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "取消"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "插入 SIM 卡並重新啟動裝置以使用網絡共用"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "連接至 Wi-Fi 網絡時無法使用藍牙共享。"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "無法使用網絡共用"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "重新命名裝置"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "無法於飛行模式中使用網絡共享。如要使用網絡共享，請停用飛行模式"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "我的裝置名稱"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "關於手機"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "輸入密碼。"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "已連接裝置"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "完成"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "取消"
+
+msgid "IDS_COM_SK_YES"
+msgstr "是"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "儲存"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "設定"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "藍牙網絡共享"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "安全性"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "已連接裝置"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "網絡共享"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "已使用的數據：%s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "輸入至少 8 個字元的密碼"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "裝置名稱"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "啟用 USB 網絡共用將中斷先前的 USB 連接"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "裝置名稱可於 %s 中更改。"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "裝置名稱:%s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "請輸入至少 %d 個字元。"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "隱藏我的裝置"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "密碼"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d 位元組"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "無法使用分組數據服務。超出覆蓋範圍"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "安全性"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "輕觸以配置網絡共享。"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "網絡共享使用中"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "網絡共享目前由其他應用程式控制。若要配置網絡共享，將停用該應用程式。"
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "密碼僅可用於 Wi-Fi 網絡共用。"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "已隱藏 Wi-Fi 網絡共用。"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "連接至流動網絡"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "連接 USB 傳輸線"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "停用飛行模式"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "請插入 SIM 卡"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "網絡共享失敗"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "無法使用網絡共享"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB 網絡共用"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi 網絡共用"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi 網絡共用設定"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "已連接裝置: %d"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "將中斷已連接的裝置。"
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "連接 USB 線"
+msgstr "連接 USB 線。"
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "停用網絡共用將阻止連接的裝置存取互聯網。繼續嗎？"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "啟用 USB 網絡共用將中斷先前的 USB 連接。"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "插入 SIM 卡並重新啟動裝置以使用網絡共用。"
 
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "密碼必須包含至少%d個字元，但不可超過%d個字元"
+msgstr "密碼必須包含至少%d個字元，但不可超過%d個字元。"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "裝置名稱:%s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "網路共享會消耗更多電力且增加數據使用量。"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "網絡共享使用中"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "若要啟用此網絡共享功能，請連接至流動或 Wi-Fi 網絡。"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "網絡共享目前由其他應用程式控制。若要配置網絡共享，將停用該應用程式"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "無法使用網絡共用。"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "安全性類型：%s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "無法於飛行模式中使用網絡共享。如要使用網絡共享，請停用飛行模式。"
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "若要使用網絡共享，請連接至流動網絡"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "網絡共享連接已逾時"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "連線逾時"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "網絡共享連接已逾時。"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "已使用的數據：%s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "流動數據已停用。啟用流動數據並重試。"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "輕觸以配置網絡共享"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "連接至流動網絡"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "不要再顯示"
+
+msgid "IDS_BR_SK_OK"
+msgstr "確定"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "至少 %d 個字元"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "停用網絡共享"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "無名稱"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "已啟動網絡共享。"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "關閉"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "無網絡連接"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "藍牙可見度已逾時。可能找不到您的裝置"
+msgstr "藍牙可見度已逾時。可能找不到您的裝置。"
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "連線逾時。"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "輸入至少 8 個字元的密碼。"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "安全性類型：%s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "設定"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "網絡共享會消耗更多電力並增加您的數據使用量。可允許的最高網絡共享裝置數量為 %d"
+msgstr "網絡共享會消耗更多電力並增加您的數據使用量。可允許的最高網絡共享裝置數量為 %d。"
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "已啟動網絡共享。"
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi 網絡將中斷連接。網絡共享會消耗更多電力並增加您的數據使用量。可允許的最高網絡共享裝置數量為 %d"
+msgstr "Wi-Fi 網絡將中斷連接。網絡共享會消耗更多電力並增加您的數據使用量。可允許的最高網絡共享裝置數量為 %d。"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "網路共享會消耗更多電力且增加數據使用量"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "啟用"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "將中斷已連接的裝置"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "已達數據使用量上限"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "已連接裝置: %d"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "飛行模式"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "顯示裝置名稱可區分附近裝置清單中通過藍牙、Wi-Fi Direct 與其他方式連接的所有可用裝置。"
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "若要使用網絡共享，請連接至流動網絡。"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "重新命名"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "已連接裝置"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "發生 SIM 卡錯誤"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "無法使用分組數據服務。超出覆蓋範圍。"
 
diff --git a/po/zh_SG.po b/po/zh_SG.po
deleted file mode 100644
index d058ac5..0000000
--- a/po/zh_SG.po
+++ /dev/null
@@ -1,129 +0,0 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "该密码仅用于WLAN网络共享"
-
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "WLAN网络共享已隐藏"
-
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "WLAN网络共享"
-
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "WLAN网络共享设置"
-
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "已接收："
-
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "已发送："
-
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "设备名称"
-
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "密码"
-
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "Device name can be changed in %s"
-
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "隐藏我的设备"
-
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "使用数据"
-
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB 网络共享"
-
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "禁用网络共享将阻止链接的设备访问互联网。是否继续？"
-
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "插入 SIM 卡并重启设备以使用网络共享"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "无法使用网络共享"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "飞行模式下无法使用网络共享。若要使用网络共享，禁用飞行模式"
-
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "关于手机"
-
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "连接的设备"
-
-msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
-msgstr "蓝牙网络分享"
-
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "安全设定"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "网络分享"
-
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "输入至少8个字符的密码"
-
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "Enabling USB tethering will disconnect previous USB connection"
-
-msgid "IDS_MOBILEAP_BODY_PD_BYTES"
-msgstr "%d 字节"
-
-msgid "IDS_MOBILEAP_BODY_PD_KB"
-msgstr "%d KB"
-
-msgid "IDS_MOBILEAP_BODY_PD_MB"
-msgstr "%d MB"
-
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "无法使用信息包服务。在覆盖范围之外"
-
-msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "连结USB缆线"
-
-msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "密码必须至少包含%d个字符，并且不超过%d个字符"
-
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "设备名称：%s"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "网络分享激活"
-
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "网络共享当前受控于另一应用程序。若要配置网络共享，将禁用该应用程序"
-
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "安全类型：%s"
-
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "若要使用网络共享，请连接至移动网络"
-
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "连接超时"
-
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "已使用的数据：%s"
-
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "轻敲以配置网络共享"
-
-msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "蓝牙可见性已超时。可能找不到您的设备"
-
-msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "网络共享会消耗更多电池电量且增加您的数据使用量。允许的最多网络共享设备数为 %d"
-
-msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi 网络将断开。网络共享会消耗更多电池电量且增加您的数据使用量。允许的最多网络共享设备数为 %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 "已连接的设备将断开"
-
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "连接的设备：%d"
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cac1f71..8a4e754 100644..100755
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,71 +1,95 @@
-msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
-msgstr "密碼僅可用於 Wi-Fi 網路共享"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "取消"
 
-msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
-msgstr "已隱藏 Wi-Fi 網路共享"
+msgid "IDS_COM_SK_OK"
+msgstr "確定"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
-msgstr "Wi-Fi 網路共享"
+msgid "IDS_MOBILEAP_POP_TURNING_ON_WI_FI_WILL_DISABLE_MOBILE_HOTSPOT_CONTINUE_Q_VZW"
+msgstr "開啟 Wi-Fi 將停用手機無線基地台。繼續嗎？"
 
-msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
-msgstr "Wi-Fi 網路共享設定"
+msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
+msgstr "數據使用量"
 
-msgid "IDS_MOBILEAP_BODY_RECEIVED_C"
-msgstr "已接收："
+msgid "IDS_MOBILEAP_BODY_TETHERING"
+msgstr "網路共享"
 
-msgid "IDS_MOBILEAP_BODY_SENT_C"
-msgstr "已傳送："
+msgid "IDS_MOBILEAP_POP_DO_NOT_SHOW_AGAIN"
+msgstr "不再顯示"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
-msgstr "裝置名稱"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "開啟 Wi-Fi 將停用 Wi-Fi 網路共享。"
 
-msgid "IDS_MOBILEAP_BODY_PASSWORD"
-msgstr "密碼"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "已達字元數量上限  %d"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
-msgstr "裝置名稱可於 %s 中變更"
+msgid "IDS_COM_SK_NO"
+msgstr "否"
 
-msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
-msgstr "隱藏我的裝置"
+msgid "IDS_BR_SK_YES"
+msgstr "是"
 
-msgid "IDS_MOBILEAP_MBODY_DATA_USAGE"
-msgstr "數據使用量"
+msgid "IDS_BR_SK_NO"
+msgstr "否"
 
-msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
-msgstr "USB 網絡共享"
+msgid "IDS_BR_SK_DONE"
+msgstr "完成"
 
-msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
-msgstr "停用網路共享將阻止連接的裝置存取網際網路。繼續嗎？"
+msgid "IDS_BR_SK_CANCEL"
+msgstr "取消"
 
-msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
-msgstr "插入 SIM 卡並重新啟動裝置以使用網路共享"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK"
+msgstr "連接至 Wi-Fi 網路時無法使用藍牙共享。"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
-msgstr "無法使用網路共享"
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "重新命名裝置"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
-msgstr "在飛航模式中無法使用網路共享。要使用網路共享需停用飛航模式"
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "我的裝置名稱"
 
-msgid "IDS_ST_BODY_ABOUT_PHONE"
-msgstr "關於手機"
+msgid "IDS_COM_BODY_ENTER_PASSWORD"
+msgstr "輸入密碼。"
 
-msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
-msgstr "已連接的裝置"
+msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
+msgstr "完成"
+
+msgid "IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"
+msgstr "取消"
+
+msgid "IDS_COM_SK_YES"
+msgstr "是"
+
+msgid "IDS_COM_SK_SAVE"
+msgstr "儲存"
+
+msgid "IDS_COM_BODY_SETTINGS"
+msgstr "設定"
 
 msgid "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"
 msgstr "藍牙網路共享"
 
-msgid "IDS_MOBILEAP_BODY_SECURITY"
-msgstr "安全性"
+msgid "IDS_MOBILEAP_BODY_CONNECTED_DEVICE"
+msgstr "已連接的裝置"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING"
-msgstr "網路共享"
+msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
+msgstr "已使用的數據：%s"
 
-msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
-msgstr "輸入至少 8 個字元的密碼"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME"
+msgstr "裝置名稱"
 
-msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
-msgstr "啟用 USB 網路共享將中斷先前的 USB 連接"
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"
+msgstr "裝置名稱可於 %s 中變更。"
+
+msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
+msgstr "設備名稱：%s"
+
+msgid "IDS_MOBILEAP_BODY_ENTER_AT_LEAST_PD_CHARACTERS"
+msgstr "請輸入至少 %d 個字元。"
+
+msgid "IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"
+msgstr "隱藏我的裝置"
+
+msgid "IDS_MOBILEAP_BODY_PASSWORD"
+msgstr "密碼"
 
 msgid "IDS_MOBILEAP_BODY_PD_BYTES"
 msgstr "%d 位元組"
@@ -76,54 +100,171 @@ msgstr "%d KB"
 msgid "IDS_MOBILEAP_BODY_PD_MB"
 msgstr "%d MB"
 
-msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
-msgstr "無法使用數據傳輸。超出覆蓋範圍"
+msgid "IDS_MOBILEAP_BODY_SECURITY"
+msgstr "安全性"
+
+msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
+msgstr "輕觸以設定網路共享。"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
+msgstr "網路共享使用中"
+
+msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
+msgstr "網路共享台目前由其他應用程式控制。若要設定網路共享，將停用該應用程式。"
+
+msgid "IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"
+msgstr "密碼僅可用於 Wi-Fi 網路共享。"
+
+msgid "IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN"
+msgstr "已隱藏 Wi-Fi 網路共享。"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_TO_MOBILE_NETWORK_ABB"
+msgstr "連接至行動網路"
+
+msgid "IDS_MOBILEAP_HEADER_CONNECT_USB_CABLE_ABB"
+msgstr "連接 USB 傳輸線"
+
+msgid "IDS_MOBILEAP_HEADER_DISABLE_FLIGHT_MODE_ABB"
+msgstr "停用飛航模式"
+
+msgid "IDS_MOBILEAP_HEADER_INSERT_SIM_CARD_ABB"
+msgstr "請插入 SIM 卡"
+
+msgid "IDS_MOBILEAP_HEADER_TETHERING_FAILED_ABB"
+msgstr "網路共享失敗"
+
+msgid "IDS_MOBILEAP_HEADER_UNABLE_TO_USE_TETHERING_ABB"
+msgstr "無法使用網路共享"
+
+msgid "IDS_MOBILEAP_MBODY_USB_TETHERING"
+msgstr "USB數據連線"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING"
+msgstr "Wi-Fi 網路共享"
+
+msgid "IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"
+msgstr "Wi-Fi 網路共享設定"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
+msgstr "連接的設備：％d個"
+
+msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
+msgstr "將中斷連接的裝置。"
 
 msgid "IDS_MOBILEAP_POP_CONNECT_USB_CABLE"
-msgstr "連接 USB 纜線"
+msgstr "連接 USB 纜線。"
+
+msgid "IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"
+msgstr "停用網路共享將阻止連接的裝置存取網際網路。繼續嗎？"
+
+msgid "IDS_MOBILEAP_POP_ENABLING_USB_TETHERING_WILL_DISCONNECT_PREVIOUS_USB_CONNECTION"
+msgstr "啟用 USB 網路共享將中斷先前的 USB 連接。"
+
+msgid "IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"
+msgstr "插入 SIM 卡並重新啟動裝置以使用網路共享。"
 
 msgid "IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"
-msgstr "密碼必須包含至少%d個字符，並且不得超過%d個字符"
+msgstr "密碼必須包含至少%d個字符，並且不得超過%d個字符。"
 
-msgid "IDS_MOBILEAP_BODY_DEVICE_NAME_C_PS"
-msgstr "設備名稱：%s"
+msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
+msgstr "網路共享會消耗更多電力且增加數據使用量。"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_ACTIVE_ABB"
-msgstr "網路共享使用中"
+msgid "IDS_MOBILEAP_POP_TO_ENABLE_THIS_TETHERING_FUNCTION_CONNECT_TO_A_MOBILE_OR_WI_FI_NETWORK"
+msgstr "若要啟用此網路共享功能，請連接至行動或 Wi-Fi 網路"
 
-msgid "IDS_MOBILEAP_BODY_TETHERING_IS_CURRENTLY_BEING_CONTROLLED_BY_ANOTHER_APPLICATION_TO_CONFIGURE_TETHERING_THAT_APPLICATION_WILL_BE_DISABLED"
-msgstr "網路共享台目前由其他應用程式控制。若要設定網路共享，將停用該應用程式"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"
+msgstr "無法使用網路共享。"
 
-msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
-msgstr "安全性類型：%s"
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"
+msgstr "在飛航模式中無法使用網路共享。要使用網路共享需停用飛航模式。"
 
-msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
-msgstr "若要使用網路共享，請連接至行動網路"
+msgid "IDS_MOBILEAP_TMBODY_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "網路共享連線逾時"
 
-msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
-msgstr "連線逾時"
+msgid "IDS_MOBILEAP_TPOP_TETHERING_CONNECTION_TIMED_OUT"
+msgstr "網路共享連線逾時。"
 
-msgid "IDS_MOBILEAP_BODY_DATA_USED_C_PS_ABB"
-msgstr "已使用的數據：%s"
+msgid "IDS_MSGC_POP_MOBILE_DATA_IS_DISABLED_ENABLE_MOBILE_DATA_AND_TRY_AGAIN"
+msgstr "行動數據已停用。啟用行動數據後重試。"
 
-msgid "IDS_MOBILEAP_BODY_TAP_TO_CONFIGURE_TETHERING"
-msgstr "輕觸以設定網路共享"
+msgid "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK"
+msgstr "連接至行動網路"
+
+msgid "IDS_BR_OPT_DO_NOT_SHOW_AGAIN"
+msgstr "不再顯示"
+
+msgid "IDS_BR_SK_OK"
+msgstr "確定"
+
+msgid "IDS_CHATON_BODY_AT_LEAST_PD_CHARACTERS_ABB"
+msgstr "至少 %d 個字元"
+
+msgid "IDS_CMV_HEADER_DISABLE_TETHERING_ABB"
+msgstr "停用網路共享"
+
+msgid "IDS_COM_BODY_NO_NAME"
+msgstr "無姓名"
+
+msgid "IDS_COM_BODY_TETHERING_ENABLED"
+msgstr "已啟用網路共享。"
+
+msgid "IDS_COM_BODY_TURN_OFF"
+msgstr "關閉"
+
+msgid "IDS_MSG_HEADER_NO_NETWORK_CONNECTION"
+msgstr "無網路連接"
 
 msgid "IDS_ST_BODY_BLUETOOTH_VISIBILITY_HAS_TIMED_OUT_YOUR_DEVICE_MIGHT_NOT_BE_FOUND"
-msgstr "藍牙可見度已逾時。可能找不到您的裝置"
+msgstr "藍牙可見度已逾時。可能找不到您的裝置。"
+
+msgid "IDS_ST_BODY_CONNECTION_TIMEOUT"
+msgstr "連線逾時。"
+
+msgid "IDS_ST_BODY_DO_NOT_SHOW_AGAIN_VZW"
+msgstr "Do not show again"
+
+msgid "IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"
+msgstr "輸入至少 8 個字元的密碼。"
+
+msgid "IDS_ST_BODY_SECURITY_TYPE_C_PS"
+msgstr "安全性類型：%s"
+
+msgid "IDS_ST_BODY_SETTINGS"
+msgstr "設定"
 
 msgid "IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "網路共享會消耗更多電力並增加您的數據用量。可允許的最高網路共享裝置數量為 %d"
+msgstr "網路共享會消耗更多電力並增加您的數據用量。可允許的最高網路共享裝置數量為 %d。"
+
+msgid "IDS_ST_BODY_TETHERING_ENABLED"
+msgstr "已啟用網路共享。"
 
 msgid "IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"
-msgstr "Wi-Fi 網路將中斷連接。網路共享會消耗更多電力並增加您的數據用量。可允許的最高網路共享裝置數量為 %d"
+msgstr "Wi-Fi 網路將中斷連接。網路共享會消耗更多電力並增加您的數據用量。可允許的最高網路共享裝置數量為 %d。"
 
-msgid "IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE"
-msgstr "網路共享會消耗更多電力且增加數據使用量"
+msgid "IDS_ST_BUTTON_ENABLE_M_USE"
+msgstr "啟用"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"
-msgstr "將中斷連接的裝置"
+msgid "IDS_ST_HEADER_DATA_USAGE_LIMIT_REACHED_ABB2"
+msgstr "已達數據使用量上限"
 
-msgid "IDS_MOBILEAP_POP_CONNECTED_DEVICES_C_PD"
-msgstr "連接的設備：％d個"
+msgid "IDS_ST_MBODY_FLIGHT_MODE_ABB"
+msgstr "飛航模式"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "將顯示裝置名稱以區別附近裝置清單中各個可用的裝置，並顯示經藍牙、Wi-Fi Direct、與其他連接方式。"
+
+msgid "IDS_ST_POP_TO_USE_TETHERING_CONNECT_TO_A_MOBILE_NETWORKS"
+msgstr "若要使用網路共享，請連接至行動網路。"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "重新命名"
+
+msgid "IDS_WIFI_HEADER_CONNECTED_DEVICES"
+msgstr "已連接的裝置"
+
+msgid "MIDS_SWALL_HEADER_SIM_CARD_ERROR_OCCURRED_ABB"
+msgstr "發生 SIM 卡錯誤"
+
+msgid "IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"
+msgstr "無法使用數據傳輸。超出覆蓋範圍。"
 
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 71758d4..b474178 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -9,3 +9,14 @@ ADD_DEPENDENCIES(${PROJECT_NAME} tethering_images.edj)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tethering_images.edj DESTINATION ${EDJDIR})
 
+ADD_CUSTOM_TARGET(tethering.edj
+                COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/
+                        ${CMAKE_CURRENT_SOURCE_DIR}/tethering.edc
+                        ${CMAKE_CURRENT_SOURCE_DIR}/tethering.edj
+                DEPENDS
+                        ${CMAKE_CURRENT_SOURCE_DIR}/tethering.edc
+                                               )
+ADD_DEPENDENCIES(${PROJECT_NAME} tethering.edj)
+
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tethering.edj DESTINATION ${EDJDIR})
+
diff --git a/resources/images/USB.png b/resources/images/A01-5_device_USB.png
index 9c6eb7c..f1c00ed 100644
--- a/resources/images/USB.png
+++ b/resources/images/A01-5_device_USB.png
diff --git a/resources/images/A01-5_device_USB_icon.png b/resources/images/A01-5_device_USB_icon.png
new file mode 100644
index 0000000..4c49de7
--- /dev/null
+++ b/resources/images/A01-5_device_USB_icon.png
diff --git a/resources/images/A01-5_device_USB_press.png b/resources/images/A01-5_device_USB_press.png
new file mode 100644
index 0000000..b4dd5bf
--- /dev/null
+++ b/resources/images/A01-5_device_USB_press.png
diff --git a/resources/images/A01-5_device_WIFI.png b/resources/images/A01-5_device_WIFI.png
new file mode 100644
index 0000000..41f23b4
--- /dev/null
+++ b/resources/images/A01-5_device_WIFI.png
diff --git a/resources/images/A01-5_device_WIFI_press.png b/resources/images/A01-5_device_WIFI_press.png
new file mode 100644
index 0000000..de56bad
--- /dev/null
+++ b/resources/images/A01-5_device_WIFI_press.png
diff --git a/resources/images/A01-5_device_bluetooth.png b/resources/images/A01-5_device_bluetooth.png
new file mode 100644
index 0000000..0e7e87f
--- /dev/null
+++ b/resources/images/A01-5_device_bluetooth.png
diff --git a/resources/images/A01-5_device_bluetooth_press.png b/resources/images/A01-5_device_bluetooth_press.png
new file mode 100644
index 0000000..e39fcd9
--- /dev/null
+++ b/resources/images/A01-5_device_bluetooth_press.png
diff --git a/resources/images/Wifi.png b/resources/images/A09_device_telephone_connect.png
index c1b392e..6204f77 100644..100755
--- a/resources/images/Wifi.png
+++ b/resources/images/A09_device_telephone_connect.png
diff --git a/resources/images/B31_option_popup_icon_help.png b/resources/images/B31_option_popup_icon_help.png
new file mode 100644
index 0000000..0c05bdb
--- /dev/null
+++ b/resources/images/B31_option_popup_icon_help.png
diff --git a/resources/images/Q02_Notification_MobileAP.png b/resources/images/Q02_Notification_MobileAP.png
new file mode 100644
index 0000000..540907d
--- /dev/null
+++ b/resources/images/Q02_Notification_MobileAP.png
diff --git a/resources/images/noti_tethering_bluetooth.png b/resources/images/noti_tethering_bluetooth.png
new file mode 100644
index 0000000..9d0abf2
--- /dev/null
+++ b/resources/images/noti_tethering_bluetooth.png
diff --git a/resources/images/noti_tethering_general.png b/resources/images/noti_tethering_general.png
new file mode 100644
index 0000000..cf6b34d
--- /dev/null
+++ b/resources/images/noti_tethering_general.png
diff --git a/resources/images/noti_tethering_usb.png b/resources/images/noti_tethering_usb.png
new file mode 100644
index 0000000..6e05910
--- /dev/null
+++ b/resources/images/noti_tethering_usb.png
diff --git a/resources/images/noti_tethering_wifi_num.png b/resources/images/noti_tethering_wifi_num.png
new file mode 100644
index 0000000..ab069cf
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num.png
diff --git a/resources/images/noti_tethering_wifi_num_01.png b/resources/images/noti_tethering_wifi_num_01.png
new file mode 100644
index 0000000..b61f126
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_01.png
diff --git a/resources/images/noti_tethering_wifi_num_02.png b/resources/images/noti_tethering_wifi_num_02.png
new file mode 100644
index 0000000..61f44f9
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_02.png
diff --git a/resources/images/noti_tethering_wifi_num_03.png b/resources/images/noti_tethering_wifi_num_03.png
new file mode 100644
index 0000000..e9ba175
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_03.png
diff --git a/resources/images/noti_tethering_wifi_num_04.png b/resources/images/noti_tethering_wifi_num_04.png
new file mode 100644
index 0000000..66bda3b
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_04.png
diff --git a/resources/images/noti_tethering_wifi_num_05.png b/resources/images/noti_tethering_wifi_num_05.png
new file mode 100644
index 0000000..7ceade4
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_05.png
diff --git a/resources/images/noti_tethering_wifi_num_06.png b/resources/images/noti_tethering_wifi_num_06.png
new file mode 100644
index 0000000..a9e9177
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_06.png
diff --git a/resources/images/noti_tethering_wifi_num_07.png b/resources/images/noti_tethering_wifi_num_07.png
new file mode 100644
index 0000000..d159a40
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_07.png
diff --git a/resources/images/noti_tethering_wifi_num_08.png b/resources/images/noti_tethering_wifi_num_08.png
new file mode 100644
index 0000000..f28a1aa
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_08.png
diff --git a/resources/images/noti_tethering_wifi_num_09.png b/resources/images/noti_tethering_wifi_num_09.png
new file mode 100644
index 0000000..9d9bed1
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_09.png
diff --git a/resources/images/noti_tethering_wifi_num_10.png b/resources/images/noti_tethering_wifi_num_10.png
new file mode 100644
index 0000000..1d2d325
--- /dev/null
+++ b/resources/images/noti_tethering_wifi_num_10.png
diff --git a/resources/images/Bluetooth.png b/resources/images/noti_tethering_wifi_num_no.png
index 6aefb32..d5427b7 100644
--- a/resources/images/Bluetooth.png
+++ b/resources/images/noti_tethering_wifi_num_no.png
diff --git a/resources/images/org.tizen.tethering.png b/resources/images/org.tizen.tethering.png
new file mode 100644
index 0000000..9191fac
--- /dev/null
+++ b/resources/images/org.tizen.tethering.png
diff --git a/resources/images/tethering.png b/resources/images/tethering.png
deleted file mode 100644
index 4d8f3b4..0000000
--- a/resources/images/tethering.png
+++ /dev/null
diff --git a/resources/tethering.edc b/resources/tethering.edc
new file mode 100755
index 0000000..4cc9cb8
--- /dev/null
+++ b/resources/tethering.edc
@@ -0,0 +1,554 @@
+#define TETH_ENTRYPASSWORDVIEW_FIELD_MIN_MAX 0 66
+#define RENAME_POPUP_ENTRY_2BUTTON_BG_MIN 0 291
+#define POPUP_WITH_LANDSCAPE 0 200
+#define LANDSCAPE_CONTENT 0 50
+
+
+#define TETH_POPUP_PAD_W 0
+#define TETH_POPUP_PAD_H 16
+
+#define POPUP_HEIGHT_LANDSCAPE 50
+#define POPUP_EDITFIELD_LAYOUT_MINMAX_HEIGHT_INC 66
+#define POPUP_WITH_2_GL_ITEMS 200
+
+#define POPUP_CHECK_VIEW_LAYOUT_MIN_INC 0 165
+#define POPUP_CHECK_VIEW_LAYOUT_CONTENT_MIN_INC 0 100
+#define POPUP_CHECK_VIEW_LAYOUT_BOTTOM_MIN_INC 0 27
+#define POPUP_CHECK_VIEW_SWALLOW_END_MIN_INC 38 38
+
+collections {
+	base_scale: 1.8;
+	group { name: "popup_checkview_layout";
+		parts {
+			part { name: "bg";
+				scale: 1;
+				type: SPACER;
+				description {
+					state: "default" 0.0;
+					min: POPUP_CHECK_VIEW_LAYOUT_MIN_INC;
+					fixed: 1 0;
+				}
+			}
+			part { name: "elm.swallow.content";
+				type: SWALLOW;
+				scale: 1;
+				description { state: "default" 0.0;
+					fixed: 1 0;
+					min: POPUP_CHECK_VIEW_LAYOUT_CONTENT_MIN_INC;
+					align: 0.0 0.0;
+					rel1 {
+						relative: 0.0 0.0;
+					}
+					rel2 {
+						relative: 1.0 0.0;
+						to: "check";
+					}
+					color: 0 255 0 1;
+				}
+			}
+			part { name: "check";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 1.0;
+					min: POPUP_CHECK_VIEW_SWALLOW_END_MIN_INC;
+					fixed: 1 1;
+					rel1 {
+						relative: 0.0 1.0;
+						to: "pad_b";
+						offset: 15 0;
+					}
+					rel2 {
+						relative: 1.0 0.0;
+						to_y: "pad_b";
+					}
+				}
+			}
+			part { name: "elm.swallow.end";
+				type: SWALLOW;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 0.5;
+					min: POPUP_CHECK_VIEW_SWALLOW_END_MIN_INC;
+					fixed: 1 1;
+					rel1.to: check;
+					rel2.to: check;
+				}
+			}
+			part { name: "pad_b";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 1.0;
+					min: POPUP_CHECK_VIEW_LAYOUT_BOTTOM_MIN_INC;
+					fixed: 0 1;
+					rel1 {
+						relative: 0.0 1.0;
+					}
+					rel2 {
+						relative: 1.0 1.0;
+					}
+				}
+			}
+		}
+	}
+	group {
+		name: "entry_style";
+		parts {
+			part {
+				name: "base";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 POPUP_EDITFIELD_LAYOUT_MINMAX_HEIGHT_INC;
+				}
+			}
+			part { name: "pad_l";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: TETH_POPUP_PAD_W 0;
+					rel1 {
+						relative: 0.0 0.0;
+						to: "base";
+					}
+					rel2 {
+						relative: 0.0 1.0;
+						to: "base";
+					}
+					align: 0.0 0.0;
+				}
+			}
+			part { name: "pad_r";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: TETH_POPUP_PAD_W 0;
+					fixed: 0 0;
+					rel1 {
+						relative: 1.0 0.0;
+						to: "base";
+					}
+					rel2 {
+						relative: 1.0 1.0;
+						to: "base";
+					}
+					align: 1.0 0.0;
+				}
+			}
+			part { name: "entry_part";
+				type: SWALLOW;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 POPUP_EDITFIELD_LAYOUT_MINMAX_HEIGHT_INC;
+					align: 0.0 0.0;
+					rel1{
+						relative: 1.0 0.0 ;
+						to_x: "pad_l";
+					}
+					rel2{
+						relative: 0.0 1.0;
+						to_x: "pad_r";
+					}
+				}
+			}
+		}
+	}
+	group { name: "rename_device_portrait";
+		parts {
+			part {
+				name: "base";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: RENAME_POPUP_ENTRY_2BUTTON_BG_MIN;
+					fixed: 1 0;
+				}
+			}
+			part {
+				name: "content_top_padding";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 15;
+					fixed: 0 1;
+					align: 0.0 0.0;
+					rel1 {
+						relative: 0.0 0.0;
+						to_x: "base";
+					}
+					rel2 {
+						relative: 1.0 0.0;
+						to_x: "base";
+					}
+				}
+			}
+			part {
+				name: "content_left_padding";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 30 0;
+					fixed: 1 0;
+					align: 0.0 0.0;
+					rel1 {
+						to: "base";
+						relative: 0.0 0.0;
+					}
+					rel2 {
+						to: "base";
+						relative: 0.0 1.0;
+					}
+				}
+			}
+			part {
+				name: "content_right_padding";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 30 0;
+					fixed: 1 0;
+					align: 1.0 0.0;
+					rel1 {
+						to: "base";
+						relative: 1.0 0.0;
+					}
+					rel2 {
+						to: "base";
+						relative: 1.0 1.0;
+					}
+				}
+			}
+			part {
+				name: "content_bottom_padding";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 15;
+					fixed: 0 1;
+					align: 0.0 1.0;
+					rel1 {
+						relative: 1.0 0.0;
+						to_x: "base";
+					}
+					rel2 {
+						relative: 1.0 1.0;
+						to_x: "base";
+					}
+				}
+			}
+			part {
+				name: "content_field";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 96;
+					fixed: 0 1;
+					align: 0.5 0.0;
+					rel1 {
+						relative: 0.0 1.0;
+						to: "content_top_padding";
+					}
+					rel2.to: "content_top_padding";
+				}
+			}
+			part {
+				name: "elm.swallow.content";
+				type: SWALLOW;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 96;
+					fixed: 1 1;
+					align: 0.5 0.5;
+					rel1.to: "content_field";
+					rel2.to: "content_field";
+				}
+			}
+			part {
+				name: "end_top_padding";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 0;
+					fixed: 0 1;
+					align: 0.0 0.0;
+					rel1 {
+						to: "content_field";
+						relative: 0.0 1.0;
+					}
+					rel2.to: "content_field";
+				}
+			}
+			part {
+				name: "end_field";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 150;
+					fixed: 0 0;
+					align: 0.0 0.0;
+					rel1 {
+						to_x: "content_left_padding";
+						to_y: "end_top_padding";
+						relative: 1.0 1.0;
+					}
+					rel2 {
+						to_x: "content_right_padding";
+						to_y: "base";
+						relative : 0.0 1.0;
+					}
+				}
+			}
+			part {
+				name: "elm.swallow.end";
+				type: SWALLOW;
+				scale: 1;
+				mouse_events: 0;
+				description {
+					state: "default" 0.0;
+					fixed: 1 1;
+					align: 0.0 0.5;
+					rel1.to: "end_field";
+					rel2.to: "end_field";
+				}
+			}
+		}
+	}
+	group {
+		name: "rename_device_landscape";
+		inherit: "rename_device_portrait";
+		parts {
+			part {
+			name: "base";
+			type: SPACER;
+			scale: 1;
+			description {
+				state: "default" 0.0;
+				min: POPUP_WITH_LANDSCAPE;
+				fixed: 1 0;
+			}
+		}
+			part {
+				name: "end_field";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: LANDSCAPE_CONTENT;
+					fixed: 0 0;
+					align: 0.0 0.0;
+					rel1 {
+						to: "end_top_padding";
+						relative: 0.0 1.0;
+					}
+					rel2.to: "end_top_padding";
+				}
+			}
+			part {
+				name: "elm.swallow.end";
+				type: SWALLOW;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					fixed: 1 1;
+					align: 0.0 0.5;
+					rel1.to: "end_field";
+					rel2.to: "end_field";
+				}
+			}
+		}
+	}
+	group {
+		name: "rename_device_ly";
+		parts {
+			part {
+				name:"pad_t";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 0;
+					align: 0.5 0.0;
+					fixed: 0 1;
+					rel2.relative: 1.0 0.0;
+				}
+			}
+			part {
+				name:"elm.swallow.layout";
+				type: SWALLOW;
+				scale: 1;
+				mouse_events: 1;
+				repeat_events: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 POPUP_WITH_2_GL_ITEMS;
+					align: 0.5 1.0;
+					fixed: 1 0;
+					rel1 {
+						relative: 1.0 1.0;
+						to_x: "pad_l";
+						to_y: "pad_t";
+					}
+					rel2 {
+						relative: 0.0 0.0;
+						to_x: "pad_r";
+						to_y: "pad_b";
+					}
+				}
+			}
+
+			part {
+				name:"pad_b";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					align: 0.5 1.0;
+					min: 0 0;
+					fixed: 0 1;
+					rel1.relative: 0.0 1.0;
+				}
+			}
+
+			part {
+				name: "pad_l";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 0;
+					fixed: 0 0;
+					align: 0.0 0.0;
+					rel1 {
+						relative: 0.0 0.0;
+					}
+					rel2 {
+						relative: 0.0 1.0;
+					}
+				 }
+			}
+
+			part {
+				name: "pad_r";
+				type: SPACER;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					min: 0 0;
+					fixed: 0 0;
+					align: 1.0 0.0;
+					rel1 {
+						relative: 1.0 0.0;
+					}
+					rel2 {
+						relative: 1.0 1.0;
+					}
+				}
+			}
+		}
+	}
+	group { name: "editfield_layout";
+		parts {
+			part { name: "bg";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+				min : 0 250;
+				}
+			}	
+			part { name: "top_padding";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					min: 0 15;
+					fixed : 0 1;
+					rel1 {
+						relative: 0 0;
+						to: "bg";
+					}
+					rel2 {
+						relative: 1 0;
+						to: "bg";
+					}
+				}
+			}
+			part { name: "bg_entry";
+				type: SPACER;
+				scale:1;
+				description { state: "default" 0.0;
+					min: 0 66;
+					fixed : 0 1;
+					rel1 {
+						relative: 0.0 0.0;
+						to: "top_padding";
+					}
+					rel2 {
+						relative: 1.0 0.0;
+						to: "top_padding";
+					}
+					align: 0.5 0;
+				}
+			}
+			part { name: "entry_part";
+				type: SWALLOW;
+				scale: 1;
+				description { state: "default" 0.0;
+					fixed: 1 1;
+					rel1.to: "bg_entry";
+					rel2.to: "bg_entry";
+					align: 0.5 0.5;
+				}
+			}
+			part { name : "btm_pad";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					min: 0 15;
+					fixed : 0 1;
+					rel1 {
+						relative: 0.0 1.0;
+						to: "bg_entry";
+					}
+					rel2 {
+						relative: 1.0 1.0;
+						to: "bg_entry";
+					}
+					align: 0 0;
+				}
+			}
+			part { name : "description";
+				type: SWALLOW;
+				scale: 1;
+				description { state: "default" 0.0;
+					min: 0 100;
+					rel1 {
+						relative: 0.0 1.0;
+						to: "btm_pad";
+					}
+					rel2 {
+						relative: 1.0 1.0;
+						to: "bg";
+					}
+					align: 0 0;
+				}
+			}
+		}
+	}
+}
+#undef TETH_ENTRYPASSWORDVIEW_FIELD_MIN_MAX
+#undef RENAME_POPUP_ENTRY_2BUTTON_BG_MIN
+#undef POPUP_WITH_LANDSCAPE
+#undef LANDSCAPE_CONTENT
diff --git a/resources/tethering_images.edc b/resources/tethering_images.edc
index 53eed6e..4c49a4a 100644
--- a/resources/tethering_images.edc
+++ b/resources/tethering_images.edc
@@ -1,8 +1,8 @@
 #include "tethering_image_macro.edc"
 
 collections {
-   RESOURCE_IMAGE("Bluetooth.png");
-   RESOURCE_IMAGE("USB.png");
-   RESOURCE_IMAGE("Wifi.png");
+	RESOURCE_IMAGE("A01-5_device_bluetooth.png");
+	RESOURCE_IMAGE("A01-5_device_USB_icon.png");
+	RESOURCE_IMAGE("A01-5_device_WIFI.png");
+	base_scale: 1.8;
 }
-
diff --git a/src/mh_common_utility.c b/src/mh_common_utility.c
index d165d17..26e7b51 100644
--- a/src/mh_common_utility.c
+++ b/src/mh_common_utility.c
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,573 +17,108 @@
 *
 */
 
-#include <efl_assist.h>
+#include <net_connection.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
 
 #include "mh_common_utility.h"
 #include "mobile_hotspot.h"
 
-//#define SK_BACK_SUPPORT
-static mh_popup_type_e popup_type = MH_POPUP_NONE;
-static Evas_Object *popup_content = NULL;
-static char *popup_string = NULL;
-
-static void __one_btn_popup_resp(void *data, Evas_Object *obj, void *event_info)
+void _handle_network_cellular_state_changed_cb(keynode_t *key, void *data)
 {
-	__MOBILE_AP_FUNC_ENTER__;
-
-	if (data == NULL || obj == NULL) {
-		ERR("The param is NULL\n");
+	if (key == NULL || data == NULL) {
+		ERR("Parameter is NULL\n");
 		return;
 	}
-
 	mh_appdata_t *ad = (mh_appdata_t *)data;
+	int vconf_key = 0;
 
-	evas_object_del(ad->popup);
-	ad->popup = NULL;
-
-	DBG("popup_type : %d\n", popup_type);
-	switch (popup_type) {
-	case MH_POP_USB_CONNECT:
-		_update_usb_item(ad, MH_STATE_NONE);
-		vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT,
-				_handle_usb_mode_change);
-		break;
-
-	case MH_POP_INFORMATION:
-		break;
-
-	default:
-		DBG("Unknown popup_type : %d\n", popup_type);
-		break;
-	}
-
-	__MOBILE_AP_FUNC_EXIT__;
-}
-
-static void __alert_popup_resp(void *data, Evas_Object *obj, void *event_info)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	if (data == NULL || obj == NULL) {
-		ERR("The param is NULL\n");
+	if (vconf_keynode_get_type(key) != VCONF_TYPE_INT) {
+		ERR("Invalid vconf key type\n");
 		return;
 	}
 
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-
-	evas_object_del(ad->popup);
-	ad->popup = NULL;
-
-	DBG("popup_type : %d\n", popup_type);
-	switch (popup_type) {
-	case MH_POP_INFORMATION_WO_BUTTON:
-		break;
-
-	default:
-		DBG("Unknown popup_type : %d\n", popup_type);
-		break;
-	}
-
-	__MOBILE_AP_FUNC_EXIT__;
-}
-
-static void __popup_resp_yes(void *data, Evas_Object *obj, void *event_info)
-{
-	__MOBILE_AP_FUNC_ENTER__;
+	vconf_key = vconf_keynode_get_int(key);
+	SDBG("key = %s, value = %d(int)\n",
+			vconf_keynode_get_name(key), vconf_key);
 
-	if (data == NULL || obj == NULL) {
-		ERR("The param is NULL\n");
+	if (vconf_key != VCONFKEY_NETWORK_CELLULAR_FLIGHT_MODE)
 		return;
-	}
-
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-	bool wifi_state;
-	int ret = 0;
-
-	evas_object_del(ad->popup);
-	ad->popup = NULL;
-
-	DBG("popup_type : %d\n", popup_type);
-	switch (popup_type) {
-	case MH_POP_WIFI_ON_CONF:
-		wifi_is_activated(&wifi_state);
-		if (wifi_state == true) {
-			if (_turn_off_wifi(ad) != 0) {
-				ERR("_turn_off_wifi is failed\n");
-				_update_wifi_item(ad, MH_STATE_NONE);
-			}
-		} else if (_is_wifi_direct_on() == true) {
-			if (_turn_off_wifi_direct(ad) != 0) {
-				ERR("_turn_off_wifi_direct is failed\n");
-				_update_wifi_item(ad, MH_STATE_NONE);
-			}
-		} else {
-			ret = tethering_enable(ad->handle, TETHERING_TYPE_WIFI);
-			if (ret != TETHERING_ERROR_NONE) {
-				ERR("wifi tethering on is failed : %d\n", ret);
-				_update_wifi_item(ad, MH_STATE_NONE);
-			}
-		}
-		break;
-
-	case MH_POP_WIFI_OFF_CONF:
-		ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI);
-		if (ret != TETHERING_ERROR_NONE) {
-			ERR("wifi tethering off is failed : %d\n", ret);
-			_update_wifi_item(ad, MH_STATE_NONE);
-		}
-		break;
-
-	case MH_POP_BT_ON_CONF:
-		ret = tethering_enable(ad->handle, TETHERING_TYPE_BT);
-		if (ret != TETHERING_ERROR_NONE) {
-			ERR("Error enable bt tethering : %d\n", ret);
-			_update_bt_item(ad, MH_STATE_NONE);
-		}
-		break;
-
-	case MH_POP_USB_ON_CONF:
-		if (_get_vconf_usb_state() != VCONFKEY_SYSMAN_USB_AVAILABLE) {
-			_prepare_popup(MH_POP_USB_CONNECT,
-					_("IDS_MOBILEAP_POP_CONNECT_USB_CABLE"));
-			_create_popup(ad);
-			vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT,
-					_handle_usb_mode_change, (void *)ad);
-			break;
-		}
-
-		_prepare_popup(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);
-			_update_usb_item(ad, MH_STATE_NONE);
-		}
-		break;
-
-	case MH_POP_ENTER_TO_WIFI_SETUP_CONF:
-		_update_wifi_item(ad, MH_STATE_PROCESS);
-		ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI);
-		if (ret != TETHERING_ERROR_NONE) {
-			ERR("Wi-Fi tethering off is failed : %d\n", ret);
-			_update_wifi_item(ad, MH_STATE_NONE);
-		} else
-			ad->main.need_recover_wifi_tethering = true;
 
-		mh_draw_wifi_setup_view(ad);
-		break;
-
-	default:
-		DBG("Unknown popup_type : %d\n", popup_type);
-		break;
-	}
-
-	__MOBILE_AP_FUNC_EXIT__;
-}
-
-static void __popup_resp_no(void *data, Evas_Object *obj, void *event_info)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	if (data == NULL || obj == NULL) {
-		ERR("The param is NULL\n");
-		return;
+	if (ad->popup) {
+		evas_object_del(ad->popup);
+		ad->popup = NULL;
 	}
-
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-
-	evas_object_del(ad->popup);
-	ad->popup = NULL;
-
-	DBG("popup_type : %d\n", popup_type);
-	switch (popup_type) {
-	case MH_POP_WIFI_ON_CONF:
-		_update_wifi_item(ad, MH_STATE_NONE);
-		break;
-
-	case MH_POP_WIFI_OFF_CONF:
+	if (ad->is_wifi_teth_enabling) {
 		_update_wifi_item(ad, MH_STATE_NONE);
-		break;
-
-	case MH_POP_BT_ON_CONF:
+		ad->is_wifi_teth_enabling = false;
+	}
+	if (ad->is_bt_teth_enabling) {
 		_update_bt_item(ad, MH_STATE_NONE);
-		break;
-
-	case MH_POP_USB_ON_CONF:
-		_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;
-
-	default:
-		DBG("Unknown popup_type : %d\n", popup_type);
-		break;
+		ad->is_bt_teth_enabling = false;
 	}
-
-	__MOBILE_AP_FUNC_EXIT__;
-}
-
-static bool _count_connected_clients_cb(tethering_client_h client, void *user_data)
-{
-	if (user_data == NULL) {
-		ERR("user_data is NULL\n");
-		return true;
+	if (ad->is_usb_teth_enabling) {
+		_update_usb_item(ad, MH_STATE_NONE);
+		ad->is_usb_teth_enabling = false;
 	}
-
-	int *count = (int *)user_data;
-
-	*count += 1;
-
-	return true;
+	return;
 }
 
-void _prepare_popup_with_content(int type, Evas_Object *obj)
+void _device_name_changed_cb(keynode_t *key, void *data)
 {
-	__MOBILE_AP_FUNC_ENTER__;
-
-	if (obj == NULL) {
-		ERR("param is NULL\n");
+	if (key == NULL || data == NULL) {
+		ERR("Parameter is NULL\n");
 		return;
 	}
 
-	popup_type = type;
-
-	if (popup_content)
-		evas_object_del(popup_content);
-	popup_content = obj;
-
-	if (popup_string) {
-		free(popup_string);
-		popup_string = NULL;
-	}
-
-	__MOBILE_AP_FUNC_EXIT__;
-}
-
-void _prepare_popup(int type, const char *str)
-{
-	__MOBILE_AP_FUNC_ENTER__;
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	char *dev_name = NULL;
 
-	if (str == NULL) {
-		ERR("param is NULL\n");
+	if (vconf_keynode_get_type(key) != VCONF_TYPE_STRING) {
+		ERR("Invalid vconf key type\n");
 		return;
 	}
-
-	popup_type = type;
-	popup_content = NULL;
-
-	if (popup_string)
-		free(popup_string);
-
-	popup_string = strndup(str, MH_LABEL_LENGTH_MAX);
-	if (popup_string == NULL)
-		ERR("strndup is failed\n");
-
-	__MOBILE_AP_FUNC_EXIT__;
-}
-
-Eina_Bool _create_popup(mh_appdata_t *ad)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	Evas_Object *btn = NULL;
-
-	if (ad == NULL) {
-		ERR("The param is NULL\n");
-		if (popup_string) {
-			free(popup_string);
-			popup_string = NULL;
-		}
-		popup_content = NULL;
-
-		return EINA_FALSE;
+	dev_name = vconf_keynode_get_str(key);
+	if (ad->setup.name_item != NULL) {
+		elm_genlist_item_update(ad->setup.name_item);
 	}
-
-	if (ad->popup != NULL) {
-		DBG("Pop-up already exists. Delete it.\n");
-		evas_object_del(ad->popup);
-		ad->popup = NULL;
+	if (ad->main.help_item != NULL) {
+		elm_genlist_item_update(ad->main.help_item);
 	}
-
-	DBG("Create_popup %d\n", popup_type);
-	switch (popup_type) {
-	case MH_POP_WIFI_ON_CONF:
-		ad->popup = elm_popup_add(ad->win);
-		evas_object_size_hint_weight_set(ad->popup,
-				EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-		if (popup_content == NULL)
-			elm_object_text_set(ad->popup, popup_string);
-		else
-			elm_object_content_set(ad->popup, popup_content);
-
-		btn = elm_button_add(ad->popup);
-		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_SK_CANCEL"));
-		elm_object_part_content_set(ad->popup, "button1", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_no, (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_OK"));
-		elm_object_part_content_set(ad->popup, "button2", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_yes, (void *)ad);
-
-#ifndef SK_BACK_SUPPORT
-		ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK,
-				__popup_resp_no, (void *)ad);
-#endif
-
-		evas_object_show(ad->popup);
-		break;
-
-	case MH_POP_WIFI_OFF_CONF:
-		ad->popup = elm_popup_add(ad->win);
-		evas_object_size_hint_weight_set(ad->popup,
-				EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-		if (popup_content == NULL)
-			elm_object_text_set(ad->popup, popup_string);
-		else
-			elm_object_content_set(ad->popup, popup_content);
-
-		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_part_content_set(ad->popup, "button1", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_no, (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_YES"));
-		elm_object_part_content_set(ad->popup, "button2", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_yes, (void *)ad);
-
-#ifndef SK_BACK_SUPPORT
-		ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK,
-				__popup_resp_no, (void *)ad);
-#endif
-
-		evas_object_show(ad->popup);
-		break;
-
-	case MH_POP_USB_CONNECT:
-		ad->popup = elm_popup_add(ad->win);
-		evas_object_size_hint_weight_set(ad->popup, EVAS_HINT_EXPAND,
-				EVAS_HINT_EXPAND);
-
-		if (popup_content == NULL)
-			elm_object_text_set(ad->popup, popup_string);
-		else
-			elm_object_content_set(ad->popup, popup_content);
-
-		btn = elm_button_add(ad->popup);
-		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_SK_CANCEL"));
-		elm_object_part_content_set(ad->popup, "button1", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__one_btn_popup_resp, (void *)ad);
-
-#ifndef SK_BACK_SUPPORT
-		ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK,
-				__one_btn_popup_resp, (void *)ad);
-#endif
-
-		evas_object_show(ad->popup);
-		break;
-
-	case MH_POP_BT_ON_CONF:
-		ad->popup = elm_popup_add(ad->win);
-		evas_object_size_hint_weight_set(ad->popup,
-				EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-		if (popup_content == NULL)
-			elm_object_text_set(ad->popup, popup_string);
-		else
-			elm_object_content_set(ad->popup, popup_content);
-
-		btn = elm_button_add(ad->popup);
-		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_SK_CANCEL"));
-		elm_object_part_content_set(ad->popup, "button1", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_no, (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_OK"));
-		elm_object_part_content_set(ad->popup, "button2", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_yes, (void *)ad);
-
-#ifndef SK_BACK_SUPPORT
-		ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK,
-				__popup_resp_no, (void *)ad);
-#endif
-
-		evas_object_show(ad->popup);
-		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);
-
-		if (popup_content == NULL)
-			elm_object_text_set(ad->popup, popup_string);
-		else
-			elm_object_content_set(ad->popup, popup_content);
-
-		btn = elm_button_add(ad->popup);
-		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_SK_CANCEL"));
-		elm_object_part_content_set(ad->popup, "button1", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_no, (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_OK"));
-		elm_object_part_content_set(ad->popup, "button2", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_yes, (void *)ad);
-
-#ifndef SK_BACK_SUPPORT
-		ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK,
-				__popup_resp_no, (void *)ad);
-#endif
-
-		evas_object_show(ad->popup);
-		break;
-
-	case MH_POP_INFORMATION:
-		ad->popup = elm_popup_add(ad->win);
-		evas_object_size_hint_weight_set(ad->popup, EVAS_HINT_EXPAND,
-				EVAS_HINT_EXPAND);
-
-		if (popup_content == NULL)
-			elm_object_text_set(ad->popup, popup_string);
-		else
-			elm_object_content_set(ad->popup, popup_content);
-
-		btn = elm_button_add(ad->popup);
-		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_POP_CLOSE"));
-		elm_object_part_content_set(ad->popup, "button1", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__one_btn_popup_resp, (void *)ad);
-
-#ifndef SK_BACK_SUPPORT
-		ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK,
-				__one_btn_popup_resp, (void *)ad);
-#endif
-
-		evas_object_show(ad->popup);
-		break;
-
-	case MH_POP_INFORMATION_WO_BUTTON:
-		ad->popup = elm_popup_add(ad->win);
-		evas_object_size_hint_weight_set(ad->popup, EVAS_HINT_EXPAND,
-				EVAS_HINT_EXPAND);
-
-		if (popup_content == NULL)
-			elm_object_text_set(ad->popup, popup_string);
-		else
-			elm_object_content_set(ad->popup, popup_content);
-
-		elm_popup_timeout_set(ad->popup, MH_POPUP_TIMEOUT);
-		evas_object_smart_callback_add(ad->popup, "timeout",
-				__alert_popup_resp, (void *)ad);
-		evas_object_smart_callback_add(ad->popup, "block,clicked",
-				__alert_popup_resp, (void *)ad);
-
-#ifndef SK_BACK_SUPPORT
-		ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK,
-				__alert_popup_resp, (void *)ad);
-#endif
-		evas_object_show(ad->popup);
-		break;
-
-	case MH_POP_ENTER_TO_WIFI_SETUP_CONF:
-		ad->popup = elm_popup_add(ad->win);
-		evas_object_size_hint_weight_set(ad->popup,
-				EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-		if (popup_content == NULL)
-			elm_object_text_set(ad->popup, popup_string);
-		else
-			elm_object_content_set(ad->popup, popup_content);
-
-		btn = elm_button_add(ad->popup);
-		elm_object_style_set(btn, "popup_button/default");
-		elm_object_text_set(btn, S_("IDS_COM_SK_CANCEL"));
-		elm_object_part_content_set(ad->popup, "button1", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_no, (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_OK"));
-		elm_object_part_content_set(ad->popup, "button2", btn);
-		evas_object_smart_callback_add(btn, "clicked",
-				__popup_resp_yes, (void *)ad);
-
-#ifndef SK_BACK_SUPPORT
-		ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK,
-				__popup_resp_no, (void *)ad);
-#endif
-
-		evas_object_show(ad->popup);
-		break;
-	default:
-		ERR("Unknown popup_type : %d\n", popup_type);
-		break;
+	if (ad->rename_popup) {
+		elm_entry_entry_set(ad->rename_entry, dev_name);
+		elm_entry_cursor_end_set(ad->rename_entry);
 	}
-
-	if (popup_string) {
-		free(popup_string);
-		popup_string = NULL;
+	if (ad->main.hotspot_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI) {
+		_update_wifi_item(ad, MH_STATE_PROCESS);
 	}
-	popup_content = NULL;
-
-	__MOBILE_AP_FUNC_EXIT__;
-
-	return EINA_TRUE;
+	return;
 }
 
-void _destroy_popup(mh_appdata_t *ad)
+Evas_Object *_create_progressbar(Evas_Object *parent, const char *style)
 {
-	__MOBILE_AP_FUNC_ENTER__;
-
-	if (ad && ad->popup) {
-		evas_object_del(ad->popup);
-		ad->popup = NULL;
+	if (parent == NULL || style == NULL) {
+		ERR("Invalid param\n");
+		return NULL;
 	}
 
-	if (popup_string) {
-		free(popup_string);
-		popup_string = NULL;
+	Evas_Object *progressbar;
+
+	progressbar = elm_progressbar_add(parent);
+	if (progressbar == NULL) {
+		ERR("progressbar is NULL\n");
+		return NULL;
 	}
-	popup_content = NULL;
-	popup_type = MH_POPUP_NONE;
 
-	__MOBILE_AP_FUNC_EXIT__;
+	elm_object_style_set(progressbar, style);
+	elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
+	elm_progressbar_pulse(progressbar, EINA_TRUE);
+	evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_show(progressbar);
 
-	return;
+	return progressbar;
 }
 
 Evas_Object *_create_bg(Evas_Object *parent, const char *style)
@@ -673,11 +208,28 @@ Evas_Object *_create_naviframe(Evas_Object *parent)
 	return naviframe;
 }
 
-void _handle_usb_mode_change(keynode_t *key, void *data)
+Evas_Object *_create_button(Evas_Object *parent, const char *text, const char *part,
+		Evas_Smart_Cb func, void *user_data)
 {
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-	int vconf_key = 0;
+	if (parent == NULL || text == NULL || part == NULL || func == NULL) {
+		ERR("Invalid param\n");
+		return NULL;
+	}
 
+	Evas_Object *btn;
+
+	btn = elm_button_add(parent);
+	elm_object_style_set(btn, "popup");
+	elm_object_domain_translatable_text_set(btn, PACKAGE, text);
+	elm_object_part_content_set(parent, part, btn);
+	evas_object_smart_callback_add(btn, "clicked", func, user_data);
+	evas_object_show(btn);
+
+	return btn;
+}
+
+void _handle_mobileap_syspopup_popup_response(keynode_t *key, void *data)
+{
 	if (!data) {
 		ERR("The param is NULL\n");
 		return;
@@ -688,22 +240,61 @@ void _handle_usb_mode_change(keynode_t *key, void *data)
 		return;
 	}
 
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	int vconf_key = 0;
+
 	vconf_key = vconf_keynode_get_int(key);
-	DBG("vconf_key : %d\n", vconf_key);
-	if (vconf_key == SETTING_USB_NONE_MODE) {
-		DBG("usb-utilties is processing mode change\n");
+
+	if (vconf_key) {
+		if (vconf_set_int(VCONF_KEY_MOBILEAP_SYSPOPUP_RESPONSE, 0) < 0) {
+			ERR("vconf_set_int is failed\n");
+		}
+		if (ad->type != TETHERING_TYPE_WIFI) {
+			DBG("no need to handle user response\n");
+			return;
+		}
+		if (ad->popup) {
+			evas_object_del(ad->popup);
+			ad->popup = NULL;
+		}
+		if (ad->popup_checkbox) {
+			evas_object_del(ad->popup_checkbox);
+			ad->popup_checkbox = NULL;
+		}
+		if (vconf_key == 1)
+			_update_wifi_item(ad, MH_STATE_NONE);
+	}
+}
+
+void _handle_usb_status_change(keynode_t *key, void *data)
+{
+	int vconf_key = 0;
+
+	if (!data) {
+		ERR("The param is NULL\n");
 		return;
 	}
 
-	vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT,
-				_handle_usb_mode_change);
+	mh_appdata_t *ad = (mh_appdata_t *)data;
 
-	evas_object_del(ad->popup);
-	ad->popup = NULL;
+	if (vconf_keynode_get_type(key) != VCONF_TYPE_INT) {
+		ERR("Invalid vconf key\n");
+		return;
+	}
 
-	if (tethering_enable(ad->handle, TETHERING_TYPE_USB) != TETHERING_ERROR_NONE) {
-		DBG("Error enable usb tethering\n");
-		_update_usb_item(ad, MH_STATE_NONE);
+	vconf_key = vconf_keynode_get_int(key);
+	if (vconf_key == SETTING_USB_NONE_MODE) {
+		return;
+	}
+	if (vconf_key != VCONFKEY_SYSMAN_USB_AVAILABLE) {
+		if (ad->type == TETHERING_TYPE_USB && ad->popup) {
+			evas_object_del(ad->popup);
+			ad->popup = NULL;
+			_update_tethering_item(ad, MH_STATE_NONE);
+		}
+		elm_object_item_disabled_set(ad->main.usb_item, EINA_TRUE);
+	} else {
+		elm_object_item_disabled_set(ad->main.usb_item, EINA_FALSE);
 	}
 }
 
@@ -715,59 +306,383 @@ int _get_vconf_hotspot_mode(void)
 		ERR("vconf_get_int is failed\n");
 		return 0;
 	}
-
 	DBG("%s : %d\n", VCONFKEY_MOBILE_HOTSPOT_MODE, value);
 
 	return value;
 }
 
-Eina_Bool _get_no_of_connected_device(tethering_h handle, int *no, tethering_type_e type)
+Eina_Bool _get_no_of_connected_device(mh_appdata_t *ad, int *no, tethering_type_e type)
+{
+	if (ad == NULL) {
+		ERR("Invalid param\n");
+		return EINA_FALSE;
+	}
+
+	if (ad->client_list == NULL) {
+		*no = 0;
+		return EINA_TRUE;
+	}
+
+	GSList *l = NULL;
+	tethering_client_h handle;
+	tethering_type_e type2;
+	tethering_error_e ret;
+	int count = 0;
+
+	for (l = ad->client_list; l != NULL; l = g_slist_next(l) ) {
+		handle = l->data;
+		if (handle == NULL)
+			continue;
+
+		ret = tethering_client_get_tethering_type(handle, &type2);
+		if (ret != TETHERING_ERROR_NONE) {
+			ERR("tethering_client_get_tethering_type is failed [0x%X]\n", ret);
+			continue;
+		}
+
+		if (type != TETHERING_TYPE_ALL && type != type2)
+			continue;
+
+		count++;
+	}
+	*no = count;
+
+	return EINA_TRUE;
+}
+
+void _append_list_client_handle(mh_appdata_t *ad, tethering_client_h client)
 {
-	if (handle == NULL || no == NULL)
-		return FALSE;
+	if (ad == NULL || client == NULL) {
+		ERR("Invalid param\n");
+		return;
+	}
+
+	int ret;
+	tethering_client_h handle;
 
-	tethering_foreach_connected_clients(handle, type,
-			_count_connected_clients_cb, (void *)no);
+	ret = tethering_client_clone(&handle, client);
+	if (ret != TETHERING_ERROR_NONE) {
+		ERR("Unable to clone client handle");
+		return;
+	}
 
-	return TRUE;
+	ad->client_list = g_slist_append(ad->client_list, handle);
+
+	return;
 }
 
-Evas_Object *_create_label(Evas_Object *parent, const char *text)
+void _release_list_client_handle(mh_appdata_t *ad)
 {
-	Evas_Object *label;
+	if (ad == NULL) {
+		ERR("Invalid param\n");
+		return;
+	}
 
-	label = elm_entry_add(parent);
-	if (label == NULL) {
-		ERR("elm_entry_add is failed\n");
-		return NULL;
+	if (ad->client_list == NULL)
+		return;
+
+	GSList *l = NULL;
+	tethering_client_h handle;
+
+	for (l = ad->client_list; l != NULL; l = g_slist_next(l) ) {
+		handle = l->data;
+		if (handle == NULL)
+			continue;
+
+		tethering_client_destroy(handle);
 	}
 
-	elm_entry_editable_set(label, EINA_FALSE);
-	elm_entry_context_menu_disabled_set(label, EINA_TRUE);
-	elm_object_text_set(label, text);
+	g_slist_free(ad->client_list);
+	ad->client_list = NULL;
 
-	evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, 0.0);
-	evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	evas_object_show(label);
+	return;
+}
+
+static int __find_mac_address(gconstpointer a, gconstpointer b)
+{
+	tethering_client_h handle = (tethering_client_h)a;
+	const char *udn = (const char *)b;
+	char *mac_addr;
+	int ret;
+
+	ret = tethering_client_get_mac_address(handle, &mac_addr);
+	if (ret != TETHERING_ERROR_NONE)
+		return -1;
+
+	ret = g_ascii_strcasecmp(mac_addr, udn);
 
-	return label;
+	if (mac_addr)
+		free(mac_addr);
+
+	return ret;
 }
 
-Evas_Object *_create_slide_title(Evas_Object *parent, const char *text)
+void _delete_list_client_handle(mh_appdata_t *ad, const char *mac_addr)
 {
-	if (parent == NULL || text == NULL)
-		return NULL;
+	if (ad == NULL || mac_addr == NULL) {
+		ERR("Invalid param\n");
+		return;
+	}
+
+	GSList *l = NULL;
+	tethering_client_h handle = NULL;
+
+	l = g_slist_find_custom(ad->client_list, mac_addr, __find_mac_address);
+	if (!l) {
+		ERR("Not found\n");
+		return;
+	}
+
+	handle = (tethering_client_h)l->data;
+	ad->client_list = g_slist_delete_link(ad->client_list, l);
+	if (handle == NULL)
+		return;
+
+	tethering_client_destroy(handle);
+	return;
+}
+
+int _get_list_clients_count(mh_appdata_t *ad)
+{
+	int client_list_counts;
 
-	Evas_Object *label;
+	if (ad == NULL) {
+		ERR("Invalid param\n");
+		return 0;
+	}
+
+	client_list_counts = g_slist_length(ad->client_list);
+	if (client_list_counts > TETHERING_WIFI_MAX_CONNECTED_STA) {
+		INFO("client_list_counts = [%d]\n", client_list_counts);
+		return TETHERING_WIFI_MAX_CONNECTED_STA;
+	} else
+		return client_list_counts;
+}
+
+void _get_list_clients_informations(mh_appdata_t *ad)
+{
+	if (ad == NULL) {
+		ERR("Invalid param\n");
+		return;
+	}
+
+	GSList *l = NULL;
+	tethering_client_h handle;
+	int i = 1;
+	int ret;
+	tethering_type_e type = 0;
+	char *name = NULL;
+	char *mac_addr = NULL;
+
+	for (l = ad->client_list; l != NULL; l = g_slist_next(l), i++) {
+		handle = (tethering_client_h)l->data;
+
+		ret = tethering_client_get_name(handle, &name);
+		if (ret != TETHERING_ERROR_NONE)
+			ERR("tethering_client_get_name is failed : %d\n", ret);
+
+		ret = tethering_client_get_mac_address(handle, &mac_addr);
+		if (ret != TETHERING_ERROR_NONE)
+			ERR("tethering_client_get_mac_address is failed : %d\n", ret);
+
+		ret = tethering_client_get_tethering_type(handle, &type);
+		if (ret != TETHERING_ERROR_NONE)
+			ERR("tethering_client_get_tethering_type is failed : %d\n", ret);
+		if (name) {
+			SDBG("Client[%d] : %s\n", i, name);
+			free(name);
+			name = NULL;
+		}
+
+		if (mac_addr) {
+			SDBG("MAC[%d] : %s\n", i, mac_addr);
+			free(mac_addr);
+			mac_addr = NULL;
+		}
+
+		SDBG("Type[%d] : %d\n", i, type);
+	}
+
+	return;
+}
+
+void _free_genlist_item(Elm_Object_Item **item)
+{
+	if (*item == NULL) {
+		return;
+	}
+
+	elm_object_item_del(*item);
+	*item = NULL;
+}
+
+void _free_genlist_itc(Elm_Genlist_Item_Class **itc)
+{
+	if (*itc == NULL) {
+		return;
+	}
+
+	elm_genlist_item_class_free(*itc);
+	*itc = NULL;
+}
+
+int _get_sim_state(void)
+{
+	int value = 0;
+
+	if (vconf_get_int(VCONFKEY_TELEPHONY_SIM_SLOT, &value) < 0) {
+		ERR("vconf_get_int is failed\n");
+	}
+	DBG("%s : %d\n", VCONFKEY_TELEPHONY_SIM_SLOT, value);
+	if (value == VCONFKEY_TELEPHONY_SIM_INSERTED) {
+		return value;
+	}
+
+#if defined TIZEN_DUALSIM_ENABLE
+	if (vconf_get_int(VCONFKEY_TELEPHONY_SIM_SLOT2, &value) < 0) {
+		ERR("vconf_get_int is failed\n");;
+	}
+	DBG("%s : %d\n", VCONFKEY_TELEPHONY_SIM_SLOT2, value);
+#endif
+
+	return value;
+}
+
+connection_cellular_state_e _get_cellular_state(void)
+{
+	int ret;
+	connection_h handle = NULL;
+	connection_cellular_state_e cellular_state;
+
+	ret = connection_create(&handle);
+	if (ret != CONNECTION_ERROR_NONE) {
+		ERR("Connection create failed");
+		return CONNECTION_CELLULAR_STATE_OUT_OF_SERVICE;
+	}
+	ret = connection_get_cellular_state(handle, &cellular_state);
+	if (ret != CONNECTION_ERROR_NONE) {
+		ERR("connection_get_cellular_state() is failed : %d\n");
+		connection_destroy(handle);
+		return CONNECTION_CELLULAR_STATE_OUT_OF_SERVICE;
+	}
+
+	connection_destroy(handle);
+	return cellular_state;
+}
+
+int _get_checkbox_status(tethering_type_e type)
+{
+	int value = 0;
+	char *vconf_key = NULL;
+
+	if (type == TETHERING_TYPE_WIFI)
+		vconf_key = VCONF_MOBILE_AP_WIFI_POPUP_CHECKBOX_STATUS;
+	else if (type == TETHERING_TYPE_BT)
+		vconf_key = VCONF_MOBILE_AP_BT_POPUP_CHECKBOX_STATUS;
+	else if (type == TETHERING_TYPE_USB)
+		vconf_key = VCONF_MOBILE_AP_USB_POPUP_CHECKBOX_STATUS;
+	else
+		return 0;
+	if (vconf_get_int(vconf_key, &value) < 0) {
+		ERR("vconf_get_int() is failed\n");
+		return 0;
+	}
+	DBG("%s : %d\n", vconf_key, value);
+	return value;
+}
+
+bool _set_checkbox_status(tethering_type_e type, int value)
+{
+	char *vconf_key = NULL;
+
+	if (type == TETHERING_TYPE_WIFI)
+		vconf_key = VCONF_MOBILE_AP_WIFI_POPUP_CHECKBOX_STATUS;
+	else if (type == TETHERING_TYPE_BT)
+		vconf_key = VCONF_MOBILE_AP_BT_POPUP_CHECKBOX_STATUS;
+	else if (type == TETHERING_TYPE_USB)
+		vconf_key = VCONF_MOBILE_AP_USB_POPUP_CHECKBOX_STATUS;
+	else
+		return false;
+
+	if (vconf_set_int(vconf_key, value) < 0) {
+		ERR("vconf_set_int is failed\n");
+		return false;
+	}
+	return true;
+}
+
+bool _set_vconf_prev_wifi_state(bool value)
+{
+	if (vconf_set_bool(VCONF_MOBILE_AP_PREV_WIFI_STATUS, value) < 0) {
+		ERR("vconf_set_bool failed\n");
+		return false;
+	}
+	return true;
+}
+
+bool _get_vconf_prev_wifi_state()
+{
+	int value = 0;
+
+	if (vconf_get_bool(VCONF_MOBILE_AP_PREV_WIFI_STATUS, &value) < 0) {
+		ERR("vconf_get_bool is failed\n");
+		return false;
+	}
+	DBG("%s : %d\n", VCONF_MOBILE_AP_PREV_WIFI_STATUS, value);
+
+	return value ? true : false;
+}
+
+int _send_signal_qp(const char *cmd)
+{
+	if (cmd == NULL) {
+		ERR("Invalid param");
+		return -1;
+	}
+
+	DBusGConnection *conn = NULL;
+	DBusConnection *gconn = NULL;
+	DBusMessage *msg = NULL;
+	GError *err = NULL;
+	char *module = "wifi_hotspot";
+
+	conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &err);
+	if (err != NULL) {
+		ERR("Failed connection to system bus[%s]", err->message);
+		g_error_free(err);
+		return -1;
+	}
+
+	gconn = dbus_g_connection_get_connection(conn);
+	if (gconn == NULL) {
+		ERR("Failed to get connection \n");
+		dbus_g_connection_unref(conn);
+		return -1;
+	}
+
+	msg = dbus_message_new_signal("/Org/Tizen/Quickpanel",
+					  "org.tizen.quickpanel",
+					  "ACTIVITY");
+	if (!msg) {
+		ERR("Unable to allocate D-Bus signal\n");
+		dbus_g_connection_unref(conn);
+		return -1;
+	}
+
+	if (!dbus_message_append_args(msg,
+			DBUS_TYPE_STRING, &module,
+			DBUS_TYPE_STRING, &cmd,
+			DBUS_TYPE_INVALID)) {
+		ERR("Event sending failed");
+		dbus_message_unref(msg);
+		dbus_g_connection_unref(conn);
+		return -1;
+	}
 
-	label = elm_label_add(parent);
-	elm_object_style_set(label, "naviframe_title");
-	elm_label_slide_mode_set(label, ELM_LABEL_SLIDE_MODE_AUTO);
-	elm_label_wrap_width_set(label, 1);
-	elm_label_ellipsis_set(label, EINA_TRUE);
-	elm_object_text_set(label, text);
-	evas_object_show(label);
+	DBG("Send dbus signal : %s\n", cmd);
+	dbus_connection_send(gconn, msg, NULL);
+	dbus_message_unref(msg);
+	dbus_g_connection_unref(conn);
 
-	elm_access_object_unregister(label);
-	return label;
+	return 0;
 }
diff --git a/src/mh_connected_client.c b/src/mh_connected_client.c
new file mode 100644
index 0000000..f3be57e
--- /dev/null
+++ b/src/mh_connected_client.c
@@ -0,0 +1,363 @@
+/*
+ * mh_connected_client.c
+ *
+ *  Created on: 05-Sep-2014
+ *      Author: sach.sharma
+ */
+#include <time.h>
+
+#include "mh_view_main.h"
+#include "mobile_hotspot.h"
+#include "mh_string.h"
+
+static void __deconstruct_conn_clients_view(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	mh_conn_client_view_t *client = &ad->connected_device;
+	int no_of_dev;
+	int i = 0;
+
+	no_of_dev = _get_list_clients_count(ad);
+	for (i = 0; i < no_of_dev; i++) {
+		_free_genlist_item(&ad->connected_device.station_items[i]);
+	}
+
+	_free_genlist_itc(&client->dev_itc[TETHERING_TYPE_WIFI]);
+	_free_genlist_itc(&client->dev_itc[TETHERING_TYPE_BT]);
+	_free_genlist_itc(&client->dev_itc[TETHERING_TYPE_USB]);
+
+	evas_object_del(client->genlist);
+	client->genlist = NULL;
+	client->navi_it = NULL;
+	_stop_update_device_conn_time(ad);
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __update_connected_client_view(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (ad == NULL) {
+		ERR("Invalid param\n");
+		return;
+	}
+
+	Elm_Object_Item *item = NULL;
+	tethering_type_e connection_type = 0;
+	GSList *l = NULL;
+	tethering_client_h *handle;
+	int count = 0;
+	mh_conn_client_view_t *cli_view = &(ad->connected_device);
+
+	elm_genlist_clear(cli_view->genlist);
+
+	for (l = ad->client_list; l != NULL; l = g_slist_next(l) ) {
+		handle = (tethering_client_h *)l->data;
+		tethering_client_get_tethering_type(handle, &connection_type);
+
+		item = elm_genlist_item_append(cli_view->genlist,
+				cli_view->dev_itc[connection_type],
+				(void *)handle,
+				NULL, ELM_GENLIST_ITEM_NONE,
+				NULL, NULL);
+		if (item == NULL) {
+			ERR("elm_genlist_item_append is failed\n");
+			continue;
+		}
+		cli_view->station_items[count++] = item;
+		elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+	}
+	cli_view->no_of_clients = count;
+	_start_update_device_conn_time(ad);
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
+
+void _update_conn_clients(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (ad == NULL) {
+		ERR("Invalid param\n");
+		return;
+	}
+	unsigned int no_of_dev = 0;
+	no_of_dev = _get_list_clients_count(ad);
+
+	if (no_of_dev == 0) {
+		__deconstruct_conn_clients_view(ad);
+		elm_naviframe_item_pop(ad->naviframe);
+	} else {
+		__update_connected_client_view(ad);
+	}
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
+
+static char *__get_diff_time(time_t connection_time)
+{
+	time_t current_time;
+	char buf[MH_LABEL_LENGTH_MAX] = {0, };
+	int day;
+	int hour;
+	int min;
+	int sec;
+	double diff;
+
+	time(&current_time);
+	diff = difftime(current_time, connection_time);
+	day = diff / (60 * 60 * 24);
+	diff = diff - (day * 60 * 60 * 24);
+	hour = diff / (60 * 60);
+	diff = diff - (hour * 60 * 60);
+	min = diff / 60;
+	diff = diff - (min * 60);
+	sec = diff;
+
+	if (day > 0)
+		hour = hour + day * 24;
+
+	if (hour > 0)
+		snprintf(buf, sizeof(buf), "%02d:%02d:%02d", hour, min, sec);
+	else
+		snprintf(buf, sizeof(buf), "%02d:%02d", min, sec);
+
+	return g_strdup(buf);
+}
+
+static char *__gl_get_dev_label(void *data, Evas_Object *obj, const char *part)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	tethering_client_h client = (tethering_client_h)data;
+	char *name = NULL;
+	char *dev_name = NULL;
+	time_t tm;
+
+	if (data == NULL || obj == NULL || part == NULL) {
+		ERR("Invalid param\n");
+		return NULL;
+	}
+
+	if (!strcmp(part, "elm.text.sub.left.bottom")) {
+		tethering_client_get_time(client, &tm);
+		return __get_diff_time(tm);
+	}
+
+	if (!strcmp(part, "elm.text.main.left.top")) {
+		tethering_client_get_name(client, &name);
+		if (NULL == name) {
+			return NULL;
+		}
+		if (!strcmp(name, "UNKNOWN")) {
+			free(name);
+			return strdup(STR_NO_NAME);
+		}
+		dev_name = elm_entry_utf8_to_markup(name);
+		free(name);
+		return dev_name;
+	}
+
+	__MOBILE_AP_FUNC_EXIT__;
+	return NULL;
+
+}
+
+static Evas_Object *__gl_get_dev_wifi_icon(void *data, Evas_Object *obj,
+							const char *part)
+{
+	Evas_Object *icon;
+
+	if (!strcmp(part, "elm.icon.left")) {
+		icon = elm_icon_add(obj);
+		elm_image_file_set(icon, EDJDIR"/"TETHERING_IMAGES_EDJ, WIFI_ICON);
+		ea_theme_object_color_set(icon, "AO002");
+		evas_object_size_hint_aspect_set(icon,
+				EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+		return icon;
+	}
+	return NULL;
+}
+
+static Evas_Object *__gl_get_dev_usb_icon(void *data, Evas_Object *obj,
+							const char *part)
+{
+	Evas_Object *icon;
+
+	if (!strcmp(part, "elm.icon.left")) {
+		icon = elm_icon_add(obj);
+		elm_image_file_set(icon, EDJDIR"/"TETHERING_IMAGES_EDJ, USB_ICON);
+		ea_theme_object_color_set(icon, "AO002");
+		evas_object_size_hint_aspect_set(icon,
+				EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+		return icon;
+	}
+	return NULL;
+}
+
+static Evas_Object *__gl_get_dev_bt_icon(void *data, Evas_Object *obj,
+							const char *part)
+{
+	Evas_Object *icon;
+
+	if (!strcmp(part, "elm.icon.left")) {
+		icon = elm_icon_add(obj);
+		elm_image_file_set(icon, EDJDIR"/"TETHERING_IMAGES_EDJ, BT_ICON);
+		ea_theme_object_color_set(icon, "AO002");
+		evas_object_size_hint_aspect_set(icon,
+					EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+		return icon;
+	}
+	return NULL;
+}
+
+static void __set_genlist_itc(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	ad->connected_device.dev_itc[TETHERING_TYPE_WIFI] = elm_genlist_item_class_new();
+	ad->connected_device.dev_itc[TETHERING_TYPE_WIFI]->item_style = "2line.top";
+	ad->connected_device.dev_itc[TETHERING_TYPE_WIFI]->func.text_get = __gl_get_dev_label;
+	ad->connected_device.dev_itc[TETHERING_TYPE_WIFI]->func.content_get = __gl_get_dev_wifi_icon;
+	ad->connected_device.dev_itc[TETHERING_TYPE_WIFI]->func.state_get = NULL;
+	ad->connected_device.dev_itc[TETHERING_TYPE_WIFI]->func.del = NULL;
+
+	ad->connected_device.dev_itc[TETHERING_TYPE_USB] = elm_genlist_item_class_new();
+	ad->connected_device.dev_itc[TETHERING_TYPE_USB]->item_style = "2line.top";
+	ad->connected_device.dev_itc[TETHERING_TYPE_USB]->func.text_get = __gl_get_dev_label;
+	ad->connected_device.dev_itc[TETHERING_TYPE_USB]->func.content_get = __gl_get_dev_usb_icon;
+	ad->connected_device.dev_itc[TETHERING_TYPE_USB]->func.state_get = NULL;
+	ad->connected_device.dev_itc[TETHERING_TYPE_USB]->func.del = NULL;
+
+	ad->connected_device.dev_itc[TETHERING_TYPE_BT] = elm_genlist_item_class_new();
+	ad->connected_device.dev_itc[TETHERING_TYPE_BT]->item_style = "2line.top";
+	ad->connected_device.dev_itc[TETHERING_TYPE_BT]->func.text_get = __gl_get_dev_label;
+	ad->connected_device.dev_itc[TETHERING_TYPE_BT]->func.content_get = __gl_get_dev_bt_icon;
+	ad->connected_device.dev_itc[TETHERING_TYPE_BT]->func.state_get = NULL;
+	ad->connected_device.dev_itc[TETHERING_TYPE_BT]->func.del = NULL;
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __scroll_start_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	_stop_update_device_conn_time((mh_appdata_t *)data);
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __scroll_stop_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	_start_update_device_conn_time((mh_appdata_t *)data);
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __create_genlist(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (ad == NULL) {
+		ERR("ad is NULL\n");
+		return;
+	}
+
+	Evas_Object *genlist;
+	Elm_Object_Item *item = NULL;
+	tethering_type_e connection_type = 0;
+	GSList *l = NULL;
+	tethering_client_h *handle;
+	int count = 0;
+
+	mh_conn_client_view_t *client = &ad->connected_device;
+
+	genlist = elm_genlist_add(ad->naviframe);
+	if (genlist == NULL) {
+		ERR("genlist is NULL\n");
+		return;
+	}
+
+	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+	client->genlist = genlist;
+
+	__set_genlist_itc(ad);
+
+	for (l = ad->client_list; l != NULL; l = g_slist_next(l) ) {
+		handle = (tethering_client_h *)l->data;
+		tethering_client_get_tethering_type(handle, &connection_type);
+
+		item = elm_genlist_item_append(client->genlist,
+				client->dev_itc[connection_type],
+				(void *)handle,
+				NULL, ELM_GENLIST_ITEM_NONE,
+				NULL, NULL);
+		if (item == NULL) {
+			ERR("elm_genlist_item_append is failed\n");
+			continue;
+		}
+		client->station_items[count++] = item;
+		elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+	}
+	evas_object_smart_callback_add(genlist, "scroll,anim,start",
+				__scroll_start_cb, ad);
+	evas_object_smart_callback_add(genlist, "scroll,drag,start",
+				__scroll_start_cb, ad);
+	evas_object_smart_callback_add(genlist, "scroll,anim,stop",
+				__scroll_stop_cb, ad);
+	evas_object_smart_callback_add(genlist, "scroll,drag,stop",
+				__scroll_stop_cb, ad);
+
+	client->no_of_clients = count;
+	_start_update_device_conn_time(ad);
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static Eina_Bool __back_btn_cb(void *data, Elm_Object_Item *navi_item)
+{
+	DBG("+\n");
+
+	if (data == NULL) {
+		ERR("The param is NULL\n");
+		return EINA_FALSE;
+	}
+
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+
+	__deconstruct_conn_clients_view(ad);
+
+	DBG("-\n");
+	return EINA_TRUE;
+}
+
+void _create_connected_client_view(mh_appdata_t *ad)
+{
+	DBG("+\n");
+	if (ad == NULL) {
+		ERR("ad is NULL\n");
+		return;
+	}
+
+	mh_conn_client_view_t *client = &ad->connected_device;
+
+	if (client->navi_it != NULL) {
+		ERR("connected device view already exists\n");
+		return;
+	}
+
+	__create_genlist(ad);
+	if (client->genlist == NULL) {
+		ERR("__create_genlist failed NULL\n");
+		return;
+	}
+
+	client->navi_it = elm_naviframe_item_push(ad->naviframe, STR_CONN_DEVICES, NULL, NULL, client->genlist, NULL);
+	elm_object_item_domain_text_translatable_set(client->navi_it, PKGNAME, EINA_TRUE);
+
+	elm_naviframe_item_pop_cb_set(client->navi_it, __back_btn_cb, (void *)ad);
+	DBG("-\n");
+}
diff --git a/src/mh_device_rename.c b/src/mh_device_rename.c
new file mode 100644
index 0000000..fd679df
--- /dev/null
+++ b/src/mh_device_rename.c
@@ -0,0 +1,488 @@
+/*
+ * mh_device_rename.c
+ *
+ *  Created on: 26-May-2014
+ *      Author: sach.sharma
+ */
+
+#include <Elementary.h>
+#include <vconf.h>
+
+#include "mh_view_main.h"
+#include "mh_string.h"
+#include "mh_popup.h"
+
+static Eina_Bool __is_portrait_mode = EINA_TRUE;
+static int (*rotate_cb)(Eina_Bool , void*) = NULL;
+static void *rotate_cb_data = NULL;
+static void __set_rotate_cb(int (*cb)(Eina_Bool, void*) , void *data);
+
+static void __rename_popup_keyback_cb(void *data, Evas_Object *obj,
+		void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+
+	elm_object_focus_set(ad->rename_entry, EINA_FALSE);
+
+	if (ad->rename_popup) {
+		evas_object_del(ad->rename_popup);
+	}
+	ad->rename_popup = NULL;
+	ad->rename_entry = NULL;
+	__set_rotate_cb(NULL, NULL);
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __rename_popup_mouseup_cb(void *data,
+		Evas *e, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	Evas_Event_Mouse_Up *ev = event_info;
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+
+	if (ev->button == 3) {
+		elm_object_focus_set(ad->rename_entry, EINA_FALSE);
+		if (ad->rename_popup) {
+			evas_object_del(ad->rename_popup);
+		}
+		ad->rename_popup = NULL;
+		ad->rename_entry = NULL;
+	}
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
+
+static bool __is_space_str(const char *str)
+{
+	while (str) {
+		if (*str != '\0' && *str != ' ') {
+			return FALSE;
+		} else if (*str == '\0') {
+			return TRUE;
+		}
+		str++;
+	}
+	return TRUE;
+}
+
+static void __rename_popop_entry_changed_cb(void *data, Evas_Object *obj,
+				void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+
+	const char *entry_text 	= NULL;
+	char *input_str 		= NULL;
+	bool is_space_string = FALSE;
+
+	entry_text = elm_entry_entry_get(obj);
+	input_str = elm_entry_markup_to_utf8(entry_text);
+
+	if (elm_object_part_content_get(obj, "elm.swallow.clear")) {
+		if (elm_object_focus_get(obj)) {
+			if (elm_entry_is_empty(obj))
+				elm_object_signal_emit(obj, "elm,state,clear,hidden", "");
+			else
+				elm_object_signal_emit(obj, "elm,state,clear,visible", "");
+		}
+	}
+
+
+	if (input_str == NULL || (strlen(input_str) == 0)) {
+		elm_object_disabled_set(ad->rename_button, TRUE);
+		elm_entry_input_panel_return_key_disabled_set(obj, TRUE);
+		if (input_str) {
+			free(input_str);
+		}
+		return;
+	}
+
+	is_space_string = __is_space_str(input_str);
+	if (is_space_string) {
+		elm_object_disabled_set(ad->rename_button, TRUE);
+		elm_entry_input_panel_return_key_disabled_set(ad->rename_entry, TRUE);
+		free(input_str);
+		return;
+	}
+
+	if (strlen(input_str) > 0) {
+		elm_object_disabled_set(ad->rename_button, FALSE);
+		elm_entry_input_panel_return_key_disabled_set(ad->rename_entry, FALSE);
+	}
+	if (input_str) {
+		free(input_str);
+	}
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __device_name_maxlength_reached_cb(void *data, Evas_Object *obj,
+		void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (data == NULL || obj == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	char buf[MH_LABEL_LENGTH_MAX] = { 0, };
+	notification_error_e ret;
+
+	snprintf(buf, sizeof(buf), STR_PW_MAX_LEN_WARN_MSG, DEVICE_NAME_LENGTH_MAX);
+	ret = notification_status_message_post(buf);
+	if (ret != NOTIFICATION_ERROR_NONE) {
+		ERR("notification_status_message_post() is failed : %d\n", ret);
+	}
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __entry_focused_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (elm_object_part_content_get(obj, "elm.swallow.clear")) {
+		if (!elm_entry_is_empty(obj))
+			elm_object_signal_emit(obj, "elm,state,clear,visible", "");
+		else
+			elm_object_signal_emit(obj, "elm,state,clear,hidden", "");
+	}
+	elm_object_signal_emit(obj, "elm,state,focus,on", "");
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (elm_object_part_content_get(obj, "elm.swallow.clear"))
+		elm_object_signal_emit(obj, "elm,state,clear,hidden", "");
+	elm_object_signal_emit(obj, "elm,state,focus,off", "");
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __eraser_btn_clicked_cb(void *data, Evas_Object *obj,
+		void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (data == NULL) {
+		ERR("data is null\n");
+		return;
+	}
+	mh_appdata_t *ad = (mh_appdata_t*) data;
+
+	elm_entry_entry_set(ad->rename_entry, "");
+	elm_object_disabled_set(ad->rename_button, TRUE);
+	elm_entry_input_panel_return_key_disabled_set(ad->rename_entry, TRUE);
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __rename_popup_cancel_cb(void *data, Evas_Object *obj,
+		void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (data == NULL || obj == NULL) {
+		ERR("data is null\n");
+		return;
+	}
+	mh_appdata_t *ad = (mh_appdata_t*) data;
+
+	if (ad->rename_popup) {
+		evas_object_del(ad->rename_popup);
+		ad->rename_popup = NULL;
+	}
+	if (ad->rename_entry) {
+		evas_object_del(ad->rename_entry);
+		ad->rename_entry = NULL;
+	}
+	__set_rotate_cb(NULL, NULL);
+
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
+
+static void __rename_popup_ok_cb(void *data, Evas_Object *obj,
+		void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (data == NULL || obj == NULL) {
+		ERR("data is null\n");
+		return;
+	}
+	mh_appdata_t *ad = (mh_appdata_t*) data;
+	char *device_name_str = NULL;
+	const char *entry_str = elm_entry_entry_get(ad->rename_entry);
+
+	device_name_str = elm_entry_markup_to_utf8(entry_str);
+	if (device_name_str == NULL) {
+		ERR("elm_entry_utf8_to_markup is failed\n");
+		return;
+	}
+
+	DBG("New device name:[%s]\n", device_name_str);
+	__set_rotate_cb(NULL, NULL);
+	if (ad->rename_popup) {
+		evas_object_del(ad->rename_popup);
+		ad->rename_popup = NULL;
+	}
+	if (ad->rename_entry) {
+		evas_object_del(ad->rename_entry);
+		ad->rename_entry = NULL;
+	}
+	if (g_strcmp0(ad->setup.device_name, device_name_str)) {
+		if (vconf_set_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR, device_name_str) != 0) {
+			DBG("Set vconf[%s] failed\n",VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+		}
+
+		g_strlcpy(ad->setup.device_name, entry_str,
+				sizeof(ad->setup.device_name));
+
+		if (ad->main.help_item != NULL) {
+			elm_genlist_item_update(ad->main.help_item);
+		}
+
+		if (ad->setup.name_item != NULL) {
+			elm_genlist_item_update(ad->setup.name_item);
+		}
+	}
+	free(device_name_str);
+
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
+
+static void __enter_key_down_cb(void *data, Evas *evas, Evas_Object *obj,
+				void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	Evas_Event_Key_Down *ev = event_info;
+
+	if (g_strcmp0(ev->key, "KP_Enter") == 0 ||
+			g_strcmp0(ev->key, "Return") == 0) {
+		Ecore_IMF_Context *imf_context;
+		elm_entry_cursor_end_set(obj);
+		imf_context = (Ecore_IMF_Context*)elm_entry_imf_context_get(obj);
+		if (imf_context)
+			ecore_imf_context_input_panel_hide(imf_context);
+		elm_object_focus_set(obj, EINA_FALSE);
+	}
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __set_rotate_cb(int (*cb)(Eina_Bool, void*), void *data)
+{
+	rotate_cb = cb;
+	rotate_cb_data = data;
+}
+
+Eina_Bool __is_current_mode_portrait(void)
+{
+	return __is_portrait_mode;
+}
+
+static void __set_portrait_mode(Eina_Bool is_portrait)
+{
+	__is_portrait_mode = is_portrait;
+}
+
+
+void _hadnle_rename_popup_rotation(Eina_Bool is_portrait)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	__set_portrait_mode(is_portrait);
+	if (rotate_cb) {
+		rotate_cb(is_portrait, rotate_cb_data);
+	}
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static Evas_Object *__rename_entry_icon_get(void *data, Evas_Object *obj, const char *part)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	Evas_Object *entry = NULL;
+	Evas_Object *button = NULL;
+	char *ptr = NULL;
+	char *device_name_utf = NULL;
+	static Elm_Entry_Filter_Limit_Size limit_filter_data;
+
+	if (data == NULL) {
+		ERR("data is null\n");
+		return NULL;
+	}
+	mh_appdata_t *ad = (mh_appdata_t*) data;
+
+	if (strcmp(part, "elm.icon.entry")) {
+		return NULL;
+	}
+
+	entry = ea_editfield_add(obj, EA_EDITFIELD_SCROLL_SINGLELINE);
+	limit_filter_data.max_char_count = DEVICE_NAME_LENGTH_MAX;
+	elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter_data);
+
+	evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	ea_entry_selection_back_event_allow_set(entry, EINA_TRUE);
+	elm_object_signal_emit(entry, "elm,action,hide,search_icon", "");
+	elm_object_domain_translatable_part_text_set(entry, "elm.guide", PACKAGE,
+			STR_DEVICE_NAME);
+
+	elm_entry_input_panel_return_key_type_set(entry,
+			ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
+	elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
+	ad->rename_entry = entry;
+
+	device_name_utf = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+	if (device_name_utf == NULL) {
+		ERR("vconf_get_str failed \n");
+		return NULL;
+	}
+	ptr = elm_entry_utf8_to_markup(device_name_utf);
+	if (ptr == NULL) {
+		ERR("elm_entry_utf8_to_markup is failed\n");
+		free(device_name_utf);
+		return NULL;
+	} else {
+		elm_entry_entry_set(entry, ptr);
+	}
+	free(device_name_utf);
+	free(ptr);
+	elm_entry_cursor_end_set(entry);
+
+	evas_object_smart_callback_add(entry, "changed,user", __rename_popop_entry_changed_cb, ad);
+	evas_object_smart_callback_add(entry, "changed", __rename_popop_entry_changed_cb, ad);
+	evas_object_smart_callback_add(entry, "preedit,changed",
+			__rename_popop_entry_changed_cb, ad);
+
+	evas_object_smart_callback_add(entry, "maxlength,reached",
+			__device_name_maxlength_reached_cb, ad);
+	evas_object_smart_callback_add(entry, "focused", __entry_focused_cb, NULL);
+	evas_object_smart_callback_add(entry, "unfocused", __entry_unfocused_cb, NULL);
+	evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN,
+			__enter_key_down_cb, ad);
+
+	button = elm_button_add(obj);
+	elm_object_style_set(button, "search_clear");
+	elm_object_focus_allow_set(button, EINA_FALSE);
+	elm_object_part_content_set(entry, "elm.swallow.clear", button);
+	evas_object_smart_callback_add(button, "clicked", __eraser_btn_clicked_cb, ad);
+	evas_object_show(entry);
+	elm_object_focus_set(entry, EINA_TRUE);
+	return entry;
+}
+
+static char *__rename_desc_label_get(void *data, Evas_Object *obj,
+					const char *part)
+{
+	if (!strcmp(part, "elm.text.multiline" )) {
+		return g_strdup(STR_RENAME_DEVICE_MSG);
+	}
+	return NULL;
+}
+
+void _create_rename_device_popup(void *data)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (data == NULL) {
+		ERR("data is null\n");
+		__MOBILE_AP_FUNC_EXIT__;
+		return;
+	}
+
+	Evas_Object *popup = NULL;
+	Evas_Object *button = NULL;
+	Evas_Object *rename_btn = NULL;
+	Evas_Object *genlist = NULL;
+	Elm_Object_Item *item = NULL;
+	Evas_Object *layout = NULL;
+	mh_appdata_t *ad = (mh_appdata_t*) data;
+
+	if (ad->rename_popup) {
+		evas_object_del(ad->rename_popup);
+		ad->rename_popup = NULL;
+	}
+
+	popup = elm_popup_add(ad->layout);
+	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	elm_object_domain_translatable_part_text_set(popup, "title,text", PACKAGE,
+			"IDS_ST_HEADER_RENAME_DEVICE");
+	ea_object_event_callback_add(popup, EA_CALLBACK_BACK,
+			__rename_popup_keyback_cb, (void *)ad);
+	evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP,
+			__rename_popup_mouseup_cb, (void *)ad);
+
+	layout = elm_layout_add(popup);
+	elm_layout_file_set(layout, FILE_PATH_OF_EDC, "rename_device_ly");
+	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+	genlist = elm_genlist_add(layout);
+	evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+	elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE);
+
+	/* Entry genlist item */
+	ad->setup.rename_entry_itc = elm_genlist_item_class_new();
+	ad->setup.rename_entry_itc->item_style = "entry";
+	ad->setup.rename_entry_itc->func.text_get = NULL;
+	ad->setup.rename_entry_itc->func.content_get = __rename_entry_icon_get;
+	ad->setup.rename_entry_itc->func.state_get = NULL;
+	ad->setup.rename_entry_itc->func.del = NULL;
+
+	elm_genlist_item_append(genlist, ad->setup.rename_entry_itc, ad,
+				NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+
+	/* Description genlist item */
+	ad->setup.rename_descp_itc = elm_genlist_item_class_new();
+	ad->setup.rename_descp_itc->item_style = "multiline_sub";
+	ad->setup.rename_descp_itc->func.text_get = __rename_desc_label_get;
+	ad->setup.rename_descp_itc->func.content_get = NULL;
+	ad->setup.rename_descp_itc->func.state_get = NULL;
+	ad->setup.rename_descp_itc->func.del = NULL;
+	item = elm_genlist_item_append(genlist, ad->setup.rename_descp_itc, NULL, NULL,
+				ELM_GENLIST_ITEM_NONE, NULL, NULL);
+	elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+	button = elm_button_add(popup);
+	elm_object_style_set(button, "popup");
+	elm_object_text_set(button, STR_CANCEL);
+	elm_object_domain_translatable_text_set(button, PACKAGE, STR_CANCEL);
+	elm_object_part_content_set(popup, "button1", button);
+	evas_object_smart_callback_add(button, "clicked",
+			__rename_popup_cancel_cb, ad);
+	evas_object_show(button);
+
+	rename_btn = elm_button_add(popup);
+	ad->rename_button = rename_btn;
+	elm_object_style_set(rename_btn, "popup");
+	elm_object_domain_translatable_text_set(rename_btn, PACKAGE, STR_RENAME_DEVICE);
+	elm_object_part_content_set(popup, "button2", rename_btn);
+	evas_object_smart_callback_add(rename_btn, "clicked", __rename_popup_ok_cb, ad);
+	evas_object_show(rename_btn);
+
+	elm_genlist_realization_mode_set(genlist, EINA_TRUE);
+	evas_object_show(genlist);
+	elm_object_part_content_set(layout, "elm.swallow.layout", genlist);
+	evas_object_show(layout);
+	elm_object_content_set(popup, layout);
+
+	evas_object_show(popup);
+	ad->rename_popup = popup;
+	elm_object_focus_set(ad->rename_entry, EINA_TRUE);
+
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
diff --git a/src/mh_func_onoff.c b/src/mh_func_onoff.c
index 8f957f1..ea129c4 100644
--- a/src/mh_func_onoff.c
+++ b/src/mh_func_onoff.c
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,22 +18,45 @@
 */
 
 #include <stdlib.h>
-#include <wifi-direct.h>
+#include <glib.h>
 
 #include "mh_func_onoff.h"
+#include "mh_popup.h"
+#include "mh_string.h"
 
-static bool __get_vconf_prev_wifi_state()
+static bool is_wifi_tethering_checkbox_popup_active = false;
+
+void _update_tethering_enabling_item(mh_appdata_t *ad, tethering_type_e type, mh_state_e state)
 {
-	int value = 0;
+	switch(type) {
+	case TETHERING_TYPE_WIFI:
+		_update_wifi_item(ad, MH_STATE_NONE);
+		ad->is_wifi_teth_enabling = false;
+		break;
 
-	if (vconf_get_bool(VCONF_MOBILE_AP_PREV_WIFI_STATUS, &value) < 0) {
-		ERR("vconf_get_bool is failed\n");
-		return false;
-	}
+	case TETHERING_TYPE_BT:
+		_update_bt_item(ad, MH_STATE_NONE);
+		ad->is_bt_teth_enabling = false;
+		break;
+
+	case TETHERING_TYPE_USB:
+		_update_usb_item(ad, MH_STATE_NONE);
+		ad->is_usb_teth_enabling = false;
+		break;
 
-	DBG("%s : %d\n", VCONF_MOBILE_AP_PREV_WIFI_STATUS, value);
+	default :
+		ERR("invalid type \n");
+		break;
+	}
+}
+void _wifi_tethering_checkbox_popup_status_set(bool value)
+{
+	is_wifi_tethering_checkbox_popup_active = value;
+}
 
-	return value ? true : false;
+bool _wifi_tethering_checkbox_popup_status_get(void)
+{
+	return is_wifi_tethering_checkbox_popup_active;
 }
 
 int _get_vconf_usb_state()
@@ -44,12 +67,83 @@ int _get_vconf_usb_state()
 		ERR("vconf_get_int is failed\n");
 		return 0;
 	}
-
 	DBG("%s : %d\n", VCONFKEY_SYSMAN_USB_STATUS, value);
 
 	return value;
 }
 
+void _update_tethering_item(mh_appdata_t * ad, mh_state_e state)
+{
+	ERR("type : %d state : %d\n", ad->type, state);
+	switch(ad->type)	{
+		case TETHERING_TYPE_WIFI:
+			_update_wifi_item(ad, state);
+			break;
+		case TETHERING_TYPE_BT:
+			_update_bt_item(ad, state);
+			break;
+		case TETHERING_TYPE_USB:
+			_update_usb_item(ad, state);
+			break;
+		default:
+			break;
+	}
+}
+
+gboolean _ps_recheck_timeout_cb(gpointer data)
+{
+	connection_cellular_state_e cellular_state = _get_cellular_state();
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	static int recheck_count = 0;
+
+	DBG("Re-Check cellular state (%d)\n", recheck_count);
+
+	if(cellular_state == CONNECTION_CELLULAR_STATE_FLIGHT_MODE) {
+		_update_tethering_item(ad, MH_STATE_NONE);
+		recheck_count = 0;
+		return FALSE;
+	}
+
+	if (cellular_state == CONNECTION_CELLULAR_STATE_CONNECTED ||
+		cellular_state == CONNECTION_CELLULAR_STATE_AVAILABLE) {
+		if (ad->type == TETHERING_TYPE_WIFI) {
+			if (_create_wifi_hotspot_on_popup(ad) < 0) {
+				ERR("__create_wifi_hotspot_on_popup fail\n");
+				_update_tethering_item(ad, MH_STATE_NONE);
+				recheck_count = 0;
+				return FALSE;
+			}
+		_send_signal_qp(QP_SIGNAL_PROGRESS_ON);
+		} else if (ad->type == TETHERING_TYPE_BT && _create_bt_tethering_on_popup(ad) < 0) {
+				ERR("_create_bt_tethering_on_popup fail\n");
+				_update_tethering_item(ad, MH_STATE_NONE);
+				recheck_count = 0;
+				return FALSE;
+		} else if (ad->type == TETHERING_TYPE_USB && _create_usb_tethering_on_popup(ad) < 0) {
+				ERR("__create_usb_hotspot_on_popup fail\n");
+				_update_tethering_item(ad, MH_STATE_NONE);
+				recheck_count = 0;
+				return FALSE;
+		} else {
+			ERR("Unknown tethering type \n");
+			recheck_count = 0;
+			return FALSE;
+		}
+	} else {
+		if(++recheck_count >= PS_RECHECK_COUNT_MAX) {
+			DBG("Cellular network is not connected : %d\n", cellular_state);
+			_update_tethering_item(ad, MH_STATE_NONE);
+			_prepare_popup(MH_POPUP_NETWORK_OUT_OF_RANGE, STR_NO_DATA_SERVICE);
+			_create_popup(ad);
+			recheck_count = 0;
+			return FALSE;
+		}
+		return TRUE;
+	}
+	recheck_count = 0;
+	return FALSE;
+}
+
 static bool __is_connected_wifi_net(mh_appdata_t *ad)
 {
 	connection_wifi_state_e wifi_state = CONNECTION_WIFI_STATE_DEACTIVATED;
@@ -90,100 +184,157 @@ static bool __is_connected_ethernet_net(mh_appdata_t *ad)
 	return true;
 }
 
-static bool __is_connected_cellular_net(mh_appdata_t *ad)
+static int __is_preconditions_handled(mh_appdata_t *ad)
 {
+	DBG("+\n");
+
 	connection_cellular_state_e cellular_state = CONNECTION_CELLULAR_STATE_OUT_OF_SERVICE;
-	sim_state_e sim_state = SIM_STATE_UNAVAILABLE;
-	int ret;
+	int dnet_state = 0;
 
-	/* Check SIM state */
-	ret = sim_get_state(&sim_state);
-	if (ret != SIM_ERROR_NONE) {
-		ERR("sim_get_state() is failed : %d\n", ret);
-		_prepare_popup(MH_POP_INFORMATION,
-				_("IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"));
-		_create_popup(ad);
-		return false;
+	/* check ethernet connection */
+	if (__is_connected_ethernet_net(ad)) {
+		DBG("ethernet network is connected\n");
+		return 1;
 	}
-	DBG("SIM State : %d\n", sim_state);
-	if (sim_state != SIM_STATE_AVAILABLE) {
-		_prepare_popup(MH_POP_INFORMATION,
-				_("IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"));
-		_create_popup(ad);
-		return false;
+
+	/*  check wifi connection */
+	if (ad->type != TETHERING_TYPE_WIFI) {
+		if (__is_connected_wifi_net(ad)) {
+			DBG("wifi network is connected\n");
+			return 1;
+		}
 	}
 
-	ret = connection_get_cellular_state(ad->conn_handle, &cellular_state);
-	if (ret != CONNECTION_ERROR_NONE) {
-		ERR("connection_get_cellular_state() is failed : %d\n");
-		return false;
+	/* Check SIM state */
+	if (_get_sim_state() != VCONFKEY_TELEPHONY_SIM_INSERTED) {
+		if(ad->type == TETHERING_TYPE_WIFI)
+			_prepare_popup(MH_POPUP_NO_SIM, STR_INSERT_SIM_TO_USE_TETH);
+		else
+			_prepare_popup(MH_POPUP_NO_SIM, STR_CONN_MOBILE_DATA_TO_USE_TETH);
+
+		_create_popup(ad);
+		return -1;
 	}
 
+	/* Check cellular state */
+	cellular_state = _get_cellular_state();
+	DBG("cellular state is :  %d \n", cellular_state);
 	if (cellular_state == CONNECTION_CELLULAR_STATE_FLIGHT_MODE) {
-		_prepare_popup(MH_POP_INFORMATION_WO_BUTTON,
-				_("IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING_IN_FLIGHT_MODE_TO_USE_TETHERING_DISABLE_FLIGHT_MODE"));
+		_prepare_popup(MH_POPUP_FLIGHT_MODE, STR_DISABLE_FLIGHT_MODE_MSG);
 		_create_popup(ad);
-		ERR("Cellular network is not connected\n");
-		return false;
-	} else if (cellular_state != CONNECTION_CELLULAR_STATE_CONNECTED &&
+		ERR("Flight mode is ON\n");
+		return -1;
+	} else {
+		if (vconf_get_bool(VCONFKEY_3G_ENABLE , &dnet_state) < 0) {
+			ERR("vconf_get_bool is failed\n");
+		} else if(dnet_state == 0) {
+			DBG("Data Network is not connected");
+			_prepare_popup(MH_POPUP_MOBILE_DATA_OFF, STR_NO_NET_CONN_MSG);
+			_create_popup(ad);
+			return 0;
+		}
+		if (cellular_state != CONNECTION_CELLULAR_STATE_CONNECTED &&
 			cellular_state != CONNECTION_CELLULAR_STATE_AVAILABLE) {
-		_prepare_popup(MH_POP_INFORMATION,
-				_("IDS_MOBILEAP_POP_UNABLE_TO_USE_PACKET_DATA_SERVICE_OUT_OF_COVERAGE"));
-		_create_popup(ad);
-		ERR("Cellular network is not connected : %d\n", cellular_state);
-		return false;
+			if(ad->ps_recheck_timer_id > 0) {
+				g_source_remove(ad->ps_recheck_timer_id);
+				ad->ps_recheck_timer_id = 0;
+				if (ad->is_wifi_teth_enabling == true && ad->type != TETHERING_TYPE_WIFI) {
+					_update_tethering_enabling_item(ad, TETHERING_TYPE_WIFI, MH_STATE_NONE);
+				}
+				if (ad->is_bt_teth_enabling == true && ad->type != TETHERING_TYPE_BT) {
+					_update_tethering_enabling_item(ad, TETHERING_TYPE_BT, MH_STATE_NONE);
+				}
+				if (ad->is_usb_teth_enabling == true && ad->type != TETHERING_TYPE_USB) {
+					_update_tethering_enabling_item(ad, TETHERING_TYPE_USB, MH_STATE_NONE);
+				}
+			}
+			ad->ps_recheck_timer_id = g_timeout_add(PS_RECHECK_INTERVAL, _ps_recheck_timeout_cb, (void*)ad);
+			return 0;
+		}
 	}
 
 	DBG("Cellular network is connected\n");
-	return true;
+	DBG("-\n");
+	return 1;
 }
 
-static int __create_wifi_hotspot_on_popup(mh_appdata_t *ad)
+int _create_wifi_hotspot_on_popup(mh_appdata_t *ad)
 {
-	char *fmt;
-	char *str;
+	char *fmt = NULL;
+	char *str = NULL;
 	bool wifi_state = false;
+	int value = 0;
 
 	wifi_is_activated(&wifi_state);
-	if (wifi_state == true || _is_wifi_direct_on() == true)
-		fmt = _("IDS_ST_BODY_WI_FI_NETWORK_WILL_BE_DISCONNECTED_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD");
-	else
-		fmt = _("IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD");
-
-	str = malloc(MH_LABEL_LENGTH_MAX);
-	snprintf(str, MH_LABEL_LENGTH_MAX, fmt, TETHERING_WIFI_MAX_CONNECTED_STA);
-	_prepare_popup(MH_POP_WIFI_ON_CONF, str);
-	free(str);
-
-	_create_popup(ad);
-
+	_set_vconf_prev_wifi_state(wifi_state);
+	value = _get_checkbox_status(TETHERING_TYPE_WIFI);
+	if (0 == value) {
+		if (wifi_state == true || _is_wifi_direct_on() == true) {
+			fmt = STR_TETH_ON_DESC_1;
+		} else {
+			fmt = STR_TETH_ON_DESC_2;
+		}
+		str = g_malloc0(MH_LABEL_LENGTH_MAX);
+		if (str == NULL) {
+			ERR("memory allocation is failed\n");
+			return -1;
+		}
+		snprintf(str, MH_LABEL_LENGTH_MAX, fmt, TETHERING_WIFI_MAX_CONNECTED_STA);
+		_wifi_tethering_checkbox_popup_status_set(true);
+		_prepare_popup(MH_POPUP_WIFI_ON_CHECKBOX, str);
+		g_free(str);
+		_create_popup(ad);
+	} else {
+		_prepare_popup_type(MH_POPUP_WIFI_ON_CHECKBOX);
+		_teth_on(ad);
+	}
 	return 0;
 }
 
-static int __create_bt_tethering_on_popup(mh_appdata_t *ad)
+int _create_bt_tethering_on_popup(mh_appdata_t *ad)
 {
 	char *str;
-
-	str = malloc(MH_LABEL_LENGTH_MAX);
-	snprintf(str, MH_LABEL_LENGTH_MAX,
-			_("IDS_ST_BODY_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE_THE_MAXIMUM_NUMBER_OF_TETHERED_DEVICES_ALLOWED_IS_PD"),
-			TETHERING_BT_MAX_CONNECTED_STA);
-	_prepare_popup(MH_POP_BT_ON_CONF, str);
-	free(str);
-
-	_create_popup(ad);
-
+	int value = 0;
+	value = _get_checkbox_status(TETHERING_TYPE_BT);
+	if (0 == value) {
+		str = g_malloc0(MH_LABEL_LENGTH_MAX);
+		if (str == NULL) {
+			ERR("memory allocation is failed\n");
+			return -1;
+		}
+		snprintf(str, MH_LABEL_LENGTH_MAX, STR_TETH_ON_DESC_2,
+				TETHERING_BT_MAX_CONNECTED_STA);
+		_prepare_popup(MH_POPUP_BT_ON_CHECKBOX, str);
+		g_free(str);
+		_create_popup(ad);
+	} else {
+		_prepare_popup_type(MH_POPUP_BT_ON_CHECKBOX);
+		_teth_on(ad);
+	}
 	return 0;
 }
 
-static int __create_usb_tethering_on_popup(mh_appdata_t *ad)
+int _create_usb_tethering_on_popup(mh_appdata_t *ad)
 {
-	char *str;
-
-	str = _("IDS_MOBILEAP_POP_TETHERING_CONSUMES_MORE_BATTERY_POWER_AND_INCREASES_YOUR_DATA_USAGE");
-	_prepare_popup(MH_POP_USB_ON_CONF, str);
-	_create_popup(ad);
-
+	int value = 0;
+	char *str = NULL;
+	value = _get_checkbox_status(TETHERING_TYPE_USB);
+	DBG("%s : %d\n", VCONF_MOBILE_AP_USB_POPUP_CHECKBOX_STATUS, value);
+	if (0 == value) {
+		str = g_malloc0(MH_LABEL_LENGTH_MAX);
+		if (str == NULL) {
+			ERR("memory allocation is failed\n");
+			return -1;
+		}
+		snprintf(str, MH_LABEL_LENGTH_MAX, "%s",
+				STR_TETH_ON_DESC_3);
+		_prepare_popup(MH_POPUP_USB_ON_CHECKBOX, str);
+		g_free(str);
+		_create_popup(ad);
+	} else {
+		_prepare_popup_type(MH_POPUP_USB_ON_CHECKBOX);
+		_teth_on(ad);
+	}
 	return 0;
 }
 
@@ -197,146 +348,211 @@ static void __disable_tethering_by_ind(mh_appdata_t *ad, tethering_disabled_caus
 	DBG("cause : %d\n", cause);
 	switch (cause) {
 	case TETHERING_DISABLED_BY_WIFI_ON:
-		DBG("TETHERING_DISABLED_IND by WIFI\n");
 		break;
 
 	case TETHERING_DISABLED_BY_BT_OFF:
-		DBG("TETHERING_DISABLED_BY_BT_DEACTIVATION\n");
 		break;
 
 	case TETHERING_DISABLED_BY_USB_DISCONNECTION:
-		DBG("TETHERING_DISABLED_IND by USB DISCONNECT\n");
+		if (ad->is_bt_teth_enabling && ad->main.bt_item) {
+			_update_bt_item(ad, MH_STATE_NONE);
+			ad->is_bt_teth_enabling = false;
+		}
+		if (ad->is_wifi_teth_enabling && ad->main.wifi_item) {
+			_update_wifi_item(ad, MH_STATE_NONE);
+			ad->is_wifi_teth_enabling = false;
+		}
 		break;
 
 	case TETHERING_DISABLED_BY_FLIGHT_MODE:
-		DBG("TETHERING_DISABLED_IND by FLIGHT_MODE\n");
 		break;
 
 	case TETHERING_DISABLED_BY_TIMEOUT:
-		DBG("TETHERING_DISABLED_BY_TIMEOUT\n");
 		break;
 
 	case TETHERING_DISABLED_BY_OTHERS:
-		DBG("TETHERING_DISABLED_IND by OTHERS\n");
+		if (ad->main.wifi_item && _get_vconf_prev_wifi_state() == true) {
+			elm_object_item_disabled_set(ad->main.wifi_item, EINA_TRUE);
+		}
 		break;
 
 	case TETHERING_DISABLED_BY_LOW_BATTERY:
-		DBG("TETHERING_DISABLED_IND by LOW_BATTERY\n");
 		break;
 
 	default:
-		DBG("TETHERING_DISABLED_IND Default\n");
 		break;
 	}
 
 	return;
 }
 
-static void __recover_wifi_station_mode(void)
+/* Wi-Fi callbacks */
+static void __wifi_activated_cb(wifi_error_e result, void *user_data)
+{
+	DBG("+\n");
+
+	return;
+}
+
+/* Tethering callbacks */
+void _enabled_cb(tethering_error_e result, tethering_type_e type, bool is_requested, void *user_data)
 {
 	DBG("+\n");
+	DBG("result : %d, type : %d, is_requested : %d\n", result, type, is_requested);
+
+	if (user_data == NULL) {
+		ERR("user_data is NULL\n");
+		return;
+	}
 
-	if (__get_vconf_prev_wifi_state() == false) {
-		DBG("No need to recover wifi station mode\n");
+	mh_appdata_t *ad = (mh_appdata_t *)user_data;
+
+	if (!is_requested) {
+		if (ad->type == type && ad->popup) {
+			DBG("This tethering type is already enabled\n");
+			evas_object_del(ad->popup);
+			ad->popup = NULL;
+		}
+		_update_main_view(ad, type);
+		if (type == TETHERING_TYPE_RESERVED) {
+			DBG("MobileAP is turned on\n");
+			_prepare_popup(MH_POPUP_WIFI_AP_OFF, STR_WIFI_AP_CONTROLLED_ANOTHER_APP);
+			_create_popup(ad);
+		}
 		return;
 	}
 
-	if (_turn_on_wifi() != 0)
-		ERR("_turn_on_wifi is failed\n");
-	if (vconf_set_bool(VCONF_MOBILE_AP_PREV_WIFI_STATUS, 0) < 0)
-		ERR("vconf_set_bool failed\n");
+	if (result != TETHERING_ERROR_NONE) {
+	}
+	_update_main_view(ad, type);
 
 	return;
 }
 
-/* Wi-Fi Direct callback */
-static void _wifi_direct_state_cb(int error_code, wifi_direct_device_state_e state, void *user_data)
+void _disabled_cb(tethering_error_e result, tethering_type_e type, tethering_disabled_cause_e cause, void *user_data)
 {
 	DBG("+\n");
+	DBG("result : %d, type : %d, cause : %d\n", result, type, cause);
 
 	if (user_data == NULL) {
-		ERR("The param is NULL\n");
+		ERR("user_data is NULL\n");
 		return;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t *)user_data;
-	int ret = 0;
-
-	wifi_direct_unset_device_state_changed_cb();
-	wifi_direct_deinitialize();
-	DBG("-\n");
 
-	if (error_code != 0) {
-		ERR("wifi_direct_deactivate fail in cb : %d\n", error_code);
-		_update_main_view(ad);
+	if (cause != TETHERING_DISABLED_BY_REQUEST) {
+		if (ad->type == type && ad->popup) {
+			DBG("This tethering type is already disabled\n");
+			evas_object_del(ad->popup);
+			ad->popup = NULL;
+		}
+		__disable_tethering_by_ind(ad, cause);
+		_update_main_view(ad, type);
 		return;
 	}
 
-	if (state != WIFI_DIRECT_DEVICE_STATE_DEACTIVATED) {
-		ERR("Unknown state : %d\n", state);
+	if (result != TETHERING_ERROR_NONE) {
+		_prepare_popup(MH_POPUP_TETH_ENABLING_FAILED, STR_UNABLE_TO_USE_TETH);
+		_create_popup(ad);
+		_update_main_view(ad, type);
 		return;
 	}
 
-	ret = tethering_enable(ad->handle, TETHERING_TYPE_WIFI);
-	if (ret != TETHERING_ERROR_NONE) {
-		ERR("wifi tethering on is failed : %d\n", ret);
-		_update_main_view(ad);
-		return;
+	if (type == TETHERING_TYPE_WIFI && _get_vconf_prev_wifi_state() == true) {
+		elm_object_item_disabled_set(ad->main.wifi_item, EINA_TRUE);
 	}
 
-	DBG("-\n");
-	return;
-}
-
-/* Wi-Fi callbacks */
-static void __wifi_activated_cb(wifi_error_e result, void *user_data)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	DBG("Wi-Fi on is done\n");
+	_update_main_view(ad, type);
 
-	__MOBILE_AP_FUNC_EXIT__;
 	return;
 }
 
-static void __wifi_deactivated_cb(wifi_error_e result, void *user_data)
+void _connection_changed_cb(tethering_client_h client, bool is_opened, void *user_data)
 {
-	__MOBILE_AP_FUNC_ENTER__;
+	DBG("+\n");
 
 	if (user_data == NULL) {
-		ERR("The param is NULL\n");
+		ERR("user_data is NULL\n");
 		return;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t *)user_data;
-	int ret;
+	char *mac_addr = NULL;
 
-	if (result != WIFI_ERROR_NONE) {
-		ERR("__wifi_deactivated_cb error : %d\n", result);
-		_update_main_view(ad);
-		return;
+	if (is_opened) {
+		_append_list_client_handle(ad, client);
+
+#ifdef TETHERING_DATA_USAGE_SUPPORT
+		if (ad->is_foreground && _get_list_clients_count(ad) == 1) {
+			_start_update_data_packet_usage(ad);
+		}
+#endif
+	} else {
+		tethering_client_get_mac_address(client, &mac_addr);
+		if (mac_addr) {
+			_delete_list_client_handle(ad, mac_addr);
+			free(mac_addr);
+		}
+#ifdef TETHERING_DATA_USAGE_SUPPORT
+		if (ad->is_foreground && _get_list_clients_count(ad) == 0)
+			_stop_update_data_packet_usage(ad);
+#endif
 	}
 
-	DBG("Wi-Fi is turned off\n");
+	ap_update_data_device(ad);
 
-	ret = vconf_set_bool(VCONF_MOBILE_AP_PREV_WIFI_STATUS, 1);
-	if (ret < 0)
-		ERR("vconf_set_bool() is failed : %d\n", ret);
+	return;
+}
 
-	ret = tethering_enable(ad->handle, TETHERING_TYPE_WIFI);
-	if (ret != TETHERING_ERROR_NONE) {
-		ERR("wifi tethering on is failed : %d\n", ret);
-		_update_main_view(ad);
+void _wifi_state_changed_cb(wifi_device_state_e state, void *user_data)
+{
+	if (user_data == NULL) {
+		ERR("user_data is NULL\n");
 		return;
 	}
 
-	__MOBILE_AP_FUNC_EXIT__;
-	return;
+	DBG("+\n");
+
+	mh_appdata_t *ad= (mh_appdata_t *)user_data;
+	char *str = NULL;
+	char *fmt = NULL;
+	if (state == WIFI_DEVICE_STATE_ACTIVATED) {
+		if (ad->main.wifi_item && elm_object_item_disabled_get(ad->main.wifi_item))
+			elm_object_item_disabled_set(ad->main.wifi_item, EINA_FALSE);
+		_set_vconf_prev_wifi_state(false);
+	} else if (state == WIFI_CONNECTION_STATE_DISCONNECTED){
+		_set_vconf_prev_wifi_state(true);
+	}
+
+	if (ad->type == TETHERING_TYPE_WIFI && ad->popup && ad->popup_checkbox &&
+			_wifi_tethering_checkbox_popup_status_get()) {
+		evas_object_del(ad->popup_checkbox);
+		ad->popup_checkbox = NULL;
+		evas_object_del(ad->popup);
+		ad->popup = NULL;
+		if (state == WIFI_DEVICE_STATE_ACTIVATED) {
+			fmt = STR_TETH_ON_DESC_1;
+		} else {
+			fmt = STR_TETH_ON_DESC_2;
+		}
+		str = g_malloc0(MH_LABEL_LENGTH_MAX);
+		if (str == NULL) {
+			ERR("memory allocation is failed\n");
+			return;
+		}
+		snprintf(str, MH_LABEL_LENGTH_MAX, fmt, TETHERING_WIFI_MAX_CONNECTED_STA);
+		_prepare_popup(MH_POPUP_WIFI_ON_CHECKBOX, str);
+		g_free(str);
+		_create_popup(ad);
+	}
+	DBG("-\n");
 }
 
-/* Tethering callbacks */
-void _enabled_cb(tethering_error_e result, tethering_type_e type, bool is_requested, void *user_data)
+void _visibility_changed_cb(bool is_visible, void *user_data)
 {
+	DBG("+\n");
+
 	if (user_data == NULL) {
 		ERR("user_data is NULL\n");
 		return;
@@ -344,31 +560,23 @@ 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);
-			ad->popup = NULL;
-		}
-		_update_main_view(ad);
-
+	if (ad->setup.visibility == is_visible)
 		return;
-	}
 
-	if (result != TETHERING_ERROR_NONE) {
-		_prepare_popup(MH_POP_INFORMATION,
-				_("IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"));
-		_create_popup(ad);
-	}
+	ad->setup.visibility = is_visible;
+	ad->setup.visibility_new = is_visible;
+	if (ad->setup.hide_item)
+		elm_genlist_item_update(ad->setup.hide_item);
 
-	_update_main_view(ad);
+	DBG("-\n");
 
 	return;
 }
 
-void _disabled_cb(tethering_error_e result, tethering_type_e type, tethering_disabled_cause_e cause, void *user_data)
+void _security_type_changed_cb(tethering_wifi_security_type_e changed_type, void *user_data)
 {
+	DBG("+\n");
+
 	if (user_data == NULL) {
 		ERR("user_data is NULL\n");
 		return;
@@ -376,60 +584,59 @@ 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");
+	if (ad->setup.security_type == changed_type)
 		return;
-	}
 
-	if (cause != TETHERING_DISABLED_BY_REQUEST) {
-		DBG("Tethering [%d] is disabled because of [%d]\n", type, cause);
-		if (NULL != ad->popup) {
-			evas_object_del(ad->popup);
-			ad->popup = NULL;
-		}
-		_update_main_view(ad);
-		__disable_tethering_by_ind(ad, cause);
-		return;
-	}
+	ad->setup.security_type = changed_type;
+	ad->setup.security_type_new = changed_type;
 
-	if (result != TETHERING_ERROR_NONE) {
-		_prepare_popup(MH_POP_INFORMATION,
-				_("IDS_MOBILEAP_POP_UNABLE_TO_USE_TETHERING"));
-		_create_popup(ad);
-		_update_main_view(ad);
-		return;
-	}
+	if (ad->setup.security_item)
+		elm_genlist_item_update(ad->setup.security_item);
 
-	DBG("Tethering [%d] is disabled by reqeust\n", type);
-	if (type == TETHERING_TYPE_WIFI) {
-		__recover_wifi_station_mode();
-	}
-
-	_update_main_view(ad);
+	DBG("-\n");
 
 	return;
 }
 
-void _connection_changed_cb(tethering_client_h client, bool is_opened, void *user_data)
+void _passphrase_changed_cb(void *user_data)
 {
+	DBG("+\n");
+
 	if (user_data == NULL) {
 		ERR("user_data is NULL\n");
 		return;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t *)user_data;
-	char *name = NULL;
+	char *passphrase = NULL;
+	int ret;
+
+	ret = tethering_wifi_get_passphrase(ad->handle, &passphrase);
+	if (ret != TETHERING_ERROR_NONE) {
+		ERR("tethering_wifi_get_passphrase failed ret = [0x%x]\n", ret);
+		return;
+	}
+
+	if (!g_strcmp0(passphrase, ad->setup.wifi_passphrase)) {
+		goto DONE;
+	}
 
-	tethering_client_get_name(client, &name);
-	DBG("Client %s is %s\n", name, is_opened ?  "connected" : "disconnected");
-	if (name)
-		free(name);
+	g_strlcpy(ad->setup.wifi_passphrase, passphrase,
+		sizeof(ad->setup.wifi_passphrase));
 
-	ap_update_data_device(ad);
+	g_strlcpy(ad->setup.wifi_passphrase_new, passphrase,
+		sizeof(ad->setup.wifi_passphrase_new));
 
+	if (ad->setup.pw_item)
+		elm_genlist_item_update(ad->setup.pw_item);
+
+DONE:
+	g_free(passphrase);
+	DBG("-\n");
 	return;
 }
 
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 void _data_usage_cb(tethering_error_e result, unsigned long long received_data, unsigned long long sent_data, void *user_data)
 {
 	if (user_data == NULL) {
@@ -450,6 +657,7 @@ void _data_usage_cb(tethering_error_e result, unsigned long long received_data,
 
 	return;
 }
+#endif
 /* End of Tethering callbacks */
 
 int _handle_wifi_onoff_change(mh_appdata_t *ad)
@@ -461,13 +669,12 @@ int _handle_wifi_onoff_change(mh_appdata_t *ad)
 
 	/* Turn off WiFi hotspot */
 	if (ad->main.hotspot_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI) {
-		if (_get_no_of_connected_device(ad->handle, &connected_wifi_clients,
-					TETHERING_TYPE_WIFI) == FALSE) {
+		if (_get_no_of_connected_device(ad, &connected_wifi_clients,
+					TETHERING_TYPE_WIFI) == EINA_FALSE) {
 			ERR("Getting the number of connected device is failed\n");
 		}
 		if (connected_wifi_clients > 0) {
-			_prepare_popup(MH_POP_WIFI_OFF_CONF,
-					_("IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"));
+			_prepare_popup(MH_POPUP_WIFI_OFF, STR_CLOSE_INTERNET_Q);
 			_create_popup(ad);
 		} else {
 			ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI);
@@ -475,17 +682,19 @@ int _handle_wifi_onoff_change(mh_appdata_t *ad)
 				ERR("wifi tethering off is failed : %d\n", ret);
 				return -1;
 			}
+			_send_signal_qp(QP_SIGNAL_PROGRESS_OFF);
 		}
 		return 0;
 	}
 
 	/* Turn on WiFi hotspot */
-	if (!__is_connected_ethernet_net(ad) && !__is_connected_cellular_net(ad)) {
-		ERR("There is no connected network\n");
+	ret = __is_preconditions_handled(ad);
+	if (ret < 0)
 		return -1;
-	}
+	else if (ret == 0)
+		return 0;
 
-	if (__create_wifi_hotspot_on_popup(ad) < 0) {
+	if (_create_wifi_hotspot_on_popup(ad) < 0) {
 		ERR("__create_wifi_hotspot_on_popup fail\n");
 		return -1;
 	}
@@ -512,14 +721,14 @@ int _handle_bt_onoff_change(mh_appdata_t *ad)
 	}
 
 	/* Turn on Bluetooth tethering */
-	if (!__is_connected_ethernet_net(ad) && !__is_connected_wifi_net(ad) &&
-			!__is_connected_cellular_net(ad)) {
-		ERR("There is no connected network\n");
+	ret = __is_preconditions_handled(ad);
+	if (ret < 0)
 		return -1;
-	}
+	else if (ret == 0)
+		return 0;
 
-	if (__create_bt_tethering_on_popup(ad) < 0) {
-		ERR("__create_bt_tethering_on_popup fail\n");
+	if (_create_bt_tethering_on_popup(ad) < 0) {
+		ERR("_create_bt_tethering_on_popup fail\n");
 		return -1;
 	}
 
@@ -538,21 +747,21 @@ int _handle_usb_onoff_change(mh_appdata_t *ad)
 	if (ad->main.hotspot_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_USB) {
 		ret = tethering_disable(ad->handle, TETHERING_TYPE_USB);
 		if (ret) {
-			DBG("Error disable usb tethering : %d\n", ret);
+			ERR("Error disable usb tethering : %d\n", ret);
 			return -1;
 		}
 		return 0;
 	}
 
 	/* Turn on USB tethering */
-	if (!__is_connected_ethernet_net(ad) && !__is_connected_wifi_net(ad) &&
-			!__is_connected_cellular_net(ad)) {
-		ERR("There is no connected network\n");
+	ret = __is_preconditions_handled(ad);
+	if (ret < 0)
 		return -1;
-	}
+	else if (ret == 0)
+		return 0;
 
-	if (__create_usb_tethering_on_popup(ad) < 0) {
-		ERR("__create_usb_tethering_on_popup fail\n");
+	if (_create_usb_tethering_on_popup(ad) < 0) {
+		ERR("_create_usb_tethering_on_popup fail\n");
 		return -1;
 	}
 
@@ -561,19 +770,6 @@ int _handle_usb_onoff_change(mh_appdata_t *ad)
 	return 0;
 }
 
-int _turn_off_wifi(mh_appdata_t *ad)
-{
-	int ret;
-
-	ret = wifi_deactivate(__wifi_deactivated_cb, (void *)ad);
-	if (ret != WIFI_ERROR_NONE) {
-		ERR("wifi_deactivate() is failed : %d\n", ret);
-		return -1;
-	}
-
-	return 0;
-}
-
 int _turn_on_wifi(void)
 {
 	int ret;
@@ -600,34 +796,3 @@ bool _is_wifi_direct_on(void)
 
 	return wifi_direct_state != 0 ? true : false;
 }
-
-int _turn_off_wifi_direct(mh_appdata_t *ad)
-{
-	int ret;
-
-	ret = wifi_direct_initialize();
-	if (ret < 0) {
-		ERR("wifi_direct_initialize() is failed : %d\n", ret);
-		return -1;
-	}
-
-	ret = wifi_direct_set_device_state_changed_cb(_wifi_direct_state_cb, (void *)ad);
-	if (ret < 0) {
-		ERR("wifi_direct_set_device_state_changed_cb() is failed : %d\n", ret);
-		ret = wifi_direct_deinitialize();
-		DBG("wifi_direct_deinitialize() ret : %d\n", ret);
-		return -1;
-	}
-
-	ret = wifi_direct_deactivate();
-	if (ret < 0) {
-		ERR("wifi_direct_deactivate() is failed : %d\n", ret);
-		ret = wifi_direct_unset_device_state_changed_cb();
-		DBG("wifi_direct_unset_device_state_changed_cb() ret : %d\n", ret);
-		ret = wifi_direct_deinitialize();
-		DBG("wifi_direct_deinitialize() ret : %d\n", ret);
-		return -1;
-	}
-
-	return 0;
-}
diff --git a/src/mh_main_ug.c b/src/mh_main_ug.c
index 7babc58..7cca347 100644
--- a/src/mh_main_ug.c
+++ b/src/mh_main_ug.c
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,17 +21,24 @@
 #define UG_MODULE_API __attribute__ ((visibility("default")))
 #endif
 
+//#include <setting-cfg.h>
+
 #include "mobile_hotspot.h"
 #include "mh_view_main.h"
 #include "mh_func_onoff.h"
 #include "mh_common_utility.h"
+#include "mh_popup.h"
+#include "mh_string.h"
+#include "mh_view_wifi_setup.h"
+
+//UG_MODULE_API int setting_plugin_search_init(app_control_h app_control, void * priv, char ** domainname);
 
 static Evas_Object *create_content(mh_appdata_t *ad)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
 	ad->naviframe = _create_naviframe(ad->layout);
-	ap_draw_contents(ad);
+	_main_draw_contents(ad);
 
 	__MOBILE_AP_FUNC_EXIT__;
 
@@ -40,6 +47,8 @@ static Evas_Object *create_content(mh_appdata_t *ad)
 
 static void __set_callbacks(tethering_h handle, void *user_data)
 {
+	DBG("+\n");
+
 	int ret;
 
 	ret = tethering_set_enabled_cb(handle, TETHERING_TYPE_ALL,
@@ -47,40 +56,141 @@ static void __set_callbacks(tethering_h handle, void *user_data)
 	if (ret != TETHERING_ERROR_NONE)
 		ERR("tethering_set_enabled_cb [0x%X]\n", ret);
 
+	ret = tethering_set_enabled_cb(handle, TETHERING_TYPE_RESERVED,
+			_enabled_cb, user_data);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_set_enabled_cb [0x%X]\n", ret);
+
+	ret = tethering_wifi_set_passphrase_changed_cb(handle,
+			_passphrase_changed_cb, user_data);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_wifi_set_passphrase_changed_cb [0x%X]\n", ret);
+
+	ret = tethering_wifi_set_ssid_visibility_changed_cb(handle,
+			_visibility_changed_cb, user_data);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_wifi_set_ssid_visibility_changed_cb [0x%X]\n", ret);
+
+	ret = tethering_wifi_set_security_type_changed_cb(handle,
+			_security_type_changed_cb, user_data);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_wifi_set_security_type_changed_cb [0x%X]\n", ret);
+
 	ret = tethering_set_disabled_cb(handle, TETHERING_TYPE_ALL,
 			_disabled_cb, user_data);
 	if (ret != TETHERING_ERROR_NONE)
 		ERR("tethering_set_disabled_cb [0x%X]\n", ret);
 
+	ret = tethering_set_disabled_cb(handle, TETHERING_TYPE_RESERVED,
+			_disabled_cb, user_data);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_set_disabled_cb [0x%X]\n", ret);
+
 	ret = tethering_set_connection_state_changed_cb(handle,
 			TETHERING_TYPE_ALL,
 			_connection_changed_cb, user_data);
 	if (ret != TETHERING_ERROR_NONE)
 		ERR("tethering_set_connection_state_changed_cb [0x%X]\n", ret);
+
+	ret = wifi_set_device_state_changed_cb(_wifi_state_changed_cb, user_data);
+	if (ret != WIFI_ERROR_NONE)
+		ERR("wifi_set_device_state_changed_cb [0x%X]\n", ret);
+	vconf_notify_key_changed(VCONFKEY_SETAPPL_DEVICE_NAME_STR,
+				_device_name_changed_cb, user_data);
+
+	vconf_notify_key_changed(VCONFKEY_NETWORK_CELLULAR_STATE,
+			_handle_network_cellular_state_changed_cb, user_data);
+
+	vconf_notify_key_changed(VCONFKEY_SYSMAN_USB_STATUS,
+			_handle_usb_status_change, (void *)user_data);
+
+	vconf_notify_key_changed(VCONF_KEY_MOBILEAP_SYSPOPUP_RESPONSE,
+			_handle_mobileap_syspopup_popup_response, (void *)user_data);
+
+	DBG("-\n");
 }
 
 static void __unset_callbacks(tethering_h handle)
 {
+	DBG("+\n");
+
 	int ret;
 
+	ret = wifi_unset_device_state_changed_cb();
+	if (ret != WIFI_ERROR_NONE)
+		ERR("wifi_unset_device_state_changed_cb [0x%X]\n", ret);
+
 	ret = tethering_unset_connection_state_changed_cb(handle,
 			TETHERING_TYPE_ALL);
 	if (ret != TETHERING_ERROR_NONE)
 		ERR("tethering_unset_connection_state_changed_cb[0x%X]\n", ret);
 
+	ret = tethering_unset_disabled_cb(handle, TETHERING_TYPE_RESERVED);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_unset_disabled_cb [0x%X]\n", ret);
+
 	ret = tethering_unset_disabled_cb(handle, TETHERING_TYPE_ALL);
 	if (ret != TETHERING_ERROR_NONE)
 		ERR("tethering_unset_disabled_cb [0x%X]\n", ret);
 
+	ret = tethering_wifi_unset_security_type_changed_cb(handle);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_wifi_unset_security_type_changed_cb [0x%X]\n", ret);
+
+	ret = tethering_wifi_unset_ssid_visibility_changed_cb(handle);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_wifi_unset_ssid_visibility_changed_cb [0x%X]\n", ret);
+
+	ret = tethering_wifi_unset_passphrase_changed_cb(handle);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_wifi_unset_passphrase_changed_cb [0x%X]\n", ret);
+
+	ret = tethering_unset_enabled_cb(handle, TETHERING_TYPE_RESERVED);
+	if (ret != TETHERING_ERROR_NONE)
+		ERR("tethering_unset_enabled [0x%X]\n", ret);
+
 	ret = tethering_unset_enabled_cb(handle, TETHERING_TYPE_ALL);
 	if (ret != TETHERING_ERROR_NONE)
 		ERR("tethering_unset_enabled [0x%X]\n", ret);
+
+	vconf_ignore_key_changed(VCONFKEY_SETAPPL_DEVICE_NAME_STR,
+			_device_name_changed_cb);
+
+	vconf_ignore_key_changed(VCONFKEY_NETWORK_CELLULAR_STATE,
+			_handle_network_cellular_state_changed_cb);
+
+	vconf_ignore_key_changed(VCONFKEY_SYSMAN_USB_STATUS, _handle_usb_status_change);
+
+	vconf_ignore_key_changed(VCONF_KEY_MOBILEAP_SYSPOPUP_RESPONSE,
+			_handle_mobileap_syspopup_popup_response);
+
+	DBG("-\n");
+}
+
+Ea_Theme_Color_Table *_color_table_set(void)
+{
+	Ea_Theme_Color_Table *table;
+
+	table = ea_theme_color_table_new(COLOR_TABLE);
+	DBG("Tethering color table : %p \n");
+	ea_theme_colors_set(table, EA_THEME_STYLE_DEFAULT);
+	return table;
+}
+
+Ea_Theme_Font_Table *_font_table_set(void)
+{
+	Ea_Theme_Font_Table *table;
+
+	table = ea_theme_color_table_new(FONT_TABLE);
+	DBG("Tethering font table : %p \n");
+	ea_theme_fonts_set(table);
+	return table;
 }
 
 static void *on_create(ui_gadget_h ug, enum ug_mode mode,
-		service_h service, void *priv)
+		app_control_h app_control, void *priv)
 {
-	__MOBILE_AP_FUNC_ENTER__;
+	DBG("+\n");
 
 	if (!ug || !priv) {
 		ERR("The param is NULL\n");
@@ -97,13 +207,13 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode,
 	mh_ugdata_t *ugd;
 	mh_appdata_t *ad;
 	int ret;
+	int rots[4] = { 0, 90, 180, 270 };
 
 	bindtextdomain(MH_TEXT_DOMAIN, MH_LOCALEDIR);
 	dgettext(PACKAGE, LOCALEDIR);
 
 	ad = (mh_appdata_t *)malloc(sizeof(mh_appdata_t));
 	if (ad == NULL) {
-		// TODO review this
 		ERR("Error!!! failed to allocate memory()\n");
 		return NULL;
 	}
@@ -114,6 +224,8 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode,
 	ugd->ug = ug;
 	ad->gadget = ugd;
 
+	_send_signal_qp(QP_SIGNAL_PROGRESS_RESET);
+
 	ecore_imf_init();
 
 	ret = tethering_create(&ad->handle);
@@ -132,6 +244,14 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode,
 		return NULL;
 	}
 
+	if (!elm_win_wm_rotation_supported_get(ad->win)) {
+		return NULL;
+	}
+
+	elm_win_wm_rotation_available_rotations_set(ad->win, rots, 1);
+	ea_theme_changeable_ui_enabled_set(EINA_TRUE);
+	ad->color_table = _color_table_set();
+	ad->font_table = _font_table_set();
 	layout = _create_win_layout(ad);
 	if (layout == NULL) {
 		ERR("_create_win_layout is failed\n");
@@ -150,7 +270,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode,
 
 	elm_object_part_content_set(layout, "elm.swallow.content", content);
 	evas_object_show(layout);
-
 	ret = connection_create(&ad->conn_handle);
 	if (ret != CONNECTION_ERROR_NONE) {
 		ERR("connection_create() is failed : %d\n", ret);
@@ -163,27 +282,96 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode,
 
 	__set_callbacks(ad->handle, (void *)ad);
 
-	__MOBILE_AP_FUNC_EXIT__;
+	DBG("-\n");
 	return layout;
 }
 
-static void on_start(ui_gadget_h ug, service_h service, void *priv)
+static void on_start(ui_gadget_h ug, app_control_h app_control, void *priv)
 {
+	DBG("+\n");
+
+	char * viewtype = NULL;
+
+	mh_ugdata_t *ugd = (mh_ugdata_t *)priv;
+	mh_appdata_t *ad = ugd->ad;
+
+	ad->is_foreground = true;
+
+	if (_get_list_clients_count(ad) > 0) {
+#ifdef TETHERING_DATA_USAGE_SUPPORT
+		_start_update_data_packet_usage(ad);
+#endif
+		if (ad->connected_device.navi_it) {
+			_start_update_device_conn_time(ad);
+		}
+	}
+
+	if (tethering_is_enabled(NULL, TETHERING_TYPE_RESERVED) == true) {
+		DBG("MobileAP is turned on\n");
+		_prepare_popup(MH_POPUP_WIFI_AP_OFF, STR_WIFI_AP_CONTROLLED_ANOTHER_APP);
+		_create_popup(ad);
+	}
+
+	app_control_get_extra_data(app_control, "viewtype", &viewtype);
+
+	if (viewtype != NULL) {
+		if(strcmp(viewtype, "wifisettings") == 0)
+			mh_draw_wifi_setup_view(ad);
+		g_free(viewtype);
+	}
+
+	DBG("-\n");
+	return;
 }
 
-static void on_pause(ui_gadget_h ug, service_h service, void *priv)
+static void on_pause(ui_gadget_h ug, app_control_h app_control, void *priv)
 {
+	DBG("+\n");
+
+	mh_ugdata_t *ugd = (mh_ugdata_t *)priv;
+	mh_appdata_t *ad = ugd->ad;
+
+#ifdef TETHERING_DATA_USAGE_SUPPORT
+	_stop_update_data_packet_usage(ad);
+#endif
+	_stop_update_device_conn_time(ad);
+	ad->is_foreground = false;
 
+	DBG("-\n");
 }
 
-static void on_resume(ui_gadget_h ug, service_h service, void *priv)
+static void on_resume(ui_gadget_h ug, app_control_h app_control, void *priv)
 {
+	DBG("+\n");
+
+	mh_ugdata_t *ugd = (mh_ugdata_t *)priv;
+	mh_appdata_t *ad = ugd->ad;
+	Elm_Object_Item *item = ad->main.device_item;
+	GSList *l = NULL;
 
+	ad->is_foreground = true;
+
+	if (item && elm_genlist_item_expanded_get(item)) {
+		for (l = ad->client_list; l != NULL; l = g_slist_next(l) ) {
+			item = elm_genlist_item_next_get(item);
+			elm_genlist_item_fields_update(item, "elm.text.2", ELM_GENLIST_ITEM_FIELD_TEXT);
+		}
+	}
+
+	if (_get_list_clients_count(ad) > 0) {
+#ifdef TETHERING_DATA_USAGE_SUPPORT
+		_start_update_data_packet_usage(ad);
+#endif
+		if (ad->connected_device.navi_it) {
+			_start_update_device_conn_time(ad);
+		}
+	}
+	DBG("-\n");
 }
 
-static void on_destroy(ui_gadget_h ug, service_h service, void *priv)
+static void on_destroy(ui_gadget_h ug, app_control_h app_control, void *priv)
 {
-	__MOBILE_AP_FUNC_ENTER__;
+	DBG("+\n");
 
 	if (priv == NULL) {
 		ERR("The param is NULL\n");
@@ -200,7 +388,15 @@ static void on_destroy(ui_gadget_h ug, service_h service, void *priv)
 	}
 
 	__unset_callbacks(ad->handle);
+
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 	_stop_update_data_packet_usage(ad);
+#endif
+	_stop_update_device_conn_time(ad);
+
+	if (vconf_set_int(VCONF_MOBILE_AP_CONNECT_USB_POPUP_STATUS, 0) < 0) {
+		ERR("vconf_set_int is failed\n");
+	}
 
 	ret = wifi_deinitialize();
 	if (ret != WIFI_ERROR_NONE) {
@@ -224,75 +420,40 @@ static void on_destroy(ui_gadget_h ug, service_h service, void *priv)
 		return;
 	}
 
-	ap_callback_del(ad);
 	if (ad->popup) {
 		evas_object_del(ad->popup);
 		ad->popup = NULL;
 	}
 
+	if(ad->ps_recheck_timer_id > 0) {
+		g_source_remove(ad->ps_recheck_timer_id);
+		ad->ps_recheck_timer_id = 0;
+	}
+
 	evas_object_del(ad->bg);
 	ad->bg = NULL;
 
 	evas_object_del(ad->layout);
 	ad->layout = NULL;
 
+	_main_free_genlist_itc(ad);
+
 	ecore_imf_shutdown();
 
 	free(ugd->ad);
 	ugd->ad = NULL;
 
-	__MOBILE_AP_FUNC_EXIT__;
+	DBG("-\n");
 	return;
 }
 
-static void on_message(ui_gadget_h ug, service_h msg,
-		service_h service, void *priv)
-{
-}
-
-static void __rotate_changed_cb(mh_appdata_t *ad, enum ug_event rotate_state)
+static void on_message(ui_gadget_h ug, app_control_h msg,
+		app_control_h app_control, void *priv)
 {
-	if (ad == NULL) {
-		ERR("ad is NULL\n");
-		return;
-	}
-
-	Elm_Object_Item *top_navi_it = NULL;
-	mh_wifi_setting_view_t *st = &ad->setup;
-
-	ad->rotate_state = rotate_state;
-
-	top_navi_it = elm_naviframe_top_item_get(ad->naviframe);
-	if (top_navi_it == NULL) {
-		ERR("elm_naviframe_top_item_get returns NULL\n");
-		return;
-	}
-
-	if (top_navi_it != st->navi_it) {
-		return;
-	}
-
-	if (rotate_state == UG_EVENT_ROTATE_PORTRAIT ||
-			rotate_state == UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN) {
-		DBG("Naviframe title is shown\n");
-		elm_naviframe_item_title_visible_set(st->navi_it,
-				EINA_TRUE);
-	} else if (rotate_state == UG_EVENT_ROTATE_LANDSCAPE ||
-			rotate_state == UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN) {
-		if (ad->imf_state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
-			DBG("Naviframe title is hided\n");
-			elm_naviframe_item_title_visible_set(st->navi_it,
-					EINA_FALSE);
-		}
-	} else {
-		ERR("Unknown rotate_state : %d\n", rotate_state);
-	}
-
-	return;
 }
 
 static void on_event(ui_gadget_h ug, enum ug_event event,
-		service_h service, void *priv)
+		app_control_h app_control, void *priv)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
@@ -301,31 +462,24 @@ static void on_event(ui_gadget_h ug, enum ug_event event,
 		return;
 	}
 
-	mh_ugdata_t *ugd = (mh_ugdata_t *)priv;
-	mh_appdata_t *ad = ugd->ad;
-
 	switch (event) {
 	case UG_EVENT_LOW_MEMORY:
-		DBG("UG_EVENT_LOW_MEMORY\n");
 		break;
 	case UG_EVENT_LOW_BATTERY:
-		DBG("UG_EVENT_LOW_BATTERY\n");
 		break;
 	case UG_EVENT_LANG_CHANGE:
-		DBG("UG_EVENT_LANG_CHANGE\n");
 		break;
 	case UG_EVENT_ROTATE_PORTRAIT:
 	case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
 		DBG("UG_EVENT_ROTATE_PORTRAIT[_UPSIDEDOWN]\n");
-		__rotate_changed_cb(ad, event);
+		_rotate_adjust_rename_popup();
 		break;
 	case UG_EVENT_ROTATE_LANDSCAPE:
 	case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
 		DBG("UG_EVENT_ROTATE_LANDSCAPE[_UPSIDEDOWN]\n");
-		__rotate_changed_cb(ad, event);
+		_rotate_adjust_rename_popup();
 		break;
 	default:
-		DBG("default\n");
 		break;
 	}
 
@@ -333,7 +487,7 @@ static void on_event(ui_gadget_h ug, enum ug_event event,
 }
 
 static void on_key_event(ui_gadget_h ug, enum ug_key_event event,
-		service_h service, void *priv)
+		app_control_h app_control, void *priv)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
@@ -368,7 +522,7 @@ static void on_key_event(ui_gadget_h ug, enum ug_key_event event,
 
 UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
 {
-	__MOBILE_AP_FUNC_ENTER__;
+	DBG("+\n");
 
 	if (!ops) {
 		ERR("The param is NULL\n");
@@ -393,14 +547,12 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
 	ops->priv = ugd;
 	ops->opt = UG_OPT_INDICATOR_ENABLE;
 
-	__MOBILE_AP_FUNC_EXIT__;
-
 	return 0;
 }
 
 UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
 {
-	__MOBILE_AP_FUNC_ENTER__;
+	DBG("+\n");
 
 	if (!ops) {
 		ERR("The param is NULL\n");
@@ -411,32 +563,46 @@ UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
 
 	if (ugd)
 		free(ugd);
-
-	__MOBILE_AP_FUNC_EXIT__;
 }
 
 static void __mh_reset_vconf(tethering_h handle)
 {
 	int ret = 0;
 
+	ret = vconf_set_int(VCONF_MOBILE_AP_WIFI_POPUP_CHECKBOX_STATUS, 0);
+	if (ret != 0)
+		ERR("vconf_set_int failed\n");
+
+	ret = vconf_set_int(VCONF_MOBILE_AP_BT_POPUP_CHECKBOX_STATUS, 0);
+	if (ret != 0)
+		ERR("vconf_set_int failed\n");
+
+	ret = vconf_set_int(VCONF_MOBILE_AP_USB_POPUP_CHECKBOX_STATUS, 0);
+	if (ret != 0)
+		ERR("vconf_set_int failed\n");
+
 	ret = vconf_set_int(VCONF_MOBILE_AP_PREV_WIFI_STATUS, 0);
 	if (ret != 0)
 		ERR("vconf_set_int failed\n");
 
+	ret = vconf_set_int(VCONF_MOBILE_AP_CONNECT_USB_POPUP_STATUS, 0);
+	if (ret != 0)
+		ERR("vconf_set_int is failed\n");
+
 	ret = tethering_wifi_set_ssid_visibility(handle, true);
 	if (ret != TETHERING_ERROR_NONE)
 		ERR("tethering_wifi_set_ssid_visibility failed\n");
 
-	ret = tethering_wifi_set_security_type(handle, TETHERING_WIFI_SECURITY_TYPE_NONE);
+	ret = tethering_wifi_set_security_type(handle, TETHERING_WIFI_SECURITY_TYPE_WPA2_PSK);
 	if (ret != TETHERING_ERROR_NONE)
 		ERR("tethering_wifi_set_security_type failed\n");
 
 	return;
 }
 
-UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
+UG_MODULE_API int setting_plugin_reset(app_control_h app_control, void *priv)
 {
-	__MOBILE_AP_FUNC_ENTER__;
+	DBG("+\n");
 
 	int ret = -1;
 	tethering_h handle = NULL;
@@ -462,7 +628,37 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
 
 	tethering_destroy(handle);
 
-	__MOBILE_AP_FUNC_EXIT__;
+	return 0;
+}
+
+/* Below code is commented as search in setting is no more supported in kiran */
+
+#if 0
+UG_MODULE_API int setting_plugin_search_init(app_control_h app_control, void * priv, char ** domainname)
+{
+	*domainname = strdup(PACKAGE":/usr/apps/ug-setting-mobileap-efl/res/locale");
+
+	Eina_List ** pplist = (Eina_List**)priv;
+	void * node = NULL;
+
+	node = setting_plugin_search_item_add("IDS_MOBILEAP_MBODY_USB_TETHERING", "viewtype:frontpage", NULL, 5, NULL);
+	*pplist = eina_list_append(*pplist, node);
+
+	node = setting_plugin_search_item_add("IDS_MOBILEAP_MBODY_WI_FI_TETHERING", "viewtype:frontpage", NULL, 5, NULL);
+	*pplist = eina_list_append(*pplist, node);
+
+	node = setting_plugin_search_item_add("IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING", "viewtype:frontpage", NULL, 5, NULL);
+	*pplist = eina_list_append(*pplist, node);
+
+	node = setting_plugin_search_item_add("IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS", "viewtype:wifisettings", NULL, 5, NULL);
+	*pplist = eina_list_append(*pplist, node);
+
+	node = setting_plugin_search_item_add("IDS_MOBILEAP_BODY_HIDE_MY_DEVICE", "viewtype:wifisettings", NULL, 5, NULL);
+	*pplist = eina_list_append(*pplist, node);
+
+	node = setting_plugin_search_item_add("IDS_MOBILEAP_BODY_SECURITY", "viewtype:wifisettings", NULL, 5, NULL);
+	*pplist = eina_list_append(*pplist, node);
 
 	return 0;
 }
+#endif
diff --git a/src/mh_popup.c b/src/mh_popup.c
new file mode 100755
index 0000000..cfe6929
--- /dev/null
+++ b/src/mh_popup.c
@@ -0,0 +1,609 @@
+/*
+* ug-mobile-ap
+*
+* Copyright 2012  Samsung Electronics Co., Ltd
+
+* Licensed under the Flora License, Version 1.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+
+* http://www.tizenopensource.org/license
+
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+#include <utilX.h>
+#include <efl_assist.h>
+
+#include "mh_common_utility.h"
+#include "mobile_hotspot.h"
+#include "mh_popup.h"
+#include "mh_string.h"
+
+static mh_popup_type_e popup_type = MH_POPUP_NONE;
+static Evas_Object *popup_content = NULL;
+static char *popup_string = NULL;
+
+static void __handle_one_btn(void *data)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (data == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+
+	if (ad->popup) {
+		evas_object_del(ad->popup);
+		ad->popup = NULL;
+	}
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __popup_one_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	if (data == NULL || obj == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	__handle_one_btn(data);
+}
+
+static void __popup_one_btn_mouse_event_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+	if (data == NULL || obj == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	Evas_Event_Mouse_Up *ev = event_info;
+
+	if (ev->button == 3) {
+		__handle_one_btn(data);
+	}
+}
+
+static void __launch_network_app(void)
+{
+	int ret = APP_CONTROL_ERROR_NONE;
+	app_control_h app_control;
+
+	app_control_create(&app_control);
+	if(ret != APP_CONTROL_ERROR_NONE) {
+		ERR("app_control_create failed");
+		return;
+	}
+	app_control_set_operation(app_control, APP_CONTROL_OPERATION_DEFAULT);
+	app_control_set_window(app_control, elm_win_xwindow_get(ug_get_window()));
+	app_control_set_app_id(app_control, "setting-network-efl");
+
+	ret = app_control_send_launch_request(app_control, NULL, NULL);
+	if(ret == APP_CONTROL_ERROR_NONE) {
+		DBG("Launch network ug successful");
+	} else {
+		ERR("Fail to launch network ug");
+	}
+
+	app_control_destroy(app_control);
+}
+
+static void __handle_popup_resp(void *data, bool response)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (data == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	int ret = 0;
+	Eina_Bool state = 0;
+
+	if (ad->popup_checkbox) {
+		state = elm_check_state_get(ad->popup_checkbox);
+		evas_object_del(ad->popup_checkbox);
+		ad->popup_checkbox = NULL;
+		DBG("Checkbox status is = %d\n", state);
+	}
+	if (ad->popup) {
+		evas_object_del(ad->popup);
+		ad->popup = NULL;
+	}
+
+	if (response == true) {
+		switch (popup_type) {
+		case MH_POPUP_WIFI_ON_CHECKBOX:
+			if(state) {
+				_set_checkbox_status(TETHERING_TYPE_WIFI, 1);
+			}
+			ad->is_wifi_teth_enabling = false;
+			ret = tethering_enable(ad->handle, TETHERING_TYPE_WIFI);
+			if (ret != TETHERING_ERROR_NONE) {
+				ERR("wifi tethering on is failed : %d\n", ret);
+				_update_wifi_item(ad, MH_STATE_NONE);
+			}
+			_wifi_tethering_checkbox_popup_status_set(false);
+			_send_signal_qp(QP_SIGNAL_PROGRESS_ON);
+			break;
+
+		case MH_POPUP_BT_ON_CHECKBOX:
+			if(state) {
+				_set_checkbox_status(TETHERING_TYPE_BT, 1);
+			}
+			ad->is_bt_teth_enabling = false;
+			ret = tethering_enable(ad->handle, TETHERING_TYPE_BT);
+			if (ret != TETHERING_ERROR_NONE) {
+				ERR("Error enable bt tethering : %d\n", ret);
+				_update_bt_item(ad, MH_STATE_NONE);
+			}
+			break;
+
+		case MH_POPUP_USB_ON_CHECKBOX:
+			if(state) {
+				_set_checkbox_status(TETHERING_TYPE_USB, 1);
+			}
+			if (_get_vconf_usb_state() != VCONFKEY_SYSMAN_USB_AVAILABLE) {
+				_update_tethering_item(ad, MH_STATE_NONE);
+				break;
+			}
+			ad->is_usb_teth_enabling = false;
+			ret = tethering_enable(ad->handle, TETHERING_TYPE_USB);
+			if (ret != TETHERING_ERROR_NONE) {
+				ERR("Error enable usb tethering : %d\n", ret);
+				_update_usb_item(ad, MH_STATE_NONE);
+			}
+			break;
+
+		case MH_POPUP_WIFI_AP_OFF:
+			ret = tethering_disable(ad->handle, TETHERING_TYPE_RESERVED);
+			if (ret != TETHERING_ERROR_NONE) {
+				ERR("MobileAP off is failed : %d\n", ret);
+			}
+			break;
+
+		case MH_POPUP_WIFI_OFF:
+			ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI);
+			if (ret != TETHERING_ERROR_NONE) {
+				ERR("wifi tethering off is failed : %d\n", ret);
+				_update_wifi_item(ad, MH_STATE_NONE);
+			}
+			_send_signal_qp(QP_SIGNAL_PROGRESS_OFF);
+			break;
+
+		case MH_POPUP_MOBILE_DATA_OFF:
+			__launch_network_app();
+			_update_tethering_enabling_item(ad, ad->type, MH_STATE_NONE);
+			break;
+
+		default:
+			ERR("Unknown popup_type : %d\n", popup_type);
+			break;
+		}
+	} else {
+		switch (popup_type) {
+		case MH_POPUP_WIFI_ON_CHECKBOX:
+			_update_tethering_enabling_item(ad, TETHERING_TYPE_WIFI, MH_STATE_NONE);
+			_send_signal_qp(QP_SIGNAL_PROGRESS_RESET);
+			_wifi_tethering_checkbox_popup_status_set(false);
+			break;
+
+		case MH_POPUP_BT_ON_CHECKBOX:
+			_update_tethering_enabling_item(ad, TETHERING_TYPE_BT, MH_STATE_NONE);
+			break;
+
+		case MH_POPUP_USB_ON_CHECKBOX:
+			_update_tethering_enabling_item(ad,TETHERING_TYPE_USB, MH_STATE_NONE);
+			break;
+
+		case MH_POPUP_WIFI_AP_OFF:
+			if (ad->setup.genlist)
+				elm_naviframe_item_pop(ad->naviframe);
+			elm_naviframe_item_pop(ad->naviframe);
+			break;
+
+		case MH_POPUP_WIFI_OFF:
+			_update_tethering_enabling_item(ad, TETHERING_TYPE_WIFI, MH_STATE_NONE);
+			_send_signal_qp(QP_SIGNAL_PROGRESS_RESET);
+			break;
+
+		case MH_POPUP_MOBILE_DATA_OFF:
+			_update_tethering_enabling_item(ad, ad->type, MH_STATE_NONE);
+			break;
+		default:
+			ERR("Unknown popup_type : %d\n", popup_type);
+			break;
+		}
+	}
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+void _teth_on(mh_appdata_t *ad)
+{
+	__handle_popup_resp(ad, true);
+}
+
+static void __popup_yes_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	if (data == NULL || obj == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	__handle_popup_resp(data, true);
+}
+
+static void __popup_no_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	if (data == NULL || obj == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	__handle_popup_resp(data, false);
+}
+
+static void __popup_no_btn_mouse_event_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+	if (data == NULL || obj == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	Evas_Event_Mouse_Up *ev = event_info;
+
+	if (ev->button == 3) {
+		__handle_popup_resp(data, false);
+	}
+}
+
+void _prepare_popup_with_content(int type, Evas_Object *obj)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (obj == NULL) {
+		ERR("param is NULL\n");
+		return;
+	}
+
+	popup_type = type;
+
+	if (popup_content)
+		evas_object_del(popup_content);
+	popup_content = obj;
+
+	if (popup_string) {
+		free(popup_string);
+		popup_string = NULL;
+	}
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+void _prepare_popup(int type, const char *str)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (str == NULL) {
+		ERR("param is NULL\n");
+		return;
+	}
+	popup_type = type;
+
+	popup_content = NULL;
+
+	if (popup_string)
+		free(popup_string);
+
+	popup_string = strndup(str, MH_LABEL_LENGTH_MAX);
+	if (popup_string == NULL)
+		ERR("strndup is failed\n");
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+void _prepare_popup_type(int type)
+{
+	popup_type = type;
+}
+
+static void __language_changed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	Evas_Object *label = NULL;
+	bool wifi_state = false;
+	char *fmt = NULL;
+	char str[MH_LABEL_LENGTH_MAX];
+
+	if (ad->type < TETHERING_TYPE_USB || ad->type > TETHERING_TYPE_BT ) {
+		ERR("Invalid Tethering type\n");
+		return;
+	}
+
+	switch(ad->type) {
+	case TETHERING_TYPE_WIFI:
+		wifi_is_activated(&wifi_state);
+		_set_vconf_prev_wifi_state(wifi_state);
+		if (wifi_state == true || _is_wifi_direct_on() == true) {
+			fmt = STR_TETH_ON_DESC_1;
+		} else {
+			fmt = STR_TETH_ON_DESC_2;
+		}
+		snprintf(str, MH_LABEL_LENGTH_MAX, fmt, TETHERING_WIFI_MAX_CONNECTED_STA);
+		break;
+
+	case TETHERING_TYPE_BT:
+		snprintf(str, MH_LABEL_LENGTH_MAX, STR_TETH_ON_DESC_2, TETHERING_BT_MAX_CONNECTED_STA);
+		break;
+
+	case TETHERING_TYPE_USB:
+		snprintf(str, MH_LABEL_LENGTH_MAX, STR_TETH_ON_DESC_3);
+		break;
+	default:
+		break;
+	}
+
+	label = elm_label_add(ad->main.check_popup_ly);
+	elm_object_style_set(label, "popup/default");
+	elm_label_line_wrap_set(label, ELM_WRAP_MIXED);
+	elm_object_text_set(label, str);
+	evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, 0.0);
+	evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_show(label);
+	elm_object_part_content_set(ad->main.check_popup_ly, "elm.swallow.content", label);
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __popup_with_checkbox(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	Evas_Object *popup = NULL;
+	Evas_Object *yes_button = NULL;
+	Evas_Object *cancel_button = NULL;
+	Evas_Object *layout = NULL;
+	Evas_Object *label = NULL;
+	Evas_Object *check = NULL;
+
+	popup = elm_popup_add(ad->win);
+	ad->popup = popup;
+	switch (ad->type) {
+	case TETHERING_TYPE_WIFI:
+		elm_object_domain_translatable_part_text_set(popup, "title,text", PACKAGE,
+				"IDS_MOBILEAP_MBODY_WI_FI_TETHERING");
+		break;
+	case TETHERING_TYPE_BT:
+		elm_object_domain_translatable_part_text_set(popup, "title,text", PACKAGE,
+				"IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING");
+		break;
+	case TETHERING_TYPE_USB:
+		elm_object_domain_translatable_part_text_set(popup, "title,text", PACKAGE,
+				"IDS_MOBILEAP_MBODY_USB_TETHERING");
+		break;
+	default:
+		break;
+	}
+
+	/* layout */
+	layout = elm_layout_add(popup);
+	elm_layout_file_set(layout, FILE_PATH_OF_EDC, "popup_checkview_layout");
+	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	ad->main.check_popup_ly = layout;
+
+	/* check */
+	check = elm_check_add(popup);
+	elm_object_style_set(check, "popup");
+	elm_object_domain_translatable_text_set(check, PACKAGE, STR_NO_SHOW_AGAIN);
+	evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	elm_object_part_content_set(layout, "elm.swallow.end", check);
+	ad->popup_checkbox = check;
+
+	/* label */
+	label = elm_label_add(layout);
+	elm_object_style_set(label, "popup/default");
+	elm_label_line_wrap_set(label, ELM_WRAP_MIXED);
+	elm_object_text_set(label, popup_string);
+	evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, 0.0);
+	evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_show(label);
+	elm_object_part_content_set(layout, "elm.swallow.content", label);
+
+	cancel_button = _create_button(popup,  "IDS_BR_SK_CANCEL",
+				"button1", __popup_no_btn_clicked_cb, ad);
+	yes_button = _create_button(popup, "IDS_ST_BUTTON_ENABLE_M_USE",
+				"button2", __popup_yes_btn_clicked_cb, ad);
+
+	evas_object_smart_callback_add(popup, "language,changed", __language_changed_cb, ad);
+
+	ea_object_event_callback_add(popup, EA_CALLBACK_BACK,
+			__popup_no_btn_clicked_cb, (void *)ad);
+
+	evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP,
+			__popup_no_btn_mouse_event_cb, (void *)ad);
+
+	elm_object_focus_next_object_set(check, yes_button, ELM_FOCUS_PREVIOUS);
+	elm_object_focus_next_object_set(cancel_button, check, ELM_FOCUS_PREVIOUS);
+
+	elm_object_focus_next_object_set(yes_button, check, ELM_FOCUS_NEXT);
+	elm_object_focus_next_object_set(check ,cancel_button, ELM_FOCUS_NEXT);
+
+	elm_object_content_set(popup, layout);
+	evas_object_show(popup);
+	ad->popup = popup;
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+Eina_Bool _create_popup(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	Evas_Object *popup = NULL;
+	Evas_Object *cancel_button = NULL;
+	Evas_Object *yes_button = NULL;
+	Evas_Object *label = NULL;
+
+	if (ad == NULL) {
+		ERR("The param is NULL\n");
+		if (popup_string) {
+			free(popup_string);
+			popup_string = NULL;
+		}
+		popup_content = NULL;
+
+		return EINA_FALSE;
+	}
+
+	if (ad->popup != NULL) {
+		evas_object_del(ad->popup);
+		ad->popup = NULL;
+	}
+	ad->popup_checkbox = NULL;
+	DBG("popup type : %d", popup_type);
+
+	switch (popup_type) {
+	case MH_POPUP_WIFI_ON_CHECKBOX:
+	case MH_POPUP_BT_ON_CHECKBOX:
+	case MH_POPUP_USB_ON_CHECKBOX:
+		__popup_with_checkbox(ad);
+		break;
+
+	case MH_POPUP_WIFI_OFF:
+		popup = elm_popup_add(ad->win);
+		ad->popup = popup;
+
+		elm_object_domain_translatable_part_text_set(popup, "title,text", PACKAGE,
+				"IDS_MOBILEAP_MBODY_WI_FI_TETHERING");
+
+		evas_object_size_hint_weight_set(popup,
+				EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+		if (popup_content == NULL)
+			elm_object_domain_translatable_text_set(popup, PACKAGE, popup_string);
+		else
+			elm_object_content_set(popup, popup_content);
+
+		cancel_button =_create_button(popup, STR_CANCEL,
+				"button1", __popup_no_btn_clicked_cb, ad);
+		yes_button = _create_button(popup, STR_TURN_OFF,
+				"button2", __popup_yes_btn_clicked_cb, ad);
+
+		ea_object_event_callback_add(popup, EA_CALLBACK_BACK,
+				__popup_no_btn_clicked_cb, (void *)ad);
+		evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP,
+				__popup_no_btn_mouse_event_cb, (void *)ad);
+
+		evas_object_show(popup);
+		break;
+
+	case MH_POPUP_TETH_ENABLING_FAILED:
+	case MH_POPUP_NO_SIM:
+	case MH_POPUP_FLIGHT_MODE:
+	case MH_POPUP_NETWORK_OUT_OF_RANGE:
+	case MH_POPUP_MOBILE_DATA_OFF:
+		popup = elm_popup_add(ad->win);
+		ad->popup = popup;
+		evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
+				EVAS_HINT_EXPAND);
+
+		if (popup_content == NULL)
+			elm_object_domain_translatable_text_set(popup, PACKAGE, popup_string);
+		else
+			elm_object_content_set(popup, popup_content);
+		elm_object_domain_translatable_part_text_set(popup, "title,text", PACKAGE,
+				STR_NO_NET_CONN);
+		cancel_button = _create_button(popup,  STR_CANCEL,
+				"button1", __popup_no_btn_clicked_cb, ad);
+
+		ea_object_event_callback_add(popup, EA_CALLBACK_BACK,
+				__popup_no_btn_clicked_cb, (void *)ad);
+		evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP,
+				__popup_no_btn_mouse_event_cb, (void *)ad);
+
+		evas_object_show(popup);
+		break;
+
+	case MH_POPUP_WIFI_AP_OFF:
+		popup = elm_popup_add(ad->win);
+		ad->popup = popup;
+		evas_object_size_hint_weight_set(popup,
+				EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+		elm_object_domain_translatable_part_text_set(popup, "title,text", PACKAGE,
+				STR_TETH);
+		if (popup_content == NULL)
+			elm_object_domain_translatable_text_set(popup, PACKAGE, popup_string);
+		else
+			elm_object_content_set(popup, popup_content);
+
+		cancel_button = _create_button(popup,  STR_CANCEL,
+				"button1", __popup_no_btn_clicked_cb, ad);
+		yes_button = _create_button(popup, STR_ENABLE,
+				"button2", __popup_yes_btn_clicked_cb, ad);
+
+		ea_object_event_callback_add(popup, EA_CALLBACK_BACK,
+				__popup_no_btn_clicked_cb, (void *)ad);
+		evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP,
+				__popup_no_btn_mouse_event_cb, (void *)ad);
+
+		evas_object_show(popup);
+		break;
+
+	default:
+		ERR("Unknown popup_type : %d\n", popup_type);
+		break;
+	}
+
+	elm_object_focus_next_object_set(cancel_button, yes_button, ELM_FOCUS_PREVIOUS);
+	elm_object_focus_next_object_set(yes_button, cancel_button, ELM_FOCUS_NEXT);
+
+	if (popup_string) {
+		free(popup_string);
+		popup_string = NULL;
+	}
+	popup_content = NULL;
+
+	__MOBILE_AP_FUNC_EXIT__;
+
+	return EINA_TRUE;
+}
+
+void _destroy_popup(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (ad == NULL) {
+		ERR("ad is null\n");
+		return;
+	}
+
+	if (ad->popup) {
+		evas_object_del(ad->popup);
+		ad->popup = NULL;
+	}
+	ad->popup_checkbox = NULL;
+
+	if (popup_string) {
+		free(popup_string);
+		popup_string = NULL;
+	}
+	popup_content = NULL;
+	popup_type = MH_POPUP_NONE;
+
+	__MOBILE_AP_FUNC_EXIT__;
+
+	return;
+}
diff --git a/src/mh_view_main.c b/src/mh_view_main.c
index 61e5ac4..771e24d 100644
--- a/src/mh_view_main.c
+++ b/src/mh_view_main.c
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,141 +18,66 @@
 */
 
 #include <time.h>
+#include <limits.h>
 #include <efl_assist.h>
 
 #include "mh_view_main.h"
+#include "mh_popup.h"
+#include "mh_string.h"
 
-// #define SK_BACK_SUPPORT
+static void __ctx_move_more_ctxpopup(Evas_Object *ctx, mh_appdata_t *ad);
+static void __ctx_delete_more_ctxpopup_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static Eina_Bool rotate_flag = EINA_FALSE;
+void _genlist_update_device_item(mh_appdata_t *ad);
+mh_appdata_t *g_ad = NULL;
+#define UPDATE_INTERVAL 1
 
-static void _gl_device_item_sel(void *data, Evas_Object *obj, void *event_info);
-static void _gl_exp(void *data, Evas_Object *obj, void *event_info);
-static void _gl_con(void *data, Evas_Object *obj, void *event_info);
-
-static bool _connected_clients_cb(tethering_client_h client, void *user_data)
+void _rotate_adjust_rename_popup(void)
 {
-	if (user_data == NULL) {
-		ERR("user_data is NULL\n");
-		return true;
-	}
-
-	mh_appdata_t *ad = (mh_appdata_t *)user_data;
-	int i = ad->clients.number++;
+	__MOBILE_AP_FUNC_ENTER__;
 
-	tethering_client_clone(&(ad->clients.handle[i]), client);
+	int change_ang = 0;
 
-	return true;
+	change_ang = elm_win_rotation_get(g_ad->win);
+	if (change_ang == 0 || change_ang == 180) {
+		_hadnle_rename_popup_rotation(EINA_TRUE);
+	} else {
+		_hadnle_rename_popup_rotation(EINA_FALSE);
+	}
+	__MOBILE_AP_FUNC_EXIT__;
 }
 
-static void __genlist_update_device_subitem(mh_appdata_t *ad)
+void _select_connected_dev(void *data, Evas_Object *obj, void *event_info)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
-	if (ad == NULL) {
-		ERR("Invalid param\n");
+	if (data == NULL) {
+		ERR("data is NULL\n");
 		return;
 	}
 
-	Elm_Object_Item *item = NULL;
-	tethering_type_e connection_type = 0;
-	int i;
-
-	for (i = 0; i < ad->clients.number; i++) {
-		tethering_client_get_tethering_type(ad->clients.handle[i], &connection_type);
-
-		item = elm_genlist_item_append(ad->main.genlist,
-				ad->main.dev_itc[connection_type],
-				(void *)ad->clients.handle[i],
-				ad->main.device_item, ELM_GENLIST_ITEM_NONE,
-				NULL, NULL);
-		if (item == NULL) {
-			ERR("elm_genlist_item_append is failed\n");
-			continue;
-		}
-
-		elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-	}
+	mh_appdata_t *ad = (mh_appdata_t *)data;
 
+	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+	_create_connected_client_view(ad);
 	__MOBILE_AP_FUNC_EXIT__;
-
-	return;
 }
 
-static void __genlist_update_device_item(mh_appdata_t *ad, int no_of_dev)
+static bool _connected_clients_cb(tethering_client_h client, void *user_data)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
-	if (ad == NULL) {
-		ERR("Invalid param\n");
-		return;
-	}
-
-	Elm_Object_Item *item = NULL;
-	const Elm_Genlist_Item_Class *itc = NULL;
-	Elm_Genlist_Item_Type item_flags = ELM_GENLIST_ITEM_NONE;
-	Eina_Bool expanded = EINA_FALSE;
-
-	if (ad->main.device_item != NULL) {
-		itc = elm_genlist_item_item_class_get(ad->main.device_item);
-		if (itc == NULL) {
-			ERR("itc is NULL\n");
-			return;
-		}
-
-		if ((itc == ad->main.device0_itc && no_of_dev == 0) ||
-				(itc == ad->main.device_itc && no_of_dev > 0)) {
-			DBG("No need to change genlist item flags\n");
-			elm_genlist_item_update(ad->main.device_item);
-
-			expanded = elm_genlist_item_expanded_get(ad->main.device_item);
-			if (expanded == EINA_TRUE) {
-				elm_genlist_item_subitems_clear(ad->main.device_item);
-				__genlist_update_device_subitem(ad);
-			}
-
-			return;
-		}
-
-		elm_genlist_item_subitems_clear(ad->main.device_item);
-		elm_object_item_del(ad->main.device_item);
-		ad->main.device_item = NULL;
-	}
-
-	if (no_of_dev == 0) {
-		itc = ad->main.device0_itc;
-		item_flags = ELM_GENLIST_ITEM_NONE;
-	} else if (no_of_dev > 0) {
-		itc = ad->main.device_itc;
-		item_flags = ELM_GENLIST_ITEM_TREE;
-	}
-
-	item = elm_genlist_item_insert_before(ad->main.genlist,
-			itc, ad, NULL, ad->main.usage_item, item_flags,
-			_gl_device_item_sel, NULL);
-	if (item == NULL) {
-		ERR("elm_genlist_item_insert_before is failed.\n");
-		return;
+	if (user_data == NULL) {
+		ERR("user_data is NULL\n");
+		return true;
 	}
-	elm_object_item_signal_emit(item, "elm,state,top", "");
 
-	ad->main.device_item = item;
+	mh_appdata_t *ad = (mh_appdata_t *)user_data;
 
-	if (no_of_dev == 0) {
-		elm_genlist_item_select_mode_set(item,
-				ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-		evas_object_smart_callback_del(ad->main.genlist, "expanded",
-				_gl_exp);
-		evas_object_smart_callback_del(ad->main.genlist, "contracted",
-				_gl_con);
-	} else if (no_of_dev > 0) {
-		evas_object_smart_callback_add(ad->main.genlist, "expanded",
-				_gl_exp, ad);
-		evas_object_smart_callback_add(ad->main.genlist, "contracted",
-				_gl_con, ad);
-	}
+	_append_list_client_handle(ad, client);
 
 	__MOBILE_AP_FUNC_EXIT__;
-
-	return;
+	return true;
 }
 
 void ap_update_data_device(mh_appdata_t *ad)
@@ -164,40 +89,23 @@ void ap_update_data_device(mh_appdata_t *ad)
 		return;
 	}
 
-	int i;
-
-	if (ad->clients.number > 0) {
-		for (i = 0; i < ad->clients.number; i++) {
-			if (!ad->clients.handle[i])
-				continue;
-
-			tethering_client_destroy(ad->clients.handle[i]);
-			ad->clients.handle[i] = NULL;
-		}
-	}
-	ad->clients.number = 0;
-
-	tethering_foreach_connected_clients(ad->handle, TETHERING_TYPE_ALL,
-			_connected_clients_cb, (void *)ad);
-	__genlist_update_device_item(ad, ad->clients.number);
+	_genlist_update_device_item(ad);
 
 	__MOBILE_AP_FUNC_EXIT__;
 }
 
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 Eina_Bool ap_update_data_packet_usage(mh_appdata_t *ad)
 {
 	if (ad == NULL) {
 		ERR("Invalid param\n");
 		return EINA_FALSE;
 	}
-
 	if (ad->main.usage_item == NULL) {
-		DBG("usage_item is removed\n");
 		return EINA_TRUE;
 	}
 
 	elm_genlist_item_update(ad->main.usage_item);
-
 	return EINA_TRUE;
 }
 
@@ -210,14 +118,14 @@ Eina_Bool ap_get_data_statistics(void *data)
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 
 	if (ad->main.hotspot_mode == VCONFKEY_MOBILE_HOTSPOT_MODE_NONE) {
-		DBG("Mobile hotspot is turned off.\n");
 		ad->update_statistics_handle = NULL;
 		return ECORE_CALLBACK_CANCEL;
 	}
 
 	/* If previous data is not updated, new data is not required */
-	if (ad->data_statistics.is_updated == false)
+	if (ad->data_statistics.is_updated == false) {
 		return ECORE_CALLBACK_RENEW;
+	}
 
 	/* Because previous data is updated, new data is required.
 	   It will be returned asynchronously. */
@@ -226,7 +134,67 @@ Eina_Bool ap_get_data_statistics(void *data)
 
 	return ECORE_CALLBACK_RENEW;
 }
+#endif
+
+Eina_Bool ap_update_device_conn_time(void * data)
+{
+	if (!data) {
+		ERR("The param is NULL\n");
+		return ECORE_CALLBACK_CANCEL;
+	}
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+
+	int count = 0;
+	if (ad->main.hotspot_mode == VCONFKEY_MOBILE_HOTSPOT_MODE_NONE) {
+		_stop_update_device_conn_time(ad);
+		__MOBILE_AP_FUNC_EXIT__;
+		return ECORE_CALLBACK_CANCEL;
+	}
+
+	while (count < ad->connected_device.no_of_clients) {
+		if (ad->connected_device.station_items[count])
+			elm_genlist_item_fields_update(ad->connected_device.station_items[count++],
+					"elm.text.sub.left.bottom", ELM_GENLIST_ITEM_FIELD_TEXT);
+	}
+	return ECORE_CALLBACK_RENEW;
+}
+
+void _start_update_device_conn_time(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (ad == NULL) {
+		ERR("Invalid param\n");
+		__MOBILE_AP_FUNC_EXIT__;
+		return;
+	}
+
+	if (ad->update_conn_time_handle) {
+		_stop_update_device_conn_time(ad);
+	}
+	ad->update_conn_time_handle = ecore_timer_add(UPDATE_INTERVAL,
+			ap_update_device_conn_time, (void *)ad);
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+void _stop_update_device_conn_time(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (ad == NULL) {
+		ERR("Invalid param\n");
+		return;
+	}
+
+	if (ad->update_conn_time_handle) {
+		ecore_timer_del(ad->update_conn_time_handle);
+		ad->update_conn_time_handle = NULL;
+	}
+	__MOBILE_AP_FUNC_EXIT__;
+}
 
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 void _start_update_data_packet_usage(mh_appdata_t *ad)
 {
 	__MOBILE_AP_FUNC_ENTER__;
@@ -237,7 +205,6 @@ void _start_update_data_packet_usage(mh_appdata_t *ad)
 	}
 
 	if (ad->update_statistics_handle) {
-		DBG("update_statistics_handle is not NULL.\n");
 		_stop_update_data_packet_usage(ad);
 	}
 
@@ -268,6 +235,7 @@ void _stop_update_data_packet_usage(mh_appdata_t *ad)
 	__MOBILE_AP_FUNC_EXIT__;
 	return;
 }
+#endif
 
 static void __read_setting(mh_appdata_t *ad)
 {
@@ -281,20 +249,17 @@ static void __read_setting(mh_appdata_t *ad)
 	int ret = 0;
 	char *ssid = NULL;
 	char *passphrase = NULL;
+	bool visibility;
+	tethering_wifi_security_type_e type;
 
 	ad->main.hotspot_mode = _get_vconf_hotspot_mode();
 
-	ret = vconf_get_int(VCONFKEY_MOBILE_HOTSPOT_CONNECTED_DEVICE,
-			&ad->clients.number);
-	if (ret != 0) {
-		ERR("vconf_get_int is failed\n");
-		ad->clients.number = 0;
-	}
-
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 	ad->data_statistics.pdp_total_sent = 0;
 	ad->data_statistics.pdp_total_receive = 0;
 	if (ad->main.hotspot_mode != VCONFKEY_MOBILE_HOTSPOT_MODE_NONE)
 		tethering_get_data_usage(ad->handle, _data_usage_cb, (void *)ad);
+#endif
 
 	ret = tethering_wifi_get_ssid(ad->handle, &ssid);
 	if (ret != TETHERING_ERROR_NONE || ssid == NULL) {
@@ -309,22 +274,26 @@ static void __read_setting(mh_appdata_t *ad)
 		ERR("tethering_wifi_get_passphrase is failed : %d\n", ret);
 		return;
 	}
+
 	g_strlcpy(ad->setup.wifi_passphrase, passphrase,
 			sizeof(ad->setup.wifi_passphrase));
 	g_strlcpy(ad->setup.wifi_passphrase_new, passphrase,
 			sizeof(ad->setup.wifi_passphrase_new));
 	free(passphrase);
 
-	ret = tethering_wifi_get_ssid_visibility(ad->handle, &ad->setup.visibility);
+	ret = tethering_wifi_get_ssid_visibility(ad->handle, &visibility);
 	if (ret != TETHERING_ERROR_NONE) {
 		ERR("tethering_wifi_get_ssid_visibility is failed\n");
 	}
+	ad->setup.visibility = visibility;
+	ad->setup.visibility_new = visibility;
 
-	ret = tethering_wifi_get_security_type(ad->handle, &ad->setup.security_type);
+	ret = tethering_wifi_get_security_type(ad->handle, &type);
 	if (ret != TETHERING_ERROR_NONE) {
 		ERR("tethering_wifi_get_security_type is failed\n");
 	}
-	DBG("End of Load setting value \n");
+	ad->setup.security_type = type;
+	ad->setup.security_type_new = type;
 
 	__MOBILE_AP_FUNC_EXIT__;
 }
@@ -334,18 +303,15 @@ void _update_wifi_item(mh_appdata_t *ad, int wifi_state)
 	__MOBILE_AP_FUNC_ENTER__;
 
 	if (ad->main.wifi_state == wifi_state) {
-		DBG("aready updated\n");
 		return;
 	}
 
 	if (ad->main.wifi_state == MH_STATE_PROCESS) {
 		ad->main.wifi_state = MH_STATE_NONE;
 		elm_genlist_item_select_mode_set(ad->main.wifi_item, ELM_OBJECT_SELECT_MODE_DEFAULT);
-		elm_object_item_disabled_set(ad->main.setup_item, EINA_FALSE);
 	} else if (ad->main.wifi_state == MH_STATE_NONE) {
 		ad->main.wifi_state = MH_STATE_PROCESS;
 		elm_genlist_item_select_mode_set(ad->main.wifi_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-		elm_object_item_disabled_set(ad->main.setup_item, EINA_TRUE);
 	}
 
 	elm_genlist_item_update(ad->main.wifi_item);
@@ -361,7 +327,6 @@ void _update_bt_item(mh_appdata_t *ad, int bt_state)
 	__MOBILE_AP_FUNC_ENTER__;
 
 	if (ad->main.bt_state == bt_state) {
-		DBG("aready updated\n");
 		return;
 	}
 
@@ -385,7 +350,6 @@ void _update_usb_item(mh_appdata_t *ad, int usb_state)
 	__MOBILE_AP_FUNC_ENTER__;
 
 	if (ad->main.usb_state == usb_state) {
-		DBG("aready updated\n");
 		return;
 	}
 
@@ -404,7 +368,44 @@ void _update_usb_item(mh_appdata_t *ad, int usb_state)
 	return;
 }
 
-void _update_main_view(mh_appdata_t *ad)
+void _genlist_update_device_item(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (ad == NULL) {
+		ERR("Invalid param\n");
+		return;
+	}
+	unsigned int no_of_dev = 0;
+	no_of_dev = _get_list_clients_count(ad);
+	Elm_Object_Item *item = NULL;
+
+	if (ad->main.device_item) {
+		elm_object_item_del(ad->main.device_item);
+		ad->main.device_item = NULL;
+		if (no_of_dev == 0) {
+			item = elm_genlist_item_append(ad->main.genlist,
+					ad->main.device0_itc, ad, NULL,
+					ELM_GENLIST_ITEM_NONE, NULL, NULL);
+			elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+		} else {
+			item = elm_genlist_item_append(ad->main.genlist,
+					ad->main.device_itc, ad, NULL,
+					ELM_GENLIST_ITEM_NONE, _select_connected_dev, (void *)ad);
+			elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DEFAULT);
+		}
+		ad->main.device_item = item;
+	}
+
+	if (ad->connected_device.navi_it) {
+		_update_conn_clients(ad);
+	}
+
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
+
+void _update_main_view(mh_appdata_t *ad, tethering_type_e type)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
@@ -417,7 +418,10 @@ void _update_main_view(mh_appdata_t *ad)
 	Eina_Bool wifi_state = EINA_FALSE;
 	Eina_Bool bt_state = EINA_FALSE;
 	Eina_Bool usb_state = EINA_FALSE;
+	Eina_Bool wifi_ap_state = EINA_FALSE;
 	Elm_Object_Item *item = NULL;
+	Evas_Object *obj;
+	int no_of_dev = 0;
 
 	ad->main.hotspot_mode = _get_vconf_hotspot_mode();
 	state = ad->main.hotspot_mode;
@@ -425,90 +429,135 @@ void _update_main_view(mh_appdata_t *ad)
 	wifi_state = (Eina_Bool)(state & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI);
 	bt_state = (Eina_Bool)(state & VCONFKEY_MOBILE_HOTSPOT_MODE_BT);
 	usb_state = (Eina_Bool)(state & VCONFKEY_MOBILE_HOTSPOT_MODE_USB);
-	DBG("wifi_state : %d, bt_state : %d, usb_state : %d\n",
-			wifi_state, bt_state, usb_state);
-
-	/* Update Wi-Fi tethering on / off button */
-	if (ad->main.wifi_state != MH_STATE_NONE) {
-		_update_wifi_item(ad, MH_STATE_NONE);
-	} else {
-		elm_check_state_set(ad->main.wifi_btn, wifi_state);
-	}
+	wifi_ap_state = (Eina_Bool)(state & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI_AP);
 
-	/* Update BT tethering on / off button */
-	if (ad->main.bt_state != MH_STATE_NONE) {
-		_update_bt_item(ad, MH_STATE_NONE);
-	} else {
-		elm_check_state_set(ad->main.bt_btn, bt_state);
-	}
-
-	/* Update USB tethering on / off button */
-	if (ad->main.usb_state != MH_STATE_NONE) {
-		_update_usb_item(ad, MH_STATE_NONE);
+	if (wifi_ap_state) {
+		elm_object_item_disabled_set(ad->main.wifi_item, EINA_TRUE);
+		elm_object_item_disabled_set(ad->main.setup_item, EINA_TRUE);
+		elm_object_item_disabled_set(ad->main.bt_item, EINA_TRUE);
+		elm_object_item_disabled_set(ad->main.usb_item, EINA_TRUE);
 	} else {
-		elm_check_state_set(ad->main.usb_btn, usb_state);
+		elm_object_item_disabled_set(ad->main.setup_item, EINA_FALSE);
+		elm_object_item_disabled_set(ad->main.bt_item, EINA_FALSE);
+		if (_get_vconf_usb_state() != VCONFKEY_SYSMAN_USB_AVAILABLE) {
+			elm_object_item_disabled_set(ad->main.usb_item, EINA_TRUE);
+		} else {
+			elm_object_item_disabled_set(ad->main.usb_item, EINA_FALSE);
+		}
 	}
 
 	if (wifi_state || bt_state || usb_state) {
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 		if (ad->main.usage_item == NULL) {
 			item = elm_genlist_item_insert_before(ad->main.genlist,
 					ad->main.usage_itc, ad, NULL,
-					ad->main.sp_item[3],
+					ad->main.sp_item[0],
 					ELM_GENLIST_ITEM_NONE, NULL, NULL);
 			elm_genlist_item_select_mode_set(item,
 					ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 			ad->main.usage_item = item;
 		}
+#endif
 
+		no_of_dev = _get_list_clients_count(ad);
 		if (ad->main.device_item == NULL) {
-			ap_update_data_device(ad);
+			if (no_of_dev == 0) {
+				item = elm_genlist_item_append(ad->main.genlist,
+						ad->main.device0_itc, ad, NULL,
+						ELM_GENLIST_ITEM_NONE, NULL, NULL);
+				elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+			} else {
+				item = elm_genlist_item_append(ad->main.genlist,
+						ad->main.device_itc, ad, NULL,
+						ELM_GENLIST_ITEM_NONE, _select_connected_dev, (void *)ad);
+				elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DEFAULT);
+			}
+			ad->main.device_item = item;
 		}
-
-		_start_update_data_packet_usage(ad);
 	} else {
-		_stop_update_data_packet_usage(ad);
-
 		if (ad->main.device_item) {
-			elm_genlist_item_subitems_clear(ad->main.device_item);
 			elm_object_item_del(ad->main.device_item);
 			ad->main.device_item = NULL;
 		}
-
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 		if (ad->main.usage_item) {
 			elm_object_item_del(ad->main.usage_item);
 			ad->main.usage_item = NULL;
 		}
+#endif
 	}
 
-	if (wifi_state || bt_state) {
+	if (wifi_state) {
 		if (ad->main.help_item) {
-			DBG("Just update help label item\n");
 			elm_genlist_item_update(ad->main.help_item);
-			return;
 		} else {
-			DBG("Add help item\n");
 			item = elm_genlist_item_insert_after(ad->main.genlist,
 					ad->main.help_itc, ad, NULL,
-					ad->main.usb_item,
+					ad->main.wifi_item,
 					ELM_GENLIST_ITEM_NONE, NULL,
 					NULL);
 			if (item == NULL) {
 				ERR("elm_genlist_item_insert_after NULL\n");
-				return;
+			} else {
+				elm_genlist_item_select_mode_set(item,
+						ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+				ad->main.help_item = item;
 			}
-			elm_genlist_item_select_mode_set(item,
-					ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-			ad->main.help_item = item;
 		}
 	} else {
 		if (ad->main.help_item) {
-			DBG("Remove help item\n");
 			elm_object_item_del(ad->main.help_item);
 			ad->main.help_item = NULL;
 		}
 	}
 
+	switch (type) {
+	case TETHERING_TYPE_WIFI:
+		/* Update Wi-Fi tethering on / off button */
+		if (ad->main.wifi_state != MH_STATE_NONE) {
+			_update_wifi_item(ad, MH_STATE_NONE);
+		} else {
+			obj = elm_object_item_part_content_get(ad->main.wifi_item, "elm.icon.2");
+			if (obj != NULL) {
+				elm_check_state_set(obj, wifi_state);
+			}
+			elm_genlist_item_update(ad->main.wifi_item);
+		}
+		break;
+
+	case TETHERING_TYPE_BT:
+		/* Update BT tethering on / off button */
+		if (ad->main.bt_state != MH_STATE_NONE) {
+			_update_bt_item(ad, MH_STATE_NONE);
+		} else {
+			obj = elm_object_item_part_content_get(ad->main.bt_item, "elm.icon.2");
+			if (obj != NULL) {
+				elm_check_state_set(obj, bt_state);
+			}
+			elm_genlist_item_update(ad->main.bt_item);
+		}
+		break;
+
+	case TETHERING_TYPE_USB:
+		/* Update USB tethering on / off button */
+		if (ad->main.usb_state != MH_STATE_NONE) {
+			_update_usb_item(ad, MH_STATE_NONE);
+		} else {
+			obj = elm_object_item_part_content_get(ad->main.usb_item, "elm.icon.2");
+			if (obj != NULL)
+				elm_check_state_set(obj, usb_state);
+			elm_genlist_item_update(ad->main.usb_item);
+		}
+		break;
+
+	default:
+		DBG("Unknown tethering type : %d\n", type);
+		break;
+	}
+
 	__MOBILE_AP_FUNC_EXIT__;
+
+	return;
 }
 
 static void __wifi_onoff_changed_cb(void *data, Evas_Object *obj,
@@ -524,10 +573,12 @@ static void __wifi_onoff_changed_cb(void *data, Evas_Object *obj,
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 
 	_update_wifi_item(ad, MH_STATE_PROCESS);
-
+	ad->type = TETHERING_TYPE_WIFI;
+	ad->is_wifi_teth_enabling = true;
 	if (_handle_wifi_onoff_change(ad) != 0) {
 		ERR("_handle_wifi_onoff_change is failed\n");
 		_update_wifi_item(ad, MH_STATE_NONE);
+		ad->is_wifi_teth_enabling = false;
 	}
 
 	__MOBILE_AP_FUNC_EXIT__;
@@ -543,60 +594,10 @@ static void __select_wifi_item(void *data, Evas_Object *obj, void *event_info)
 		ERR("The param is NULL\n");
 		return;
 	}
-
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
-
-	__wifi_onoff_changed_cb(data, ad->main.wifi_btn, NULL);
-
-	__MOBILE_AP_FUNC_EXIT__;
-
-	return;
-}
-
-static void __select_setup_item(void *data, Evas_Object *obj, void *event_info)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-	int connected_wifi_clients = 0;
-	int ret = 0;
-
-	if (data == NULL) {
-		ERR("The param is NULL\n");
-		return;
-	}
-
-	elm_genlist_item_selected_set(item, EINA_FALSE);
-
-	if (tethering_is_enabled(ad->handle, TETHERING_TYPE_WIFI) == false) {
-		mh_draw_wifi_setup_view(ad);
-		return;
-	}
-
-	DBG("Wi-Fi tethering is on\n");
-	if (_get_no_of_connected_device(ad->handle, &connected_wifi_clients,
-				TETHERING_TYPE_WIFI) == FALSE) {
-		ERR("Getting the number of connected device is failed\n");
-	}
-
-	if (connected_wifi_clients > 0) {
-		_prepare_popup(MH_POP_ENTER_TO_WIFI_SETUP_CONF,
-				_("IDS_MOBILEAP_POP_CONNECTED_DEVICE_WILL_BE_DISCONNECTED"));
-		_create_popup(ad);
-	} else {
-		_update_wifi_item(ad, MH_STATE_PROCESS);
-		ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI);
-		if (ret != TETHERING_ERROR_NONE) {
-			ERR("Wi-Fi tethering off is failed : %d\n", ret);
-			_update_wifi_item(ad, MH_STATE_NONE);
-		} else
-			ad->main.need_recover_wifi_tethering = true;
-
-		mh_draw_wifi_setup_view(ad);
-	}
+	mh_draw_wifi_setup_view(ad);
 
 	__MOBILE_AP_FUNC_EXIT__;
 
@@ -615,10 +616,13 @@ static void __bt_onoff_changed_cb(void *data, Evas_Object *obj, void *event_info
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 
 	_update_bt_item(ad, MH_STATE_PROCESS);
+	ad->type = TETHERING_TYPE_BT;
+	ad->is_bt_teth_enabling = true;
 
 	if (_handle_bt_onoff_change(ad) != 0) {
 		ERR("_handle_bt_onoff_change is failed\n");
 		_update_bt_item(ad, MH_STATE_NONE);
+		ad->is_bt_teth_enabling = false;
 	}
 
 	__MOBILE_AP_FUNC_EXIT__;
@@ -630,8 +634,8 @@ static void __select_bt_item(void *data, Evas_Object *obj, void *event_info)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
+	Evas_Object *content;
 	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-	mh_appdata_t *ad = (mh_appdata_t *)data;
 
 	if (data == NULL) {
 		ERR("The param is NULL\n");
@@ -640,7 +644,8 @@ static void __select_bt_item(void *data, Evas_Object *obj, void *event_info)
 
 	elm_genlist_item_selected_set(item, EINA_FALSE);
 
-	__bt_onoff_changed_cb(data, ad->main.bt_btn, NULL);
+	content = elm_object_item_part_content_get(item, "elm.icon");
+	__bt_onoff_changed_cb(data, content, NULL);
 
 	__MOBILE_AP_FUNC_EXIT__;
 
@@ -657,11 +662,13 @@ static void __usb_onoff_changed_cb(void *data, Evas_Object *obj, void *event_inf
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t *)data;
-
 	_update_usb_item(ad, MH_STATE_PROCESS);
+	ad->type = TETHERING_TYPE_USB;
+	ad->is_usb_teth_enabling = true;
 	if (_handle_usb_onoff_change(ad) != 0) {
 		ERR("_handle_usb_onoff_change is failed\n");
 		_update_usb_item(ad, MH_STATE_NONE);
+		ad->is_usb_teth_enabling = false;
 	}
 
 	__MOBILE_AP_FUNC_EXIT__;
@@ -673,8 +680,8 @@ static void __select_usb_item(void *data, Evas_Object *obj, void *event_info)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
+	Evas_Object *content;
 	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-	mh_appdata_t *ad = (mh_appdata_t *)data;
 
 	if (data == NULL) {
 		ERR("The param is NULL\n");
@@ -683,69 +690,68 @@ static void __select_usb_item(void *data, Evas_Object *obj, void *event_info)
 
 	elm_genlist_item_selected_set(item, EINA_FALSE);
 
-	__usb_onoff_changed_cb(data, ad->main.usb_btn, NULL);
+	content = elm_object_item_part_content_get(item, "elm.icon");
+	__usb_onoff_changed_cb(data, content, NULL);
 
 	__MOBILE_AP_FUNC_EXIT__;
 
 	return;
 }
 
-static void __back_btn_cb(void *data, Evas_Object *obj, void *event_info)
+static Eina_Bool __back_btn_cb(void *data, Elm_Object_Item *navi_item)
 {
-	__MOBILE_AP_FUNC_ENTER__;
+	INFO("+\n");
 
 	if (data == NULL) {
 		ERR("The param is NULL\n");
-		return;
+		return EINA_FALSE;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t*)data;
 
+	_release_list_client_handle(ad);
+	_main_callback_del(ad);
+
 	ug_destroy_me(((mh_ugdata_t *)ad->gadget)->ug);
 
-	__MOBILE_AP_FUNC_EXIT__;
+	INFO("-\n");
+	return EINA_FALSE;
 }
 
 static char *__get_wifi_label(void *data, Evas_Object *obj, const char *part)
 {
-	if (strcmp(part, "elm.text") != 0) {
-		DBG("Unknown part : %s\n", part);
+
+	if (strcmp(part, "elm.text.main.left") != 0) {
 		return NULL;
 	}
 
-	return strdup(_("IDS_MOBILEAP_MBODY_WI_FI_TETHERING"));
+	return strdup(STR_WIFI_TETH);
 }
 
 static Evas_Object *__get_wifi_icon(void *data, Evas_Object *obj,
 		const char *part)
 {
-	__MOBILE_AP_FUNC_ENTER__;
-
 	if (data == NULL) {
 		ERR("The param is NULL\n");
 		return NULL;
 	}
 
-	if (strcmp(part, "elm.icon") != 0) {
-		DBG("Unknown part : %s\n", part);
+	if (strcmp(part, "elm.icon.2") != 0) {
 		return NULL;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t*)data;
 	Evas_Object *btn = NULL;
 	Evas_Object *progressbar = NULL;
+	Evas_Object *icon_layout = NULL;
+
+	icon_layout = elm_layout_add(obj);
+	elm_layout_theme_set(icon_layout, "layout", "list/C/type.3", "default");
 
 	if (ad->main.wifi_state == MH_STATE_PROCESS) {
-		progressbar = elm_progressbar_add(obj);
-		if (progressbar == NULL) {
-			ERR("progressbar is NULL\n");
-			return NULL;
-		}
-		elm_object_style_set(progressbar, "list_process");
-		elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
-		elm_progressbar_pulse(progressbar, EINA_TRUE);
-		evas_object_show(progressbar);
-		ad->main.wifi_btn = progressbar;
+		progressbar = _create_progressbar(obj, "process_medium");
+		elm_layout_content_set(icon_layout, "elm.swallow.content", progressbar);
+		return icon_layout;
 	} else {
 		btn = elm_check_add(obj);
 		elm_object_style_set(btn, "on&off");
@@ -758,49 +764,29 @@ static Evas_Object *__get_wifi_icon(void *data, Evas_Object *obj,
 
 		evas_object_smart_callback_add(btn, "changed", __wifi_onoff_changed_cb,
 				ad);
-		ad->main.wifi_btn = btn;
+		elm_layout_content_set(icon_layout, "elm.swallow.content", btn);
+		return icon_layout;
 	}
-
-	__MOBILE_AP_FUNC_EXIT__;
-	return ad->main.wifi_btn;
-}
-
-static char *__get_setup_label(void *data, Evas_Object *obj, const char *part)
-{
-	if (data == NULL) {
-
-		ERR("The param is NULL\n");
-		return NULL;
-	}
-
-	if (strcmp(part, "elm.text") != 0) {
-		DBG("Unknown part : %s\n", part);
-		return NULL;
-	}
-
-	return strdup(_("IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"));
 }
 
 static char *__get_bt_label(void *data, Evas_Object *obj, const char *part)
 {
-	if (strcmp(part, "elm.text") != 0) {
-		DBG("Unknown part : %s\n", part);
+
+	if (strcmp(part, "elm.text.main.left") != 0) {
 		return NULL;
 	}
 
-	return strdup(_("IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING"));
+	return strdup(STR_BLUETOOTH_TETH);
 }
 
 static Evas_Object *__get_bt_icon(void *data, Evas_Object *obj, const char *part)
 {
-	__MOBILE_AP_FUNC_ENTER__;
-
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	Evas_Object *btn = NULL;
 	Evas_Object *progressbar = NULL;
+	Evas_Object *icon_layout = NULL;
 
-	if (strcmp(part, "elm.icon") != 0) {
-		DBG("Unknown part : %s\n", part);
+	if (strcmp(part, "elm.icon.2") != 0) {
 		return NULL;
 	}
 
@@ -809,18 +795,13 @@ static Evas_Object *__get_bt_icon(void *data, Evas_Object *obj, const char *part
 		return NULL;
 	}
 
-	ad->main.bt_btn = NULL;
+	icon_layout = elm_layout_add(obj);
+	elm_layout_theme_set(icon_layout, "layout", "list/C/type.3", "default");
+
 	if (ad->main.bt_state == MH_STATE_PROCESS) {
-		progressbar = elm_progressbar_add(obj);
-		if (progressbar == NULL) {
-			ERR("progressbar is NULL\n");
-			return NULL;
-		}
-		elm_object_style_set(progressbar, "list_process");
-		elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
-		elm_progressbar_pulse(progressbar, EINA_TRUE);
-		evas_object_show(progressbar);
-		ad->main.bt_btn = progressbar;
+		progressbar = _create_progressbar(obj, "process_medium");
+		elm_layout_content_set(icon_layout, "elm.swallow.content", progressbar);
+		return icon_layout;
 	} else {
 		btn = elm_check_add(obj);
 		if (btn == NULL) {
@@ -835,35 +816,29 @@ static Evas_Object *__get_bt_icon(void *data, Evas_Object *obj, const char *part
 		evas_object_show(btn);
 		evas_object_smart_callback_add(btn, "changed", __bt_onoff_changed_cb,
 				ad);
-		ad->main.bt_btn = btn;
+		elm_layout_content_set(icon_layout, "elm.swallow.content", btn);
+		return icon_layout;
 	}
-
-	__MOBILE_AP_FUNC_EXIT__;
-
-	return ad->main.bt_btn;
 }
 
 static char *__get_usb_label(void *data, Evas_Object *obj, const char *part)
 {
-	if (strcmp(part, "elm.text") != 0) {
-		DBG("Unknown part : %s\n", part);
+	if (strcmp(part, "elm.text.main.left") != 0) {
 		return NULL;
 	}
 
-	return strdup(_("IDS_MOBILEAP_MBODY_USB_TETHERING"));
+	return strdup(STR_USB_TETH);
 }
 
 static Evas_Object *__get_usb_icon(void *data, Evas_Object *obj,
 							const char *part)
 {
-	__MOBILE_AP_FUNC_ENTER__;
-
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	Evas_Object *btn = NULL;
 	Evas_Object *progressbar = NULL;
+	Evas_Object *icon_layout = NULL;
 
-	if (strcmp(part, "elm.icon") != 0) {
-		DBG("Unknown part : %s\n", part);
+	if (strcmp(part, "elm.icon.2") != 0) {
 		return NULL;
 	}
 
@@ -871,19 +846,13 @@ static Evas_Object *__get_usb_icon(void *data, Evas_Object *obj,
 		ERR("The param is NULL\n");
 		return NULL;
 	}
+	icon_layout = elm_layout_add(obj);
+	elm_layout_theme_set(icon_layout, "layout", "list/C/type.3", "default");
 
-	ad->main.usb_btn = NULL;
 	if (ad->main.usb_state == MH_STATE_PROCESS) {
-		progressbar = elm_progressbar_add(obj);
-		if (progressbar == NULL) {
-			ERR("progressbar is NULL\n");
-			return NULL;
-		}
-		elm_object_style_set(progressbar, "list_process");
-		elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
-		elm_progressbar_pulse(progressbar, EINA_TRUE);
-		evas_object_show(progressbar);
-		ad->main.usb_btn = progressbar;
+		progressbar = _create_progressbar(obj, "process_medium");
+		elm_layout_content_set(icon_layout, "elm.swallow.content", progressbar);
+		return icon_layout;
 	} else {
 		btn = elm_check_add(obj);
 		if (btn == NULL) {
@@ -898,28 +867,25 @@ static Evas_Object *__get_usb_icon(void *data, Evas_Object *obj,
 		evas_object_show(btn);
 		evas_object_smart_callback_add(btn, "changed", __usb_onoff_changed_cb,
 				ad);
-		ad->main.usb_btn = btn;
-	}
+		elm_layout_content_set(icon_layout, "elm.swallow.content", btn);
+		return icon_layout;
 
-	__MOBILE_AP_FUNC_EXIT__;
-
-	return ad->main.usb_btn;
+	}
 }
 
 static char *__get_help_label(void *data, Evas_Object *obj, const char *part)
 {
-	__MOBILE_AP_FUNC_ENTER__;
-
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	char buf[MH_LABEL_LENGTH_MAX] = {0, };
 	char device_name[MH_LABEL_LENGTH_MAX] = {0, };
 	char passphrase[MH_LABEL_LENGTH_MAX] = {0, };
+	char security_type[MH_LABEL_LENGTH_MAX] = {0, };
 	char *hidden = "";
 	char *ptr = NULL;
+	char *device_name_utf = NULL;
 	int wifi_state = VCONFKEY_MOBILE_HOTSPOT_MODE_NONE;
 
-	if (strcmp(part, "elm.text") != 0) {
-		DBG("Unknown part : %s\n", part);
+	if (strcmp(part, "elm.text.multiline") != 0) {
 		return NULL;
 	}
 
@@ -928,14 +894,23 @@ static char *__get_help_label(void *data, Evas_Object *obj, const char *part)
 		return NULL;
 	}
 
-	ptr = elm_entry_utf8_to_markup(ad->setup.device_name);
+	device_name_utf = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+	if (device_name_utf == NULL) {
+		ERR("vconf_get_str failed \n");
+		return NULL;
+	}
+	ptr = elm_entry_utf8_to_markup(device_name_utf);
 	if (ptr == NULL) {
+		g_free(device_name_utf);
 		ERR("elm_entry_utf8_to_markup is failed\n");
 		return NULL;
 	}
+	g_strlcpy(ad->setup.device_name, ptr,
+			sizeof(ad->setup.device_name));
 	g_strlcpy(device_name, ptr, MH_LABEL_LENGTH_MAX);
-	free(ptr);
-
+	g_free(device_name_utf);
+	g_free(ptr);
+	ptr = NULL;
 	if (ad->setup.security_type != TETHERING_WIFI_SECURITY_TYPE_NONE) {
 		ptr = elm_entry_utf8_to_markup(ad->setup.wifi_passphrase);
 		if (ptr == NULL) {
@@ -943,48 +918,50 @@ static char *__get_help_label(void *data, Evas_Object *obj, const char *part)
 			return NULL;
 		}
 		g_strlcpy(passphrase, ptr, MH_LABEL_LENGTH_MAX);
-		free(ptr);
+		g_free(ptr);
+
+		snprintf(security_type, sizeof(security_type),
+				STR_SECURITY_TYPE_PS, "WPA2 PSK");
 	}
 
 	wifi_state = ad->main.hotspot_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI;
 
 	if (wifi_state && ad->setup.visibility == false)
-		hidden = _("IDS_MOBILEAP_BODY_WI_FI_TETHERING_HIDDEN");
+		hidden = STR_WIFI_TETH_HIDDEN;
 
 	if (wifi_state && ad->setup.security_type != TETHERING_WIFI_SECURITY_TYPE_NONE) {
 		snprintf(buf, MH_LABEL_LENGTH_MAX,
 				"%s: %s<br>"
-				"%s: %s<br><br>"
-				"%s"
-				"%s"
+				"%s: %s<br>"
+				"%s<br>"
+				"%s%s"
 				"%s",
-				_("IDS_MOBILEAP_BODY_DEVICE_NAME"),
+				STR_DEV_NAME,
 				device_name,
-				_("IDS_MOBILEAP_BODY_PASSWORD"),
+				STR_PASSWORD,
 				passphrase,
-				_("IDS_MOBILEAP_BODY_THIS_PASSWORD_IS_ONLY_FOR_WI_FI_TETHERING"),
+				security_type,
+				STR_PASSWORD_FOR_WIFI_TETH,
 				hidden[0] != '\0' ? "<br>" : "",
 				hidden);
-
 	} else {
 		snprintf(buf, MH_LABEL_LENGTH_MAX,
-				"%s : %s%s%s",
-				_("IDS_MOBILEAP_BODY_DEVICE_NAME"),
+				"%s : %s%s"
+				"%s",
+				STR_DEV_NAME,
 				device_name,
 				hidden[0] != '\0' ? "<br>" : "",
 				hidden);
 	}
 
-	__MOBILE_AP_FUNC_EXIT__;
-
 	return strdup(buf);
 }
 
-static char *__get_connected_device_label(void *data, Evas_Object *obj,
+static char *__get_no_connected_device_label(void *data, Evas_Object *obj,
 							const char *part)
 {
-	if (strcmp(part, "elm.text.1") != 0 && strcmp(part, "elm.text.2") != 0) {
-		DBG("Unknown part : %s\n", part);
+
+	if (strcmp(part, "elm.text.multiline") != 0) {
 		return NULL;
 	}
 
@@ -993,246 +970,105 @@ static char *__get_connected_device_label(void *data, Evas_Object *obj,
 		return NULL;
 	}
 
-	mh_appdata_t *ad = (mh_appdata_t*)data;
 	char buf[MH_LABEL_LENGTH_MAX] = {0, };
+	int no_of_dev;
+	mh_appdata_t *ad = (mh_appdata_t*)data;
 
-	if (strcmp(part, "elm.text.1") != 0)
-		snprintf(buf, MH_LABEL_LENGTH_MAX, "%d",
-				ad->clients.number);
-	else if (strcmp(part, "elm.text.2") != 0)
-		g_strlcpy(buf, _("IDS_MOBILEAP_BODY_CONNECTED_DEVICE"),
-				sizeof(buf));
-
+	no_of_dev = _get_list_clients_count(ad);
+	snprintf(buf, sizeof(buf), "%s<br>%d", STR_CONNECTED_DEV, no_of_dev);
 	return strdup(buf);
 }
 
-static char *__get_usage_label(void *data, Evas_Object *obj, const char *part)
+static char *__get_connected_device_label(void *data, Evas_Object *obj,
+							const char *part)
 {
+
 	if (data == NULL) {
 		ERR("The param is NULL\n");
 		return NULL;
 	}
 
-	if (strcmp(part, "elm.text.1") != 0 && strcmp(part, "elm.text.2") != 0)	{
-		DBG("Unknown part : %s\n", part);
+	if (strcmp(part, "elm.text.multiline") != 0 && strcmp(part, "elm.text.sub") != 0)	{
 		return NULL;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t*)data;
-	int sent = 0;
-	int received = 0;
-	char *sent_str = NULL;
-	char *received_str = NULL;
-	char fmt[MH_LABEL_LENGTH_MAX] = {0, };
-	char label[MH_LABEL_LENGTH_MAX] = {0, };
-
-	if (strcmp(part, "elm.text.1") != 0 ) {
-		sent = ad->data_statistics.pdp_total_sent;
-		received = ad->data_statistics.pdp_total_receive;
-
-		if (sent >= MH_MB) {
-			sent /= MH_MB;
-			sent_str =  _("IDS_MOBILEAP_BODY_PD_MB");
-		} else if (sent >= MH_KB) {
-			sent /= MH_KB;
-			sent_str =  _("IDS_MOBILEAP_BODY_PD_KB");
-		} else {
-			sent_str =  _("IDS_MOBILEAP_BODY_PD_BYTES");
-		}
-
-		if (received >= MH_MB) {
-			received /= MH_MB;
-			received_str =  _("IDS_MOBILEAP_BODY_PD_MB");
-		} else if (received >= MH_KB) {
-			received /= MH_KB;
-			received_str =  _("IDS_MOBILEAP_BODY_PD_KB");
-		} else {
-			received_str =  _("IDS_MOBILEAP_BODY_PD_BYTES");
-		}
-
-		snprintf(fmt, sizeof(fmt), "%s %s / %s %s",
-				_("IDS_MOBILEAP_BODY_SENT_C"),
-				sent_str,
-				_("IDS_MOBILEAP_BODY_RECEIVED_C"),
-				received_str);
-		snprintf(label, sizeof(label), fmt, sent, received);
-	} else if (strcmp(part, "elm.text.2") != 0)
-		g_strlcpy(label, _("IDS_MOBILEAP_MBODY_DATA_USAGE"),
-				sizeof(label));
-
-	return strdup(label);
-}
-
-static char *__get_diff_time(time_t connection_time)
-{
-	time_t current_time;
 	char buf[MH_LABEL_LENGTH_MAX] = {0, };
-	int day;
-	int hour;
-	int min;
-	int sec;
-	double diff;
-
-	time(&current_time);
-	diff = difftime(current_time, connection_time);
-	day = diff / (60 * 60 * 24);
-	diff = diff - (day * 60 * 60 * 24);
-	hour = diff / (60 * 60);
-	diff = diff - (hour * 60 * 60);
-	min = diff / 60;
-	diff = diff - (min * 60);
-	sec = diff;
-
-	if (day > 0)
-		hour = hour + day * 24;
-
-	if (hour > 0)
-		snprintf(buf, sizeof(buf), "%02d : %02d : %02d", hour, min, sec);
-	else
-		snprintf(buf, sizeof(buf), "%02d : %02d", min, sec);
-
-        return g_strdup(buf);
-}
+	int no_of_dev;
 
-static char *__gl_get_dev_label(void *data, Evas_Object *obj, const char *part)
-{
-	if (data == NULL || part == NULL) {
-		ERR("Invalid param\n");
-		return NULL;
-	}
-
-	tethering_client_h client = (tethering_client_h)data;
-	char *name = NULL;
-	time_t tm;
-
-	if (!strcmp(part, "elm.text.1")) {
-		tethering_client_get_name(client, &name);
-		DBG("Device name : %s\n", name);
+	no_of_dev = _get_list_clients_count(ad);
 
-		if (!strcmp(name, "UNKNOWN")) {
-			return strdup(S_("IDS_COM_BODY_NO_NAME"));
-		}
-
-		return name;
-	} else if (!strcmp(part, "elm.text.2")) {
-		tethering_client_get_time(client, &tm);
-		return __get_diff_time(tm);
+	if (!strcmp(part, "elm.text.sub")) {
+		g_strlcpy(buf, STR_CONNECTED_DEV,
+							sizeof(buf));
 	}
 
-	return NULL;
-}
-
-static Evas_Object *__gl_get_dev_wifi_icon(void *data, Evas_Object *obj,
-							const char *part)
-{
-	Evas_Object *icon;
-
-	if (!strncmp(part, "elm.icon", 8)) {
-		icon = elm_icon_add(obj);
-		elm_image_file_set(icon, EDJDIR"/"TETHERING_IMAGES_EDJ, WIFI_ICON);
-		evas_object_size_hint_aspect_set(icon,
-				EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-		return icon;
-	}
-	return NULL;
-}
-
-static Evas_Object *__gl_get_dev_usb_icon(void *data, Evas_Object *obj,
-							const char *part)
-{
-	Evas_Object *icon;
-
-	if (!strncmp(part, "elm.icon", 8)) {
-		icon = elm_icon_add(obj);
-		elm_image_file_set(icon, EDJDIR"/"TETHERING_IMAGES_EDJ, USB_ICON);
-		evas_object_size_hint_aspect_set(icon,
-				EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-		return icon;
+	if (!strcmp(part, "elm.text.multiline")) {
+		snprintf(buf, MH_LABEL_LENGTH_MAX, "%d", no_of_dev);
 	}
-	return NULL;
-}
-
-static Evas_Object *__gl_get_dev_bt_icon(void *data, Evas_Object *obj,
-							const char *part)
-{
-	Evas_Object *icon;
 
-	if (!strncmp(part, "elm.icon", 8)) {
-		icon = elm_icon_add(obj);
-		elm_image_file_set(icon, EDJDIR"/"TETHERING_IMAGES_EDJ, BT_ICON);
-		evas_object_size_hint_aspect_set(icon,
-					EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-		return icon;
-	}
-	return NULL;
+	return strdup(buf);
 }
 
-static void _gl_exp(void *data, Evas_Object *obj, void *event_info)
+#ifdef TETHERING_DATA_USAGE_SUPPORT
+static char *__get_usage_label(void *data, Evas_Object *obj, const char *part)
 {
-	__MOBILE_AP_FUNC_ENTER__;
-
 	if (data == NULL) {
-		ERR("Invalid param\n");
-		return;
+		ERR("The param is NULL\n");
+		return NULL;
 	}
 
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-
-	ap_update_data_device(ad);
-
-	__MOBILE_AP_FUNC_EXIT__;
-}
-
-static void _gl_con(void *data, Evas_Object *obj, void *event_info)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	if (event_info == NULL) {
-		ERR("Invalid param\n");
-		return;
+	if (strcmp(part, "elm.text.multiline") != 0 && strcmp(part, "elm.text.sub") != 0)	{
+		return NULL;
 	}
 
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-
-	elm_genlist_item_subitems_clear(ad->main.device_item);
-
-	__MOBILE_AP_FUNC_EXIT__;
-}
-
-static void _gl_device_item_sel(void *data, Evas_Object *obj, void *event_info)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	Elm_Object_Item *item = (Elm_Object_Item*)event_info;
-
-	elm_genlist_item_selected_set(item, EINA_FALSE);
+	mh_appdata_t *ad = (mh_appdata_t*)data;
+	unsigned long long total = 0;
+	unsigned long long sent = 0;
+	unsigned long long received = 0;
+	char *fmt_str;
+	char buf[MH_LABEL_LENGTH_MAX] = {0, };
+	char label[MH_LABEL_LENGTH_MAX] = {0, };
 
-	Eina_Bool status = elm_genlist_item_expanded_get(item);
-	DBG("+ expand status:%d\n", status);
+	if (!strcmp(part, "elm.text.multiline")) {
+		sent = ad->data_statistics.pdp_total_sent;
+		received = ad->data_statistics.pdp_total_receive;
 
-	elm_genlist_item_expanded_set(item, !status);
+		if (sent >= MH_MB || received >= MH_MB) {
+			sent /= MH_MB;
+			received /= MH_MB;
 
-	__MOBILE_AP_FUNC_EXIT__;
+			total = sent + received;
+			fmt_str = STR_MB;
+		} else if (sent + received >= MH_MB) {
+			total = (sent + received) / MH_MB;
+			fmt_str = STR_MB;
+		} else if (sent >= MH_KB || received >= MH_KB) {
+			sent /= MH_KB;
+			received /= MH_KB;
 
-	return;
-}
+			total = sent + received;
+			fmt_str = STR_KB;
+		} else if (sent + received >= MH_KB) {
+			total = (sent + received) / MH_KB;
+			fmt_str = STR_KB;
+		} else {
+			total = sent + received;
+			fmt_str = STR_BYTE;
+		}
 
-static void __free_genlist_itc(mh_appdata_t *ad)
-{
-	elm_genlist_item_class_free(ad->main.sp_itc);
-	elm_genlist_item_class_free(ad->main.wifi_itc);
-	elm_genlist_item_class_free(ad->main.setup_itc);
-	elm_genlist_item_class_free(ad->main.bt_itc);
-	elm_genlist_item_class_free(ad->main.usb_itc);
-	elm_genlist_item_class_free(ad->main.help_itc);
-	elm_genlist_item_class_free(ad->main.device_itc);
-	elm_genlist_item_class_free(ad->main.device0_itc);
-	elm_genlist_item_class_free(ad->main.usage_itc);
-	elm_genlist_item_class_free(ad->main.dev_itc[TETHERING_TYPE_WIFI]);
-	elm_genlist_item_class_free(ad->main.dev_itc[TETHERING_TYPE_USB]);
-	elm_genlist_item_class_free(ad->main.dev_itc[TETHERING_TYPE_BT]);
-	return;
+		if (total > INT_MAX) {
+			ERR("data usage overflow\n");
+			total = 0;
+		}
+		snprintf(label, sizeof(buf), fmt_str, (int)total);
+	} else if (!strcmp(part, "elm.text.sub")) {
+		g_strlcpy(label, STR_DATA_USAGE,
+				sizeof(label));
+	}
+	return strdup(label);
 }
+#endif
 
 static void __set_genlist_itc(mh_appdata_t *ad)
 {
@@ -1245,44 +1081,37 @@ static void __set_genlist_itc(mh_appdata_t *ad)
 	ad->main.sp_itc->func.del = NULL;
 
 	ad->main.wifi_itc = elm_genlist_item_class_new();
-	ad->main.wifi_itc->item_style = "dialogue/1text.1icon";
+	ad->main.wifi_itc->item_style = "1line";
 	ad->main.wifi_itc->func.text_get = __get_wifi_label;
-	ad->main.wifi_itc->func.content_get = __get_wifi_icon;
+	ad->main.wifi_itc->func.content_get =  __get_wifi_icon;
 	ad->main.wifi_itc->func.state_get = NULL;
 	ad->main.wifi_itc->func.del = NULL;
 
-	ad->main.end_sp_itc = elm_genlist_item_class_new();
-	ad->main.end_sp_itc->item_style = "dialogue/separator";
-	ad->main.end_sp_itc->func.text_get = NULL;
-	ad->main.end_sp_itc->func.content_get = NULL;
-	ad->main.end_sp_itc->func.state_get = NULL;
-	ad->main.end_sp_itc->func.del = NULL;
+	ad->main.sp2_itc = elm_genlist_item_class_new();
+	ad->main.sp2_itc->item_style = "dialogue/separator.2";
+	ad->main.sp2_itc->func.text_get = NULL;
+	ad->main.sp2_itc->func.content_get = NULL;
+	ad->main.sp2_itc->func.state_get = NULL;
+	ad->main.sp2_itc->func.del = NULL;
 	/* End of On, Off view's item class for genlist */
 
 	/* Off view's item class for genlist */
-	ad->main.setup_itc = elm_genlist_item_class_new();
-	ad->main.setup_itc->item_style = "dialogue/1text";
-	ad->main.setup_itc->func.text_get = __get_setup_label;
-	ad->main.setup_itc->func.content_get = NULL;
-	ad->main.setup_itc->func.state_get = NULL;
-	ad->main.setup_itc->func.del = NULL;
-
 	ad->main.bt_itc = elm_genlist_item_class_new();
-	ad->main.bt_itc->item_style = "dialogue/1text.1icon";
+	ad->main.bt_itc->item_style = "1line";
 	ad->main.bt_itc->func.text_get = __get_bt_label;
 	ad->main.bt_itc->func.content_get = __get_bt_icon;
 	ad->main.bt_itc->func.state_get = NULL;
 	ad->main.bt_itc->func.del = NULL;
 
 	ad->main.usb_itc = elm_genlist_item_class_new();
-	ad->main.usb_itc->item_style = "dialogue/1text.1icon";
+	ad->main.usb_itc->item_style = "1line";
 	ad->main.usb_itc->func.text_get = __get_usb_label;
 	ad->main.usb_itc->func.content_get = __get_usb_icon;
 	ad->main.usb_itc->func.state_get = NULL;
 	ad->main.usb_itc->func.del = NULL;
 
 	ad->main.help_itc = elm_genlist_item_class_new();
-	ad->main.help_itc->item_style = "multiline/1text";
+	ad->main.help_itc->item_style = "multiline_sub";
 	ad->main.help_itc->func.text_get = __get_help_label;
 	ad->main.help_itc->func.content_get = NULL;
 	ad->main.help_itc->func.state_get = NULL;
@@ -1291,49 +1120,29 @@ static void __set_genlist_itc(mh_appdata_t *ad)
 	/* End of Off view's item class for genlist */
 
 	/* On view's item class for genlist */
+	ad->main.device0_itc = elm_genlist_item_class_new();
+	ad->main.device0_itc->item_style = "multiline_sub";
+	ad->main.device0_itc->func.text_get = __get_no_connected_device_label;
+	ad->main.device0_itc->func.content_get = NULL;
+	ad->main.device0_itc->func.state_get = NULL;
+	ad->main.device0_itc->func.del = NULL;
+
 	ad->main.device_itc = elm_genlist_item_class_new();
-	ad->main.device_itc->item_style = "dialogue/2text.3/expandable";
+	ad->main.device_itc->item_style = "multiline_main.sub";
 	ad->main.device_itc->func.text_get = __get_connected_device_label;
 	ad->main.device_itc->func.content_get = NULL;
 	ad->main.device_itc->func.state_get = NULL;
 	ad->main.device_itc->func.del = NULL;
 
-	ad->main.device0_itc = elm_genlist_item_class_new();
-	ad->main.device0_itc->item_style = "dialogue/2text.3";
-	ad->main.device0_itc->func.text_get = __get_connected_device_label;
-	ad->main.device0_itc->func.content_get = NULL;
-	ad->main.device0_itc->func.state_get = NULL;
-	ad->main.device0_itc->func.del = NULL;
-
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 	ad->main.usage_itc = elm_genlist_item_class_new();
-	ad->main.usage_itc->item_style = "dialogue/2text.3";
+	ad->main.usage_itc->item_style = "multiline_main.sub";
 	ad->main.usage_itc->func.text_get = __get_usage_label;
 	ad->main.usage_itc->func.content_get = NULL;
 	ad->main.usage_itc->func.state_get = NULL;
 	ad->main.usage_itc->func.del = NULL;
-
-	ad->main.dev_itc[TETHERING_TYPE_WIFI] = elm_genlist_item_class_new();
-	ad->main.dev_itc[TETHERING_TYPE_WIFI]->item_style = "dialogue/2text.1icon.2";
-	ad->main.dev_itc[TETHERING_TYPE_WIFI]->func.text_get = __gl_get_dev_label;
-	ad->main.dev_itc[TETHERING_TYPE_WIFI]->func.content_get = __gl_get_dev_wifi_icon;
-	ad->main.dev_itc[TETHERING_TYPE_WIFI]->func.state_get = NULL;
-	ad->main.dev_itc[TETHERING_TYPE_WIFI]->func.del = NULL;
-
-	ad->main.dev_itc[TETHERING_TYPE_USB] = elm_genlist_item_class_new();
-	ad->main.dev_itc[TETHERING_TYPE_USB]->item_style = "dialogue/2text.1icon.2";
-	ad->main.dev_itc[TETHERING_TYPE_USB]->func.text_get = __gl_get_dev_label;
-	ad->main.dev_itc[TETHERING_TYPE_USB]->func.content_get = __gl_get_dev_usb_icon;
-	ad->main.dev_itc[TETHERING_TYPE_USB]->func.state_get = NULL;
-	ad->main.dev_itc[TETHERING_TYPE_USB]->func.del = NULL;
-
-	ad->main.dev_itc[TETHERING_TYPE_BT] = elm_genlist_item_class_new();
-	ad->main.dev_itc[TETHERING_TYPE_BT]->item_style = "dialogue/2text.1icon.2";
-	ad->main.dev_itc[TETHERING_TYPE_BT]->func.text_get = __gl_get_dev_label;
-	ad->main.dev_itc[TETHERING_TYPE_BT]->func.content_get = __gl_get_dev_bt_icon;
-	ad->main.dev_itc[TETHERING_TYPE_BT]->func.state_get = NULL;
-	ad->main.dev_itc[TETHERING_TYPE_BT]->func.del = NULL;
+#endif
 	/* End of On view's item class for genlist */
-
 	return;
 }
 
@@ -1358,19 +1167,21 @@ static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
 				(elm_check_state_get(btn) ? "On" : "Off"));
 		elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, str);
 
-		if (item == ad->main.wifi_item || item == ad->main.bt_item)  {
+		if (item == ad->main.wifi_item || item == ad->main.bt_item) {
+			DBG("Wi-Fi or BT item : %p\n", item);
 			elm_object_item_signal_emit(item, "elm,state,top", "");
 		} else if (item == ad->main.usb_item) {
+			DBG("USB item\n");
 			elm_object_item_signal_emit(item, "elm,state,bottom", "");
 		}
 	} else if (item == ad->main.setup_item) {
+		DBG("setup_item\n");
 		ao = elm_object_item_access_object_get(item);
 		elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, "Item");
 
 		elm_object_item_signal_emit(item, "elm,state,bottom", "");
-	} else if (item == ad->main.usage_item) {
-		elm_object_item_signal_emit(item, "elm,state,bottom", "");
 	} else if (item == ad->main.device_item) {
+		DBG("device_item\n");
 		ao = elm_object_item_access_object_get(item);
 		snprintf(str, sizeof(str), "%s, %s", "Expandable list",
 				"Double tap to open list");
@@ -1378,7 +1189,8 @@ static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
 
 		elm_object_item_signal_emit(item, "elm,state,top", "");
 	} else if (ad->main.device_item != NULL &&
-			ad->main.device_item == elm_genlist_item_parent_get(item))  {
+			ad->main.device_item == elm_genlist_item_parent_get(item)) {
+		DBG("device_item's child\n");
 		elm_object_item_signal_emit(item, "elm,state,center", "");
 	} else {
 		for (i = 0; i < 4; i++) {
@@ -1386,7 +1198,12 @@ static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
 				elm_object_item_access_unregister(item);
 		}
 	}
-
+#ifdef TETHERING_DATA_USAGE_SUPPORT
+	if (item == ad->main.usage_item) {
+			DBG("usage_item\n");
+			elm_object_item_signal_emit(item, "elm,state,bottom", "");
+	}
+#endif
 	return;
 }
 
@@ -1395,7 +1212,7 @@ static void __create_inner_contents(mh_appdata_t *ad)
 	__MOBILE_AP_FUNC_ENTER__;
 
 	Elm_Object_Item *item = NULL;
-	int i = 0;
+	int no_of_dev = 0;
 
 	__read_setting(ad);
 	ad->main.genlist = elm_genlist_add(ad->naviframe);
@@ -1404,27 +1221,18 @@ static void __create_inner_contents(mh_appdata_t *ad)
 
 	__set_genlist_itc(ad);
 
-	/* separator */
-	item = elm_genlist_item_append(ad->main.genlist, ad->main.sp_itc, NULL,
-			NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-	elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-	ad->main.sp_item[i++] = item;
-
 	item = elm_genlist_item_append(ad->main.genlist, ad->main.wifi_itc,
 			ad, NULL, ELM_GENLIST_ITEM_NONE,
 			__select_wifi_item, ad);
 	ad->main.wifi_item = item;
 
-	item = elm_genlist_item_append(ad->main.genlist, ad->main.setup_itc,
-			ad, NULL, ELM_GENLIST_ITEM_NONE,
-			__select_setup_item, ad);
-	ad->main.setup_item = item;
-
-	/* separator */
-	item = elm_genlist_item_append(ad->main.genlist, ad->main.sp_itc, NULL,
-			NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-	elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-	ad->main.sp_item[i++] = item;
+	if (ad->main.hotspot_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI) {
+		item = elm_genlist_item_append(ad->main.genlist, ad->main.help_itc,
+				ad, NULL, ELM_GENLIST_ITEM_NONE,
+				NULL, NULL);
+		elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+		ad->main.help_item = item;
+	}
 
 	item = elm_genlist_item_append(ad->main.genlist, ad->main.bt_itc,
 			ad, NULL, ELM_GENLIST_ITEM_NONE,
@@ -1435,46 +1243,78 @@ static void __create_inner_contents(mh_appdata_t *ad)
 			ad, NULL, ELM_GENLIST_ITEM_NONE,
 			__select_usb_item, ad);
 	ad->main.usb_item = item;
-
-	if (ad->main.hotspot_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI ||
-			ad->main.hotspot_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_BT) {
-		item = elm_genlist_item_append(ad->main.genlist, ad->main.help_itc,
-				ad, NULL, ELM_GENLIST_ITEM_NONE,
-				NULL, NULL);
-		elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-		DBG("elm_genlist_item_append for help_itc : %x\n", item);
-		ad->main.help_item = item;
+	if (_get_vconf_usb_state() != VCONFKEY_SYSMAN_USB_AVAILABLE) {
+		elm_object_item_disabled_set(ad->main.usb_item, EINA_TRUE);
+	} else {
+		elm_object_item_disabled_set(ad->main.usb_item, EINA_FALSE);
 	}
-
-	/* separator */
-	item = elm_genlist_item_append(ad->main.genlist, ad->main.sp_itc, ad,
-			NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-	elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-	ad->main.sp_item[i++] = item;
-
-	if (ad->main.hotspot_mode != VCONFKEY_MOBILE_HOTSPOT_MODE_NONE) {
+	if (ad->main.hotspot_mode & (VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI |
+				VCONFKEY_MOBILE_HOTSPOT_MODE_USB |
+				VCONFKEY_MOBILE_HOTSPOT_MODE_BT)) {
+#ifdef TETHERING_DATA_USAGE_SUPPORT
 		item = elm_genlist_item_append(ad->main.genlist, ad->main.usage_itc,
 				ad, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 		elm_genlist_item_select_mode_set(item,
 				ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 		ad->main.usage_item = item;
-
+#endif
 		/* Insert "Connected devices" item */
-		ap_update_data_device(ad);
+		tethering_foreach_connected_clients(ad->handle, TETHERING_TYPE_ALL,
+				_connected_clients_cb, (void *)ad);
+
+		no_of_dev = _get_list_clients_count(ad);
+		if (no_of_dev == 0) {
+			item = elm_genlist_item_append(ad->main.genlist,
+						ad->main.device0_itc, ad, NULL,
+						ELM_GENLIST_ITEM_NONE, NULL, NULL);
+			elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+		} else {
+			item = elm_genlist_item_append(ad->main.genlist,
+						ad->main.device_itc, ad, NULL,
+						ELM_GENLIST_ITEM_NONE, _select_connected_dev, (void *)ad);
+			elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DEFAULT);
+		}
+		ad->main.device_item = item;
+	}
 
-		_start_update_data_packet_usage(ad);
+	if (ad->main.hotspot_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI_AP) {
+		elm_object_item_disabled_set(ad->main.wifi_item, EINA_TRUE);
+		elm_object_item_disabled_set(ad->main.setup_item, EINA_TRUE);
+		elm_object_item_disabled_set(ad->main.bt_item, EINA_TRUE);
+		elm_object_item_disabled_set(ad->main.usb_item, EINA_TRUE);
 	}
 
-	item = elm_genlist_item_append(ad->main.genlist, ad->main.end_sp_itc, NULL,
-			NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-	elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-	ad->main.sp_item[i++] = item;
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
+
+void _main_free_genlist_itc(mh_appdata_t *ad)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (ad == NULL)
+		return;
+
+	mh_main_view_t *mv = &ad->main;
+
+#ifdef TETHERING_DATA_USAGE_SUPPORT
+	_free_genlist_itc(&mv->usage_itc);
+#endif
+	_free_genlist_itc(&mv->device_itc);
+	_free_genlist_itc(&mv->device0_itc);
+	_free_genlist_itc(&mv->help_itc);
+	_free_genlist_itc(&mv->usb_itc);
+	_free_genlist_itc(&mv->bt_itc);
+	_free_genlist_itc(&mv->setup_itc);
+	_free_genlist_itc(&mv->sp2_itc);
+	_free_genlist_itc(&mv->wifi_itc);
+	_free_genlist_itc(&mv->sp_itc);
 
 	__MOBILE_AP_FUNC_EXIT__;
 	return;
 }
 
-void ap_callback_del(mh_appdata_t *ad)
+void _main_callback_del(mh_appdata_t *ad)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
@@ -1483,33 +1323,173 @@ void ap_callback_del(mh_appdata_t *ad)
 		return;
 	}
 
-	evas_object_smart_callback_del(ad->main.back_btn, "clicked",
-			__back_btn_cb);
-	evas_object_smart_callback_del(ad->main.wifi_btn, "changed",
-			__wifi_onoff_changed_cb);
-	evas_object_smart_callback_del(ad->main.bt_btn, "changed",
-			__bt_onoff_changed_cb);
-	evas_object_smart_callback_del(ad->main.usb_btn, "changed",
-			__usb_onoff_changed_cb);
+	Evas_Object *obj;
+
+	obj = elm_object_item_part_content_get(ad->main.wifi_item, "elm.icon.2");
+	if (obj != NULL)
+		evas_object_smart_callback_del(obj, "changed", __wifi_onoff_changed_cb);
+
+	obj = elm_object_item_part_content_get(ad->main.bt_item, "elm.icon.2");
+	if (obj != NULL)
+		evas_object_smart_callback_del(obj, "changed", __bt_onoff_changed_cb);
+
+	obj = elm_object_item_part_content_get(ad->main.usb_item, "elm.icon.2");
+	if (obj != NULL)
+		evas_object_smart_callback_del(obj, "changed", __usb_onoff_changed_cb);
 
-	evas_object_smart_callback_del(ad->main.genlist, "expanded", _gl_exp);
-	evas_object_smart_callback_del(ad->main.genlist, "contracted", _gl_con);
 	evas_object_smart_callback_del(ad->main.genlist, "realized", __gl_realized);
 
 	__MOBILE_AP_FUNC_EXIT__;
 }
 
-void ap_update_data_onoff(void* data)
+static void __ctx_move_more_ctxpopup(Evas_Object *ctx, mh_appdata_t *ad)
+{
+	Evas_Coord w;
+	Evas_Coord h;
+	int pos = -1;
+	__MOBILE_AP_FUNC_ENTER__;
+
+	elm_win_screen_size_get(ad->win, NULL, NULL, &w, &h);
+	pos = elm_win_rotation_get(ad->win);
+
+	switch (pos) {
+		case 0:
+		case 180:
+			evas_object_move(ctx, w/2, h);
+			break;
+		case 90:
+			evas_object_move(ctx, h/2, w);
+			break;
+		case 270:
+			evas_object_move(ctx, h/2, w);
+			break;
+	}
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __rotate_more_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	Evas_Object *ctx = ad->ctxpopup;
+
+	__ctx_move_more_ctxpopup(ctx, ad);
+	evas_object_show(ctx);
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __dismissed_more_ctxpopup_cb(void *data, Evas_Object *obj, void *event)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	Evas_Object *ctx = ad->ctxpopup;
+
+	if (!rotate_flag) {
+		evas_object_del(ctx);
+		ctx = NULL;
+	} else {
+		__ctx_move_more_ctxpopup(ctx, ad);
+		evas_object_show(ctx);
+		rotate_flag = EINA_FALSE;
+	}
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __ctx_delete_more_ctxpopup_cb(void *data, Evas *e, Evas_Object *obj,
+		void *event_info)
+{
+	Evas_Object *navi = (Evas_Object *)data;
+	Evas_Object *ctx = obj;
+
+	if (navi == NULL) {
+		ERR("data is null\n");
+		return;
+	}
+	__MOBILE_AP_FUNC_ENTER__;
+
+	evas_object_smart_callback_del(ctx, "dismissed",
+			__dismissed_more_ctxpopup_cb);
+	evas_object_smart_callback_del(elm_object_top_widget_get(ctx),
+			"rotation,changed", __rotate_more_ctxpopup_cb);
+	evas_object_event_callback_del_full(ctx, EVAS_CALLBACK_DEL,
+			__ctx_delete_more_ctxpopup_cb, navi);
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+static void _gl_rename_device_sel(void *data, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+
+	if (ad == NULL) {
+		ERR("ad is null\n");
+		return;
+	}
+	evas_object_del(ad->ctxpopup);
+	ad->ctxpopup = NULL;
+
+	_create_rename_device_popup((void *)ad);
 	__MOBILE_AP_FUNC_EXIT__;
 }
 
-void ap_draw_contents(mh_appdata_t *ad)
+static void __create_ctxpopup_more_button(void *data, Evas_Object *obj,
+		void *event_info)
 {
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	Evas_Object *ctxpopup = NULL;
+
+	if (ad == NULL) {
+		ERR("ad is null\n");
+		return;
+	}
 	__MOBILE_AP_FUNC_ENTER__;
-#ifdef SK_BACK_SUPPORT
+
+	if (ad->setup.navi_it == NULL) {
+		return;
+	}
+
+	elm_naviframe_item_pop_cb_set(ad->setup.navi_it, _setting_back_btn_cb, (void *)ad);
+	ctxpopup = elm_ctxpopup_add(ad->naviframe);
+	elm_ctxpopup_auto_hide_disabled_set(ctxpopup, EINA_TRUE);
+
+	ea_object_event_callback_add(ctxpopup, EA_CALLBACK_BACK,
+			ea_ctxpopup_back_cb, ad);
+	ea_object_event_callback_add(ctxpopup, EA_CALLBACK_MORE,
+			ea_ctxpopup_back_cb, ad);
+	elm_object_style_set(ctxpopup, "more/default");
+	evas_object_smart_callback_add(ctxpopup, "dismissed",
+			__dismissed_more_ctxpopup_cb, ad);
+	evas_object_smart_callback_add(elm_object_top_widget_get(ctxpopup), "rotation,changed",
+			__rotate_more_ctxpopup_cb, ad);
+	evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_DEL,
+			__ctx_delete_more_ctxpopup_cb, ad->naviframe);
+
+	elm_ctxpopup_direction_priority_set(ctxpopup, ELM_CTXPOPUP_DIRECTION_UP,
+			ELM_CTXPOPUP_DIRECTION_DOWN,
+			ELM_CTXPOPUP_DIRECTION_UNKNOWN,
+			ELM_CTXPOPUP_DIRECTION_UNKNOWN);
+
+	__ctx_move_more_ctxpopup(ctxpopup, ad);
+	elm_ctxpopup_item_append(ctxpopup, STR_RENAME_DEVICE_HEADER,
+			NULL, _gl_rename_device_sel, ad);
+
+	evas_object_show(ctxpopup);
+
+	ad->ctxpopup = ctxpopup;
+
+	__MOBILE_AP_FUNC_EXIT__;
+}
+
+void _main_draw_contents(mh_appdata_t *ad)
+{
+	INFO("+\n");
+
+	Elm_Object_Item *navi_item;
+
 	__create_inner_contents(ad);
 
 	ad->main.back_btn = elm_button_add(ad->naviframe);
@@ -1521,28 +1501,20 @@ void ap_draw_contents(mh_appdata_t *ad)
 		}
 		return;
 	}
-
 	elm_object_style_set(ad->main.back_btn, "naviframe/back_btn/default");
-	evas_object_smart_callback_add(ad->main.back_btn, "clicked",
-			__back_btn_cb, ad);
-	elm_object_focus_allow_set(ad->main.back_btn, EINA_FALSE);
-
-	elm_naviframe_item_push(ad->naviframe,
-			_("IDS_MOBILEAP_BODY_TETHERING"),
-			ad->main.back_btn, NULL, ad->main.genlist, NULL);
-#else
-	Elm_Object_Item *navi_item;
 
-	__create_inner_contents(ad);
+	ea_object_event_callback_add(ad->naviframe, EA_CALLBACK_BACK,
+			ea_naviframe_back_cb, NULL);
+	ea_object_event_callback_add(ad->naviframe, EA_CALLBACK_MORE,
+			__create_ctxpopup_more_button, ad);
 
-	ea_object_event_callback_add(ad->naviframe, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL);
-
-	navi_item = elm_naviframe_item_push(ad->naviframe,
-			 _("IDS_MOBILEAP_BODY_TETHERING"),
-			 ad->main.back_btn, NULL, ad->main.genlist, NULL);
+	navi_item = elm_naviframe_item_push(ad->naviframe, IDS_TETH,
+				ad->main.back_btn, NULL, ad->main.genlist, NULL);
+	elm_object_item_domain_text_translatable_set(navi_item, PKGNAME, EINA_TRUE);
 
 	elm_naviframe_item_pop_cb_set(navi_item, __back_btn_cb, (void *)ad);
-#endif
-	__MOBILE_AP_FUNC_EXIT__;
+	ad->navi_item = navi_item;
+	g_ad = ad;
+	INFO("-\n");
 	return;
 }
diff --git a/src/mh_view_wifi_setup.c b/src/mh_view_wifi_setup.c
index ba30a57..fa6e48c 100644
--- a/src/mh_view_wifi_setup.c
+++ b/src/mh_view_wifi_setup.c
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,65 +16,52 @@
 * limitations under the License.
 *
 */
-#include <notification.h>
+#include <utilX.h>
+
+#include "mh_popup.h"
 #include "mh_view_wifi_setup.h"
+#include "mh_string.h"
 
-//#define SK_BACK_SUPPORT
-static void __back_btn_cb(void *data, Evas_Object *obj, void *event_info);
 static void __gl_realized(void *data, Evas_Object *obj, void *event_info);
+static void __cancel_btn_cb(void *data, Evas_Object *object, void *event_info);
+static void __save_btn_cb(void *data, Evas_Object *object, void *event_info);
 
-static void __input_panel_event_cb(void *data, Ecore_IMF_Context *ctx, int value)
+static void __hide_btn_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
-	if (data == NULL) {
-		ERR("data is NULL\n");
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (data == NULL || obj == NULL) {
+		ERR("Invalid param\n");
 		return;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t *)data;
-	mh_wifi_setting_view_t *st = &ad->setup;
-
-	ad->imf_state = value;
-
-	if (st->navi_it == NULL) {
-		DBG("naviframe item is not pushed yet\n");
-		return;
-	}
 
-	if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW &&
-			(ad->rotate_state == UG_EVENT_ROTATE_LANDSCAPE ||
-			 ad->rotate_state == UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN)) {
-		DBG("ECORE_IMF_INPUT_PANEL_STATE_SHOW and Landscape mode\n");
-		elm_naviframe_item_title_visible_set(st->navi_it, EINA_FALSE);
-	} else if (value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) {
-		DBG("ECORE_IMF_INPUT_PANEL_STATE_HIDE\n");
-		elm_naviframe_item_title_visible_set(st->navi_it, EINA_TRUE);
-	}
+	ad->setup.visibility_new = !ad->setup.visibility_new;
 
-	return;
+	__MOBILE_AP_FUNC_EXIT__;
 }
 
-static void __hide_btn_changed_cb(void *data, Evas_Object *obj, void *event_info)
+static bool __save_hide_btn_change(mh_appdata_t *ad)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
-	if (data == NULL || obj == NULL) {
+	if (ad == NULL) {
 		ERR("Invalid param\n");
-		return;
+		return false;
 	}
 
-	mh_appdata_t *ad = (mh_appdata_t *)data;
 	int ret = 0;
 
 	ret = tethering_wifi_set_ssid_visibility(ad->handle,
-			!ad->setup.visibility);
+			ad->setup.visibility_new);
 	if (ret != TETHERING_ERROR_NONE) {
 		ERR("tethering_wifi_set_ssid_visibility is failed : %d\n", ret);
-		return;
+		return false;
 	}
 
-	ad->setup.visibility = !ad->setup.visibility;
-
 	__MOBILE_AP_FUNC_EXIT__;
+	return true;
 }
 
 static void __security_btn_changed_cb(void *data, Evas_Object *obj, void *event_info)
@@ -87,61 +74,86 @@ static void __security_btn_changed_cb(void *data, Evas_Object *obj, void *event_
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t *)data;
-	int ret = 0;
+	mh_wifi_setting_view_t *st = &ad->setup;
 
-	if (ad->setup.security_type == TETHERING_WIFI_SECURITY_TYPE_NONE)
-		ad->setup.security_type = TETHERING_WIFI_SECURITY_TYPE_WPA2_PSK;
+	if (st->security_type_new == TETHERING_WIFI_SECURITY_TYPE_NONE)
+		st->security_type_new = TETHERING_WIFI_SECURITY_TYPE_WPA2_PSK;
 	else
-		ad->setup.security_type = TETHERING_WIFI_SECURITY_TYPE_NONE;
+		st->security_type_new = TETHERING_WIFI_SECURITY_TYPE_NONE;
 
-	ret = tethering_wifi_set_security_type(ad->handle, ad->setup.security_type);
-	if (ret != TETHERING_ERROR_NONE) {
-		ERR("tethering_wifi_set_security_type is failed : %d\n", ret);
-		return;
+	/* update wifi passphrase item */
+	if (st->security_type_new == TETHERING_WIFI_SECURITY_TYPE_NONE) {
+		elm_object_item_disabled_set(st->pw_item, EINA_TRUE);
+		elm_object_disabled_set(st->save_button, EINA_FALSE);
+	} else {
+		elm_object_item_disabled_set(st->pw_item, EINA_FALSE);
+		if (st->pw_entry == NULL || strlen(elm_entry_entry_get(st->pw_entry)) == 0)
+			elm_object_disabled_set(st->save_button, EINA_TRUE);
 	}
 
-	elm_genlist_item_update(ad->setup.pw_item);
+	elm_genlist_item_update(st->pw_item);
 
 	__MOBILE_AP_FUNC_EXIT__;
 }
 
-static char *__gl_hide_label_get(void *data, Evas_Object *obj, const char *part)
+static bool __save_security_btn_change(mh_appdata_t *ad)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
-	if (data == NULL || obj == NULL || part == NULL) {
+	if (ad == NULL) {
 		ERR("Invalid param\n");
-		return NULL;
+		return false;
 	}
 
-	if (strcmp(part, "elm.text") != 0) {
-		DBG("Unknown part : %s\n", part);
-		return NULL;
+	int ret = 0;
+
+	ret = tethering_wifi_set_security_type(ad->handle, ad->setup.security_type_new);
+	if (ret != TETHERING_ERROR_NONE) {
+		ERR("tethering_wifi_set_security_type is failed : %d\n", ret);
+		return false;
 	}
 
 	__MOBILE_AP_FUNC_EXIT__;
-	return strdup(_("IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"));
+	return true;
 }
 
-static char *__gl_security_label_get(void *data, Evas_Object *obj, const char *part)
+static char *__gl_device_name_title_label_get(void *data, Evas_Object *obj, const char *part)
 {
 	__MOBILE_AP_FUNC_ENTER__;
-
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	char *device_name_utf = NULL;
+	char *ptr = NULL;
 	if (data == NULL || obj == NULL || part == NULL) {
 		ERR("Invalid param\n");
 		return NULL;
 	}
 
-	if (strcmp(part, "elm.text") != 0) {
-		DBG("Unknown part : %s\n", part);
-		return NULL;
+	if (!strcmp(part, "elm.text.multiline")) {
+		device_name_utf = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+		if (device_name_utf == NULL) {
+			ERR("vconf_get_str failed \n");
+		}
+		ptr = elm_entry_utf8_to_markup(device_name_utf);
+		if (ptr == NULL) {
+			ERR("elm_entry_utf8_to_markup is failed\n");
+			free(device_name_utf);
+			return NULL;
+		}
+		g_strlcpy(ad->setup.device_name, ptr,
+				sizeof(ad->setup.device_name));
+		free(device_name_utf);
+		return ptr;
+	}
+
+	if (!strcmp(part, "elm.text.sub")) {
+		return strdup(STR_MY_DEVICE_NAME);
 	}
 
 	__MOBILE_AP_FUNC_EXIT__;
-	return strdup(_("IDS_MOBILEAP_BODY_SECURITY"));
+	return NULL;
 }
 
-static char *__gl_name_label_get(void *data, Evas_Object *obj, const char *part)
+static char *__gl_hide_label_get(void *data, Evas_Object *obj, const char *part)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
@@ -150,40 +162,29 @@ static char *__gl_name_label_get(void *data, Evas_Object *obj, const char *part)
 		return NULL;
 	}
 
-	if (strcmp(part, "elm.text") != 0) {
-		DBG("Unknown part : %s\n", part);
+	if (strcmp(part, "elm.text.main.left") != 0) {
 		return NULL;
 	}
 
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-	char label[MH_LABEL_LENGTH_MAX] = {0, };
-	char name_change_label[MH_LABEL_LENGTH_MAX] = {0, };
-	char path[MH_LABEL_LENGTH_MAX] = {0, };
-	char *device_name = NULL;
+	__MOBILE_AP_FUNC_EXIT__;
+	return strdup(STR_HIDE_MY_DEV);
+}
 
-	DBG("Device name : %s\n", ad->setup.device_name);
+static char *__gl_security_label_get(void *data, Evas_Object *obj, const char *part)
+{
+	__MOBILE_AP_FUNC_ENTER__;
 
-	device_name = elm_entry_utf8_to_markup(ad->setup.device_name);
-	if (device_name == NULL) {
-		ERR("elm_entry_utf8_to_markup is failed\n");
+	if (data == NULL || obj == NULL || part == NULL) {
+		ERR("Invalid param\n");
 		return NULL;
 	}
 
-	snprintf(path, sizeof(path), "%s > %s",
-			S_("IDS_COM_BODY_SETTINGS"),
-			_("IDS_ST_BODY_ABOUT_PHONE"));
-	snprintf(name_change_label, sizeof(name_change_label),
-			_("IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"),
-			path);
-	snprintf(label, sizeof(label), "%s: %s<br>%s",
-			_("IDS_MOBILEAP_BODY_DEVICE_NAME"),
-			device_name,
-			name_change_label);
-	free(device_name);
+	if (strcmp(part, "elm.text.main.left") != 0) {
+		return NULL;
+	}
 
 	__MOBILE_AP_FUNC_EXIT__;
-
-	return strdup(label);
+	return strdup(STR_SECURITY_TYPE);
 }
 
 static Evas_Object *__gl_hide_icon_get(void *data, Evas_Object *obj,
@@ -196,14 +197,16 @@ static Evas_Object *__gl_hide_icon_get(void *data, Evas_Object *obj,
 		return NULL;
 	}
 
-	if (strcmp(part, "elm.icon") != 0) {
-		DBG("Unknown part : %s\n", part);
+	if (strcmp(part, "elm.icon.2") != 0) {
 		return NULL;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	Evas_Object *btn = NULL;
+	Evas_Object *icon_layout = NULL;
 
+	icon_layout = elm_layout_add(obj);
+	elm_layout_theme_set(icon_layout, "layout", "list/C/type.3", "default");
 	btn = elm_check_add(obj);
 	if (btn == NULL) {
 		ERR("btn is NULL\n");
@@ -213,13 +216,16 @@ static Evas_Object *__gl_hide_icon_get(void *data, Evas_Object *obj,
 	evas_object_show(btn);
 	evas_object_pass_events_set(btn, EINA_TRUE);
 	evas_object_propagate_events_set(btn, EINA_FALSE);
-	elm_check_state_set(btn, ad->setup.visibility ? EINA_FALSE : EINA_TRUE);
+	elm_object_focus_allow_set(btn, EINA_FALSE);
+	elm_check_state_set(btn, ad->setup.visibility_new ? EINA_FALSE : EINA_TRUE);
 	evas_object_smart_callback_add(btn, "changed",
 			__hide_btn_changed_cb, (void *)ad);
+
 	ad->setup.hide_btn = btn;
 
+	elm_layout_content_set(icon_layout, "elm.swallow.content", btn);
 	__MOBILE_AP_FUNC_EXIT__;
-	return btn;
+	return icon_layout;
 }
 
 static Evas_Object *__gl_security_icon_get(void *data, Evas_Object *obj,
@@ -232,38 +238,41 @@ static Evas_Object *__gl_security_icon_get(void *data, Evas_Object *obj,
 		return NULL;
 	}
 
-	if (strcmp(part, "elm.icon") != 0) {
-		DBG("Unknown part : %s\n", part);
+	if (strcmp(part, "elm.icon.2") != 0) {
 		return NULL;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	Evas_Object *btn = NULL;
+	Evas_Object *icon_layout = NULL;
 
-	btn = elm_check_add(obj);
+	icon_layout = elm_layout_add(obj);
+	elm_layout_theme_set(icon_layout, "layout", "list/C/type.3", "default");
 
+	btn = elm_check_add(obj);
 	elm_object_style_set(btn, "on&off");
 	evas_object_show(btn);
 	evas_object_pass_events_set(btn, EINA_TRUE);
 	evas_object_propagate_events_set(btn, EINA_FALSE);
-	elm_check_state_set(btn, ad->setup.security_type ==
+	elm_check_state_set(btn, ad->setup.security_type_new ==
 			TETHERING_WIFI_SECURITY_TYPE_NONE ?
 			EINA_FALSE : EINA_TRUE);
 	evas_object_smart_callback_add(btn, "changed",
 			__security_btn_changed_cb, (void *)ad);
 	ad->setup.security_btn = btn;
 
+	elm_layout_content_set(icon_layout, "elm.swallow.content", btn);
 	__MOBILE_AP_FUNC_EXIT__;
-	return btn;
+	return icon_layout;
 }
 
-static Eina_Bool __save_wifi_passphrase(mh_appdata_t *ad)
+static bool __save_wifi_passphrase(mh_appdata_t *ad)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
 	if (ad == NULL) {
 		ERR("Invalid param\n");
-		return EINA_FALSE;
+		return false;
 	}
 
 	mh_wifi_setting_view_t *st = &ad->setup;
@@ -272,226 +281,235 @@ static Eina_Bool __save_wifi_passphrase(mh_appdata_t *ad)
 	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);
-		return EINA_FALSE;
-	}
-
-	g_strlcpy(st->wifi_passphrase, st->wifi_passphrase_new, sizeof(st->wifi_passphrase));
-
-	__MOBILE_AP_FUNC_EXIT__;
-
-	return EINA_TRUE;
-}
-
-static void __passphrase_maxlength_reached_cb(void *data, Evas_Object *obj,
-		void *event_info)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	if (data == NULL || obj == NULL) {
-		ERR("The param is NULL\n");
-		return;
-	}
-
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-	char buf[MH_LABEL_LENGTH_MAX] = {0, };
-	int ret;
-
-	ecore_imf_input_panel_hide();
-	elm_object_focus_set(ad->setup.pw_entry, EINA_FALSE);
-
-	if (__save_wifi_passphrase(ad) == EINA_FALSE) {
-		ERR("__save_wifi_passphrase is failed\n");
-	}
-
-	snprintf(buf, sizeof(buf),
-			_("IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"),
-			WIFI_PASSPHRASE_LENGTH_MIN, WIFI_PASSPHRASE_LENGTH_MAX);
-
-	ret = notification_status_message_post(buf);
-	if (ret != NOTIFICATION_ERROR_NONE)
-		ERR("notification_status_message_post() is failed : %d\n", ret);
-
-	__MOBILE_AP_FUNC_EXIT__;
-}
-
-static void __passphrase_activated_cb(void *data, Evas_Object *obj,
-		void *event_info)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	if (data == NULL || obj == NULL) {
-		ERR("Invalid param\n");
-		return;
-	}
-
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-	int ret;
-	char *ptr;
-
-	ecore_imf_input_panel_hide();
-	elm_object_focus_set(ad->setup.pw_entry, EINA_FALSE);
-
-	if (strlen(ad->setup.wifi_passphrase_new) < WIFI_PASSPHRASE_LENGTH_MIN) {
-		DBG("Password is shorter than %d\n", WIFI_PASSPHRASE_LENGTH_MIN);
-		ret = notification_status_message_post(_("IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"));
-		if (ret != NOTIFICATION_ERROR_NONE)
-			ERR("notification_status_message_post() is failed : %d\n", ret);
-
-		ptr = elm_entry_utf8_to_markup(ad->setup.wifi_passphrase);
-		if (ptr != NULL) {
-			elm_entry_entry_set(ad->setup.pw_entry, ptr);
-			free(ptr);
-		} else {
-			ERR("elm_entry_utf8_to_markup is failed\n");
-		}
-
-		return;
-	}
-
-	if (__save_wifi_passphrase(ad) == EINA_FALSE) {
-		ERR("__save_wifi_passphrase is failed\n");
+		return false;
 	}
 
 	__MOBILE_AP_FUNC_EXIT__;
-
-	return;
+	return true;
 }
 
 static void __pw_entry_changed_cb(void *data, Evas_Object *obj,
-		void *event_info)
+				void *event_info)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
-	if (data == NULL || obj == NULL) {
-		ERR("Invalid param\n");
-		return;
-	}
-
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	mh_wifi_setting_view_t *st = &ad->setup;
 	const char *changed_text;
 	char *utf8_string;
+	int len = 0;
 
-	changed_text = elm_entry_entry_get(st->pw_entry);
+	changed_text = elm_entry_entry_get(obj);
 	if (changed_text == NULL) {
 		ERR("elm_entry_entry_get is failed\n");
 		return;
 	}
 
 	utf8_string = elm_entry_markup_to_utf8(changed_text);
+
 	if (utf8_string == NULL) {
 		ERR("elm_entry_markup_to_utf8() Failed!!!\n");
 	} else {
+		len = strlen(utf8_string);
+		if (WIFI_PASSPHRASE_LENGTH_MIN <= len) {
+			elm_object_disabled_set(st->save_button, EINA_FALSE);
+			elm_entry_input_panel_return_key_disabled_set(obj, FALSE);
+		} else {
+			elm_object_disabled_set(st->save_button, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(obj, TRUE);
+		}
 		g_strlcpy(st->wifi_passphrase_new, utf8_string,
-				sizeof(st->wifi_passphrase_new));
+						sizeof(st->wifi_passphrase_new));
 		free(utf8_string);
+		utf8_string = NULL;
 	}
 
-	if (!elm_object_focus_get(st->pw_entry)) {
-		return;
-	}
-
-	if (elm_entry_is_empty(st->pw_entry)) {
-		elm_object_item_signal_emit(st->pw_item,
-				"elm,state,eraser,hide", "");
-	} else {
-		elm_object_item_signal_emit(st->pw_item,
-				"elm,state,eraser,show", "");
+	if (elm_object_part_content_get(obj, "elm.swallow.clear")) {
+		if (elm_object_focus_get(obj)) {
+			if (elm_entry_is_empty(obj))
+				elm_object_signal_emit(obj, "elm,state,clear,hidden", "");
+			else
+				elm_object_signal_emit(obj, "elm,state,clear,visible", "");
+		}
 	}
 
 	__MOBILE_AP_FUNC_EXIT__;
-
 	return;
-
 }
 
-static void __pw_entry_focused_cb(void *data, Evas_Object *obj,
+static void __pw_entry_maxlength_reached_cb(void *data, Evas_Object *obj,
 		void *event_info)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
-	if (data == NULL || obj == NULL) {
-		ERR("Invalid param\n");
+	if (obj == NULL) {
+		ERR("The param is NULL\n");
+		__MOBILE_AP_FUNC_EXIT__;
 		return;
 	}
+	char buf[MH_LABEL_LENGTH_MAX] = { 0, };
+	notification_error_e ret;
 
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-	mh_wifi_setting_view_t *st = &ad->setup;
+	snprintf(buf, sizeof(buf), STR_PASSWORD_MIN_MAX,
+			WIFI_PASSPHRASE_LENGTH_MIN, WIFI_PASSPHRASE_LENGTH_MAX);
 
-	if (!elm_entry_is_empty(st->pw_entry)) {
-		elm_entry_cursor_end_set(st->pw_entry);
-		elm_object_item_signal_emit(st->pw_item,
-				"elm,state,eraser,show", "");
+	ret = notification_status_message_post(buf);
+	if (ret != NOTIFICATION_ERROR_NONE) {
+		ERR("notification_status_message_post() is failed : %d\n", ret);
 	}
 
 	__MOBILE_AP_FUNC_EXIT__;
-
-	return;
-
 }
 
-static void __pw_entry_unfocused_cb(void *data, Evas_Object *obj,
-		void *event_info)
+static void __pw_entry_activated_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
-	if (data == NULL || obj == NULL) {
-		ERR("Invalid param\n");
+	if (obj == NULL) {
+		ERR("Invalid parameter");
 		return;
 	}
 
-	mh_appdata_t *ad = (mh_appdata_t *)data;
-	mh_wifi_setting_view_t *st = &ad->setup;
+	elm_object_focus_set(obj, EINA_FALSE);
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
 
-	elm_object_item_signal_emit(st->pw_item,
-			"elm,state,eraser,hide", "");
+static void __pw_entry_focused_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	if (elm_object_part_content_get(obj, "elm.swallow.clear")) {
+		if (!elm_entry_is_empty(obj))
+			elm_object_signal_emit(obj, "elm,state,clear,visible", "");
+		else
+			elm_object_signal_emit(obj, "elm,state,clear,hidden", "");
+	}
+	elm_object_signal_emit(obj, "elm,state,focus,on", "");
+}
 
-	__MOBILE_AP_FUNC_EXIT__;
+static void __pw_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	if (elm_object_part_content_get(obj, "elm.swallow.clear"))
+		elm_object_signal_emit(obj, "elm,state,clear,hidden", "");
+	elm_object_signal_emit(obj, "elm,state,focus,off", "");
+}
 
-	return;
+static void __eraser_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
 
+	elm_entry_entry_set(data, "");
+	elm_entry_input_panel_return_key_disabled_set(data, TRUE);
+
+	__MOBILE_AP_FUNC_EXIT__;
 }
 
-static void __pw_layout_eraser_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+static void __pw_entry_language_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
-	if (data == NULL || obj == NULL) {
-		ERR("Invalid param\n");
+	if (obj == NULL || data == NULL) {
+		ERR("NULL param\n");
 		return;
 	}
-
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	mh_wifi_setting_view_t *st = &ad->setup;
+	char buf[MH_LABEL_LENGTH_MAX];
 
-	elm_entry_entry_set(st->pw_entry, "");
+	snprintf(buf, sizeof(buf), STR_PW_GUIDE_TEXT, WIFI_PASSPHRASE_LENGTH_MIN);
 
+	if (st->security_type_new == TETHERING_WIFI_SECURITY_TYPE_NONE) {
+		elm_genlist_item_update(st->pw_item);
+	} else {
+		elm_object_part_text_set(obj, "elm.guide", buf);
+	}
 	__MOBILE_AP_FUNC_EXIT__;
-
-	return;
-
 }
 
-static char *__gl_pw_text_get(void *data, Evas_Object *obj, const char *part)
+static Evas_Object *__get_pw_entry(void *data, Evas_Object *parent)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
-	if (data == NULL || obj == NULL || part == NULL) {
-		ERR("Invalid parameter\n");
+	static Elm_Entry_Filter_Limit_Size limit_filter_data;
+	Evas_Object *entry = NULL;
+	char *ptr = NULL;
+	Evas_Object * clr_btn = NULL;
+	char buf[MH_LABEL_LENGTH_MAX];
+
+	if (parent == NULL || data == NULL) {
+		ERR("null param \n");
 		return NULL;
 	}
 
-	if (g_strcmp0(part, "elm.text") != 0) {
-		ERR("Invalid part : %s\n", part);
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	mh_wifi_setting_view_t *st = &ad->setup;
+
+	entry = ea_editfield_add(parent, EA_EDITFIELD_SCROLL_SINGLELINE);
+	if (entry == NULL) {
+		ERR("elm_entry_add returns NULL\n");
+		st->pw_entry = NULL;
 		return NULL;
 	}
+	st->pw_entry = entry;
+	evas_object_smart_callback_add(entry, "language,changed",
+			__pw_entry_language_changed_cb, ad);
+
+	ea_entry_selection_back_event_allow_set(entry, EINA_TRUE);
+	elm_entry_prediction_allow_set(entry, EINA_FALSE);
+	elm_object_signal_emit(entry, "elm,action,hide,search_icon", "");
+	elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_PASSWORD);
+	elm_entry_select_allow_set(entry, EINA_TRUE);
+	elm_entry_cursor_end_set(entry);
+	snprintf(buf, sizeof(buf), STR_PW_GUIDE_TEXT, WIFI_PASSPHRASE_LENGTH_MIN);
+	elm_object_part_text_set(entry, "elm.guide", buf);
+	elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
+
+	limit_filter_data.max_char_count = 0;
+	limit_filter_data.max_byte_count = WIFI_PASSPHRASE_LENGTH_MAX;
+	elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter_data);
+
+	if (st->security_type_new == TETHERING_WIFI_SECURITY_TYPE_NONE) {
+		elm_object_part_text_set(entry, "default", buf);
+		elm_entry_input_panel_enabled_set(entry, EINA_FALSE);
+		elm_entry_select_allow_set(entry, EINA_FALSE);
+		elm_object_disabled_set(entry, EINA_TRUE);
+		elm_object_item_signal_emit(st->pw_item, "elm,state,rename,hide", "");
+		return entry;
+	} else {
+		ptr = elm_entry_utf8_to_markup(st->wifi_passphrase_new);
+		if (ptr != NULL) {
+			elm_entry_entry_set(entry, ptr);
+			free(ptr);
+		} else {
+			ERR("elm_entry_utf8_to_markup is failed\n");
+		}
+	}
+
+	elm_entry_input_panel_return_key_type_set(st->pw_entry,
+			ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
+
+	clr_btn = elm_button_add(entry);
+	elm_object_style_set(clr_btn, "search_clear");
+	elm_object_focus_allow_set(clr_btn, EINA_FALSE);
+	elm_object_part_content_set(entry, "elm.swallow.clear", clr_btn);
+	evas_object_smart_callback_add(clr_btn, "clicked", __eraser_btn_clicked_cb, entry);
+	evas_object_show(clr_btn);
+
+	evas_object_smart_callback_add(entry, "changed",
+			__pw_entry_changed_cb, ad);
+	evas_object_smart_callback_add(entry, "maxlength,reached",
+			__pw_entry_maxlength_reached_cb, ad);
+	evas_object_smart_callback_add(entry, "activated",
+			__pw_entry_activated_cb, NULL);
+	evas_object_smart_callback_add(entry, "focused",
+			__pw_entry_focused_cb, NULL);
+	evas_object_smart_callback_add(entry, "unfocused",
+			__pw_entry_unfocused_cb, NULL);
 
 	__MOBILE_AP_FUNC_EXIT__;
-	return strdup(_("IDS_MOBILEAP_BODY_PASSWORD"));
+	return st->pw_entry;
 }
 
-static Evas_Object *__gl_pw_icon_get(void *data, Evas_Object *obj,
-		const char *part)
+static char *__gl_pw_text_get(void *data, Evas_Object *obj, const char *part)
 {
 	__MOBILE_AP_FUNC_ENTER__;
 
@@ -500,103 +518,41 @@ static Evas_Object *__gl_pw_icon_get(void *data, Evas_Object *obj,
 		return NULL;
 	}
 
-	if (g_strcmp0(part, "elm.icon.entry") == 0) {
-		static Elm_Entry_Filter_Limit_Size limit_filter_data;
+	if (strcmp(part, "elm.text.main") != 0) {
+		return NULL;
+	}
 
-		mh_appdata_t *ad = (mh_appdata_t *)data;
-		mh_wifi_setting_view_t *st = &ad->setup;
-		Evas_Object *entry = NULL;
-		char *ptr = NULL;
-		Ecore_IMF_Context *imf_context;
+	__MOBILE_AP_FUNC_EXIT__;
+	return strdup(STR_PASSWORD);
+}
 
-		entry = elm_entry_add(obj);
-		if (entry == NULL) {
-			ERR("elm_entry_add returns NULL\n");
-			st->pw_entry = NULL;
-			return NULL;
-		}
+static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char *part)
+{
 
-		/* Set single line of entry */
-		elm_entry_scrollable_set(entry, EINA_TRUE);
-		elm_entry_single_line_set(entry, EINA_TRUE);
-		elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_PASSWORD);
-		elm_entry_select_allow_set(entry, EINA_FALSE);
-		elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
-
-		/* Set the maximum length filter for passphrase entry */
-		limit_filter_data.max_char_count = 0;
-		limit_filter_data.max_byte_count = WIFI_PASSPHRASE_LENGTH_MAX;
-		elm_entry_markup_filter_append(entry,
-				elm_entry_filter_limit_size, &limit_filter_data);
-
-		DBG("security_type : %d\n", st->security_type);
-		if (st->security_type == TETHERING_WIFI_SECURITY_TYPE_NONE) {
-			ptr = elm_entry_utf8_to_markup(st->wifi_passphrase);
-			if (ptr != NULL) {
-				elm_entry_entry_set(entry, ptr);
-				free(ptr);
-			} else {
-				ERR("elm_entry_utf8_to_markup is failed\n");
-			}
+	__MOBILE_AP_FUNC_ENTER__;
 
-			/* Set editable mode */
-			elm_entry_input_panel_enabled_set(entry, EINA_FALSE);
-			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);
-				free(ptr);
-			} else {
-				ERR("elm_entry_utf8_to_markup is failed\n");
-			}
-		}
+	if (data == NULL) {
+		ERR("data is null \n");
+		return NULL;
+	}
 
-		evas_object_smart_callback_add(entry, "maxlength,reached",
-				__passphrase_maxlength_reached_cb, data);
-		evas_object_smart_callback_add(entry, "activated",
-				__passphrase_activated_cb, data);
-		evas_object_smart_callback_add(entry, "changed",
-				__pw_entry_changed_cb, data);
-		evas_object_smart_callback_add(entry, "focused",
-				__pw_entry_focused_cb, data);
-		evas_object_smart_callback_add(entry, "unfocused",
-				__pw_entry_unfocused_cb, data);
-
-		imf_context = (Ecore_IMF_Context *)elm_entry_imf_context_get(entry);
-		if (imf_context == NULL) {
-			ERR("elm_entry_imf_context_get() is failed\n");
-		} else {
-			ecore_imf_context_input_panel_event_callback_add(imf_context,
-					ECORE_IMF_INPUT_PANEL_STATE_EVENT,
-					__input_panel_event_cb, (void *)ad);
-		}
+	mh_appdata_t *ad = (mh_appdata_t *)data;
 
-		elm_object_item_signal_emit(st->pw_item,
-				"elm,state,rename,hide", "");
-		if (!elm_entry_is_empty(entry)) {
-			elm_object_item_signal_emit(st->pw_item,
-					"elm,state,eraser,hide", "");
-		}
+	Evas_Object * layout = NULL;
+	Evas_Object * entry = NULL;
 
-		elm_object_part_text_set(entry, "elm.guide",
-				S_("IDS_COM_BODY_ENTER_PASSWORD"));
+	if (g_strcmp0(part, "elm.icon.entry") != 0)
+		return NULL;
 
-		evas_object_show(entry);
-		st->pw_entry = entry;
+	layout = elm_layout_add(obj);
+	elm_layout_file_set(layout, FILE_PATH_OF_EDC, "entry_style");
+	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-		__MOBILE_AP_FUNC_EXIT__;
-		return st->pw_entry;
-	} else if (g_strcmp0(part, "elm.icon.eraser") == 0) {
-		Evas_Object *btn = elm_button_add(obj);
-		elm_object_style_set(btn, "editfield_clear");
-		evas_object_smart_callback_add(btn, "clicked", __pw_layout_eraser_clicked_cb, data);
-		return btn;
-	} else {
-		DBG("Unknown part : %s\n", part);
-	}
+	entry = __get_pw_entry(ad, layout);
 
-	return NULL;
+	elm_object_part_content_set(layout, "entry_part", entry);
+	__MOBILE_AP_FUNC_EXIT__;
+	return layout;
 }
 
 static void __gl_hide_item_sel(void *data, Evas_Object *obj, void *event_info)
@@ -611,9 +567,9 @@ static void __gl_hide_item_sel(void *data, Evas_Object *obj, void *event_info)
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 
 	elm_genlist_item_selected_set((Elm_Object_Item*)event_info, EINA_FALSE);
+	__hide_btn_changed_cb(ad, obj, NULL);
 
-	__hide_btn_changed_cb(data, obj, NULL);
-	elm_check_state_set(ad->setup.hide_btn, ad->setup.visibility ?
+	elm_check_state_set(ad->setup.hide_btn, ad->setup.visibility_new ?
 			EINA_FALSE : EINA_TRUE);
 
 	__MOBILE_AP_FUNC_EXIT__;
@@ -631,28 +587,13 @@ static void __gl_security_item_sel(void *data, Evas_Object *obj, void *event_inf
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 
 	elm_genlist_item_selected_set((Elm_Object_Item*)event_info, EINA_FALSE);
-
 	__security_btn_changed_cb(data, obj, NULL);
-	elm_check_state_set(ad->setup.security_btn, ad->setup.security_type ==
+	elm_check_state_set(ad->setup.security_btn, ad->setup.security_type_new ==
 			TETHERING_WIFI_SECURITY_TYPE_NONE ? EINA_FALSE : EINA_TRUE);
 
 	__MOBILE_AP_FUNC_EXIT__;
 }
 
-static void __free_genlist_itc(mh_appdata_t *ad)
-{
-	__MOBILE_AP_FUNC_ENTER__;
-
-	elm_genlist_item_class_free(ad->setup.sp_itc);
-	elm_genlist_item_class_free(ad->setup.hide_itc);
-	elm_genlist_item_class_free(ad->setup.security_itc);
-	elm_genlist_item_class_free(ad->setup.pw_itc);
-	elm_genlist_item_class_free(ad->setup.name_itc);
-
-	__MOBILE_AP_FUNC_EXIT__;
-	return;
-}
-
 static void __set_genlist_itc(mh_appdata_t *ad)
 {
 	__MOBILE_AP_FUNC_ENTER__;
@@ -664,40 +605,40 @@ static void __set_genlist_itc(mh_appdata_t *ad)
 	ad->setup.sp_itc->func.state_get = NULL;
 	ad->setup.sp_itc->func.del = NULL;
 
+	ad->setup.name_itc = elm_genlist_item_class_new();
+	ad->setup.name_itc->item_style = "multiline_main.sub";
+	ad->setup.name_itc->func.text_get = __gl_device_name_title_label_get;
+	ad->setup.name_itc->func.content_get = NULL;
+	ad->setup.name_itc->func.state_get = NULL;
+	ad->setup.name_itc->func.del = NULL;
+
 	ad->setup.hide_itc = elm_genlist_item_class_new();
-	ad->setup.hide_itc->item_style = "dialogue/1text.1icon";
+	ad->setup.hide_itc->item_style = "1line"; 
 	ad->setup.hide_itc->func.text_get = __gl_hide_label_get;
 	ad->setup.hide_itc->func.content_get = __gl_hide_icon_get;
 	ad->setup.hide_itc->func.state_get = NULL;
 	ad->setup.hide_itc->func.del = NULL;
 
 	ad->setup.security_itc = elm_genlist_item_class_new();
-	ad->setup.security_itc->item_style = "dialogue/1text.1icon";
+	ad->setup.security_itc->item_style = "1line";
 	ad->setup.security_itc->func.text_get = __gl_security_label_get;
 	ad->setup.security_itc->func.content_get = __gl_security_icon_get;
 	ad->setup.security_itc->func.state_get = NULL;
 	ad->setup.security_itc->func.del = NULL;
 
 	ad->setup.pw_itc = elm_genlist_item_class_new();
-	ad->setup.pw_itc->item_style = "dialogue/editfield/title";
+	ad->setup.pw_itc->item_style = "entry.main";
 	ad->setup.pw_itc->func.text_get = __gl_pw_text_get;
-	ad->setup.pw_itc->func.content_get = __gl_pw_icon_get;
+	ad->setup.pw_itc->func.content_get = __gl_pw_content_get;
 	ad->setup.pw_itc->func.state_get = NULL;
 	ad->setup.pw_itc->func.del = NULL;
 
-	ad->setup.name_itc = elm_genlist_item_class_new();
-	ad->setup.name_itc->item_style = "multiline/1text";
-	ad->setup.name_itc->func.text_get = __gl_name_label_get;
-	ad->setup.name_itc->func.content_get = NULL;
-	ad->setup.name_itc->func.state_get = NULL;
-	ad->setup.name_itc->func.del = NULL;
-
-	ad->setup.end_sp_itc = elm_genlist_item_class_new();
-	ad->setup.end_sp_itc->item_style = "dialogue/separator";
-	ad->setup.end_sp_itc->func.text_get = NULL;
-	ad->setup.end_sp_itc->func.content_get = NULL;
-	ad->setup.end_sp_itc->func.state_get = NULL;
-	ad->setup.end_sp_itc->func.del = NULL;
+	ad->setup.sp2_itc = elm_genlist_item_class_new();
+	ad->setup.sp2_itc->item_style = "dialogue/separator.2";
+	ad->setup.sp2_itc->func.text_get = NULL;
+	ad->setup.sp2_itc->func.content_get = NULL;
+	ad->setup.sp2_itc->func.state_get = NULL;
+	ad->setup.sp2_itc->func.del = NULL;
 
 	__MOBILE_AP_FUNC_EXIT__;
 	return;
@@ -712,105 +653,163 @@ static void __deconstruct_wifi_setup_view(mh_wifi_setting_view_t *st)
 		return;
 	}
 
-	if (st->pw_entry == NULL) {
-		ERR("pw_entry is NULL");
-		return;
-	}
-
 	evas_object_smart_callback_del(st->hide_btn, "changed",
 			__hide_btn_changed_cb);
 	evas_object_smart_callback_del(st->security_btn, "changed",
 			__security_btn_changed_cb);
-	if (st->pw_entry) {
-		evas_object_smart_callback_del(st->pw_entry,
-				"maxlength,reached",
-				__passphrase_maxlength_reached_cb);
-		evas_object_smart_callback_del(st->pw_entry,
-				"activated",
-				__passphrase_activated_cb);
-	}
-	evas_object_smart_callback_del(st->back_btn, "clicked",
-			__back_btn_cb);
+	evas_object_smart_callback_del(st->cancel_button, "clicked",
+			__cancel_btn_cb);
+	evas_object_smart_callback_del(st->save_button, "clicked",
+			__save_btn_cb);
 	evas_object_smart_callback_del(st->genlist, "realized",
 			__gl_realized);
 
-	st->hide_btn = NULL;
-	st->security_btn = NULL;
-	st->pw_entry = NULL;
-	st->back_btn = NULL;
-	st->genlist = NULL;
-
 	__MOBILE_AP_FUNC_EXIT__;
 }
 
-static void __back_btn_cb(void *data, Evas_Object *obj, void *event_info)
+static void __settings_reloaded_cb(tethering_error_e result, void *user_data)
 {
+	if (user_data == NULL) {
+		ERR("Invalid parameter\n");
+		return;
+	}
+
 	__MOBILE_AP_FUNC_ENTER__;
 
+	mh_appdata_t *ad = (mh_appdata_t *)user_data;
+
+	if (result != TETHERING_ERROR_NONE)
+		ERR("tethering_wifi_reload_settings is failed [0x%X]\n", result);
+	_update_wifi_item(ad, MH_STATE_NONE);
+
+	__MOBILE_AP_FUNC_EXIT__;
+
+	return;
+}
+
+static void __save_btn_cb(void *data, Evas_Object *object, void *event_info)
+{
+	DBG("+\n");
 	if (data == NULL) {
-		ERR("The param is NULL\n");
+		ERR("data is NULL\n");
 		return;
 	}
 
 	mh_appdata_t *ad = (mh_appdata_t *)data;
 	mh_wifi_setting_view_t *st = &ad->setup;
-	Eina_Bool imf_state;
-	int ret;
-	char *ptr = NULL;
-
-	imf_state = ecore_imf_input_panel_hide();
-	elm_object_focus_set(st->pw_entry, EINA_FALSE);
-
-	if (strlen(st->wifi_passphrase_new) < WIFI_PASSPHRASE_LENGTH_MIN) {
-		DBG("Password is shorter than %d\n", WIFI_PASSPHRASE_LENGTH_MIN);
-		ret = notification_status_message_post(_("IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"));
-		if (ret != NOTIFICATION_ERROR_NONE)
-			ERR("notification_status_message_post() is failed : %d\n", ret);
-
-		ptr = elm_entry_utf8_to_markup(st->wifi_passphrase);
-		if (ptr != NULL) {
-			elm_entry_entry_set(st->pw_entry, ptr);
-			free(ptr);
+	bool ret = false;
+	bool is_setting_changed = false;
+
+	/* handle hide button change */
+	if (st->visibility != st->visibility_new) {
+		ret = __save_hide_btn_change(ad);
+		if (ret == false) {
+			elm_check_state_set(st->hide_btn, st->visibility ?
+					EINA_FALSE : EINA_TRUE);
 		} else {
-			ERR("elm_entry_utf8_to_markup is failed\n");
+			st->visibility = st->visibility_new;
+			is_setting_changed = true;
 		}
-
-		return;
 	}
-
-	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");
+	/* handle security button change */
+	if (st->security_type != st->security_type_new) {
+		ret = __save_security_btn_change(ad);
+		if (ret == false) {
+			elm_check_state_set(st->security_btn, st->security_type ==
+					TETHERING_WIFI_SECURITY_TYPE_NONE ? EINA_FALSE : EINA_TRUE);
+		} else {
+				st->security_type = st->security_type_new;
+				is_setting_changed = true;
 		}
 	}
 
-	if (imf_state == EINA_TRUE) {
-		DBG("IMF is hided\n");
-		return;
+	/* handle wifi passphrase change */
+	if (strcmp(st->wifi_passphrase, st->wifi_passphrase_new)) {
+		ret = __save_wifi_passphrase(ad);
+		if (ret == false) {
+			g_strlcpy(st->wifi_passphrase_new, st->wifi_passphrase,
+					sizeof(st->wifi_passphrase_new));
+			elm_genlist_item_update(st->pw_item);
+		} else {
+			g_strlcpy(st->wifi_passphrase, st->wifi_passphrase_new,
+					sizeof(st->wifi_passphrase));
+			is_setting_changed = true;
+			if (ad->main.help_item) {
+				elm_genlist_item_update(ad->main.help_item);
+			}
+		}
 	}
 
-	if (ad->main.need_recover_wifi_tethering == true) {
-		DBG("Turn on Wi-Fi tethering again\n");
+	if (is_setting_changed) {
 		_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("Wi-Fi tethering on is failed : %d\n", ret);
-			_update_wifi_item(ad, MH_STATE_NONE);
-			ad->main.need_recover_wifi_tethering = false;
-		}
+		/* reload wifi settings */
+		ret = tethering_wifi_reload_settings(ad->handle, __settings_reloaded_cb,
+				(void *)ad);
+		if (ret != TETHERING_ERROR_NONE)
+			ERR("reload_configuration is failed : %d\n", ret);
 	}
 
-	__deconstruct_wifi_setup_view(st);
+	elm_naviframe_item_pop(ad->naviframe);
 
-	evas_object_del(ad->setup.genlist);
-	__free_genlist_itc(ad);
+	DBG("-\n");
+	return;
+}
+
+static void __cancel_btn_cb(void *data, Evas_Object *object, void *event_info)
+{
+	DBG("+\n");
+
+	if (data == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	mh_appdata_t *ad = (mh_appdata_t *)data;
 
 	elm_naviframe_item_pop(ad->naviframe);
+	DBG("-\n");
+	return;
+}
 
-	__MOBILE_AP_FUNC_EXIT__;
+Eina_Bool _setting_back_btn_cb(void *data, Elm_Object_Item *navi_item)
+{
+	DBG("+\n");
+
+	if (data == NULL) {
+		ERR("The param is NULL\n");
+		return EINA_FALSE;
+	}
+
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+	mh_wifi_setting_view_t *st = &ad->setup;
+
+	if (st->visibility != st->visibility_new) {
+		st->visibility_new = st->visibility;
+	}
+
+	if (st->security_type != st->security_type_new) {
+		st->security_type_new = st->security_type;
+	}
+
+	if (strcmp(st->wifi_passphrase_new, st->wifi_passphrase)) {
+		g_strlcpy(st->wifi_passphrase_new, st->wifi_passphrase,
+					sizeof(st->wifi_passphrase_new));
+	}
+	st->pw_entry = NULL;
+	__deconstruct_wifi_setup_view(st);
+
+	if (ad->rename_popup != NULL) {
+		evas_object_del(ad->rename_popup);
+		ad->rename_popup = NULL;
+	}
+	ad->setup.navi_it = NULL;
+
+	DBG("-\n");
+	return EINA_TRUE;
 }
 
 static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
@@ -823,22 +822,20 @@ static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
 	Evas_Object *ao;
 	Evas_Object *btn;
 	char str[MH_LABEL_LENGTH_MAX] = {0, };
-	int i = 0;
+	int no_of_sp;
+	int i;
 
 	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) {
-		DBG("Security item is realized\n");
 		elm_object_item_signal_emit(item, "elm,state,center", "");
 	} 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");
 	}
 
-	for (i = 0; i < 2; i++) {
+	no_of_sp = sizeof(st->sp_item) / sizeof(st->sp_item[0]);
+	for (i = 0; i < no_of_sp; i++) {
 		if (item == st->sp_item[i])
 			elm_object_item_access_unregister(item);
 	}
@@ -851,11 +848,41 @@ static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
 		elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, str);
 	}
 
+	if (item == st->pw_item) {
+		elm_object_item_access_unregister(item);
+		ao = elm_object_item_access_register(item);
+		snprintf(str, sizeof(str), "%s, %s", STR_PASSWORD, st->wifi_passphrase_new);
+		elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, str);
+	}
+
 	__MOBILE_AP_FUNC_EXIT__;
 
 	return;
 }
 
+static void __select_passphrase_item(void *data, Evas_Object *obj, void *event_info)
+{
+	__MOBILE_AP_FUNC_ENTER__;
+
+	if (data == NULL) {
+		ERR("The param is NULL\n");
+		return;
+	}
+
+	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
+	Evas_Object *layout = NULL;
+	mh_appdata_t *ad = (mh_appdata_t *)data;
+
+	elm_genlist_item_selected_set(item, EINA_FALSE);
+
+	layout = elm_layout_add(obj);
+	elm_layout_file_set(layout, FILE_PATH_OF_EDC, "entry_style");
+	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	__get_pw_entry(ad, layout);
+	__MOBILE_AP_FUNC_EXIT__;
+	return;
+}
+
 Evas_Object *__create_genlist(mh_appdata_t *ad)
 {
 	__MOBILE_AP_FUNC_ENTER__;
@@ -868,8 +895,6 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
 	void *data = (void *)ad;
 	mh_wifi_setting_view_t *st = &ad->setup;
 	Evas_Object *genlist;
-	Elm_Object_Item *item;
-	int i = 0;
 
 	genlist = elm_genlist_add(ad->naviframe);
 	if (genlist == NULL) {
@@ -882,10 +907,11 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
 	evas_object_smart_callback_add(genlist, "realized", __gl_realized, ad);
 
 	__set_genlist_itc(ad);
-	item = elm_genlist_item_append(genlist, st->sp_itc, NULL, NULL,
+
+	st->name_item = elm_genlist_item_append(genlist, st->name_itc, data, NULL,
 			ELM_GENLIST_ITEM_NONE, NULL, NULL);
-	elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-	st->sp_item[i++] = item;
+	elm_genlist_item_select_mode_set(st->name_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+	elm_object_item_disabled_set(st->name_item, EINA_TRUE);
 
 	st->hide_item = elm_genlist_item_append(genlist, st->hide_itc, data, NULL,
 			ELM_GENLIST_ITEM_NONE, __gl_hide_item_sel, data);
@@ -894,133 +920,65 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
 			ELM_GENLIST_ITEM_NONE, __gl_security_item_sel, data);
 
 	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_NONE);
-
-	st->name_item = elm_genlist_item_append(genlist, st->name_itc, data, NULL,
-			ELM_GENLIST_ITEM_NONE, NULL, NULL);
-	elm_genlist_item_select_mode_set(st->name_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+			ELM_GENLIST_ITEM_NONE, __select_passphrase_item, ad);
+	if (st->security_type == TETHERING_WIFI_SECURITY_TYPE_NONE)
+		elm_object_item_disabled_set(st->pw_item, EINA_TRUE);
+	else
+		elm_object_item_disabled_set(st->pw_item, EINA_FALSE);
 
-	item = elm_genlist_item_append(genlist, st->end_sp_itc, NULL, NULL,
+/* End separator is removed because of P131104-03336. It is confirmed by UX team for this case.
+	item = elm_genlist_item_append(genlist, st->sp_itc, NULL, NULL,
 			ELM_GENLIST_ITEM_NONE, NULL, NULL);
 	elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 	st->sp_item[i++] = item;
-
+*/
 
 	__MOBILE_AP_FUNC_EXIT__;
 
 	return genlist;
 }
 
-char *__slide_title_access_info_cb(void *data, Evas_Object *obj)
-{
-	Evas_Object *label;
-	Elm_Object_Item *navi_it;
-	Eina_Strbuf *buf;
-	const char *info;
-	char *ret;
-
-	navi_it = (Elm_Object_Item *) data;
-	label = elm_object_item_part_content_get(navi_it, "elm.swallow.title");
-	if (label == NULL)
-		return NULL;
-
-	info = elm_object_text_get(label);
-	if (info == NULL)
-		return NULL;
-
-	buf = eina_strbuf_new();
-	eina_strbuf_append(buf, info);
-
-	ret = eina_strbuf_string_steal(buf);
-	eina_strbuf_free(buf);
-	return ret;
-}
-
-static void __title_clicked_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	Evas_Object *label;
-	Elm_Object_Item *navi_it = event_info;
-	if (navi_it == NULL)
-		return;
-
-	label = elm_object_item_part_content_get(navi_it, "elm.swallow.title");
-	if (label == NULL)
-		return;
-
-	elm_label_slide_go(label);
-}
-
 void mh_draw_wifi_setup_view(mh_appdata_t *ad)
 {
-	__MOBILE_AP_FUNC_ENTER__;
+	DBG("+\n");
 
 	if (ad == NULL) {
 		ERR("ad is NULL\n");
+		DBG("-\n");
 		return;
 	}
-
+	Evas_Object *btn;
 	mh_wifi_setting_view_t *st = &ad->setup;
-	Evas_Object *ao;
-	Evas_Object *label;
-
 
-	if (st->genlist != NULL) {
+	if (ad->setup.navi_it != NULL) {
 		ERR("Wi-Fi setup view already exists\n");
+		DBG("-\n");
 		return;
 	}
 
 	st->genlist = __create_genlist(ad);
 	if (st->genlist == NULL) {
 		ERR("__create_genlist returns NULL\n");
-		goto FAIL;
-	}
-
-	st->back_btn = elm_button_add(ad->naviframe);
-	if (st->back_btn == NULL) {
-		ERR("elm_button_add returns NULL\n");
-		goto FAIL;
-	}
-	elm_object_style_set(st->back_btn, "naviframe/back_btn/default");
-	evas_object_smart_callback_add(st->back_btn, "clicked",
-			__back_btn_cb, ad);
-	elm_object_focus_allow_set(st->back_btn, EINA_FALSE);
-
-	st->navi_it = elm_naviframe_item_push(ad->naviframe,
-			_("IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"),
-			st->back_btn, NULL, st->genlist, NULL);
-
-#ifndef SK_BACK_SUPPORT
-	elm_naviframe_item_pop_cb_set(st->navi_it, __back_btn_cb, (void *)ad);
-#endif
-
-	/* Slide title */
-	label = _create_slide_title(ad->naviframe, _("IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"));
-
-	elm_object_item_part_content_set(st->navi_it, "elm.swallow.title", label);
-	evas_object_smart_callback_add(ad->naviframe, "title,clicked", __title_clicked_cb, NULL);
-
-	ao = elm_object_item_access_object_get(st->navi_it);
-	if (ao) {
-		elm_access_info_set(ao, ELM_ACCESS_TYPE, "title");
-		elm_access_info_cb_set(ao, ELM_ACCESS_INFO,
-				__slide_title_access_info_cb, st->navi_it);
-		elm_object_focus_set(ao, EINA_TRUE);
+		DBG("-\n");
+		return;
 	}
 
-	/* Realize genlist item forcely since UIFW doesn't make realize to avoid crash on landscape mode*/
-	elm_genlist_item_update(st->pw_item);
+	st->navi_it = elm_naviframe_item_push(ad->naviframe, "IDS_MOBILEAP_MBODY_WI_FI_TETHERING",
+			NULL, NULL, st->genlist, NULL);
+	elm_object_item_domain_text_translatable_set(st->navi_it, PKGNAME, EINA_TRUE);
 
-	__MOBILE_AP_FUNC_EXIT__;
-
-	return;
+	elm_naviframe_item_pop_cb_set(st->navi_it, _setting_back_btn_cb, (void *)ad);
 
-FAIL:
-	if (st->back_btn)
-		evas_object_del(st->back_btn);
-	if (st->genlist)
-		evas_object_del(st->genlist);
+	btn = elm_button_add(ad->naviframe);
+	elm_object_style_set(btn, "naviframe/title_cancel");
+	evas_object_smart_callback_add(btn, "clicked", __cancel_btn_cb, ad);
+	elm_object_item_part_content_set(st->navi_it, "title_left_btn", btn);
+	st->cancel_button = btn;
 
-	st->back_btn = NULL;
-	st->genlist = NULL;
+	btn = elm_button_add(ad->naviframe);
+	elm_object_style_set(btn, "naviframe/title_done");
+	evas_object_smart_callback_add(btn, "clicked", __save_btn_cb, ad);
+	elm_object_item_part_content_set(st->navi_it, "title_right_btn", btn);
+	st->save_button = btn;
+	DBG("-\n");
 }
diff --git a/tables/ug-setting-mobileap-efl_ChangeableColorInfo.xml b/tables/ug-setting-mobileap-efl_ChangeableColorInfo.xml
new file mode 100644
index 0000000..942baff
--- /dev/null
+++ b/tables/ug-setting-mobileap-efl_ChangeableColorInfo.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ChangeableColorTables>
+	<ChangeableColorTable num="1">
+		<Theme style="Dark">
+		</Theme>
+		<Theme style="Light">
+			<ChangeableColorInfo id="AO001" inputColor="-" hue="0" saturation="0" value="0" alpha="80" fixedHue="true" fixedSaturation="true" fixedValue="true" />
+			<ChangeableColorInfo id="AO002" inputColor="1" hue="0" saturation="0" value="0" alpha="60" />
+		</Theme>
+	</ChangeableColorTable>
+	<ChangeableColorTable num="2">
+		<Theme style="Dark">
+		</Theme>
+		<Theme style="Light">
+			<ChangeableColorInfo id="AO001" inputColor="-" hue="0" saturation="0" value="0" alpha="80" fixedHue="true" fixedSaturation="true" fixedValue="true" />
+			<ChangeableColorInfo id="AO002" inputColor="1" hue="0" saturation="0" value="0" alpha="60" />
+		</Theme>
+	</ChangeableColorTable>
+	<ChangeableColorTable num="3">
+		<Theme style="Dark">
+		</Theme>
+		<Theme style="Light">
+			<ChangeableColorInfo id="AO001" inputColor="-" hue="0" saturation="0" value="0" alpha="80" fixedHue="true" fixedSaturation="true" fixedValue="true" />
+			<ChangeableColorInfo id="AO002" inputColor="1" hue="0" saturation="0" value="0" alpha="60" />
+		</Theme>
+	</ChangeableColorTable>
+</ChangeableColorTables>
\ No newline at end of file
diff --git a/tables/ug-setting-mobileap-efl_fontInfoTable.xml b/tables/ug-setting-mobileap-efl_fontInfoTable.xml
new file mode 100644
index 0000000..573b1b7
--- /dev/null
+++ b/tables/ug-setting-mobileap-efl_fontInfoTable.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FontInfoTable>
+</FontInfoTable>
diff --git a/ug-setting-mobileap-efl.efl b/ug-setting-mobileap-efl.efl
new file mode 100644
index 0000000..1770579
--- /dev/null
+++ b/ug-setting-mobileap-efl.efl
@@ -0,0 +1,17 @@
+ug-setting-mobile-efl mobileap-agent rw---- ------
+ug-setting-mobile-efl system::homedir rwxat ------
+ug-setting-mobile-efl system::vconf rwxat ------
+ug-setting-mobile-efl pulseaudio rwxat ------
+ug-setting-mobile-efl org.tizen.indicator -w---- ------
+ug-setting-mobile-efl dbus rwx--- ------
+ug-setting-mobile-efl secure-storage rw---- ------
+ug-setting-mobile-efl secure-storage::tethering rw---- ------
+ug-setting-mobile-efl connman rw---- ------
+ug-setting-mobile-efl connman::get rw---- ------
+ug-setting-mobile-efl net-config rw---- ------
+ug-setting-mobile-efl tethering::dbus-access rw---- ------
+ug-setting-mobile-efl ug-setting-mobileap-efl rw---- ------
+ug-setting-mobile-efl system::vconf_network rw---- ------
+ug-setting-mobile-efl system::vconf_system r----- ------
+ug-setting-mobile-efl telephony_framework::vconf r----- ------
+ug-setting-mobile-efl telephony_framework::api_ps_public rw---- ------
diff --git a/ug-setting-mobileap-efl.manifest b/ug-setting-mobileap-efl.manifest
index 75b0fa5..756e571 100644
--- a/ug-setting-mobileap-efl.manifest
+++ b/ug-setting-mobileap-efl.manifest
@@ -1,5 +1,9 @@
 <manifest>
-    <request>
-        <domain name="_"/>
-    </request>
+	<request>
+		<domain name="_"/>
+	</request>
+	<assign>
+		<filesystem path="/usr/apps/ug-setting-mobileap-efl/shared/res/tables/ug-setting-mobileap-efl_ChangeableColorInfo.xml" label="_"/>
+		<filesystem path="/usr/apps/ug-setting-mobileap-efl/shared/res/tables/ug-setting-mobileap-efl_fontInfoTable.xml" label="_"/>
+	</assign>  
 </manifest>
diff --git a/ug-setting-mobileap-efl.xml b/ug-setting-mobileap-efl.xml
index 12b58cd..f37db78 100644
--- a/ug-setting-mobileap-efl.xml
+++ b/ug-setting-mobileap-efl.xml
@@ -1,13 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" package="ug-setting-mobileap-efl" version="2.0.25" install-location="internal-only">
 	<label>Tethering</label>
-	<author email="sy39.ju@samsung.com" href="www.samsung.com">Seungyoun Ju</author>
 	<description>Tethering UG</description>
-	<ui-application appid="setting-mobileap-efl" exec="/usr/ug/bin/setting-mobileap-efl" nodisplay="true" multiple="true" type="capp" taskmanage="false">
+	<ui-application appid="setting-mobileap-efl" exec="/usr/apps/ug-setting-mobileap-efl/bin/ug-setting-mobileap-efl" ui-gadget="true" nodisplay="true" multiple="false" type="capp" taskmanage="false" process-pool="true" hw-acceleration="use-GL">
 		<label>Tethering</label>
-		<icon>/usr/ug/res/images/ug-setting-mobileap-efl/com.samsung.tethering.png</icon>
+		<label xml:lang="ar-ae">ﺖﻘﻴﻳﺩ</label>
+		<label xml:lang="az-az">Bağlanma</label>
+		<label xml:lang="bg-bg">Привързване</label>
+		<label xml:lang="ca-es">Tethering</label>
+		<label xml:lang="cs-cz">Sdílení internetového připojení</label>
+		<label xml:lang="da-dk">Internetdeling</label>
+		<label xml:lang="de-de">Tethering</label>
+		<label xml:lang="el-gr">Tethering</label>
+		<label xml:lang="en-gb">Tethering</label>
+		<label xml:lang="en-ph">Tethering</label>
+		<label xml:lang="en-us">Tethering</label>
+		<label xml:lang="es-es">Módem USB</label>
+		<label xml:lang="es-mx">Anclaje a red</label>
+		<label xml:lang="et-ee">Mobiilse internetiga ühendamine</label>
+		<label xml:lang="eu-es">Sare ainguraketa</label>
+		<label xml:lang="fi-fi">Yhteyden jako</label>
+		<label xml:lang="fr-ca">Fonction modem</label>
+		<label xml:lang="fr-fr">Fonction modem</label>
+		<label xml:lang="ga-ie">Ag déanamh teaghráin</label>
+		<label xml:lang="gl-es">Ancoraxe á rede</label>
+		<label xml:lang="hi-in">"टेथरिंग</label>
+		<label xml:lang="hr-hr">Dijeljenje veze</label>
+		<label xml:lang="hu-hu">Internetmegosztás</label>
+		<label xml:lang="hy-am">Տեղակապում</label>
+		<label xml:lang="is-is">Sími sem netaðgangsstaður</label>
+		<label xml:lang="it-it">Tethering</label>
+		<label xml:lang="ja-jp">テザリング</label>
+		<label xml:lang="ka-ge">მიბმა</label>
+		<label xml:lang="kk-kz">Шектеу</label>
+		<label xml:lang="ko-kr">테더링</label>
+		<label xml:lang="lt-lt">Siejama</label>
+		<label xml:lang="lv-lv">Ierīces piesaiste tālrunim</label>
+		<label xml:lang="mk-mk">Споделување</label>
+		<label xml:lang="nb-no">Internettdeling</label>
+		<label xml:lang="nl-nl">Tethering</label>
+		<label xml:lang="pl-pl">Udost. poł. internetowego</label>
+		<label xml:lang="pt-br">Ancoragem</label>
+		<label xml:lang="pt-pt">Partilha de Internet</label>
+		<label xml:lang="ro-ro">Tethering</label>
+		<label xml:lang="ru-ru">Модем</label>
+		<label xml:lang="sk-sk">Zdieľanie pripojenia</label>
+		<label xml:lang="sl-si">Tethering</label>
+		<label xml:lang="sr-rs">Vezivanje</label>
+		<label xml:lang="sv-se">Internetdelning</label>
+		<label xml:lang="tr-tr">Bağlantı</label>
+		<label xml:lang="uk-ua">Прив’язка</label>
+		<label xml:lang="uz-uz">Bog‘lash</label>
+		<label xml:lang="zh-cn">网络分享</label>
+		<label xml:lang="zh-hk">網絡共享</label>
+		<label xml:lang="zh-sg">网络分享</label>
+		<label xml:lang="zh-tw">網路共享</label>
+		<icon>/usr/apps/ug-setting-mobileap-efl/res/images/ug-setting-mobileap-efl/org.tizen.tethering.png</icon>
 		<application-service>
 			<operation name="http://tizen.org/appcontrol/operation/pick"/>
 		</application-service>
 	</ui-application>
+	<privileges>
+		<privilege>http://tizen.org/privilege/tethering.admin</privilege>
+	</privileges>
 </manifest>