summaryrefslogtreecommitdiff
path: root/ug-wifidirect
diff options
context:
space:
mode:
Diffstat (limited to 'ug-wifidirect')
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/CMakeLists.txt27
-rw-r--r--ug-wifidirect/include/wfd_client.h156
-rw-r--r--ug-wifidirect/include/wfd_motion_control.h43
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/include/wfd_ug.h431
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/include/wfd_ug_view.h494
-rw-r--r--ug-wifidirect/po/CMakeLists.txt8
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/ar.po484
-rw-r--r--ug-wifidirect/po/as.po249
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/az.po482
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/bg.po482
-rw-r--r--ug-wifidirect/po/bn.po249
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/ca.po476
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/cs.po482
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/da.po486
-rwxr-xr-xug-wifidirect/po/de.po471
-rw-r--r--ug-wifidirect/po/de_DE.po117
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/el_GR.po484
-rw-r--r--ug-wifidirect/po/en.po479
-rw-r--r--ug-wifidirect/po/en_PH.po478
-rw-r--r--ug-wifidirect/po/en_US.po478
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/es_ES.po476
-rw-r--r--ug-wifidirect/po/es_US.po480
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/et.po482
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/eu.po478
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/fi.po484
-rwxr-xr-xug-wifidirect/po/fr.po471
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/fr_CA.po480
-rw-r--r--ug-wifidirect/po/fr_FR.po117
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/ga.po486
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/gl.po476
-rw-r--r--ug-wifidirect/po/gu.po249
-rw-r--r--ug-wifidirect/po/hi.po497
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/hr.po484
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/hu.po482
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/hy.po482
-rw-r--r--ug-wifidirect/po/id.po249
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/is.po484
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/it_IT.po482
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/ja_JP.po494
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/ka.po488
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/kk.po484
-rw-r--r--ug-wifidirect/po/km.po249
-rw-r--r--ug-wifidirect/po/kn.po249
-rw-r--r--ug-wifidirect/po/ko_KR.po500
-rw-r--r--ug-wifidirect/po/lo.po249
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/lt.po482
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/lv.po482
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/mk.po482
-rw-r--r--ug-wifidirect/po/ml.po249
-rw-r--r--ug-wifidirect/po/mr.po249
-rw-r--r--ug-wifidirect/po/ms.po249
-rw-r--r--ug-wifidirect/po/my.po249
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/nb.po484
-rw-r--r--ug-wifidirect/po/ne.po249
-rwxr-xr-xug-wifidirect/po/nl.po471
-rw-r--r--ug-wifidirect/po/nl_NL.po117
-rw-r--r--ug-wifidirect/po/or.po249
-rw-r--r--ug-wifidirect/po/pa.po249
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/pl.po478
-rw-r--r--ug-wifidirect/po/pt_BR.po484
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/pt_PT.po484
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/ro.po478
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/ru_RU.po482
-rw-r--r--ug-wifidirect/po/si.po249
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/sk.po482
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/sl.po484
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/sr.po484
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/sv.po481
-rw-r--r--ug-wifidirect/po/ta.po249
-rw-r--r--ug-wifidirect/po/te.po249
-rw-r--r--ug-wifidirect/po/th.po249
-rw-r--r--ug-wifidirect/po/tl.po249
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/tr_TR.po486
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/uk.po484
-rw-r--r--ug-wifidirect/po/ur.po249
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/uz.po484
-rw-r--r--ug-wifidirect/po/vi.po249
-rw-r--r--ug-wifidirect/po/zh_CN.po476
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/zh_HK.po480
-rw-r--r--ug-wifidirect/po/zh_SG.po117
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/po/zh_TW.po480
-rw-r--r--ug-wifidirect/resources/icons/settings_wifi_direct.pngbin0 -> 9104 bytes
-rwxr-xr-xug-wifidirect/resources/images/A09_Connect.pngbin3428 -> 0 bytes
-rwxr-xr-xug-wifidirect/resources/images/A09_NoDevice.pngbin4279 -> 0 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_Medical.pngbin0 -> 1976 bytes
-rwxr-xr-xug-wifidirect/resources/images/A09_device_audio_devices.pngbin1626 -> 0 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_audio_devices_connect.pngbin3735 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/resources/images/A09_device_camera.pngbin1678 -> 1402 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_camera_connect.pngbin3750 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/resources/images/A09_device_computer.pngbin1220 -> 1204 bytes
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/resources/images/A09_device_display.pngbin1275 -> 1108 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_display_connect.pngbin3246 -> 0 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_gaming.pngbin0 -> 1568 bytes
-rwxr-xr-xug-wifidirect/resources/images/A09_device_gaming_devices.pngbin1713 -> 0 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_headphone.pngbin0 -> 1915 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_headset.pngbin0 -> 1807 bytes
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/resources/images/A09_device_input_device.pngbin1422 -> 1485 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_input_device_connect.pngbin3478 -> 0 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_mouse.pngbin0 -> 1703 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_multimedia.pngbin0 -> 1235 bytes
-rwxr-xr-xug-wifidirect/resources/images/A09_device_multimedia_devices.pngbin1282 -> 0 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_multimedia_devices_connect.pngbin3283 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/resources/images/A09_device_network_infrastructure.pngbin1401 -> 1260 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_network_infrastructure_connect.pngbin3437 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/resources/images/A09_device_printer.pngbin1414 -> 1434 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_printer_connect.pngbin3412 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/resources/images/A09_device_storage.pngbin1109 -> 1135 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_storage_connect.pngbin3048 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/resources/images/A09_device_telephone.pngbin1284 -> 1133 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_telephone_connect.pngbin3230 -> 0 bytes
-rw-r--r--ug-wifidirect/resources/images/A09_device_unknown.pngbin0 -> 1125 bytes
-rw-r--r--ug-wifidirect/resources/images/U04_device_BD.pngbin0 -> 1992 bytes
-rw-r--r--ug-wifidirect/resources/images/U04_device_Dongle.pngbin0 -> 1402 bytes
-rw-r--r--ug-wifidirect/resources/images/U04_device_Home_Theater.pngbin0 -> 2415 bytes
-rw-r--r--ug-wifidirect/resources/images/U04_device_STB.pngbin0 -> 1252 bytes
-rw-r--r--ug-wifidirect/resources/images/icon_select_all.png (renamed from ug-wifidirect/resources/images/A09_device_computer_connect.png)bin3249 -> 3394 bytes
-rw-r--r--ug-wifidirect/resources/wfd_ug.edc725
-rw-r--r--ug-wifidirect/setting-wifidirect-efl.xml11
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/src/wfd_client.c2395
-rwxr-xr-xug-wifidirect/src/wfd_motion_control.c204
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/src/wfd_ug.c1106
-rw-r--r--ug-wifidirect/src/wfd_ug_about_view.c128
-rwxr-xr-xug-wifidirect/src/wfd_ug_genlist.c1402
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/src/wfd_ug_main_view.c2590
-rw-r--r--[-rwxr-xr-x]ug-wifidirect/src/wfd_ug_multiconnect_view.c1274
-rwxr-xr-xug-wifidirect/src/wfd_ug_popup.c809
-rw-r--r--ug-wifidirect/src/wfd_ug_rename_popup.c415
-rw-r--r--ug-wifidirect/tables/setting-wifidirect-efl_ChangeableColorTable.xml24
-rw-r--r--ug-wifidirect/tables/setting-wifidirect-efl_FontInfoTable.xml3
129 files changed, 34802 insertions, 7240 deletions
diff --git a/ug-wifidirect/CMakeLists.txt b/ug-wifidirect/CMakeLists.txt
index e10920f..bd49222 100755..100644
--- a/ug-wifidirect/CMakeLists.txt
+++ b/ug-wifidirect/CMakeLists.txt
@@ -2,29 +2,36 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(ug-setting-wifidirect-efl C)
SET(PACKAGE_NAME ug-setting-wifidirect-efl)
-SET(PREFIX "/opt/ug")
-SET(LIBDIR "${PREFIX}/lib")
+SET(PREFIX "/usr/apps/setting-wifidirect-efl")
+SET(LIBDIR "${PREFIX}/lib/ug")
SET(RESDIR "${PREFIX}/res")
-SET(EDJDIR "${RESDIR}/edje/${PROJECT_NAME}")
-SET(IMGDIR "${RESDIR}/images/${PROJECT_NAME}")
+SET(EDJDIR "${RESDIR}/edje/${PROJECT_NAME}")
+SET(SMACKDIR "/etc/smack/accesses.d")
+SET(TABLEDIR "/usr/apps/setting-wifidirect-efl/shared/res/tables")
+SET(IMAGEDIR "/usr/apps/setting-wifidirect-efl/shared/icons")
-SET(SRCS
+SET(dependents "network")
+
+SET(SRCS
src/wfd_ug.c
src/wfd_client.c
src/wfd_ug_popup.c
src/wfd_ug_genlist.c
src/wfd_ug_main_view.c
src/wfd_ug_multiconnect_view.c
- src/wfd_ug_about_view.c
+# src/wfd_motion_control.c
+ src/wfd_ug_rename_popup.c
)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden -Wall")
+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden -Wall -DWFD_DBUS_LAUNCH -DWFD_ON_OFF_GENLIST")
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
SET(CMAKE_C_FLAGS_RELEASE "-O2")
-
+IF(MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE)
+ ADD_DEFINITIONS(-DMODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE)
+ENDIF(MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE)
ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
@@ -41,6 +48,8 @@ ADD_DEPENDENCIES(${PROJECT_NAME} wfd_ug.edj)
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
INSTALL(FILES ${CMAKE_BINARY_DIR}/wfd_ug.edj DESTINATION ${EDJDIR})
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/images/ DESTINATION ${IMGDIR} FILES_MATCHING PATTERN "*.png")
+INSTALL(FILES setting-wifidirect-efl.xml DESTINATION /usr/share/packages)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tables/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
ADD_SUBDIRECTORY(po)
diff --git a/ug-wifidirect/include/wfd_client.h b/ug-wifidirect/include/wfd_client.h
index 2e65b2e..e8b6c5e 100644
--- a/ug-wifidirect/include/wfd_client.h
+++ b/ug-wifidirect/include/wfd_client.h
@@ -22,44 +22,150 @@
#define __WFD_CLIENT_H__
-typedef enum
-{
- WFD_DEVICE_TYPE_COMPUTER = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_COMPUTER, // 1
- WFD_DEVICE_TYPE_INPUT_DEVICE= WIFI_DIRECT_PRIMARY_DEVICE_TYPE_INPUT_DEVICE,
- WFD_DEVICE_TYPE_PRINTER = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_PRINTER,
- WFD_DEVICE_TYPE_CAMERA = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_CAMERA,
- WFD_DEVICE_TYPE_STORAGE = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_STORAGE, // 5
- WFD_DEVICE_TYPE_NW_INFRA = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_NETWORK_INFRA,
- WFD_DEVICE_TYPE_DISPLAYS = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_DISPLAY,
- WFD_DEVICE_TYPE_MM_DEVICES = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_MULTIMEDIA_DEVICE,
- WFD_DEVICE_TYPE_GAME_DEVICES = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_GAME_DEVICE,
- WFD_DEVICE_TYPE_TELEPHONE = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_TELEPHONE, // 10
- WFD_DEVICE_TYPE_AUDIO = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_AUDIO,
- WFD_DEVICE_TYPE_OTHER = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_OTHER, // 255
+typedef enum {
+ WFD_DEVICE_TYPE_COMPUTER = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_COMPUTER,
+ WFD_DEVICE_TYPE_INPUT_DEVICE = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_INPUT_DEVICE,
+ WFD_DEVICE_TYPE_PRINTER = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_PRINTER,
+ WFD_DEVICE_TYPE_CAMERA = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_CAMERA,
+ WFD_DEVICE_TYPE_STORAGE = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_STORAGE,
+ WFD_DEVICE_TYPE_NW_INFRA = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_NETWORK_INFRA,
+ WFD_DEVICE_TYPE_DISPLAYS = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_DISPLAY,
+ WFD_DEVICE_TYPE_MM_DEVICES = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_MULTIMEDIA_DEVICE,
+ WFD_DEVICE_TYPE_GAME_DEVICES = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_GAME_DEVICE,
+ WFD_DEVICE_TYPE_TELEPHONE = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_TELEPHONE,
+ WFD_DEVICE_TYPE_AUDIO = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_AUDIO,
+ WFD_DEVICE_TYPE_OTHER = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_OTHER,
} device_type_e;
typedef enum {
- WFD_LINK_STATUS_DEACTIVATED = WIFI_DIRECT_STATE_DEACTIVATED, // 0
- WFD_LINK_STATUS_DEACTIVATING = WIFI_DIRECT_STATE_DEACTIVATING,
- WFD_LINK_STATUS_ACTIVATING = WIFI_DIRECT_STATE_ACTIVATING,
- WFD_LINK_STATUS_ACTIVATED = WIFI_DIRECT_STATE_ACTIVATED,
- WFD_LINK_STATUS_DISCOVERING = WIFI_DIRECT_STATE_DISCOVERING,
- WFD_LINK_STATUS_CONNECTING = WIFI_DIRECT_STATE_CONNECTING, // 5
- WFD_LINK_STATUS_DISCONNECTING = WIFI_DIRECT_STATE_DISCONNECTING,
- WFD_LINK_STATUS_CONNECTED = WIFI_DIRECT_STATE_CONNECTED,
- WFD_LINK_STATUS_GROUP_OWNER = WIFI_DIRECT_STATE_GROUP_OWNER,
+ WFD_LINK_STATUS_DEACTIVATED = WIFI_DIRECT_STATE_DEACTIVATED,
+ WFD_LINK_STATUS_DEACTIVATING = WIFI_DIRECT_STATE_DEACTIVATING,
+ WFD_LINK_STATUS_ACTIVATING = WIFI_DIRECT_STATE_ACTIVATING,
+ WFD_LINK_STATUS_ACTIVATED = WIFI_DIRECT_STATE_ACTIVATED,
+ WFD_LINK_STATUS_DISCOVERING = WIFI_DIRECT_STATE_DISCOVERING,
+ WFD_LINK_STATUS_CONNECTING = WIFI_DIRECT_STATE_CONNECTING,
+ WFD_LINK_STATUS_DISCONNECTING = WIFI_DIRECT_STATE_DISCONNECTING,
+ WFD_LINK_STATUS_CONNECTED = WIFI_DIRECT_STATE_CONNECTED,
+ WFD_LINK_STATUS_GROUP_OWNER = WIFI_DIRECT_STATE_GROUP_OWNER,
} link_status_e;
-int wfd_get_vconf_status(void *data);
+/**
+ * This function let the ug get wi-fi direct status from vconf
+ * @return If success, return the wfd status, else return -1
+ * @param[in] void
+ */
+int wfd_get_vconf_status();
+
+/**
+ * This function let the ug get device name from vconf
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_get_vconf_device_name(void *data);
+
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
+/**
+ * This function let the ug turn wifi off
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int wfd_wifi_off(void *data);
+#endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
+
+/**
+ * This function let the ug turn AP on
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_mobile_ap_on(void *data);
+
+/**
+ * This function let the ug turn AP off
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_mobile_ap_off(void *data);
+
+/**
+ * This function let the ug do initialization
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int init_wfd_client(void *data);
+
+
+/**
+ * This function let the ug load wfd manager
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int launch_wifi_direct_manager(void *data);
+
+/**
+ * This function let the ug do de-initialization
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int deinit_wfd_client(void *data);
-int wfd_client_start_discovery(void *data);
+
+/**
+ * This function let the ug turn wi-fi direct on
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int wfd_client_switch_on(void *data);
+
+/**
+ * This function let the ug turn wi-fi direct off
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int wfd_client_switch_off(void *data);
+
+#ifdef WFD_ON_OFF_GENLIST
+/**
+ * This function let the ug turn wi-fi direct on/off forcely
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ * @param[in] onoff whether to turn on/off wi-fi direct
+ */
int wfd_client_swtch_force(void *data, int onoff);
+#endif
+
+/**
+ * This function let the ug create a group
+ * @return If success, return 0, else return -1
+ */
+int wfd_client_group_add();
+
+/**
+ * This function let the ug connect to the device by mac address
+ * @return If success, return 0, else return -1
+ * @param[in] mac_addr the pointer to the mac address of device
+ */
int wfd_client_connect(const char *mac_addr);
+
+/**
+ * This function let the ug disconnect to the device by mac address
+ * @return If success, return 0, else return -1
+ * @param[in] mac_addr the pointer to the mac address of device
+ */
int wfd_client_disconnect(const char *mac_addr);
+
+/**
+ * This function let the ug set the intent of a group owner
+ * @return If success, return 0, else return -1
+ * @param[in] go_intent the intent parameter
+ */
int wfd_client_set_p2p_group_owner_intent(int go_intent);
+/**
+ * This function let the ug destroy tethering
+ * @return void
+ * @param[in] ugd the pointer to the main data structure
+ */
+void wfd_client_destroy_tethering(struct ug_data *ugd);
+
+void wfd_client_free_raw_discovered_peers(struct ug_data *ugd);
+
#endif /* __WFD_CLIENT_H__ */
diff --git a/ug-wifidirect/include/wfd_motion_control.h b/ug-wifidirect/include/wfd_motion_control.h
new file mode 100644
index 0000000..f3f5bd3
--- /dev/null
+++ b/ug-wifidirect/include/wfd_motion_control.h
@@ -0,0 +1,43 @@
+/*
+ * Wi-Fi Direct
+ *
+ * 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 __MOTION_CONTROL_H__
+#define __MOTION_CONTROL_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <Evas.h>
+#include "wfd_ug.h"
+
+typedef enum {
+ MOTION_TARGET_VIEW_FOCUS_ON = 0,
+ MOTION_TARGET_VIEW_FOCUS_OFF
+}TARGET_VIEW_FOCUS;
+
+void motion_create(struct ug_data *);
+void motion_destroy(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/ug-wifidirect/include/wfd_ug.h b/ug-wifidirect/include/wfd_ug.h
index c24b1ee..306d178 100755..100644
--- a/ug-wifidirect/include/wfd_ug.h
+++ b/ug-wifidirect/include/wfd_ug.h
@@ -22,58 +22,118 @@
#define __WFD_UG_H__
#include <dlog.h>
+#include <notification.h>
#include <ui-gadget-module.h>
+
#include <tethering.h>
+#include <wifi-direct.h>
+#include <efl-assist/efl_assist.h>
+
+#include <glib-object.h>
+#include <gio/gio.h>
+#include <glib.h>
+#include <assert.h>
+
#define PACKAGE "ug-setting-wifidirect-efl"
-#define LOCALEDIR "/opt/ug/res/locale"
+#define LOCALEDIR "/usr/share/locale"
+#define COLOR_TABLE "/usr/apps/setting-wifidirect-efl/shared/res/tables/setting-wifidirect-efl_ChangeableColorTable.xml"
+#define FONT_TABLE "/usr/apps/setting-wifidirect-efl/shared/res/tables/setting-wifidirect-efl_FontInfoTable.xml"
#define DIRECT_TAG "wfd_ug"
+/* TODO:: To change the log level as LOG_INFO */
#define DBG(log_level, format, args...) \
- LOG(log_level, DIRECT_TAG, "[%s()][%d] " format, __FUNCTION__, __LINE__, ##args)
+ LOG(LOG_ERROR, DIRECT_TAG, "[%s()][%d] " format, __FUNCTION__, __LINE__, ##args)
+#define DBG_SECURE(log_level, format, args...) \
+ SECURE_LOG(LOG_ERROR, DIRECT_TAG, "[%s()][%d] " format, __FUNCTION__, __LINE__, ##args)
+
+#define MAC2SECSTR(a) (a)[0], (a)[4], (a)[5]
+#define MACSECSTR "%02x:%02x:%02x"
+#if 0
+#define IP2SECSTR(a) (a)[0], (a)[3]
+#define IPSECSTR "%d..%d"
+#endif
-#define __FUNC_ENTER__ DBG(LOG_VERBOSE, "+\n")
-#define __FUNC_EXIT__ DBG(LOG_VERBOSE, "-\n")
+#define __FUNC_ENTER__ DBG(LOG_INFO, "+\n")
+#define __FUNC_EXIT__ DBG(LOG_INFO, "-\n")
+#if 0
+#define __FUNC_ENTER__
+#define __FUNC_EXIT__
+#endif
-#define VCONF_WFD_APNAME "db/setting/device_name"
+#define VCONF_WFD_APNAME "db/setting/device_name"
#define assertm_if(expr, fmt, arg...) do { \
- if(expr) { \
+ if (expr) { \
DBG(LOG_VERBOSE, " ##(%s) -> %s() assert!!## "fmt, #expr, __FUNCTION__, ##arg); \
assert(1); \
- } \
-} while (0) // retvm if
-
-#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
-#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
-
-#define AP_NAME_LENGTH_MAX 32 //allowed lenght is 31 + '\0'
-#define AP_PASSWORD_LENGTH_MAX 64 //allowed lenght is 63 + '\0'
-#define AP_PASSWORD_LENGTH_MIN 8 //min limit
+ } \
+} while (0)
+
+#define WFD_IF_DEL_OBJ(obj) \
+ do { \
+ if(obj) { \
+ evas_object_del(obj); \
+ obj = NULL; \
+ } \
+ } while (0)
+
+#define WFD_IF_DEL_ITEM(obj) \
+ do { \
+ if(obj) { \
+ elm_object_item_del(obj); \
+ obj = NULL; \
+ } \
+ } while (0)
+
+#define WFD_RET_IF(expr, fmt, args...) \
+ do { \
+ if(expr) { \
+ DBG(LOG_ERROR, "[%s] Return, message "fmt, #expr, ##args );\
+ return; \
+ } \
+ } while (0)
+
+#define WFD_RETV_IF(expr, val, fmt, args...) \
+ do { \
+ if(expr) { \
+ DBG(LOG_ERROR,"[%s] Return value, message "fmt, #expr, ##args );\
+ return (val); \
+ } \
+ } while (0)
+
+#define WFD_IF_FREE_MEM(mem) \
+ do { \
+ if(mem) { \
+ free(mem); \
+ mem = NULL; \
+ } \
+ } while (0)
+
+#define AP_NAME_LENGTH_MAX 32
+#define AP_PASSWORD_LENGTH_MAX 64
+#define AP_PASSWORD_LENGTH_MIN 8
#define AP_REJECT_CHAR_LIST "=,"
-#define DEFAULT_DEV_NAME "GT_I9500"
+#define DEFAULT_DEV_NAME "ZEQ"
#define MAC_LENGTH 18
#define SSID_LENGTH 32
+#define MAX_CONNECTED_PEER_NUM 7
#define MAX_PEER_NUM 10
-#define MAX_POPUP_PEER_NUM 7
#define MAX_POPUP_TEXT_SIZE 256
-#define MAX_DISPLAY_TIME_OUT 30
+#define MAX_DISPLAY_TIME_OUT 3
+#define MAX_NO_ACTION_TIME_OUT 300 /*5min*/
+#define MAX_SCAN_TIME_OUT 0
+
+#define GENLIST_HEADER_POS 1
+#define SR_CHECKBOX_ON_MSG "on/off button on"
+#define SR_CHECKBOX_OFF_MSG "on/off button off"
+#define SR_BUTTON_MSG "multiple connect button"
#define _(s) dgettext(PACKAGE, s)
#define N_(s) dgettext_noop(s)
#define S_(s) dgettext("sys_string", s)
-
-#if 1 //To-Do : Text should be translated.
-
-#define IDS_WFD_POP_SCAN_AGAIN "To start new scanning,<br>current connection will be<br>ended.Continue?"
-#define IDS_WFD_POP_WARN_BUSY_DEVICE "Unavailable device. Device is connected to another device."
-#define IDS_WFD_BODY_FAILED_DEVICES "Failed Devices"
-
-#endif
-
-
#define WFD_GLOBALIZATION_STR_LENGTH 256
typedef enum {
@@ -82,146 +142,234 @@ typedef enum {
WFD_MULTI_CONNECT_MODE_COMPLETED,
} wfd_multi_connect_mode_e;
-typedef enum
-{
- PEER_CONN_STATUS_DISCONNECTED,
- PEER_CONN_STATUS_DISCONNECTING,
- PEER_CONN_STATUS_CONNECTING = PEER_CONN_STATUS_DISCONNECTING,
- PEER_CONN_STATUS_CONNECTED,
- PEER_CONN_STATUS_FAILED_TO_CONNECT,
- PEER_CONN_STATUS_WAIT_FOR_CONNECT,
+typedef enum {
+ PEER_CONN_STATUS_DISCONNECTED,
+ PEER_CONN_STATUS_DISCONNECTING,
+ PEER_CONN_STATUS_CONNECTING = PEER_CONN_STATUS_DISCONNECTING,
+ PEER_CONN_STATUS_CONNECTED,
+ PEER_CONN_STATUS_FAILED_TO_CONNECT,
+ PEER_CONN_STATUS_WAIT_FOR_CONNECT,
} conn_status_e;
-
-typedef struct
-{
- char ssid[SSID_LENGTH]; // 31 + 1('\0')
- unsigned int category;
- char mac_addr[MAC_LENGTH];
- char if_addr[MAC_LENGTH];
- conn_status_e conn_status;
- bool is_group_owner; /** Is an active P2P Group Owner */
- bool is_persistent_group_owner; /** Is a stored Persistent GO */
- bool is_connected; /** Is peer connected*/
- Elm_Object_Item *gl_item;
+typedef enum {
+ WIFI_DIRECT_DISCOVERY_NONE,
+ WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START,
+ WIFI_DIRECT_DISCOVERY_FULL_SCAN_START,
+ WIFI_DIRECT_DISCOVERY_STOPPED,
+ WIFI_DIRECT_DISCOVERY_BACKGROUND,
+} discovery_status_e;
+
+
+typedef struct device_type_s_{
+ char ssid[SSID_LENGTH];
+ unsigned int category;
+ unsigned int sub_category;
+ char mac_addr[MAC_LENGTH];
+ char if_addr[MAC_LENGTH];
+ conn_status_e conn_status;
+ bool is_group_owner; /** Is an active P2P Group Owner */
+ bool is_persistent_group_owner; /** Is a stored Persistent GO */
+ bool is_connected; /** Is peer connected*/
+ bool is_alive;
+ bool dev_sel_state;
+ Elm_Object_Item *gl_item;
+ struct device_type_s_ *next;
} device_type_s;
-typedef struct
-{
- bool dev_sel_state;
- device_type_s peer;
-} wfd_multi_sel_data_s;
+struct ug_data {
+ Evas_Object *base;
+ ui_gadget_h ug;
+
+ Evas_Object *win;
+ Evas_Object *bg;
+ Evas_Object *layout;
+ Evas_Object *naviframe;
+ Elm_Object_Item *navi_item;
+ Elm_Object_Item *multi_navi_item;
+ Elm_Object_Item *head;
+ Evas_Object *genlist;
+ Evas_Object *multiconn_view_genlist;
+ Evas_Object *multiconn_layout;
+ Evas_Object *popup;
+ Evas_Object *act_popup;
+ Evas_Object *warn_popup;
+ Evas_Object *rename_popup;
+ Evas_Object *ctxpopup;
+ Evas_Object *scan_btn;
+ Evas_Object *disconnect_btn;
+ Evas_Object *toolbar;
+ Evas_Object *rename_entry;
+ Evas_Object *rename_button;
+
+#ifdef WFD_ON_OFF_GENLIST
+ Evas_Object *on_off_check;
+#endif
-struct ug_data
-{
- Evas_Object *base;
- ui_gadget_h ug;
+ Evas_Object *scan_toolbar;
+ Evas_Object *multiconn_scan_stop_btn;
+ Evas_Object *multiconn_conn_btn;
+ Evas_Object *select_all_icon;
- Evas_Object *win;
- Evas_Object *bg;
- Evas_Object *naviframe;
- Evas_Object *genlist;
- Evas_Object *multiconn_view_genlist;
- Evas_Object *popup;
- Evas_Object *act_popup;
- Evas_Object *warn_popup;
- Elm_Object_Item *head;
- Elm_Object_Item *scan_btn;
- Elm_Object_Item *multi_scan_btn;
- Elm_Object_Item *multi_connect_btn;
- Elm_Object_Item *nodevice_title_item;
- Elm_Object_Item *nodevice_item;
- Elm_Object_Item *nodevice_sep_low_item;
+ Elm_Object_Item *multi_connect_toolbar_item;
+ Elm_Object_Item *multi_view_connect_toolbar_item;
- Elm_Object_Item *about_wfd_item;
- Elm_Object_Item *about_wfdsp_sep_end_item;
+ Elm_Object_Item *select_all_view_genlist;
+#ifdef WFD_ON_OFF_GENLIST
+ Elm_Object_Item *item_wifi_onoff;
+#endif
+ Elm_Object_Item *device_name_item;
+ Elm_Genlist_Item_Class *rename_entry_itc;
+ Elm_Genlist_Item_Class *rename_desc_itc;
+ Elm_Object_Item *multi_connect_sep_item;
- Elm_Object_Item *conn_wfd_item;
+ Elm_Object_Item *nodevice_title_item;
+ Elm_Object_Item *nodevice_item;
- Elm_Object_Item *conn_failed_wfd_item;
- Elm_Object_Item *conn_failed_wfd_sep_item;
+ Elm_Object_Item *conn_wfd_item;
+ Elm_Object_Item *conn_failed_wfd_item;
+ Elm_Object_Item *avlbl_wfd_item;
+ Elm_Object_Item *busy_wfd_item;
+ Elm_Object_Item *multi_connect_wfd_item;
- Elm_Object_Item *avlbl_wfd_item;
+ Elm_Object_Item *mcview_title_item;
+ Elm_Object_Item *mcview_nodevice_item;
+ Elm_Object_Item *more_btn_multiconnect_item;
- Elm_Object_Item *busy_wfd_item;
- Elm_Object_Item *busy_wfd_sep_item;
+ Evas_Object *back_btn;
- Elm_Object_Item *multi_connect_wfd_item;
+ // Notify
+ Evas_Object *notify;
+ Evas_Object *notify_layout;
- Elm_Object_Item *multi_button_item;
- Elm_Object_Item *multi_button_sep_high_item;
- Elm_Object_Item *multi_button_sep_low_item;
+ int head_text_mode;
+ char *mac_addr_connecting;
+ char *mac_addr_req;
- Elm_Object_Item *mcview_select_all_item;
- Elm_Object_Item *mcview_title_item;
- Elm_Object_Item *mcview_nodevice_item;
+ //Connection is incoming or not
+ bool is_conn_incoming;
- Evas_Object *multi_btn;
+ // title mode of device list
+ int title_content_mode;
- int head_text_mode;
+ // Raw peer data
+ device_type_s raw_connected_peers[MAX_CONNECTED_PEER_NUM];
+ int raw_connected_peer_cnt;
+ GList *raw_discovered_peer_list;
+ int raw_discovered_peer_cnt;
- // Raw peer data
- device_type_s raw_connected_peers[MAX_PEER_NUM];
- int raw_connected_peer_cnt;
- device_type_s raw_discovered_peers[MAX_PEER_NUM];
- int raw_discovered_peer_cnt;
+ // Peer data in the Genlist
+ int gl_connected_peer_cnt;
+ device_type_s *gl_conn_peers_start;
- // Peer data in the Genlist
- device_type_s gl_connected_peers[MAX_PEER_NUM];
- int gl_connected_peer_cnt;
+ int gl_connected_failed_peer_cnt;
+ device_type_s *gl_failed_peers_start;
- device_type_s gl_connected_failed_peers[MAX_PEER_NUM];
- int gl_connected_failed_peer_cnt;
+ int gl_available_peer_cnt;
+ device_type_s *gl_avlb_peers_start;
- device_type_s gl_available_peers[MAX_PEER_NUM];
- int gl_available_peer_cnt;
+ int gl_busy_peer_cnt;
+ device_type_s *gl_busy_peers_start;
- device_type_s gl_busy_peers[MAX_PEER_NUM];
- int gl_busy_peer_cnt;
+ device_type_s raw_multi_selected_peers[MAX_PEER_NUM];
+ int raw_multi_selected_peer_cnt;
- device_type_s raw_multi_selected_peers[MAX_PEER_NUM];
- int raw_multi_selected_peer_cnt;
+ int gl_multi_connect_peer_cnt;
+ device_type_s *gl_mul_conn_peers_start;
- device_type_s gl_multi_connect_peers[MAX_PEER_NUM];
- int gl_multi_connect_peer_cnt;
+ // My status
+ bool I_am_group_owner;
+ bool I_am_connected;
- // My status
- bool I_am_group_owner;
- bool I_am_connected;
+ // Following variables are used at the Multi connect view.
+ wfd_multi_connect_mode_e multi_connect_mode;
+ device_type_s *multi_conn_dev_list_start;
+ int gl_available_dev_cnt_at_multiconn_view;
+ int g_source_multi_connect_next;
- // Following variables are used at the Multi connect view.
- wfd_multi_connect_mode_e multi_connect_mode;
- wfd_multi_sel_data_s multi_conn_dev_list[MAX_PEER_NUM];
- int gl_available_dev_cnt_at_multiconn_view;
- int g_source_multi_connect_next;
+#ifdef WFD_ON_OFF_GENLIST
+ int wfd_onoff;
+#endif
+ wifi_direct_state_e wfd_status;
+ char *dev_name;
+ char *dev_pass;
- int wfd_onoff;
- int wfd_status;
- char *dev_name;
- char *dev_pass;
+ // For connect failed peers
+ int last_display_time;
+ Ecore_Timer *display_timer;
- // For connect failed peers
- int last_display_time;
- Ecore_Timer *display_timer;
+ // Tethering
+ bool is_hotspot_off;
+ bool is_hotspot_locally_disabled;
+ tethering_h hotspot_handle;
- //tethering
- tethering_h hotspot_handle;
-
+ // wfds service
+ char *wfds;
+
+ // Device filter
+ int device_filter;
+
+ // Whether support auto exit after successed connection
+ bool is_auto_exit;
+
+ //Whether support multi connection
+ bool is_multi_connect;
+ bool is_select_all_checked;
+
+ //view type for search
+ char *view_type;
+
+ //Title of UG
+ char *title;
+
+ // The ip address of connected peer
+ char *peer_ip_address;
+
+ // The service name that supported WFDSP
+ char *service_name;
+
+ // Whether initialize wfd-namager ok
+ bool is_init_ok;
+
+ //timer for deleting progress bar
+ int timer_stop_progress_bar;
+
+ //timer for multi connect reset
+ int timer_multi_reset;
+
+ //if all the items are selected or not
+ bool is_multi_check_all_selected;
+
+ //timer for remove not alive peer
+ int timer_delete_not_alive_peer;
+
+ //wifi direct discovery status
+ int wfd_discovery_status;
+
+ bool is_paused;
+
+#ifdef WFD_DBUS_LAUNCH
+ GCancellable *dbus_cancellable;
+ GDBusConnection *conn;
+#endif
+ Ea_Theme_Color_Table *color_table;
+ Ea_Theme_Font_Table *font_table;
};
-extern Elm_Gen_Item_Class sep_itc;
-extern Elm_Gen_Item_Class sep_itc_end;
-extern Elm_Gen_Item_Class head_itc;
-extern Elm_Gen_Item_Class name_itc;
+extern Elm_Gen_Item_Class device_name_title_itc;
+#ifdef WFD_ON_OFF_GENLIST
+extern Elm_Gen_Item_Class wfd_onoff_itc;
+#endif
+extern Elm_Gen_Item_Class device_name_itc;
extern Elm_Gen_Item_Class title_itc;
+extern Elm_Gen_Item_Class multi_view_title_itc;
extern Elm_Gen_Item_Class peer_itc;
+extern Elm_Gen_Item_Class title_no_device_itc;
extern Elm_Gen_Item_Class noitem_itc;
-extern Elm_Gen_Item_Class help_itc;
-extern Elm_Gen_Item_Class button_itc;
+extern Elm_Gen_Item_Class title_available_itc;
extern Elm_Gen_Item_Class title_conn_itc;
extern Elm_Gen_Item_Class peer_conn_itc;
@@ -231,9 +379,30 @@ extern Elm_Gen_Item_Class peer_busy_itc;
extern Elm_Gen_Item_Class title_multi_connect_itc;
extern Elm_Gen_Item_Class peer_multi_connect_itc;
+extern Elm_Gen_Item_Class select_all_multi_connect_itc;
extern Elm_Gen_Item_Class title_conn_failed_itc;
extern Elm_Gen_Item_Class peer_conn_failed_itc;
+/**
+ * This function let the ug destroy the ug
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_destroy_ug(void *data);
+
+/**
+ * This function is called when ON/OFF button is turned ON/OFF
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] object
+ * @param[in] event
+ */
+void _onoff_changed_cb(void *data, Evas_Object *obj, void *event_info);
+void toolbar_language_changed(void *data, Evas_Object *obj, void *event_info);
+void ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void *event_info);
+void wfd_free_nodivice_item(struct ug_data *ugd);
+void discover_cb(int error_code, wifi_direct_discovery_state_e discovery_state, void *user_data);
+
#endif /* __WFD_UG_H__ */
diff --git a/ug-wifidirect/include/wfd_ug_view.h b/ug-wifidirect/include/wfd_ug_view.h
index 2a35949..d4ec29e 100755..100644
--- a/ug-wifidirect/include/wfd_ug_view.h
+++ b/ug-wifidirect/include/wfd_ug_view.h
@@ -21,119 +21,459 @@
#define __WFD_UG_VIEW_H__
#include <glib.h>
-#include <syspopup_caller.h>
-#define EDJDIR "/opt/ug/res/edje/ug-setting-wifidirect-efl"
+#define EDJDIR "/usr/apps/setting-wifidirect-efl/res/edje/ug-setting-wifidirect-efl"
#define WFD_UG_EDJ_PATH EDJDIR"/wfd_ug.edj"
-#define WFD_IMG_DIR "/opt/ug/res/images/ug-setting-wifidirect-efl"
-#define TICKERNOTI_SYSPOPUP "tickernoti-syspopup"
-
+#define WFD_IMG_DIR "/usr/apps/setting-wifidirect-efl/res/images/ug-setting-wifidirect-efl"
/* Define icons */
+#define WFD_ICON_DEVICE_COMPUTER "A09_device_computer.png"
+#define WFD_ICON_DEVICE_INPUT_DEVICE "A09_device_input_device.png"
+#define WFD_ICON_DEVICE_PRINTER "A09_device_printer.png"
+#define WFD_ICON_DEVICE_CAMERA "A09_device_camera.png"
+#define WFD_ICON_DEVICE_STORAGE "A09_device_storage.png"
+#define WFD_ICON_DEVICE_NETWORK_INFRA "A09_device_network_infrastructure.png"
+#define WFD_ICON_DEVICE_DISPLAY "A09_device_display.png"
+#define WFD_ICON_DEVICE_MULTIMEDIA "A09_device_multimedia.png"
+#define WFD_ICON_DEVICE_GAMING "A09_device_gaming.png"
+#define WFD_ICON_DEVICE_TELEPHONE "A09_device_telephone.png"
+#define WFD_ICON_DEVICE_HEADSET "A09_device_headset.png"
+#define WFD_ICON_DEVICE_UNKNOWN "A09_device_unknown.png"
+#define WFD_ICON_DEVICE_BD "U04_device_BD.png"
+#define WFD_ICON_DEVICE_DONGLE "U04_device_Dongle.png"
+#define WFD_ICON_DEVICE_HOME_THEATER "U04_device_Home_Theater.png"
+#define WFD_ICON_DEVICE_STB "U04_device_STB.png"
+
+/* Not support */
+#define WFD_ICON_DEVICE_HEADPHONE "A09_device_headphone.png"
+#define WFD_ICON_DEVICE_MEDICAL "A09_device_Medical.png"
+#define WFD_ICON_DEVICE_MOUSE "A09_device_mouse.png"
-#define WFD_ICON_DEVICE_COMPUTER WFD_IMG_DIR"/A09_device_computer.png"
-#define WFD_ICON_DEVICE_INPUT_DEVICE WFD_IMG_DIR"/A09_device_input_device.png"
-#define WFD_ICON_DEVICE_PRINTER WFD_IMG_DIR"/A09_device_printer.png"
-#define WFD_ICON_DEVICE_CAMERA WFD_IMG_DIR"/A09_device_camera.png"
-#define WFD_ICON_DEVICE_STORAGE WFD_IMG_DIR"/A09_device_storage.png"
-#define WFD_ICON_DEVICE_NETWORK_INFRA WFD_IMG_DIR"/A09_device_network_infrastructure.png"
-#define WFD_ICON_DEVICE_DISPLAY WFD_IMG_DIR"/A09_device_display.png"
-#define WFD_ICON_DEVICE_MULTIMEDIA_DEVICE WFD_IMG_DIR"/A09_device_multimedia_devices.png"
-#define WFD_ICON_DEVICE_GAMING_DEVICE WFD_IMG_DIR"/A09_device_gaming_devices.png"
-#define WFD_ICON_DEVICE_TELEPHONE WFD_IMG_DIR"/A09_device_telephone.png"
-#define WFD_ICON_DEVICE_AUDIO_DEVICE WFD_IMG_DIR"/A09_device_audio_devices.png"
-
-#define WFD_ICON_DEVICE_COMPUTER_CONNECT WFD_IMG_DIR"/A09_device_computer_connect.png"
-#define WFD_ICON_DEVICE_INPUT_DEVICE_CONNECT WFD_IMG_DIR"/A09_device_input_device_connect.png"
-#define WFD_ICON_DEVICE_PRINTER_CONNECT WFD_IMG_DIR"/A09_device_printer_connect.png"
-#define WFD_ICON_DEVICE_CAMERA_CONNECT WFD_IMG_DIR"/A09_device_camera_connect.png"
-#define WFD_ICON_DEVICE_STORAGE_CONNECT WFD_IMG_DIR"/A09_device_storage_connect.png"
-#define WFD_ICON_DEVICE_NETWORK_INFRA_CONNECT WFD_IMG_DIR"/A09_device_network_infrastructure_connect.png"
-#define WFD_ICON_DEVICE_DISPLAY_CONNECT WFD_IMG_DIR"/A09_device_display_connect.png"
-#define WFD_ICON_DEVICE_MULTIMEDIA_DEVICE_CONNECT WFD_IMG_DIR"/A09_device_multimedia_devices_connect.png"
-#define WFD_ICON_DEVICE_GAMING_DEVICE_CONNECT WFD_IMG_DIR"/A09_device_gaming_devices_connect.png"
-#define WFD_ICON_DEVICE_TELEPHONE_CONNECT WFD_IMG_DIR"/A09_device_telephone_connect.png"
-#define WFD_ICON_DEVICE_AUDIO_DEVICE_CONNECT WFD_IMG_DIR"/A09_device_audio_devices_connect.png"
-
-#define WFD_ICON_CONNECTED WFD_IMG_DIR"/A09_Connect.png"
-
-
-enum
-{
- HEAD_TEXT_TYPE_DIRECT,
- HEAD_TEXT_TYPE_DEACTIVATING,
- HEAD_TEXT_TYPE_ACTIVATING,
- HEAD_TEXT_TYPE_ACTIVATED,
- HEAD_TEXT_TYPE_SCANING,
+#define WFD_ICON_DEVICE_MORE_HELP "A09_popup_help.png"
+
+enum {
+ HEAD_TEXT_TYPE_DIRECT,
+ HEAD_TEXT_TYPE_DEACTIVATING,
+ HEAD_TEXT_TYPE_ACTIVATING,
+ HEAD_TEXT_TYPE_ACTIVATED,
};
-enum
-{
- /* User confirm */
- POPUP_TYPE_WIFI_OFF,
- POPUP_TYPE_HOTSPOT_OFF,
+enum {
+ TITLE_CONTENT_TYPE_NONE,
+ TITLE_CONTENT_TYPE_SCANNING,
+ TITLE_CONTENT_TYPE_FOUND,
+};
+
+
+enum {
+ /* User confirm */
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
+ POPUP_TYPE_WIFI_OFF,
+#endif
+
+ POPUP_TYPE_HOTSPOT_OFF = 1,
- /* Activation */
- POPUP_TYPE_ACTIVATE_FAIL,
- POPUP_TYPE_DEACTIVATE_FAIL,
+ /* Activation */
+ POPUP_TYPE_ACTIVATE_FAIL,
+ POPUP_TYPE_ACTIVATE_FAIL_POLICY_RESTRICTS,
+ POPUP_TYPE_DEACTIVATE_FAIL,
- /* Connection */
- POPUP_TYPE_LINK_TIMEOUT,
- POPUP_TYPE_AUTH_FAIL,
- POPUP_TYPE_LINK_FAIL,
- POPUP_TYPE_UNKNOWN_ERROR,
+ /* Connection */
+ POPUP_TYPE_LINK_TIMEOUT,
+ POPUP_TYPE_AUTH_FAIL,
+ POPUP_TYPE_LINK_FAIL,
+ POPUP_TYPE_UNKNOWN_ERROR,
- POPUP_TYPE_TERMINATE,
+ POPUP_TYPE_INFO,
+ POPUP_TYPE_TERMINATE,
+ POPUP_TYPE_TERMINATE_DEACTIVATE_FAIL,
+ POPUP_TYPE_TERMINATE_NOT_SUPPORT,
- /* Disconnect */
- POP_TYPE_DISCONNECT,
+ /* Disconnect */
+ POP_TYPE_DISCONNECT,
- /* Disconnect All*/
- POP_TYPE_DISCONNECT_ALL,
+ POP_TYPE_CANCEL_CONNECT,
- /* Scan again */
- POP_TYPE_SCAN_AGAIN,
+ POP_TYPE_ACCEPT_CONNECTION,
- /* multi connect */
- POP_TYPE_MULTI_CONNECT_POPUP,
+ /* Scan again */
+ POP_TYPE_SCAN_AGAIN,
- /* Busy device */
- POP_TYPE_BUSY_DEVICE_POPUP,
+ /* multi connect */
+ POP_TYPE_MULTI_CONNECT_POPUP,
+
+ /* Busy device */
+ POP_TYPE_BUSY_DEVICE_POPUP,
+
+ /* Automaticlly turn off */
+ POP_TYPE_AUTOMATIC_TURN_OFF,
};
struct ug_data *wfd_get_ug_data();
+
+/**
+ * This function let the ug create the main view
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
void create_wfd_ug_view(void *data);
+
+/**
+ * This function let the ug destroy the main view
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
void destroy_wfd_ug_view(void *data);
-void wfd_ug_view_refresh_glitem(void *obj);
-void wfd_ug_view_refresh_button(void *obj, const char *text, int enable);
+
+/**
+ * This function let the ug update the genlist item
+ * @return void
+ * @param[in] gl_item the pointer to genlist item
+ */
+void wfd_ug_view_refresh_glitem(Elm_Object_Item *gl_item);
+
+/**
+ * This function let the ug refresh the attributes of button
+ * @return void
+ * @param[in] tb_item the pointer to the toolbar button
+ * @param[in] text the pointer to the text of button
+ * @param[in] enable whether the button is disabled
+ */
+void wfd_ug_view_refresh_button(Evas_Object *tb_item, const char *text,
+ int enable);
+
+/**
+ * This function let the ug update the peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
void wfd_ug_view_update_peers(void *data);
+
+/**
+ * This function let the ug free the peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
void wfd_ug_view_free_peers(void *data);
+
+/**
+ * This function let the ug create a action popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] message the pointer to the text of popup
+ * @param[in] popup_type the message type
+ */
void wfd_ug_act_popup(void *data, const char *message, int popup_type);
+
+/**
+ * This function let the ug remove the action popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
void wfg_ug_act_popup_remove(void *data);
+
+/**
+ * This function let the ug create a warning popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] message the pointer to the text of popup
+ * @param[in] popup_type the message type
+ */
void wfd_ug_warn_popup(void *data, const char *message, int popup_type);
-void wfg_ug_warn_popup_remove(void *data);
-int _create_connected_dev_list(void *data);
-int _change_multi_button_title(void *data);
-void _wifid_create_about_view(struct ug_data *ugd);
+/**
+ * This function let the ug create the view for multi connection
+ * @return void
+ * @param[in] ugd the pointer to the main data structure
+ */
void _wifid_create_multiconnect_view(struct ug_data *ugd);
-void _sub_view_back_btn_cb(void *data, Evas_Object * obj, void *event_info);
-void _back_btn_cb(void *data, Evas_Object * obj, void *event_info);
+/**
+ * This function let the ug call it when click 'back' button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+Eina_Bool _back_btn_cb(void *data, Elm_Object_Item *it);
+
+/**
+ * This function let the ug call it when click 'scan' button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
void _scan_btn_cb(void *data, Evas_Object * obj, void *event_info);
-void _wfd_onoff_btn_cb(void *data, Evas_Object *obj, void *event_info);
-void _wifid_create_multibutton_cb(void *data, Evas_Object * obj, void *event_info);
+/**
+ * This function let the ug call it when click 'disconnect' button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _wfd_ug_disconnect_button_cb(void *data, Evas_Object *obj, void *event_info);
+
+/**
+ * This function let the ug call it when click "Cancel Connection" button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _wfd_ug_cancel_connection_button_cb(void *data, Evas_Object *obj, void *event_info);
+/**
+ * This function let the ug get the found peers
+ * @return If success, return 0, else return -1
+ * @param[in] ugd the pointer to the main data structure
+ */
int wfd_ug_get_discovered_peers(struct ug_data *ugd);
+
+/**
+ * This function let the ug get the connecting peer mac
+ * @return If success, return 0, else return -1
+ * @param[in] ugd the pointer to the main data structure
+ */
+int wfd_ug_get_connecting_peer(struct ug_data *ugd);
+
+/**
+ * This function let the ug get the connected peers
+ * @return If success, return 0, else return -1
+ * @param[in] ugd the pointer to the main data structure
+ */
int wfd_ug_get_connected_peers(struct ug_data *ugd);
-int wfd_refresh_wifi_direct_state(void* data);
-int wfd_multi_connect_next(void* data);
+/**
+ * This function let the ug get the device status
+ * @return If success, return 0-3(available: 0, connected: 1, busy: 2, connected failed: 3), else return -1
+ * @param[in] ugd the pointer to the main data structure
+ * @param[in] device the pointer to the number of connected failed devices
+ */
+//int wfd_get_device_status(void *data, device_type_s *device);
+
+/**
+ * This function let the ug refresh current status of wi-fi direct
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_refresh_wifi_direct_state(void *data);
+
+/**
+ * This function let the ug free the selected peers in multi connect view
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_free_multi_selected_peers(void *data);
+
+/**
+ * This function let the ug stop to connect to selected peer
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int wfd_stop_multi_connect(void *data);
-gboolean wfd_multi_connect_next_cb(void* data);
+/**
+ * This function let the ug connect to the next selected peer automatically
+ * @return If stop the timer, return false, else return true
+ * @param[in] data the pointer to the main data structure
+ */
+gboolean wfd_multi_connect_next_cb(void *data);
+
+/**
+ * This function let the ug add a dialogue separator
+ * @return the separator item
+ * @param[in] genlist the pointer to the genlist
+ * @param[in] separator_style the style of separator
+ */
+Elm_Object_Item *wfd_add_dialogue_separator(Evas_Object *genlist,
+ const char *separator_style);
+
+/**
+ * This function let the ug free the multi connect devices
+ * @return 0
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_free_multiconnect_device(struct ug_data *ugd);
+
+/**
+ * This function let the ug update the multi connect devices
+ * @return 0
+ * @param[in] ugd the pointer to the main data structure
+ * @param[in] is_free_all_peers true to free all peers
+ */
+int wfd_update_multiconnect_device(struct ug_data *ugd, bool is_free_all_peers);
+
+/**
+ * This function let the ug create the view for multi connection
+ * @return void
+ * @param[in] ugd the pointer to the main data structure
+ */
+void wfd_create_multiconnect_view(struct ug_data *ugd);
+
+/**
+ * This function let the ug delete search progressbar
+ * @return void
+ * @param[in] user_data the pointer to the main data structure
+ */
+int wfd_delete_progressbar_cb(void *user_data);
+
+/**
+ * This function let the ug insert peer item to genlist
+ * @return int
+ * @param[in] genlist the pointer to genlist
+ * @param[in] item the pointer to item to insert after
+ * @param[in] itc Elm_Gen_Item_Class
+ * @param[in] start_pos the pointer to the start position of peer array
+ * @param[in] peer_for_insert the pointer to the peer to insert
+ * @param[in] callback callback for peer select
+ */
+int insert_gl_item(Evas_Object *genlist, Elm_Object_Item *item,
+ Elm_Gen_Item_Class *itc, device_type_s **start_pos,
+ device_type_s *peer_for_insert, void *callback);
+
+/**
+ * This function let the ug get the insert position for next item
+ * @return item the position to insert after
+ * @param[in] peer the pointer to peer to search
+ * @param[in] pre_item the title item of peer list
+ * @param[in] peer_cnt the count of gl peers
+ */
+Elm_Object_Item *get_insert_postion(device_type_s *peer,
+ Elm_Object_Item *pre_item, int peer_cnt);
+
+/**
+ * This function let the ug find a peer in genlist
+ * @return peer the pointer of peer that found
+ * @param[in] start_pos the start position of peers list
+ * @param[in] mac_addr the mac_addr of peer for search
+ */
+device_type_s *find_peer_in_glist(device_type_s *start_pos, const char *mac_addr);
+
+/**
+ * This function let the ug free gl peers
+ * @return void
+ * @param[in] gl_peers_start the start pointer of peer list that for free
+ */
+void wfd_ug_view_free_peer(device_type_s *gl_peers_start);
+
+/**
+ * This function let the ug exits automatically after successed connection
+ * @return void
+ * @param[in] user_data the pointer to the main data structure
+ */
+void _wfd_ug_auto_exit(void *user_data);
+
+/**
+ * This function let the ug update the buttons of toolbar
+ * @return void
+ * @param[in] ugd the pointer to the main data structure
+ */
+void wfd_ug_update_toolbar(struct ug_data *ugd);
+
+/**
+ * This function let the ug update the available and busy peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_ug_update_available_peers(void *data);
+
+/**
+ * This function let the ug init the genlist
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] is_free_all_peers true to free all peer items
+ */
+void wfd_ug_view_init_genlist(void *data, bool is_free_all_peers);
+
+/**
+ * This function let the ug delete dead peers
+ * @return void
+ * @param[in] ugd the pointer to the main data structure
+ * @param[in] start_pos the pointer to start of peer list
+ * @param[in] cnt the pointer to the number of peets in list
+ */
+void delete_not_alive_peers(struct ug_data *ugd, device_type_s **start_pos,
+ int *cnt);
+
+/**
+ * This function let the ug mark up the dead peers
+ * @return void
+ * @param[in] ugd the pointer to the main data structure
+ * @param[in] start_pos the pointer to start of peer list
+ */
+void set_not_alive_peers(device_type_s *start_pos);
+
+/**
+ * This function let the ug update connected peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_ug_update_connected_peers(void *data);
+
+/**
+ * This function let the ug update the multi-connect peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_ug_view_update_multiconn_peers(void *data);
+
+/**
+ * This function let the ug update the failed peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_ug_update_failed_peers(void *data);
+
+/**
+ * This function let the ug cancel progressbar stop timer
+ * @return void
+ * @param[in] ugd the pointer to the main data structure
+ */
+void wfd_cancel_progressbar_stop_timer(struct ug_data *ugd);
+
+/**
+ * This function let the ug cancel not-alive devices delete timer
+ * @return void
+ * @param[in] ugd the pointer to the main data structure
+ */
+void wfd_cancel_not_alive_delete_timer(struct ug_data *ugd);
+
+/**
+ * This function let the ug move ctxpopup to specified location
+ * @return void
+ */
+void _ctxpopup_move();
+
+int _create_available_dev_genlist(void *data);
+
+Evas_Object *_create_no_device_genlist(void *data);
+
+Evas_Object *_create_no_device_multiconnect_genlist(struct ug_data *ugd);
+
+/**
+ * This function let the ug create rename popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+
+void _gl_rename_device_sel(void *data, Evas_Object *obj, void *event_info);
-void wfd_ug_tickernoti_popup(char *msg);
+#ifdef WFD_ON_OFF_GENLIST
+/**
+ * This function let the ug create on off check
+ * @return void
+ * @param[in] parent the pointer to the naviframe
+ */
+void wfd_ug_create_on_off_check(struct ug_data *ugd);
+#endif
+/**
+ * This function is called after select all button is checked to select all available devices
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_genlist_select_all_check_changed_cb(void *data, Evas_Object *obj,
+ void *event_info);
#endif /* __WFD_UG_VIEW_H__ */
diff --git a/ug-wifidirect/po/CMakeLists.txt b/ug-wifidirect/po/CMakeLists.txt
index f54113b..e8773a4 100644
--- a/ug-wifidirect/po/CMakeLists.txt
+++ b/ug-wifidirect/po/CMakeLists.txt
@@ -1,6 +1,9 @@
# 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_US.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")
@@ -15,8 +18,7 @@ FOREACH(pofile ${POFILES})
COMMAND ${MSGFMT} -o ${moFile} ${absPofile}
DEPENDS ${absPofile}
)
- INSTALL(FILES ${moFile}
- DESTINATION /opt/ug/res/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+ INSTALL(FILES ${moFile} DESTINATION /usr/share/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
SET(moFiles ${moFiles} ${moFile})
ENDFOREACH(pofile)
diff --git a/ug-wifidirect/po/ar.po b/ug-wifidirect/po/ar.po
index ba92fa7..b87d28a 100644..100755
--- a/ug-wifidirect/po/ar.po
+++ b/ug-wifidirect/po/ar.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "تم التوصيل"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "أدخل المعرف"
-msgid "IDS_WFD_CONNECTING"
-msgstr "جاري التوصيل"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "تم الوصول إلى أقصى عدد من الحروف."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "جاري الفصل..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "تم تحديد %d"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "تم التوصيل"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "تفعيل"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "خطأ غير معروف"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "عدم تطابق رموز PIN!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "تم الوصول إلى الحد الأقصى من عدد الأحرف %d"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "جاري التفعيل..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "فشل الحصول على عنوان IP."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "تم تحديد %d"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "تم الاتصال بشبكة Wi-Fi التي تحمل الاسم %s"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "جاري إلغاء التفعيل..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "أبدًا"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "تنزيل البيانات عبر شبكة Wi-Fi و4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "تنزيل البيانات عبر شبكة Wi-Fi و3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "تجاهل"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "إلغاء"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "موافق"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "تم الاتصال"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "التبديل تلقائيا بين شبكات Wi-Fi والهاتف المحمول للحفاظ على اتصال إنترنت ثابت."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "حدث خطأ في المصادقة"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "سيتم استخدام شبكة Wi-Fi وشبكات الهاتف المحمول معًا لتنزيل الملفات بشكل أسرع. قد يزيد ذلك استخدام بيانات هاتفك المحمول."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "تم تفعيل تبديل الشبكة الذكي. تساعد هذه الوظيفة على المحافظة على اتصال إنترنت ثابت عبر التبديل بين شبكات جهاز المحمول وWi-Fi. قد يزيد هذا من استخدام البيانات."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "تم تحديد %s.‏\n\nإذا تعذر عليك الاتصال بنقطة الوصول، فغيّر بطاقة SIM المستخدمة للتحقق عبر الانتقال إلى إدارة بطاقة SIM. ثم حدد بطاقة SIM التي تريد استخدامها لبيانات الهاتف المحمول ورسائل الوسائط المتعددة. بدلاً من ذلك، يمكنك إلغاء تحميل بطاقة SIM التي لا تريد استخدامها."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "اضغط WPS في نقطة وصول Wi-Fi خلال %d دقيقة."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "مفتوح"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "لا يتوفر Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "سيتم قطع اتصال الشبكة الحالية."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "عرض كلمة المرور"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "مفعل"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "غير مفعل"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "نسيان الشبكة"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "تبديل الشبكة الذكي"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "قوة الإشارة"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "تخفيض استخدام بيانات الهاتف المحمول"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "جعل السرعة أولوية"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "ربط الشبكات"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "معلومات حول شبكة Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "تحديد طريقة WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "عنوان التفويض"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "كلمة المرور"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "غير مدعوم"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "أدخل كلمة المرور."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "زر WPS"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "بحث"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "أجهزة Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "العثور على الشبكة المخفية"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "شبكات Wi-Fi متاحة."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "مباشر Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "أثناء الشحن فقط"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "ضعيفة"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "شهادة المستخدم"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "غير محدد"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "غير معروف"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "لتنزيل ملفات أكبر حجمًا بشكل أسرع، استخدم شبكة Wi-Fi وشبكات الهواتف المحمولة معاً ."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "قناع الشبكة الفرعية"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "ثابت IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "فرز بواسطة"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "جاري البحث..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "استلام إشعارات عند توفّر الشبكات"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "منفذ الوكيل"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "انقر للتوصيل"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "الاسم"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "عنوان MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "عنوان IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "الهوية"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "عنوان البوابة"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "أدخل الهوية."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "أسلوب EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "جار التوصيل..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "توصيل"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "إلغاء الاتصال"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "تم الحفظ."
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "تم اكتشاف شبكة Wi-Fi. سيتم الاتصال."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "ضبط متقدم"
+
+msgid "IDS_COM_SK_NO"
+msgstr "لا"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "سياسة الأمان تقيد استخدام Wi-Fi."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "انقر هنا للاتصال."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "يتم توصيل جهازك بـ %1$s. ولكن، قد لا توفر هذه الشبكة الوصول إلى الإنترنت.\nانقر فوق موافق لتبقى على اتصال بـ %1$s الآن، وقم أيضا بمنع تبديل الشبكة الذكي من الاتصال بهذه الشبكة في المستقبل."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "حول Wi-Fi Direct"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "لا يمكن تنشيط كل من Wi-Fi وMobile AP في الوقت نفسه. هل تريد إلغاء تنشيط Mobile AP؟"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "تعمل شبكة Wi-Fi Direct على تفعيل أجهزة Wi-Fi للاتصال مباشرة والطباعة ومشاركة الملفات والمزامنة ومشاركة الشاشة بسهولة وراحة أكبر. ومن خلال الاتصال بالأجهزة التي تدعم شبكة Wi-Fi Direct، يمكن مشاركة المحتوى ومزامنة البيانات والتواصل مع الأصدقاء على المستوى الاجتماعي وتشغيل الألعاب والصوت ومقاطع الفيديو وغير ذلك المزيد باستخدام تطبيقات متعددة"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "تسجيل الدخول لشبكة Wi-Fi"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "قد لا يتوفر الإنترنت"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "عدم السؤال مرة أخرى"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "فتح إعدادات Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "لم يتم العثور على أجهزة"
+
+msgid "IDS_BR_SK_YES"
+msgstr "نعم"
+
+msgid "IDS_BR_SK_NO"
+msgstr "لا"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "إلغاء"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "إعادة تسمية الجهاز"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "اسم الجهاز"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "فشل."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "إلغاء"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "تم التوصيل."
+
+msgid "IDS_BR_SK_OK"
+msgstr "موافق"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "تعرض أسماء الأجهزة لتمييز كل جهاز متوفر في قائمة الأجهزة القريبة، عبر البلوتوث ومباشر Wi-Fi وغيرها من الطرق."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "تغيير الاسم"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "انقر لتغيير الضبط"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "تم إدخال حرف غير صالح. حاول مرة أخرى."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "غير مدعوم."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "متوفر"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "فشل الاتصال"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "أجهزة Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "انقر للتوصيل."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "إلغاء الاتصال"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "الأجهزة المتصلة"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "اختيار الكل"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "الأجهزة المشغولة"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "متصل بجهاز آخر"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "جاري التوصيل"
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "في انتظار الاتصال"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "فشل الاتصال"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "فشل الاتصال."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "اتصال متعدد"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "فصل الكل"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "فصل"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "لم يتم العثور على أجهزة"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "إلغاء تفعيل Wi-Fi Direct بعد استخدامها"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "إلغاء تفعيل Wi-Fi Direct بعد استخدامها"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "إلغاء تفعيل Wi-Fi Direct بعد استخدامها لتوفير البطارية"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "إلغاء تفعيل Wi-Fi Direct بعد استخدامها لتوفير البطارية"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "يطلب %s الاتصال بشبكة Wi-Fi Direct. هل تريد السماح؟"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "سيؤدي استخدام Wi-Fi Direct إلى قطع اتصال Wi-Fi الحالي. متابعة؟"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "سيؤدي استخدام Wi-Fi Direct إلى قطع تقييد Wi-Fi الحالي. متابعة؟"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "اتصال Wi-Fi مباشر"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "قطع اتصال Wi-Fi مباشر"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "هل تريد إلغاء اتصال Wi-Fi Direct؟"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "لا توجد أجهزة"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "الاتصال بأجهزة أخرى عبر Wi-Fi مباشر."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "لم يوجد أي نشاط لمدة %d دقائق منذ تفعيل شبكة Wi-Fi Direct. ولإطالة عمر البطارية، تم إلغاء تفعيل Wi-Fi Direct."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "بحث"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "إيقاف"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "فشل إلغاء التنشيط"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "فشل إلغاء التنشيط."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "فشل التنشيط"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "فشل التنشيط."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "سيتم قطع الاتصال الحالي. متابعة؟"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "يمكنك الاتصال بما يصل إلى %d أجهزة في نفس الوقت."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "الأجهزة المتاحة"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "يمكنك الاتصال بما يصل إلى %d أجهزة في نفس الوقت"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "فشل في الاتصال بـ %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "تم توصيل الجهاز بجهاز آخر."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "تم توصيله بـ %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "رموز PIN غير متطابقة."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "جاري إلغاء التفعيل..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "سيتم قطع الاتصال الحالي حتى يبدأ المسح. هل تريد المتابعة؟"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "الأجهزة التي فشلت في الاتصال"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "أدخل رمز PIN للاتصال بـ %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "اتصال بـ %s في خلال %d ثوان."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "%s لرمز PIN"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "تحديد أجهزة"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "تم فقد اتصال Wi-Fi Direct"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "اتصال بـ %s في خلال %d ثوان."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "إعادة تسمية الجهاز"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "يتعذر الاتصال"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "إيقاف الاتصال"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "السماح"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "جاري التفعيل..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "توصيل"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "تم التوصيل."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "إدخال اسم الجهاز"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "تم توصيله بـ %d أجهزة عبر Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "غير متصل"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "سيتم إلغاء اتصال مباشر Wi-Fi هذا."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "لتوفير طاقة البطارية، ألغ تفعيل شبكة Wi-Fi Direct بعد استخدامها."
diff --git a/ug-wifidirect/po/as.po b/ug-wifidirect/po/as.po
new file mode 100644
index 0000000..de81aab
--- /dev/null
+++ b/ug-wifidirect/po/as.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "কোনো ডিভাইচ পোৱা নগ'ল"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "মোৰ ডিভাইচৰ নাম"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ডিভাইচ পুনঃনাম দিয়ক"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ডিভাইচ নামসমূহ কাষৰীয়া ডিভাইচ সূচীত উপলভ্য প্ৰত্যেক ডিভাইচসমূহৰ স্পষ্টতালৈ প্ৰদৰ্শন কৰা হৈছে, আৰু ব্লুটুথ, Wi-Fi Direct আৰু অন্য পদ্ধতিসমূহৰ হৈ৷"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "বৰ্ণৰ সৰ্বাধিক সংখ্যাত উপনীত হৈছে৷"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "সংযোগ হৈ আছে..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "বাতিল কৰক"
+
+msgid "IDS_BR_SK_YES"
+msgstr "হয়"
+
+msgid "IDS_BR_SK_NO"
+msgstr "নহয়"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ঠিক"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "বাতিল কৰক"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "বিফল হৈছে৷"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "সক্ষম"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d টা চয়নিত"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "সংযোজিত"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "অমান্য বৰ্ণ প্ৰৱিষ্ট কৰা হৈছে। পুনৰ চেষ্টা কৰক।"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "ছেটিংছ পৰিৱৰ্তনৰ বাবে টিপক৷"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "বাতিল"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ঠিক"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "সমৰ্থিত নহয়৷"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Wi-Fi ব্যৱহাৰৰ নিৰাপত্তা আঁচনি প্ৰতিবন্ধিত৷"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "পুনঃনাম"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "উপলভ্য"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "সংযোগ বিফল হৈছে"
+
+msgid "IDS_COM_SK_NO"
+msgstr "নহয়"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct ডিভাইচসমূহ"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "সংযোগ কৰিবলৈ টিপক৷"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "সংযোগ বাতিল কৰক"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "সংযোজিত ডিভাইচ"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "সকলো চয়ন কৰক"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "ব্যস্ত ডিভাইচসমূহ"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "অন্য ডিভাইচৰ সৈতে সংযোগ হৈছে"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "সংযোগলৈ অপেক্ষা কৰক"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "সংযোগ কৰিবলৈ বিফল হৈছে৷"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "একাধিক-সংযোগ"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "সকলো সংযোগহীন কৰক"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "সংযোগহীন"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ব্যৱহাৰ কৰাৰ পিছত Wi-Fi ডাইৰেক্ট অক্ষম কৰক"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "ব্যৱহাৰ কৰাৰ পিছত Wi-Fi Direct অক্ষম"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "সংৰক্ষণ কৰা বেটাৰীলৈ ব্যৱহাৰ কৰাৰ পিছত Wi-Fi ডাইৰেক্ট অক্ষম কৰক"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "সংৰক্ষণ কৰা বেটাৰীলৈ ব্যৱহাৰ কৰাৰ পিছত Wi-Fi ডাইৰেক্ট অক্ষম কৰক"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s এটা Wi-Fi ডাইৰেক্ট সংযোগৰ অনুৰোধ কৰিছে৷ অনুমতি?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct ব্যৱহাৰ কৰি থাকিলে, সাম্প্ৰতিক Wi-Fi সংযোগ সংযোগহীন হৈ পৰিব৷ অব্যাহত ৰাখিবনে?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct ব্যৱহাৰ কৰি থাকিলে, সাম্প্ৰতিক Wi-Fi সংযোগ সংযোগহীন হৈ পৰিব৷ অব্যাহত ৰাখিবনে?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct সংযোগ"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct সংযোগ কৰক"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct সংযোগ বাতিল কৰিবনে?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi ডাইৰেক্ট হৈ অন্য ডিভাইচলৈ সংযোগ কৰক৷"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct সক্ষম হৈ থকাৰ পৰা %d মিনিটৰ কাৰণে কোনো কাৰ্যকাৰিতা নাছিল৷ বেটাৰী লাইফ বৃদ্ধি কৰিবলৈ, Wi-Fi Direct অক্ষম কৰিব লাগিব৷"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "স্কেন"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "বন্ধ কৰক"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "সক্ৰিয়হীন বিফল হৈছে৷"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "সক্ৰিয়কৰন বিফল হ'ল৷"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "সাম্প্ৰতিক নেটৱৰ্ক সংযোগহীন হ'ব৷ জাৰী ৰাখিবনে?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "আপুনি একে সময়তে %d ডিভাইচলৈকে সংযোগ কৰিব পাৰে৷"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "উপলভ্য ডিভাইচসমূহ"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s লৈ সংযোগ কৰিবলৈ বিফল হৈছে৷"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "অন্য ডিভাইচলৈ ডিভাইচ সংযোগ হৈছে৷"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s সৈতে সংযোজিত৷"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "পিন মিলা নাই৷"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "নিস্ক্ৰীয় হৈ আছে..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "শেহতীয়া সংযোগ সংযোগহীন কৰা হ'ব যাতে স্কেনিং আৰম্ভ কৰিব পাৰে৷ জাৰী ৰাখিবনে?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "সংযোগ কৰিবলৈ বিফল হোৱা ডিভাইচসমূহ"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s-লৈ সংযোগ কৰিবলৈ PIN প্ৰৱিষ্ট কৰক৷"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d ছেকেণ্ডত %s লৈ সংযোগ কৰক৷"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "পিন %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ডিভাইচসমূহ চয়ন কৰক"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct সংযোগ হেৰাইছে৷"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s ছেকেণ্ডত %d-ৰ সৈতে সংযোগ কৰক৷"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ডিভাইচ পুনঃনামাংকন কৰক"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "সংযোগ কৰাত অক্ষম"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "সংযোগ বন্ধ কৰক"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "অনুমতি"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "সক্ৰিয় হৈ আছে..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "সংযোগ"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "সংযোজিত৷"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ডিভাইচৰ নাম প্রৱিষ্ট কৰক"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct হৈ %d ডিভাইচৰ সৈতে সংযোগ হৈছে৷"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "সংযোগ হোৱা নাই"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "এই Wi-Fi Direct-ৰ সংযোগ বাতিল হ'ব৷"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "বেটাৰীৰ পাৱাৰ সংৰক্ষণ কৰিবলৈ, ব্যৱহাৰৰ পাছত Wi-Fi ডাইৰেক্ট অক্ষম কৰক৷"
+
diff --git a/ug-wifidirect/po/az.po b/ug-wifidirect/po/az.po
index b066340..c969b7a 100644..100755
--- a/ug-wifidirect/po/az.po
+++ b/ug-wifidirect/po/az.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Qoşuldu"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "ID-nizi daxil edin."
-msgid "IDS_WFD_CONNECTING"
-msgstr "qoşulur"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Simvol sayı maksimuma çatıb."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d seçilmişdir"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Qoş"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Simvolların sayı maksimuma %d çatıb"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP ünvanın əldə etmək mümkün olmadı."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Wi-Fi şəbəkəsinə %s qoşuldu"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Bağlantı kəsilir"
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Heç zaman"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Wi-Fi və 4G vasitəsilə yüklə"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Wi-Fi və 3G vasitəsilə yüklə"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Unut"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Ləğv et"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Oldu"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Qoşuldu"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Naməlum xəta"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Sabit internet bağlantısı qurmaq üçün Wi-Fi və mobil şəbəkələr arasında avtomatik keçin."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-lər uyğun deyil!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Eyniləşdirmə səhvi baş verdi"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Fəallaşdırılır..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi və mobil şəbəkələr bu faylların daha cəld yüklənməsi üçün birlikdə istifadə ediləcəkdir. Bu sizin mobil internetdən istifadənizi artıracaqdır."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d seçilmişdir"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Ağıllı şəbəkə keçiricisi aktivləşdirildi. Bu funksiya mobil və Wi-Fi şəbəkələri arasında keçməklə sabit internet bağlantısı yaratmağa kömək edir. Bu sizin mobil tarifdən istifadənizi artıracaqdır."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Söndürülür..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s seçildi.\n\nAP-a qoşula bilmədiyinizdə, SIM kart menecerinə keçərək təsdiq üçün istifadə edilən SIM kartı dəyişin. Sonra Mobil tarif və multimedia mesajları üçün istifadə etmək istədiyiniz SIM kartı seçin. Alternativ olaraq siz istifadə etmək istəmədiyiniz SIM kartı çıxara bilərsiniz."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Dəstəklənmir"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "%d dəqiqə ərzində Wi-Fi giriş nöqtəsində WPS düyməsini bas."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Aç"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi AP tapılmadı."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Cari şəbəkə ilə əlaqə kəsiləcək."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Parolu göstər"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Qoş"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Söndür"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Şəbəkə unudulsun"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Smart şəbəkə keçidi"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Siqnal səviyyəsi"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Mobil int-dən ist-i azalt"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Üstünlük verilən sürət"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Şəbəkə bağlantısı"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi şəbəkə məlumatı"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS üsulunu seç"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Giriş modulu ünvanı"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Şifrə"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Kodu daxil et."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS düyməsi"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Axtarın"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct cihazları"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Gizli şəbəkləri tap"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi şəbəkələri mövcuddur."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Yalnız doldurulma zamanı"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Zəif"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "İstifadəçi sertifikatı"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Təyin edilməyib"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Naməlum"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Böyük faylları daha cəld yükləmək üçün Wi-Fi və mobil şəbəkədən eyni zamanda istifadə edin."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Şəbəkə altı qoruyucusu"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statik İP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sıralama qaydası"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Skan edilir..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Şəbəkələr mövcud olduqda bildirişlər alın"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Qoşulmaq üçün vur"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proksi portu"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Ad"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC ünvanı"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP ünvanı"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Kimlik"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Giriş ünvanı"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Eyniliyi daxil edin."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP metodu"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "qoşulur"
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Qoşul"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Bağlantını ləğv et"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Yaddaşa yazıldı"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fi şəbəkəsi aşkarlandı. Siz qoşulacaqsınız"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Təkmilləşdirilmiş parametrlər"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Xeyr"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Təhlükəsizlik siyasəti Wi-Fi-dan istifadəni məhdudlaşdırır."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Direct haqqında"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Qoşulmaq üçün vurun."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct Wi-Fi cihazlarının birbaşa qoşulma, çap etmə, fayl paylaşma, sinxronlaşma və ekran paylaşmasını daha sadə və rahat edir. Wi-Fi Direct dəstəkləyən cihazlara qoşulmaq müxtəlif proqramlardan istifadə edərək məzmunuzu paylaşmağı, məlumatlarınızı paylaşmağı, sosiallaşmağı, oyunlar oynamağı, audio, videolar və sairəyə imkan verir"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Cihazınız %1$s-a qoşulmuşdur. Lakin bu şəbəkənin internetə çıxışı olmaya bilər.\n%1$s-a qoşulmuş qalmaq üçün OK vurun, lakin eyni zamanda Smart şəbəkəsinin gələcəkdə qoşulduğu şəbəkədən bu şəbəkəyə keçməsinə yol verməyin."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi və Mobile AP eyni zamanda aktivləşdirilə bilməz. Mobile AP qeyri-aktiv edilsin?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi şəbəkəsinə daxil ol"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "İnternet mövcud olmaya bilər"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Təkrar soruşma"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi parametrlərini aç"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Heç bir cihaz tapılmadı"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Bəli"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Xeyr"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Ləğv et"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Cihazın adını dəyiş"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Qurğumun adı"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Mümkün olmadı."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Ləğv et"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Qoşuldu"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Adını dəyişdir"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Parametrləri dəyişmək üçün vurun"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Səhv simvol daxil edilib. Təkrar cəhd et"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Dəstəklənmir."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "İstifadə etmək mümkündür"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Bağlantı uğursuzdur"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct cihazları"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Qoşulmaq üçün vur."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Bağlantını ləğv et"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Qoşulmuş cihazlar"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Hamısını seç"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Məşğul cihazlar"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Digər cihazlarla qoşulub"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "qoşulur"
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Bağlantını gözləyir"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Bağlantı alınmadı"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Bağlantı alınmadı."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Çoxlu bağlantı"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Hamısı ilə əlaqəni kəs"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Bağlantını kəs"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Heç bir cihaz tapılmadı"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "İstifadədən sonra Wi-Fi Direct-i qeyri-aktiv et"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "İst.dən sonra Wi-Fi Direct-i söndür"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Batareyaya qənaət üçün istifadədən sonra Wi-Fi Direct-i qeyri-aktiv et"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Batareyaya qənaət üçün Wi-Fi Direct-i söndürün"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s Wi-Fi Direct bağlantısı sorğulayır. İcazə verilsin?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct istifadəsi cari Wi-Fi bağlantısını kəsəcək. Davam edilsin?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct istifadəsi mövcud Wi-Fi bağlantısını kəsəcək. Davam edilsin?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct bağlantısı"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ilə əlaqəni kəs"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Wi-Fi Direct bağlantısı ləğv edilsin?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Cihaz yoxdur"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ilə digər cihazlara qoşul."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct aktivləşdiriləndən %d dəqiqə ərzində fəaliyyət olmamışdır. Batareyanın istifadə müddətini uzatmaq üçün Wi-Fi Direct qeyri-aktiv edilmişdir."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Axtar"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Dayandır"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Söndürülmə alınmadı"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Söndürülmə alınmadı."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Fəallaşdırmaq mümkün olmadı"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Fəallaşdırmaq mümkün olmadı."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Hazırkı bağlantı kəsiləcək. Davam edilsin?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Siz eyni zamanda maksimum %d cihaza qoşula bilərsiniz."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Mümkün cihazlar"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Siz eyni zamanda maksimum %d cihaza qoşula bilərsiniz"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s qoşulma alınmadı."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Cihaz başqa bir cihaza qoşulub."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s ilə qoşuldu."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN kodlar uyğun deyil."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Söndürülür..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Axtarışa başlamaq üçün cari bağlantı ilə əlaqə kəsiləcək. Davam edilsin?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Qoşulmanın uğursuz olduğu cihazlar"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s qoşulmaq üçün PIN daxil et."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%s qoşul %d saniyəyə."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN kod %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Cihazları seç"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct bağlantısı kəsildi."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%d saniyəyə %s ilə qoşul."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Cihazın adını dəyiş"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "P I N"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Qoşulmaq mümkün deyil"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Bağlantını kəs"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "İcazə ver"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Fəallaşdırılır..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Qoşul"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Qoşuldu."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Cihaz adını daxil edin"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct vasitəsilə %d cihazla qoşulub."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Qoşulmamışdır"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Bu Wi-Fi Direct bağlantısı ləğv ediləcək."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Batareya enerjisinə qənaət etmək üçün istifadədən sonra Wi-Fi Direct-i deaktiv edin."
diff --git a/ug-wifidirect/po/bg.po b/ug-wifidirect/po/bg.po
index 3f8da15..d67f429 100644..100755
--- a/ug-wifidirect/po/bg.po
+++ b/ug-wifidirect/po/bg.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Свързан"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Въведете вашия ИД."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Свързване..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Достигнат максимален брой знаци."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Изключване..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d избрани"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Свързан"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Разрешаване"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Неизвестна грешка"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN кодовете не съвпадат!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Достигнат е максималният брой знаци %d."
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Активиране..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Неуспешно получаване на IP адрес."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d избрани"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Свързано e към Wi-Fi мрежа %s."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Деактивиране..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Никога"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Не се поддържа"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Изтег. на данни през Wi-Fi и 4G"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Изтег. на данни през Wi-Fi и 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Забравяне"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Отмени"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Свързано"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "За автоматично превключване между Wi-Fi и мобилни мрежи за поддържане на стабилна интернет връзка."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Възникна грешка при удостоверяване"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi и мобилните мрежи ще се използват заедно за по-бързо изтегляне на файлове. Това може да увеличи вашето потребление на мобилни данни."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Превключване на умна мрежа е активирано. Тази функция помага да се запази стабилна интернет връзка, като превключва между мобилна и Wi-Fi мрежа. Това може да увеличи потреблението на мобилни данни."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s е избрано.\n\nАко не можете да се свържете към точка за достъп, сменете SIM картата, използвана за потвърждаване, като отидете в „Диспечер на SIM карти“. След това изберете SIM картата, която искате да използвате за Мобилни данни и за мултимедийни съобщения. Също така можете да демонтирате SIM картата, която не искате да използвате."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Натиснете WPS на Wi-Fi точката за достъп в рамките на %d минути."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Отваряне"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Не е намерена Wi-Fi AP."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Връзката с текущата мрежа ще бъде прекъсната."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Показване на паролата"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Включено"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Изключено"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Забравяне на мрежата"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Превключв. на умна мрежа"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Сила на сигнала"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Намал. използ. моб. данни"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Приоритет на скоростта"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Свързване на мрежа"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Информация за Wi-Fi мрежа"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Избор на WPS метод"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Адрес на прокси"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Парола"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Въвеждане на парола"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Бутон WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Сканиране"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Устройства за Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Намиране на скрита мрежа"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Има достъпни Wi-Fi мрежи."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Само докато се зарежда"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Слаб"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Сертификат потр."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Неопределен"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Няма информация"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "За да изтегляте по-големи файлове по-бързо, използвайте Wi-Fi и мобилни мрежи за едно."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Подмрежова маска"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Статичен IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Сортиране по"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Сканиране..."
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Чукнете, за да се свържете"
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Получаване на известия, когато има достъпни мрежи"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Порт за прокси"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Име"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC адрес"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP адрес"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Самоличност"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Адрес на шлюз"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Въведете самоличност."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Метод EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Свързване..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Свързване"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Отмяна на връзката"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Записан"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Открита е Wi-Fi връзка. Ще бъдете свързани."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Разширени настройки"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Не"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "За Wi-Fi Direct"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Правилата за защита ограничават използването на Wi-Fi."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct позволява на Wi-Fi устройства да се свързват директно, като прави печата, споделянето на файлове, синхронизирането и споделянето на екрани много по-просто и по-удобно. Свързването към устройства, които поддържат Wi-Fi Direct, позволява да споделяте съдържанието си, да синхронизирате данните си, да се социализирате с приятелите си, да играете игри, да възпроизвеждате аудио, видео и много други, с помощта на различни приложения."
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Чукнете тук, за да се свържете."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Устройството ви се свързва към %1$s. Все пак, тази мрежа може да не осигурява интернет достъп.\nЧукнете OK, за да останете свързани към %1$s сега, но също и да предотвратите свързване на Превключване на умна мрежа към тази мрежа в бъдеще."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi и Mobile AP не могат да бъдат активирани едновременно.. Деактивиране на Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Влизане в Wi-Fi мрежа"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Интернет може да не е достъпен"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Не питай повече"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Отворете настройките за Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Не са намерени устройства"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Да"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Не"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Отмени"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Преименуване на устройството"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Име на моето устройство"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Неуспешно."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Отказ"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Свързан"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Имената на устройствата са показани, за да се различава всяко от устройствата, налични в списъка с устройства наблизо, и през Bluetooth, Wi-Fi Direct и други методи."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Ново име"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Чукнете, за да промените настройките"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Въведен е невалиден знак. Опитайте отново"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Не се поддържа."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Достъпен"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Свързването е неусп."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Устройства за Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Чукнете, за да се свържете."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Отмяна на връзката"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Свързани устройства"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Избери всички"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Заети устройства"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Свързано с друго устройство"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Свързване..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Изчакване на връзка"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Неуспешно свързване"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Неуспешно свързване."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Мултивръзка"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Прекъсване на всички"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Изключване"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Не са намерени устройства"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Деактивиране на Wi-Fi Direct след използване"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Деакт. Wi-Fi Direct след използване"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Деактивиране на Wi-Fi Direct след използване, за да се пести батерията"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Деактив. Wi-Fi Direct след използв. за пест. бат."
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s иска разрешение за Wi-Fi Direct връзка. Разрешавате ли?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Използването на Wi-Fi Direct ще прекъсне текущата Wi-Fi връзка. Продължаване?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Използването на Wi-Fi Direct ще прекъсне текущото сдвояване. Продължаване?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Връзка Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Край връзка Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Отмяна на връзка Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Няма устройства"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Свързване към други устройства през Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Не е имало никаква активност в продължение на %d минути от активирането на Wi-Fi Direct. За да се удължи животът на батерията, Wi-Fi Direct е деактивиран."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Скани-ране"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Стоп"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Деактивирането неуспешно"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Деактивирането e неуспешно."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "Неуспешно активиране"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Текущата връзка ще бъде прекъсната. Продължаване?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Можете да свържете до %d устройства едновременно."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Достъпни устройства"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Можете да свържете до %d устройства едновременно"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Неуспешно свързване с %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Устройството е свързано към друго устройство."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Свързан с %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-овете не съвпадат."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Деактивиране..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Текущата връзка ще бъде прекъсната, за да може да стартира сканирането. Продължавате ли?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Устройства, които не са успели да се свържат"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Въведете PIN, за да се свържете с %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Свързване към %s след %d секунди"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN код %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Изберете устройства"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct връзката е изгубена."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Свързване към %s след %d сек."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Преименуване на устройството"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Не може да се свърже"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Край на връзката"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Позволи"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Активиране..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Свързване"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Свързан."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Въведете име на устройството"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Свързано с %d устройства през Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Не е свързано"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Тази Wi-Fi Direct връзка ще бъде отменена."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "За да пестите енергията на батерията, деактивирайте Wi-Fi Direct след използване."
diff --git a/ug-wifidirect/po/bn.po b/ug-wifidirect/po/bn.po
new file mode 100644
index 0000000..a289e4a
--- /dev/null
+++ b/ug-wifidirect/po/bn.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "কোনও ডিভাইস খুঁজে পাওয়া যায়নি"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "আমার ডিভাইসের নাম"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ডিভাইসের পুনঃনামকরণ"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "কাছাকাছি ডিভাইসের তালিকা, এবং ব্লুটুথ, Wi-Fi Direct এবং অন্যান্য পদ্ধতিগুলির মাধ্যমে সুলভ প্রতিটি ডিভাইসকে আলাদা করতে ডিভাইসের নামগুলি প্রদর্শিত।"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "অক্ষর সর্বাধিক সংখ্যায় পৌঁছেছে।"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "সংযোগ হচ্ছে..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "বাতিল"
+
+msgid "IDS_BR_SK_YES"
+msgstr "হ্যাঁ"
+
+msgid "IDS_BR_SK_NO"
+msgstr "না"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ওকে"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "বাতিল"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "ব্যর্থ হয়েছে।"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "সক্ষম"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%dটি নির্বাচিত"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "সংযুক্ত"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "অবৈধ অক্ষর প্রবেশ করানো হয়েছে৷ আবার চেষ্টা করুন।"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "সেটিংস পরিবর্তন করতে ট্যাপ করুন।"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "বাতিল"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ওকে"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "সমর্থিত নয়।"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "সুরক্ষা নীতি Wi-Fi-এর ব্যবহারকে সীমাবদ্ধ করে।"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "পুনঃনামকরণ"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "সুলভ"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "সংযোগ ব্যর্থ"
+
+msgid "IDS_COM_SK_NO"
+msgstr "না"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct ডিভাইসগুলি"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "সংযোগ স্থাপন করতে ট্যাপ করুন।"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "সংযোগ বাতিল করুন"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "সংযুক্ত ডিভাইসগুলি"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "সমস্ত নির্বাচন করুন"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "ব্যস্ত ডিভাইসগুলি"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "অন্য একটি ডিভাইসের সাথে সংযুক্ত"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "সংযোগের জন্য প্রতীক্ষারত"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "সংযোগ করতে ব্যর্থ।"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "একাধিক-সংযোগ"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "সমস্ত সংযোগ বিচ্ছিন্ন করুন"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "বিচ্ছিন্ন"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ব্যবহারের পরে Wi-Fi Direct অক্ষম করুন"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Wi-Fi Direct ব্যবহারের পরে অক্ষম করুন"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "ব্যাটারি সাশ্রয় করতে ব্যবহারের পরে Wi-Fi Direct অক্ষম করুন"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "ব্যাটারি সাশ্রয় করতে Wi-Fi Direct ব্যবহারের পরে অক্ষম করুন"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s একটি Wi-Fi Direct সংযোগের চেষ্টা করছে৷ অনুমতি দেবেন?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct ব্যবহার করা হলে বর্তমান Wi-Fi সংযোগ বিচ্ছিন্ন হবে৷ অবিরত রাখবেন?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct ব্যবহার করা হলে বর্তমান Wi-Fi সংযোগ বিচ্ছিন্ন হবে৷ অবিরত রাখবেন?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct সংযোগ"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct থেকে সংযোগ বিচ্ছিন্ন"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct সংযোগ বাতিল করবেন?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct-এর মাধ্যমে অন্যান্য ডিভাইসে সংযোগ স্থাপন।"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct সক্ষম থাকার কারণে %d মিনিট যাবত কোনও ক্রিয়াকলাপ ছিল না৷ ব্যাটারির আয়ুষ্কালটি প্রসারিত করতে Wi-Fi Directটি অক্ষম আছে৷"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "স্ক্যান করুন"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "থামুন"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "নিষ্ক্রিয়করণ ব্যর্থ।"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "সক্রিয়করণ ব্যর্থ।"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "বর্তমান সংযোগ বিচ্ছিন্ন হবে। অবিরত থাকবেন?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "আপনি একই সময়ে %dটি পর্যন্ত ডিভাইস সংযুক্ত করতে পারেন।"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "সুলভ ডিভাইসগুলি"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s-এ সংযোগ স্থাপন করতে ব্যর্থ।"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "ডিভাইস অন্য একটি ডিভাইসের সাথে সংযুক্ত।"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s-এর সঙ্গে সংযুক্ত।"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINগুলি অনুরূপ নয়।"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "নিষ্ক্রিয় করা হচ্ছে…"
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "স্ক্যানিং যাতে শুরু হতে পারে তাই বর্তমান সংযোগটি সংযোগ বিচ্ছিন্ন হবে৷ অবিরত থাকবেন?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "যে ডিভাইসগুলি সংযোগ করতে ব্যর্থ"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s-এর সাথে সংযোগ স্থাপন করতে PIN লিখুন।"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d সেকেন্ডের মধ্যে %s-এর সাথে সংযোগ করুন।"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ডিভাইসগুলি নির্বাচন করুন"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct সংযোগটি হারিয়েছে।"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%d সেকেন্ডে %s-এর সঙ্গে সংযোগ।"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ডিভাইসের পুনঃনামকরণ করুন"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "সংযোগ করতে অক্ষম"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "সংযোগ থামান"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "অনুমতি দিন"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "সক্রিয় করা হচ্ছে…"
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "সংযোগ"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "সংযুক্ত।"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ডিভাইস নাম লিখুন"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct-এর মাধ্যমে %dটি ডিভাইসের সাথে সংযুক্ত।"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "সংযুক্ত নয়"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "এই Wi-Fi Direct সংযোগগুলি বাতিল হবে।"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ব্যাটারি পাওয়ার সাশ্রয় করতে ব্যবহারের পরে Wi-Fi Direct অক্ষম করুন।"
+
diff --git a/ug-wifidirect/po/ca.po b/ug-wifidirect/po/ca.po
index 0f236f9..5a5dd03 100644..100755
--- a/ug-wifidirect/po/ca.po
+++ b/ug-wifidirect/po/ca.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Introdueixi l'ID"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "S'ha assolit el nombre màxim de caràcters"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d seleccionat"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Activar"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "S'ha assolit el nombre màxim de %d caràcters."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Error en obtenir l'adreça IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Està connectat a la xarxa Wi-Fi %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Mai"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Descarreg dades amb Wi-Fi i 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Descarreg dades amb Wi-Fi i 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Oblidar"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Acceptar"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Connectat"
-msgid "IDS_WFD_CONNECTING"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Alternar automàticament entre xarxes Wi-Fi i mòbils per mantenir una connexió a Internet estable."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "S'ha produït un error d'autenticació"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Les xarxes Wi-Fi i mòbil s'utilitzaran conjuntament per descarregar fitxers més ràpidament. Això pot augmentar l'ús de dades mòbils."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "S'ha habilitat Smart network switch. Aquesta funció l'ajuda a mantenir una connexió a Internet estable canviant entre xarxes mòbils i Wi-Fi. Aquesta acció pot augmentar el seu consum de dades."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "S'ha seleccionat %s.\n\nSi no pot connectar a un punt d'accés, canviï la targeta SIM utilitzada per a la verificació anant al gestor de targetes SIM. Després, seleccioni la targeta SIM que vulgui utilitzar per a les dades mòbils i missatges multimèdia. També pot desmuntar la targeta SIM que no vulgui utilitzar."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Premi WPS al seu punt d'accés Wi-Fi en %d minuts"
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Obrir"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No es troba Wi-Fi AP"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Es desconnectarà la connexió actual"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Mostrar contrasenya"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Activat"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Desactivat"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Oblidar xarxa"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Canvi Smart network"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Potència de senyal"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reduir ús de dades mòbils"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioritzar velocitat"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Vinculació de xarxa"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informació de xarxa Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Seleccionar mètode WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Adreça de proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Contrasenya"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Introduir contrasenya"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Botó WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Escanejar"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Cercar xarxa oculta"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Xarxes Wi-Fi disponibles"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Només mentre es carrega"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Feble"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certificat usuari"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Sense especificar"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Desconegut"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Per descarregar fitxers més ràpidament, utilitzi Wi-Fi i xarxes mòbils conjuntament."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Màscara de subxarxa"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP estàtica"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Ordenar per"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Examinant..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Rebre notificacions quan hi hagi xarxes disponibles"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Port de servidor intermediari"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nom"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Adreça MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Adreça IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identitat"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Adreça passarel·la"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Introduir identitat"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Mètode EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
msgstr "Connectant..."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Desconnectant..."
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Connectar"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Desat"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "S'ha detectat una xarxa Wi-Fi. S'hi connectarà."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Ajustaments avançats"
+
+msgid "IDS_COM_SK_NO"
+msgstr "No"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "La política de seguretat restringeix l'ús de Wi-Fi"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toqui aquí per connectar."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "El dispositiu s'està connectant a %1$s.Tanmateix, aquesta xarxa no pot proporcionar accés a Internet.\nToqui Acceptar per mantenir-se connectat a %1$s, però evitar també que Smart network switch es connecti a aquesta xarxa en el futur."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "No es poden activar els punt d'accés Wi-Fi i mòbil al mateix temps. Desactivar al punt d'accés mòbil?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Iniciar ses a xarxa Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet potser no disponible"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "No ho tornis a preguntar"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Obrir ajustaments Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "No s'han trobat dispositius"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Sí"
+
+msgid "IDS_BR_SK_NO"
+msgstr "No"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Canviar el nom del dispositiu"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "El nom del meu dispositiu"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Error"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cancel·lar"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
msgstr "Connectat"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Error desconegut"
+msgid "IDS_BR_SK_OK"
+msgstr "Acceptar"
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Els PIN no coincideixen!"
+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_WFD_BODY_ACTIVATING"
-msgstr "Activant..."
+msgid "IDS_ST_SK_RENAME"
+msgstr "Canv. nom"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d seleccionat"
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Toqui per canviar ajustaments"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Desactivant..."
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Caràcter introduït no vàlid. Torni-ho a intentar."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
+msgid "IDS_ST_POP_NOT_SUPPORTED"
msgstr "No s'admet"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Disponible"
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Escanejar"
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Error de connexió"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
msgstr "Dispositius Wi-Fi Direct"
-msgid "IDS_WFD_TAP_TO_CONNECT"
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
msgstr "Toqui per connectar"
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Connectar"
-
-msgid "IDS_WFD_BUTTON_CANCEL"
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
msgstr "Cancel·lar connexió"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Sobre Wi-Fi Direct"
-
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct permet als dispositius Wi-Fi connectar-se directament, fent que tasques com imprimir, compartir fitxers, sincronitzar i compartir pantalla siguin molt més senzilles i còmodes. Connectar a dispositius que admeten Wi-Fi Direct fa possible compartir contingut, sincronitzar dades, socialitzar amb amics, jugar a jocs, reproduir àudio i vídeo, etc. amb diverses aplicacions"
-
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Dispositius connectats"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Seleccioni-ho tot"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Dispositius ocupats"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Connectat a un altre dispositiu"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Connectant..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Esperant connexió"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
msgstr "Error en la connexió"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Connexió múltiple"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Desconnectar tot"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Desconnectar"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "No s'han trobat dispositius"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Deshabilitar Wi-Fi Direct després d'ús"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Deshab Wi-Fi Direct després ús"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Deshabilitar Wi-Fi Direct després d'ús per estalviar bateria"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Deshab Wi-Fi Direct després d'ús per estalviar bat"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s està sol·licitant una connexió Wi-Fi Direct. Permetre?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "L'ús de Wi-Fi Direct desconnectarà la connexió Wi-Fi actual. Continuar?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "L'ús de Wi-Fi Direct desconnectarà el tethering Wi-Fi actual. Continuar?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Connexió Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Desconnectar Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Cancel·lar connexió Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Sense dispositius"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connectar a altres dispositius mitjançant Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "No hi ha hagut activitat durant %d minuts des que s'ha habilitat Wi-Fi Direct. Per ampliar la durada de la bateria, s'ha deshabilitat Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Escan"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Aturar"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "Error en desactivar"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "Activació fallida"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Es desconnectarà la connexió actual. Continuar?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Dispositius disponibles"
-
-msgid "IDS_WFD_POP_MULTI_CONNECT"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
msgstr "Pot connectar fins a %d dispositius simultàniament"
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Dispositius dispon"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Error en connectar-se a %s"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Dispositiu connectat a un altre dispositiu"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Connectat a %s"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Els PIN no coincideixen"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Desactivant..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Es desconnectarà la connexió actual per poder iniciar la cerca. Continuar?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Dispositius que no han pogut connectar"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Introduir PIN per connectar a %s"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Connectar a %s en %d segons"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Codi PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Seleccionar dispositius"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "S'ha perdut la connexió Wi-Fi Direct"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Connectar amb %s en %d s"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Canviar el nom del dispositiu"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "No es pot connectar"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Aturar connexió"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Permetre"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Activant..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Connectar"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Connectat"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Introdueixi un nom de dispositiu"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connectat amb %d dispositius mitjançant Wi-Fi Direct"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "No connectat"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Es cancel·larà aquesta connexió Wi-Fi Direct."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Per estalviar bateria, deshabiliti Wi-Fi Direct després d'ús"
+
diff --git a/ug-wifidirect/po/cs.po b/ug-wifidirect/po/cs.po
index e52777c..2127afb 100644..100755
--- a/ug-wifidirect/po/cs.po
+++ b/ug-wifidirect/po/cs.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Připojeno"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Zadejte své ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Připojování..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Bylo dosaženo maximálního počtu znaků."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Vybráno: %d"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Povolit"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Bylo dosaženo maximálního počtu znaků %d."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Nepodařilo se získat IP adresu."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Připojeno k síti Wi-Fi %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nikdy"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Odpojování..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Stáhnout data přes Wi-Fi a 4G"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Stáhnout data přes Wi-Fi a 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN kód WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Odstranit"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Zrušit"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Připojeno"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Neznámá chyba"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automaticky přepíná mezi Wi-Fi a mobilními sítěmi, aby bylo zachováno stabilní připojení k Internetu."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN kódy se neshodují!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Chyba ověření"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktivace..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi a mobilní sítě budou společně použity pro rychlejší stahování souborů. Tím může být zvýšeno využití mobilních dat."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "Vybráno %d"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Byl zapnut Inteligentní přepínač sítě. Tato funkce pomáhá zachovat stabilní připojení k Internetu přepínáním mezi mobilními sítěmi a sítí Wi-Fi. Může se zvýšit využití dat."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deaktivace..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Je vybrána %s.\n\nPokud se nemůžete připojit k přístupovému bodu, změňte SIM kartu použitou k ověření pomocí správce SIM karet. Potom vyberte SIM kartu, kterou chcete použít pro Mobilní data a multimediální zprávy. Nebo můžete odpojit SIM kartu, kterou nechcete použít."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nepodporováno"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Stiskněte do %d minut tlačítko WPS na přístupovém bodu Wi-Fi."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Otevřít"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nebyl nalezen žádný přístupový bod Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Aktuální síť bude odpojena."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Zobrazit heslo"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Zapnuto"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Vypnuto"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Zapomenout síť"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Chytrý přepínač sítě"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Intenzita signálu"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Snížit využití mob. dat"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Priorita rychlost"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Spojování sítí"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informace o síti Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Vyberte metodu WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Adresa proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Heslo"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Zadejte heslo."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Tlač. WPS"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Načíst"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Zařízení Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Najít skrytou síť"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Dostupné sítě Wi-Fi."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Pouze během nabíjení"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Slabý"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Uživ. certifikát"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Nespecifikováno"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Neznámé"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Chcete-li stahovat velké soubory rychleji, použijte Wi-Fi a mobilní sítě dohromady."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Maska podsítě"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Pevná adresa IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Seřadit podle"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Hledám..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Budete upozorňováni, když budou dostupné sítě"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Port serveru proxy"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Klepnutím připojte"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Jméno"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC adresa"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP adresa"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Totožnost"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Adresa brány"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Zadejte identitu."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Metoda EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Připojování..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Připojit"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Zrušit připojení"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Uloženo"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Byla zjištěna síť Wi-Fi. Budete připojeni."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Upřesnit nastavení"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Zásady zabezpečení omezují použití Wi-Fi."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Připojte klepnutím sem."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "O Wi-Fi Direct"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Vaše zařízení se připojuje k %1$s. Tato síť ovšem nemusí poskytovat přístup k Internetu.\nKlepnutím na OK nyní zůstanete připojeni k %1$s, ale zabráníte Inteligentnímu přepínači sítě, aby se k této síti připojil v budoucnu."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Standard Wi-Fi Direct umožňuje bezdrátovým zařízením mnohem jednodušeji a mnohem pohodlněji přímo se připojovat, tisknout, sdílet soubory, provádět synchronizaci a sdílet obraz na displeji. Když se připojíte k zařízením podporujícím standard Wi-Fi Direct, budete moci sdílet obsah, synchronizovat data, komunikovat s přáteli, hrát hry, přehrávat zvukové a obrazové záznamy a kromě toho používat různé aplikace."
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi a mobilní přístupový bod nelze aktivovat současně. Chcete deaktivovat mobilní přístupový bod?"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Přihlásit se k síti Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet nemusí být dostupný"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Příště se neptat"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otevřít nastavení Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nebyla nalezena žádná zařízení"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ano"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Zrušit"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Přejmenovat zařízení"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Název zařízení"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nezdařilo se."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Zrušit"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Připojeno"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Přejmenovat"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Klepněte, chcete-li změnit nastavení"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Byl zadán neplatný znak. Opakujte akci"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodporováno."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Dostupný"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Přip. se nezdařilo"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Zařízení Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Klepnutím připojte."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Zrušit připojení"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Připojená zařízení"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Vybrat vše"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Zaneprázdněná zařízení"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Připojeno k jinému zařízení"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Připojování..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Čekání na připojení"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Připojení se nezdařilo"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Připojení se nezdařilo."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Vícenásobné připojení"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Odpojit vše"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Odpojit"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nebyla nalezena žádná zařízení"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Po použití vypnout Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Po použití vypnout Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Po použití vypnout Wi-Fi Direct z důvodu šetření baterie"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Po použití vypnout Wi-Fi Direct pro úsporu baterie"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s vyžaduje připojení Wi-Fi Direct. Povolit?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Použitím Wi-Fi Direct se odpojí aktuální připojení Wi-Fi. Chcete pokračovat?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Použitím Wi-Fi Direct se odpojí aktuální sdílení připojení Wi-Fi. Chcete pokračovat?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Připojení Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Odpojit Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Zrušit připojení Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Žádná zařízení"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Připojit k dalším zařízením prostřednictvím Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Po zapnutí Wi-Fi Direct nebyla po dobu %d minut vyvinuta žádná aktivita. Wi-Fi Direct bylo vypnuto z důvodu prodloužení životnosti baterie."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Hledat"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stop"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deaktivace se nezdařila"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deaktivace se nezdařila."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktivace se nezdařila"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktivace se nezdařila."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Aktuální připojení bude odpojeno. Chcete pokračovat?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Současně se můžete připojit max. k %d zařízením."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Dostupná zařízení"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Současně se můžete připojit max. k %d zařízením"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Nepodařilo se připojit k %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Zařízení je připojeno k jinému zařízení."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Připojeno k %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN kódy se neshodují."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deaktivace..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Aktuální připojení bude odpojeno, aby mohlo být zahájeno vyhledávání. Chcete pokračovat?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Zařízení, ke kterým se nepodařilo připojit"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Zadejte PIN kód pro připojení k %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Připojí se k %s za %d sekund."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN kód %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Vyberte zařízení"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Připojení Wi-Fi Direct bylo přerušeno."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Připojit k %s za %d s."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Přejmenovat zařízení"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Připojení se nezdařilo"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Zastavit připojení"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Povolit"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktivace..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Připojit"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Připojeno."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Zadejte název zařízení"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Připojeno k %d zařízením prostřednictvím Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Nepřipojeno"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Toto připojení Wi-Fi Direct bude zrušeno."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Chcete-li šetřit energii baterie, vypněte po použití Wi-Fi Direct."
diff --git a/ug-wifidirect/po/da.po b/ug-wifidirect/po/da.po
index ec1fd70..bdc4deb 100644..100755
--- a/ug-wifidirect/po/da.po
+++ b/ug-wifidirect/po/da.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Forbundet"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Indtast dit id."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Opretter forbindelse..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Det maksimale antal tegn er nået."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d valgt"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Aktivér"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Det maksimale antal tegn %d er nået."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Kunne ikke finde IP-adresse."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Sluttet til Wi-Fi-netværk %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Afbryder..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Aldrig"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Download data via Wi-Fi og 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Download data via Wi-Fi og 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN-kode"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Glem"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Annullér"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Forbundet"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Ukendt fejl"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Skift automatisk mellem Wi-Fi og mobile netværk for at opretholde en stabil internetforbindelse."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-koder stemmer ikke overens!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Godkendelsesfejl opstod"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktiverer ..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi- og mobile netværk bruges sammen for at download filer hurtigere. Dette kan øge forbruget af dine mobile data."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d valgt"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Skift til smart-netværk er aktiveret. Denne funktion hjælper med at vedligeholde en stabil internetforbindelse ved at skifte mellem mobile netværk og Wi-Fi-netværk. Dette kan øge dataanvendelsen."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deaktiverer..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s er blevet valgt.\n\nHvis du ikke kan oprette forbindelse til en AP, skal du ændre indstillingen for SIM-kortet, der bruges til bekræftelse, ved at gå til Administration af SIM-kort. Vælg herefter det SIM-kort, du vil bruge til mobile data og mms-beskeder. Alternativt kan du deaktivere det SIM-kort, du ikke vil bruge."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Understøttes ikke"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Tryk på WPS på dit Wi-Fi-adgangspunkt inden for %d minutter."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Åben"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ingen Wi-Fi-AP fundet."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Det aktuelle netværk bliver frakoblet."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Vis adgangskode"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Til"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Fra"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Glem netværk"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Skift til smart-netværk"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signalstyrke"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Nedsæt brug af mob. data"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioritér hastighed"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Netværkstilknytning"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Oplysninger om Wi-Fi-netværk"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Vælg WPS-metode"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy-adresse"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Adgangskode"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Angiv adgangskode."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS-knap"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Scanning"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct-enheder"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Find skjult netværk"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Rør for at tilslutte"
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Tilgængelige Wi-Fi-netværk."
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Forbind"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Kun under opladning"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Svag"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Brugercertifikat"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Ikke specificeret"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Ukendt"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Hvis du vil downloade store filer hurtigere, skal du bruge Wi-Fi- og mobile netværk samtidig."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Subnet-maske"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statisk IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sortér efter"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Scanner ..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Modtag meddelelser, når der er tilgængelige netværk."
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy-port"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Navn"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-adresse"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-adresse"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identitet"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Gateway-adresse"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Indtast identitet."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP-metode"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Opretter forbindelse..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Tilslut"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Gemt"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Et Wi-Fi-netværk er blevet registreret. Du vil blive tilsluttet."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Avancerede indstillinger"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Annuller forbindelse"
+msgid "IDS_COM_SK_NO"
+msgstr "Nej"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Om Wi-Fi Direct"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Sikkerhedspolitik begrænser brug af Wi-Fi."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct gør det muligt for Wi-Fi-enheder at tilslutte direkte og gøre udskrivning, fildeling, synkronisering og skærmdeling meget enklere og mere praktisk. Tilslutning til enheder, der understøtter Wi-Fi Direct, gør det muligt at dele dit indhold, synkronisere dine data, være social med venner, spille spil, lyd, video og mere ved hjælp af forskellige programmer"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tap her for at forbinde."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Din enhed opretter forbindelse til %1$s. Men dette netværk har ikke internetadgang.\nTap på OK for at opretholde forbindelsen til %1$s nu, men forhindr smart-netværk-skift i at oprette forbindelse til dette netværk fremover."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Både Wi-Fi og mobilt adgangspunkt kan ikke være aktiveret på samme tid. Deaktivér mobilt adgangspunkt?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Log på Wi-Fi-netværk"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet muligvis ikke tilg."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Spørg ikke igen"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Åbn Wi-Fi-indstillinger"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Ingen enheder fundet"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nej"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annullér"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Omdøb enhed"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Mit enhedsnavn"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Mislykkedes."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Annullér"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Forbundet"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Omdøb"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Tryk for at ændre indstillinger."
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Ugyldigt tegn indtastet. Prøv igen."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Understøttes ikke."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Tilgængelig"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Forbind. mislykkedes"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct-enheder"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Tryk for at tilslutte."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Annullér forbindelse"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Tilsluttede enheder"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Vælg alle"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Optagne enheder"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Sluttet til en anden enhed"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Opretter forbindelse..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Venter på forbindelse"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Kunne ikke tilslutte"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Kunne ikke tilslutte."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Multi-forbind"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Frakobl alle"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Afbryd"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Ingen enheder fundet"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Deaktivér Wi-Fi Direct efter brug"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Deaktivér Wi-Fi Direct efter brug"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Deaktivér Wi-Fi Direct efter brug for at spare batteri"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Deak. Wi-Fi Direct efter brug for at spare batteri"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s anmoder om en Wi-Fi Direct-forbindelse. Tillad?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Brug af Wi-Fi Direct deaktiverer din nuværende Wi-Fi-forbindelse. Vil du fortsætte?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Brug af Wi-Fi Direct deaktiverer din nuværende Wi-Fi-tethering. Vil du fortsætte?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct-forbindelse"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
-msgstr "Annuller Wi-Fi Direct-forbindelse?"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Frakobl Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Annullér Wi-Fi Direct-forbindelse?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Forbind til andre enheder via Wi-Fi Direct."
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Ingen enheder"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Der har ikke været nogen aktivitet i %d minutter, siden Wi-Fi Direct blev aktiveret. For at udvide batterilevetiden er Wi-Fi Direct blevet deaktiveret."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Scan"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stop"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deaktivering mislykkedes"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deaktivering mislykkedes."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktivering mislykkedes"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktivering mislykkedes."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Den aktuelle forbindelse vil blive afbrudt. Vil du fortsætte?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Du kan tilslutte op til %d enheder på samme tid."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Tilgængelige enheder"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Du kan tilslutte op til %d enheder på samme tid"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Kunne ikke oprette forbindelse til %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Enhed forbundet til anden enhed."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Tilsluttet %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-koder stemmer ikke overens."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deaktiverer ..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Aktuel forbindelse afbrydes, så scanning kan starte. Fortsæt?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Enheder, der ikke kunne oprette forbindelse"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Angiv PIN-kode for at forbinde til %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Forbind til %s i løbet af %d sekunder."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-kode %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Vælg enheder"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct-forbindelsen er mistet."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Sluttet til %s i %d sekunder."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Omdøb enhed"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN-kode"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Kunne ikke oprette forbindelse"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Stop forbindelse"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Tillad"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktiverer ..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Forbind"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Forbundet."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Angiv enhedsnavn"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Forbundet med %d enheder via Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Ingen forbindelse"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Denne Wi-Fi Direct-forbindelse annulleres."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Deaktivér Wi-Fi Direct efter brug for at spare batteristrøm."
diff --git a/ug-wifidirect/po/de.po b/ug-wifidirect/po/de.po
new file mode 100755
index 0000000..1d46956
--- /dev/null
+++ b/ug-wifidirect/po/de.po
@@ -0,0 +1,471 @@
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "ID eingeben"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximal zulässige Zeichenanzahl erreicht."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d ausgewählt"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Aktivieren"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximale Anzahl %d von Zeichen erreicht."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP-Adresse konnte nicht abgerufen werden."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Mit WLAN-Netz %s verbunden."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Niemals"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Daten-Download über WLAN und 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Daten-Download über WLAN und 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS-PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Entfernen"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Abbrechen"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Verbunden"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatisch zwischen WLAN und mobilen Netzwerken umschalten, um eine stabile Internetverbindung aufrechtzuerhalten."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Authentifizierungsfehler aufgetreten"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Zum schnelleren Herunterladen von großen Dateien werden WLAN und mobile Netze gleichzeitig verwendet. Dadurch kann sich Ihre Datennutzung erhöhen."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Der intelligente Netzwechsel wurde aktiviert. Diese Funktion hilft Ihnen dabei eine stabile Internetverbindung aufrechtzuerhalten, indem sie zwischen mobilen Netzen und WLAN-Netzwerken hin und her schaltet. Dadurch kann sich Ihr genutztes Datenvolumen erhöhen."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s wurde ausgewählt.\n\nWenn Sie keine Verbindung mit einem AP herstellen können, ändern Sie die SIM-Karte für die Bestätigung in der SIM-Kartenverwaltung. Wählen Sie dann die SIM-Karte aus, die Sie für mobile Daten und MMS verwenden möchten. Als Alternative können Sie die SIM-Karte, die Sie nicht verwenden möchten, deaktivieren."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Drücken Sie die WPS-Taste an Ihrem WLAN-Zugangspunkt innerhalb von %d Minuten."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Offen"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Keine WLAN-AP gefunden"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Aktuelle Netzwerkverbindung wird getrennt."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Passwort anzeigen"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Ein"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Aus"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Netzwerk entfernen"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Intelligenter Netzwechsel"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signalstärke"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Mobile Daten reduzieren"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Vorrang für Geschwind."
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Netzwerkbündelung"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Info zum WLAN-Netzwerk"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS-Methode auswählen"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy-Adresse"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Passwort"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Passwort eingeben"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS-Taste"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Suchen"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Nach verborgenen Netzwerken suchen"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "WLAN-Netze verfügbar"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "WLAN"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Nur beim Laden"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Schwach"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Nutzerzertifikat"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Nicht angegeben"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Unbekannt"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Verwenden Sie zum Herunterladen von großen Dateien WLAN und mobile Netze gleichzeitig."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Subnetzmaske"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statische IP-Adresse"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sortieren nach"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Scannen..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Benachrichtigung erhalten, wenn Netzwerke verfügbar sind."
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy-Port"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Name"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-Adresse"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-Adresse"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identität"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Gateway-Adresse"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Identität eingeben"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP-Methode"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Verbindung wird hergestellt..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Verbinden"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Gespeichert"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Es wurde ein WLAN-Netzwerk erkannt. Die Verbindung wird hergestellt."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Weitere Einstellungen"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nein"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Sicherheitsrichtlinie schränkt die Verwendung von WLAN ein."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Zum Verbinden hier tippen."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Das Gerät stellt eine Verbindung mit %1$s her. Dieses Netzwerk bietet möglicherweise keinen Internetzugang.\nTippen Sie auf „OK“, um die Verbindung mit %1$s beizubehalten, aber zu verhindern, dass der intelligente Netzwechsel in Zukunft eine Verbindung mit diesem Netzwerk herstellt."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "WLAN und Mobile AP können nicht zur gleichen Zeit aktiviert werden. Mobile AP deaktivieren?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Im WLAN-Netzwerk anmelden"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet event. nicht verfügbar"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Nicht erneut fragen"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "WLAN-Einstellungen öffnen"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Keine Geräte gefunden"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nein"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Abbrechen"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Gerätenamen ändern"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Name meines Geräts"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Fehlgeschlagen"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Abbrechen"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Verbunden"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Umbenennen"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Tippen, um Einstellungen zu ändern."
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Ungültiges Zeichen eingegeben. Erneut versuchen."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nicht unterstützt"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Verfügbar"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Verbindung fehlg."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct-Geräte"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Zum Verbinden tippen"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Verbindung abbrechen"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "Verbundene Geräte"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Alle auswählen"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "Bereits ausgelastete Geräte"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "Mit anderem Gerät verbunden"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "Warte auf Verbindung"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Verbindung nicht möglich"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "Mehrfachverbindung"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "Alle trennen"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "Trennen"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wi-Fi Direct nach Verwendung deaktivieren"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Wi-Fi Direct nach Verwenden deaktvieren"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Wi-Fi Direct nach Verwendung deaktivieren, um Strom zu sparen"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Wi-Fi Direct nach Verwenden deakt., um Strom zu sparen."
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s fragt eine Wi-Fi Direct-Verbindung an. Möchten Sie diese erlauben?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wenn Wi-Fi Direct verwendet wird, wird die aktuelle WLAN-Verbindung getrennt. Fortfahren?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wenn Wi-Fi Direct verwendet wird, wird das aktuelle WLAN-Tethering getrennt. Fortfahren?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct-Verbindung"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct beenden"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct-Verbindung trennen?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Über Wi-Fi Direct mit anderen Geräten verbinden"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Seit der Aktivierung von Wi-Fi Direct gab es %d Minuten keine Aktivitäten. Wi-Fi Direct wurde deaktiviert, um die Akkulaufzeit zu verlängern."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Suchen"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "Stopp"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deaktivierung fehlgeschlagen"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktivierung fehlgeschlagen"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "Aktuelle Verbindung wird getrennt. Fortfahren?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Sie können bis zu %d Geräte gleichzeitig miteinander verbinden."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Verfügbare Geräte"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Verbindung zu %s nicht möglich"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Gerät ist mit einem anderen Gerät verbunden."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Verbunden mit %s"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINs stimmen nicht überein."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Wird deaktiviert..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Aktuelle Verbindung wird getrennt, damit der Scan gestartet werden kann. Fortfahren?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Geräte, deren Verbindung fehlgeschlagen ist"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "PIN eingeben, um mit %s zu verbinden."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Verbindung zu %s in %d Sekunden"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-Code %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Geräte auswählen"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Die Wi-Fi Direct-Verbindung ist abgebrochen."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Verbindung mit %s in %d Sek."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Gerätenamen ändern"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Verbindung nicht möglich"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Verbindung beenden"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Zulassen"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Wird aktiviert..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Verbinden"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Verbunden"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Gerätenamen eingeben"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Mit %d Geräten über Wi-Fi Direct verbunden"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Nicht verbunden"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Diese Wi-Fi Direct-Verbindung wird abgebrochen."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wi-Fi Direct nach Verwendung deaktivieren, um Strom zu sparen."
+
diff --git a/ug-wifidirect/po/de_DE.po b/ug-wifidirect/po/de_DE.po
deleted file mode 100644
index a90ef3a..0000000
--- a/ug-wifidirect/po/de_DE.po
+++ /dev/null
@@ -1,117 +0,0 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Verbunden"
-
-msgid "IDS_WFD_CONNECTING"
-msgstr "Verbindung wird hergestellt..."
-
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Verbindung wird getrennt..."
-
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Verbunden"
-
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Unbekannter Fehler"
-
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PINs stimmen nicht überein!"
-
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Wird aktiviert..."
-
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d ausgewählt"
-
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Wird deaktiviert..."
-
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nicht unterstützt"
-
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
-
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Suchen"
-
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct-Geräte"
-
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Zum Verbinden tippen"
-
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Verbinden"
-
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Verbindung abbrechen"
-
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Info zu Wi-Fi Direct"
-
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct ermöglicht es WLAN-Geräten eine direkte Verbindung herzustellen und sorgt dafür, dass Druckvorgänge, Datenaustausch, Synchronisierung und die gemeinsame Nutzung von Bildschirmen einfacher und bequemer durchgeführt werden können. Durch die Verbindungsherstellung zu Wi-Fi Direct unterstützenden Geräten können Inhalte freigegeben, Daten synchronisiert, Kontakt mit Freunden aufgenommen sowie Spiele, Audiodateien, Videos und vieles mehr mit zahlreichen Anwendungen genutzt werden."
-
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
-msgstr "Verbundene Geräte"
-
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
-msgstr "Bereits ausgelastete Geräte"
-
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
-msgstr "Mit anderem Gerät verbunden"
-
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Verbindung wird hergestellt..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
-msgstr "Warte auf Verbindung"
-
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Verbindung nicht möglich"
-
-msgid "IDS_WFD_BUTTON_MULTI"
-msgstr "Mehrfachverbindung"
-
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
-msgstr "Alle trennen"
-
-msgid "IDS_WFD_BUTTON_DISCONNECT"
-msgstr "Trennen"
-
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Keine Geräte gefunden"
-
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Wenn Wi-Fi Direct verwendet wird, wird die aktuelle WLAN-Verbindung getrennt. Fortfahren?"
-
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Wenn Wi-Fi Direct verwendet wird, wird das aktuelle WLAN-Tethering getrennt. Fortfahren?"
-
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
-msgstr "Wi-Fi Direct-Verbindung"
-
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
-msgstr "Wi-Fi Direct-Verbindung trennen?"
-
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Keine Geräte"
-
-msgid "IDS_WFD_BUTTON_STOPSCAN"
-msgstr "Stopp"
-
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deaktivierung fehlgeschlagen"
-
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktivierung fehlgeschlagen"
-
-msgid "IDS_WFD_POP_DISCONNECT"
-msgstr "Aktuelle Verbindung wird getrennt. Fortfahren?"
-
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Verfügbare Geräte"
-
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Sie können bis zu %d Geräte gleichzeitig miteinander verbinden."
-
diff --git a/ug-wifidirect/po/el_GR.po b/ug-wifidirect/po/el_GR.po
index be21a4f..a155432 100644..100755
--- a/ug-wifidirect/po/el_GR.po
+++ b/ug-wifidirect/po/el_GR.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Συνδέθηκε"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Εισάγετε το ID σας."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Σύνδεση..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Ο μέγιστος αριθμός χαρακτήρων συμπληρώθηκε."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Αποσύνδεση..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d επιλέχθηκαν"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Συνδέθηκε"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Ενεργό"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Άγνωστο σφάλμα"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Τα PIN δεν συμφωνούν!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Συμπληρώθηκε ο μέγιστος αριθμός %d χαρακτήρων."
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Ενεργοποίηση..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Αποτυχία λήψης διεύθυνσης IP."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "Επιλέχθηκαν %d"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Συνδέθηκε στο δίκτυο Wi-Fi %s."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Απενεργοποίηση.."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Ποτέ"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Δεν υποστηρίζεται"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Λήψη δεδομ. μέσω Wi-Fi και 4G"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Λήψη δεδομ. μέσω Wi-Fi και 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Διαγραφή"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Άκυρο"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Έγινε σύνδεση"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Αυτόματη εναλλαγή μεταξύ Wi-Fi και δικτύων κινητής τηλεφωνίας για τη διατήρηση σταθερής σύνδεσης στο Internet."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Παρουσιάστηκε σφάλμα πιστοποίησης"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Για την ταχύτερη λήψη των αρχείων, θα χρησιμοποιηθούν ταυτόχρονα τα δίκτυα Wi-Fi και κινητής τηλεφωνίας. Αυτό μπορεί να αυξήσει τη χρήση δεδομένων κινητής τηλεφωνίας."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Έχει ενεργοποιηθεί η έξυπνη εναλλαγή δικτύου. Αυτή η λειτουργία συμβάλλει στη διατήρηση της σταθερότητας της σύνδεσης Internet, κάνοντας εναλλαγή μεταξύ των δικτύων κινητής τηλεφωνίας και Wi-Fi. Αυτό μπορεί να αυξήσει τη χρήση δεδομένων."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Το %s είναι επιλεγμένο.\n\nΑν δεν μπορείτε να συνδεθείτε σε ένα AP, αλλάξτε την κάρτα SIM που χρησιμοποιείται για επαλήθευση μέσω της Διαχείρισης καρτών SIM. Στη συνέχεια, επιλέξτε την κάρτα SIM που θέλετε να χρησιμοποιήσετε για δεδομένα κινητής τηλεφωνίας και μηνύματα πολυμέσων. Εναλλακτικά, μπορείτε να αποσυνδέσετε την κάρτα SIM που δεν θέλετε να χρησιμοποιήσετε."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Πιέστε το WPS του σημείου πρόσβασης Wi-Fi εντός %d λεπτών."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Άνοιγμα"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Δεν βρέθηκε εφαρμογή Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Το τρέχον δίκτυο θα αποσυνδεθεί."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Εμφάνιση κωδικού πρόσβασης"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Ενεργό"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Ανενεργό"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Να μη γίνει απομνημόνευση δικτύου"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Έξυπνη εναλλαγή δικτύου"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Ισχύς σήματος"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Μείωση χρ. δεδ. κιν. τηλ."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Προτεραιότητα ταχύτητας"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Σύνδεση δικτύων"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Πληροφορίες δικτύου Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Επιλογή μεθόδου WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Διεύθ.διακ.μεσολάβ."
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Κωδικός πρόσβασης"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Εισαγωγή κωδικού."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Πλήκτρο WPS"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Σάρωση"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Συσκευές Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Κρυφό δίκτυο"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Διαθέσιμα δίκτυα Wi-Fi."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Μόνο κατά τη φόρτιση"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Ασθενές"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Πιστοπ. χρήστη"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Ακαθόριστο"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Άγνωστο"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Για την ταχύτερη λήψη μεγάλων αρχείων, χρησιμοποιήστε δίκτυα Wi-Fi και κινητής τηλεφωνίας ταυτόχρονα."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Μάσκα υποδικτύου"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Στατικό IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Ταξινόμηση κατά"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Σάρωση..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Λήψη ειδοποιήσεων όταν υπάρχουν διαθέσιμα δίκτυα"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Θύρα proxy"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Πατήστε για σύνδεση"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Όνομα"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Διεύθυνση MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Διεύθυνση IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Ταυτότητα"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Διεύθυνση πύλης"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Εισαγάγετε ταυτότητα."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Μέθοδος EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Σύνδεση..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Σύνδεση"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Ακύρωση σύνδεσης"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Αποθηκεύτηκε"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Εντοπίστηκε δίκτυο Wi-Fi. Θα συνδεθείτε."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Σύνθετες ρυθμίσεις"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Όχι"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Η πολιτική ασφαλείας περιορίζει τη χρήση του Wi-Fi."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Πατήστε εδώ για σύνδεση."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Σχετικά με Wi-Fi Direct"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "H συσκευή σας συνδέεται με το %1$s. Ωστόσο, αυτό το δίκτυο ενδέχεται να μην παρέχει πρόσβαση στο Internet.\nΠατήστε OK για να παραμείνετε συνδεδεμένοι στο %1$s και για να αποτρέψετε την έξυπνη εναλλαγή δικτύου από τη σύνδεση σε αυτό το δίκτυο στο μέλλον."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Το Wi-Fi Direct επιτρέπει στις συσκευές Wi-Fi να συνδέονται απευθείας, γεγονός που κάνει τη διαδικασία εκτύπωσης, κοινής χρήσης αρχείων, συγχρονισμού και κοινής χρήσης οθόνης πιο απλή και πιο εύχρηστη. Η σύνδεση σε συσκευές που υποστηρίζουν Wi-Fi Direct σας επιτρέπει να μοιράζεστε περιεχόμενο, να συγχρονίζετε τα δεδομένα σας, να συναναστρέφεστε με τους φίλους σας, να παίζετε παιχνίδια, να ακούτε μουσική, να παρακολουθείτε ταινίες κ.ά., χρησιμοποιώντας διάφορες εφαρμογές"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Τόσο το Wi-Fi όσο και το AP για κινητά δεν μπορούν να ενεργοποιηθούν ταυτόχρονα. Απενεργοποίηση AP για κινητά;"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Σύνδεση στο δίκτυο Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Το Internet ίσως δεν είναι διαθέσ."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Να μην ερωτηθώ ξανά"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Άνοιγμα ρυθμίσεων Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Δεν βρέθηκαν συσκευές"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ναι"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Όχι"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Άκυρο"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Μετονομασία συσκευής"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Το όνομα της συσκευής μου"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Αποτυχία."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Ακύρωση"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Συνδέθηκε"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Τα αρχεία συσκευής εμφανίζονται για την αναγνώριση των διαθέσιμων συσκευών στη λίστα των κοντινών συσκευών και των συσκευών που είναι διαθέσιμες μέσω Bluetooth, Wi-Fi Direct και άλλων μεθόδων."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Μετονομασία"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Πατήστε για αλλαγή ρυθμίσεων"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Καταχωρίστηκε μη έγκυρος χαρακτήρας. Δοκιμάστε ξανά"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Δεν υποστηρίζεται."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Διαθέσιμο"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Η σύνδεση απέτυχε"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Συσκευές Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Πατήστε για σύνδεση."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Ακύρωση σύνδεσης"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Συνδεδεμένες συσκευές"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Επιλογή όλων"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Απασχολημένες συσκευές"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Έχει συνδεθεί με άλλη συσκευή"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Σύνδεση..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Αναμονή για σύνδεση"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Αποτυχία σύνδεσης"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Αποτυχία σύνδεσης."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Πολλαπλή σύνδεση"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Αποσύνδεση όλων"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Αποσύνδεση"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Δεν βρέθηκαν συσκευές"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Απενεργοποίηση Wi-Fi Direct μετά τη χρήση"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Απενεργ. Wi-Fi Direct μετά τη χρήση"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Απενεργοποίηση Wi-Fi Direct μετά τη χρήση για εξοικοκονόμηση μπαταρίας"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Απεν. Wi-Fi Direct μετά τη χρήση για εξοικ. μπατ."
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "Ο χρήστης %s ζητά άδεια για σύνδεση Wi-Fi Direct. Να επιτραπεί;"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Η χρήση του Wi-Fi Direct θα αποσυνδέσει την τρέχουσα σύνδεση Wi-Fi. Συνέχεια;"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Η χρήση του Wi-Fi Direct θα αποσυνδέσει την τρέχουσα σύνδεση tethering μέσω Wi-Fi. Συνέχεια;"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Σύνδεση Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Αποσύνδεση Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Ακύρωση της σύνδεσης Wi-Fi Direct;"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Καμία συσκευή"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Σύνδεση σε άλλες συσκευές μέσω του Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Έχουν περάσει %d λεπτά χωρίς δραστηριότητα από την ενεργοποίηση του Wi-Fi Direct. Για την επέκταση της ζωής της μπαταρίας, το Wi-Fi Direct έχει απενεργοποιηθεί."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Σάρωση"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Διακοπή"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Αποτυχία απενεργοποίησης"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Αποτυχία απενεργοποίησης."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Αποτυχία ενεργοποίησης"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Αποτυχία ενεργοποίησης."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Η τρέχουσα σύνδεση θα αποσυνδεθεί. Συνέχεια;"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Μπορείτε να συνδέσετε έως και %d συσκευές ταυτόχρονα."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Διαθέσιμες συσκευές"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Μπορείτε να συνδέσετε έως και %d συσκευές ταυτόχρονα"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Αποτυχία σύνδεσης με %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Η συσκευή έχει συνδεθεί σε άλλη συσκευή."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Σύνδεση με %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Ασυμφωνία κωδικών PIN."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Απενεργοποίηση.."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Η τρέχουσα σύνδεση θα αποσυνδεθεί για να είναι δυνατή η έναρξη της σάρωσης. Συνέχεια;"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Συσκευές που απέτυχε η σύνδεσή τους"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Εισάγετε τον κωδικό PIN για σύνδεση με %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Σύνδεση με τη συσκευή %s σε %d δευτερόλεπτα."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Κωδικός ΡΙΝ %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Επιλογή συσκευών"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Η σύνδεση Wi-Fi Direct χάθηκε."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Σύνδεση με το %s σε %d δευτερόλ."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Μετονομασία συσκευής"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Αποτυχία σύνδεσης"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Διακοπή σύνδεσης"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Αποδοχή"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Ενεργοποίηση..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Σύνδεση"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Συνδέθηκε."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Εισάγετε όνομα συσκευής"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Συνδέθηκε με %d συσκευές μέσω Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Δεν έχει συνδεθεί"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Αυτή η σύνδεση Wi-Fi Direct θα ακυρωθεί."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Για εξοικονόμηση μπαταρίας, απενεργοποιήστε το Wi-Fi Direct μετά τη χρήση."
diff --git a/ug-wifidirect/po/en.po b/ug-wifidirect/po/en.po
index d3a8223..fe2a4d5 100644
--- a/ug-wifidirect/po/en.po
+++ b/ug-wifidirect/po/en.po
@@ -1,114 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Connected"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Enter your ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Connecting..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximum number of characters reached."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d selected"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Enable"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximum number of characters %d reached."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Failed to obtain IP address."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connected to Wi-Fi network %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Disconnecting..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Never"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Download data via Wi-Fi and 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Download data via Wi-Fi and 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Forget"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Connected"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Unknown error"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatically switch between Wi-Fi and mobile networks to maintain a stable Internet connection."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PINs don't match!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Authentication error occurred"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Activating..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi and mobile networks will be used together to download files faster. This may increase your mobile data usage."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d selected"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Smart network switch has been enabled. This function helps to maintain a stable Internet connection by switching between mobile and Wi-Fi networks. This may increase your data usage."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deactivating..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s is selected.\n\nIf you are unable to connect to an AP, change the SIM card used for verification by going to SIM card manager. Then select the SIM card you want to use for Mobile data and multimedia messages. Alternatively, you can unmount the SIM card you do not want to use."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Not supported"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Press WPS on your Wi-Fi access point within %d minutes."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Open"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No Wi-Fi AP found."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Current network will be disconnected."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Show password"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "On"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Off"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Forget network"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Smart network switch"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signal strength"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reduce mobile data usage"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioritise speed"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Network bonding"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi network info"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Select WPS method"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy address"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Password"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Enter password."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS button"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Scan"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct devices"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Find hidden network"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi networks available."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "While charging only"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Weak"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "User certificate"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Unspecified"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Unknown"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "To download large files faster, use Wi-Fi and mobile networks together."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Subnet mask"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Static IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sort by"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Scanning..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Receive notifications when networks are available."
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Tap to connect"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy port"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Name"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC address"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP address"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identity"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Gateway address"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Enter identity."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP method"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Connecting..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Connect"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Cancel connection"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Saved"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "A Wi-Fi network has been detected. You will be connected."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Advanced settings"
+
+msgid "IDS_COM_SK_NO"
+msgstr "No"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Security policy restricts use of Wi-Fi."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct enables Wi-Fi devices to connect directly, making printing, file sharing, synchronising, and screen sharing much simpler and more convenient. Connecting to devices that support Wi-Fi Direct makes it possible to share your content, synchronise your data, socialise with friends, play games, audio, videos, and more, using various applications"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tap here to connect."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Your device is connecting to %1$s. However, this network may not provide Internet access.\nTap OK to stay connected to %1$s now, but also prevent Smart network switch from connecting to this network in the future."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Both Wi-Fi and mobile AP cannot be activated at the same time. Deactivate mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Sign in to Wi-Fi network"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet may not be available"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Don't ask again"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Open Wi-Fi settings"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "No devices found"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Yes"
+
+msgid "IDS_BR_SK_NO"
+msgstr "No"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Rename device"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "My device name"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Failed."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Connected"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Rename"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Tap to change settings."
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Invalid character entered. Try again."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Not supported."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Available"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Connection failed"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct devices"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Tap to connect."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Cancel connection"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Connected devices"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Select all"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Busy devices"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Connected with another device"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Connecting..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Waiting for connection"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Failed to connect"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Failed to connect."
-msgid "IDS_WFD_BUTTON_MULTI"
-msgstr "Multi-connect"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "Multi connect"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Disconnect all"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Disconnect"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "No devices found"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Disable Wi-Fi Direct after use"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Disable Wi-Fi Direct after use"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Disable Wi-Fi Direct after use to save battery"
-msgid "IDS_WFD_POP_WIFI_OFF"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Disable Wi-Fi Direct after use to save battery"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s is requesting a Wi-Fi Direct connection. Allow?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct connection"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Disconnect Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Cancel Wi-Fi Direct connection?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "No devices"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connect to other devices via Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "There has been no activity for %d minutes since Wi-Fi Direct was enabled. To extend battery life, Wi-Fi Direct has been disabled."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Scan"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stop"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deactivation failed"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deactivation failed."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Activation failed"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Activation failed."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Current connection will be disconnected. Continue?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "You can connect up to %d devices at the same time."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Available devices"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "You can connect up to %d devices at the same time"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Failed to connect to %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Device connected to another device."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Connected to %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINs do not match."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deactivating..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Current connection will be disconnected so that scanning can start. Continue?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Devices that failed to connect"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Enter PIN to connect to %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Connect to %s in %d seconds."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Select devices"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "The Wi-Fi Direct connection has been lost."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Connect with %s in %d secs."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Rename device"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Unable to connect"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Stop connection"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Allow"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Activating..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Connect"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Connected."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Enter device name"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connected with %d devices via Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Not connected"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "This Wi-Fi Direct connection will be cancelled."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "To save battery power, disable Wi-Fi Direct after use."
diff --git a/ug-wifidirect/po/en_PH.po b/ug-wifidirect/po/en_PH.po
index 1db0617..3c779fe 100644
--- a/ug-wifidirect/po/en_PH.po
+++ b/ug-wifidirect/po/en_PH.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Connected"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Enter your ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Connecting..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximum number of characters reached."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d selected"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Enable"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximum number of characters %d reached."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Failed to obtain IP address."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connected to Wi-Fi network %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Disconnecting..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Never"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Download data via Wi-Fi and 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Download data via Wi-Fi and 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Forget"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Connected"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Unknown error"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatically switch between Wi-Fi and mobile networks to maintain a stable Internet connection."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PINs don't match!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Authentication error occurred"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Activating..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi and mobile networks will be used together to download files faster. This may increase your mobile data usage."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d selected"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Smart network switch has been enabled. This function helps to maintain a stable Internet connection by switching between mobile and Wi-Fi networks. This may increase your data usage."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deactivating..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s is selected.\n\nIf you are unable to connect to an AP, change the SIM card used for verification by going to SIM card manager. Then select the SIM card you want to use for Mobile data and multimedia messages. Alternatively, you can unmount the SIM card you do not want to use."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Not supported"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Press WPS on your Wi-Fi access point within %d minutes."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Open"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No Wi-Fi AP found."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Current network will be disconnected."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Show password"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "On"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Off"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Forget network"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Smart network switch"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signal strength"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reduce mobile data usage"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioritize speed"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Network bonding"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi network info"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Select WPS method"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy address"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Password"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Enter password"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS button"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Scan"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct devices"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Find hidden network"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi networks available."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "While charging only"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Weak"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "User certificate"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Unspecified"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Unknown"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "To download large files faster, use Wi-Fi and mobile networks together."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Subnet mask"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Static IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sort by"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Scanning..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Receive notifications when networks are available"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Tap to connect"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy port"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Name"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC address"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP address"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identity"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Gateway address"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Enter identity."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP method"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Connecting..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Connect"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Cancel connection"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Saved"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "A Wi-Fi network has been detected. Connect?"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Advanced settings"
+
+msgid "IDS_COM_SK_NO"
+msgstr "No"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Security policy restricts use of Wi-Fi."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "About Wi-Fi Direct"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tap here to connect."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct enables Wi-Fi devices to connect directly, making printing, file sharing, synchronizing, and screen sharing much simpler and more convenient. Connecting to devices that support Wi-Fi Direct makes it possible to share your content, synchronize your data, socialize with friends, play games, audio, videos, and more, using various applications."
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Your device is connecting to %1$s. However, this network may not provide Internet access.\nTap OK to stay connected to %1$s now, but also prevent Smart network switch from connecting to this network in the future."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Both Wi-Fi and Mobile AP cannot be activated at the same time. Deactivate Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Sign in to Wi-Fi network"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet may not be available"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Don't ask again"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Open Wi-Fi settings"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "No devices found"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Yes"
+
+msgid "IDS_BR_SK_NO"
+msgstr "No"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Rename device"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "My device name"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Failed"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Connected"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Rename"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Tap to change settings"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Invalid character entered. Try again"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Not supported."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Available"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Connection failed"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct devices"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Tap to connect."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Cancel connection"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Connected devices"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Select all"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Busy devices"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Connected with another device"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Connecting..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Waiting for connection"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Failed to connect"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Failed to connect."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Multi-connect"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Disconnect all"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Disconnect"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "No devices found"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Disable Wi-Fi Direct after use"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Disable Wi-Fi Direct after use"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Disable Wi-Fi Direct after use to save battery"
-msgid "IDS_WFD_POP_WIFI_OFF"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Disable Wi-Fi Direct after use to save battery"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s is requesting a Wi-Fi Direct connection. Allow?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct connection"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Disconnect Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Cancel Wi-Fi Direct connection?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "No devices"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connect to other devices via Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "There has been no activity for %d minutes since Wi-Fi Direct was enabled. To extend battery life, Wi-Fi Direct has been disabled"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Scan"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stop"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deactivation failed"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deactivation failed."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Activation failed"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Activation failed."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Current connection will be disconnected. Continue?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "You can connect up to %d devices at the same time."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Available devices"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "You can connect up to %d devices at the same time"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Failed to connect to %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Device connected to another device."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Connected to %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINs do not match."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deactivating..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Current connection will be disconnected so that scanning can start. Continue?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Devices that failed to connect"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Enter PIN to connect to %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Connect to %s in %d seconds."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN code %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Select devices"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "The Wi-Fi Direct connection has been lost."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Connect with %s in %d secs."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Rename device"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Unable to connect"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Stop connection"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Allow"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Activating..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Connect"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Connected."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Enter device name"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connected with %d devices via Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Not connected"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "This Wi-Fi Direct connection will be cancelled."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "To save battery power, disable Wi-Fi Direct after use."
diff --git a/ug-wifidirect/po/en_US.po b/ug-wifidirect/po/en_US.po
index 1db0617..49e1bfe 100644
--- a/ug-wifidirect/po/en_US.po
+++ b/ug-wifidirect/po/en_US.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Connected"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Enter your ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Connecting..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximum number of characters reached."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d selected"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Turn on"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximum number of characters %d reached."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Failed to obtain IP address."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connected to Wi-Fi network %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Disconnecting..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Never"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Download data via Wi-Fi and 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Download data via Wi-Fi and 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Forget"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Connected"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Unknown error"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatically switch between Wi-Fi and mobile networks to maintain a stable Internet connection."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PINs don't match!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Authentication error occurred"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Activating..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi and mobile networks will be used together to download files faster. This may increase your mobile data usage."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d selected"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Smart network switch has been enabled. This function helps to maintain a stable Internet connection by switching between mobile and Wi-Fi networks. This may increase your data usage."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deactivating..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s is selected.\n\nIf you are unable to connect to an AP, change the SIM card used for verification by going to SIM card manager. Then select the SIM card you want to use for Mobile data and multimedia messages. Alternatively, you can unmount the SIM card you do not want to use."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Not supported"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Press WPS on your Wi-Fi access point within %d minutes."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Open"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No Wi-Fi AP found."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Current network will be disconnected."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Show password"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "On"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Off"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Forget network"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Smart network switch"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signal strength"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reduce mobile data usage"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioritize speed"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Network bonding"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi network info"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Select WPS method"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy address"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Password"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Enter password"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS button"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Scan"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct devices"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Find hidden network"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi networks available."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "While charging only"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Weak"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "User certificate"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Unspecified"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Unknown"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "To download large files faster, use Wi-Fi and mobile networks together."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Subnet mask"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Static IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sort by"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Scanning..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Receive notifications when networks are available."
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Tap to connect"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy port"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Name"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC address"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP address"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identity"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Gateway address"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Enter identity."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP method"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Connecting..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Connect"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Cancel connection"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Saved"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "A Wi-Fi network has been detected. You will be connected."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Advanced settings"
+
+msgid "IDS_COM_SK_NO"
+msgstr "No"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Security policy restricts use of Wi-Fi."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "About Wi-Fi Direct"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tap here to connect."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct enables Wi-Fi devices to connect directly, making printing, file sharing, synchronizing, and screen sharing much simpler and more convenient. Connecting to devices that support Wi-Fi Direct makes it possible to share your content, synchronize your data, socialize with friends, play games, audio, videos, and more, using various applications."
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Your device is connecting to %1$s. However, this network may not provide Internet access.\nTap OK to stay connected to %1$s now, but also prevent Smart network switch from connecting to this network in the future."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Both Wi-Fi and Mobile AP cannot be activated at the same time. Deactivate Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Sign in to Wi-Fi network"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet may not be available"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Don't ask again"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Open Wi-Fi settings"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "No devices found"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Yes"
+
+msgid "IDS_BR_SK_NO"
+msgstr "No"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Rename device"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "My device name"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Failed"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cancel"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Connected"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Rename"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Tap to change settings"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Invalid character entered. Try again."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Not supported."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Available"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Connection failed"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct devices"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Tap to connect."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Cancel connection"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Connected devices"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Select all"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Busy devices"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Connected with another device"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Connecting..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Waiting for connection"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Failed to connect"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Failed to connect."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Multi-connect"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Disconnect all"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Disconnect"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "No devices found"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Disable Wi-Fi Direct after use"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Turn off Wi-Fi Direct after use"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Disable Wi-Fi Direct after use to save battery"
-msgid "IDS_WFD_POP_WIFI_OFF"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Turn off Wi-Fi Direct after use to save battery"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s is requesting a Wi-Fi Direct connection. Allow?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct connection"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Disconnect Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Cancel Wi-Fi Direct connection?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "No devices"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connect to other devices via Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "There has been no activity for %d minutes since Wi-Fi Direct was turned on. To extend battery life, Wi-Fi Direct has been turned off."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Scan"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stop"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deactivation failed"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deactivation failed."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Activation failed"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Activation failed."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Current connection will be disconnected. Continue?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "You can connect up to %d devices at the same time."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Available devices"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "You can connect up to %d devices at the same time"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Failed to connect to %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Device connected to another device."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Connected to %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINs do not match."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deactivating..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Current connection will be disconnected so that scanning can start. Continue?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Devices that failed to connect"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Enter PIN to connect to %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Connect to %1$s in %2$d seconds."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Select devices"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "The Wi-Fi Direct connection has been lost."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Connect with %s in %d secs."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Rename device"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Unable to connect"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Stop connection"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Allow"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Activating..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Connect"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Connected."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Enter device name"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connected with %d devices via Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Not connected"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "This Wi-Fi Direct connection will be cancelled."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "To save battery power, disable Wi-Fi Direct after use."
diff --git a/ug-wifidirect/po/es_ES.po b/ug-wifidirect/po/es_ES.po
index 8ac7c2a..6dec539 100644..100755
--- a/ug-wifidirect/po/es_ES.po
+++ b/ug-wifidirect/po/es_ES.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Introduzca su ID"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Alcanzado el número máximo de caracteres"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d seleccionado(s)"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Habilitar"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Se ha alcanzado el número máximo de caracteres %d."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Error al obtener dirección IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Se ha conectado a red Wi-Fi %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nunca"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Descargar datos con Wi-Fi y 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Descargar datos con Wi-Fi y 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN DE WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Olvidar"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Aceptar"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Conectado"
-msgid "IDS_WFD_CONNECTING"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Cambiar automáticamente entre redes móviles y Wi-Fi para mantener una conexión de Internet estable."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Se ha producido un error de autenticación"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Las redes Wi-Fi y móvil se usarán conjuntamente para descargar archivos más rápido. Esto puede aumentar su uso de datos móviles."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Smart network switch se ha activado. Esta función contribuye a mantener una conexión a Internet estable con cambio entre las redes Wi-Fi y móvil. Esto puede incrementar el uso de datos."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Se ha seleccionado %s.\n\nSi no puede conectarse a un punto de acceso, cambie la tarjeta SIM utilizada para la verificación accediendo al gestor de tarjetas SIM. A continuación, seleccione la tarjeta que quiere utilizar para los datos móviles y los mensajes multimedia. De forma alternativa, puede desinstalar la tarjeta SIM que no desee utilizar."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Pulse WPS de su punto de acceso Wi-Fi en %d minutos"
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Abierta"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No se ha encontrado ningún AP Wi-Fi"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Se desconectará la red actual"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Mostrar contraseña"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Activado"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Desactivado"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Olvidar red"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Cambio de Smart network"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Intensidad de la señal"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reducir uso datos móviles"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Priorizar velocidad"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Vinculación de red"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Información de red Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Seleccionar método WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Dirección de proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Contraseña"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Introducir contraseña"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Botón WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Buscar"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Encontrar red oculta"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Redes Wi-Fi disponibles"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Solo durante carga"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Débil"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certific usuario"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Sin especificar"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Desconocido"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Para descargar archivos grandes más rápido, use redes Wi-Fi y móviles conjuntamente."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Máscara de subred"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP estática"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Ordenar por"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Explorando..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Recibir notificaciones cuando haya redes disponibles"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Puerto Proxy"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nombre"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Dirección MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Dirección IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identidad"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Dirección de puerta de enlace"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Introducir identidad"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Método EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
msgstr "Conectando..."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Desconectando..."
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Conectar"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Guardado"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Se ha detectado una red Wi-Fi. Se conectará."
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Ajustes avanzados"
+
+msgid "IDS_COM_SK_NO"
+msgstr "No"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "La política de seguridad restringe el uso del Wi-Fi"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pulse aquí para conectarse."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "El dispositivo se está conectando a %1$s. No obstante, puede que esta red no proporcione acceso a Internet.\nPulse Aceptar para seguir conectado a %1$s ahora e impedir que el cambio de Smart network se conecte a esta red en el futuro."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Las conexiones Wi-Fi y Mobile AP no se pueden activar al mismo tiempo. ¿Desactivar Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Inicie sesión red Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet podría no estar disp"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "No volver a preguntar"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Abrir ajustes Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "No se han encontrado dispositivos"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Sí"
+
+msgid "IDS_BR_SK_NO"
+msgstr "No"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Cambiar nombre"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nombre de mi dispositivo"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Error"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
msgstr "Conectado"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Error desconocido"
+msgid "IDS_BR_SK_OK"
+msgstr "Aceptar"
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Los códigos PIN no coinciden"
+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_WFD_BODY_ACTIVATING"
-msgstr "Activando..."
+msgid "IDS_ST_SK_RENAME"
+msgstr "Camb. nom"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d seleccionado"
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Pulse para cambiar los ajustes"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Desactivando..."
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Carácter introducido no válido. Vuelva a intentarlo."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
+msgid "IDS_ST_POP_NOT_SUPPORTED"
msgstr "No admitido"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Disponible"
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Buscar"
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Error de conexión"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
msgstr "Dispositivos Wi-Fi Direct"
-msgid "IDS_WFD_TAP_TO_CONNECT"
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
msgstr "Pulse para conectar"
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Conectar"
-
-msgid "IDS_WFD_BUTTON_CANCEL"
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
msgstr "Cancelar conexión"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Acerca de Wi-Fi Direct"
-
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct permite que los dispositivos Wi-Fi se conecten directamente y facilita enormemente la impresión, el uso compartido de archivos y de pantallas. La conexión de dispositivos compatibles con Wi-Fi Direct permite compartir contenido, sincronizar datos, relacionarse con amigos, reproducir juegos, audio, vídeo y mucho más gracias al uso de distintas aplicaciones"
-
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Dispositivos conectados"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Seleccionar todo"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Dispositivos ocupados"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Conectado con otro dispositivo"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Conectando..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Esperando conexión"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
msgstr "Error de conexión"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Conexión múltiple"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Desconectar todo"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Desconectar"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "No se han encontrado dispositivos"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Desactivar Wi-Fi Direct después de su uso"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Desact Wi-Fi Direct después uso"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Desactivar Wi-Fi Direct después de su uso para ahorrar batería"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Desact Wi-Fi Direct tras su uso para ahorrar bat"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s está solicitando una conexión Wi-Fi Direct. ¿Permitir?"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "El uso de Wi-Fi Direct desconectará la conexión Wi-Fi actual. ¿Continuar?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "El uso de Wi-Fi Direct desconectará la Zona Wifi actual. ¿Continuar?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Conexión Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Desconectar Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "¿Cancelar conexión Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "No hay dispositivos"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectar a otros dispositivos Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Se ha detectado un periodo de inactividad de %d minutos desde que se habilitó Wi-Fi Direct. Para aumentar la duración de la batería, se ha desactivado Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Buscar"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Parar"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "Error en desactivación"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "Error al activar"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "La conexión actual finalizará. ¿Continuar?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Dispositivos disponibles"
-
-msgid "IDS_WFD_POP_MULTI_CONNECT"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
msgstr "Puede conectar hasta %d dispositivos al mismo tiempo"
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Disposit dispon"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Error al conectar a %s"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Dispositivo conectado con otro dispositivo"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Conectado a %s"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Los PIN no coinciden"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Desactivando..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Se desconectará la conexión actual para que pueda iniciarse la búsqueda. ¿Continuar?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Dispositivos que no han podido conectar"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Introduzca el PIN para conectarse a %s"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Conectar a %s en %d segundos"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Código PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Seleccionar dispositivos"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Se ha perdido la conexión Wi-Fi Direct"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Conectar con %s en %d segundos"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Cambiar nombre del dispositivo"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "No se puede conectar"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Detener conexión"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Permitir"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Activando..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Conectar"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Conectado"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Introduzca nombre de dispositivo"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectado con %d dispositivos a través de Wi-Fi Direct"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "No conectado"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Se cancelará esta conexión Wi-Fi Direct."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Para ahorrar batería, desactive Wi-Fi Direct después de su uso"
+
diff --git a/ug-wifidirect/po/es_US.po b/ug-wifidirect/po/es_US.po
index e024219..37b0241 100644
--- a/ug-wifidirect/po/es_US.po
+++ b/ug-wifidirect/po/es_US.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Conectado"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Introducir su ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Conectando..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Se ha alcanzado el número máximo de caracteres."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d seleccionado(s)"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Activar"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Se alcanzó el número máximo de caracteres (%d)."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Error al obtener la dirección IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Conectado a red Wi-Fi %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Desconectando..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nunca"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Descargar datos por Wi-Fi y 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Descargar datos por Wi-Fi y 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN DE WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Olvidar"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Aceptar"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Conectado"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Error desconocido"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Cambiar automáticamente entre redes móviles y Wi-Fi para mantener una conexión de Internet estable."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Los PIN no coinciden"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Se ha producido un error de autentificación"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Activando..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Se usarán redes Wi-Fi y móviles juntas para descargar archivos más rápido. Esto puede aumentar su uso de datos móviles."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d seleccionado(s)"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Cambio de Red inteligente ha sido activado. Esta función ayuda a mantener una conexión a Internet estable mediante el cambio entre redes Wi-Fi y redes móviles. Esto podría aumentar su uso de datos."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Desactivando…"
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Se seleccionó %s.\n\nSi no es posible conectarse a un Punto de acceso, cambie la tarjeta SIM usada para la verificación desde el administrador de tarjetas SIM. Luego, seleccione la tarjeta SIM que desea usar para Datos móviles y mensajes multimedia. Como alternativa, puede desmontar la tarjeta SIM que no desea utilizar."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "No soportado"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Pulse WPS en el punto de acceso Wi-Fi en %d minutos."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Directo"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Abierta"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No se ha encontrado ningún Punto de Acceso de Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Se desconectará la red actual."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Mostrar contraseña"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Activado"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Desactivado"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Olvidar red"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Cambio de Red inteligente"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Intensidad de la señal"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reducir uso de datos móviles"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Priorizar velocidad"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Unión de red"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Información de red Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Seleccionar método WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Dirección de PROXY"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Contraseña"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Introducir contraseña."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Botón WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Buscar"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Dispositivos Wi-Fi Directo"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Buscar red oculta"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Redes Wi-Fi disponibles."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Directo"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Sólo durante la carga"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Débil"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certific. usuario"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Sin especificar"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Desconocido"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Para descargar archivos grandes más rápido, use redes Wi-Fi y móviles juntas."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Máscara de subred"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP estática"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Ordenar por"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Buscando..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Recibir notificaciones cuando las redes estén disponibles"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Pulse para conectar"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Puerto proxy"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nombre"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Dirección MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Dirección IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identidad"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Dirección de puerta de enlace"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Introducir identidad."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Método EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Conectando..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Conectar"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Cancelar conexión"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Guardado"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Se detectó una red Wi-Fi. Se conectará."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Configuración avanzada"
+
+msgid "IDS_COM_SK_NO"
+msgstr "No"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "La política de seguridad restringe el uso del Wi-Fi."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Acerca de Wi-Fi Direct"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pulse aquí para conectar."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Directo permite conectar directamente dispositivos Wi-Fi, lo que hace más simple y conveniente imprimir, compartir archivos, sincronizar datos y compartir en pantalla. La conexión con dispositivos que admiten Wi-Fi Directo hace que puedas compartir tus contenidos, sincronizar tus datos, socializar con amigos, jugar juegos, reproducir audio o videos, etc., mediante varias aplicaciones"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "El dispositivo se está conectando a %1$s. No obstante, puede que esta red no proporcione acceso a Internet.\nPulse Aceptar para seguir conectado a %1$s ahora e impedir que Cambio de Smart network se conecte a esta red en el futuro."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Las conexiones Wi-Fi y Mobile AP no se pueden activar al mismo tiempo. ¿Desactivar Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Acceder a la red Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet podría no estar disp."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "No volver a preguntar"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Abrir configuración de Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "No se encontraron dispositivos"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Sí"
+
+msgid "IDS_BR_SK_NO"
+msgstr "No"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Renombrar dispositivo"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nombre del dispositivo"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Error."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Conectado"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Aceptar"
+
+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_SK_RENAME"
+msgstr "Renombrar"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Pulse para cambiar la configuración"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Se ingresó un carácter no válido. Inténtelo de nuevo"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "No soportado."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Disponible"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Error de conexión"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Dispositivos Wi-Fi Directo"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Pulse para conectar."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Cancelar conexión"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Dispositivos conectados"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Todo"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Dispositivos ocupados"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Conectado con otro dispositivo"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Conectando..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Esperando conectarse"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Error de conexión"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Error de conexión."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Conexión múltiple"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Desconectar todo"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Desconectar"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "No se han encontrado dispositivos"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Desactivar Wi-Fi Directo después de usar"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Desac. Wi-Fi Directo después de usar"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Desactivar Wi-Fi Directo después de uso para ahorro de la batería"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Desac. Wi-Fi Directo después de usar para ahorr. bat."
-msgid "IDS_WFD_POP_WIFI_OFF"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s está solicitando una conexión Wi-Fi Directo. ¿Permitir?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
msgstr "Al usar Wi-Fi Directo se desconectará la conexión Wi-Fi actual. ¿Continuar?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Al usar Wi-Fi Directo se desconectará la redirección de Wi-Fi actual. ¿Continuar?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Al usar Wi-Fi directo se desconectará anclaje de Wi-Fi actual. ¿Continuar?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Conexión Wi-Fi Directo"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Desconectar Wi-Fi Directo"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "¿Desea cancelar la conexión de Wi-Fi Directo?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "No hay dispositivos"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectar a otros dispositivos a través de Wi-Fi Directo."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "No ha habido actividad por %d minutos desde que se activó Wi-Fi Directo. Se ha desactivado Wi-Fi Directo para extender la vida de la batería."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Buscar"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Detener"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Error en desactivación"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Error en desactivación."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Error al activar"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Error en la activación."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "La conexión actual se desconectará. ¿Continuar?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Puedes conectar hasta %d dispositivos al mismo tiempo."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Dispositivos disponibles"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Puedes conectar hasta %d dispositivos al mismo tiempo"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Error al conectar a %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Dispositivo conectado a otro dispositivo."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Conectado a %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "El PIN no coincide."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Desactivando…"
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "La conexión actual se perderá para poder iniciar la búsqueda. ¿Continuar?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Dispositivos que no pudieron conectarse"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Introducir PIN para conectarse a %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Conectar a %s en %d segundos."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Seleccionar dispositivos"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Se perdió la conexión a Wi-Fi Directo."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Conectar con %s en %d segundos."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Renombrar dispositivo"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "No se puede conectar"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Detener conexión"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Permitir"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Activando..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Conectar"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Conectado"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Introducir nombre de dispositivo"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectado con %d dispositivos a través de Wi-Fi Directo."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "No conectado"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Se cancelará esta conexión de Wi-Fi Directo."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Para ahorrar batería, desactive Wi-Fi Directo después de usarlo."
diff --git a/ug-wifidirect/po/et.po b/ug-wifidirect/po/et.po
index 50ff9cc..252b207 100644..100755
--- a/ug-wifidirect/po/et.po
+++ b/ug-wifidirect/po/et.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Ühendatud"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Sisestage oma tunnus."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Ühendamine..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Lubatud arv märke on täis."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d valitud"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Luba"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maksimaalne tähemärkide arv (%d) on saavutatud"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP-aadressi hankimine nurjus."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Ühendatud Wi-Fi võrguga %s"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Ühenduse katkestamine..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Mitte kunagi"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Laadi alla: Wi-Fi ja 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Laadi alla: Wi-Fi ja 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS-i PIN-kood"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Unusta"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Tühista"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Ühendatud"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Tundmatu tõrge"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Saate lülituda automaatselt ümber Wi-Fi ja mobiilsidevõrkude vahel, et säilitada stabiilne internetiühendus."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-koodid ei kattu!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Ilmnes autentimistõrge"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktiveerimine..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Failide kiiremaks allalaadimiseks kasutatakse Wi-Fi ja mobiilsidevõrke koos. See võib suurendada teie mobiilset andmekasutust."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d valitud"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Nutikas võrgu vahetamine on aktiveeritud. See funktsioon aitab säilitada stabiilse internetiühenduse, lülitudes ümber mobiilsidevõrgu ja Wi-Fi võrgu vahel. See võib suurendada teie andmekasutust."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Desaktiveerimine..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s on valitud.\n\nKui te ei saa luua ühendust AP-ga, muutke SIM-kaardi halduris kinnitamiseks kasutatavat SIM-kaarti. Seejärel valige SIM-kaart, mida soovite kasutada mobiilse andmeside ja multimeediumsõnumite jaoks. Selle asemel võite ka katkestada ühenduse SIM-kaardiga, mida ei soovi kasutada."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Tugi puudub"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Vajutage %d minuti jooksul WPS-nuppu oma Wi-Fi paasupunktil."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Ava"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi pääsupunkti ei leitud."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Uhendus praeguse vorguga katkestatakse."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Kuva parool"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Sees"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Väljas"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Unusta võrk"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Nutikas võrgu vahetamine"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signaali tugevus"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Väh. mob. andmeside kas."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Kiiruse prioriteet"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Võrkude liitmine"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi võrgu teave"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Valige WPS-i meetod"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Puhverserveri aadress"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Parool"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Sisestage parool."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS-i nupp"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Otsi"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct seadmed"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Otsi peidetud võrku"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi võrgud on saadaval."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Ainult laadimise ajal"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Nõrk"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Kasutaja sert."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Määramata"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Tundmatu"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Suurte failide kiiremaks allalaadimiseks kasutage Wi-Fi ja mobiilisidevõrke koos."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Alamvõrgumask"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Staatiline IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sortimisalus"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Skaneerimine..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Võta vastu teavitusi, kui võrgud on saadaval"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "puudutage ühendamiseks"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Puhverserveri port"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nimi"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-aadress"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-aadress"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Tunnus"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Lüüsi aadress"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Sisestage tunnus."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP-meetod"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Ühendamine..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Ühenda"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Katkesta ühendus"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Salvestatud"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fi võrk on tuvastatud. Teid ühendatakse."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Täpsemad seaded"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ei"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Turvalisuse poliis piirab Wi-Fi kasutuse."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Directi teave"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toksake ühendamiseks siia."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct võimaldab Wi-Fi seadmetel otse ühenduda, muutes printimise, failijagamise, sünkroonimise ja ekraanijagamise palju lihtsamaks ning mugavamaks. Teenust Wi-Fi Direct toetavate seadmete ühendamine võimaldab teil mitmesuguste rakenduste abil jagada sisu, sünkroonida andmeid, suhelda sõpradega, mängida mänge, heli, videoid ja teha muudki"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Teie seade loob ühendust seadmega %1$s. Kuid see võrk ei pruugi pakkuda juurdepääsu internetile.\nToksake valikut OK, et jääda hetkel ühendatuks seadmega %1$s, kuid samas takistada nutikal võrgu vahetamisel luua tulevikus ühendust selle võrguga."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fit ja Mobile AP-d ei saa aktiveerida samaaegselt. Kas desaktiveerida Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Logi Wi-Fi võrku"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet ei pruugi olla saad."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ära küsi enam"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Ava Wi-Fi seaded"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Seadmeid ei leitud"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Jah"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ei"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Tühista"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Nimeta seade ümber"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Minu seadme nimi"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nurjus."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Tühista"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Ühendatud"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Nim. ümb."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Toksake, et muuta seadeid"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Sisestati vale tähemärk. Proovige uuesti"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Tugi puudub."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Saadaval"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Ühendus nurjus"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct seadmed"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "puudutage uhendamiseks."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Katkesta ühendus"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Ühendatud seadmed"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Vali kõik"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Hõivatud seadmed"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Ühendatud teise seadmega"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Ühendamine..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Ühenduse ootamine"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Ühendamine nurjus"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Ühendamine nurjus."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Mitmikühendus"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Katkesta kõigi ühendus"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Katkesta ühendus"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Seadmeid ei leitud"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Desaktiveerige Wi-Fi Direct pärast kasutamist"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Pärast kasut. desakt. Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Aku säästmiseks desaktiveerige Wi-Fi Direct pärast kasutamist"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Pärast kasut. desakt. Wi-Fi Direct, et säästa akut"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s taotleb Wi-Fi Directi ühendust. Kas lubate?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Directi kasutamisel katkestatakse aktiivne Wi-Fi ühendus. Kas jätkata?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Directi kasutamisel katkestatakse aktiivne Wi-Fi modem. Kas jätkata?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Directi ühendus"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Ühenda Wi-Fi Direct lahti"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Kas katkestada Wi-Fi Directi ühendus?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Seadmeid pole"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Uhenda teiste seadmetega Wi-Fi Directi kaudu."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Alates Wi-Fi Directi aktiveerimisest pole %d minutit midagi toimunud. Aku kestvuse pikendamiseks on Wi-Fi Direct desaktiveeritud."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Otsi"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Lõpeta"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Desaktiveerimine nurjus"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Desaktiveerimine nurjus."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktiveerimine nurjus"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktiveerimine nurjus."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Aktiivne ühendus katkestatakse. Kas jätkata?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Korraga saate uhendada kuni %d seadet."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Saadaolevad seadmed"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Korraga saate ühendada kuni %d seadet"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Ühenduse loomine üksusega %s nurjus."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Seade on ühendatud teise seadmega."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Ühendatud võrguga %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-koodid ei kattu."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Desaktiveerimine..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Aktiivne ühendus katkestatakse, et otsimist saaks alustada. Kas jätkata?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Seadmed, millega ühendamine nurjus"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Sisestage PIN-kood, et luua uhendust seadmega %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Loo uhendus seadmega %s %d sekundi parast."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-kood %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Vali seadmed"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Directi uhendus on katkenud."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Uhenda seadmega %s %d s parast."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Nimeta seade ümber"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Ühendust ei saa luua"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Katkesta ühendus"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Luba"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktiveerimine..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Ühenda"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Ühendatud."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Sisestage seadme nimi"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Ühendatud Wi-Fi Directi kaudu %d seadmega."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Pole ühendatud"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Antud Wi-Fi Direct ühendus tühistatakse."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Akutoite saastmiseks desaktiveerige Wi-Fi Direct parast kasutamist."
diff --git a/ug-wifidirect/po/eu.po b/ug-wifidirect/po/eu.po
index 4cb31ea..9a948b5 100644..100755
--- a/ug-wifidirect/po/eu.po
+++ b/ug-wifidirect/po/eu.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Adierazi zure IDa"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Gehienezko karaktere kopurura heldu zara"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d aukeratuta"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Gaitu"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "%d gehienezko karaktere kopurura iritsi zara."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Ezin izan da IP helbidea lortu."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "%s Wi-Fi sarera konektatu da."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Inoiz ez"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Deskar. datuak Wi-Fi eta 4G bidez"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Deskar. datuak Wi-Fi eta 3G bidez"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PINa"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Ahaztu"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Ezeztatu"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Onartu"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Konektatuta"
-msgid "IDS_WFD_CONNECTING"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatikoki aldatu Wi-Fi eta sare mugikorren artean, Internet konexio egonkorra mantentzeko."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Autentifikazio errorea gertatu da"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi eta sare mugikorrak elkarrekin erabiliko dira fitxategiak azkarrago deskargatzeko. Baliteke horrek datu mugikorren erabilera handitzea."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Sare adimendunaren tekla gaitu da. Funtzio horrek Internet konexio egonkorrari eusten laguntzen du, sare mugikorren eta Wi-Fi sareen artean aldatuz. Baliteke datu erabilera handitzea."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s hautatu da.\n\nEzin baduzu SP batera konektatu, aldatu egiaztapenean erabilitako SIM txartela, SIM txartelaren kudeatzailean. Ondoren hautatu Datu mugikorretarako eta multimedia mezuetarako erabili nahi duzun SIM txartela. Bestela, erabili nahi ez duzun SIM txartela atera dezakezu."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Sakatu WPS Wi-Fi sargunean %d minutu igaro baino lehen"
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Ireki"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ez da Wi-Fi APrik aurkitu"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Sare hau deskonektatuko da"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Erakutsi pasahitza"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Aktibatuta"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Desaktibatuta"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Ahaztu sarea"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Sare adimendunaren tekla"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Seinale indarra"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Txikitu d. mug. erabilera"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Lehenetsi abiadura"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Sare lotzea"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi sarearen informazioa"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Hautatu WPS metodoa"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy helbidea"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Pasahitza"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Pasahitza idatzi"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS botoia"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Eskaneatzea"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Aurkitu ezkutuko sarea"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi sare erabilgarriak"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Kargatzean soilik"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Ahula"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Erabiltzailearen ziurtag."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Zehaztu gabe"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Ezezaguna"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Fitxategi handiak azkarrago deskargatzeko, erabili Wi-Fi eta sare mugikorrak aldi berean"
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Azpi-sareko maskara"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP estatikoa"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Antolatu honen bidez"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Eskaneatzen..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Jaso jakinarazpenak sareak erabilgarri daudenean"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy ataka"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Izena"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC helbidea"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP helbidea"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identitatea"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Atebidearen helbidea"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Sartu identitatea"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP metodoa"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
msgstr "Konektatzen"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Deskonektatzen"
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Konektatu"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Gordeta"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fi sarea hauteman da. Konektatu egingo zara."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Ezarpen aurreratuak"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ez"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Segurtasun politikak Wi-Fi erabilera mugatzen du"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Ukitu hemen konektatzeko."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Zure gailua %1$s-(e)ra konektatzen ari da. Hala ere, baliteke sare honek Interneterako sarbiderik ez ematea.\nUkitu ados orain %1$s-(e)ra konektatuta jarraitzeko, baina saihestu sare adimendunaren tekla etorkizunean sare honetara konektatzea."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi eta Mobile AP ezin dira aldi berean aktibatu. Desaktibatu Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Hasi saioa Wi-Fi sarean"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Baliteke Internet erabilgarri ez egotea"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ez galdetu berriz"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Ireki Wi-Fi ezarpenak"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Ez da gailurik aurkitu"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Bai"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ez"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Ezeztatu"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Berrizendatu gailua"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nire gailuaren izena"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Huts egin du"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Ezeztatu"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
msgstr "Konektatuta"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Errore ezezaguna"
+msgid "IDS_BR_SK_OK"
+msgstr "Ados"
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PINak ez datoz bat!"
+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_WFD_BODY_ACTIVATING"
-msgstr "Aktibatzen..."
+msgid "IDS_ST_SK_RENAME"
+msgstr "Berrizendatu"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d aukeratuta"
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Ukitu ezarpenak aldatzeko"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Desaktibatzen..."
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Karaktere baliogabea adierazi dituzu. Saiatu berriz."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
+msgid "IDS_ST_POP_NOT_SUPPORTED"
msgstr "Bateraezina"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Eskuragarri"
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Eskaneatzea"
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Konexioak huts egin du"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
msgstr "Wi-Fi Direct-en gailuak"
-msgid "IDS_WFD_TAP_TO_CONNECT"
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
msgstr "Ukitu konektatzeko"
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Konektatu"
-
-msgid "IDS_WFD_BUTTON_CANCEL"
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
msgstr "Utzi konexioa"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Direct-i buruz"
-
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct funtzioak Wi-Fi gailuei zuzenean konektatzea ahalbidetzen die, hala, errazagoa eta erosoagoa izango da inprimatzea, fitxategiak partekatzea, sinkronizatzea eta pantailak partekatzea. Wi-Fi Direct onartzen duten gailuetara konektatzean posible izango zaizu zure edukia partekatzea, datuak sinkronizatzea, lagunekin sozializatzea, jokoetara jokatzea, audioa, bideoa eta bestelakoak erabiltzea, zenbait aplikazioren bidez"
-
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Konektatutako gailuak"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Hautatu denak"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Lanpetutako gailuak"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Beste gailua batekin konektatuta"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Konektatzen"
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
-msgstr "Konexiora itxaroten"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "Konexioa itxaroten"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
msgstr "Ezin izan da konektatu"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Konexio anitza"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Deskonektatu guztiak"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Deskonektatu"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Ez da gailurik aurkitu"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Desgaitu Wi-Fi Direct erabili ondoren"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Ezgaitu Wi-Fi Direct erabili ostean"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Desgaitu Wi-Fi Direct erabili ondoren bateria aurrezteko"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Ezgaitu Wi-Fi Direct erabili ostean bateria aurrezteko"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s baimena eskatzen ari zaizu Wi-Fi Direct-ekin konektatzeko?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct erabiltzeak oraingo Wi-Fi konexioa deskonektatuko du. Jarraitu?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct erabiltzeak oraingo Wi-Fi ainguraketa deskonektatuko du. Jarraitu?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct konexioa"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Deskonektatu Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Utzi Wi-Fi Direct konexioa?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Gailurik ez"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Konektatu beste gailu batzuetara Wi-Fi Direct bidez"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Ez da aktibitaterik egon %d minutuz Wi-Fi Direct gaitu zenetik. Bateria bizitza luzatzeko, Wi-Fi Direct ezgaitu da."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Eskane-atzea"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Gelditu"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "Desaktibazioak huts egin du"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "Aktibazioak huts egin du"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Uneko konexioa deskonektatu egingo da. Jarraitu?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Eskura dauden gailuak"
-
-msgid "IDS_WFD_POP_MULTI_CONNECT"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
msgstr "%d gailu ere konekta ditzakezu aldi berean"
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Gailu eskuragarriak"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Ezin da %s-ra konektatu"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Gailua beste gailu batera konektatuta"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s-ra konektatuta"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINak ez datoz bat"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Desaktibatzen..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Oraingo konexioa deskonektatuko da bilaketa abiarazteko. Jarraitu?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Konektatu ezin izan diren gailuak"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Adierazi PINa %s-(e)ra konektatzeko"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Konektatu %s-(e)ra %d segundo barru"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN kodea %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Hautatu gailuak"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct konexioa galdu da"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Konektatu %s-(r)ekin %d seg. barru"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Berrizendatu gailua"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PINa"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Ezin da konektatu"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Eten konexioa"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Baimendu"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktibatzen..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Konektatu"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Konektatuta"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Idatzi gailu izena"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Beste %d gailurekin konektatuta Wi-Fi Direct bidez"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Ez dago konektatuta"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Wi-Fi Direct konexio hau utziko da."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Bateria aurrezteko, ezgaitu Wi-Fi Direct erabili ondoren"
+
diff --git a/ug-wifidirect/po/fi.po b/ug-wifidirect/po/fi.po
index 7a9d955..b541f62 100644..100755
--- a/ug-wifidirect/po/fi.po
+++ b/ug-wifidirect/po/fi.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Yhdistetty"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Anna tunnuksesi."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Yhdistetään..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Merkkien enimmäismäärä saavutettu."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d valittu"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Päälle"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Merkkien enimmäismäärä %d on saavutettu."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP-osoitteen haku epäonnistui."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Yhdistetty Wi-Fi-verkkoon %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Yhteyttä katkaistaan..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Ei koskaan"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Lataa Wi-Fi- ja 4G-v. kautta"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Lataa Wi-Fi- ja 3G-v. kautta"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Unohda"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Peruuta"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Yhdistetty"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Tuntematon virhe"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Vaihda automaattisesti Wi-Fi-yhteyden ja matkapuhelinverkkojen välillä vakaan Internet-yhteyden säilyttämiseksi."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-koodit eivät täsmää!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Todennusvirhe"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktivoidaan..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi- ja matkapuhelinverkkoja käytetään yhdessä, jotta suuret tiedostot ladataan nopeammin. Tämä voi lisätä mobiilidatan käyttöä."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d valittu"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Älykäs verkon vaihto on käytössä. Tämä toiminto auttaa pitämään Internet-yhteyden vakaana vaihtamalla matkapuhelin- ja Wi-Fi-verkkojen välillä. Tämä voi lisätä datankäyttöä."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Kytketään pois päältä..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s on valittu.\n\nJos et pysty muodostamaan yhteyttä tukiasemaan, vaihda vahvistukseen käytettävä SIM-kortti siirtymällä SIM-kortin hallintaan. Valitse sitten mobiilidata- ja multimediaviestitoimintojen kanssa käytettävä SIM-kortti. Voit myös poistaa SIM-kortin käytöstä, jos et halua käyttää sitä."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Ei tuettu"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Paina Wi-Fi-yhteyspisteesi WPS-painiketta %d minuutin kuluessa."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Avoin"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "WI-Fi-yhteyspistettä ei löydy."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Yhteys nykyiseen verkkoon katkaistaan."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Näytä salasana"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Päällä"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Pois"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Unohda verkko"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Älykäs verkon vaihto"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signaalinvoimakkuus"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Väh. mobiilidatan käyttöä"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Priorisoi nopeus"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Verkkojen liitos"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi-verkon tiedot"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Valitse WPS-menetelmä"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Välityspalvelimen osoite"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Salasana"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Kirjoita salasana."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS-painike"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Hae"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct -laitteet"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Etsi piilotettu verkko"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Käytett. olevat Wi-Fi-verkot."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Vain latauksen aikana"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Heikko"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Käyttäjävarmenne"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Määrittelemätön"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Tuntematon"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Voit ladata suuret tiedostot nopeammin käyttämällä Wi-Fi- ja matkapuhelinverkkoja yhdessä."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Aliverkon peite"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Staattinen IP-osoite"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Lajitteluperuste"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Etsitään..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Vastaanota ilmoituksia, kun verkkoja on käytettävissä."
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Yhdistä napauttamalla"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Välityspalvelimen portti"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nimi"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-osoite"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-osoite"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Käyttäjätiedot"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Yhdyskäytävän osoite"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Anna käyttäjätiedot."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP-menetelmä"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Yhdistetään..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Yhdistä"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Peruuta yhteys"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Tallennettu"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Havaittu Wi-Fi-verkko. Yhdistetään."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Lisäasetukset"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ei"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Suojauskäytäntö estää Wi-Fi-yhteyden käytön."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Directin tiedot"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Muodosta yhteys napauttamalla tätä."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct -toiminnon avulla Wi-Fi-laitteet voivat muodostaa suoria yhteyksiä, mikä tekee tulostamisesta, tiedostojen jakamisesta, synkronoinnista ja näytön jakamisesta entistä helpompaa ja mukavampaa. Muodostamalla yhteyden Wi-Fi Direct -toimintoa tukeviin laitteisiin voit jakaa sisältöä, synkronoida tietoja, pitää yhteyttä ystäviin, pelata pelejä, toistaa ääntä ja videoita sekä tehdä paljon muuta erilaisten sovellusten avulla"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Laite muodostaa yhteyttä kohteeseen %1$s. Internet ei kuitenkaan ole tässä verkossa käytettävissä.\nNapauta OK, jos haluat säilyttää yhteyden kohteeseen %1$s, mutta myös estää Älykäs verkon vaihto -toimintoa muodostamasta yhteyttä tähän verkkoon tulevaisuudessa."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fiä ja mobiilitukiasemaa ei voi ottaa käyttöön samaan aikaan. Haluatko poistaa mobiilitukiaseman käytöstä?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Kirjaudu Wi-Fi-verkkoon"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet ei ehkä ole käytett."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Älä kysy uudelleen"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Avaa Wi-Fi-asetukset"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Laitteita ei löytynyt"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Kyllä"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ei"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Peruuta"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Nimeä laite uudelleen"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Oman laitteen nimi"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Epäonnistui."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Peruuta"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Yhdistetty"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Nim. uud."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Muuta asetuksia napauttamalla."
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Annettu virheellinen merkki. Yritä uudelleen."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Ei tuettu."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Käytettävissä"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Yhdist. epäonnistui"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct -laitteet"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Yhdistä napauttamalla."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Peruuta yhteys"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Yhdistetyt laitteet"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Valitse kaikki"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Varatut laitteet"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Yhdistetty toiseen laitteeseen"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Yhdistetään..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Odotetaan yhteyttä"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Yhteyden muodostaminen epäonnistui"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Yhteyden muodostaminen epäonnistui."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Moniyhteys"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Katkaise kaikki"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Katkaise yhteys"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Laitteita ei löytynyt"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Poista Wi-Fi Direct käytön jälkeen käytöstä"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Sammuta Wi-Fi Direct käytön jälk."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Sammuta Wi-Fi Direct käytön jälkeen akun säästämiseksi"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Sammuta Wi-Fi Direct akun sääst. käyt. jälkeen"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s pyytää Wi-Fi Direct -yhteyttä. Sallitaanko?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Directia käytettäessä nykyinen Wi-Fi-yhteys katkaistaan. Jatketaanko?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Directia käytettäessä nykyinen Wi-Fi-yhteyden jakaminen katkaistaan. Jatketaanko?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct -yhteys"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Katkaise Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Peruutetaanko Wi-Fi Direct -yhteys?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Ei laitteita"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Yhdistä muihin laitteisiin Wi-Fi Direct -yhteyden kautta."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Mitään toimintoja ei ole suoritettu %d minuuttiin Wi-Fi Direct -yhteyden käyttöönoton jälkeen. Akun käyttöajan pidentämiseksi Wi-Fi Direct -yhteys on poistettu käytöstä."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Hae"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Lopeta"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Käytöstä poistaminen epäonnistui"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Käytöstä poistaminen epäonnistui."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktivointi epäonnistui"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktivointi epäonnistui."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Nykyinen yhteys katkaistaan. Jatketaanko?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Käytettävissä olevat laitteet"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Voit muodostaa yhteyden samanaikaisesti enintään %d laitteeseen."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Käyt. olevat laitt."
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Yhteyden muodostaminen kohteeseen %s epäonnistui."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Laite on yhdistetty toiseen laitteeseen."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Yhdistetty kohteeseen %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-koodit eivät täsmää."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Kytketään pois päältä..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Nykyinen yhteys katkaistaan, jotta haku voidaan aloittaa. Jatketaanko?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Laitteet, jotka eivät pystyneet muodostamaan yhteyttä"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Anna PIN-koodi laitteeseen %s yhdistämistä varten."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Yhdistä laitteeseen %s %d sekunnin kuluttua."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-koodi %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Valitse laitteet"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct -yhteys on katkennut."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Yhdistä laitt. %s %d s kuluttua."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Nimeä laite uudelleen"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Ei voi yhdistää"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Katkaise yhteys"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Salli"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktivoidaan..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Yhdistä"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Yhdistetty."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Anna laitteen nimi"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Yhdistetty %d laitteeseen Wi-Fi Direct -yhteyden kautta."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Ei yhdistetty"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Tämä Wi-Fi Direct -yhteys peruutetaan."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Voit muodostaa yhteyden samanaikaisesti enintään %d laitteeseen"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Poista Wi-Fi Direct akkuvirran säästämiseksi käytön jälkeen käytöstä."
diff --git a/ug-wifidirect/po/fr.po b/ug-wifidirect/po/fr.po
new file mode 100755
index 0000000..609c3ff
--- /dev/null
+++ b/ug-wifidirect/po/fr.po
@@ -0,0 +1,471 @@
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Entrez votre ID."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Nb max de caractères atteint"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d sélectionné(es)"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Activer"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Le nombre maximum de caractères (%d) est atteint."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Impossible d'obtenir l'adresse IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connecté au réseau Wi-Fi %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Jamais"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Téléch. données via Wi-Fi et 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Téléch. données via Wi-Fi et 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Oublier"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Annuler"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Connecté"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Basculez automatiquement entre le Wi-Fi et les réseaux mobiles pour conserver une connexion Internet stable."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Une erreur d'authentification est survenue"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Les réseaux Wi-Fi et mobile seront utilisés en même temps pour télécharger les fichiers plus rapidement. Cela risque d'augmenter votre utilisation des données mobiles."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Réseau intelligent a été activé. Cette fonction permet de maintenir une connexion Internet stable en jonglant entre les réseaux mobiles et Wi-Fi. Ceci peut augmenter votre utilisation des données."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s est sélectionné.\n\nSi vous ne parvenez pas à vous connecter à un point d'accès, changez la carte SIM utilisée aux fins de la vérification en accédant au gestionnaire de carte SIM. Sélectionnez alors la carte SIM que vous souhaitez utiliser pour les données mobiles et les MMS. Vous pouvez aussi démonter la carte SIM que vous ne prévoyez pas d'utiliser."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Appuyez sur la touche WPS de votre point d'accès Wi-Fi sous %d minutes."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Ouvert"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Aucune application Wi-Fi trouvée."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Le réseau actuel sera déconnecté."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Afficher le mot de passe"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Activé"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Désactivé"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Oublier le réseau"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Bascul. réseau intellig."
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Force du signal"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Réduire util. donn. mob."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioriser la vitesse"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Association de réseaux"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Infos sur le réseau Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Sélectionner la méthode WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Adresse du proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Mot de passe"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Saisir le mot de passe."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Touche WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Rechercher"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Réseau sécurisé"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Réseaux Wi-Fi disponibles"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Uniq. lors du chargement"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Faible"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certif. utilisat."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Non défini"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Inconnu"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Pour télécharger des fichiers volumineux plus rapidement, utilisez les réseaux mobile et Wi-Fi en même temps."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Masque de sous-réseau"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP statique"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Trier par"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Recherche..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Recevoir des notifications lorsque des réseaux sont disponibles"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Port du proxy"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nom"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Adresse MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Adresse IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identité"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Adresse de passerelle"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Indiquer une identité."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Méthode EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Connexion..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Connexion"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Enregistré"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Un réseau Wi-Fi a été détecté. Vous allez être connecté."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Paramètres avancés"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Non"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "La politique de sécurité limite l'utilisation du Wi-Fi."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Appuyez ici pour vous connecter."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Votre appareil se connecte à %1$s. Cependant, ce réseau peut ne pas fournir d'accès à Internet.\nAppuyez sur OK pour rester connecté à %1$s maintenant tout en empêchant la fonction Réseau intelligent de se connecter à ce réseau à l'avenir."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Activation simultanée du Wi-Fi et du point d'accès mobile impossible. Désactiver le point d'accès mobile ?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Connexion au réseau Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Intern. peut ne pas être disp."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne plus demander"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Ouvrir paramètres Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Aucun appareil détecté"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Oui"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Non"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annuler"
+
+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_POP_FAILED"
+msgstr "Échec"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Annuler"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Connecté"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Renommer"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Appuyez pour modifier les paramètres"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Caractère non valide saisi. Réessayez."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Non pris en charge"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Disponible"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Échec de connexion"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Périphériques Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Appuyez pour vous connecter."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Annuler la connexion"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "Périphériques connectés"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Sélect. tout"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "Périphériques occupés"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "Connecté à un autre périphérique"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "Connexion en cours"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Échec de la connexion."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "Connexion multiple"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "Tout déconnecter"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "Déconnecter"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Désactiver Wi-Fi Direct après utilisation"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Désact Wi-Fi Direct après utilisat."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Désactiver Wi-Fi Direct après utilisation pour économiser de la batterie"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Désact Wi-Fi Direct apr util pour économ batterie"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s demande l'autorisation d'établir une connexion via Wi-Fi Direct. Accepter ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "L'utilisation de Wi-Fi Direct va interrompre la connexion Wi-Fi actuelle. Continuer ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "L'utilisation du Wi-Fi Direct va désactiver le modem Wi-Fi. Continuer ?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Connexion Wi-Fi Direct"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Déconnexion de Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Annuler la connexion Wi-Fi Direct ?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Se connecter à d'autres périphériques via Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Aucune activité pendant %d minutes depuis que Wi-Fi Direct est activé. Wi-Fi Direct a été désactivé pour étendre la durée de vie de la batterie."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Rechercher"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "Arrêter"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Échec de la désactivation."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Échec de l'activation."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "La connexion actuelle sera interrompue. Continuer ?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Vous pouvez vous connecter à %d périphériques maximum simultanément."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Périph. disponibles"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Impossible de se connecter à %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Périphérique connecté à un autre périphérique"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Connecté à %s"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Les codes PIN ne correspondent pas."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Désactivation..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "La connexion actuelle va être interrompue pour que la recherche puisse démarrer. Continuer ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Périphériques dont la connexion a échoué"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Entrez le code PIN pour vous connecter à %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Connexion à %s dans %d secondes"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Code PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Sélectionner des appareils"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "La connexion Wi-Fi Direct a été perdue."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Connexion à %s dans %d sec."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Renommer le périphérique"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "Code PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Connexion impossible"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Arrêter connexion"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Autoriser"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Activation en cours..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Connexion"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Connecté"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Entrer un nom pour l'appareil"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connecté à %d périphériques via Wi-Fi Direct"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Non connecté"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Cette connexion Wi-Fi Direct sera annulée."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Désactivez Wi-Fi Direct après utilisation pour économiser la batterie."
+
diff --git a/ug-wifidirect/po/fr_CA.po b/ug-wifidirect/po/fr_CA.po
index efc6601..f677499 100644..100755
--- a/ug-wifidirect/po/fr_CA.po
+++ b/ug-wifidirect/po/fr_CA.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Connecté"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Entrez votre ID."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Nb max de caractères atteint."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d sélect."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Activer"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Le nombre maximum de caractères (%d) est atteint."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Impossible d'obtenir l'adresse IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "La connexion au réseau Wifi %s est établie."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Jamais"
-msgid "IDS_WFD_CONNECTING"
-msgstr "Connexion ..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Téléch. données via Wifi et 4G"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Déconnexion ..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Téléch. données via Wifi et 3G"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "NIP WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Oublier"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Annuler"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Connecté"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Erreur inconnue"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Basculez automatiquement entre le Wifi et les réseaux mobiles pour conserver une connexion Internet stable."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Les NIP ne correspondent pas !"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Une erreur d'authentification est survenue"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "En cours d'activation ..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Les réseaux Wifi et mobile seront utilisés en même temps pour télécharger les fichiers plus rapidement. Cela risque d'augmenter votre utilisation des données mobiles."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d sélectionnées"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Réseau intelligent a été activé. Cette fonction permet de maintenir une connexion Internet stable en jonglant entre les réseaux mobiles et Wifi. Ceci peut augmenter votre utilisation des données."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Désactivation..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s est sélectionné.\n\nSi vous ne parvenez pas à vous connecter à un point d'accès, changez la carte SIM utilisée aux fins de la vérification en accédant au gestionnaire de carte SIM. Sélectionnez alors la carte SIM que vous souhaitez utiliser pour les données mobiles et les MMS. Vous pouvez aussi démonter la carte SIM que vous ne prévoyez pas d'utiliser."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Appuyez sur le bouton WPS de votre point d'accès wifi dans %d minutes."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Ouvert"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Aucune application wifi trouvée"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Le réseau actuel sera déconnecté."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Afficher le mot de passe"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Activé"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Désactivé"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Oublier le réseau"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Réseau intelligent"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Force du signal"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Réduire util. donn. mob."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioriser la vitesse"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Association de réseaux"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Infos sur le réseau Wifi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Sélectionner la méthode WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Adresse du serveur mandataire"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Mot de passe"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Non pris en charge"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Saisir le mot de passe."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Bouton WPS"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Rechercher"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Périphériques Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Réseau sécurisé"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Réseaux Wifi disponibles"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wifi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wifi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Uniq. lors du chargement"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Faible"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certif. utilisat"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Non défini"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Inconnu"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Pour télécharger des fichiers volumineux plus rapidement, utilisez les réseaux mobile et Wifi en même temps."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Masque de sous-réseau"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP statique"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Trier par"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Recherche..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Recevoir des notifications lorsque des réseaux sont disponibles"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Port proxy"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Touchez pour vous connecter"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nom"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Adresse MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Adresse IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identité"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Adresse de passerelle"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Indiquer une identité."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Méthode EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Connexion en cours..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Connexion"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Annuler la connexion"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Enregistré"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Un réseau Wifi a été détecté. Vous allez être connecté."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Paramètres avancés"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Non"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "La politique de sécurité limite l'utilisation du Wifi."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Touchez ici pour vous connecter."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "À propos de Wifi Direct"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Votre appareil se connecte à %1$s. Cependant, ce réseau peut ne pas fournir d'accès à Internet.\nTouchez OK pour rester connecté à %1$s maintenant tout en empêchant la fonction Réseau intelligent de se connecter à ce réseau à l'avenir."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct active les périphériques Wifi pour se connecter directement, réaliser des impressions, partager des fichiers, synchroniser des données et partager des écrans de manière simple et pratique. La connexion aux périphériques qui prennent en charge Wi-Fi Direct permet de partager vos contenus, synchroniser vos données, communiquer avec vos amis, jouer à des jeux, écouter de la musique, visionner des vidéos, etc. via diverses applications."
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Activation simultanée de wifi et du point d'accès mobile impossible. Désactiver le point d'accès mobile ?"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Conn. au réseau Wifi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Intern. peut ne pas être disp."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne plus demander"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Ouvrir paramètres Wifi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Aucun appareil détecté"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Oui"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Non"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annuler"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Renommer l'appareil"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nom de mon périphérique"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Échec."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Non"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Connecté"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Renommer"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Touchez pour modifier les paramètres"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Caractère non valide saisi. Réessayez"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Non pris en charge."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Disponible"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Échec de connexion"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Périphériques Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Touchez pour vous connecter."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Annuler la connexion"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Périphériques connectés"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Sélectionner tout"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Périphériques occupés"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Connecté à un autre périphérique"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Connexion ..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Connexion en cours"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Échec de la connexion"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Échec de la connexion."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Connexion multiple"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Tout déconnecter"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Déconnecter"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Aucun périphérique détecté"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Désactiver Wi-Fi Direct après utilisation"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Désact Wi-Fi Direct après utilisat."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Désactiver Wi-Fi Direct après utilisation pour économiser l'énergie de la pile"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Désact Wi-Fi Direct apr util pour économ pile"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s demande l'autorisation de se connecter à Wifi Direct. Autoriser ?"
-msgid "IDS_WFD_POP_WIFI_OFF"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
msgstr "L'utilisation de Wifi Direct va interrompre la connexion Wifi actuelle. Continuer ?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
msgstr "L'utilisation de Wifi Direct va désactiver le modem Wifi. Continuer ?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Connexion Wifi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
-msgstr "Annuler la connexion Wi-Fi Direct ?"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Déconn. Wifi Direct"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Aucun périphérique"
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Annuler la connexion Wifi Direct ?"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Se connecter à d'autres périphériques via Wifi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Aucune activité pendant %d minutes depuis que Wifi Direct est activé. Wifi Direct a été désactivé pour prolonger la durée d'utilisation de la pile."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Rech."
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Arrêter"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Échec de la désactivation"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Échec de la désactivation."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Échec de l'activation"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Échec de l'activation."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "La connexion actuelle sera déconnectée. Continuer ?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Vous pouvez vous connecter à %d périphériques maximum simultanément."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Appareils disponibles"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Vous pouvez vous connecter à %d périphériques maximum simultanément"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Impossible de se connecter à %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Périphérique connecté à un autre périphérique."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Connecté à %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Les NIP ne correspondent pas."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Désactivation..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "La connexion actuelle va être interrompue pour que la recherche puisse démarrer. Continuer ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Périphériques dont la connexion a échoué"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Entrez le NIP pour vous connecter à %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Connexion à %s dans %d secondes"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Code NIP %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Sélectionner des appareils"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "La connexion Wifi Direct a été perdue."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Connexion à %s dans %d s"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Renommer l'appareil"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "NIP"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Connexion impossible"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Arrêter connexion"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Autoriser"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "En cours d'activation ..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Connexion"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Connecté."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Entrer un nom pour l'appareil"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connecté à %d périphériques via Wifi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Non connecté"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Cette connexion Wifi Direct sera annulée."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Désactivez Wifi Direct après utilisation pour économiser la pile."
diff --git a/ug-wifidirect/po/fr_FR.po b/ug-wifidirect/po/fr_FR.po
deleted file mode 100644
index cd35522..0000000
--- a/ug-wifidirect/po/fr_FR.po
+++ /dev/null
@@ -1,117 +0,0 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Connecté"
-
-msgid "IDS_WFD_CONNECTING"
-msgstr "Connexion..."
-
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Déconnexion..."
-
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Connecté"
-
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Erreur inconnue"
-
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Les codes PIN ne correspondent pas !"
-
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Activation en cours..."
-
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d sélectionné(es)"
-
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Désactivation..."
-
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Non pris en charge"
-
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
-
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Analyser"
-
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Périphériques Wi-Fi Direct"
-
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Appuyez pour vous connecter"
-
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Connexion"
-
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Annuler la connexion"
-
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "A propos Wi-Fi Direct"
-
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct active les périphériques Wi-Fi pour se connecter directement, réaliser des impressions, partager des fichiers, synchroniser des données et partager des écrans de manière simple et pratique. La connexion aux périphériques qui prennent en charge Wi-Fi Direct permet de partager vos contenus, synchroniser vos données, communiquer avec vos amis, jouer à des jeux, écouter de la musique, visionner des vidéos, etc. via diverses applications"
-
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
-msgstr "Périphériques connectés"
-
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
-msgstr "Périphériques occupés"
-
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
-msgstr "Connecté à un autre périphérique"
-
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Connexion..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
-msgstr "Connexion en cours"
-
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Echec de la connexion"
-
-msgid "IDS_WFD_BUTTON_MULTI"
-msgstr "Connexion multiple"
-
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
-msgstr "Tout déconnecter"
-
-msgid "IDS_WFD_BUTTON_DISCONNECT"
-msgstr "Déconnecter"
-
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Aucun périphérique détecté"
-
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "L'utilisation de Wi-Fi Direct va interrompre la connexion Wi-Fi actuelle. Continuer ?"
-
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "L'utilisation de Wi-Fi Direct va désactiver le modem Wi-Fi. Continuer ?"
-
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
-msgstr "Connexion Wi-Fi Direct"
-
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
-msgstr "Annuler la connexion Wi-Fi Direct ?"
-
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Aucun périphérique"
-
-msgid "IDS_WFD_BUTTON_STOPSCAN"
-msgstr "Arrêter"
-
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Echec de la désactivation"
-
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Echec de l'activation"
-
-msgid "IDS_WFD_POP_DISCONNECT"
-msgstr "La connexion actuelle sera déconnectée. Continuer ?"
-
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Appareils disponibles"
-
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Vous pouvez vous connecter à %d périphériques maximum simultanément"
-
diff --git a/ug-wifidirect/po/ga.po b/ug-wifidirect/po/ga.po
index ef5e103..8fcd0d7 100644..100755
--- a/ug-wifidirect/po/ga.po
+++ b/ug-wifidirect/po/ga.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Nasctha"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Iontráil do ID"
-msgid "IDS_WFD_CONNECTING"
-msgstr "Ag nascadh..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Uaslíon na gcarachtar bainte amach."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d roghnaithe"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Cumasaigh"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Uaslíon na gcarachtar %d bainte amach."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Theip ar fháil seoladh IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Nasctha leis an líonra Wi-Fi %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Choíche"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Ag dínascadh..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Íoslód. sonraí le Wi-Fi agus 4G"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Íoslód. sonraí le Wi-Fi agus 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Dearmad"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cuir ar ceal"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Nasctha"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Earráid anaithnid"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Aistrigh go huathoibríoch idir Wi-Fi agus líonraí móibíleacha le nasc Idirlín cobhsaí a choimeád."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Ní mheaitseálann na PIN!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Tharla earráid fhíordheimhnithe"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Ag cur i ngníomh..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Úsáidfear Wi-Fi agus líonraí móibíleacha le chéile chun comhaid a íoslódáil níos tapa. Is féidir go méadófar d'úsáid sonraí móibíleacha leis seo."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d roghnaithe"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Aistriú líonra cliste cumasaithe. Tá an fheidhm seo ina cuidiú leat nasc Idirlín a choinneáil cobhsaí trí aistriú idir líonraí móibíleacha agus Wi-Fi. Is féidir leis seo d'úsáid sonraí a mhéadú."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Ag díghníomhachtú..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Tá %s roghnaithe.\n\nMura féidir leat nascadh le AP, athraigh an cárta SIM a úsáidtear le fíorú ach gabháil chuig Bainisteoir cártaí SIM. Ansin roghnaigh an cárta SIM is mian leat a úsáid le haghaidh Sonraí móibíleacha agus teachtaireachtaí ilmheán. De rogha air sin, is féidir leat an cárta SIM nach mian leat a úsáid a dhíghléasadh."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Gan tacú"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Brúigh WPS ar do phointe rochtana Wi-Fi laistigh de %d nóiméad"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Oscailte"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Níor aimsíodh AP Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Dínascfar an líonra reatha"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Taispeáin pasfhocal"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Air"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "As"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Déan dearmad ar líonra"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Aistriú go líonra cliste"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Neart comhartha"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Laghdaigh úsáid sonraí móib."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Tosaíocht ar luas"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Nascáil líonra"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Faisnéis líonra Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Roghnaigh modh WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Seoladh seachfhreastalaí"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Pasfhocal"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Iontráil pasfhocal"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Cnaipe WPS"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Scan"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Gléasanna Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Aimsigh líonra folaithe"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Tapáil chun nascadh"
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Tá líonraí Wi-Fi ar fáil."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Le linn luchtú amháin"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Lag"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Deimhniú úsáideora"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Neamhshonraithe"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Anaithnid"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Chun comhaid mhóra a íoslódáil níos tapa, úsáid Wi-Fi agus líonraí móibíleacha le chéile."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Masc folíonra"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP Statach"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sórtáil de réir"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Ag scanadh..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Faigh fógraí nuair atá líonraí ar fáil"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Seachphort"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Ainm"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Seoladh MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Seoladh IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Aitheantas"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Seoladh geata"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Iontráil aitheantas"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Modh EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Ag nascadh..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Nasc"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Cuir nasc ar ceal"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Sábháilte"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Braitheadh líonra Wi-Fi. Nascfar leis thú."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Ardsocruithe"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ná déan é"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Cuireann an beartas slándála srian ar úsáid Wi-Fi"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tapáil anseo le nascadh."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Eolas faoi Wi-Fi Direct"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Tá do ghléas á nascadh le %1$s. Mar sin féin, is féidir nach soláthraítear rochtain Idirlín leis an líonra seo.\nTapáil OK le fanacht nasctha le %1$s anois, ach freisin chun cosc a chur ar Aistriú líonra cliste nascadh leis an líonra sin amach anseo."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Cuireann Wi-Fi Direct ar chumas gléasanna Wi-Fi nascadh go díreach, rud a dhéanann priontáil. comhroinnt comhad, sioncronú agus comhroinnt scáileáin níos simplí áisiúla. Trí nascadh le gléasanna a bhfuil tacú iontu do Wi-Fi Direct, is féidir d'inneachar a chomhroinnt, do shonraí a shioncronú, teagmháil a dhéanamh le cairde, cluichí a imirt, ceol agus físeáin a sheinm, agus eile, trí fheidhmchláir éagsúla a úsáid"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Ní féidir Wi-Fi agus AP Móibíleach a chur i ngníomh ag an am céanna. Díghníomhachtaigh AP Móibíleach?"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Sínigh ist. líonra Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Seans nach bhfuil Idirlíon ar fáil"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ná hiarr arís"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Oscail socruithe Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Níor aimsíodh gléasanna"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Déan é"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ná déan é"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cuir ar ceal"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Athainmnigh an gléas"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Ainm mo ghléis"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Theip air."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cuir ar ceal"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Nasctha"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Athainmnigh"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Tapáil le socruithe a athrú"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Carachtar neamhbhailí iontráilte. Triail arís."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Gan tacú."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Ar fáil"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Theip ar nascadh"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Gléasanna Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Tapáil chun nascadh"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Cuir nasc ar ceal"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Gléasanna nasctha"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Roghnaigh gach"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Gléasanna gnóthacha"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Nasctha le gléas eile"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Ag nascadh..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Ag feitheamh le nasc"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Theip ar nascadh"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Theip ar nascadh."
-msgid "IDS_WFD_BUTTON_MULTI"
-msgstr "Ilnasc"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "Ilnascadh"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
-msgstr "Dínasc gach rud"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "Dínasc gach"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Dínasc"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Níor aimsíodh gléas"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Díchumasaigh Wi-Fi Direct tar éis úsáide"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Díchum. Wi-Fi Direct tar éis úsáide"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Díchumasaigh Wi-Fi Direct tar éis úsáide chun an ceallra a choigilt"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Díchum. Wi-Fi Direct tar éis úsáide le ceallra a choigilt"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s ag iarraidh nasc Wi-Fi Direct. Ceadaigh?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Dínascfar an nasc Wi-Fi reatha má úsáidtear Wi-Fi Direct. Ar aghaidh?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Dínascfar an nascaireacht Wi-Fi reatha má úsáidtear Wi-Fi Direct. Ar aghaidh?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Nasc Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Dínasc Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Cuir nasc Wi-Fi Direct ar ceal?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Níl gléasanna ann"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Nasc le gléasanna eile le Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Níor tharla aon ghníomhaíocht le %d nóiméad anuas ón am ar cumasaíodh Wi-Fi Direct. Chun saolré an cheallra a shíneadh rinneadh Wi-Fi Direct a dhíchumasú."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Scan"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stop"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Theip ar dhíghníomhachtú"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Theip ar dhíghníomhachtú."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Theip ar chur i ngníomh"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Theip ar chur i ngníomh."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Dínascfar an nasc reatha. Ar aghaidh?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Is féidir leat suas le %d gléas a nascadh ag an am céanna"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Gléasanna atá ar fáil"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Is féidir leat suas le %d gléas a nascadh ag an am céanna"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Theip ar nascadh le %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Gléas nasctha le gléas eile."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Nasctha le %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Ní hionann na PIN"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Ag díghníomhachtú..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Dínascfar an nasc reatha ionas go bhféadfar tosú ag scanadh. Lean ar aghaidh?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Gléasanna ar theip orthu nascadh"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Iontráil PIN chun nascadh le %s"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Nasc le %s i gceann %d soicind"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Roghnaigh gléasanna"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Cailleadh nasc Wi-Fi Direct"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Nasc le %s i gceann %d soicind"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Athainmnigh an gléas"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Nascadh dodhéanta"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Scoir nasc"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Ceadaigh"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Ag cur i ngníomh..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Nasc"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Nasctha."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Iontráil ainm an ghléis"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Nasctha le %d gléas trí Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Gan nascadh"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Cuirfear an nasc Wi-Fi Direct seo ar ceal."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Le cumhacht ceallra a choigilt, díchumasaigh Wi-Fi Direct tar éis úsáide"
diff --git a/ug-wifidirect/po/gl.po b/ug-wifidirect/po/gl.po
index 263fd3d..4da525e 100644..100755
--- a/ug-wifidirect/po/gl.po
+++ b/ug-wifidirect/po/gl.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Insire a túa ID"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Número máximo de caracteres alcanzado"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d seleccionados"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Activar"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Alcanzouse o número máximo de carácteres %d."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Non se puido obter o enderezo IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Conectado á rede Wi-Fi %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nunca"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Descargar datos por Wi-Fi e 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Descargar datos por Wi-Fi e 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Ignorar"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Aceptar"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Conectado"
-msgid "IDS_WFD_CONNECTING"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Cambiar automaticamente entre redes móbiles e Wi-Fi para manter unha conexión á Internet estable."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Produciuse un erro de autenticación"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Utilizaranse redes Wi-Fi e móbiles á vez para descargar os arquivos máis rápido. É posible que isto aumente a utilización de datos móbiles."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Activouse Smart network switch. Esta función axuda a manter unha conexión á Internet estable mediante o cambio entre redes móbiles e Wi-Fi. É posible que isto aumente o teu uso de datos."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s está seleccionado.\n\nSe non podes conectarte a un punto de acceso, cambia a tarxeta SIM usada para a verificación no xestor de tarxetas SIM. A continuación, selecciona a tarxeta SIM que desexas usar para os datos móbiles e as mensaxes multimedia. Tamén podes desmontar a tarxeta SIM que non desexas usar."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Pulsa no botón WPS no punto de acceso Wi-Fi dentro de %d minutos"
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Abrir"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Non se atopou ningún punto de acceso Wi-Fi"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Desconectarase a rede actual"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Amosar contrasinal"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Activado"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Desactivado"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Ignorar rede"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Cambio rede intelixente"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Intensidade do sinal"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reducir uso datos móbiles"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioridade á velocidade"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Unión de redes"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Información rede Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Seleccionar método WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Enderezo proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Contrasinal"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Introduza o contrasinal"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Botón WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Buscar"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Buscar rede oculta"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Redes Wi-Fi dispoñibles"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Só durante a carga"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Débil"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certificado usua."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Non especificado"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Descoñecido"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Para descargar arquivos grandes máis rapidamente, utiliza redes Wi-Fi e móbiles á vez"
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Máscara de subrede"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP estática"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Ordenar por"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Escaneando..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Recibir notificacións cando as redes estean dispoñibles"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Porto do proxy"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nome"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Enderezo MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Enderezo IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identidade"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Enderezo de pasarela"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Introducir identidade"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Método EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
msgstr "Conectando..."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Desconectando..."
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Conectar"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Gardado"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Detectouse unha rede Wi-Fi. Establecerase a conexión a ela."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Axustes avanzados"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Non"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "A política de seguridade limita o uso da Wi-Fi"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toca aquí para conectarte."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "O teu dispositivo está conectándose a %1$s. Non obstante, é posible que esta rede non forneza acceso á Internet.\nToca Aceptar para manterte conectado a %1$s agora, pero impide tamén que Cambio de Smart network se conecte a esta rede no futuro."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "O Wi-Fi e AP Móbil non poden activarse ao mesmo tempo. Desactivar AP Móbil?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Inic. sesi. na rede Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Pode que Internet non dispoñ."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Non volver preguntar"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Abrir axustes de Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Non se atoparon dispositivos"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Si"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Non"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Cambiar nome do dispositivo"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nome do meu dispositivo"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Erro"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
msgstr "Conectado"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Erro descoñecido"
+msgid "IDS_BR_SK_OK"
+msgstr "Aceptar"
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Os PIN non coinciden!"
+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_WFD_BODY_ACTIVATING"
-msgstr "Activando..."
+msgid "IDS_ST_SK_RENAME"
+msgstr "Cam. nome"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d seleccionadas"
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Toca para cambiar os axustes"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Desactivando..."
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Inseriuse un carácter non válido. Téntao de novo."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
+msgid "IDS_ST_POP_NOT_SUPPORTED"
msgstr "Non admitido"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Dispoñible"
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Buscar"
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Erro de conexión"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
msgstr "Dispositivos Wi-Fi Direct"
-msgid "IDS_WFD_TAP_TO_CONNECT"
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
msgstr "Toca para conectarte"
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Conectar"
-
-msgid "IDS_WFD_BUTTON_CANCEL"
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
msgstr "Cancelar conexión"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Acerca de Wi-Fi Direct"
-
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct permite aos dispositivos Wi-Fi conectarse directamente, realizar impresións, compartir arquivos, sincronizar e compartir pantallas dun xeito moito máis simple e cómodo. A conexión con dispositivos compatibles con Wi-Fi Direct permite compartir o teu contido, sincronizar os teus datos, socializarte cos amigos, xogar a xogos, escoitar son, ver vídeos, etc., mediante varias aplicacións"
-
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Dispositivos conectados"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Seleccionar todo"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Dispositivos ocupados"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Conectado con outro dispositivo"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Conectando..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Agardando conex. datos"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
msgstr "Non se puido establecer a conexión"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Multiconexión"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Desconectar todo"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Desconectar"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Non se atoparon dispositivos"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Desactiva Wi-Fi Direct despois de usalo"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Desactivar Wi-Fi Direct despois uso"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Desactiva Wi-Fi Direct despois de usalo para aforrar batería"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Desac. Wi-Fi Direct desp. uso para aforrar batería"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s está solicitando unha conexión Wi-Fi Direct. Desexas permitila?"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "A utilización de Wi-Fi Direct desconectará a conexión Wi-Fi actual. Desexas continuar?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "A utilización de Wi-Fi Direct desconectará a ancoraxe á rede Wi-Fi actual. Desexas continuar?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Conexión Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Desconectar Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Desexas cancelar a conexión Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Non hai dispositivos"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectar a outros dispositivos a través de Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Non houbo ningunha actividade durante %d minutos dende que se activou Wi-Fi Direct. Para ampliar a vida útil da batería, desactivouse Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Buscar"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Deter"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "Erro na desactivación"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "Fallo na activación"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "A conexión actual desconectarase. Continuar?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Dispositivos dispoñibles"
-
-msgid "IDS_WFD_POP_MULTI_CONNECT"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
msgstr "Podes conectar ata %d dispositivos á vez"
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Dispositivos dispoñ."
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Non se puido conectar a %s"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Dispositivo conectado a outro dispositivo"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Conectando a %s"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Os PINs non coinciden"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Desactivando..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "A conexión actual desconectarase para que se poida iniciar a exploración. Desexas continuar?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Dispositivos que non se puideron conectar"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Introduce o PIN para conectarte a %s"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Conectar con %s dentro de %d segundos"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Código PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Seleccionar dispositivos"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "A conexión Wi-Fi Direct perdeuse"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Conéctate con %s en %d segundos"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Renomear dispositivo"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Imposible conectar"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Deter conexión"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Permitir"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Activando..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Conectar"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Conectado"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Introduce o nome do dispositivo"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectado a %d dispositivos a través de Wi-Fi Direct"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Non conectado"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Cancelarase esta conexión a Wi-Fi Direct."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Para aforrar batería, desactiva Wi-Fi Direct despois de usalo"
+
diff --git a/ug-wifidirect/po/gu.po b/ug-wifidirect/po/gu.po
new file mode 100644
index 0000000..7908a22
--- /dev/null
+++ b/ug-wifidirect/po/gu.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "કોઈ ઉપકરણો મળ્યાં નથી"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "મારું ઉપકરણ નામ"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ઉપકરણનું પુનઃનામકરણ કરો"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "નજીકના ઉપકરણોની યાદીમાં અને બ્લ્યુટુથ, Wi-Fi Direct, અને અન્ય પદ્ધતિઓ મારફતે ઉપલબ્ધ પ્રત્યેક ઉપકરણોની તુલના કરવા માટે ઉપકરણોના નામો પ્રદર્શિત કરવામાં આવે છે."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "વર્ણોની મહત્તમ સંખ્યાએ પહોંચ્યા."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "જોડાણ થઇ રહ્યું છે…"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "રદ કરો"
+
+msgid "IDS_BR_SK_YES"
+msgstr "હા"
+
+msgid "IDS_BR_SK_NO"
+msgstr "ના"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ઓકે"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "રદ કરો"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "નિષ્ફળ."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "સક્ષમ કરો"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d પસંદ કર્યા"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "જોડાયું"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "અમાન્ય અક્ષર દાખલ કર્યો છે. ફરી પ્રયાસ કરો."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "સેટિંગ્સ બદલવા માટે ટેપ કરો."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "રદ કરો"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ઓકે"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "ટેકો નથી."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "સુરક્ષા નીતિ Wi-Fi નો ઉપયોગને પ્રતિબંધિત કરે છે."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "ફરી નામ આપો"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "ઉપલબ્ધ"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "જોડાણ નિષ્ફળ"
+
+msgid "IDS_COM_SK_NO"
+msgstr "ના"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi સીધા ઉપકરણો"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "જોડાણ કરવા માટે ટેપ કરો"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "જોડાણ રદ્દ કરો"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "જોડાણ કરેલ ઉપકરણો"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "બધું પસંદ કરો"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "વ્યસ્ત ઉપકરણો"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "અન્ય ઉપકરણ સાથે જોડેલ છે"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "જોડાણની પ્રતીક્ષા કરે છે"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "જોડવામાં નિષ્ફળ."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "બહુવિધ જોડાણ"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "બધું ડિસ્કનેક્ટ કરો"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "જોડાણ તોડો"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wi-Fi Direct ને વાપર્યા પછી અક્ષમ કરો"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "ઉપયોગ પછી Wi-Fi Direct અક્ષમ કરો"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "બેટરી બચાવવા Wi-Fi Direct ને વાપર્યા પછી અક્ષમ કરો"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "બેટરી બચાવવા ઉપયોગ પછી Wi-Fi Direct અક્ષમ કરો"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s એ Wi-Fi Direct જોડાણની વિનંતી કરી રહ્યાં છે. છૂટ આપીએ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Directનો ઉપયોગ કરવા પર વર્તમાન Wi-Fi જોડાણ અલગ થશે. ચાલુ રાખીએ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Directનો ઉપયોગ કરવા પર વર્તમાન Wi-Fi જોડાણ અલગ થશે. ચાલુ રાખીએ?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct જોડાણ"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ડિસ્કનેક્ટ કરો"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct જોડાણ રદ કરીએ?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct દ્વારા અન્ય ઉપકરણેસ સાથે જોડો."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct સક્ષમ હતું તેથી %d સુધી કોઈ પ્રવૃત્તિ કરવામાં આવી નથી. બેટરી આવરદા વધારવા માટે, Wi-Fi Directને અક્ષમ કર્યુ છે."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "સ્કેન કરો"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "રોકો"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "નિષ્ક્રિયતા નિષ્ફળ."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "સક્રિયતા નિષ્ફળ."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "હાલનું જોડાણ તોડી નખાશે. આગળ વધીએ?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "તમે એક સમયમાં %d ઉપકરણો સુધી જોડાણ કરી શકો છો."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "ઉપલબ્ધ ઉપકરણો"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s સાથે જોડાવવા નિષ્ફળ."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "ઉપકરણ અન્ય ઉપકરણ સાથે જોડાયેલ છે."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s સાથે જોડાણ કરેલું છે."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN મેળ ખાતો નથી."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "નિષ્ક્રિય કરે છે...."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "વર્તમાન કનેક્શન ડિસ્કનેક્ટ કરવામાં આવશે જેથી સ્કેનિંગ પ્રારંભ થઈ શકે. ચાલુ રાખીએ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "જોડવામાં નિષ્ફળ થયેલા ઉપકરણો"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s સાથે જોડવા માટે PIN દાખલ કરો."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d સેકંડ્સમાં %s સાથે જોડાણ કરો."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN કોડ %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ઉપકરણો પસંદ કરો"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct જોડાણ નાશ પામ્યું છે."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%d સેકંડમાં %s સાથે જોડાણ કરો."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ઉપકરણનું પુનઃનામકરણ કરો"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "જોડવામાં અસમર્થ"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "જોડાણ અટકાવો"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "મંજૂરી આપો"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "સક્રિય થઇ રહ્યું છે..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "જોડો"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "જોડાયું."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ઉપકરણનું નામ દાખલ કરો"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct દ્વારા %d ઉપકરણો સાથે જોડાયેલ છે."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "જોડાયેલ નથી"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "આ Wi-Fi Direct જોડાણ રદ કરવામાં આવશે."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "બેટરી પાવર બચાવવા માટે, ઉપયોગ પછી Wi-Fi Direct ને અક્ષમ કરો."
+
diff --git a/ug-wifidirect/po/hi.po b/ug-wifidirect/po/hi.po
index 7e15cee..34df068 100644
--- a/ug-wifidirect/po/hi.po
+++ b/ug-wifidirect/po/hi.po
@@ -1,118 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "जोड़ा गया"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "अपनी ID दर्ज करें"
-msgid "IDS_WFD_CONNECTING"
-msgstr "जोड़ा जा रहा है…"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "वर्णो की संख्‍या अधिकतम पहुँची।"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "डिस्कनेक्ट हो रहा है..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d चयनित"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "जोड़ा गया"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "सक्षम"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "अज्ञात त्रुटि"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN मेल नही खाता!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "वर्णों की अधिकतम संख्या %d तक पहुँच गई।"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "सक्रिय हो रहा है…"
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP पता प्राप्त करने में विफल।"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d चयनित"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Wi-Fi नेटवर्क %s से जोड़ा गया"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "निष्क्रिय हो रहा है…"
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "कभी नहीं"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "असमर्थित"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Wi-Fi और 4G से डाउनलोड करें"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi डायरेक्ट"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "डाटा Wi-Fi और 3G से डाउनलोड करें"
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "स्‍कैन"
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "वाई-फाई डायरेक्ट डिवाइसें"
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "भूल जाएँ"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "कनेक्ट करने के लिए टैप करें"
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "रद्द"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ओके"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "कनेक्ट किया गया"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "एक स्थायी इंटरनेट कनेक्शन बनाए रखने के लिए Wi-Fi और मोबाइल नेटवर्क्स के बीच स्वचालित रूप से स्विच करें।"
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "प्रमाणीकरण त्रुटि हुई"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "फ़ाइलें तेज़ी से डाउनलोड करने के लिए Wi-Fi और मोबाइल डाटा दोनों का एक साथ उपयोग किया जाएगा। इससे आपके मोबाइल डाटा उपयोग में बढ़ोतरी हो सकती है।"
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "स्मार्ट नेटवर्क स्विच सक्षम कर दिया है। मोबाइल और Wi-Fi नेटवर्क्स के बीच स्विच कर स्थिर इंटरनेट कनेक्शन बनाए रखने में इस फंक्शन से मदद मिलती है। इससे आपके डाटा उपयोग में बढ़ोतरी हो सकती है।"
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s चयनित है।\n\nयदि आप किसी AP से कनेक्ट करने में असमर्थ हैं, तो SIM कार्ड प्रबंधक में जाकर सत्यापन के लिए उपयोग किया गया SIM कार्ड बदलें। फिर मोबाइल डाटा और मल्टीमीडिया सन्देशों के लिए उपयोग करने हेतु इच्छित SIM कार्ड चुनें। वैकल्पिक रूप से, आप जो SIM कार्ड उपयोग नहीं करना चाहते उसे अनमाउंट कर सकते हैं।"
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "%d मिनटों के अंदर आप के Wi-Fi एक्सेस पॉइंट पर WPS दबाएँ"
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "खोलें"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "कोई Wi-Fi AP नहीं मिला।"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "वर्तमान नेटवर्क डिस्कनेक्ट हो जाएगा।"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "पासवर्ड दिखाएँ"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "चालू"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "बंद"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "नेटवर्क भूल जाये"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "स्मार्ट नेटवर्क स्विच"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "सिग्नल क्षमता"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "मोबाइल डाटा उपयोग घटाएँ"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "गति को प्राथमिकता दें"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "नेटवर्क बाँडिंग"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi नेटवर्क जानकारी"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS पद्धति चुनें"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "प्रॉक्‍सी पता"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "पासवर्ड"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "पासवर्ड प्रविष्ट करें"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS बटन"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "स्‍कैन करें"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "छुपा नेटवर्क ढूँढें"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi नेटवर्क्स उपलब्ध।"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "केवल चार्जिंग के दौरान"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "दुर्बल"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "उपभोक्ता प्रमाणपत्र"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "अनिर्दिष्‍ट"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "अज्ञात"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "बड़ी फ़ाइलें तेज़ी से डाउनलोड करने के लिए, Wi-Fi और मोबाइल नेटवर्क दोनों का एक साथ उपयोग करें।"
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "सबनेट मास्क"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "स्थिर IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "इसके द्वारा क्रमबद्ध करें"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "स्कैन हो रहा है..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "नेटवर्क्स उपलब्ध होने पर अधिसूचनाएँ प्राप्त करें"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "प्रॉक्‍सी पोर्ट"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "नाम"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC पता"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP पता"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "पहचानें"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "गेटवे पता"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "पहचान प्रविष्ट करें"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP विधि"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "कनेक्ट हो रहा है..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "जोड़ें"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "कनेक्शन रद्द करें"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "सुरक्षित किया"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "एक Wi-Fi नेटवर्क का पता लगा है। आप कनेक्ट हो जाएंगे।"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "उन्नत सेटिंग्स"
+
+msgid "IDS_COM_SK_NO"
+msgstr "नहीं"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi डायरेक्ट के बारे में"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "सुरक्षा नीति Wi-Fi के उपयोग को प्रतिबंधित करती है।"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi डायरेक्ट Wi-Fi डिवाइसेस को सीधे कनेक्ट करना सक्षम करता है, जिस से प्रिंट करना, फ़ाइल साझाकरण, सिंक्रोनाइज करना, और स्‍क्रीन साझाकरण बहुत आसान और अधिक सुविधाजनक बन जाता है। Wi-Fi डायरेक्ट को समर्थित करने वाले डिवाइसेस के साथ कनेक्ट करने से विभिन्न एप्लीकेशंस का उपयोग करते हुए, आपकी सामग्री साझा करना, आपका डेटा सिंक्रोनाइज करना, मित्रों के साथ सोशलाइज़ करना, गेम्स प्ले करने, ऑडियो, वीडियोज़, और बहुत कुछ संभव हो जाता है"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "कनेक्ट करने के लिए यहाँ टैप करें।"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "आपका डिवाइस %1$s से कनेक्ट हो रहा है। हालाँकि, हो सकता है यह नेटवर्क इंटरनेट ऐक्सेस प्रदान न करे।\nअभी %1$s से कनेक्ट रहने के लिए ओके टैप करें, लेकिन साथ ही स्मार्ट नेटवर्क को भविष्य में इस नेटवर्क से कनेक्ट करने से रोकें।"
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "एक ही समय में Wi-Fi और मोबाइल AP सक्रिय नहीं कर सकते हैं। मोबाइल AP निष्क्रिय करें?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi नेटवर्क साइन इन करे"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "हो सकता है इंटरनेट उपलब्ध न हो"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "दोबारा न पूछें"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi सेटिंग्स खोलें"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "कोई डिवाइस नहीं मिले"
+
+msgid "IDS_BR_SK_YES"
+msgstr "हाँ"
+
+msgid "IDS_BR_SK_NO"
+msgstr "नहीं"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "रद्द"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "डिवाइस का नाम बदलें"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "मेरे डिवाइस का नाम"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "विफल।"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "रद्द करें"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "कनेक्ट किया गया"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ओके"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ब्लूटूथ, Wi-Fi Direct और किसी अन्य पद्धतियों के माध्यम से, निकटवर्ती डिवाइसों की सूची में उपलब्ध प्रत्येक डिवाइसों को पहचानने के लिए डिवाइस नाम प्रदर्शित होते हैं।"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "नाम बदलें"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "सेटिंग्स बदलने के लिए टैप करें।"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "अमान्य वर्ण प्रविष्ट किए गए। फिर से प्रयास करें।"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "असमर्थित।"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "उपलब्ध"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "कनेक्शन विफल"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct डिवाइसें"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "कनेक्ट करने के लिए टैप करें"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "कनेक्शन रद्द करें"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "कनेक्ट किए गए डिवाइसेस"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
-msgstr "व्यस्त डिवाइसेस"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "सभी चुनें"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
-msgstr "अन्‍य डिवाइस के साथ कनेक्ट किया गया"
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "व्यस्त डिवाइसेस"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "जोड़ा जा रहा है…"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "अन्‍य डिवाइस के साथ जोड़ा गया"
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
-msgstr "कनेक्शन के लिए प्रतीक्षारत"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "कनेक्शन हेतु प्रतीक्षा"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "कनेक्ट करने में असफल"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "जोड़ने में असफल।"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "मल्टी-कनेक्ट"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "सभी डिस्कनेक्ट करें"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
-msgstr "डिसकनेक्ट"
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "डिस्कनेक्ट"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "उपयोग के बाद Wi-Fi Direct अक्षम करें"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "कोई साधन नहीं मिला"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "उपयोग के बाद Wi-Fi Direct अक्षम करे"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "बैटरी सुरक्षित करने के लिए उपयोग करने के बाद Wi-Fi Direct अक्षम करें"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "बैटरी बचाने हेतु, उपयोग के बाद Wi-Fi Direct अक्षम करें"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
-msgstr "Wi-Fi डायरेक्ट कनेक्‍शन"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s किसी Wi-Fi Direct कनेक्शन के लिए अनुरोध कर रहा है। अनुमति दें?"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
-msgstr "Wi-Fi डायरेक्ट कनेक्‍शन रद्द करें?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct का उपयोग करने पर वर्तमान Wi-Fi कनेक्शन डिस्कनेक्ट हो जाएगा। जारी रखें?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "डिवाइस नहीं"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct का उपयोग करने पर वर्तमान Wi-Fi टेथरिंग डिस्कनेक्ट हो जाएगी। जारी रखें?"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct कनेक्‍शन"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct डिस्कनेक्ट करें"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct कनेक्‍शन रद्द करें?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct के द्वारा अन्य डिवाइसों से कनेक्ट करें।"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct सक्षम होने के बाद से %d मिनट के लिए कोई गतिविधि नहीं हुई। बैटरी लाइफ बढ़ाने के लिए, Wi-Fi Direct अक्षम किया गया है।"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "स्कैन करें"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "रोकें"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "निष्क्रियता विफल"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "निष्क्रियता विफल।"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "सक्रियण विफल"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "सक्रियण विफल।"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "वर्तमान कनेक्शन डिस्कनेक्ट किया जाएगा। जारी रखें?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "उपलब्ध डिवाइसें"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "आप एक ही समय में %d डिवाइसेस तक कनेक्ट कर सकते है।"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "उपलब्‍ध डिवाइसेस"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s से जोड़ने में असफल।"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "डिवाइस अन्‍य डिवाइस के साथ कनेक्ट किया गया।"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s से कनेक्ट किया हुआ।"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN मेल नहीं खाते हैं।"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "निष्क्रिय हो रहा है..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "वर्तमान कनेक्शन डिस्कनेक्ट किया जाएगा ताकि स्कैनिंग प्रारंभ कर सकें। जारी रखें?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "जोड़ने में विफल होने वाले डिवाइस"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s के साथ कनेक्ट करने के लिए PIN प्रविष्ट करें"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d सेकंड में %s से कनेक्ट करें"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "डिवाइस चुनें"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct कनेक्शन खो गया है।"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%d सेकंड में %s से कनेक्ट करें।"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "डिवाइस का नाम बदलें"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "जोड़ने में असमर्थ"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "कनेक्टशन रोकें"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "अनुमति दें"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "सक्रिय हो रहा है..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "कनेक्ट"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "जोड़ा गया।"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "डिवाइस का नाम प्रविष्ट करें"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct के द्वारा %d डिवाइसेस के साथ कनेक्ट किया गया।"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "कनेक्‍ट नहीं है"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "आप एक ही समय में %d डिवाइसेस तक कनेक्ट कर सकते है"
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "यह Wi-Fi Direct कनेक्शन रद्द कर दिया जाएगा।"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "बैटरी पावर बचाने के लिए, उपयोग के बाद Wi-Fi Direct अक्षम करें।"
diff --git a/ug-wifidirect/po/hr.po b/ug-wifidirect/po/hr.po
index 349984d..f7648e8 100644..100755
--- a/ug-wifidirect/po/hr.po
+++ b/ug-wifidirect/po/hr.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Spojeno"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Upišite svoj ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Spajanje..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maks. broj znakova."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Odspajanje..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d odabrano"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Spojeno"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Uključi"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Nepoznata greška"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-ovi se ne podudarajui!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Dosegnut maksimalan broj znakova %d."
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Uključivanje..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Dobivanje IP adrese nije uspjelo."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d odabrano"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Spojeno na Wi-Fi mrežu %s."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Isključivanje..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nikad"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nepodržan"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Skinite pod. preko Wi-Fi i 4G"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Skinite pod. preko Wi-Fi i 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Zaboravi"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Prekid"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Spojen"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatsko prebacivanje između Wi-Fi i mobilnih mreža za održavanje stabilne internetske veze."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Došlo je do greške provjere"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Koristit će se Wi-Fi i mobilne mreže zajedno za brže skidanje velikih datoteka. To bi moglo povećati prijenos podataka na mobilnom uređaju."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Omogućena je Pametna promjena mreže. Ova funkcija omogućuje održavanje stabilne internetske veze prebacivanjem između mobilne i Wi-Fi mreže. To može povećati prijenos podataka."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Odabrana je kartica %s.\n\nAko se ne možete povezati s pristupnom točkom, odlaskom na upravitelja SIM kartice promijenite SIM karticu za provjeru. Zatim odaberite SIM karticu koju želite koristiti za Mobilne podatke i multimedijske poruke. Druga je mogućnost odspajanje SIM kartice koju ne želite koristiti."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Pritisnite WPS na Wi-Fi pristupnoj točki u roku od %d minute."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Otvorena"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nije nađena Wi-Fi pristupna točka."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Trenutna mreža biti će odspojena."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Prikaži lozinku"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Uključeno"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Isključeno"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Zaboravi mrežu"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Pametna promjena mreže"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Jačina signala"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Smanj. korišt. mob. pod."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Daj prioritet brzini"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Povezivanje mreža"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informacije o Wi-Fi mreži"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Odaberite WPS-način"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy adresa"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Šifra"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Unesite lozinku."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS tipka"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Skeniraj"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Uređaji za Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Traži skrivenu mrežu"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Dostupne Wi-Fi mreže."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Samo tijekom punjenja"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Slaba"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Korisnič. potvrda"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Neodređeno"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Nepoznato"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Za brže skidanje velikih datoteka, koristite Wi-Fi i mobilne mreže zajedno."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Maska podmreže"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statički IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sortiraj po"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Pretraživanje..."
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Dotaknite za spajanje"
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Primite obavijesti kada su mreže dostupne."
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy ulaz"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Ime"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC adresa"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP adresa"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identitet"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Adresa pristupnika"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Unesi identitet."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP način"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Spajanje..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Spoji"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Prekini vezu"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Spremljeno"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Prepoznata je Wi-Fi mreža. Bit ćete spojeni."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Dodatne postavke"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Sigurnosne odredbe ograničavaju Wi-Fi korištenje."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "O Wi-Fi Direct"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Dotaknite ovdje za spajanje."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct omogućuje da se Wi-Fi uređaji direktno spajaju, čime se izuzetno olakšava i pojednostavljuje ispis, dijeljenje datoteka, sinkroniziranje i dijeljenje zaslona. Spajanje s uređajima koji podržavaju Wi-Fi Direct omogućuje vam dijeljenje sadržaja, sinkroniziranje podataka, druženje s prijateljima, igranje igara, reproduciranje audia i videa te još mnogo toga pomoću raznih aplikacija"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Vaš se uređaj spaja na %1$s. Međutim, preko ove mreže nije se moguće spojiti na internet.\nDodirnite U redu da biste sad ostali spojeni na %1$s, ali i kako biste spriječili da se Pametna promjena mreže ubuduće spaja na ovu mrežu."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Istodobno ne možete uključiti Wi-Fi i Mobile AP. Isključiti Mobilnu pristupnu točku?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prijava na Wi-Fi mrežu"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet možda nije dostupan"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne pitaj više"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otvori postavke za Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nisu pronađeni uređaji"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Da"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Prekid"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Preimenuj uređaj"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Naziv mog uređaja"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Neuspješno."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Prekid"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Spojeno"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Preimenuj"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Dodirnite za mijenjanje postavki."
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Unesen neispravan znak. Pokušajte ponovno"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodržan."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Dostupno"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Greška spajanja"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Uređaji za Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Dotaknite za spajanje."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Prekini vezu"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Spojeni uređaji"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Odaberi sve"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Zauzeti uređaji"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Spojen na drugi uređaj"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Spajanje..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Čekanje veze"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Greška spajanja"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Greška spajanja."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "multi spajanje"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Prekini sve"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Prekini vezu"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nisu pronađeni uređaji"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Isključi Wi-Fi Direct nakon upotrebe"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Isklj. Wi-Fi Direct"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Isključi Wi-Fi Direct nakon upotrebe radi uštede baterije"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Isklj. Wi-Fi Direct nakon up. radi uštede baterije"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s zahtijeva Wi-Fi Direct vezu. Dopustiti?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Korištenjem Wi-Fi Direct prekida se trenutačna Wi-Fi veza. Nastaviti?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Korištenje Wi-Fi Directa će isključiti trenutno Wi-Fi dijeljenje mreže. Nastaviti?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct veza"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Odspajanje Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Poništiti Wi-Fi Direct vezu?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Nema uređaja"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Spojite se na druge uređaje pomoću Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Nije bilo aktivnosti %d minuta od kada je uključen Wi-Fi Direct. Isključen je Wi-Fi Direct radi produljenja trajanja baterije."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Skeniraj"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Zaustavi"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Isključivanje neuspješno"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Isključivanje neuspješno."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktivacija nije uspjela"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktivacija nije uspjela."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Aktivna veza će se prekinuti. Nastaviti?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "U svakom trenutku možete spojiti najviše %d uređaja."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Dostupni uređaji"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "U svakom trenutku možete spojiti najviše %d uređaja"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Neuspješno spajanje sa %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Uređaj spojen na drugi uređaj."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Spojeno sa %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-ovi ne odgovaraju."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Isključivanje..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Aktivna veza će se prekinuti da bi pretraga mogla početi. Nastaviti?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Uređaji koji se nisu uspjeli spojiti"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Unesite PIN za spajanje s %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Spojite se na %s za %d sek."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Odaberite uređaje"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct veza je prekinuta."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Spajanje s %s za %d sek."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Preimenuj uređaj"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Nemoguće povezati"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Zaustavi vezu"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Dopusti"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Uključivanje..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Spoji"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Spojeno."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Unesite naziv uređaja"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Spojeno s %d uređajima pomoću Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Nije spojen"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Ova Wi-Fi Direct veza bit će poništena."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Da biste uštedili bateriju, isključite Wi-Fi Direct nakon upotrebe."
diff --git a/ug-wifidirect/po/hu.po b/ug-wifidirect/po/hu.po
index b5069e4..657e376 100644..100755
--- a/ug-wifidirect/po/hu.po
+++ b/ug-wifidirect/po/hu.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Csatlakoztatva"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Adja meg az azonosítóját."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Kapcsolódás..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Nincs hely több karakternek."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d kiválasztva"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Engedélyezés"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Elérte a karakterek maximális számát (%d)."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Nem sikerült lekérni az IP-címet."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "A(z) %s Wi-Fi hálózathoz kapcsolódva."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Szétkapcsolás..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Soha"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Adatletöltés Wi-Fi-n és 4G-n"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Adatletöltés Wi-Fi-n és 3G-n"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Elfelejt"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Mégse"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Csatlakoztatva"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Ismeretlen hiba"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatikusan átkapcsol a Wi-Fi és a mobilhálózat között a stabil internetkapcsolat fenntartása érdekében."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "A PIN kódok nem egyeznek!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Hitelesítési hiba történt"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktiválás..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Az eszköz a nagy fájlok letöltésének meggyorsítására egyszerre használja a Wi-Fi és a mobilhálózatot. Így növekedhet a mobil internetkapcsolat adatforgalma."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d kiválasztva"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Engedélyezte az intelligens hálózatváltást. Ez a funkció a mobil- és Wi-Fi hálózat között átváltva hozzájárul a stabil internetkapcsolat fenntartásához. Így megnövekedhet az adatforgalom."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deaktiválás..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "A(z) %s van kiválasztva.\n\nHa nem tud kapcsolódni egy hozzáférési ponthoz, akkor módosítsa a hitelesítéshez használt SIM kártyát a SIM-kártyakezelő segítségével. Ezután válassza ki a mobil adatkapcsolathoz és multimédiás üzenetekhez használni kívánt SIM kártyát. Azt is megteheti azonban, hogy leválasztja azt a SIM kártyát, amelyet nem kíván használni."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nem támogatott"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "%d percen belül nyomja meg a Wi-Fi hozzáférési pont WPS gombját."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Nincs"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nem található Wi-Fi hozzáférési pont."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "A jelenlegi hálózati kapcsolat megszűnik."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Jelszó megjelenítése"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Be"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Ki"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Hálózat elfelejtése"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Intelligens hálózatváltás"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Jelerősség"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Mobil adathaszn. csökk."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "A gyorsaság az elsődleges"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Hálózatkapcsolás"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi hálózat adatai"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS-módszer kiválasztása"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy címe"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Jelszó"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Írja be a jelszót."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS gomb"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Keresés"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct-eszközök"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Rejtett hálózat keresése"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Érintse meg a kapcsolódáshoz"
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Van elérhető Wi-Fi hálózat."
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Kapcsolódik"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Kapcsolat megszakítása"
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Csak töltéskor"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Gyenge"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Felh. tanúsítv."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Nincs megadva"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Ismeretlen"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "A nagy fájlok gyorsabb letöltése érdekében egyszerre is használhatja a Wi-Fi és a mobilhálózatot."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Alhálózati maszk"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statikus IP-cím"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Rendezés"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Ellenőrzés..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Értesítések fogadása, ha elérhető a hálózat"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy port"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Név"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-cím"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-cím"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Azonosító"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Átjárócím"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Identitás megadása"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP módszer"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "2. DNS"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "1. DNS"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Kapcsolódás..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Kapcsolódás"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Mentve."
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fi hálózat észlelhető. Kapcsolódni fog hozzá."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Speciális beállítások"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "A Wi-Fi Directről"
+msgid "IDS_COM_SK_NO"
+msgstr "Nem"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "A Wi-Fi Direct lehetővé teszi a Wi-Fi eszközök közvetlen csatlakoztatását, így jóval egyszerűbbé és kényelmesebbé válik a nyomtatás, fájlmegosztás, szinkronizálás és képernyőmegosztás. Wi-Fi Directet támogató eszközökhöz kapcsolódva tartalmat oszthat meg, adatokat szinkronizálhat, közösségi életet élhet ismerőseivel, játszhat, hangot, videót és egyebeket játszhat le, és különféle alkalmazásokat használhat"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "A biztonsági irányelv korlátozza a Wi-Fi használatát."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Érintse meg a kapcsolódáshoz."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Az eszköz kapcsolódik a(z) %1$s hozzáférési ponthoz. Ez a hálózat azonban nem feltétlenül biztosít internet-hozzáférést.\nÉrintse meg az OK gombot a(z) %1$s-kapcsolat jelenlegi fenntartásához azzal, hogy az intelligens hálózatváltás funkció máskor nem kapcsolódik majd ehhez a hálózathoz."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "A Wi-Fi és a Mobil AP-nem lehet egyszerre aktív. Kikapcsolja a Mobil AP-t?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Bejel. a Wi-Fi hálózatba"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Az internet esetleg nem elérh."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Máskor ne legyen kérdés"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi beállítások megnyitása"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nem található eszköz"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Igen"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nem"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Mégse"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Eszköz átnevezése"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Saját eszköz neve"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Sikertelen"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Mégse"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Csatlakoztatva."
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Átnevez"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Érintse meg a beállítások módosításához"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Érvénytelen karaktert vitt be. Próbálja újra"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nem támogatott."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Elérhető"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Sikert. kapcsolódás"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct-eszközök"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Érintse meg a kapcsolódáshoz."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Kapcsolat megszakítása"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Csatlakoztatott eszközök"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Összes kijelölése"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Foglalt eszközök"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Másik eszközhöz csatlakozik"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Kapcsolódás..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Várakozás kapcsolatra"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Nem sikerült kapcsolódni"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Nem sikerült kapcsolódni."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Többszörös kapcsolat"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Összes szétkapcsolása"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Szétkapcsolás"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nem található eszköz"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Használat után tiltsa le a Wi-Fi Direct funkciót"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Haszn. után tiltsa le a Wi-Fi Directet"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Használat után akkukíméléshez le a Wi-Fi Direct funkciót"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Haszn. után akkukíméléshez tiltsa le a Wi-Fi Directet"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "A(z) %s Wi-Fi Direct-kapcsolatot kér. Engedélyezi?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "A Wi-Fi Direct használata esetén megszakad az aktuális Wi-Fi kapcsolat. Folytatja?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "A Wi-Fi Direct használatával a Mobil Wi-Fi hotspot kapcsolat megszakad. Folytatja?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct-kapcsolat"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct-kapcs. bont."
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Megszakítja a Wi-Fi Direct-kapcsolatot?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Nincs eszköz"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Kapcsolódás más eszközökhöz Wi-Fi Direct segítségével"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "%d percig tartott a tétlenség engedélyezett Wi-Fi Direct mellett. A Wi-Fi Direct az akkumulátor üzemidejének meghosszabbítása érdekében le lett tiltva."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Keres"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Leállít"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "Sikertelen deaktiválás"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Nem sikerült aktiválni"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Nem sikerült aktiválni."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "A jelenlegi kapcsolat megszakad. Folytatja a műveletet?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Egyszerre legfeljebb %d eszközt csatlakoztathat."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Elérhető eszközök"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Egyszerre legfeljebb %d eszközt csatlakoztathat"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Nem sikerült csatlakozni a következőhöz: %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Az eszköz egy másik eszközhöz csatlakozik."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Kapcsolódva a(z) %s hálózathoz."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "A PIN kódok nem egyeznek."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deaktiválás..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "A keresés megkezdéséhez megszakad a jelenlegi kapcsolat. Folytatja?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Sikertelenül kapcsolódó eszközök"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Adja meg a PIN-t a(z) %s eszközhöz való kapcsolódáshoz."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Kapcsolódás a(z) %s eszközhöz %d mp-en belül."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN kód: %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Eszközök kiválasztása"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "A Wi-Fi Direct-kapcsolat megszakadt."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Kapcs. %s esz.höz %d mp-en belül."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Eszköz átnevezése"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Nem lehet kapcsolódni"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Kapcs. leállítása"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Megenged"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktiválás..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Kapcsolódik"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Csatlakoztatva."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Írjon be egy eszköznevet"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "%d eszközhöz csatlakozik Wi-Fi Direct segítségével."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Nincs kapcsolat"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Ez a Wi-Fi Direct-kapcsolat megszakad."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Használat után az akkumulátor kímélése érdekében tiltsa le a Wi-Fi Direct funkciót."
diff --git a/ug-wifidirect/po/hy.po b/ug-wifidirect/po/hy.po
index 657d3c6..e6a9a6a 100644..100755
--- a/ug-wifidirect/po/hy.po
+++ b/ug-wifidirect/po/hy.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Մուտքագրեք Ձեր ID-ն:"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Հասել եք նիշերի առավելագույն քանակին:"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d ընտրվել է"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Ակտիվացնլ"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Հասել է նիշերի առավելագույն քանակին՝ %d"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Չհաջողվեց ստանալ IP հասցե:"
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Միացել է %s Wi-Fi ցանցին"
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Երբեք"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Ներբեռնել տվյալներ. Wi-Fi և 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Ներբեռնել տվյալներ. Wi-Fi և 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Մոռանալ"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Չեղարկել"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Միացված է"
-msgid "IDS_WFD_CONNECTING"
-msgstr "Միացում..."
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Ինքնաբերաբար փոխարկել Wi-Fi և շարժական կապի ցանցերի միջև՝ կայուն ինտերնետ-միացում պահպանելու համար:"
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Նույնականացման սխալ է տեղի ունեցել"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Անջատվում է..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi և բջջային ցանցերը կօգտագործվեն միասին՝ նիշքերն արագ ներբեռնելու համար: Կարող են օգտագործել լրացուցիչ տվյալներ:"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Ցանցերի խելացի փոխարկումն ընձեռվել է: Այս գործառույթն օգնում է պահպանել կայուն ինտերնետի միացում՝ փոխարկելով Wi-Fi և շարժական կապի ցանցերի միջև: Դա կարող է մեծացնել տվյալների օգտագործումը:"
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Ընտրվել է %s:\n\nԵթե չեք կարողանում միանալ որևէ մուտքի կետի, փոխեք ստուգման նպատակով օգտագործվող SIM քարտ՝ գնալով SIM քարտի կառավարիչ: Հետո ընտրեք SIM քարտը, որն ուզում եք օգտագործել Շարժական տվյալների և մուլտիմեդիա հաղորդագրությունների համար: Այլընտրանքորեն, կարող եք ապասարել SIM քարտը, որն ուզում եք օգտագործել:"
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Սեղմեք Ձեր Wi-Fi մուտքի կետի WPS-ը %d րոպե:"
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Բացել"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi մատչման կետ չի գտնեվել:"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Ընթացիկ ցանցը կանջատվի:"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Ցույց տալ գաղտնաբառը"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
msgstr "Միացված է"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Անորոշ սխալ"
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Անջատված է"
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-ը չի համընկնում։"
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Մոռանալ ցանցը"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Ակտիվացվում է..."
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Ցանցերի խելացի փոխարկում"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d ընտրվել է"
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Ազդանշանի ուժգնությունը"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Ապաակտիվացում..."
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Իջեցնել բջջ. տվյլ-ի օգտ-ը"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Չի սատարվում"
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Առաջնահերթ արագություն"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Ցանցի կապում"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Տեղեկ. Wi-Fi ցանցի մասին"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Ընտրել WPS եղանակ"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Պրոքսիի հասցե"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Գաղտնաբառ"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Մուտքագրեք գաղտնաբառը:"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS կոճակ"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Զննել"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct սարքեր"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Փնտրել թաքնված ցանց"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Թակել միանալու համար"
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Առկա են Wi-Fi ցանցեր:"
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Միացնել"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Դադարեցնել միացումը"
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Միայն լիցքավորման ընթացքում"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Թույլ"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Օգտվողի վկայական"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Սահմանված չէ"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Անհայտ"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Մեծ նիշքերն արագ ներբեռնելու համար օգտագործեք Wi-Fi և բջջային ցանցերը միասին:"
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Ենթացանցի դիմակ"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Ստատիկ IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Տեսակավորել ըստ"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Սկանավորում է..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Ստանալ ծանուցումներ ցանցերի մատչելիության մասին"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Պրոքսիի պորտ"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Անուն"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC հասցե"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP հասցե"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Ինքնություն"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Ուղեմուտի հասցե"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Մուտքագրել ինքնությունը:"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP եղանակ"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Միացում..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Միանալ"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Պահպանվեց:"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fi ցանց է հայտնաբերվել: Դուք կմիանաք ցանցին"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Լրացուցիչ կայանքներ"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ոչ"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Direct-ի մասին"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Անվտանգության քաղաքականությունը սահմանափակում է Wi-Fi-ի օգտագործումը:"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct-ը Wi-Fi սարքերին ընձեռում է ուղղակիորեն միանալու հնարավորություն՝ տպելը, ֆայլեր համօգտագործելը, համաժամացնելը և էկրանը համօգտագործելը դարձնելով շատ ավելի հեշտ ու հարմարավետ: Wi-Fi Direct-ի աշխատանքն ապահովող սարքերին միանալը հնարավոր է դարձնում համօգտագործել Ձեր բովանդակությունը, համաժամացնել տվյալները, շփվել ընկերների հետ, խաղեր խաղալ, ձայնանյութեր ու տեսանյութեր նվագարկել և ավելին՝ օգտագործելով զանազան ծրագրեր"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Միանալու համար թակեք այստեղ:"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Ձեր սարքը կապակցվում է %1$s-ին: Սակայն այս ցանցը կարող է չապահովել կապակցումը Համացանցին:\nՀպեք OK՝ %1$s-ին այժմ կապակցված մնալու համար, սակայն նաև կանխեք Խելացի ցանցի փոխարկումը այս ցանցին հետագայում:"
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi-ն ու Mobile AP-ն չեն կարող միաժամանակ ակտիվացվել: Ապաակտիվացնե՞լ Mobile AP-ն:"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Մտեք Wi-Fi ցանց"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Համացանցը կարող է անմատչելի լինել"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Այլևս չհարցնել"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Բացել Wi-Fi կարգավորումները"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Սարքեր չեն գտնվել"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Այո"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ոչ"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Չեղարկել"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Վերանվանել սարքը"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Իմ սարքի անունը"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Ձախողվեց:"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Չեղարկել"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Միացված"
+
+msgid "IDS_BR_SK_OK"
+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_SK_RENAME"
+msgstr "Վրանվանել"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Թակել՝ դրվածքները փոխելու համար"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Անվավեր նիշ է մուտքագրվել: Նորից փորձեք"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Չի սատարվում:"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Հասանելի է"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Միացումը ձախողվեց"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct սարքեր"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Թակել միանալու համար:"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Դադարեցնել միացումը"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Միացված սարքեր"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Ընտրել բոլորը"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Զբաղված սարքեր"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Միացված է այլ սարքի հետ"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Միացում..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Սպասում է միացման"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Չհաջողվեց միանալ"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Չհաջողվեց միանալ:"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Բազմակի միացում"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Անջատել բոլորը"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Անջատել"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Սարքեր չեն գտնվել"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Օգտագործումից հետո կասեցրեք Wi-Fi Direct-ը"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Օգտ. հետո կասեցրեք Wi-Fi Direct-ը"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Օգտագործումից հետո կասեցրեք Wi-Fi Direct-ը՝ մարտկոցի լիցքը խնայելու համար"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Օգտ. հետո կասեցրեք Wi-Fi Direct՝ մրտկց խնայելու հր"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s-ը Wi-Fi Direct միացում է պահանջում. թույլ տա՞լ:"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct օգտագործելը կանջատի ընթացիկ Wi-Fi միացումը. շարունակե՞լ:"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct օգտագործելը կանջատի ընթացիկ Wi-Fi տեղակապումը. շարունակե՞լ:"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct-ի միացում"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Անջատել Wi-Fi Direct-ը"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Դադարեցնե՞լ Wi-Fi Direct-ի միացումը:"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Սարքեր չկան"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Միանալ այլ սարքերի Wi-Fi Direct-ի միջոցով:"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "%d րոպեի ընթացքում ոչ մի գործունեություն չի եղել Wi-Fi Direct-ի ընձեռումից ի վեր: Մարտկոցի կյանքը երկարացնելու համար Wi-Fi Direct-ը կասեցվել է:"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Տեսածրել"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Կանգնել"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Ապաակտիվացումը ձախողվեց"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Ապաակտիվացումը ձախողվեց:"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Ակտիվացումը ձախողվեց"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Ակտիվացումը ձախողվեց:"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Ընթացիկ կապակցումը կդադարեցվի։ Շարունակե՞լ"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Կարող եք միաժամանակ միացնել մինչև %d սարք:"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Մատչելի սարքեր"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Կարող եք միաժամանակ միացնել մինչև %d սարք"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Միացումը %s-ին ձախողվեց:"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Սարքը միացված է այլ սարքի:"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Միացել է %s-ին:"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-երը չեն համընկնում:"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Ապաակտիվացում..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Ընթացիկ միացումը կանջատվի, որպեսզի հնարավոր լինի սկսել տեսածրումը. շարունակե՞լ:"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Սարքեր, որոնք չեն կարողացել միանալ"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Մուտքագրել PIN-ը՝ %s-ին միանալու համար:"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Միանալ %s-ին %d վայրկյանից:"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN կոդ %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Ընտրել սարքեր"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct-ի կապը կորել է:"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Միանալ %s-ի հետ %d վայրկյանից:"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Վերանվանել սարքը"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Անհնար է միանալ"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Կանգնեցնել միացում"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Թույլատրել"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Ակտիվացվում է..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Միացնել"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Միացված է"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Մուտքագրել սարքի անունը"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Միացված է %d սարքերի հետ Wi-Fi Direct-ի միջոցով:"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Միացված չէ"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Այս Wi-Fi Direct միացումը կդադարեցվի:"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Մարտկոցի էներգիան խնայելու համար կասեցրեք Wi-Fi Direct-ը այն օգտագործելուց հետո:"
diff --git a/ug-wifidirect/po/id.po b/ug-wifidirect/po/id.po
new file mode 100644
index 0000000..7e63a68
--- /dev/null
+++ b/ug-wifidirect/po/id.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Tidak ditemukan perangkat"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nama perangkat saya"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Namai ulang perangkat"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Nama perangkat ditampilkan untuk membedakan setiap perangkat yang tersedia dalam daftar perangkat terdekat, dan melalui Bluetooth, Wi-Fi Direct, dan metode lain."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Jumlah maksimum karakter tercapai."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Menyambungkan"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Batal"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ya"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Tidak"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Batal"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Gagal."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Aktif"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d dipilih"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Tersambung"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Karakter tidak valid. Coba lagi"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Ketuk untuk mengubah pengaturan"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Batalkan"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Tdk mendukung."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Kebijakan pengaman membatasi penggunaan Wi-Fi."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Mengganti nama"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Tersedia"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Koneksi gagal"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Tidak"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Perangkat Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi langsung"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Ketuk utk menghubungkan."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Batalkan koneksi"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "Perangkat yg tersambung"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Pilih semua"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "Perangkat sibuk"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "Tersambung dengan perangkat lain"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "Menunggu koneksi"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Gagal utk menyambung."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "Multi-konek"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "Putuskan semua koneksi"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "Putus"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Nonaktifkan Wi-Fi Direct setelah pakai"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Nonaktifkan Wi-Fi Direct stlh pakai"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Nonaktifkan Wi-Fi Direct setelah pakai untuk hemat baterai"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Nonaktifkan Wi-Fi Direct stlh pakai utk hemat bat."
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s meminta koneksi Wi-Fi Direct. Izinkan?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Menggunakan Wi-Fi Direct akan memutuskan koneksi Wi-Fi saat ini. Lanjutkan?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Menggunakan Wi-Fi Direct akan memutuskan penambatan Wi-Fi saat ini. Lanjutkan?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Koneksi Wi-Fi Direct"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Putuskan Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Batalkan koneksi Wi-Fi Direct?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Sambungkan ke perangkat lain lewat Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Tidak ada aktivitas selama %d menit sejak Wi-Fi Direct diaktifkan. Untuk memperpanjang masa pakai baterai, Wi-Fi Direct telah dinonaktifkan."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Pindai"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "Berhenti"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Penonaktifan gagal."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktivasi gagal."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "Koneksi aktif akan terputus. Lanjutkan?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Anda dapat menyambungkan hingga %d perangkat dalam waktu bersamaan."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Perangkat tersedia"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Gagal terhubung ke %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Perangkat tersambung ke perangkat lain."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Terhubung ke %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN tidak cocok."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Menonkatifkan..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Koneksi saat ini akan diputus sehingga pemindaian dapat dimulai. Lanjutkan?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Perangkat yang gagal tersambung"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Masukkan PIN untuk tersambung ke %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Sambung ke %s dalam %d detik."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Kode PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Pilih perangkat"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Koneksi Wi-Fi Direct hilang."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Sambungkan dgn %s dalam %d dtk."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Ubah nama perangkat"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Tdk dpt menyambung"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Hentikan koneksi"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Izinkan"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Mengaktivasi..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Hubung"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Tersambung."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Masukkan nama perangkat"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Tersambung dengan perangkat %d melalui Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Tidak tersambung"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Koneksi Wi-Fi Direct ini akan dibatalkan."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Untuk menghemat daya baterai, nonaktifkan Wi-Fi Direct setelah digunakan."
+
diff --git a/ug-wifidirect/po/is.po b/ug-wifidirect/po/is.po
index ec86b97..c5db3d5 100644..100755
--- a/ug-wifidirect/po/is.po
+++ b/ug-wifidirect/po/is.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Tengt"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Sláðu inn auðkennið þitt."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Verið er að tengjast..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Hámarksfjölda stafa hefur verið náð."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d valið"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Gera virkt"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Hámarksfjölda stafa (%d) hefur verið náð."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Mistókst að fá IP-tölu."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Tengt við Wi-Fi netið %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Verið er að aftengja..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Aldrei"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Sækja gögn um Wi-Fi og 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Sækja gögn um Wi-Fi og 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN fyrir nettengingu"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Gleyma"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Hætta við"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Í lagi"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Tengt"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Óþekkt villa"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Skipta sjálfkrafa á milli Wi-Fi og farsímakerfa til að viðhalda stöðugri nettengingu."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-númerin passa ekki saman!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Auðkenningarvilla kom upp"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Ræsi..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi og farsímakerfi verða notuð saman til að hlaða skrám hraðar niður. Þetta kann að auka farsímagagnanotkun."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d valið"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Kveikt var á snjöllum netskiptum. Þessi eiginleiki hjálpar til við að viðhalda stöðugu netsambandi með því að skipta á milli farsímakerfa og Wi-Fi neta. Þetta kann að auka gagnanotkun."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Slekk..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s er valið.\n\nEf þú getur ekki tengst aðgangsstað skaltu fara í SIM-kortastjórnun og skipta um SIM-kort fyrir staðfestingu. Veldu síðan SIM-kortið sem þú vilt nota fyrir farsímagögn og margmiðlunarskilaboð. Önnur leið er að aftengja SIM-kortið sem þú vilt ekki nota."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Óstutt"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Ýttu á Nettengingu á Wi-Fi aðgangsstaðnum innan %d mínútna."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Opna"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Enginn Wi-Fi aðgangsstaður fannst."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Tengingu við núverandi kerfi verður slitið."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Sýna lykilorð"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Kveikt"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Slökkt"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Gleyma kerfi"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Snjöll netskipti"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Sendistyrkur"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Minnka farsímagagnanotkun"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Hraði í forgangi"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Sameinað net"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Upplýsingar um Wi-Fi net"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Veldu WPS-aðferð"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Vistfang staðgengilsnetþjóns"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Aðgangsorð"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Rita aðgangsorð."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Tengihnapp."
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Skanna"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct tæki"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Finna falið net"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Pikkaðu til að tengja"
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi net eru til staðar."
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Tengja"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Hætta við tengingu"
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Aðeins við hleðslu"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Lítill"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Notandavottorð"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Ótilgreint"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Óþekkt"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Til að sækja skrár hraðar skaltu nota Wi-Fi og farsímakerfi saman."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Undirkerfi"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Kyrrlegar IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Raða eftir"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Verið er að skrá..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Fá tilkynningar þegar net er í boði"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Tengi fyrir staðgengilnetþjón"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Heiti"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-vistfang"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP vistfang"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Auðkenni"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Vistfang gáttar"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Sláðu inn auðkenni."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP-aðferð"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Verið er að tengjast..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Tengjast"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Vistað"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fi net fannst. Þú munt tengjast því."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Frekari stillingar"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nei"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Um Wi-Fi Direct"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Öryggisreglur takmarka notkun Wi-Fi."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct gerir tækjum með Wi-Fi kleift að tengjast beint sín á milli, sem gerir prentun, samnýtingu skráa, samstillingu og skjásamnýtingu einfaldari og þægilegri. Með tengingu við tæki sem styðja Wi-Fi Direct geturðu deilt efninu þínu, samstillt gögn, blandað geði við vini, spilað leiki, myndskeið og tónlist og margt fleira, með ýmsum forritum"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pikkaðu hér til að tengja."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Tækið er tengt við %1$s. Ekki er víst að hægt sé að tengjast við internetið um þetta net.\nPikkaðu á „Í lagi“ til að hafa tækið áfram tengt við %1$s en hindra jafnframt snjöll netskipti í að tengjast við þetta net í framtíðinni."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Það er ekki hægt að nota Wi-Fi og farsímaaðgangsstað á sama tíma. Viltu loka farsímaaðgangsstaðnum?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Skrá inn á Wi-Fi-net"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Net er hugsanlega ekki í boði"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ekki spyrja aftur"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Opna Wi-Fi stillingar"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Engin tæki fundust"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Já"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nei"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Hætta við"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Endurnefna tæki"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Heiti tækisins"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Mistókst."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Hætta við"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Tengt"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Í lagi"
+
+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_SK_RENAME"
+msgstr "Endurnefna"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Pikkaðu til að breyta stillingum"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Ógildur stafur sleginn inn. Reyndu aftur."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Óstutt."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Laust"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Tengingin rofnaði"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct tæki"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Pikkaðu til að tengja."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Hætta við tengingu"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Tengd tæki"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Velja allt"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Upptekin tæki"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Tengt við annað tæki"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Verið er að tengjast..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Bíður eftir tengingu"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Mistókst að tengjast"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Mistókst að tengjast."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Fjöltenging"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Aftengja allt"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Aftengja"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Engin tæki fundust"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Slökkva á Wi-Fi Direct eftir notkun"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Slökkva á Wi-Fi Direct eftir notkun"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Slökkva á Wi-Fi Direct eftir notkun til að spara rafhlöðu"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Slökktu síðan á Wi-Fi Direct til að spara rafhl."
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s biður um Wi-Fi Direct-tengingu. Leyfa?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Núverandi Wi-Fi tengingu verður slitið ef Wi-Fi Direct er notað. Viltu halda áfram?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Núverandi Wi-Fi tjóðrun verður slitið ef Wi-Fi Direct er notað. Viltu halda áfram?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct tenging"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Aftengja Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Hætta við Wi-Fi Direct tengingu?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Engin tæki"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Tengja við önnur tæki um Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Engin virkni hefur verið til staðar í %d mínútur síðan Wi-Fi Direct var gert virkt. Til að bæta rafhlöðuendingu þarf að slökkva á Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Leita"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stöðva"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Mistókst að slökkva"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Mistókst að slökkva."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Ekki tókst að gera virkt"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Ekki tókst að gera virkt."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Tengingu við netkerfið verður slitið. Viltu halda áfram?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Hægt er að tengjast allt að %d tækjum samtímis."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Tiltæk tæki"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Hægt er að tengjast allt að %d tækjum samtímis"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Mistókst að tengjast við %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Tækið er tengt við annað tæki."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Tengt við %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-númer stangast á."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Slekk..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Núverandi tenging verður aftengd svo að skönnun geti hafist. Halda áfram?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Tæki sem mistókst að tengjast"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Sláðu inn PIN-númer til að tengjast við %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Tengjast %s eftir %d sekúndur."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-númer %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Velja tæki"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct tengingin slitnaði."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Tengjast %s eftir %d sek."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Endurnefna tæki"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Ekki er hægt að tengjast"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Slíta tengingu"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Leyfa"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Ræsi..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Tengja"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Tengt."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Sláðu inn heiti tækis"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Tengt við %d önnur tæki um Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Engin tenging"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Hætt verður við þessa Wi-Fi Direct-tengingu."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Til að spara rafhlöðuna skaltu slökkva á Wi-Fi Direct eftir notkun."
diff --git a/ug-wifidirect/po/it_IT.po b/ug-wifidirect/po/it_IT.po
index 5687423..3adb1bc 100644..100755
--- a/ug-wifidirect/po/it_IT.po
+++ b/ug-wifidirect/po/it_IT.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Inserite l'ID."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Raggiunto numero massimo di caratteri."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d selezionato/i"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Attiva"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "È stato raggiunto il numero massimo di caratteri (%d)."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Impossibile ottenere l'indirizzo IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connesso alla rete Wi-Fi %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Mai"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Scarica dati con Wi-Fi e 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Scarica dati con Wi-Fi e 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Rimuovi"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Annulla"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Connesso"
-msgid "IDS_WFD_CONNECTING"
-msgstr "Connessione..."
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Passate automaticamente dalle reti Wi-Fi a quelle mobili e viceversa per mantenere una connessione a Internet stabile."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Disconnessione..."
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Si è verificato un errore di autenticazione"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Collegato"
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Per scaricare file di grandi dimensioni più rapidamente, utilizzate la rete Wi-Fi e la rete cellulare contemporaneamente. Quest'operazione potrebbe comportare l'aumento dell'utilizzo dei dati cellulare."
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Errore sconosciuto"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Rete Intelligente attivata. Questa funzione consente di mantenere una connessione stabile a Internet passando dalla rete cellulare alla rete Wi-Fi e viceversa. L'operazione potrebbe aumentare l'utilizzo dei dati."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "I PIN non corrisponde!"
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s è selezionato.\n\nSe non riuscite a connettervi a un punto di accesso, cambiate la scheda SIM utilizzata per la verifica andando in Gestione schede SIM. Quindi, selezionate la scheda SIM che volete utilizzare per la connessione dati e i messaggi multimediali. In alternativa, potete smontare la scheda SIM che non volete utilizzare."
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Attivazione..."
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Premere WPS sul punto di accesso Wi-Fi entro %d minuti."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d selezionate"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Non protetta"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Disattivazione..."
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nessun punto di accesso Wi-Fi trovato."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Non supportato"
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "La connessione verrà terminata"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Mostra password"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Attivo"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Non attivo"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Dimentica rete"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Rete Intelligente"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Potenza del segnale"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Riduci uso connessione dati"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Assegna priorità a velocità"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Bonding di rete"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informazioni rete Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Seleziona metodo WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Indirizzo proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Password"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Inserisci password."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Tasto WPS"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Scansione"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Dispositivi Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Trova rete nascosta"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Reti Wi-Fi disponibili."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Soltanto durante la ricarica"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Debole"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certific. utente"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Non specificato"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Sconosciuto"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Per scaricare file di grandi dimensioni più rapidamente, utilizzate la rete Wi-Fi e la rete cellulare contemporaneamente."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Maschera di sottorete"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP statico"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Ordina per"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Scansione..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Ricevi notifiche quando sono disponibili delle reti"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Porta"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Toccare per connettersi"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nome"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Indirizzo MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Indirizzo IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identità"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Indirizzo gateway"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Inserisci identità."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Metodo EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Connessione..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Connetti"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Annulla connessione"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Salvato"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "È stata rilevata una rete Wi-Fi. Verrà effettuata la connessione."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Impostazioni avanzate"
+
+msgid "IDS_COM_SK_NO"
+msgstr "No"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "I criteri di sicurezza limitano l'uso del Wi-Fi."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tocca qui per connetterti."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Info su Wi-Fi Direct"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Il dispositivo sta eseguendo la connessione a %1$s. Tuttavia, questa rete potrebbe non offrire accesso a Internet.\nToccate OK per restare connessi a %1$s ma anche per impedire a Rete Intelligente di connettersi a questa rete in futuro."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct consente ai dispositivi Wi-Fi di collegarsi direttamente rendendo più semplici e comode le operazioni di stampa, condivisione file, sincronizzazione e condivisione schermo. Connettendosi ai dispositivi che supportano Wi-Fi Direct, potete condividere i contenuti, sincronizzare i dati, comunicare con gli amici, giocare, riprodurre file audio, video e altro ancora utilizzando diverse applicazioni"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Impossibile attivare contemporaneamente sia Wi-Fi che Router Wi-Fi. Disattivare Router Wi-Fi?"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Accedi a rete Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet non disponibile"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Non chiedere più"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Apri impostazioni Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nessun dispositivo trovato"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Sì"
+
+msgid "IDS_BR_SK_NO"
+msgstr "No"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annulla"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Rinomina il dispositivo"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nome mio dispositivo"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Errore"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Annulla"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Collegato"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Rinomina"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Toccate per modificare le impostazioni"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Carattere inserito non valido. Riprovate."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Non supportato."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Disponibile"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Connes. non riuscita"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Dispositivi Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Toccare per connettersi."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Annulla connessione"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Dispositivi connessi"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Seleziona tutto"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Dispositivi occupati"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Connessi con altro dispositivo"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Connessione..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "In attesa di conness."
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Connessione non riuscita"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Connessione non riuscita."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Connessione multipla"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Disconnetti tutto"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Disconnetti"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nessun dispositivo trovato"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Disattiva Wi-Fi Direct dopo l’utilizzo"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Disattiva Wi-Fi Direct dopo l'uso"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Disattiva Wi-Fi Direct dopo l’utilizzo per risparmiare batteria"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Disatt. Wi-Fi Direct dopo l'uso per risp. batteria"
-msgid "IDS_WFD_POP_WIFI_OFF"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s sta richiedendo una connessione Wi-Fi Direct. Consentire?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
msgstr "Attivando Wi-Fi Direct, la connessione Wi-Fi corrente verrà interrotta. Continuare?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Attivando Wi-Fi Direct, il tethering Wi-Fi corrente verrà interrotto. Continuare?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Attivando Wi-Fi Direct, tethering Wi-Fi verrà interrotto. Continuare?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Connessione Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
-msgstr "Annullare connessione Wi-Fi Direct?"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Disconnetti Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Annullare la connessione?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connettiti ad altri dispositivi con Wi-Fi Direct."
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Nessun dispositivo"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Dall'attivazione di Wi-Fi Direct non è stata rilevata alcuna attività per %d minuti. Wi-Fi Direct è stato disattivato per prolungare la durata della batteria."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Ricerca"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Ferma"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Disattivazione non eseguita"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Disattivazione non eseguita."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Attivazione non riuscita"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Attivazione non riuscita."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "La connessione corrente sarà disconnessa. Continuare?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Potete connettere un massimo di %d dispositivi contemporaneamente."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Dispositivi disponibili"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Potete connettere un massimo di %d dispositivi contemporaneamente"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Impossibile connettersi a %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Dispositivo connesso a un altro dispositivo."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Connesso a %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN non corrispondenti."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Disattivazione..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "La connessione corrente sarà interrotta per permettere l'avvio della ricerca. Continuare?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Dispositivi con connessione non eseguita"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Immettere PIN per connettersi a %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Connesso a %s in %d secondi."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Codice PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Seleziona dispositivi"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "La connessione Wi-Fi Direct è stata interrotta."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Connesso con %s in %d secondi."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Rinomina dispositivo"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Impossibile connettere"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Arres. connessione"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Consenti"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Attivazione..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Connetti"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Connesso"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Inserisci nome dispositivo"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connesso ad altri %d dispositivi con Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Non connesso"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Questa connessione a Wi-Fi Direct verrà annullata."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Per risparmiare la carica della batteria, disattivate Wi-Fi Direct dopo l’utilizzo."
diff --git a/ug-wifidirect/po/ja_JP.po b/ug-wifidirect/po/ja_JP.po
index f323d6b..991768d 100644..100755
--- a/ug-wifidirect/po/ja_JP.po
+++ b/ug-wifidirect/po/ja_JP.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "接続しました。"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "IDを入力してください。"
-msgid "IDS_WFD_CONNECTING"
-msgstr "接続中..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "最大文字数に達しました。"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "切断中..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d件選択"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "接続しました。"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "有効"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "不明なエラーです。"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PINが​一致​しません!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "最大文字数(%d文字)に達しました。"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "起動中..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IPアドレスの取得に失敗しました。"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d件​選択"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Wi-Fiネットワーク%sに接続しました。"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "解除​中..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "常にOFF"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "サポート​されて​いません。"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Wi-Fiと4Gでデータをダウンロード"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Wi-Fiと3Gでデータをダウンロード"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "切断"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "キャンセル"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "接続中"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "安定したインターネット接続を維持するために、モバイルネットワークとWi-Fi接続を自動で切り替え"
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "認証エラー発生"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "ファイルをより速くダウンロードするには、Wi-Fiとモバイルネットワークを同時に使用してください。この操作はモバイルデータの使用量を増加させる可能性があります。"
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "スマートネットワーク切り替えが有効です。この機能は、モバイルネットワークとWi-Fiネットワークを切り替えることで、安定したインターネット接続を維持することに役立ちます。この機能を使用すると、データ使用量が増加します。"
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%sが選択されています。\n\nAPに接続できない場合、SIMカードマネージャーに移動して認証に使用するSIMカードを変更してから、モバイルデータおよびマルチメディアメッセージに使用するSIMカードを選択します。また、使用しないSIMカードのマウントを解除することもできます。"
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "%d分以内にWi-FiアクセスポイントのWPSボタンを押してください。"
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "オープン"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi APが見つかりません。"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "現在のネットワーク接続を解除します。"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "パスワードを表示"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "ON"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "OFF"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "ネットワークを切断"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "スマートネットワーク切り替え"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "電波強度"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "モバイルデータ使用量を抑える"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "速度を優先する"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "ネットワークボンディング"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fiネットワーク情報"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS方式を選択"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "プロキシアドレス"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "パスワード"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "パスワードを入力"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPSボタン"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "スキャン"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Directデバイス"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "非表示ネットワークを検索"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fiネットワークが使用できます。"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "充電中のみON"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "弱い"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "ユーザー証明書"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "設定なし"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "不明"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "容量が大きいファイルをより速くダウンロードするには、Wi-Fiとモバイルネットワークを同時に使用してください。"
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "サブネットマスク"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "静的IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "並べ替え"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "スキャン中..."
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "タップ​して​接続"
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "ネットワークが利用可能な場合に通知を受信"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "プロキシポート"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "名前"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MACアドレス"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IPアドレス"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "ID"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "ゲートウェイアドレス"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "IDを入力"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP方法"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "接続中..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "接続"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "接続をキャンセル"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "保存済み"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fiネットワークが検出されました。接続します。"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "詳細設定"
+
+msgid "IDS_COM_SK_NO"
+msgstr "いいえ"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Direct​に​ついて"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Wi-Fiの使用は、セキュリティポリシーによって制限されています。"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi ​Directは、​より​簡単​で​便利​に​Wi-Fi​デバイス​の​直接​接続、​印刷、​ファイル​共有、​同期、​画面​共有​が​できる​よう​に​します。​Wi-Fi ​Direct​に​対応​した​デバイス​に​接続​する​と、​コンテンツ​の​共有、​データ​の​同期、​友達​と​の​交流​や​ゲーム、​音楽、​動画​の​再生​等​を​様々​な​アプリ​ケーション​で​利用​でき​ます。"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "ここをタップして接続"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "端末が%1$sに接続しようとしています。ただし、このネットワークでは、インターネットにアクセスできない可能性があります。\n%[OK]をタップすると、1$sとの接続は維持されますが、今後[スマートネットワーク切り替え]はこのネットワークへの接続も制限します。"
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-FiとWi-Fiテザリング両方は同時起動できません。Wi-Fiテザリングを無効にしますか?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fiネットワークにサインインしてください。"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "インターネット接続が不安定です"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "今後表示しない"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi設定を表示"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "デバイスが見つかりません。"
+
+msgid "IDS_BR_SK_YES"
+msgstr "はい"
+
+msgid "IDS_BR_SK_NO"
+msgstr "いいえ"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "キャンセル"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "デバイス名称を変更"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "マイデバイス名"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "失敗しました。"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "キャンセル"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "接続"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "近くのデバイス、Bluetooth、Wi-Fi Directなどで表示される利用可能なデバイスリストに、デバイスの名前を表示して、簡単に区別することができます。"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "名前変更"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "設定を変更するには、タップしてください。"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "無効な文字が入力されました。再度実行してください。"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "サポートされていません。"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "使用可能"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "接続失敗"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Directデバイス"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "タップして接続"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "接続をキャンセル"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "接続デバイス"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
-msgstr "アクセスできないデバイス"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "全て選択"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
-msgstr "他のデバイスと接続されています。"
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "接続不可デバイス"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "接続中..."
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "他のデバイスと接続中"
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
-msgstr "接続​待機​中"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "接続待機中"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "接続​に​失敗​しました。"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "接続に失敗しました。"
-msgid "IDS_WFD_BUTTON_MULTI"
-msgstr "複数​接続"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "複数接続"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
-msgstr "全て​切断"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "全て切断"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "切断"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "デバイスが​見つかりません。"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "使用後はWi-Fi Directを無効にしてください。"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Wi-Fi DirectをOFF"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "バッテリーを節約するには、使用後はWi-Fi Directを無効にしてください。"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "節電のため、使用後はWi-Fi DirectをOFF"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%sがWi-Fiダイレクトの接続を要求しています。許可しますか?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Directを使用すると、現在のWi-Fi接続が切断されます。続行しますか?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Directを使用すると、現在のテザリングが切断されます。続行しますか?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct接続"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Directを切断"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Wi-Fi Direct接続をキャンセルしますか?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "デバイス​が​あり​ません。"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Directで他のデバイスに接続"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Directが有効になってから%d分間使用していません。バッテリーの消耗を抑えるために、Wi-Fi Directを無効にしました。"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "スキャン"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "停止"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "無効に​失敗​しました"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "無効に失敗しました。"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "起動に失敗しました。"
-msgid "IDS_WFD_POP_DISCONNECT"
-msgstr "現在の​接続​は切断​されます。​続行しますか?"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "現在の接続は切断されます。続行しますか?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "接続可能なデバイス"
-
-msgid "IDS_WFD_POP_MULTI_CONNECT"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
msgstr "同時に%d台までデバイスを接続できます。"
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "接続可能デバイス"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%sへの接続失敗"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "他のデバイスと接続中です。"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%sに接続"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINが一致しません。"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "解除中..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "スキャンを開始すると、現在の接続は切断されます。続行しますか?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "接続に失敗したデバイス"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%sに接続するにはPINを入力してください。"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%2$d秒以内に、%1$sと接続します。"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "デバイスを選択"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct接続が切断されました。"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%sと%d秒以内に接続してください。"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "デバイス名称を変更"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "接続不可"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "接続を停止"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "許可"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "起動中..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "接続"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "接続しました。"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "デバイス名称を入力"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Directで%d台のデバイスと接続中"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "未接続"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Wi-Fi Direct接続をキャンセルします。"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "バッテリーの消費量を抑えるため、使用後はWi-Fi Directを無効にしてください。"
+
diff --git a/ug-wifidirect/po/ka.po b/ug-wifidirect/po/ka.po
index 2d1a45a..ff7865f 100644..100755
--- a/ug-wifidirect/po/ka.po
+++ b/ug-wifidirect/po/ka.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "დაკავშირებულია"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "შეიყვანეთ თქვენი ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "უკავშირდება..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "გამორთვა..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d არჩეულია"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "დაკავშირებულია"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "გააქტიურება"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "უცნობი შეცდომა"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN–ები არ თანხვდება!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა %d"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "აქტიურდება..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP მისამართის მიღება ვერ მოხდა."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d არჩეულია"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "დაუკავშირდა Wi-Fi ქსელს %s"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "გამორთვა..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "არასოდეს"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "გაუთვალისწინებელი"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "ჩამოტვირთვა Wi-Fi და 4G-ით"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "ჩამოტვირთვა Wi-Fi და 3G-ით"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "დავიწყება"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "გაუქმება"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "დაკავშირებული"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "ავტომატურად გადართეთ Wi-Fi-სა და მობილურ ქსელებს შორის, რათა შენარჩუნდეს უწყვეტი კავშირი ინტერნეტთან."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "მოხდა ავტორიზაციის შეცდომა"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "ფაილების უფრო სწრაფად ჩამოტვირთვისთვის ერთად იქნება გამოყენებული Wi-Fi და მობილური ქსელები. ამით შეიძლება გაიზარდოს მობილურ მონაცემთა გამოყენება."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "ჩაირთო ქსელის ინტელექტუალური გადართვა. ეს ფუნქცია ხელს უწყობს სტაბილური კავშირის შენარჩუნებას ინტერნეტთან, რისთვისაც ახდენს გადართვას მობილურ და Wi-Fi ქსელებს შორის. ამით შეიძლება გაიზარდოს მონაცემთა გამოყენება."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "არჩეულია %s.\n\nთუ წვდომის წერტილს ვერ უკავშირდებით, გადადით SIM ბარათების მმართველზე და შეცვალეთ დამოწმებისთვის გამოყენებული SIM ბარათი. შემდეგ აირჩიეთ SIM ბარათი, რომლის გამოყენებაც გსურთ მობილურ მონაცემთა ქსელისა და მულტიმედიური შეტყობინებებისთვის. სხვაგვარად, შეგიძლიათ გათიშოთ SIM ბარათი, რომლის გამოყენებაც არ გსურთ."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "მაქსიმუმ %d წუთში დააჭირეთ WPS–ს თქვენი Wi-Fi წვდომის წერტილზე."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "გახსნა"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi AP ვერ მოიძებნა."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "მიმდინარე ქსელი გამოირთვება."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "პაროლის გამოჩენა"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "ჩართვა"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "გამორთ."
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "ქსელის დავიწყება"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "ინტელექტუალური გადართვა"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "სიგნალის სიმძლავრე"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "შემცირდეს გამოყენება"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "სიჩქარის პრიორიტეტი"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "ქსელების დაკავშირება"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi ქსელის ინფორმაცია"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "აირჩიეთ WPS მეთოდი"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "პროქსი სერვერის მისამართი"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "პაროლი"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "პაროლის შეყვანა."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS ღილაკი"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "სკანირება"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct მოწყობილობები"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "ფარული ქსელის ძებნა"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "დააკაკუნეთ, რომ დაუკავშირდეთ"
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi ქსელები მისაწვდომია."
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "კავშირი"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "დაკავშირების გაუქმება"
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "მხოლოდ დამუხტვის დროს"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "სუსტი"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "მომხ. სერთიფიკატი"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "დაუზუსტებელი"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "უცნობი"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "დიდი ფაილების მოგვიანებით ჩამოტვირთვისთვის ერთად გამოიყენეთ Wi-Fi და მობილური ქსელი."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "ქვექსელის ნიღაბი"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "სტატიკური IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "გადარჩევა"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "მიმდ. სკანირება"
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "მიიღეთ შეტყობინებები, როდესაც ქსელი მისაწვდომი გახდება"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "პროქსი სერვერის პორტი"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "სახელი"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC მისამართი"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP მისამართი"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "პირადობა"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "გასასვლელის მისამართი"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "შეიყვანეთ საიდენტიფიკაციო ინფორმაცია."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP მეთოდი"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "უკავშირდება..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "დაკავშირება"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "შენახულია"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "ნაპოვნია Wi-Fi ქსელი. დამყარდება კავშირი"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "დამატებითი პარამეტრები"
+
+msgid "IDS_COM_SK_NO"
+msgstr "არა"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "უსაფრთხოების პოლიტიკა ზღუდავს Wi-Fi-ის გამოყენებას."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Direct-ის შესახებ"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "შეეხეთ აქ და დაუკავშირდით."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct ააქტიურებს Wi-Fi მოწყობილობებს, პირდაპირ დასაკავშირებლად, ამოსაბეჭდად, ფაილის გასაზიარებლად, სინქრონიზაციისთვის და ეკრანის გასაზიარებლად, გაცილებით მარტივად და უფრო მოხერხებულად. ისეთ მოწყობილობებთან დაკავშირება, რომლებშიც მუშაობს Wi-Fi Direct, გაძლევთ შესაძლებლობას გააზიაროთ მასალა, დაასინქრონოთ მონაცემები, დაამყაროთ ურთიერთობა მეგობრებთან, ითამაშოთ, ჩართოთ აუდიო, ვიდეო და ა.შ., სხვადასხვა პროგრამების გამოყენებით."
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "თქვენი მოწყობილობა უკავშირდება %1$s-ს. ამასთან, ამ ქსელმა შეიძლება არ მოგცეთ წვდომა ინტერნეტზე.\nშეეხეთ OK-ს და შეინარჩუნეთ კავშირი %1$s-თან ახლა, მაგრამ ასევე აუკრძალეთ ქსელის ინტელექტუალურ გადართვას კავშირის დამყარება ამ ქსელთან მომავალში."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi და Mobile AP ვერ გააქტიურდება ერთიდაიმავე დროს. გამოირთოს Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi ქსელში შესვლა"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "შესაძლოა, ინტერნეტი არ იყოს"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "აღარ მკითხო"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi პარამეტრების გახსნა"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "მოწყობილობები ვერ მოიძებნა"
+
+msgid "IDS_BR_SK_YES"
+msgstr "კი"
+
+msgid "IDS_BR_SK_NO"
+msgstr "არა"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "გაუქმება"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "მოწყობილობის სახელის შეცვლა"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "ჩემი მოწყობილობის სახელი"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "ვერ შესრულდა."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "გაუქმება"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "დაკავშირებულია"
+
+msgid "IDS_BR_SK_OK"
+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_SK_RENAME"
+msgstr "გადარქმ."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "შეეხეთ და შეცვალეთ პარამეტრები"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "აკრეფილია არასწორი სიმბოლო. კიდევ მოსინჯეთ"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "გაუთვალისწინებელი."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "მისაწვდომია"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "ვერ დაკავშირდა"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct მოწყობილობები"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "დააკაკუნეთ, რომ დაუკავშირდეთ."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "დაკავშირების გაუქმება"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "დაკავშირებული მოწყობილობები"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "ყველას არჩევა"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "დაკავებული აპარატები"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "დაკავშირებულია სხვა აპარატთან"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "უკავშირდება..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "დაკავშირების ლოდინი"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "ვერ დაკავშირდა"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "ვერ დაკავშირდა."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "მრავალი კავშირი"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "ყველა კავშირის გათიშვა"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "გათიშვა"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "მოწყობილობები ვერ მოიძებნა"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "გამორთეთ Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "გამორთეთ Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "გამორთეთ Wi-Fi Direct, ენერგიის დასაზოგად"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "გამორთეთ Wi-Fi Direct, ენერგიის დასაზოგად"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s ითხოვს Wi-Fi Direct კავშირს. დართავთ ნებას?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "თუ Wi-Fi Direct-ს გამოიყენებთ, გამოირთვება მიმდინარე Wi-Fi კავშირი. განაგრძობთ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct -ის გამოყენება შეაფერხებს მიმდინარე უკაბელო Wi-Fi-ის მუშაობას. განვაგრძოთ?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct კავშირი"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "შეწყდეს Wi-Fi Direct კავშირი?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "მოწყობილობები არ არის"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "სხვა მოწყობილობებთან დასაკავშირებლად გამოიყენეთ Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "მოქმედებები არ შესრულებულა Wi-Fi Direct-ის გააქტიურებიდან %d წუთის განმავლობაში. კვების ელემენტის სიცოცხლის გასაზრდელად, გამოირთო Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "სკანირება"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "შეჩერება"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "დეაქტივაცია ვერ შესრულდა"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "დეაქტივაცია ვერ შესრულდა."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "ვერ გააქტიურდა"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "ვერ გააქტიურდა."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "მიმდინარე კავშირი გამოირთვება. განაგრძობთ?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "მისაწვდომი მოწყობილობები"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "შეგიძლიათ ერთდროულად დაუკავშირდეთ %d-მდე მოწყობილობას."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "ხელმისაწვდომები"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "ვერ დაკავშირდა %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "მოწყობილობა დაკავშირებულია სხვა მოწყობილობასთან."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "დაკავშირებულია %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-ები არ თანხვდება."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "გამორთვა..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "მიმდინარე კავშირი შეწყდება, რომ დაიწყოს ძებნა. განაგრძობთ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "მოწყობილობები, რომლებიც ვერ დაკავშირდა"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "ჩაწერეთ PIN, რომ დაკავშირდეს %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "დააკავშირეთ %s, %d წამში."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN კოდი %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "მოწყობილობების არჩევა"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct კავშირი დაიკარგა."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "დაკავშირდეს %s %d წამში."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "მოწყობილობის სახელის შეცვლა"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "P I N"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "ვერ უკავშირდება"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "კავშირის შეწყვეტა"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "ნებართვა"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "აქტიურდება..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "კავშირი"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "დაკავშირებულია."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ჩაწერეთ მოწყობილობის სახელი"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "დაკავშირებულია %d მოწყობილობასთან Wi-Fi Direct-ით."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "კავშირი არაა"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "ეს Wi-Fi Direct კავშირი გაუქმდება."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "შეგიძლიათ ერთდროულად დაუკავშირდეთ %d-მდე მოწყობილობას"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ენერგიის დაზოგვის მიზნოთ, გამორთეთ Wi-Fi Direct, მისი გამოყენების შემდეგ."
diff --git a/ug-wifidirect/po/kk.po b/ug-wifidirect/po/kk.po
index 96fab04..f7aa402 100644..100755
--- a/ug-wifidirect/po/kk.po
+++ b/ug-wifidirect/po/kk.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Идентификаторыңызды енгізіңіз."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Таңбалардың ен көп саны артты."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d таңдалды"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Қосу"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Ең көп таңбалар санына (%d) жетті"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP мекенжайын алу сәтсіз аяқталды."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "%s Wi-Fi желісіне қосылды"
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Ешқашан"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Дерек-ді Wi-Fi ж. 4G арқ. жүк-у"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Дерек-ді Wi-Fi ж. 3G арқ. жүк-у"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Ұмыту"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Тоқтату"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Қосылды"
-msgid "IDS_WFD_CONNECTING"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Тұрақты интернет қосылымын қамтамасыз ету үшін Wi-Fi және ұялы байланыс желілері арасында автоматты ауыстырыңыз."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Түпнұсқалық растама қатесі орын алды"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi және ұялы деректер файлдарды жылдамырақ жүктеу үшін бірге пайдаланылатын болады. Бұл ұялы деректерді пайдалануды көбейтуі мүмкін."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Смарт желіні ауыстыру қосылды. Бұл функция ұялы және Wi-Fi желілері арасында ауыстыру арқылы тұрақты Интернет байланысын ұстануға көмектеседі. Бұл деректерді пайдалануды көбейтуі мүмкін."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s таңдалды.\n\nAP қосыла алмасаңыз, SIM карта реттеушісіне өту арқылы растау үшін пайдаланылған SIM картаны ауыстырыңыз. Осыдан кейін ұялы деректер мен мультимедиа хабарлары үшін пайдаланғыңыз келетін SIM картаны таңдаңыз. Балама түрде, пайдаланғыңыз келмейтін SIM картаны алып тастауға болады."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Wi-Fi қатынас нүктесіндегі WPS пернесін %d минут ішінде басыңыз."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Ашу"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ешқандай Wi-Fi AP табылмады."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Ағымдағы желі ажыратылады."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Құпиясөзді көрсету"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Қосылған"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Өшірілген"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Желіні ұмыту"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Смарт желіні ауыстыру"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Сигнал деңгейі"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Ұялы дер. пайдал. азайту"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Жылдамдықты приоритеттеу"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Желіні біріктіру"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi желілер туралы ақпарат"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS әдісін таңдау"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Прокси адресі"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Кілтсөз"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Кілтсөз енгізіңіз."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS түймесі"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Қарап шығу"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Жасырын желіні табу"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi желілері қол жетімді."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Тек зарядтау кезінде"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Әлсіз"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Пайдал-шы куәлігі"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Анықталмаған"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Белгісіз"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Үлкен файлдарды жылдамырақ жүктеу үшін, Wi-Fi және ұялы желілерді бірге пайдаланыңыз."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Бағыныңқы желі енгізу бүркеніші"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Статикалық IP-мекен-жай"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Бойынша сұрыптау"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Көшірілуде..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Хабарландыруларды желілер қол жетімді болған кезде қабылдау"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Порт прокси"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Аты"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC мекенжайы"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-мекен-жай"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Тұлғалық"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Ену нүктесінің адресі"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Идентификаторды енгізу."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP әдісі"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
msgstr "Қосылуда..."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Ажырату"
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Қосу"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Сақталған"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fi желісі табылды. Қосылым орнатылады"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Қосымша қондырғылар"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Жоқ"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Қауіпсіздік саясаты Wi-Fi пайдаланылуын шектейді."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Қосылу үшін мына жерді түртіңіз."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Құрылғыңыз %1$s қосылуда. Дегенмен бұл желі интернетке кіру рұқсатын бермеуі мүмкін.\nҚазір %1$s қосылулы тұру үшін OK түймесін түртіңіз, бірақ болашақта Смарт желі қосқышының осы желіге қосылуын шектейді."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi және Mobile AP екеуін де бір уақытта іске қосу мүмкін емес. Mobile AP мүмкіндігін өшіру керек пе?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi желісіне кіру"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Инт.қол жетімсіз болуы мүмкін"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Қайтадан сұрамаңыз"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi параметрлерін ашу"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Құрылғылар табылмады"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Иә"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Жоқ"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Тоқтату"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Құрылғы атын өзгерту"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Менің құрылғымның аты"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Үзіліп кетті"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Тоқтату"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
msgstr "Қосылды"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Белгісіз қате"
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN кодтары сәйкес келмейді!"
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Құрылғы атаулары жақын құрылғылар тізімінде қол жетімді құрылғылар ақылы көрсетіледі."
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Қосу..."
+msgid "IDS_ST_SK_RENAME"
+msgstr "Бсқш атау"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d таңдалды"
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Параметрлерді өзгерту үшін түртіңіз"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Өшірілуде.."
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Қате таңба енгізілді. Әрекетті қайталаңыз"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
+msgid "IDS_ST_POP_NOT_SUPPORTED"
msgstr "Ұстамайды"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Байланыс аясы"
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Қарап шығу"
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Қосылмады"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
msgstr "Wi-Fi Direct құрылғылары"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Қосылу үшін түртіңіз"
-
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Қосылу"
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Қосылу үшін түртіңіз."
-msgid "IDS_WFD_BUTTON_CANCEL"
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
msgstr "Байланыстан бас тарту"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Direct туралы"
-
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct қызметі басып шығара, файлдарды бөлісе, синхрондай және экранды аса қарапайым әрі қолайлы бөлісе отырып, Wi-Fi құрылғыларына тікелей қосылуға мүмкіндік береді. Wi-Fi Direct қызметіне қолдау көрсететін құрылғыларға қосылу әр түрлі бағдарламалар арқылы мазмұнды бөлуісуге, деректерді синхрондауға, достармен араласуға, ойындар, дыбыс, бейне ойнатуға және т.б. әрекеттерге мүмкіндік береді"
-
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Қосылған құрылғылар"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Бәрін бөлектеу"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Бос емес құрылғылар"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Басқа құрылғымен қосылды"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Қосылуда..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Байланыс күтілуде"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Қосылмады"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Қосылмады."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Бірнеше байланыс"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Барлығын ажырату"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Ажырату"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Құрылғылар табылмады"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Пайдаланғаннан кейін Wi-Fi Direct өшіру"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Пайдаланған соң Wi-Fi Direct өшір-з"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Батареяны үнемдеу үшін пайдаланғаннан кейін Wi-Fi Direct өшіру"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Батарея үнемдеу үшін пайдал. соң Wi-Fi Direct өш-з"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s Wi-Fi Direct байланысын сұрауда. Рұқсат ету керек пе?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct пайдалану ағымдағы Wi-Fi байланысын өшіреді. Жалғастыру керек пе?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct пайдалану ағымдағы Wi-Fi байланыстыруды ажыратады. Жалғастыру керек пе?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct байланысы"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ажыратыңыз"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Wi-Fi Direct байланысынан бас тарту керек пе?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Құрылғылар жоқ"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct арқылы басқа құрылғыларға қосылыңыз."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
-msgstr "Тоқтату"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct қосылғандықтан, %d минут бойы әрекет болмады. Батарея пайдалану мерзімін ұзарту үшін Wi-Fi Direct өшірілді."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Қарап шығу"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "Үзіліс"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Сөндірілген жоқ"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Сөндірілген жоқ."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "Активтендіру сәтсіз"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Ағымдағы байланыс ажыратылады. Жалғастыру керек пе?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Қол жетімді құрылғылар"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Бір уақытта %d құрылғыға дейін қосуға болады."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Қол жетімді құр-лар"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s қосылым сәтсіз аяқталды."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Құрылғы басқа құрылғыға қосылды."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s құрылғысына қосылды."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN кодтары сәйкес келмейді."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Өшірілуде.."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Іздеуді бастау үшін ағымдағы байланыс ажыратылады. Жалғастыру керек пе?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Қосылмаған құрылғылар"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s құрылғысына қосылу үшін PIN кодын енгізіңіз."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%2$d секундтан кейін %1$s құрылғысына қосылу."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN коды %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Құрылғыларды таңдау"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct байланысы жоғалды."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s құрыл-мен %d сек кейін қосылу."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Құрылғы атын өзгерту"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Қосылу мүмкін емес"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Байланысты тоқтату"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Рұқсат ету"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Қосу..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Қосылу"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Қосылды"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Құрылғы атауын енгізу"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "%d құрылғымен Wi-Fi Direct арқылы қосылды."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Қосылмаған"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Бұл Wi-Fi Direct қосылымынан бас тартылады."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Бір уақытта %d құрылғыға дейін қосуға болады"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Батарея зарядын үнемдеу үшін пайдаланғаннан кейін Wi-Fi Direct өшіріңіз."
diff --git a/ug-wifidirect/po/km.po b/ug-wifidirect/po/km.po
new file mode 100644
index 0000000..2ffaf7e
--- /dev/null
+++ b/ug-wifidirect/po/km.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "រក​មិន​ឃើញ​ឧបករណ៍​ណា​មួយ"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "ឈ្មោះ​ឧបករណ៍​ខ្ញុំ"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ប្ដូរ​ឈ្មោះ​ឧបករណ៍"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ឈ្មោះ​ឧបករណ៍​បង្ហាញ​ឡើង​ដើម្បី​សម្គាល់​ឧបករណ៍​នីមួយៗ​ដែល​មាន​ក្នុង​បញ្ជី​ឧបករណ៍​នៅក្បែរ និង តាម Bluetooth, Wi-Fi ផ្ទាល់ និង វិធី​ផ្សេងទៀត។"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "បាន​ដល់​ចំនួន​តួអក្សរ​អតិបរមា។"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "កំពុង​ភ្ជាប់..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "ចោល"
+
+msgid "IDS_BR_SK_YES"
+msgstr "ព្រម"
+
+msgid "IDS_BR_SK_NO"
+msgstr "ទេ"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ព្រម"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "ចោល"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "បាន​បរាជ័យ។"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "បើក"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "បាន​ជ្រើស %d"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "បាន​ភ្ជាប់"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "បាន​វាយបញ្ចូល​តួ​អក្សរ​អសុពលភាព។ សាកល្បង​ម្តង​ទៀត"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "ប៉ះ​ដើម្បី​ប្ដូរ​ការកំណត់"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "បោះ​បង់"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ព្រម"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "មិន​បាន​គាំទ្រ។"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "គោលការណ៍​សន្តិសុខ​កំហិត​ការប្រើ Wi-Fi។"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "ដូរឈ្មោះ"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "ទំនេរ"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "ការភ្ជាប់​បាន​បរាជ័យ"
+
+msgid "IDS_COM_SK_NO"
+msgstr "ទេ"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "ឧបករណ៍ Wi-Fi ផ្ទាល់"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi ផ្ទាល់"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "ប៉ះ​ដើម្បី​ភ្ជាប់។"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "បោះបង់​ការភ្ជាប់"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "ឧបករណ៍​ដែល​បាន​ភ្ជាប់"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "ជ្រើស​ទាំង​អស់"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "ឧបករណ៍​ដែល​រវល់"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "បាន​ភ្ជាប់​ជាមួយ​ឧបករណ៍​ផ្សេង"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "កំពុងរង់ចាំការភ្ជាប់"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ភ្ជាប់។"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "ភ្ជាប់ច្រើន"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "ផ្ដាច់ទាំងអស់"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "ផ្តាច់"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "បិទ Wi-Fi ផ្ទាល់​ក្រោយ​ការប្រើ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "បិទ Wi-Fi ផ្ទាល់ បន្ទាប់​ពី​ការប្រើ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "បិទ Wi-Fi ផ្ទាល់​ក្រោយ​ការប្រើ​ដើម្បី​សំចៃ​ថាមពល​ថ្ម"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "បិទ Wi-Fi ផ្ទាល់ បន្ទាប់​ពី​ការប្រើ​ដើម្បី​សំចៃ​ថាមពល​ថ្ម"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s កំពុងសុំការភ្ជាប់ Wi-Fi ផ្ទាល់ មួយ។ អនុញ្ញាតឲ្យឬ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "ការប្រើ Wi-Fi ផ្ទាល់ នឹង​ផ្ដាច់​ការភ្ជាប់ Wi-Fi បច្ចុប្បន្ន។ បន្ត?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "ការប្រើ Wi-Fi ផ្ទាល់ នឹង​ផ្ដាច់​ចំណង Wi-Fi បច្ចុប្បន្ន។ បន្ត?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "ការភ្ជាប់ Wi-Fi ផ្ទាល់"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "ផ្តាច់ Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "បោះបង់​ការភ្ជាប់ Wi-Fi ផ្ទាល់?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "ភ្ជាប់​ទៅ​ឧបករណ៍​ដទៃ​តាម Wi-Fi ផ្ទាល់។"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "គ្មាន​សកម្មភាព​ណា​មួយ​ក្នុង​ពេល %d នាទី ចាប់តាំង​ពី​បាន​បើកប្រើ Wi-Fi ផ្ទាល់។ ដើម្បី​ពន្យារ​ជីវិត​ថ្ម Wi-Fi ផ្ទាល់​ត្រូវ​បាន​បិទ។"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "ស្កេន"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "ឈប់"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "ការបិទ​ដំណើរការ​បរាជ័យ។"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "ការបើកដំណើរការ​បាន​បរាជ័យ។"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "នឹង​ផ្តាច់​ការភ្ជាប់​បច្ចុប្បន្ន។ បន្ត?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "អ្នក​អាច​ភ្ជាប់​ដល់​ទៅ %d ឧបករណ៍ ក្នុង​ពេល​តែ​មួយ។"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "ឧបករណ៍​ដែល​អាច​រក​បាន"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ភ្ជាប់​ទៅ %s។"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "បាន​ភ្ជាប់​ឧបករណ៍​ជាមួយ​ឧបករណ៍​ផ្សេង។"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "បាន​ភ្ជាប់​ទៅ %s។"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINs មិន​ផ្គូ។"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "កំពុង​បិទ​ដំណើរការ..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "នឹង​ផ្ដាច់​ការ​ភ្ជាប់​បច្ចុប្បន្ន ដើម្បី​អាច​ចាប់​ផ្ដើម​ការ​ស្កេន​នេះ។ បន្តឬ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "ឧបករណ៍ដែលភ្ជាប់មិនបានសម្រេច"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "វាយបញ្ចូល PIN ដើម្បី​ភ្ជាប់​ទៅ %s។"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "ភ្ជាប់​ទៅ %s ក្នុង​ពេល %d វិនាទី។"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "កូដ PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ជ្រើស​ឧបករណ៍"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "ការភ្ជាប់ Wi-Fi ផ្ទាល់ បាន​បាត់បង់។"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "ភ្ជាប់​ជាមួយ %s ក្នុង​ពេល %d វិនាទី។"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ប្ដូរ​ឈ្មោះ​ឧបករណ៍"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "មិន​អាច​ភ្ជាប់"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "បញ្ឈប់​ការភ្ជាប់"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "អនុញ្ញាត"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "កំពុង​ដំណើរការ..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "ភ្ជាប់"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "បាន​ភ្ជាប់។"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "វាយបញ្ចូល​ឈ្មោះ​ឧបករណ៍"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "បាន​ភ្ជាប់​ជាមួយ​ឧបករណ៍ %d តាម Wi-Fi ផ្ទាល់។"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "មិន​បាន​ភ្ជាប់"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "នឹង​បោះបង់​ការភ្ជាប់ Wi-Fi ផ្ទាល់។"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ដើម្បី​សំចៃ​ថាមពល​ថ្ម សូម​បិទ Wi-Fi ផ្ទាល់ បន្ទាប់​ពី​ប្រើ។"
+
diff --git a/ug-wifidirect/po/kn.po b/ug-wifidirect/po/kn.po
new file mode 100644
index 0000000..e872b1f
--- /dev/null
+++ b/ug-wifidirect/po/kn.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "ಸಾಧನಗಳು ಕಂಡುಬಂದಿಲ್ಲ"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "ನನ್ನ ಸಾಧನದ ಹೆಸರು"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ಸಾಧನವನ್ನು ಮರುಹೆಸರಿಸಿ"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ಹತ್ತಿರದ ಸಾಧನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮತ್ತು ಬ್ಲೂಟೂತ್, Wi-Fi Direct ಮತ್ತು ಇತರ ವಿಧಾನಗಳಲ್ಲಿ ಲಭ್ಯವಿರುವ ಪ್ರತಿ ಸಾಧನಗಳನ್ನು ಪ್ರತ್ಯೇಕಿಸಲು ಸಾಧನ ಹೆಸರುಗಳನ್ನು ಪ್ರದರ್ಶಿಸಲಾಗುತ್ತದೆ."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "ಅಕ್ಷರಗಳ ಗರಿಷ್ಠ ಸಂಖ್ಯೆ ತಲುಪಿದೆ."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "ರದ್ದು"
+
+msgid "IDS_BR_SK_YES"
+msgstr "ಹೌದು"
+
+msgid "IDS_BR_SK_NO"
+msgstr "ಇಲ್ಲ"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ಸರಿ"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "ರದ್ದು"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "ವಿಫಲವಾಗಿದೆ."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "ಶಕ್ತಗೊಳಿಸು"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d ಆರಿಸಿದೆ"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "ಅಮಾನ್ಯ ಅಕ್ಷರ ನಮೂದಿಸಲಾಗಿದೆ. ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "ಸಂಯೋಜನೆಗಳನ್ನು ಬದಲಾಯಿಸಲು ತಟ್ಟಿ."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "ರದ್ದು"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ಸರಿ"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "ಬೆಂಬಲಿಸಿಲ್ಲ."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "ಸುರಕ್ಷತಾ ನಿಯಮವು Wi-Fi ಯ ಬಳಕೆಯನ್ನು ನಿರ್ಬಂಧಿಸುತ್ತದೆ."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "ಮ.ಹೆಸರಿಸಿ"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "ಲಭ್ಯವಿದೆ"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "ಸಂಪರ್ಕ ವಿಫಲವಾಗಿದೆ"
+
+msgid "IDS_COM_SK_NO"
+msgstr "ಇಲ್ಲ"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct ಸಾಧನಗಳು"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "ಸಂಪರ್ಕಿಸಲು ತಟ್ಟಿ."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "ಸಂಪರ್ಕ ರದ್ದುಗೊಳಿಸಿ"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "ಸಂಪರ್ಕಿಸಿದ ಸಾಧನಗಳು"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "ಎಲ್ಲಾ ಆಯ್ಕೆಮಾಡಿ"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "ಕಾರ್ಯನಿರತ ಸಾಧನಗಳು"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "ಇನ್ನೊಂದು ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿತವಾಗಿದೆ"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "ಸಂಪರ್ಕಕ್ಕಾಗಿ ಕಾಯುತ್ತಿದೆ"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲವಾಗಿದೆ."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "ಬಹು-ಸಂಪರ್ಕ"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "ಎಲ್ಲವನ್ನು ಡಿಸ್‌ಕನೆಕ್ಟ್ ಮಾಡು"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸು"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ಬಳಸಿದ ನಂತರ Wi-Fi Direct ನಿಶಕ್ತಗೊಳಿಸಿ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "ಬಳಕೆಯ ನಂತರ Wi-Fi Direct ನಿಶಕ್ತಗೊಳಿಸಿ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "ಬ್ಯಾಟರಿ ಉಳಿಸಲು ಬಳಕೆಯ ನಂತರ Wi-Fi Direct ನಿಶಕ್ತಗೊಳಿಸಿ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "ಬ್ಯಾಟರಿ ಉಳಿಸಲು ಬಳಕೆ ಮಾಡಿದ ಬಳಿಕ Wi-Fi Direct ನಿಶಕ್ತಗೊಳಿಸಿ"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s Wi-Fi Direct ಸಂಪರ್ಕಕ್ಕೆ ವಿನಂತಿಸುತ್ತಿದೆ. ಅನುಮತಿಸುವುದೆ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct ಬಳಕೆಯು ಸದ್ಯದ Wi-Fi ಸಂಪರ್ಕವನ್ನು ತಪ್ಪಿಸುತ್ತದೆ. ಮುಂದುವರಿಯುವುದೇ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct ಬಳಕೆಯು ಸದ್ಯದ Wi-Fi ಟೆಥರಿಂಗ್ ಸಂಪರ್ಕಕಡಿತಗೊಳಿಸುತ್ತದೆ. ಮುಂದುವರಿಯುವುದೇ?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct ಸಂಪರ್ಕ"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ಸಂಪರ್ಕ ಕಡಿಯಿರಿ"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct ಸಂಪರ್ಕ ರದ್ದುಗೊಳಿಸುವುದೆ?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ಮೂಲಕ ಇತರ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಿ."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct ಅನ್ನು ಶಕ್ತಗೊಳಿಸಿರುವುದರಿಂದ %d ನಿಮಿಷಗಳ ಕಾಲ ಚಟುವಟಿಕೆಯು ಇರಲಿಲ್ಲ. ಬ್ಯಾಟರಿ ಲೈಫ್ ಹೆಚ್ಚಿಸುವುದಕ್ಕಾಗಿ, Wi-Fi Direct ಅನ್ನು ನಿಶಕ್ತಗೊಳಿಸಲಾಗಿದೆ."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "ಸ್ಕ್ಯಾನ್"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "ನಿಲ್ಲಿಸು"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವಿಕೆ ವಿಫಲವಾಗಿದೆ."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "ಸಕ್ರಿಯತೆಗೊಳ್ಳುವದು ವಿಫಲವಾಗಿದೆ."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "ಪ್ರಸಕ್ತ ಸಂಪರ್ಕದ ಸಂಪರ್ಕ ತೆಗೆಯಲಾಗುವುದು. ಮುಂದುವರಿಯುವುದೆ?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "ಒಂದೇ ಸಮಯದಲ್ಲಿ ನೀವು %d ಸಾಧನಗಳವರೆಗೆ ಸಂಪರ್ಕಿಸಬಹುದು."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "ಲಭ್ಯವಿರುವ ಸಾಧನಗಳು"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ವಿಫಲವಾಗಿದೆ."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "ಸಾಧನವು ಇನ್ನೊಂದು ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿತವಾಗಿದೆ."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%sಗೆ ಸಂಪರ್ಕಿಸಿದೆ."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "ನಿಷ್ಕ್ರೀಯಗೊಳ್ಳುತ್ತಿದೆ..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "ಪ್ರಸಕ್ತ ಸಂಪರ್ಕ ತೆಗೆದಾಗ ಸ್ಕ್ಯಾನಿಂಗ್ ಪ್ರಾರಂಭಗೊಳ್ಳುತ್ತದೆ. ಮುಂದುವರಿಸುವುದೆ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "ಸಂಪರ್ಕಗೊಳ್ಳಲು ವಿಫಲವಾದ ಸಾಧನಗಳು"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s ನೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು PIN ನಮೂದಿಸಿ."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%s ಗೆ %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಸಂಪರ್ಕಿಸಿ."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN ಕೋಡ್ %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ಸಾಧನಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct ಸಂಪರ್ಕ ತಪ್ಪಿಹೋಗಿದೆ."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%d ಸೆಕೆಂಡುಗಳಲ್ಲಿ %s ನೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಿ."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ಸಾಧನವನ್ನು ಮರುಹೆಸರಿಸಿ"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "ಸಂಪರ್ಕಿಸಲು ಅಸಮರ್ಥ"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "ಸಂಪರ್ಕ ನಿಲ್ಲಿಸಿ"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "ಅವಕಾಶ ನೀಡಿ"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "ಸಕ್ರಿಯಗೊಳ್ಳುತ್ತಿದೆ..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "ಸಂಪರ್ಕಿಸು"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "ಸಂಪರ್ಕಿಸಲಾಗಿದೆ."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ಸಾಧನ ಹೆಸರು ನಮೂದಿಸಿ"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ಮೂಲಕ %d ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕಿತವಾಗಿದೆ."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "ಸಂಪರ್ಕಿತವಾಗಿಲ್ಲ"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "ಈ Wi-Fi Direct ಸಂಪರ್ಕವನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುತ್ತದೆ."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ಬ್ಯಾಟರಿ ಶಕ್ತಿ ಉಳಿಸಲು, ಬಳಕೆಯ ನಂತರ Wi-Fi Direct ನಿಶಕ್ತಗೊಳಿಸಿ."
+
diff --git a/ug-wifidirect/po/ko_KR.po b/ug-wifidirect/po/ko_KR.po
index 6b37513..17726d1 100644
--- a/ug-wifidirect/po/ko_KR.po
+++ b/ug-wifidirect/po/ko_KR.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "연결되었습니다"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "ID를 입력하세요."
-msgid "IDS_WFD_CONNECTING"
-msgstr "연결 중..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "최대 글자 수에 도달하였습니다."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "연결을 끊는 중..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d개 선택"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "연결되었습니다"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "실행"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "알 수 없는 오류가 발생하였습니다"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN이 일치하지 않습니다"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "최대 글자 수 %d자에 도달하였습니다."
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "실행 중..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP 주소를 받지 못하였습니다."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d개 선택"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "%s Wi-Fi 네트워크에 연결하였습니다."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "해제 중..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "사용 안 함"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "사용할 수 없습니다"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Wi-Fi 및 4G로 데이터 다운로드"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Wi-Fi 및 3G로 데이터 다운로드"
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "검색"
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct 기기"
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "저장 안 함"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "연결하려면 누르세요"
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "취소"
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "연결"
+msgid "IDS_WIFI_SK2_OK"
+msgstr "확인"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "연결 취소"
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "연결됨"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "인터넷 연결을 안정적으로 유지하기 위해 Wi-Fi와 모바일 네트워크를 자동으로 전환합니다."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "인증 오류 발생"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi와 모바일 네트워크를 함께 사용하여 파일을 더 빨리 다운로드합니다. 모바일 데이터 사용량이 증가할 수 있습니다."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "[스마트 네트워크 전환]을 실행하였습니다. 이 기능은 모바일 네트워크와 Wi-Fi 네트워크를 자동으로 전환하여 인터넷 연결을 안정적으로 유지합니다. 데이터 사용량이 증가할 수 있습니다."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s SIM 카드를 선택하였습니다.\n\nAP에 연결할 수 없는 경우, [SIM 카드 관리자]에서 인증에 사용하는 SIM 카드를 변경하세요. 다음으로 모바일 데이터 및 멀티미디어 메시지에 사용할 SIM 카드를 선택하거나 사용하지 않을 SIM 카드를 마운트 해제하세요."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Wi-Fi 액세스 포인트에서 %d분 안에 WPS 버튼을 누르세요."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "공개"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "액세스 포인트를 찾을 수 없습니다."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "현재 사용 중인 네트워크 연결을 해제합니다."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "비밀번호 표시"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "사용"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "해제"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "네트워크 저장 안 함"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "스마트 네트워크 전환"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "신호 세기"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "모바일 데이터 사용량 줄이기"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "속도 우선"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "네트워크 결합"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi 네트워크 정보"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS 방식 선택"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "프록시 주소"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "비밀번호"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "비밀번호를 입력하세요."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS 버튼"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "찾기"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Direct 정보"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "숨겨진 네트워크 찾기"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct는 Wi-Fi 기기에 직접 연결하여 더욱 간단하고 편리하게 인쇄, 파일 공유, 동기화, 화면 공유를 할 수 있게 해줍니다. Wi-Fi Direct를 지원하는 기기에 연결하면 컨텐츠 공유, 데이터 동기화, 친구와 친목 도모, 게임하기, 오디오, 동영상 등 다양한 애플리케이션을 이용할 수 있습니다."
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi를 사용할 수 있습니다."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
-msgstr "연결된 기기"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi 다이렉트"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
-msgstr "사용 중인 기기"
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
-msgstr "다른 기기 연결됨"
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "충전 중일 때만"
-msgid "IDS_WFD_POP_CONNECTING"
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "약함"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "사용자 인증서"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "설정 안 함"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "알 수 없음"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "용량이 큰 파일을 더 빨리 다운로드하려면 Wi-Fi와 모바일 네트워크를 함께 사용하세요."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "서브넷 마스크"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "고정 IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "정렬 방식"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "찾는 중..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "네트워크를 사용할 수 있을 때 알림을 받습니다."
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "프록시 포트"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "이름"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC 주소"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP 주소"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "ID"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "게이트웨이 주소"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "ID를 입력하세요."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP 방식"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
msgstr "연결 중..."
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "연결"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "저장됨"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fi 네트워크를 찾았습니다. 네트워크에 연결합니다."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "고급 설정"
+
+msgid "IDS_COM_SK_NO"
+msgstr "아니요"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "보안정책에 따라 Wi-Fi를 사용할 수 없습니다."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "연결하려면 여기를 누르세요."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "디바이스를 %1$s에 연결하는 중입니다. 이 네트워크에서는 인터넷에 접속하지 못할 수 있습니다.\n지금은%1$s에 연결하지만 이후 이 네트워크에 연결하는 것을 제한하려면 [확인]을 누르세요."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi와 모바일 AP를 동시에 실행할 수 없습니다. 모바일 AP를 해제할까요?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi 네트워크 로그인"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "인터넷 연결 확실치 않음"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "다시 묻지 않기"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi 설정 실행"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "디바이스를 찾을 수 없음"
+
+msgid "IDS_BR_SK_YES"
+msgstr "예"
+
+msgid "IDS_BR_SK_NO"
+msgstr "아니요"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "취소"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "디바이스 이름 변경"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "내 디바이스 이름"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "완료하지 못하였습니다."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "취소"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "연결됨"
+
+msgid "IDS_BR_SK_OK"
+msgstr "확인"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "주변 디바이스, 블루투스, Wi-Fi 다이렉트 및 기타 다른 디바이스 목록에 이름을 표시하여 각 디바이스를 쉽게 구별할 수 있습니다."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "이름 변경"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "설정을 변경하려면 누르세요."
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "입력한 문자가 바르지 않습니다. 다시 시도하세요."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "지원되지 않습니다."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "가능"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "연결 안 됨"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi 다이렉트 디바이스"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "연결하려면 누르세요."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "연결 취소"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "연결된 디바이스"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "모두 선택"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "연결할 수 없는 디바이스"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "다른 디바이스와 연결된 상태"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "연결 대기 중"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "연결에 실패하였습니다"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "연결하지 못하였습니다."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "다중 연결"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
-msgstr "모든 연결 끊기"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "모두 해제"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "연결 해제"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "검색된 기기가 없습니다"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wi-Fi 다이렉트 사용 후 해제"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Wi-Fi 다이렉트 사용 후 해제"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "배터리 사용량을 줄이기 위해 Wi-Fi 다이렉트 사용 후 해제"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "배터리 사용량을 줄이기 위해 Wi-Fi 다이렉트 사용 후 해제"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s 디바이스에서 Wi-Fi 다이렉트 연결을 요청합니다. 허용할까요?"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Wi-Fi Direct를 사용하면 현재 사용 중인 Wi-Fi 연결이 끊어집니다. 계속하시겠습니까?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "[Wi-Fi 다이렉트]를 사용하면 현재 사용 중인 Wi-Fi 연결이 해제됩니다. 계속할까요?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Wi-Fi Direct를 사용하면 현재 사용 중인 Wi-Fi 테더링이 연결 해제됩니다. 계속하시겠습니까?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "[Wi-Fi 다이렉트]를 사용하면 현재 사용 중인 Wi-Fi 테더링 연결이 해제됩니다. 계속할까요?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
-msgstr "Wi-Fi Direct 연결"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi 다이렉트 연결"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
-msgstr "Wi-Fi Direct 연결을 취소할까요?"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi 다이렉트 연결 해제"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "기기 목록이 없습니다"
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi 다이렉트 연결을 취소할까요?"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi 다이렉트로 다른 디바이스에 연결합니다."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "[Wi-Fi 다이렉트]를 실행한 후 %d분 동안 사용하지 않았습니다. 배터리를 오래 사용하기 위해 [Wi-Fi 다이렉트]를 해제하였습니다."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "찾기"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "중지"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "연결을 끊지 못하였습니다"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "해제하지 못하였습니다."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "실행하지 못하였습니다."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "사용 중인 네트워크 연결을 해제합니다. 계속할까요?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "최대 %d대 디바이스까지 동시에 연결할 수 있습니다."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "사용 가능한 디바이스"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s에 연결하지 못하였습니다."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "디바이스를 다른 디바이스에 연결하였습니다."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s에 연결하였습니다."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN이 일치하지 않습니다."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "해제 중..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "찾기 시작하기 위해 사용 중인 연결을 해제합니다. 계속할까요?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "연결하지 못한 디바이스"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s와(과) 연결하려면 PIN을 입력하세요."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%s에 %d초 이내에 연결됩니다."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "비밀번호: %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "디바이스 선택"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi 다이렉트 연결 신호를 찾을 수 없습니다."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s와(과) %d초 안에 연결합니다."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "디바이스 이름 변경"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "연결할 수 없음"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "연결 중지"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "허용"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "실행 중..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "연결"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "연결하였습니다."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "디바이스 이름 입력"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "실행하지 못하였습니다"
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi 다이렉트로 디바이스 %d개와 연결하였습니다."
-msgid "IDS_WFD_POP_DISCONNECT"
-msgstr "사용 중인 네트워크 연결이 끊어집니다. 계속할까요?"
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "연결 안 됨"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "사용할 수 있는 기기"
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Wi-Fi 다이렉트 연결을 취소합니다."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "동시에 %d개의 기기까지 연결할 수 있습니다"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "배터리 사용량을 줄이려면 Wi-Fi 다이렉트를 사용한 후에는 해제하세요."
diff --git a/ug-wifidirect/po/lo.po b/ug-wifidirect/po/lo.po
new file mode 100644
index 0000000..c3e0fe7
--- /dev/null
+++ b/ug-wifidirect/po/lo.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "ບໍ່ພົບອຸປະກອນ"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "ຊື່ເຄື່ອງຂອງຂ້ອຍ"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ຕັ້ງຊື່ເຄື່ອງໃໝ່"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ຊື່ເຄື່ອງສະແດງຂຶ້ນ ເພື່ອຈໍາແນກຄວາມແຕກຕ່າງຂອງເຄື່ອງແຕ່ລະອັນທີ່ມີຢູ່ໃນລາຍການເຄື່ອງໃກ້ຄຽງ, ແລະຜ່ານບລູທູດ, Wi-Fi Direct, ແລະວິທີອື່ນໆ."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "ຮອດຈໍານວນຕົວອັກສອນສູງສຸດແລ້ວ."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "ກໍາລັງເຊື່ອມຕໍ່..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "ຍົກເລີກ"
+
+msgid "IDS_BR_SK_YES"
+msgstr "ແມ່ນ"
+
+msgid "IDS_BR_SK_NO"
+msgstr "ບໍ່"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ຕົກລົງ"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "ຍົກເລີກ"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "ບໍ່ສໍາເລັດ"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "ເປີດໃຫ້ໃຊ້ງານໄດ້"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d ໄດ້ຖືກເລືອກ"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "ເຊື່ອມຕໍ່ແລ້ວ"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "ໄດ້ໃສ່ຕົວອັກສອນທີ່ບໍ່ຖືກຕ້ອງ. ລອງໃໝ່ອີກ"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "ແຕະເພື່ອປ່ຽນການຕັ້ງຄ່າ"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "ຍົກເລີກ"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ຕົກລົງ"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "ບໍ່ເຂົ້າກັນໄດ້."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "ນະໂຍບາຍດ້ານຄວາມປອດໄພຈໍາກັດການໃຊ້ Wi-Fi."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "ຕັ້ງຊື່ໃໝ່"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "ມີຢູ່"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "ການເຊື່ອມຕໍ່ບໍ່ສໍາເລັດ"
+
+msgid "IDS_COM_SK_NO"
+msgstr "ບໍ່"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "ເຄື່ອງ Wi-Fi ໄດເຣັກ"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "ແຕະເພື່ອເຊື່ອມຕໍ່."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "ຍົກເລີກການເຊື່ອມຕໍ່"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "ເຄື່ອງເຊື່ອມຕໍ່ແລ້ວ"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "ເລືອກທັງໝົດ"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "ເຄື່ອງບໍ່ຫວ່າງ"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "ເຊື່ອມຕໍ່ກັບເຄື່ອງອື່ນແລ້ວ"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "ກໍາລັງລໍຖ້າການເຊື່ອມຕໍ່"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "ເຊື່ອມຕໍ່ບໍ່ສໍາເລັດ."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "ເຊື່ອມຕໍ່ຫຼາຍທາງ"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "ປິດເຊື່ອມຕໍ່ທັງໝົດ"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "ຢຸດເຊື່ອມຕໍ່"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ປິດໃຊ້ Wi-Fi ໄດເຣັກ ຫຼັງຈາກເຊົາໃຊ້"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "ປິດໃຊ້ Wi-Fi ໄດເຣັກ ຫຼັງຈາກເຊົາໃຊ້"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "ປິດໃຊ້ Wi-Fi ໄດເຣັກ ຫຼັງຈາກເຊົາໃຊ້ ເພື່ອປະຢັດແບັດເຕີຣີ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "ປິດໃຊ້ Wi-Fi ໄດເຣັກ ຫຼັງຈາກເຊົາໃຊ້ ເພື່ອປະຢັດແບັດເຕີຣີ"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s ກໍາລັງສະເໜີຂໍການເຊື່ອມຕໍ່ Wi-Fi. ອະນຸຍາດບໍ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "ການໃຊ້ Wi-Fi Direct ຈະປິດການເຊື່ອມຕໍ່ Wi-Fi ຂອງທ່ານ. ດໍາເນີນການຕໍ່ບໍ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "ການໃຊ້ Wi-Fi Direct ຈະປິດການຕໍ່ Wi-Fi ປະຈຸບັນຂອງທ່ານ. ດໍາເນີນການຕໍ່ບໍ?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "ການເຊື່ອມຕໍ່ Wi-Fi Direct"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Disconnect Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "ຍົກເລີກການເຊື່ອມຕໍ່ Wi-Fi Direct ບໍ?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connect to other devices via Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "ບໍ່ມີກິດຈະກໍາໃດເປັນເວລາ %d ນາທີ ຕັ້ງແຕ່ໄດ້ເປີດໃຊ້ Wi-Fi ໄດເຣັກ. ເພື່ອໃຫ້ແບັດເຕີຣີກຸ້ມດົນ, ໄດ້ປິດໃຊ້ Wi-Fi ໄດເຣັກ."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "ສະແກນ"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "ຢຸດ"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "ການປິດໃຊ້ງານບໍ່ສໍາເລັດ."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "ການເປີດໃຊ້ງານລົ້ມເຫຼວ."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "ການເຊື່ອມຕໍ່ປະຈຸບັນຈະຖືກຕັດ. ດໍາເນີນການຕໍ່ບໍ?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "ທ່ານສາມາດເຊື່ອມຕໍ່ໄດ້ເຖິງ %d ເຄື່ອງໃນເວລາດຽວກັນ."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "ເຄື່ອງທີ່ໃຊ້ງານໄດ້"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "ເຊື່ອມຕໍ່ກັບ %s ບໍ່ສໍາເລັດ."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "ຕໍ່ເຄື່ອງໃສ່ກັບເຄື່ອງອື່ນແລ້ວ."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "ໄດ້ເຊື່ອມຕໍ່ໃສ່ %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "ບັນດາລະຫັດ PIN ບໍ່ຖືກຕ້ອງ."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "ກໍາລັງປິດໃຊ້..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "ການເຊື່ອມຕໍ່ປະຈຸບັນຈະຖືກຢຸດ ເພື່ອໃຫ້ສາມາດເລີ່ມຕົ້ນການສະແກນໄດ້. ດໍາເນີນການຕໍ່ບໍ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "ເຄື່ອງອຸປະກອນທີ່ເຊື່ອມຕໍ່ບໍ່ໄດ້"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "ປ້ອນ PIN ເພື່ອເຊື່ອມຕໍ່ກັບ %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "ເຊື່ອມຕໍ່ກັບ %s ໃນ %d ວິນາທີ."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ເລືອກເຄື່ອງ"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "ການເຊື່ອມຕໍ່ Wi-Fi Direct ຖືກຕັດ."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "ເຊື່ອມຕໍ່ດ້ວຍ %s ໃນ %d ວິນາທີ."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ຕັ້ງຊື່ເຄື່ອງໃໝ່"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "ຢຸດການເຊື່ອມຕໍ່"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "ອະນຸຍາດ"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "ກໍາລັງເປີດໃຊ້ງານ..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "​ເຊື່​ອມຕໍ່"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "ເຊື່ອມຕໍ່ແລ້ວ."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ໃສ່ຊື່ເຄື່ອງເຂົ້າໄປ"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "ເຊື່ອມຕໍ່ດ້ວຍ %d ຜ່ານ Wi-Fi Direct ແລ້ວ."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "ບໍ່ໄດ້ເຊື່ອມຕໍ່"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "ການເຊື່ອມຕໍ່ Wi-Fi Direct ນີ້ຈະຖືກຍົກເລີກ."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ເພື່ອປະຫຍັດໄຟແບັດເຕີຣີ, ປິດໃຊ້ງານ Wi-Fi Direct ຫຼັງຈາກໃຊ້ແລ້ວ."
+
diff --git a/ug-wifidirect/po/lt.po b/ug-wifidirect/po/lt.po
index c164fc2..9aa68fd 100644..100755
--- a/ug-wifidirect/po/lt.po
+++ b/ug-wifidirect/po/lt.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Prisijungta"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Įveskite savo ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Jungiamasi..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Pasiektas didžiausias simbolių skaičius."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Pasirinkta: %d"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Įjungti"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Pasiektas didžiausias simbolių skaičius: %d"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Nepavyko gauti IP adreso."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Prisijungta prie „Wi-Fi“ tinklo %s"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Atjungiama..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Niekada"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Siųstis duomenis per Wi-Fi, 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Siųstis duomenis per Wi-Fi, 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Pamiršti"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Atšaukti"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Gerai"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Prisijungta"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Nežinoma klaida"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatiškai perjungti tarp mobiliųjų tinklų ir „Wi-Fi“, kad būtų palaikomas pastovus interneto ryšys."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN kodai nesutampa!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Įvyko tapatumo nustatymo klaida"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktyvinama..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "„Wi-Fi“ ir mobilieji tinklai bus naudojami kartu, kad failai būtų atsiųsti greičiau. Dėl to gali padidėti mobiliųjų duomenų naudojimas."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "Pasirinkta: %d"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Išmanusis tinklo jungiklis įjungtas. Ši funkcija padeda palaikyti stabilų interneto ryšį naudojant mobiliuosius ir „Wi-Fi“ tinklus. Dėl to gali padidėti duomenų naudojimas."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Išjungiama..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Pasirinkta %s.\n\nJei negalite prisijungti prie AP, nuėję į SIM kortelės tvarkyklę pakeiskite patvirtinimui naudojamą SIM kortelę. Tuomet pasirinkite SIM kortelę, kurią norite naudoti mobiliesiems duomenims ir multimedijos žinutėms. Taip pat galite išimti SIM kortelę, kurios nenorite naudoti."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nepalaikoma"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Paspauskite WPS mygtuką „Wi-Fi“ prieigos taške per %d min."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "„Wi-Fi Direct“"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Atidaryti"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "„Wi-Fi“ AP nerasta."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Dabartinis tinklas bus atjungtas."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Rodyti slaptažodį"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Įjungta"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Išjungta"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Pamiršti tinklą"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Išmanus tinklo jungiklis"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signalo stiprumas"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Mažint.mob.duom.naudojimą"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Suteikti pirmen. greičiui"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Tinklo ryšys"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "„Wi-Fi“ tinklo informacija"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Pasirinkite WPS metodą"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy serverio adresas"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Slaptažodis"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Įvesti slaptažodį."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS mygtuk."
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Skenuoti"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "„Wi-Fi Direct“ įrenginiai"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Ieškoti slepiamo tinklo"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Aptikti „Wi-Fi“ tinklai."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "„Wi-Fi Direct“"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Tik kraunant"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Silpnas"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Naud. sertifik."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Nenurodytas"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Nežinomas"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Norėdami greičiau atsisiųsti didelius failus, „Wi-Fi“ ir mobiliuosius tinklus naudokite kartu."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Potinklio maskuotė"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statinis IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Rūšiuoti pagal"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Ieškoma..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Gauti pranešimus, kai tinklas pasiekiamas"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Spustelėkite, kad prisijungtumėte"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy prievadas"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Vardas"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC adresas"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP adresas"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Tapatybė"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Šliuzo adresas"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Įveskite tapatybę."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP būdas"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "2 DNS"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "1 DNS"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Jungiamasi..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Jungtis"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Atšaukti ryšį"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Išsaugota"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Aptiktas „Wi-Fi“ tinklas. Būsite prijungti."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Papildomi nustatymai"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Saugos strategija riboja naudojimąsi „Wi-Fi“."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Apie „Wi-Fi Direct“"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Bakstelėkite čia, norėdami prisijungti."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Veikiant „Wi-Fi Direct“, „Wi-Fi“ įrenginiai prijungiami tiesiogiai – galėsite spausdinti, sinchronizuoti, bendrinti failus ir ekraną daug paprasčiau ir patogiau. Prisijungę prie įrenginių, palaikančių „Wi-Fi Direct“, galėsite bendrinti turinį, sinchronizuoti duomenis, bendrauti su draugais, žaisti žaidimus, mėgautis vaizdo ir garso įrašais ir dar daugiau, naudodamiesi įvairiomis programomis."
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Jūsų įrenginys jungiasi prie %1$s. Gali būti, kad šis tinklas neteikia interneto prieigos.\nBakstelėkite „Gerai“ ir likite prisijungę prie %1$s dabar, bet neleiskite išmaniajam tinklo jungikliui jungtis prie šio tinklo ateityje."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Tuo pat metu negalima suaktyvinti ir „Wi-Fi“, ir „Mobile AP“. Išjungti „Mobile AP“?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prisijungti prie „Wi-Fi“"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internetas gali būti nepasiek."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Kitą kartą neklausti"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Atidaryti „Wi-Fi“ nustatymus"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Įrenginių nerasta"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Taip"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Atšaukti"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Pervardyti įrenginį"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Mano įrenginio pavadinimas"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nepavyko."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Atšaukti"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Prisijungta"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Gerai"
+
+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_SK_RENAME"
+msgstr "Pervardyti"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Bakstelėkite ir keiskite nustatymus"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Įvestas neteisingas simbolis. Bandykite vėl"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepalaikoma."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Prieinama"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Nepavyko prisijungti"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "„Wi-Fi Direct“ įrenginiai"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Spustelėkite, kad prisijungtumėte."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Atšaukti ryšį"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Prijungti įrenginiai"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Pasirinkti visus"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Užimti įrenginiai"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Prijungta prie kito įrenginio"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Jungiamasi..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Laukiama prisijungimo"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Nepavyko sujungti"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Nepavyko sujungti."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Kelių įreng. prijungim."
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Atjungti visus"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Atjungti"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Įrenginių nerasta"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Panaudojus išjungti „Wi-Fi Direct“"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Po naud. išjunkite „Wi-Fi Direct“"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Taupyti akumuliatoriaus energiją ir panaudojus išjungti „Wi-Fi Direct“"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Taupyk. akum.energ. ir po naud. išj.„Wi-Fi Direct“"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s reikia „Wi-Fi Direct“ ryšio. Leisti?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Naudojant „Wi-Fi Direct“ bus atjungtas esamas „Wi-Fi“ ryšys. Tęsti?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Naudojant „Wi-Fi Direct“ bus atjungtas esamas „Wi-Fi“ siejimas. Tęsti?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "„Wi-Fi Direct“ ryšys"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Atjungti „Wi-Fi Direct“"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Atšaukti „Wi-Fi Direct“ ryšį?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Nėra įrenginių"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Prisijungti prie kitų įrenginių per „Wi-Fi Direct“."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Nuo to laiko, kai buvo įjungta „Wi-Fi Direct“, %d min. neatliktas joks veiksmas. „Wi-Fi Direct“ išjungtas, kad ilgiau veiktų akumuliatorius."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Skenuoti"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stabdyti"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Išjungti nepavyko"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Išjungti nepavyko."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktyvinti nepavyko"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktyvinti nepavyko."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Dabartinis ryšys bus išjungtas. Tęsti?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Vienu metu galite prijungti iki %d įrenginių."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Galimi įrenginiai"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Vienu metu galite prijungti iki %d įrenginių"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Nepavyko prisijungti prie %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Įrenginys prijungtas prie kito įrenginio."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Prisijungta prie %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN kodai neatitinka."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Išjungiama..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Dabartinis ryšys bus atjungtas, kad būtų galima pradėti paiešką. Tęsti?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Įrenginiai, kurių nepavyko prijungti"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Norėdami prisijungti prie „%s“, įveskite PIN kodą."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Prisijunkite prie %s per %d sek."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN kodas %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Pasirinkite įrenginius"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Nutrūko „Wi-Fi Direct“ ryšys."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Prijungti prie %s po %d sek."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Pervardyti įrenginį"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN kodas"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Neįmanoma prisijungti"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Stabdyti ryšį"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Leisti"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktyvinama..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Jungtis"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Prisijungta."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Įveskite įrenginio pavadinimą"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Prijungta prie %d įrenginių per „Wi-Fi Direct“."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Neprisijungta"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Šis „Wi-Fi Direct“ ryšys bus nutrauktas."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Baigę naudoti išjunkite „Wi-Fi Direct“ – taip bus taupoma akumuliatoriaus energija."
diff --git a/ug-wifidirect/po/lv.po b/ug-wifidirect/po/lv.po
index 4857435..dd86a5f 100644..100755
--- a/ug-wifidirect/po/lv.po
+++ b/ug-wifidirect/po/lv.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Savienots"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Ievadiet savu ID kodu."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Savieno..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Sasniegts maksimālais rakstzīmju skaits."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Izvēlēti: %d"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Aktivizēt"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Sasniegts maksimālais rakstzīmju skaits (%d)"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Neizdevās iegūt IP adresi."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Izveidots savienojums ar Wi-Fi tīklu %s"
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nekad"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Atvieno..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Lejupielādēt, izm. Wi-Fi un 4G"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Lejupielādēt, izm. Wi-Fi un 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Aizmirst"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Atcelt"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Labi"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Savienots"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Nezināma kļūda"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automātiski pārslēdzieties no mobilā tīkla uz Wi-Fi tīklu un pretēji, lai saglabātu stabilu interneta savienojumu."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN kods neatbilst!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Radās autentifikācijas kļūda"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktivizē..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi un mobilie tīkli tiks izmantoti kopā, lai lejupielādētu failus ātrāk. Tas var palielināt mobilo datu lietojumu."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d izvēlētas"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Viedā tīkla pārslēgšana ir aktivizēta. Šī funkcija palīdz nodrošināt stabilu interneta savienojumu, pārslēdzoties starp mobilajiem un Wi-Fi tīkliem. Tas var palielināt datu lietojumu."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deaktivizē..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Ir izvēlēta %s.\n\nJa nevarat izveidot savienojumu ar AP, nomainiet verifikācijai izmantoto SIM karti, atverot programmu SIM kartes pārvaldnieks. Pēc tam izvēlieties SIM karti, ko lietot mobilajiem datiem un multiziņām. SIM karti, ko nevēlaties lietot, varat arī atvienot."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nav nodrošināts"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "%d minūšu laikā uz Wi-Fi piekļuves punkta nospiediet WPS."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Atvērt"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nav atrasts neviens Wi-Fi piekļuves punkts."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Pašreizējais tīkls tiks atvienots."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Rādīt paroli"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Ieslēgt"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Izslēgt"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Aizmirst tīklu"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Viedā tīkla pārslēgšana"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signāla stiprums"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Samaz. mobilo datu liet."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Ātrums ir prioritāte"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Tīkla saistīšana"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi tīkla informācija"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS metodes izvēle"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Starpniekservera adrese"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Parole"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Ievadiet paroli."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS poga"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Meklēt"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct ierīces"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Atrast slēptu tīklu"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Pieejami Wi-Fi tīkli."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Tikai uzlādes laikā"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Vājš"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Liet.sertifikāts"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Nav norādīts"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Nezināms"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Lai ātrāk lejupielādētu lielus failus, izmantojiet gan Wi-Fi, gan mobilos tīklus."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Apakštīkla maska"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statiska IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Kārtot pēc"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Meklē..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Saņemt paziņojumus, kad tīkli ir pieejami"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Starpniekservera ports"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Pieskarieties, lai izveidotu savienojumu"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Vārds"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC adrese"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP adrese"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identitāte"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Vārtejas adrese"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Ievadiet identitāti."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP metode"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Savieno..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Savienot"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Atcelt savienojumu"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Saglabāts"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Noteikts Wi-Fi tīkls. Tiks izveidots savienojums."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Papildu iestatījumi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nē"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Drošības politika ierobežo Wi-Fi lietošanu."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pieskarieties šeit, lai izveidotu savienojumu."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Par Wi-Fi Direct"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Jūsu ierīce veido savienojumu ar %1$s. Taču šis tīkls var nenodrošināt piekļuvi internetam.\nPieskarieties pie Labi, lai šobrīd saglabātu savienojumu ar %1$s, bet vienlaikus neļautu turpmāk viedajai tīkla pārslēgšanai veidot savienojumu ar šo tīklu."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct ļauj daudz ērtāk un vienkāršāk Wi-Fi ierīcēm izveidot tiešu savienojumu, drukāt, kopīgot failus, sinhronizēt un koplietot ekrānu. Izveidojot savienojumu ar ierīcēm, kas atbalsta Wi-Fi Direct, un izmantojot dažādas programmas, var kopīgot saturu, sinhronizēt datus, sazināties ar draugiem, spēlēt spēles, atskaņot audio un video failus, kā arī veikt citas darbības"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Vienlaikus nevar aktivizēt Wi-Fi un Mobile AP. Vai deaktivizēt Mobile AP?"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Pierakstieties Wi-Fi tīk."
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internets var nebūt pieejams"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Vairs nevaicāt"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Atvērt Wi-Fi iestatījumus"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nav atrasta neviena ierīce"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Jā"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nē"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Atcelt"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Pārdēvēt ierīci"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Manas ierīces nosaukums"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Neizdevās."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Atcelt"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Savienots"
+
+msgid "IDS_BR_SK_OK"
+msgstr "Labi"
+
+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_SK_RENAME"
+msgstr "Pārdēvēt"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Pieskarieties, lai mainītu iestatījumus"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Ievadīta nederīga rakstzīme. Mēģiniet vēlreiz"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nav nodrošināts."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Pieejams"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Savienoj. neizdevās"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct ierīces"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Pieskarieties, lai izveidotu savienojumu."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Atcelt savienojumu"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Pievienotās ierīces"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Izv. visu"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Aizņemtās ierīces"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Izveidots savien. ar citu ierīci"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Savieno..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Gaida savienojumu"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Neizdevās izveidot savienojumu"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Neizdevās izveidot savienojumu."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Vairāki savienojumi"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Atvienot visu"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Atvienot"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nav atrasta neviena ierīce"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Pēc lietošanas deaktivizēt Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Deakt. Wi-Fi Direct pēc lietošanas"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Lai taupītu enerģiju, pēc lietošanas deaktivizēt Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Deakt. Wi-Fi Direct pēc liet., lai taup. enerģiju"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s pieprasa Wi-Fi Direct savienojumu. Vai atļaut?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Izmantojot Wi-Fi Direct, tiks pārtraukts pašreizējais Wi-Fi savienojums. Vai turpināt?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Izmantojot Wi-Fi Direct, tiks pārtraukta pašreizējā Wi-Fi piesaiste. Vai turpināt?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct savienojums"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Atvienot Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Vai atcelt Wi-Fi Direct savienojumu?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Nav ierīču"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Izveidot savienojumu ar citām ierīcēm, izmantojot Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Kopš Wi-Fi Direct aktivizēšanas %d minūtes nav veikta neviena darbība. Lai pagarinātu akumulatora darbības laiku, Wi-Fi Direct tika deaktivizēts."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Meklēt"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Apturēt"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deaktivizēšana neizdevās"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deaktivizēšana neizdevās."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktivizēšana neizdevās"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktivizēšana neizdevās."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Pašreizējais savienojums tiks pārtraukts. Vai turpināt?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Vienlaikus varat izveidot savienojumu ar %d ierīcēm."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Pieejamās ierīces"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Vienlaikus varat izveidot savienojumu ar %d ierīcēm"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Neizdevās izveidot savienojumu ar %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Ierīcē ir izveidots savienojums ar citu ierīci."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Izveidots savienojums ar %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN kodi nesakrīt."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deaktivizē..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Lai varētu sākt meklēšanu, pašreizējais savienojums tiks pārtraukts. Vai turpināt?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Ierīces, kurām neizdevās izveidot savienojumu"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Lai izveidotu savienojumu ar %s, ievadiet PIN kodu."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Izveidot savienojumu ar %s pēc %d sekundēm."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN kods %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Izvēlieties ierīces"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct savienojums ir zaudēts."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Pēc %d sek. izv. savien. ar %s."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Pārdēvēt ierīci"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Nevar izveidot savienojumu"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Pārtraukt savien."
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Atļaut"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktivizē..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Savienot"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Savienots."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Ievadiet ierīces nosaukumu"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Izmantojot Wi-Fi Direct, ir izveidots savienojums ar %d ierīcēm."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Nav pievienots"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Šis Wi-Fi Direct savienojums tiks atcelts."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Lai taupītu akumulatora enerģiju, pēc lietošanas deaktivizējiet Wi-Fi Direct."
diff --git a/ug-wifidirect/po/mk.po b/ug-wifidirect/po/mk.po
index ee30da6..7899ff2 100644..100755
--- a/ug-wifidirect/po/mk.po
+++ b/ug-wifidirect/po/mk.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Поврзано"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Внесете идентификација."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Поврзување..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Достигнат е максималниот број знаци."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Избрани се %d"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Вклучи"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Достигнат е максималниот број знаци %d."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Не можеше да се добие IP-адреса."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Поврзано со мрежа Wi-Fi %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Врската се прекинува..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Никогаш"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Презем.подат. преку Wi-Fi и 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Презем.подат. преку Wi-Fi и 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN за WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Заборави"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Откажи"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Поврзано"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Непозната грешка"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Автоматски префрлувај меѓу Wi-Fi и мобилни мрежи за да се одржи стабилна врска со интернет."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-овите не се совпаѓаат!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Дојде до грешка при потврдувањето"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Се активира..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi и мобилни мрежи ќе се користат заедно за преземање фајлови побрзо. Тоа може да го зголеми користењето мобилни податоци."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "Избрани се %d"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Вклучено е Паметно менување мрежи. Функцијава помага да се одржи стабилно поврзување со интернет менувајќи меѓу мобилни и мрежи Wi-Fi. Тоа може да го зголеми користењето податоци."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Се исклучува..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Избрано е %s.\n\nАко не можете да се поврзете со пристапна точка, сменете ја SIM-картичката за потврда преку уредувањето SIM-картички. Потоа изберете ја SIM-картичката што сакате да ја користите за Мобилни податоци и мултимедијални пораки. Можете и да ја демонтирате SIM-картичката што не сакате да ја користите."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Не е поддржано"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Притиснете WPS на пристапната точка за Wi-Fi во рок од %d минути."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Отворени"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Нема пристапна точка за Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Ќе се прекине врската со моменталната мрежа."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Прикажи лозинка"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Вклучено"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Исклучено"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Заборави мрежа"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Паметно менување мрежи"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Јачина на сигналот"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Намали моб.корист.под."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Брзината на прво место"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Поврзување мрежи"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Информации за мрежа Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Изберете начин за WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Адреса на прокси"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Лозинка"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Внесете лозинка."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Копче WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Скенирај"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Уреди за Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Најди скриена мрежа"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Достапни се мрежи Wi-Fi."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Само при полнење"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Слаб"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Кор. сертификат"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Неодредено"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Непознато"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "За да преземате големи фајлови побрзо, користете Wi-Fi и мобилни мрежи заедно."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Подмрежна маска"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Статичен IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Подреди според"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Пребарување..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Примај известувања кога се достапни мрежи"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Допрете за поврзување"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Порт за прокси"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Име"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-адреса"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP адреса"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Идентитет"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Адреса на порта"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Внесете идентитет."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Начин за EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Поврзување..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Поврзи"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Откажи поврзување"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Меморирано"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Откриена е мрежа Wi-Fi. Ќе се поврзете."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Напредни опции"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Не"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Политиката на безбедност го ограничува користењето Wi-Fi."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "За Wi-Fi Direct"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Допрете тука за да се поврзете."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct овозможува уреди Wi-Fi да се поврзуваат директно, со што печатењето, делењето фајлови, синхронизирањето и делењето екран е многу поедноставно и позгодно. Поврзувањето со уреди што поддржуваат Wi-Fi Direct овозможува да се делат вашите содржини, да ги синхронизирате податоците, да се дружите со пријатели, да играте игри, аудиа и видеа и многу повеќе, со помош на разни апликации"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Уредот е поврзан со %1$s. Меѓутоа, мрежата можеби не овозможува пристап на интернет.\nДопрете OK за да останете поврзани со %1$s сега, но спречете го и Паметно менување мрежа да се поврзува со оваа мрежа во иднина."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Не може истовремено да се активни и Wi-Fi и мобилна пристапна точка. Да се исклучи мобилната пристапна точка?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Запиши се на Wi-Fi мрежа"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Интернет може да не е достапен"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Не прашувај повторно"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Отвори опции за Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Нема уреди"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Да"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Не"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Откажи"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Преименувај го уредот"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Име на мојот уред"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Неуспешно."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Откажи"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Поврзано"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Имињата на уредите се прикажани за да се разликува секој уред од уредите достапни на листата блиски уреди, како и преку Bluetooth, Wi-Fi Direct и други начини."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Преименувај"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Допрете да смените поставки"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Внесен е неважечки знак. Обидете се повторно"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Не е поддржано."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Достапно"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Неусп. поврзување"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Уреди за Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Допрете за поврзување."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Откажи поврзување"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Поврзани уреди"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Избери ги сите"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Зафатени уреди"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Поврзани со друг уред"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Поврзување..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Се чека поврзување"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Не можеше да се поврзе"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Не можеше да се поврзе."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Мулти-поврзување"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Прекини ги сите"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Прекини врска"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Нема уред"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Исклучи Wi-Fi Direct по употреба"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Исклучи Wi-Fi Direct по употреба"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Исклучи Wi-Fi Direct по употреба за да се заштеди батерија"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Искл. Wi-Fi Direct по употр. за да се зашт. батер."
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s бара поврзување Wi-Fi Direct. Да се дозволи?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Користењето на Wi-Fi Direct ќе ја прекине моменталната врска Wi-Fi. Да се продолжи?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Користењето на Wi-Fi Direct ќе го прекине моменталното делење Wi-Fi. Да се продолжи?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Поврзување Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Прек. врска Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Да се откаже поврзување Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Нема уреди"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Поврзи се со други уреди преку Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Нема никаква активност %d минути откако е вклучено Wi-Fi Direct. За да се продолжи траењето на батеријата, Wi-Fi Direct беше исклучено."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Скенирај"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Запри"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Исклучувањето беше неуспешно"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Исклучувањето беше неуспешно."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Неуспешно активирање"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Неуспешно активирање."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Моменталната врска ќе се прекине. Сепак продолжи?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Може да се поврзете со најмногу %d уреди истовремено."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Достапни уреди"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Може да се поврзете со најмногу %d уреди истовремено"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Неуспешно поврзување со %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Уредот е поврзан со друг уред."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Поврзано со %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-овите не се исти."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Се исклучува..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Моменталната врска ќе се прекине за да почне скенирањето. Продолжи?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Уреди што не успеале да се поврзат"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Внесете PIN за поврзување со %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Поврзи се со %s за %d секунди."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN код %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Изберете уреди"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Поврзувањето Wi-Fi Direct е изгубено."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Поврзувањео со %s за %d секунди."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Преименувај го уредот"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Не е можно поврзување"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Сопри поврзување"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Дозволи"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Се активира..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Поврзи"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Поврзано."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Внесете име на уредот"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Поврзано со %d уреди преку Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Не е поврзано"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Ова поврзување Wi-Fi Direct ќе се откаже."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "За да заштедите батерија, исклучете го Wi-Fi Direct по употребата."
diff --git a/ug-wifidirect/po/ml.po b/ug-wifidirect/po/ml.po
new file mode 100644
index 0000000..33b204f
--- /dev/null
+++ b/ug-wifidirect/po/ml.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "ഉപകരണങ്ങളൊന്നും കണ്ടെത്തിയില്ല"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "എന്‍റെ ഉപകരണം നാമം"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ഉപകരണത്തിന്‍റെ നാമം മാറ്റുക"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ചുറ്റുവട്ടത്തുള്ള ഉപകരണം ലിസ്റ്റിൽ ലഭ്യമായതും ബ്ലൂടൂത്ത്, Wi-Fi Direct, മറ്റ് രീതികൾ എന്നിവയിലൂടെ ഉള്ളതുമായ ഉപകരണങ്ങളിൽ ഓരോന്നും തിരിച്ചറിയുന്നതിന് ഉപകരണം പേരുകൾ പ്രദർശിപ്പിക്കപ്പെടുന്നു."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "അക്ഷരങ്ങളുടെ പരമാവധിയെണ്ണത്തിലെത്തി."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "ബന്ധിപ്പിക്കുന്നു..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "റദ്ദാക്കു."
+
+msgid "IDS_BR_SK_YES"
+msgstr "അതെ"
+
+msgid "IDS_BR_SK_NO"
+msgstr "ഇല്ല"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ശരി"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "റദ്ദാക്കു."
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "പരാജയപ്പെട്ടു."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "പ്രാപ്‌തമാക്കുക"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d എണ്ണം തിരഞ്ഞെടുത്തു"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "ബന്ധിപ്പിച്ചു"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "അസാധുവായ അക്ഷരം നല്‍കി. വീണ്ടും ശ്രമിക്കുക"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "ക്രമീകരണങ്ങൾ മാറ്റുന്നതിന് സ്പർശിക്കുക."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "റദ്ദാക്കുക"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ശരി"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "പിന്തുണക്കുന്നില്ല."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "സുരക്ഷാ പോളിസി Wi-Fi-യുടെ ഉപയോഗം നിയന്ത്രിക്കുന്നു."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "പേര് മാറ്റു."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "ലഭ്യമാണ്"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "കണക്ഷന്‍ പരാജയപ്പെട്ടു"
+
+msgid "IDS_COM_SK_NO"
+msgstr "ഇല്ല"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct ഉപകരണങ്ങള്‍"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "കണക്ട് ചെയ്യുന്നതിന് തട്ടുക."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "കണക്ഷന്‍ റദ്ദാക്കുക"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "കണക്ട് ചെയ്ത ഉപകരണങ്ങള്‍"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "എല്ലാം തിരഞ്ഞെടുക്കുക"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "തിരക്കുള്ള ഉപകരണങ്ങള്‍"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "മറ്റൊരു ഉപകരണവുമായി കണക്ട് ചെയ്തു"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "കണക്ഷനായി കാത്തിരിക്കുന്നു"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "കണക്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "മള്‍ട്ടി-കണക്ട്"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "എല്ലാം വിച്ഛേദിക്കുക"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "വിച്ഛേദി."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ഉപയോഗശേഷം Wi-Fi ഡയറക്റ്റ് അപ്രാപ്തമാക്കുക"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "ഉപയോഗത്തിനുശേഷം Wi-Fi Direct അപ്രാപ്തമാക്കുക"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "ബാറ്ററി ലാഭിക്കാന്‍ ഉപയോഗിച്ചതിനുശേഷം Wi-Fi Direct അപ്രാപ്തമാക്കുക"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "ബാറ്ററി സംരക്ഷിക്കുന്നതിനായി ഉപയോഗശേഷം Wi-Fi Direct അപ്രാപ്തമാക്കുക"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s ഒരു Wi-Fi ഡയറക്ട് കണക്ഷന്‍ അഭ്യര്‍ത്ഥിക്കുന്നു. അനുവദിക്കണമോ‍?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct ഉപയോഗിക്കുന്നതിലൂടെ നിലവിലെ Wi-Fi കണക്ഷന്‍ വിച്ഛേദിക്കപ്പെടും. തുടരണോ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct ഉപയോഗിക്കുന്നതിലൂടെ നിലവിലെ Wi-Fi ടെതറിംഗ് വിച്ഛേദിക്കപ്പെടും. തുടരണോ?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi ഡയറക്ട് കണക്ഷന്‍"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct വിച്ഛേദിക്കുക"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct കണക്ഷന്‍ റദ്ദാക്കണമോ?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct വഴി മറ്റ് ഉപകരണങ്ങളിലേക്ക് കണക്ട് ചെയ്യുക."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi ഡയറക്റ്റ് പ്രാപ്തമാക്കിയതിനുശേഷം %d മിനിറ്റുവരെ പ്രവര്‍ത്തനമൊന്നും ഇല്ലായിരുന്നു. ബാറ്ററി ആയുസ് വര്‍ധിപ്പിക്കാന്‍, Wi-Fi ഡയറക്റ്റ് അപ്രാപ്തമാക്കി."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "സ്കാന്‍ചെയ്യുക"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "നിര്‍ത്തു."
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "നിര്‍ജ്ജീവമാ‍ക്കല്‍ പരാജയപ്പെട്ടു."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "സജീവമാക്കല്‍ പരാജയപ്പെട്ടു."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "നിലവിലെ കണക്ഷന്‍ വിച്ഛേദിക്കപ്പെടും. തുടരണമോ?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "ഒരേ സമയം %d ഉപകരണങ്ങള്‍ വരെ നിങ്ങള്‍ക്ക് കണക്ട് ചെയ്യാം."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "ലഭ്യമായ ഉപകരണങ്ങൾ"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s ലേക്ക് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "മറ്റൊരു ഉപകരണത്തിലേക്ക് ഉപകരണം കണക്ട് ചെയ്തു."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s ലേക്ക് കണക്ട് ചെയ്തു."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "പിന്നുകള്‍ പൊരുത്തപ്പെടുന്നില്ല."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "നിര്‍ജ്ജീവമാ‍ക്കുന്നു..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "നിലവിലെ കണക്ഷന്‍ വിച്ഛേദിക്കപ്പെടുമെന്നതിനാല്‍ സ്കാനിംഗ് ആരംഭിക്കാനാവില്ല. തുടരണമോ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "ബന്ധിപ്പിക്കല്‍ പരാജയപ്പെട്ട ഉപകരണങ്ങള്‍"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s-മായി കണക്ട് ചെയ്യുന്നതിന് PIN നല്‍കുക."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d സെക്കന്‍ഡുകളില്‍ %s ലേക്ക് ബന്ധിപ്പിക്കുക."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN കോഡ് %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ഉപകരണങ്ങൾ തിരഞ്ഞെടുക്കുക"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct കണക്ഷന്‍ നഷ്ടപ്പെട്ടു."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s-മായി %d സെക്കന്‍റില്‍ കണ്ക്ട് ചെയ്യുന്നു."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ഉപകരണത്തിന്‍റെ നാമം മാറ്റുക"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "ബന്ധിപ്പിക്കാനാവില്ല"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "കണക്ഷൻ അവസാനിപ്പിക്കുക"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "അനുവദിക്കുക"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "സജീവമാക്കുന്നു..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "ബന്ധിപ്പി."
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "ബന്ധിപ്പിച്ചു."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ഉപകരണ നാമം നൽകുക"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi ഡയറക്ട് വഴി %d ഉപകരണങ്ങളുമായി കണക്ട് ചെയ്തു."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "ബന്ധിപ്പിച്ചിട്ടില്ല"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "ഈ Wi-Fi Direct കണക്ഷൻ റദ്ദാക്കപ്പെടും."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ബാറ്ററി പവര്‍ സേവ് ചെയ്യുന്നതിന്, ഉപയോഗശേഷം Wi-Fi Direct അപ്രാപ്തമാക്കുക."
+
diff --git a/ug-wifidirect/po/mr.po b/ug-wifidirect/po/mr.po
new file mode 100644
index 0000000..5a998ee
--- /dev/null
+++ b/ug-wifidirect/po/mr.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "कोणतीही उपकरणे सापडली नाहीत"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "माझे उपकरण नाव"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "उपकरणाचे नामांतर करा"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "जवळ पासच्या उपकरणच्या सूचीमध्ये उपलब्ध असलेल्या प्रत्येक उपकरणला वेगळे दशविण्यासाठी उपकरणची नावे, आणि ब्लुटूथ, Wi-Fi Direct मार्गे, आणि इतर पध्दतीने प्रदर्शित केली जातील."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "वर्णांच्या अधिकतम संख्येपर्यंत पोहोचले."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "जोडले जात आहे..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "रद्द"
+
+msgid "IDS_BR_SK_YES"
+msgstr "होय"
+
+msgid "IDS_BR_SK_NO"
+msgstr "नाही"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ठीक"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "रद्द"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "नापास."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "सक्रिय"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d निवडले"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "जोडले"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "अवैध वर्ण प्रविष्ट केले. पुन्हा प्रयत्न करा."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "सेटिंग्स बदलण्यासाठी टॅप करा."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "रद्द"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ठीक"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "समर्थन नसलेला."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "सुरक्षा धोरण Wi-Fi चा वापर प्रतिबं‍धित करते."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "नाव बदला"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "उपलब्ध"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "कनेक्शन अयशस्वी"
+
+msgid "IDS_COM_SK_NO"
+msgstr "नाही"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct उपकरणे"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "जोडण्यासाठी टॅप करा."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "कनेक्शन रद्द करा"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "जोडलेली उपकरणे"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "सर्व निवडा"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "व्यस्त उपकरणे"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "अन्य उपकरणला कनेक्ट केले"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "कनेक्शन साठी प्रतीक्षारत"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "कनेक्ट करण्यास अयशस्वी."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "बहु-कनेक्ट"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "सर्व डिस्कनेक्ट करा"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "खंडीत"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "वापरा नंतर Wi-Fi Direct अक्षम करा"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Wi-Fi Direct वापरा नंतर अक्षम करेल"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "वापरा नंतर बॅटरी जतन करण्यास Wi-Fi Direct अक्षम करा"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "वापरल्या नंतर बॅटरी जतन करण्‍यास Wi-Fi Direct अक्षम करेल"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s एका Wi-Fi Direct कनेक्शनसाठी विनंती करत आहेत. अनुमती द्यायची?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct वापरून सद्य Wi-Fi कनेक्शन डिस्कनेक्ट होईल. सुरू ठेवायचे?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct वापरून सद्य Wi-Fi टेथरिंग डिस्कनेक्ट होईल. सुरू ठेवायचे?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct कनेक्शन"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct डिसकनेक्ट"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct कनेक्शन रद्द करायचे?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct द्वारे अन्य उपकरणशी कनेक्ट करा."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "येथे %d मिनिटांसाठी कोणतीच क्रिया नाही कारण Wi-Fi Direct सक्रिय होते. बॅटरी लाइफ वाढवण्यास, Wi-Fi Direct अक्षम केले आहे."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "स्कॅन करा"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "थांबा"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "निष्क्रियता अयशस्वी."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "सक्रीयकरण अयशस्वी."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "सध्याची जोडणी खंडित होईल. पुढे चालु ठेवायचे?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "आपण एकाच वेळी %d उपकरणांन पर्यंत कनेक्ट करू शकता."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "उपलब्ध उपकरणे"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s ला कनेक्ट करण्यात अपयश."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "उपकरण अन्य उपकरणला कनेक्ट केले."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s ला जोडले."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN जुळले नाहीत."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "निष्क्रिय करणे चालू आहे..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "सद्य कनेक्शन डिस्कनेक्ट केले जाईल जेणे करून स्कॅनिंग सुरू होवू शकेल. चालू ठेवायचे?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "ज्या उपकरणांना कनेक्ट करण्यात अयशस्वी"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s ला कनेक्ट करण्यासाठी PIN प्रविष्ट करा."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d सेकंदांमध्ये %s शी कनेक्ट करा."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN कोड %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "उपकरणे निवडा"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct जोडणी गमावली आहे."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s शी %d सेकंदांमध्ये कनेक्ट करा."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "उपकरणाचे नामांतर करा"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "कनेक्‍ट करण्‍यात अक्षम"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "कनेक्‍शन थांबवा"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "अनुमती द्या"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "सक्रिय केली जात आहे..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "जोडा"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "जोडले."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "उपकरण नाव प्रविष्‍ट करा"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct द्वारे %d उपकरणशी कनेक्ट केले."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "कनेक्ट केलेले नाही"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "हे Wi-Fi Direct कनेक्शन रद्द करण्यात येईल."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "बॅटरी पॉवर जतन करण्यासाठी, वापरानंतर Wi-Fi Direct अक्षम करा."
+
diff --git a/ug-wifidirect/po/ms.po b/ug-wifidirect/po/ms.po
new file mode 100644
index 0000000..7077569
--- /dev/null
+++ b/ug-wifidirect/po/ms.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Tiada peranti dijumpai"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nama peranti saya"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Namakan semula peranti"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Nama peranti dipaparkan untuk membezakan setiap peranti yang tersedia dalam senarai peranti berhampiran dan melalui Bluetooth, Wi-Fi Direct dan kaedah lain."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Bilangan maksimum aksara dicapai."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Menyambung.."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Batal"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ya"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Tidak"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Batal"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Gagal."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Aktif"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d dipilih"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Disambung"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Aksara tidak sah dimasukkan. Cuba lagi"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Ketik untuk mengubah aturan"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Batal"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Tidak disokong."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Polisi keselamatan mengehadkan penggunaan Wi-Fi."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Namakan semula"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Tersedia"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Sambungan gagal"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Tidak"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Peranti Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Ketik utk bersambung."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Batal sambungan"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "Peranti disambungkan"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Pilih semua"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "Peranti sibuk"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "Disambungkan dengan peranti lain"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "Menunggu sambungan"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Gagal menyambung."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "Sambungan berbilang"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "Nyhsambungkn semua sambungn"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "Ptus.smbgn"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Nyahaktifkan Wi-Fi Direct selepas guna"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Nyhaktif Wi-Fi Direct selepas diguna"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Nyahaktifkan Wi-Fi Direct selepas guna untuk menjimatkan bateri"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Nyhaktif Wi-Fi Direct selepas diguna utk m'jimatkn bateri"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s meminta sambungan Wi-Fi Direct. Benarkan?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Menggunakan Wi-Fi Direct akan menyahsambung sambungan Wi-Fi semasa. Teruskan?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Menggunakan Wi-Fi Direct akan menyahsambung penambatan Wi-Fi semasa. Teruskan?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Sambungan Wi-Fi Direct"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Putus smbgn Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Batalkan sambungan Wi-Fi Direct?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Sambung ke peranti lain melalui Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Tiada aktiviti selama %d minit sejak Wi-Fi Direct diaktifkan. Untuk melanjutkan hayat bateri, Wi-Fi Direct telah dinyahaktifkan."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Imbas"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "Henti"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Penyahaktifan gagal."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Pengaktifan gagal."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "Sambungan semasa akan diputuskan. Teruskan?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Anda boleh menyambung sehingga %d peranti pada masa yang sama."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Peranti tersedia"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Gagal menyambung ke %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Peranti disambungkan kepada peranti lain."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Disambung ke %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN tidak padan."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Menyahaktifkan…"
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Sambungan semasa akan diputuskan supaya pengimbasan boleh bermula. Teruskan?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Peranti yang gagal disambungkan"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Masukkan PIN untuk sambung ke %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Sambung ke %s dalam %d saat."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Pilih peranti"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Sambungan Wi-Fi Direct telah hilang."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Sambung dengan %s dlm %d saat."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Namakan semula peranti"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Tdk dpt menyambung"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Hentikan sambungan"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Benarkan"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Mengaktifkan…"
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Sambung"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Disambung."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Masukkan nama peranti"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Disambungkan dengan %d peranti melalui Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Tidak disambungkan"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Sambungan Wi-Fi Direct ini akan dibatalkan."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Untuk menjimatkan kuasa bateri, nyahaktifkan Wi-Fi Direct selepas digunakan."
+
diff --git a/ug-wifidirect/po/my.po b/ug-wifidirect/po/my.po
new file mode 100644
index 0000000..8dc3520
--- /dev/null
+++ b/ug-wifidirect/po/my.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "ကိရိယာမ်ား မေတြ႕ပါ"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "ကၽြႏ္ုပ္၏ ကိရိယာ အမည္"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ကိရိယာကို အမည္ျပန္ေပးပါ"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "အနီးရွိ ကိရိယာမ်ား စာရင္းထဲႏွင့္ ဘလူတုသ္၊ Wi-Fi Direct ႏွင့္ အျခားနည္းမ်ားမွတဆင့္ ရႏိုင္ေသာ ကိရိယာမ်ား အသီးသီး ခြဲျခားသိရန္ ကိရိယာ အမည္မ်ား ျပထားသည္။"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "အမ်ားဆုံး အကၡရာအေရအတြက္သု႔ိေရာက္ပါၿပီ။"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "ဆက္သြယ္ေနပါသည္…"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "ပယ္ဖ်က္"
+
+msgid "IDS_BR_SK_YES"
+msgstr "ဟုတ္ကဲ့"
+
+msgid "IDS_BR_SK_NO"
+msgstr "မဟုတ္"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "အုိေက"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "ပယ္ဖ်က္"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "မေအာင္ျမင္ပါ"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "စတင္လုပ္ေဆာင္ပါ"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d ေရြးထားသည္"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "ခ်ိတ္ဆက္ထားေသာ"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "ထပ္မံႀကိဳးစားပါ။"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "ဆက္တင္မ်ား ေျပာင္းရန္ ေခါက္ပါ"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "ပယ္ဖ်က္ပါ"
+
+msgid "IDS_BR_SK_OK"
+msgstr "အုိေက"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "အားမေပးပါ"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "လံုၿခံဳေရး မူဝါဒသည္ Wi-Fi သံုးျခင္းကို ကန္႔သတ္ထားပါသည္။"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "အမည္ျပန္ေပး"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "ရရွိႏုိင္ေသာ"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "ဆက္သြယ္မႈ မေအာင္ျမင္ပါ"
+
+msgid "IDS_COM_SK_NO"
+msgstr "မဟုတ္"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct ကိရိယာမ်ား"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "ခ်ိတ္ဆက္ရန္ ႏွိပ္ပါ။"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "အဆက္အသြယ္အား ပယ္ဖ်က္ပါ"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "ခ်ိတ္ဆက္ထားသည့္ ကိရိယာမ်ား"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "အားလုံးကုိ ေရြးပါ"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "မအားေသာ ကိရိယာမ်ား"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "အျခား ကိရိယာႏွင့္ ခ်ိတ္ဆက္ထားသည္"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "ခ်ိတ္ဆက္မႈအတြက္ ေစာင့္ေနသည္။"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "ခ်ိတ္ဆက္ရန္ မေအာင္ျမင္ပါ။"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "မ်ဳိးစံု ခ်ိတ္ဆက္မႈ"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "အားလံုး အဆက္ျဖတ္ပါ"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "ဆက္သြယ္ထားမႈကုိ ျဖတ္ေတာက္ပါ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "သံုးျပီးလွ်င္ Wi-Fi Direct ကို အလုပ္မလုပ္ေစပါႏွင့္"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "သံုးၿပီးေနာက္မွာ Wi-Fi တိုက္႐ိုက္ကို ပိတ္ပါ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "ဘက္ထရီ ေခြ်တာရန္ သံုးျပီးလွ်င္ Wi-Fi Direct ကို အလုပ္မလုပ္ေစပါႏွင့္"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "ဘက္ထရီကို ေခၽြတာရန္ သံုးၿပီးေနာက္မွာ Wi-Fi တိုက္႐ိုက္ကို ပိတ္ပါ"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s မွ Wi-Fi Direct အဆက္အသြယ္ လိုအပ္ေနသည္။ ခြင့္ျပဳမည္လား?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct သံုးျခင္းက လက္ရွိ Wi-Fi ခ်ိတ္ဆက္မႈကို ျဖတ္လိမ့္မည္။ ဆက္လုပ္မည္လား?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct သံုးျခင္းက လက္ရွိ Wi-Fi လံထားျခင္းကို ျဖတ္လိမ့္မည္။ ဆက္လုပ္မည္လား?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct ခ်ိတ္ဆက္မႈ"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Disconnect Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct အဆက္အသြယ္အား ပယ္ဖ်က္မည္လား?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Connect to other devices via Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct ညႊန္မႈဖြင့္ ၿပီးသည့္ေနာက္ %d မိနစ္အထိ ဘာလုပ္ေဆာင္မႈမွ မရွိေသးပါ။ ဘက္ထရီသက္ ရွည္ၾကာေစရန္ Wi-Fi Directကို အလုပ္မလုပ္ေစရန္ လုပ္ထားသည္။"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "စကန္"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "ရပ္"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "သက္ဝင္မႈျဖဳတ္ျခင္း မေအာင္ျမင္ပါ။"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "သက္ဝင္ေအာင္လုပ္ျခင္း မေအာင္ျမင္ပါ။"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "လက္ရွိ ခ်ိတ္ဆက္မႈ အဆက္ျပတ္သြားမည္။ ဆက္လုပ္မလား?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "တစ္ျပိဳင္နက္တည္းမွာ ကိရိယာ %d ခုအထိ ခ်ိတ္ဆက္ႏိုင္သည္။"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "ရရွိႏိုင္ေသာ ကိရိယာမ်ား"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s သို့ ဆက္သြယ္ရန္ မေအာင္ျမင္ပါ။"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "ကိရိယာသည္ အျခားကိရိယာသို႔ ဆက္ထားသည္။"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s သို႔ ခ်ိတ္ဆက္ထားသည္။"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN မ်ား မကိုက္ညီပါ။"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "ပိတ္ေနပါသည္…."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "စကန္လုပ္ျခင္း စတင္ရန္အတြက္ လက္ရွိ အဆက္အသြယ္ကို ျဖတ္လိုက္မည္။ ဆက္လုပ္မည္လား?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "ခ်ိတ္ဆက္၍ မရသည့္ ကိရိယာမ်ား"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s ကို ခ်ိတ္ဆက္ရန္ PIN နံပါတ္ထည့္ပါ။"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d စကၠန္႔အတြင္း %s သို႔ ခ်ိတ္ဆက္ပါ။"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ကိရိယာမ်ား ေရြးပါ"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct ခ်ိတ္ဆက္မႈ ေပ်ာက္သြားသည္။"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%2$d စကၠန္႔အတြင္း %1$s ႏွင့္ခ်ိတ္ဆက္ပါ"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ကိရိယာကို အမည္ျပန္ေပးပါ"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "ဆက္သြယ္၍မရပါ"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "ခ်ိတ္ဆက္မႈကို ရပ္ပါ"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "ခြင့္ျပဳပါ"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "အသက္သြင္းေနပါသည္…"
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "ဆက္သြယ္"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "ခ်ိတ္ဆက္ၿပီးၿပီ"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ကိရိယာ အမည္ ထည့္ပါ"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct မွတဆင့္ ကိရိယာ %d ခုႏွင့္ ခ်ိတ္ဆက္ထားသည္။"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "ခ်ိတ္ဆက္မထားပါ"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "ဤ Wi-Fi Direct ခ်ိတ္ဆက္မႈ ပယ္ဖ်က္လိမ့္မည္။"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ဘက္ထရီအား ေခၽြတာရန္ Wi-Fi Direct ကို သံုးၿပီးေနာက္ ပိတ္ထားပါ။"
+
diff --git a/ug-wifidirect/po/nb.po b/ug-wifidirect/po/nb.po
index b544e86..dad312e 100644..100755
--- a/ug-wifidirect/po/nb.po
+++ b/ug-wifidirect/po/nb.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Tilkoblet"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Angi ID-en din."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Kobler til..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Nådd maksimalt antall tegn."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d valgt"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Aktiver"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maksimalt antall tegn %d er nådd."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Kunne ikke hente IP-adresse."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Koblet til Wi-Fi-nettverket %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Kobler fra..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Aldri"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Last ned data via Wi-Fi og 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Last ned data via Wi-Fi og 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS-nøkkel"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Glem"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Avbryt"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Tilkoblet"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Ukjent feil"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Veksler automatisk mellom Wi-Fi- og mobilnett for å opprettholde en stabil Internett-forbindelse."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-kodene samsvarer ikke!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Godkjenningsfeil oppstod"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktiverer..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi- og mobilnett vil bli brukt samtidig for å laste ned store filer raskere. Dette kan øke forbruket av mobildata."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d valgt"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Smart nettverksbytte er aktivert. Denne funksjonen bidrar til å opprettholde en stabil Internett-forbindelse ved å bytte mellom mobil- og Wi-Fi-nettverk. Dette kan øke dataforbruket."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deaktiverer..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s er valgt.\n\nHvis du ikke kan koble til en AP, må du endre SIM-kortet som brukes for bekreftelse, ved å gå til SIM-kortadministrator. Velg deretter SIM-kortet du vil bruke for mobildata og multimediemeldinger. Du kan også løse ut SIM-kortet du ikke vil bruke."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Trykk på WPS på Wi-Fi-tilgangspunktet innen %d minutter."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Åpen"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ingen Wi-Fi-tilgangspunkt funnet."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Gjeldende nettverk vil bli frakoblet."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Vis passord"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "På"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Av"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Glem nettverk"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Smart nettverksbytte"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signalstyrke"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reduser forbr. av m.data"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioriter hastighet"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Nettverksbinding"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informasjon om Wi-Fi-nettverk"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Velg WPS-metode"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxyadresse"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Støttes ikke"
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Passord"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Angi passord."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS-knapp"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Søk"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Finn skjult nettverk"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi-nettverk tilgjengelige."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
msgstr "Wi-Fi Direct"
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Skann"
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct-enheter"
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Bare under lading"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Svak"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Brukersertifikat"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Uspesifisert"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Ukjent"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Du kan bruke Wi-Fi og mobilnett samtidig for å laste ned store filer raskere."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Subnettmaske"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statisk IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sorter etter"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Søker..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Motta varsler når det finnes tilgjengelige nettverk."
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxyport"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Trykk for å koble til"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Navn"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-adresse"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-adresse"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identitet"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Gateway-adresse"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Angi identitet."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP-metode"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Kobler til..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Koble til"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Avbryt tilkobling"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Lagret"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Det har blitt oppdaget et Wi-Fi-nettverk. Du vil bli koblet til det."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Avanserte innstillinger"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nei"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Sikkerhetspolicy begrenser bruk av Wi-Fi."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Trykk her for å koble til."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Om Wi-Fi Direct"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Enheten kobler til %1$s. Det er imidlertid ikke sikkert dette nettverket gir Internett-tilgang.\nTrykk på OK for å forbli tilkoblet til %1$s nå, men også for å hindre Smart nettverksbytte fra å koble til dette nettverket i fremtiden."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct gjør at Wi-Fi-enheter kan koble seg til direkte og gjør utskrift, fildeling, synkronisering og skjermdeling mye enklere og mer praktisk. Tilkobling til enheter som støtter Wi-Fi Direct gjør det mulig å dele innholdet ditt, synkronisere dataene dine, sosialisere med venner, spille spill, lyd, videoer og mye mer med forskjellige programmer"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Både Wi-Fi og mobilt tilgangspunkt kan ikke aktiveres samtidig. Deaktivere mobilt tilgangspunkt?"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Logg på Wi-Fi-nettverk"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internett kanskje ikke tilgj."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ikke spør på nytt"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Åpne Wi-Fi-innstillinger"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Ingen enheter funnet"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nei"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Avbryt"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Gi nytt navn til enhet"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Mitt enhetsnavn"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Det oppstod en feil."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Avbryt"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Tilkoblet"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Endre navn"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Trykk for å endre innstillinger."
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Ugyldig tegn angitt. Prøv på nytt."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Støttes ikke."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Tilgjengelig"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Kunne ikke koble til"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct-enheter"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Trykk for å koble til."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Avbryt tilkobling"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Tilkoblede enheter"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Merk alt"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Opptatte enheter"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Koblet til en annen enhet"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Kobler til..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Venter på tilkobling"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Kunne ikke koble til"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Kunne ikke koble til."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Koble til flere"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Koble fra alle"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Koble fra"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Ingen enheter funnet"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Deaktiver Wi-Fi Direct etter bruk"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Deaktiver Wi-Fi Direct etter bruk"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Deaktiver Wi-Fi Direct etter bruk for å spare batteri"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Deakt. Wi-Fi Direct etter bruk for å spare batteri"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s ber om en Wi-Fi Direct-tilkobling. Tillate?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Hvis du bruker Wi-Fi Direct, vil den gjeldende Wi-Fi-tilkoblingen bli koblet fra. Fortsette?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Hvis du bruker Wi-Fi Direct, vil gjeldende Wi-Fi-Internettdeling bli koblet fra. Fortsette?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct-tilkobling"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Koble fra Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Avbryte Wi-Fi Direct-tilkobling?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Ingen enheter"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Koble til andre enheter via Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Det har ikke vært noe aktivitet på %d minutter siden Wi-Fi Direct ble aktivert. For å forlenge batteriets levetid har Wi-Fi Direct blitt deaktivert."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Søk"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stopp"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deaktivering mislyktes"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deaktivering mislyktes."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Feil under aktivering"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Feil under aktivering."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Aktuell tilkobling vil bli frakoblet. Fortsette?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Tilgjengelige enheter"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Du kan koble til opptil %d enheter samtidig."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Tilgjeng. enheter"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Kunne ikke koble til %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Enhet koblet til en annen enhet."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Koblet til %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-kodene stemmer ikke overens."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deaktiverer..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Gjeldende tilkobling blir koblet fra slik at søket kan starte. Fortsette?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Enheter som ikke har klart å koble til"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Angi PIN-kode for å koble til %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Koble til %s om %d sekunder."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-kode %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Velg enheter"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct-tilkoblingen ble brutt."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Koble til %s om %d sek."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Gi nytt navn til enheten"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Kan ikke koble til"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Stopp tilkobling"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Tillat"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktiverer..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Koble til"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Tilkoblet."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Angi enhetsnavn"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Koblet til %d enheter via Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Ikke koblet til"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Denne Wi-Fi Direct-tilkoblingen blir avbrutt."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Du kan koble til opptil %d enheter samtidig"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "For å spare batteristrøm bør du deaktivere Wi-Fi Direct etter bruk."
diff --git a/ug-wifidirect/po/ne.po b/ug-wifidirect/po/ne.po
new file mode 100644
index 0000000..5f66f82
--- /dev/null
+++ b/ug-wifidirect/po/ne.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "कुनै यन्त्रहरू फेला परेनन्"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "मेरो यन्त्रको नाम"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "यन्त्रको नाम फेर्नुहोस्"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ब्लुटूथ, Wi-Fi Direct, र अन्य विधिहरु मार्फत र नजिकका यन्त्र सूचीमा उपलब्ध यन्त्रहरुमा फरक देखाउन यन्त्र नामहरु देखाइन्छ।"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "अक्षरहरूको अधिकतम संख्या पुग्यो।"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "जोडिँदै छ..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "रद्द"
+
+msgid "IDS_BR_SK_YES"
+msgstr "हो"
+
+msgid "IDS_BR_SK_NO"
+msgstr "होइन"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ठीक छ"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "रद्द"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "असफल भयो।"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "सक्षम पार्नुहोस्"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d चयन गरियो"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "जोड्यो"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "अवैध क्यारेक्टर प्रविष्टि गरियो। पुन: प्रयास गर्नुहोस्।"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "सेटिङहरू बदल्न ट्याप गर्नुहोस्।"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "रद्द गर्नुहोस्"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ठीक छ"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "समर्थित छैन।"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "सुरक्षा नीतिले Wi-Fi को प्रयोग माथि प्रतिबन्ध लगाउँछ।"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "नाम फेर्नुहोस्"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "उपलब्ध छन्"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "जडान असफल भयो"
+
+msgid "IDS_COM_SK_NO"
+msgstr "होइन"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct यन्त्रहरू"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "जडानका लागि ट्याप गर्नुहोस्।"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "जडान रद्द गर्नुहोस्"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "जोडिएका डिभाइसहरू"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "सबै छान्नुहोस्"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "व्यस्त यन्त्र"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "अर्को डिभाइससंग जोडिएको छ"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "जडानको लागि पर्खदै"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "जडान गर्न असफल।"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "बहु-जडान"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "सबैको जडान बिच्छेद गर्नुहोस्"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "जोडन विच्छेद"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wi-Fi Direct को प्रयोग पछि त्यसलाई असक्षम गर्नुहोस्"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "प्रयोग पछि Wi-Fi Direct असक्षम गर्नुहोस्"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Wi-Fi Direct को प्रयोग पछि बैटरी बचत गर्नको लागि त्यसलाई असक्षम गर्नुहोस्"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "बैटरी सेव गर्नको लागि प्रयोग पछि Wi-Fi Direct असक्षम गर्नुहोस्"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s ले Wi-Fi Direct जडान अनुरोध गर्दैछ। अनुमति दिने?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct प्रयोग गर्नाले हालको Wi-Fi कनेक्शन विच्छेद हुनेछ। जारी राख्‍ने?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct प्रयोग गर्नाले हालको Wi-Fi टेथरिङ विच्छेद हुनेछ। जारी राख्‍ने?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct जडान"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct विच्छेद."
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct जडान रद्द गर्ने?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "अन्य यन्त्रहरूमा Wi-Fi Direct द्वारा जडान गर्नुहोस्।"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct सक्षम गरिए देखि त्यहाँ %d मिनट सम्मको लागि कुनै गतिविधि भएको छैन। बैटरी जीवन लम्बाउनको लागि, Wi-Fi Direct असक्षम गरिएको छ।"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "स्क्यान"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "रोक्‍नुहोस्"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "असक्षमीकरण असफल।"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "सक्रियता असफल।"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "वर्तमान जडान विच्छेद हुनेछ । जारी राखूँ?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "तपाईले एकै पटकमा %d डिभाइसहरू जोड्नसक्नुहुन्छ।"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "उपलब्ध यन्त्रहरू"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s सँग जडान गर्न सकिएन।"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "डिभाइस अर्को डिभाइससंग जोडिएको छ।"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s मा जडित।"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN हरू मिलेन।"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "असक्रिय गरिँदै छ..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "हालको जडान बिच्छेद गरिनेछ ताकि स्क्यानिङ् सुरु हुन सकोस्। जारी राख्ने?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "यन्त्रहरू जुन जडान हुन असफल भयो"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s मा जोडन गर्न PIN प्रविष्टि गर्नुहोस्।"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%s मा %d सेकेण्डमा जडान गर्नुहोस्।"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "यन्त्रहरू चयन गर्नुहोस्"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct जडान गुमेको छ।"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s संग %d सेकेन्डमा जोड्नुहोस्।"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "यन्त्रको पुनः नामाकरण गर"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "जडान गर्न असक्षम भयो"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "जडानलाई रोक्नुहोस्"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "अनुमति दिनु"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "सक्रिय भइरहेको..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "जोड"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "जोड्यो।"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "यन्त्र नाम प्रविष्ट गर्नुहोस्"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "%d यन्त्रसंग Wi-Fi Direct बाट जोडिएको छ।"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "जडान गरिएको छैन"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "यस Wi-Fi Direct जडानलाई रद्द गरिनेछ।"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "बैटरी पावर बचत गर्नको लागि, Wi-Fi Direct प्रयोग पछि असक्षम बनाउनुहोस्।"
+
diff --git a/ug-wifidirect/po/nl.po b/ug-wifidirect/po/nl.po
new file mode 100755
index 0000000..7f4948c
--- /dev/null
+++ b/ug-wifidirect/po/nl.po
@@ -0,0 +1,471 @@
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Geef uw id op."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximumaantal tekens bereikt."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d geselecteerd"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Aanzetten"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maximumaantal tekens %d bereikt."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Kan IP-adres niet verkrijgen."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Verbonden met Wi-Fi-netwerk %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nooit"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Download gegevens via Wi-Fi/4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Download gegevens via Wi-Fi/3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Vergeten"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Annuleren"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Verbonden"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Schakel automatisch over tussen Wi-Fi en mobiele netwerken om een stabiele internetverbinding te handhaven."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Verificatiefout opgetreden"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi en mobiele netwerken worden samen gebruikt om bestanden sneller te downloaden. Uw gebruik van mobiele gegevens kan hierdoor toenemen."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Slimme netwerkwissel is ingeschakeld. Deze functie helpt een stabiele internetverbinding te handhaven door te wisselen tussen mobiele en Wi-Fi-netwerken. Hierdoor kan uw gegevensgebruik toenemen."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s wordt geselecteerd.\n\nAls u geen verbinding wilt maken met een toegangspunt, wijzigt u via SIM-kaartbeheer de SIM-kaart die voor verificatie wordt gebruikt. Vervolgens selecteert u de SIM-kaart die u wilt gebruiken voor Mobiele gegevens en MMS-berichten. U kunt ook de SIM-kaart verwijderen die u niet wilt gebruiken."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Druk binnen %d minuten op WPS op uw Wi-Fi-toegangspunt."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Open"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Geen Wi-Fi AP gevonden."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Huidige netwerkverbinding wordt verbroken."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Wachtwoord tonen"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Aan"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Uit"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Netwerk vergeten"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Slimme netwerkwissel"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signaalsterkte"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Verlaag gebruik mob gegev"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Voorrang snelheid"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Netwerk verbinden"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Gegevens Wi-Fi-netwerk"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS-methode selecteren"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxyadres"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Wachtwoord"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Wachtwoord invoeren"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS-knop"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Scannen"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Verborgen netwerk zoeken"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi-netwerken beschikbaar."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Alleen tijdens opladen"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Zwak"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Gebr.certificaat"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Niet-gespecificeerd"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Onbekend"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Als u grotere bestanden sneller wilt downloaden, moet u Wi-Fi en mobiele netwerken samen gebruiken."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Subnetmasker"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Vast IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sorteren op"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Scannen..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Meldingen ontvangen wanneer netwerken beschikbaar zijn"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Poort proxy"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Naam"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-adres"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-adres"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identiteit"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Gateway-adres"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Identiteit opgeven."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP-methode"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Verbinden..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Verbinden"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Opgeslagen"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Er is een Wi-Fi-netwerk gedetecteerd. U wordt verbonden."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Geavanceerde instellingen"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nee"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Gebruik van Wi-Fi beperkt door beveiligingsbeleid."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tik hier om te verbinden."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Uw apparaat maakt verbinding met %1$s. Dit netwerk biedt mogelijk echter geen internettoegang.\nTik op OK om nu verbonden te blijven met %1$s, maar ook te voorkomen dat Slimme netwerkwissel in de toekomst verbinding maakt met dit netwerk."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi en mobiel access point kunnen niet tegelijkertijd zijn geactiveerd. Mobiel access point uitschakelen?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Log in bij Wi-Fi-netwerk"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet missch niet beschikb."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Niet meer vragen"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Open Wi-Fi-instellingen"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Geen apparaten gevonden"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nee"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Annuleren"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Naam apparaat wijzigen"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Mijn apparaatnaam"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Mislukt."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Annul."
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Verbonden"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Hernoemen"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Tik om instellingen te wijzigen"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Ongeldig teken ingevoerd. Probeer het opnieuw."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Niet ondersteund."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Beschikbaar"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Verbinding mislukt"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct-apparaten"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Tik voor verbinding."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Verbinding annuleren"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "Verbonden apparaten"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Alles selecteren"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "Bezette apparaten"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "Verbonden met ander apparaat"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "Wachten op verbinding"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Kan geen verbinding maken."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "Meerdere verbindingen"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "Alle verbreken"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "Verb.verbr"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wi-Fi Direct na gebruik uitschakelen"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Wi-Fi Direct na gebruik uitzetten"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Wi-Fi Direct na gebruik uitschakelen om batterij te sparen"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Wi-Fi Direct na gebruik uit om batterij te sparen"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s vraagt om een Wi-Fi Direct-verbinding. Toestaan?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Als u Wi-Fi Direct gebruikt, wordt de huidige Wi-Fi-verbinding beëindigd. Doorgaan?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Als u Wi-Fi Direct gebruikt, wordt huidige Wi-Fi-tethering beëindigd. Doorgaan?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct-verbinding"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Verbinding Wi-Fi Direct verbreken"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct-verbinding annuleren?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Verbinden met andere apparaten via Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Er is %d minuten geen activiteit geweest nadat Wi-Fi Direct is ingeschakeld. Om de levensduur van de batterij te verlengen is Wi-Fi Direct uitgeschakeld."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Scan"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "Stoppen"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Uitschakelen mislukt."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Kan niet inschakelen..."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "Huidige verbinding wordt verbroken. Doorgaan?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "U kunt maximaal %d apparaten tegelijk verbinden."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Beschikb. apparaten"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Kan niet verbinden met %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Apparaat verbonden met een ander apparaat."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Verbonden met %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Pincodes komen niet overeen."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Uitschakelen..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Huidige verbinding wordt verbroken zodat het scannen kan beginnen. Doorgaan?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Apparaten die geen verbinding kunnen krijgen"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Geef pincode in om te verbinden met %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Verbinden met %s over %d seconden."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-code %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Apparaten selecteren"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "De Wi-Fi Direct-verbinding is verbroken."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Verbind met %s over %d sec."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Naam apparaat wijzigen"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "Geef PIN-code in"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Kan niet verbinden"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Verbinding stoppen"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Toestaan"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Inschakelen..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Verbinden"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Verbonden."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Naam apparaat invoeren"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Verbonden met %d apparaten via Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Niet verbonden"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Deze Wi-Fi Direct-verbinding wordt geannuleerd."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Schakel Wi-Fi Direct na gebruik uit om batterijvoeding te sparen."
+
diff --git a/ug-wifidirect/po/nl_NL.po b/ug-wifidirect/po/nl_NL.po
deleted file mode 100644
index 1e7f141..0000000
--- a/ug-wifidirect/po/nl_NL.po
+++ /dev/null
@@ -1,117 +0,0 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Verbonden"
-
-msgid "IDS_WFD_CONNECTING"
-msgstr "Verbinden..."
-
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Verbinding verbreken..."
-
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Verbonden"
-
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Onbekende fout"
-
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN's komen niet overeen!"
-
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Inschakelen..."
-
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d geselecteerd"
-
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Uitschakelen..."
-
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Niet ondersteund"
-
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
-
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Scannen"
-
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct-apparaten"
-
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Tik voor verbinding"
-
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "Verbinden"
-
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Verbinding annuleren"
-
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Over Wi-Fi Direct"
-
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct zorgt dat Wi-Fi-apparaten rechtstreeks kunnen worden verbonden, zodat afdrukken, bestanden delen, synchroniseren en het delen van schermen veel eenvoudiger en handiger verlopen. Als u apparaten verbindt die Wi-Fi Direct ondersteunen, kunt u via diverse applicaties inhoud delen, gegevens synchroniseren, contacten met vrienden onderhouden, gamen, en genieten van onder andere audio en video."
-
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
-msgstr "Verbonden apparaten"
-
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
-msgstr "Bezette apparaten"
-
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
-msgstr "Verbonden met ander apparaat"
-
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Verbinden..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
-msgstr "Wachten op verbinding"
-
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Kan geen verbinding maken"
-
-msgid "IDS_WFD_BUTTON_MULTI"
-msgstr "Meerdere verbindingen"
-
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
-msgstr "Alle verbreken"
-
-msgid "IDS_WFD_BUTTON_DISCONNECT"
-msgstr "Verb.verbr"
-
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Geen apparaten gevonden"
-
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
-
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
-
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
-msgstr "Wi-Fi Direct-verbinding"
-
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
-msgstr "Wi-Fi Direct-verbinding annuleren?"
-
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Geen apparaten"
-
-msgid "IDS_WFD_BUTTON_STOPSCAN"
-msgstr "Stoppen"
-
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Uitschakelen mislukt"
-
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Kan niet inschakelen..."
-
-msgid "IDS_WFD_POP_DISCONNECT"
-msgstr "Huidige verbinding wordt verbroken. Doorgaan?"
-
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Beschikbare apparaten"
-
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "U kunt maximaal %d apparaten tegelijk verbinden"
-
diff --git a/ug-wifidirect/po/or.po b/ug-wifidirect/po/or.po
new file mode 100644
index 0000000..40a174f
--- /dev/null
+++ b/ug-wifidirect/po/or.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "କୌଣସି ଡିଭାଇସ୍ ମିଳିଲା ନାହିଁ"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "ମୋ ଡିଭାଇସ୍ ନାମ"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ଡିଭାଇସ୍‌ ପୁନଃନାମକରଣ"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ପ୍ରତ୍ୟେକ ଡିଭାଇସକୁ ଚିହ୍ନିତ କରିବାକୁ ଡିଭାଇସ ନାମଗୁଡିକ ନିକଟତମ ଡିଭାଇସ ତାଲିକାରେ, ଏବଂ ବ୍ଲୁଟୁଥ୍, Wi-Fi Direct ଏବଂ ଅନ୍ୟ ପଦ୍ଧତି ମାଧ୍ୟମରେ ପ୍ରଦର୍ଶିତ ହେବ।"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "ସର୍ବାଧିକ ସଂଖ୍ୟକ ବର୍ଣ୍ଣରେ ପହଞ୍ଚିଛି।"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "ସଂଯୋଗ କରୁଛି..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "ବାତିଲ୍"
+
+msgid "IDS_BR_SK_YES"
+msgstr "ହଁ"
+
+msgid "IDS_BR_SK_NO"
+msgstr "ନା"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ଓକେ"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "ବାତିଲ୍"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "ବିଫଳ ହୋଇଛି"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "ସକ୍ଷମ"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%dଟି ଚୟନ ହୋଇଛି"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "ସଂଯୋଜିତ"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "ଅବୈଧ କମ୍‍ ପ୍ରବେଶ ହେଲା। ପୁନଃଚେଷ୍ଟା କରନ୍ତୁ।"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "ସେଟିଂଗୁଡିକ ବଦଳାଇବା ପାଇଁ ଟ୍ୟାପ୍‌ କରନ୍ତୁ।"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "ବାତିଲ୍"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ଓକେ"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "ସମର୍ଥିତ କରୁନାହିଁ"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "ସୁରକ୍ଷା ନୀତି Wi-Fiର ବ୍ୟବହାର ପ୍ରତିବନ୍ଧିତ କରିଛି।"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "ପୁନଃନାମ"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "ଉପଲବ୍ଧ"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "ସଂଯୋଜନ ବିଫଳ ହୋଇଛି"
+
+msgid "IDS_COM_SK_NO"
+msgstr "ନା"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct ଡିଭାଇସ୍‌ଗୁଡିକ"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "ସଂଯୋଗ କରିବାକୁ ଟ୍ୟାପ୍ କରନ୍ତୁ।"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "ସଂଯୋଜନା ବାତିଲ୍ କରନ୍ତୁ"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "ସଂଯୋଜିତ ଡିଭାଇସ୍"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "ସମସ୍ତ ଚୟନ"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "ବ୍ୟସ୍ତ ଡିଭାଇସଗୁଡିକ"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "ଅନ୍ୟ ଡିଭାଇସ୍ ସହ ସଂଯୋଜିତ"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "ସଂଯୋଜନ ପାଇଁ ଅପେକ୍ଷାରତ"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "ସଂଯୋଗ କରିବାକୁ ବିଫଳ ହୋଇଛି।"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "ଏକାଧିକ-ସଂଯୋଗ"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "ସମସ୍ତ ବିଚ୍ଛିନ୍ନ କରିବା"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "ବିଛିନ୍ନ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ବ୍ୟବହାର ପରେ Wi-Fi Direct ଅକ୍ଷମ କରନ୍ତୁ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "ବ୍ୟବହାର ପରେ Wi-Fi Direct ଅକ୍ଷମ କର."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "ବ୍ୟାଟେରୀ ସଞ୍ଚୟ କରିବା ପରେ Wi-Fi Direct ଅକ୍ଷମ କରନ୍ତୁ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "ବ୍ୟାଟେରୀ ସଞ୍ଚୟ କରିବା ପରେ Wi-Fi Direct ଅକ୍ଷମ କରନ୍ତୁ"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "ଏକ Wi-Fi Direct ସଂଯୋଜନକୁ %s ଅନୁରୋଧ କରୁଛି। ଅନୁମତି କରିବେ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct ବ୍ୟବହାର କରିବା ଦ୍ଵାରା ଆପଣଙ୍କ ବର୍ତ୍ତମାନ Wi-Fi ସଂଯୋଜନ ବିଚ୍ଛିନ୍ନ କରିବ। ଜାରି ରଖିବେ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct ବ୍ୟବହାର କରିବା ଦ୍ଵାରା ଆପଣଙ୍କ ବର୍ତ୍ତମାନ Wi-Fi ଟିଥରିଂ ସଂଯୋଜନ ବିଚ୍ଛିନ୍ନ କରିବ। ଜାରି ରଖିବେ?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct ସଂଯୋଜନ"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ବିଚ୍ଛି."
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct ସଂଯୋଜନ ବାତିଲ୍ କରିବେ?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ମାଧ୍ୟମରେ ଅନ୍ୟ ଡିଭାଇସଗୁଡିକ ସଂଯୋଗ କରନ୍ତୁ।"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct ସାମର୍ଥ୍ୟ ହେବା ଠାରୁ %d ମିନିଟ୍ ପାଇଁ କୌଣସି କାର୍ଯ୍ୟ ନାହିଁ। ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବିସ୍ତୃତ କରିବାକୁ, Wi-Fi Direct ଅକ୍ଷମ ହୋଇଛି।"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "ସ୍କାନ୍"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "ସ୍ଥଗିତ"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "ଅସକ୍ରିୟତା ବିଫଳ ହୋଇଛି।"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "ସକ୍ରିୟକରଣ ବିଫଳ ହୋଇଛି।"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "ବର୍ତ୍ତମାନ ଯୋଗାଯୋଗ ବିଚ୍ଛିନ୍ନ ହେବ। ଜାରି?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "ଏକା ଥରରେ ଆପଣ %dଟି ଡିଭାଇସ୍ ସଂଯୋଗ କରିପାରିବେ।"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "ଉପଲବ୍ଧ ଡିଭାଇସଗୁଡିକ"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s କୁ ସଂଯୋଗ କରିବାକୁ ବିଫଳ ହୋଇଛି।"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "ଡିଭାଇସ୍ ଅନ୍ୟ ଡିଭାଇସକୁ ସଂଯୋଜିତ ହୋଇଛି।"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%sକୁ ସଂଯୋଜିତ।"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINଗୁଡିକ ମେଳ ଖାଉନାହିଁ"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "ନିଷ୍କ୍ରିୟ କରୁଛି..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "ବର୍ତ୍ତମାନ ସଂଯୋଜନ ବିଚ୍ଛିନ୍ନ ହେବ ଯାହା ଦ୍ଵାରାକି ସ୍କ୍ୟାନିଂ ଆରମ୍ଭ ହେବ। ଜାରି ରଖିବେ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "ସଂଯୋଗ କରିବାକୁ ବିଫଳ ହୋଇଥିବା ଡିଭାଇସ୍‌ଗୁଡିକ"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s କୁ ସଂଯୋଗ କରିବାକୁ PIN ପ୍ରବିଷ୍ଟ କରନ୍ତୁ।"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%s କୁ %d ସେକେଣ୍ଡରେ ସଂଯୋଗ କରନ୍ତୁ।"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "ପିନ %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ଡିଭାଇସ୍‌ଗୁଡିକ ଚୟନ କରନ୍ତୁ"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct ସଂଯୋଜନ ହରାଇଛି।"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s ସହ %d ସେ. ରେ ସଂଯୋଗ କରୁଛି।"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ଡିଭାଇସ୍‌ ପୁନଃନାମକରଣ"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "ସଂଯୋଗ କରିବାକୁ ଅକ୍ଷମ"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "ସଂଯୋଗ ବନ୍ଦ କରନ୍ତୁ"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "ଅନୁମତି"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "ସକ୍ରିୟକରଣ କରୁଛି..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "ସଂଯୋଗ"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "ସଂଯୋଜିତ"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ଏକ ଡିଭାଇସ୍ ନାମ ପ୍ରବେଶ କରନ୍ତୁ"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ଦ୍ଵାରା %d ଡିଭାଇସ୍ ସହ ସଂଯୋଜିତ।"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "ସଂଯୋଗ ହୋଇନାହିଁ"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "ଏହି Wi-Fi Direct ସଂଯୋଜନ ବାତିଲ୍ ହେବ।"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ବ୍ୟାଟେରୀ ପାୱାର୍ ସଞ୍ଚୟ କରିବାକୁ Wi-Fi Directକୁ ବ୍ୟବହାର ପରେ ଅକ୍ଷମ କରି ଦିଅନ୍ତୁ।"
+
diff --git a/ug-wifidirect/po/pa.po b/ug-wifidirect/po/pa.po
new file mode 100644
index 0000000..fcdc8e2
--- /dev/null
+++ b/ug-wifidirect/po/pa.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "ਕੋਈ ਡਿਵਾਈਸ ਨਹੀਂ ਮਿਲੇ"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "ਮੇਰੇ ਡਿਵਾਈਸ ਦਾ ਨਾਂ"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "ਡਿਵਾਈਸ ਦਾ ਨਾਂ ਬਦਲੋ"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "ਡਿਵਾਈਸ ਨਾਂ ਨੇੜਲੇ ਡਿਵਾਈਸਿਸ ਦੀ ਸੂਚੀ, ਅਤੇ ਬਲੂਟੁੱਥ, Wi-Fi Direct ਰਾਹੀਂ, ਅਤੇ ਹੋਰ ਵਿਧੀਆਂ ਵਿੱਚ ਉਪਲਬਧ ਡਿਵਾਈਸਿਸ ਵਿੱਚੋਂ ਹਰ ਇੱਕ ਨੂੰ ਅਲੱਗ ਕਰਨ ਦੇ ਲਈ ਪ੍ਰਦਰਸ਼ਿਤ ਕੀਤੇ ਜਾਂਦੇ ਹਨ।"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "ਵਰਣ ਅਧਿਕਤਮ ਸੰਖਿਆ ਤੇ ਪਹੁੰਚੇ।"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "ਰੱਦ ਕਰੋ"
+
+msgid "IDS_BR_SK_YES"
+msgstr "ਹਾਂ"
+
+msgid "IDS_BR_SK_NO"
+msgstr "ਨਹੀਂ"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ਓਕੇ"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "ਰੱਦ ਕਰੋ"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "ਅਸਫਲ।"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "ਸਮੱਰਥ"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d ਚੁਣੇ"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "ਕਨੈਕਟ ਹੋਇਆ"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "ਅਵੈਧ ਵਰਣ ਦਾਖ਼ਲ ਹੋਇਆ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "ਸੈੱਟਿੰਗਸ ਨੂੰ ਬਦਲਣ ਲਈ ਟੈਪ ਕਰੋ।"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "ਰੱਦ ਕਰੋ"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ਓਕੇ"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "ਸਮਰਥਿਤ ਨਹੀਂ।"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "ਸੁਰੱਖਿਆ ਨੀਤੀ Wi-Fi ਦੀ ਵਰਤੋਂ ਨੂੰ ਪ੍ਰਤੀਬੰਧਿਤ ਕਰਦੀ ਹੈ।"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "ਦੁਬਾਰਾ ਨਾਂ"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "ਉਪਲਬਧ"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "ਕਨੈਕਸ਼ਨ ਅਸਫਲ"
+
+msgid "IDS_COM_SK_NO"
+msgstr "ਨਹੀਂ"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct ਡਿਵਾਈਸਾਂ"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "ਕਨੈਕਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "ਕਨੈਕਸ਼ਨ ਰੱਦ ਕਰੋ"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "ਕਨੈਕਟ ਹੋਏ ਡਿਵਾਈਸਿਸ"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "ਸਭ ਚੁਣੋ"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "ਵਿਅਸਤ ਡਿਵਾਈਸਿਸ"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "ਕਿਸੇ ਹੋਰ ਡਿਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਹੈ"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "ਕਨੈਕਸ਼ਨ ਲਈ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "ਮਲਟੀ-ਕਨੈਕਟ"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "ਸਾਰੇ ਡਿਸਕਨੈਕਟ ਕਰੋ"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "ਡਿਸਕਨੈਕਟ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wi-Fi Direct ਨੂੰ ਵਰਤਣ ਤੋਂ ਬਾਅਦ ਅਸਮੱਰਥ ਕਰ ਦਿਓ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "ਵਰਤੋਂ ਤੋਂ ਬਾਦ Wi-Fi Direct ਅਸਮਰੱਥ ਕਰੋ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "ਬੈਟਰੀ ਬਚਾਉਣ ਲਈ Wi-Fi Direct ਨੂੰ ਵਰਤਣ ਤੋਂ ਬਾਅਦ ਅਸਮੱਰਥ ਕਰ ਦਿਓ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "ਬੈਟਰੀ ਬਚਾਉਣ ਲਈ Wi-Fi Direct ਨੂੰ ਵਰਤੋਂ ਤੋਂ ਬਾਅਦ ਅਸਮਰੱਥ ਕਰੋ"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s ਇੱਕ Wi-Fi Direct ਸੰਪਰਕ ਲਈ ਬੇਨਤੀ ਕਰ ਰਿਹਾ ਹੈ। ਆਗਿਆ ਦੇਈਏ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct ਦੀ ਵਰਤੋਂ ਕਰਨ ਨਾਲ ਵਰਤਮਾਨ Wi-Fi ਕਨੈਕਸ਼ਨ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ। ਜਾਰੀ ਰੱਖੋ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct ਦੀ ਵਰਤੋਂ ਕਰਨ ਨਾਲ ਵਰਤਮਾਨ Wi-Fi ਟੈਥਰਿੰਗ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗੀ। ਜਾਰੀ ਰੱਖੋ?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct ਕਨੈਕਸ਼ਨ"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ਡਿਸਕਨੈਕਟ ਕਰੋ"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct ਕਨੈਕਸ਼ਨ ਰੱਦ ਕਰਨਾ ਹੈ?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ਰਾਹੀਂ ਹੋਰ ਡਿਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct ਦੇ ਸਮਰੱਥ ਕੀਤੇ ਜਾਣ ਦੇ ਬਾਅਦ ਇੱਥੇ %d ਮਿੰਟ ਤੋਂ ਕੋਈ ਕਿਰਿਆ ਨਹੀਂ ਸੀ। ਬੈਟਰੀ ਜੀਵਨ ਵਧਾਉਣ ਲਈ, Wi-Fi Direct ਅਸਮਰੱਥ ਕੀਤਾ ਗਿਆ।"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "ਸਕੈਨ ਕਰੋ"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "ਰੁਕੋ"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "ਨਿਸ਼ਕ੍ਰਿਆ ਕਰਨਾ ਅਸਫਲ।"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "ਕਿਰਿਆਸ਼ੀਲਤਾ ਅਸਫਲ।"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "ਮੌਜੂਦਾ ਕਨੈਕਸ਼ਨ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ। ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "ਇੱਕ ਸਮੇਂ ਵਿੱਚ ਤੁਸੀਂ %d ਤੱਕ ਡਿਵਾਈਸਿਸ ਕਨੈਕਟ ਕਰ ਸਕਦੇ ਹੋ।"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "ਉਪਲਬਧ ਡਿਵਾਈਸਿਸ"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਫ਼ਲ।"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "ਡਿਵਾਈਸ ਦੂਜੇ ਡਿਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਹੋਇਆ।"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s ਨਾਲ ਕਨੈਕਟ ਹੋਇਆ।"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ।"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "ਨਿਸ਼ਕ੍ਰਿਆ ਹੋ ਰਿਹਾ ਹੈ..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "ਮੌਜੂਦਾ ਕਨੈਕਸ਼ਨ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ ਤਾਂ ਕਿ ਸਕੈਨਿੰਗ ਆਰੰਭ ਹੋ ਸਕੇ। ਜਾਰੀ ਰੱਖੀਏ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "ਉਪਕਰਣ ਜੋ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ PIN ਦਾਖ਼ਲ ਕਰੋ।"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d ਸਕਿੰਟਾਂ ਵਿੱਚ %s ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "ਡਿਵਾਈਸਿਸ ਦੀ ਚੋਣ ਕਰੋ"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct ਕਨੈਕਸ਼ਨ ਟੁੱਟ ਗਿਆ ਹੈ।"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%d ਸਕਿ ਵਿੱਚ %s ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "ਡਿਵਾਈਸ ਦਾ ਨਾਂ ਬਦਲੋ"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "ਕਨੈਕਸ਼ਨ ਬੰਦ ਕਰੋ"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "ਆਗਿਆ ਦਿਉ"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "ਕਿਰਿਆਸ਼ੀਲ ਹੋ ਰਿਹਾ ਹੈ..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "ਕਨੈਕਟ"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "ਕਨੈਕਟ ਹੋਇਆ।"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ਡਿਵਾਈਸ ਦਾਂ ਨਾਂ ਦਾਖ਼ਲ ਕਰੋ"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ਰਾਹੀਂ %d ਡਿਵਾਈਸਿਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "ਕਨੈਕਟ ਨਹੀਂ ਹੈ"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Wi-Fi Direct ਕਨੈਕਸ਼ਨ ਰੱਦ ਹੋ ਜਾਵੇਗਾ।"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ਬੈਟਰੀ ਪਾਵਰ ਬਚਾਉਣ ਲਈ, Wi-Fi Direct ਨੂੰ ਵਰਤਣ ਤੋਂ ਬਾਅਦ ਅਸਮੱਰਥ ਕਰ ਦਿਓ।"
+
diff --git a/ug-wifidirect/po/pl.po b/ug-wifidirect/po/pl.po
index 93d2146..0a50fdf 100644..100755
--- a/ug-wifidirect/po/pl.po
+++ b/ug-wifidirect/po/pl.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Połączono"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Wprowadź identyfikator."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Łączenie..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Osiągnięto maksymalną liczbę znaków."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Wybrano %d"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Włącz"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Osiągnięto maksymalną liczbę znaków: %d."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Nie można uzyskać adresu IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Połączono z siecią Wi-Fi %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Rozłączanie..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nigdy"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Pobieraj dane przez Wi-Fi i 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Pobieraj dane przez Wi-Fi i 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Zapomnij"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Anuluj"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Połączono"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Nieznany błąd"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatycznie przełączaj między połączeniem Wi-Fi a sieciami komórkowymi w celu utrzymania stabilnego połączenia z Internetem."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Niezgodne kody PIN!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Wystąpił błąd uwierzytelniania"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Włączanie..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Aby szybciej pobierać pliki, jednocześnie użyte zostaną sieć Wi-Fi i sieci komórkowe. Może to zwiększyć użycie transmisji danych po sieci."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "Wybrano %d"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Funkcja Inteligentne przełączanie sieci została włączona. Pomaga ona utrzymać stabilne połączenie z Internetem przez przełączanie między siecią komórkową a siecią Wi-Fi. Może to zwiększyć użycie danych."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Wyłączanie..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Wybrano %s.\n\nJeśli nie możesz połączyć się z punktem dostępowym, zmień kartę SIM używaną do weryfikacji, przechodząc do menedżera kart SIM. Następnie wybierz kartę SIM, której chcesz używać dla danych komórkowych i MMS. Możesz też odłączyć kartę SIM, której nie chcesz używać."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nieobsługiwane"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Naciśnij przycisk WPS punktu dostępu do sieci Wi-Fi w ciągu %d minut."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Otwarta"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nie znaleziono punktu dostępu Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Bieżąca sieć zostanie rozłączona."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Wyświetl hasło"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Włączone"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Wyłączone"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Zapomnij sieć"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Intelig. przełącz. sieci"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Moc sygnału"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Zmniejsz uż. tr. danych"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Ustawiaj prior. szybkości"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Łączenie sieci"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informacje o sieci Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Wybór metody WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Adres serwera proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Hasło"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Wpisz hasło."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Przyc. WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Skanuj"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Urządzenia Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Znajdź ukrytą sieć"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Dostępne sieci Wi-Fi."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Tylko podczas ładowania"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Słaba"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certyfikat użytk."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Nieokreślony"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Nieznane"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Aby szybciej pobierać duże pliki, użyj jednocześnie sieci Wi-Fi i sieci komórkowych."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Maska podsieci"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statyczny adres IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sortuj według"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Skanowanie..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Otrzymuj powiadomienia o dostępnych sieciach"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Dotknij, aby połączyć"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Port serwera proxy"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nazwa"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Adres MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Adres IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Tożsamość"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Adres bramy"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Wprowadź tożsamość."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Metoda EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Łączenie..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Połącz"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Anuluj połączenie"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Zapisano"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wykryto sieć Wi-Fi. Zostanie nawiązane połączenie."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Ustawienia zaawansowane"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nie"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Zasady zabezpieczeń ograniczają użycie sieci Wi-Fi."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Dotknij tutaj, aby połączyć."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "O Wi-Fi Direct"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Twoje urządzenie łączy się z punktem dostępu %1$s. Ta sieć może jednak nie zapewniać dostępu do Internetu.\nDotknij opcji OK, aby utrzymać teraz połączenie z punktem dostępu %1$s oraz uniemożliwić funkcji Inteligentne przełączanie sieci łączenie się z tą siecią w przyszłości."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct pozwala na bezpośrednie łączenie z innymi urządzeniami Wi-Fi, np. drukowanie, przesyłanie plików, synchronizację, jest znacznie szybsze i prostsze. Podłączenie do urządzenia z Wi-Fi Direct umożliwia wymianę kontentu, synchronizację danych, granie w gry, odtwarzanie muzyki i wideo i wiele więcej"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Sieć Wi-Fi i Router Wi-Fi nie mogą być uruchomione jednocześnie. Wyłączyć Router Wi-Fi?"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Zaloguj do sieci Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet może być niedostępny"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Nie pytaj ponownie"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otwórz ustawienia Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nie znaleziono żadnych urządzeń"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Tak"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nie"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Anuluj"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Zmień nazwę urządzenia"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nazwa mojego urządzenia"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Błąd"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Anuluj"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Połączono"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Zmień nazwę"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Dotknij, aby zmienić ustawienia"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Wpisano nieprawidłowy znak. Spróbuj ponownie"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nieobsługiwane."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Dostępne"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Poł. nie powiod. się"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Urządzenia Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Dotknij, aby połączyć."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Anuluj połączenie"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Podłączone urządzenia"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Zaznacz wszystko"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Zajęte urządzenia"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Połączone z innym urządzeniem"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Łączenie..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Oczekiwanie na połącz."
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Nie można połączyć"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Nie można połączyć."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Wiele połączeń"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Rozłącz wszystkie"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Rozłącz"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nie znaleziono żadnych urządzeń"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wyłącz Wi-Fi Direct po użyciu"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Wyłącz Wi-Fi Direct po użyciu"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Wyłącz Wi-Fi Direct po użyciu, aby oszczędzać baterię"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Wyłącz Wi-Fi Direct po użyciu, aby oszczędzać bat."
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s żąda połączenia Wi-Fi Direct. Zezwolić?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Korzystanie z Wi-Fi Direct spowoduje przerwanie aktualnego połączenia Wi-Fi. Kontynuować?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Korzystanie z Wi-Fi Direct spowoduje przerwanie aktualnego połączenia przez router Wi-Fi. Kontynuować?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Połączenie Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Odłącz Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Anulować połączenie Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Brak urządzeń"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Połącz z innym urządzeniem w technologii Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Od momentu włączenia Wi-Fi Direct nie było aktywności przez %d min. W celu wydłużenia czasu pracy baterii Wi-Fi Direct zostało wyłączone."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Skanuj"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stop"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "Błąd wyłączania"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "Nie można włączyć..."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Bieżące połączenie zostanie rozłączone. Kontynuować?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Urządzeń, z którymi można połączyć jednocześnie: %d."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Dostępne urządzenia"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Urządzeń, z którymi można połączyć jednocześnie: %d"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Nawiązanie połączenia z %s nie powiodło się."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Urządzenie połączono z innym urządzeniem."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Połączony z siecią %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Niezgodny kod PIN."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Wyłączanie..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Bieżące połączenie zostanie zakończone w celu rozpoczęcia skanowania. Kontynuować?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Urządzenia, z którymi nie można się połączyć"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Wprowadź kod PIN, aby nawiązać połączenie z urządzeniem %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Połącz z urządzeniem %s za %d s."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Kod PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Wybór urządzeń"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Połączenie Wi-Fi Direct zostało utracone."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Połącz z urządzeniem %s za %d s."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Zmień nazwę urządzenia"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Nie można połączyć"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Zatrz. połączenie"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Zezwalaj"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Włączanie..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Połącz"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Połączono."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Wprowadzenie nazwy urządzenia"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Połączono się z urządzeniami Wi-Fi Direct: %d."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Nie połączono"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "To połączenie Wi-Fi Direct zostanie anulowane."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Aby oszczędzać energię baterii, wyłącz Wi-Fi Direct po użyciu."
diff --git a/ug-wifidirect/po/pt_BR.po b/ug-wifidirect/po/pt_BR.po
index 413251a..e5a93e9 100644
--- a/ug-wifidirect/po/pt_BR.po
+++ b/ug-wifidirect/po/pt_BR.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Conectado"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Insira sua ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Conectando..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Número máximo de caracteres atingido."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d selecionado(s)"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Ativar"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Número máximo de %d caracteres atingido."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Falha ao obter o endereço IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Conectado à rede Wi-Fi %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nunca"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Desconectando..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Baixar dados via Wi-Fi e 4G"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Baixar dados via Wi-Fi e 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Esquecer"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Conectado"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Erro desconhecido"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Alternar automaticamente entre Wi-Fi e redes móveis para manter uma conexão estável com a Internet."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Os PINs não correspondem"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Ocorreu um erro de autenticação"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Ativando…"
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "As redes Wi-Fi e móvel serão usadas juntas para baixar arquivos mais rápido. Isto pode aumentar seu uso de dados móveis."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d selecionada"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "A Troca de rede inteligente foi ativada. Esta função ajuda a manter uma conexão estável com a Internet alterando entre redes móveis e Wi-Fi. Isto pode aumentar o uso de dados."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Desativando…"
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s está selecionado.\n\nSe você estiver conectado a um Ponto de acesso, altere o chip usado para verificação indo para o gerenciador de chip. Em seguida, selecione o chip que deseja usar para os Dados móveis e mensagens multimídia. Ou, você pode remover o chip que não quiser usar."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Não suportado"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Pressione WPS no seu ponto de acesso Wi-Fi dentro de %d minutos."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Aberta"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi não encontrado."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "A rede atual será desconectada."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Exibir senha"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Ativado"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Desativado"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Esquecer rede"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Troca de rede inteligente"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Intensidade do sinal"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reduzir uso dados móveis"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Priorizar velocidade"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Vínculo de rede"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informações da rede Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Selecionar método WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Endereço proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Senha"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Insira senha."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Botão WPS"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Pesquisar"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Dispositivos Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Buscar rede oculta"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Redes Wi-Fi disponíveis."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Somente durante carregamento"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Fraco"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certif. utilizad."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Não especificado"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Desconhecido"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Para baixar arquivos grandes mais rápido, use as redes Wi-Fi e móvel juntas."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Máscara de subrede"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP fixo"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Ordenar por"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Procurando..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Receber notificações quando existirem redes disponíveis"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Tocar para conectar"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Porta do proxy"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nome"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Endereço MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Endereço IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identidade"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Endereço do gateway"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Inserir identidade."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Método EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Conectando..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Conectar"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Cancelar conexão"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Salvo"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Uma rede Wi-Fi foi detectada. Você será conectado."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Config. avançadas"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Não"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "A política de segurança restringe a utilização de Wi-Fi."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Sobre Wi-Fi Direct"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toque aqui para conectar-se."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "O Wi-Fi Direct permite que dispositivos Wi-Fi se conectem diretamente, tornando a impressão, o compartilhamento de arquivos, a sincronização e o compartilhamento de telas muito mais simples e convenientes. Conectar a dispositivos compatíveis com Wi-Fi Direct torna possível compartilhar seu conteúdo, sincronizar dados, socializar com amigos, jogar, ouvir música, assistir vídeos e muito mais usando vários aplicativos"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Seu dispositivo está se conectando a %1$s. Contudo, esta rede pode não oferecer acesso à Internet.\nToque em OK para permanecer conectado a %1$s agora, mas também evitar que a Troca de rede inteligente se conecte a esta rede no futuro."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Impossível utilizar Wi-Fi ou AllShare com o Roteador Wi-Fi simultaneamente. Desativar o Roteador Wi-Fi?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Verifique sua rede Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet pode estar indispon."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Não perguntar mais"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Abrir configurações de Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nenhum dispositivo encontrado"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Sim"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Não"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Renomear dispositivo"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nome do meu dispositivo"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Falhou."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Conectado"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Renomear"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Toque para alterar configurações"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Caractere inválido inserido. Tente novamente"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Não suportado."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Disponível"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Falha de conexão"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Dispositivos Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Tocar para conectar."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Cancelar conexão"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Dispositivos conectados"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Selecionar tudo"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Dispositivos ocupados"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Conectado a outro dispositivo"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Conectando..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Aguardando pela conexão"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Falha ao conectar"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Falha ao conectar."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Conexão múltipla"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Desconectar tudo"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Desativar"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nenhum dispositivo encontrado"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Desativar o Wi-Fi Direct após o uso"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Desat. Wi-Fi Direct dep. util."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Desativar o Wi-Fi Direct após o uso para economizar bateria"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Desac. Wi-Fi Direct depois util. p/ poupar bateria"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s está solicitando uma conexão Wi-Fi Direct. Permitir?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "O uso do Wi-Fi Direct desconectará sua conexão Wi-Fi atual. Continuar?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "O uso do Wi-Fi Direct desconectará sua ancoragem Wi-Fi atual. Continuar?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Conexão Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Desconectar Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Cancelar conexão Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Nenhum dispositivo"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectar a outros dispositivos por Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Não tem havido nenhuma atividade por %d minutos desde que o Wi-Fi Direct foi ativado. Para aumentar a duração da bateria, o Wi-Fi Direct está sendo desativado."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Buscar"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Parar"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Desativação falhou"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Desativação falhou."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Falha na ativação"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Falha na ativação."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "A conexão atual será desconectada. Continuar?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Dispositivos disponíveis"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Você pode conectar até %d dispositivos ao mesmo tempo."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Dispositivos dispon."
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Falha ao conectar com %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Dispositivo conectado a outro dispositivo."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Conectado a %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINs não correspondem."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Desativando…"
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "A conexão atual será desconectada para que a varredura possa iniciar. Continuar?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Dispositivos que falharam ao se conectarem"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Insira PI para conectar a %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Conectar ao %s em %d segundos."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Código PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Selecionar dispositivos"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "A conexão Wi-Fi Direct foi perdida."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Conectar com %s em %d s."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Renomear dispositivo"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Não é possível conectar"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Parar conexão"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Permitir"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Ativando…"
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Conectar"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Conectado."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Insira o nome dispositivo"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectado a %d dispositivos via Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Não conectado"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Esta conexão Wi-Fi Direct será cancelada."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Você pode conectar até %d dispositivos ao mesmo tempo"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Para economizar bateria, desative o Wi-Fi Direct após o uso."
diff --git a/ug-wifidirect/po/pt_PT.po b/ug-wifidirect/po/pt_PT.po
index 9e96047..a99f30c 100644..100755
--- a/ug-wifidirect/po/pt_PT.po
+++ b/ug-wifidirect/po/pt_PT.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Ligado"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Introduza o seu ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "A ligar..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Número máximo de caracteres atingido."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d seleccionado(s)"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Activar"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Número máximo de caracteres %d atingido."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Falha ao obter endereço IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Ligado à rede Wi-Fi %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nunca"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "A desligar..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Transferir dados via Wi-Fi e 4G"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Transferir dados via Wi-Fi e 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Esquecer"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Ligado"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Erro desconhecido"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Alterna automaticamente entre Wi-Fi e redes móveis para manter uma ligação à Internet estável."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Os PIN não correspondem!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Ocorreu um erro de autenticação"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "A activar..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "O Wi-Fi e redes móveis serão utilizados em conjunto para transferir ficheiros com maior rapidez. Isto pode aumentar a sua utilização de dados móveis."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d seleccionada"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "A Mudança de rede inteligente foi activada. Esta função ajuda a manter uma ligação de Internet estável alternando entre as redes móvel e Wi-Fi. A consequência pode ser um aumento da utilização de dados."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "A desactivar..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s seleccionado.\n\nSe não conseguir efectuar a ligação a um AP, mude o cartão SIM utilizado para verificação indo ao Gestor de cartão SIM. Em seguida, seleccione o cartão SIM que quer utilizar para os Dados móveis e as mensagens multimédia. Em alternativa, pode desmontar o cartão SIM que não quer utilizar."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Não suportado"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Prima WPS no seu ponto de acesso Wi-Fi dentro de %d minutos."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Aberta"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nenhum PA Wi-Fi localizado."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "A rede actual será desligada."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Mostrar palavra-passe"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Ligar"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Desligar"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Esquecer rede"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Mudança rede inteligente"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Potência do sinal"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reduzir utilização dados"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Priorizar velocidade"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Agregação de redes"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informações de rede Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Seleccionar método WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Endereço proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Palavra-passe"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Introduzir palavra-passe."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Botão WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Pesquisar"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Dispositivos Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Localizar rede oculta"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Redes Wi-Fi disponíveis."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Apenas durante a carga"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Fraca"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certif. utilizad."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Não especificado"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Desconhecido"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Para transferir ficheiros grandes com maior rapidez, utilize Wi-Fi e redes móveis em conjunto."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Máscara de sub-rede"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP estático"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Ordenar por"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Tocar para ligar"
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "A procurar..."
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Receber notificações quando existem redes disponíveis"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Porta de proxy"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nome"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Endereço MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Endereço IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identidade"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Endereço de gateway"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Introduzir identidade."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Método EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "A ligar..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Ligar"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Cancelar ligação"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Guardado"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Foi detectada uma rede Wi-Fi. Vai ficar ligado."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Definições avançadas"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Sobre o Wi-Fi Direct"
+msgid "IDS_COM_SK_NO"
+msgstr "Não"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "O Wi-Fi Direct permite a ligação directa dos dispositivos Wi-Fi, tornando a impressão, a partilha de ficheiros, a sincronização e a partilha de ecrã muito mais simples e cómodas. A ligação a dispositivos que suportam o Wi-Fi Direct torna possível a partilha dos seus conteúdos, a sincronização dos seus dados, a socialização com amigos, os jogos, áudio, vídeo e muito mais, utilizando várias aplicações"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "A política de segurança restringe a utilização de Wi-Fi."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toque aqui para ligar."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "O seu dispositivo está a estabelecer a ligação a %1$s. No entanto, esta rede poderá não fornecer acesso à Internet.\nToque em OK para continuar ligado a %1$s agora, mas também para impedir que a Mudança de rede inteligente se ligue a esta rede no futuro."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Impossível activar Wi-Fi e PA Móvel em simultâneo. Desactivar PA Móvel?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Inic. ses. na rede Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet pode não estar disp."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Não voltar a perguntar"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Definições de abertura de Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Sem dispositivos encontrados"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Sim"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Não"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Mudar o nome do dispositivo"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Nome do meu dispositivo"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Falha."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Ligado"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Mudar nome"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Tocar para alterar as definições"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Introduzidos caracteres inválidos. Tente novamente."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Não suportado."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Disponível"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Ligação falhou"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Dispositivos Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Tocar para ligar."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Cancelar ligação"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Dispositivos ligados"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Seleccionar tudo"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Dispositivos ocupados"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Ligado a outro dispositivo"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "A ligar..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "A aguardar ligação"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Falha ao ligar"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Falha ao ligar."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Ligações múltiplas"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Desligar tudo"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Desligar"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nenhuns dispositivos encontrados"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Desactivar o Wi-Fi Direct depois da utilização"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Desligar Wi-Fi Direct após uso"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Desactivar o Wi-Fi Direct depois da utilização para poupar a bateria"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Desac. Wi-Fi Direct depois util. p/ poupar bateria"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s está a pedir uma ligação Wi-Fi Direct. Permitir?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "A utilização do Wi-Fi Direct irá desligar a ligação Wi-Fi actual. Continuar?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "A utilização do Wi-Fi Direct irá desligar a ancoragem Wi-Fi actual. Continuar?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Ligação Wi-Fi direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Desligar Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Cancelar ligação Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Nenhuns dispositivos"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Ligar a outros dispositivos por Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Não houve actividade durante %d minutos desde que o Wi-Fi Direct foi activado. Para aumentar a vida útil da bateria o Wi-Fi Direct foi desactivado."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Pes-quisar"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Parar"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Desactivação falhou"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Desactivação falhou."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Falha na activação"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Falha na activação."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "A ligação actual será desligada. Continuar?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Dispositivos disponíveis"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Pode ligar até %d dispositivos em simultâneo."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Disposit disponíveis"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Falha ao ligar a %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Dispositivo ligado a outro dispositivo."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Ligado a %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINs não correspondem."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "A desactivar..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "A ligação actual será desligada para poder ser iniciada a pesquisa. Continuar?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Dispositivos que falharam ao estabelecer ligação"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Introduzir PI para ligar a %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Ligar a %s dentro de %d segundos."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Código PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Seleccionar dispositivos"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Perdeu-se a ligação Wi-Fi Direct."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Ligar a %s dentro de %d segundos."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Mudar o nome do dispositivo"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Impossível ligar"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Parar ligação"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Permitir"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "A activar..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Ligar"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Ligado."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Introduzir nome do dispositivo"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Ligado a %d dispositivos por Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Não ligado"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Esta ligação Wi-Fi Direct será cancelada."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Pode ligar até %d dispositivos em simultâneo"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Para poupar energia da bateria, desactive o Wi-Fi Direct depois de o utilizar."
diff --git a/ug-wifidirect/po/ro.po b/ug-wifidirect/po/ro.po
index 8edb030..0f6f958 100644..100755
--- a/ug-wifidirect/po/ro.po
+++ b/ug-wifidirect/po/ro.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Conectat"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Introduceţi ID-ul."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Conectare"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Adăugare la marcaje"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Deconectare"
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d selectate"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Activare"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "S-a atins numărul maxim de %d caractere."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Adresa IP nu a putut fi obţinută."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Este conectat la reţeaua Wi-Fi %s."
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Niciodată"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Descărc. date prin Wi-Fi şi 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Descărc. date prin Wi-Fi şi 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Revocare"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Anulare"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Conectat"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Eroare necunoscută"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Comutaţi automat între reţelele Wi-Fi şi mobile pentru menţinerea unei conexiuni stabile la internet."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Codurile PIN nu se potrivesc!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "A apărut o eroare de autentificare"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Se activează..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Pentru descărcarea mai rapidă a fişierelor, reţeaua Wi-Fi şi cea mobilă vor fi utilizate împreună. Aceasta poate creşte utilizarea datelor mobile."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d selectate"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "A fost activată Comutarea inteligentă a reţelei. Această funcţie vă ajută să menţineţi o conexiune la internet stabilă, comutând între reţelele mobile şi Wi-Fi. Aceasta poate creşte utilizarea datelor."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Dezactivare..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "S-a selectat %s.\n\nDacă nu vă puteţi conecta la un PA, schimbaţi cartela SIM utilizată pentru verificare accesând managerul de cartele SIM. Apoi, selectaţi cartela SIM pe care doriţi să o utilizaţi pentru Datele mobile şi mesajele multimedia. De asemenea, puteţi să dezinstalaţi cartela SIM pe care nu doriţi să o utilizaţi."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Neacceptat"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Apăsaţi pe WPS pe punctul dvs. de acces Wi-Fi în interval de %d minute."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Deschidere"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nu a fost găsită o aplicaţie Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Reţeaua curentă va fi deconectată."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Afişaţi parola"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Pornit"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Oprit"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Ignorare reţea"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Comutare intelig. reţea"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Putere semnal"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Reducere ut. date mobile"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioritate viteză"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Asocierea reţelelor"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informaţii reţea Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Selectare metodă WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Adresă proxy"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Parolă"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Introduceţi parola."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Buton WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Căutare"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Dispozitive cu Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Găsire reţea ascunsă"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Reţele Wi-Fi disponibile"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Numai la încărcare"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Slabă"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Certif. utiliz."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Nespecificat"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Necunoscut"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Pentru a descărca mai rapid fişierele mari, utilizaţi împreună reţeaua Wi-Fi şi cea mobilă."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Mască subreţea"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "IP static"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sortare după"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Apăsaţi pentru conectare"
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Scanare..."
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Primiţi notificări atunci când sunt disponibile reţele"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Port proxy"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Nume"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Adresă MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Adresă IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identitate"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Adresă gateway"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Introducere identitate"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Metodă EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
msgstr "Conectare"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Revocare conexiune"
+msgid "IDS_WIFI_BODY_CONNECT"
+msgstr "Conectare"
+
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Salvat"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "S-a detectat o reţea Wi-Fi. Veţi fi conectat."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Setări complexe"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nu"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Despre Wi-Fi Direct"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Politica de securitate restricţionează utilizarea reţelei Wi-Fi."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct permite conectarea directă a dispozitivelor Wi-Fi, ceea ce face ca imprimarea, partajarea fişierelor, sincronizarea şi partajarea ecranului să fie mai simple şi mai convenabile. Conectând dispozitive care acceptă Wi-Fi Direct puteţi partaja conţinut, sincroniza date, socializa cu prietenii, juca jocuri, reda conţinut audio şi video şi multe altele, utilizând diferite aplicaţii"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Atingeţi aici pentru a vă conecta."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Dispozitivul se conectează la %1$s. Cu toate acestea, este posibil ca această reţea să nu ofere acces la internet.\nAtingeţi OK pentru a rămâne conectat la %1$s acum, dar şi pentru a nu permite funcţiei Comutare inteligentă a reţelei să se conecteze pe viitor la această reţea."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi şi PA mobil nu pot fi activate simultan. Dezactivaţi PA mobil?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Conect. la reţeaua Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internetul poate fi indispon."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Nu întreba din nou"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Deschidere setări Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nu au fost găsite dispozitive"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Da"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nu"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Anulare"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Redenumire dispozitiv"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Numele dispozitivului meu"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nereuşit"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Anulare"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Conectat"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Redenumire"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Atingeţi pentru a modifica setările"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Aţi introdus un caracter nevalid. Încercaţi din nou"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Neacceptat"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Disponibil"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Conexiune nereuşită"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Dispozitive cu Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Apăsaţi pentru conectare."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Revocare conexiune"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Dispozitive conectate"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Selectare toate"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Dispozitive ocupate"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Conectat la un alt dispozitiv"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Conectare"
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Se aşteaptă conexiunea"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
msgstr "Conectare nereuşită"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Mai multe conexiuni"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Deconectaţi-le pe toate"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Deconectare"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nu au fost găsite dispozitive"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Dezactivare Wi-Fi Direct după utilizare"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Dezact. Wi-Fi Direct după utilizare"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Dezactivare Wi-Fi Direct după utilizare pentru a economisi bateria"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Dezact. Wi-Fi Direct după util. pt. econ. baterie"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s solicită o conexiune Wi-Fi Direct. Permiteţi conexiunea?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Utilizarea Wi-Fi Direct va întrerupe conexiunea Wi-Fi curentă. Continuaţi?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Utilizarea Wi-Fi Direct va întrerupe furnizarea accesului la internet prin Wi-Fi. Continuaţi?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Conexiune Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Deconectare Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Revocaţi conexiunea Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Nu există dispozitive"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectare la alte dispozitive prin Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Nu s-a înregistrat nicio activitate timp de %d minute, de la activarea Wi-Fi Direct. Pentru a prelungi durata de viaţă a bateriei, Wi-Fi Direct a fost dezactivat."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Scan."
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Oprire"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "Dezactivare nereuşită"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "Activare nereuşită"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Conexiunea actuală va fi încheiată. Continuaţi?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Dispozitive disponibile"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Vă puteţi conecta la maximum %d dispozitive în acelaşi timp."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Dispozitive dispon."
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Conectarea la %s a eşuat."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Dispozitiv conectat la un alt dispozitiv"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Conectat la %s"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Codurile PIN nu se potrivesc."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Dezactivare..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Conexiunea curentă va fi deconectată, pentru ca scanarea să poată începe. Continuaţi?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Dispozitive care nu s-au conectat"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Introduceţi codul PIN pentru a vă conecta la %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Conectaţi-vă la %s peste %d secunde."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Cod PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Selectare dispozitive"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "S-a întrerupt conexiunea Wi-Fi Direct."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Conectare cu %s în %d secunde"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Redenumire dispozitiv"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Nu se poate stabili conexiunea"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Oprire conexiune"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Se permite"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Se activează..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Conectare"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Conectat"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Introduceţi numele dispozitivului"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Conectat cu %d dispozitive prin Wi-Fi Direct"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Neconectat"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Această conexiune Wi-Fi Direct va fi anulată."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Vă puteţi conecta la maximum %d dispozitive în acelaşi timp"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Pentru a economisi bateria, dezactivaţi Wi-Fi Direct după utilizare."
diff --git a/ug-wifidirect/po/ru_RU.po b/ug-wifidirect/po/ru_RU.po
index 64ae072..e0a65a8 100644..100755
--- a/ug-wifidirect/po/ru_RU.po
+++ b/ug-wifidirect/po/ru_RU.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Подключено"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Введите свой идентификатор."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Подключение..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Достигнуто максимальное число символов."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Выбрано: %d"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Включить"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Достигнуто максимальное число символов (%d)"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Не удалось получить IP-адрес."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Подключено к сети Wi-Fi %s"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Отключение..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Никогда"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Загружать через Wi-Fi и 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Загружать через Wi-Fi и 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN-код WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Забыть"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Отмена"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Да"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Подключено"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Неизвестная ошибка"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Автоматически переключаться между Wi-Fi и мобильными сетями для обеспечения стабильного подключения к Интернету."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-коды не совпадают."
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Произошла ошибка проверки подлинности"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Включение..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi и мобильные сети будут использоваться вместе, чтобы быстрее загружать файлы. При этом трафик может увеличиться."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "Выбрано: %d"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Смарт-переключатель сети включен. Эта функция обеспечивает стабильное подключение к Интернету путем переключения между мобильной сетью и сетью Wi-Fi. При этом трафик может увеличиться."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Выключение..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Выбрана %s.\n\nЕсли не удается подключиться к точке доступа, смените SIM-карту, используемую для проверки, открыв диспетчер SIM-карт. Выберите SIM-карту, которую нужно использовать для мобильных данных и MMS. Кроме того, можно отключить SIM-карту, которую вы не хотите использовать."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Не поддерживается"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Нажмите кнопку WPS на точке доступа Wi-Fi в течение %d мин."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Открытый"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Точка доступа Wi-Fi не найдена."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Текущая сеть будет отключена."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Показать пароль"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Включено"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Выключено"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Забыть сеть"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Переключатель сетей"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Уровень сигнала"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Снижать расход трафика"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Приоритет скорости"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Объединение сетей"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Сведения о сети Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Выбрать метод WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Адрес прокси"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Пароль"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Введите пароль."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Кнопка WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Поиск"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Устройства Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Найти скрытую сеть"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Доступны сети Wi-Fi."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Только во время зарядки"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Слабый"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Сертиф. пользов."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Не указано"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Неизвестно"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Чтобы быстрее загружать большие файлы, используйте одновременно Wi-Fi и мобильные сети."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Маска подсети"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Статический IP-адрес"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Сортировка"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Поиск..."
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Нажмите для подключения"
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Получать уведомления о доступности сетей."
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Порт прокси"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Имя"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-адрес"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-адрес"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Удостоверение"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Адрес шлюза"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Введите удостоверение."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Метод EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Подключение..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Подключиться"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Отменить подключение"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Соxранено"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Обнаружена сеть Wi-Fi. Вы будете подключены к ней"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Дополнительно"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Нет"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Сведения о Wi-Fi Direct"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Политика безопасности ограничивает использование Wi-Fi."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct позволяет устройствам Wi-Fi подключаться друг к другу напрямую, упрощая печать, синхронизацию, а также общий доступ к файлам и экрану. Подключение к устройствам, поддерживающим Wi-Fi Direct, позволяет обмениваться файлами, синхронизировать данные, общаться с друзьями, играть в игры, просматривать видео и делать многое другое с помощью различных приложений"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Нажмите здесь для подключения."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Ваше устройство подключается к %1$s. Возможно, эта сеть не обеспечивает доступ к Интернету.\nНажмите “ОК”, чтобы подключиться к %1$s сейчас, но предотвратить подключение к этой сети в будущем с помощью смарт-переключения сети."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Нельзя активировать одновременно Wi-Fi и Mobile AP. Отключить Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Войти в сеть Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Интернет может быть недоступен"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Больше не спрашивать"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Открыть параметры Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Устройства не найдены"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Да"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Нет"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Отмена"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Переименовать устройство"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Имя устройства"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Сбой."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Отмена"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Подключено"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Имена устройств позволяют различать доступные устройства в списке устройств поблизости, а также при подключении через Bluetooth, Wi-Fi Direct и другими способами."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Переименовать"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Нажмите, чтобы изменить параметры."
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Введен недопустимый символ. Повторите попытку"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Не поддерживается."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Доступно"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Сбой при подключении"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Устройства Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Нажмите для подключения."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Отменить подключение"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Подключенные устройства"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Выделить все"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Занятые устройства"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Подключено к другому устройству"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Подключение..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Ожидание подключения"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Сбой подключения"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Сбой подключения."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Множеств. подключение"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Отключить все"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Отключить"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Ни одного устройства не найдено"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Отключите WiFi Direct после использования"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Отключите WiFi Direct после использования"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Отключите WiFi Direct после использования для сбережения энергии"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Отключите WiFi Direct после использования для сбережения энергии"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s запрашивает подключение Wi-Fi Direct. Разрешить?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "При использовании Wi-Fi Direct функция Wi-Fi будет отключена. Продолжить?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "При использовании Wi-Fi Direct модем Wi-Fi будет отключен. Продолжить?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Подключение Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Отключить Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Отменить подключение Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Нет устройств"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Подключение к другим устройствам через Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "В течение %d мин. после подключения Wi-Fi Direct отсутствовала активность. Чтобы продлить время работы от батареи, функция Wi-Fi Direct была отключена."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Поиск"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Стоп"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Сбой выключения"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Сбой выключения."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Сбой активации"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Сбой активации."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Текущее подключение будет разорвано. Продолжить?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Можно одновременно подключить до %d устройств."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Доступные устройства"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Можно одновременно подключить до %d устройств"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Сбой подключения к %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Подключено к другому устройству."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Подключено к %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-коды не совпадают."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Выключение..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Подключение будет разорвано, чтобы начать поиск. Продолжить?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Устройства, которым не удалось подключиться"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Введите PIN-код для соединения с %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Подключение к устройству %s через %d сек."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-код: %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Выбрать устройства"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Подключение Wi-Fi Direct разорвано."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Подключение к %s через %d сек."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Переименовать устройство"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Не удалось подключиться"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Останов. подключ-е"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Разрешить"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Включение..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Подключиться"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Подключено."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Введите имя устройства"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Подключено к %d устройств. через Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Не подключено"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Это подключение к Wi-Fi Direct будет отменено."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Для экономии заряда аккумулятора отключите технологию Wi-Fi Direct после использования."
diff --git a/ug-wifidirect/po/si.po b/ug-wifidirect/po/si.po
new file mode 100644
index 0000000..e4493aa
--- /dev/null
+++ b/ug-wifidirect/po/si.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "උපාංග කිසිවක් හමු නොවිණි"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "මගේ උපාංගයේ නම"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "උපාංගයේ නම වෙනස් කරන්න"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "සමීපස්ථ උපාංග ලැයිස්තුව තුළින් සහ බ්ලූටූත්, Wi-Fi Direct හා වෙනත් ක්‍රම ඔස්සේ ලද හැකි එක් එක් උපාංගයේ නම හඳුනාගත හැකි වන පරිදි උපාංග නාම පෙන්වනු ලැබේ."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "උපරිම අක්ෂර ගණනට ලඟා විය."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "සම්. වෙමින්..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "අව. කර."
+
+msgid "IDS_BR_SK_YES"
+msgstr "ඔව්"
+
+msgid "IDS_BR_SK_NO"
+msgstr "නැත"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "හරි"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "අව. කර."
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "අසාර්ථකයි."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "සක්‍රිය ක."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d ක් තෝරා ඇත"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "සබැඳි"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "වැරදි අකුරු ඇතුල් කර තිබේ. නැවත උත්සාහ කරන්න."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "සැකසුම් වෙනස් කිරීමට තට්ටු කරන්න."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "අවලංගු කරන්න"
+
+msgid "IDS_BR_SK_OK"
+msgstr "හරි"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "සහාය නොදක්වයි."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "ආරක්‍ෂක ප්‍රතිපත්තිය Wi-Fi භාවිතය වලකයි."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "නැ. නම් ක."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "පවතින"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "සම්බන්ධතාව අසාර්ථකයි"
+
+msgid "IDS_COM_SK_NO"
+msgstr "නැත"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi ඩිරෙක්ට් උපාංග"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "සම්බන්ධවීමට තට්ටු කරන්න."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "සම්බන්ධතාවය අවලංගු කරන්න"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "සම්බන්ධිත උපාංග"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "සියල්ල තෝරන්න"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "කාර්යබහුල උපාංග"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "වෙනත් උපාංගයක් සමග සම්බන්ධ කළ"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "සම්බන්ධතාව පොරොත්තු."
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "සම්බන්ධ කිරීම අසාර්ථක විය."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "බහුවිධ-සම්බන්ධය"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "සියල්ල විසන්ධි කරන්න"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "විසන්ධි කරන්න"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "භාවිතයෙන් පසු Wi-Fi ඩිරෙක්ට් අක්‍රීය කරන්න"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "භාවිත. පසු Wi-Fi Direct අක්‍රිය ක."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "බැටරිය සුරැකීම සඳහා භාවිතයෙන් පසු Wi-Fi ඩිරෙක්ට් අක්‍රීය කරන්න"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "බැටරිය සුරැ. සඳහා භාවිතා කර අවසන් වූ විගස Wi-Fi Direct අක්‍රිය ක."
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s Wi-Fi ඩිරෙක්ට් සම්බන්ධතාවයක් ඉල්ලා සිටී. ඉඩ දෙන්නද?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi ඩිරෙක්ට් භාවිතා කිරීම මඟින් වත්මන් Wi-Fi සම්බන්ධතාවය විසන්ධි වනු ඇත. දිගටම කරගෙන යන්නද?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi ඩිරෙක්ට් භාවිතා කිරීම මඟින් වත්මන් Wi-Fi සම්බන්ධතාවය විසන්ධි වනු ඇත. දිගටම කරගෙන යන්නද?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct සම්බන්ධතාව"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi ඩිරෙක්ට් විසන්ධි කර."
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct සම්බන්ධතා අවලංගු කරන්නද?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi ඩිරෙක්ට් හරහා අනෙක් උපාංගවලට සම්බන්ධ කරන්න."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct අක්‍රිය කිරීමෙන් පසු විනාඩි %d ක සිට කිසිඳු ක්‍රියාකාරකමක් නොමැත. බැටරි ආයු කාලය වැඩි කරගැනීම සඳහා, Wi-Fi Direct අක්‍රිය කෙරිණ."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "පිරික්සන්න"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "නවත්."
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "අක්‍රිය කිරීම අසාර්ථක විය."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "සක්‍රිය කිරීම අසමත් විය."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "පවත්නා ජාලය විසන්ධි වනු ඇත. පවත්වාගෙන යන්නද?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "එකම අවස්ථාවක ඔබට %d දක්වා උපාංග සම්බන්ධ කළ හැකිය."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "පවතින උපාංග"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s වෙත සම්බන්ධ වීමට නොහැකි විය."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "උපාංගය වෙනත් උපාංගයකට සම්බන්ධ කෙරිණි."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s වෙත සම්බන්ධ විය."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN අංක නොගැලපේ."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "අක්‍රීය කරමින් පවතී..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "වත්මන් සම්බන්ධතාවය විසන්ධි වී පිරික්සීම ඇරඹෙනු ඇත. ඉදිරියට යන්නද?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "සම්බන්ධ වීමට අසමත් වූ උපාංග"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s වෙත සම්බන්ධ වීම සඳහා පින් අංකය ඇතුලත් කරන්න."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%s වෙත තත්පර %d කින් සම්බන්ධ වන්න."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "උපාංග තෝරන්න"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "ඍජු Wi-Fi Direct විසන්ධි වී ඇත."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s සමග තත්පර %d කින් සම්බ. ව."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "උපාංගයේ නම වෙනස් කරන්න"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "සබැඳීමට නොහැක"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "සම්බන්ධතාව නවතන්න"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "ඉඩ දෙන්න"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "සක්‍රිය වෙමින්..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "සම්බ. කර."
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "සම්බන්ධ විය."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "උපාංග නම ඇතුළු කරන්න"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct හරහා උපාංග %d සමග සම්බන්ධ කෙරිණි."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "සබැඳී නැත"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "මෙම Wi-Fi Direct සබැඳුම අවලංගු කෙරෙනු ඇත."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "බැටරි බලය ඉතිරි කර ගැනීමට, Wi-Fi Direct භාවිතා කළ පසු එය අක්‍රීය කරන්න."
+
diff --git a/ug-wifidirect/po/sk.po b/ug-wifidirect/po/sk.po
index 39ec7b9..e93109b 100644..100755
--- a/ug-wifidirect/po/sk.po
+++ b/ug-wifidirect/po/sk.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Pripojené"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Zadajte váš identifikátor."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Pripájanie..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Bol dosiahnutý maximálny počet znakov."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Vybraté: %d"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Povoliť"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Dosiahol sa maximálny počet znakov (%d)."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Nepodarilo sa získať adresu IP."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Pripojené k sieti Wi-Fi %s."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Odpájanie..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nikdy"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Sťahovať údaje cez Wi-Fi a 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Sťahovať údaje cez Wi-Fi a 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Zabudnúť"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Zrušiť"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Pripojené"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Neznáma chyba"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automaticky prepína medzi sieťami Wi-Fi a mobilnými sieťami na zachovanie stabilného internetového pripojenia."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN kódy sa nezhodujú!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Vyskytla sa chyba overenia"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktivácia..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Siete Wi-Fi a mobilné siete sa budú používať spoločne na rýchlejšie sťahovanie súborov. To môže zvyšovať prenos dát cez mobilné dátové siete."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "Vybraté: %d"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Inteligentné prepínanie sietí sa zaplo. Táto funkcia pomáha udržiavať stabilné internetové pripojenie prostredníctvom prepínania medzi mobilnými sieťami a sieťami Wi-Fi. To môže zvyšovať prenos dát."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deaktivácia..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Vybraté: %s.\n\nAk sa nemôžete pripojiť k prístupovému bodu, prostredníctvom aplikácie Správca kariet SIM zmeňte kartu SIM používanú na overenie. Potom vyberte kartu SIM, ktorú chcete používať pre mobilné dátové pripojenie a multimediálne správy. Prípadne môžete odpojiť kartu SIM, ktorú nechcete používať."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nepodporované"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Do %d minút stlačte tlačidlo WPS na prístupovom bode Wi-Fi."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Otvoriť"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nepodarilo sa nájsť žiadny prístupový bod Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Aktuálna sieť sa odpojí."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Zobraziť heslo"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Zap."
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Vyp."
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Zabudnúť sieť"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Intelig. prepínanie sietí"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Intenzita signálu"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Znížiť využív. mob. dát."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Uprednostniť rýchlosť"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Spojenie sietí"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informácie o sieti Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Vyberte metódu WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Adresa proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Heslo"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Zadajte heslo."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Tlačid. WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Vyhľadať"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Zariadenia Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Hľadať skrytú sieť"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Siete Wi-Fi sú k dispozícii."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Iba počas nabíjania"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Slabá"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Použ. certifikát"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Nešpecifik."
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Neznáme"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Ak chcete rýchlejšie sťahovať veľké súbory, používajte spolu siete Wi-Fi a mobilné siete."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Maska podsiete"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Pevná adresa IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Usporiadať podľa"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Hľadanie..."
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Ťuknite na pripojenie"
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Prijímanie oznámení, keď sú k dispozícii siete"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Port proxy servera"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Meno"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Adresa MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "Adresa IP"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identita"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Adresa brány"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Zadajte identitu."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Metóda EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Pripájanie..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Pripojiť"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Zrušiť pripojenie"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Uložené"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Zistila sa sieť Wi-Fi. Pripojíte sa."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Pokročilé nastavenia"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nie"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Inform. o Wi-Fi Direct"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Politika zabezpečenia obmedzuje použitie pripojenia Wi-Fi."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct umožňuje zariadeniam siete Wi-Fi pripájať sa priamo, čo umožňuje oveľa jednoduchšie a pohodlnejšie tlačiť, zdieľať súbory, synchronizovať a zdieľať obrazovku. Pripojenie k zariadeniam, ktoré podporujú technológiu Wi-Fi Direct, umožňuje zdieľať obsah, synchronizovať údaje, komunikovať s priateľmi, hrať hry, prehrávať zvuky, videá a ďalší obsah použitím rozličných aplikácií"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Ťuknutím sem vykonáte pripojenie."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Vaše zariadenie sa pripája k sieti %1$s. Táto sieť však nemusí poskytovať prístup na internet.\nŤuknutím na tlačidlo OK sa teraz zachová pripojenie k sieti %1$s, v budúcnosti sa však zabráni funkcii Inteligentné prepínanie sietí v pripojení k tejto sieti."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi a mobilný prístupový bod sa nedajú aktivovať súčasne. Deaktivovať mobilný prístupový bod?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prihl. sa k sieti Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet nemusí byť dostupný"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Už sa nepýtať"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otvoriť nastavenia siete Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nenašli sa žiadne zariadenia"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Áno"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nie"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Zrušiť"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Premenovať zariadenie"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Názov môjho zariadenia"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nepodarilo sa."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Zrušiť"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Pripojené"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Premenovať"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Ťuknutím môžete zmeniť nastavenia"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Zadali ste neplatný znak. Skúste to znova"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodporované."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "K dispozícii"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Pripojenie zlyhalo"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Zariadenia Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Ťuknite na pripojenie."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Zrušiť pripojenie"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Pripojené zariadenia"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Vybrať všetky"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Zaneprázdnené zariadenia"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Pripojené k inému zariadeniu"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Pripájanie..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Čaká sa na pripojenie"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Nepodarilo sa pripojiť"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Nepodarilo sa pripojiť."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Viacnásobné pripojenie"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Odpojiť všetky"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Odpojiť"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nenašli sa žiadne zariadenia"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Vypnúť Wi-Fi Direct po použití"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Vypnúť Wi-Fi Direct po použití"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Vypnúť Wi-Fi Direct po použití z dôvodu šetrenia batérie"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Vypnúť Wi-Fi Direct po použití na šetrenie batérie"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s žiada o pripojenie Wi-Fi Direct. Povoliť?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Použitím pripojenia Wi-Fi Direct sa odpojí aktuálne pripojenie Wi-Fi. Pokračovať?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Použitím pripojenia Wi-Fi Direct sa odpojí aktuálne zdieľanie pripojenia Wi-Fi. Pokračovať?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Pripojenie Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Odpojiť Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Zrušiť pripojenie Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Žiadne zariadenia"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Pripojiť k iným zariadeniam cez Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Od zapnutia spojenia Wi-Fi Direct nedošlo po dobu %d minút k žiadnej aktivite. Z dôvodu predĺženia výdrže batérie sa spojenie Wi-Fi Direct vyplo."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Prehľa-dať"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stop"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deaktivácia zlyhala"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deaktivácia zlyhala."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktivácia sa nepodarila"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktivácia sa nepodarila."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Aktuálne pripojenie bude odpojené. Pokračovať?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Naraz môžete pripojiť max. %d zariadení."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Dostupné zariadenia"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Naraz môžete pripojiť max. %d zariadení"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Nepodarilo sa pripojiť k %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Zariadenie je pripojené k inému zariadeniu."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Pripojené k %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Kódy PIN sa nezhodujú."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deaktivácia..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Aktuálne pripojenie sa odpojí, aby sa mohlo spustiť vyhľadávanie. Pokračovať?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Zariadenia, ktorým sa nepodarilo pripojiť"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Zadajte kód PIN na pripojenie k %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Pripojiť k zariadeniu %s v priebehu %d sekúnd"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Kód PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Vybrať zariadenia"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Pripojenie Wi-Fi Direct sa prerušilo."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Pripojiť k %s v priebehu %d s"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Premenovať zariadenie"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Nedá sa pripojiť"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Zastav. pripojenie"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Povoliť"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktivácia..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Pripojiť"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Pripojené."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Zadajte názov zariadenia"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Pripojené k %d zariadeniam cez Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Nepripojené"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Toto pripojenie Wi-Fi Direct sa zruší."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wi-Fi Direct po použití vypnite, aby sa šetrila energia batérie."
diff --git a/ug-wifidirect/po/sl.po b/ug-wifidirect/po/sl.po
index 17a8fc6..0769849 100644..100755
--- a/ug-wifidirect/po/sl.po
+++ b/ug-wifidirect/po/sl.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Povezano"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Vnesite svoj ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Povezujem..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Doseženo je največje dovoljeno število znakov."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d izbranih"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Omogoči"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Doseženo je največje dovoljeno število znakov %d."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Naslova IP ni uspelo pridobiti."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Povezava z omrežjem Wi-Fi %s vzpostavljena."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Prekinjam"
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nikoli"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Prenos podat. prek Wi-Fi in 4G"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Prenos podat. prek Wi-Fi in 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "Koda PIN za WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Pozabi"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Prekliči"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "V redu"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Povezano"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Neznana napaka"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Samodejni preklop med omrežjem Wi-Fi in mobilnim omrežjem za ohranitev stabilne internetne povezave."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "Kodi PIN se ne ujemata!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Prišlo je do napake pri preverjanju pristnosti"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Vključujem..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Zaradi hitrejšega prenosa datotek bosta omrežje Wi-Fi in mobilno omrežje uporabljena hkrati. To lahko poveča porabo mobilnih podatkov."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d izbranih"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Funkcija Preklop pametnega omrežja je omogočena. Ta funkcija samodejno preklaplja med mobilnim omrežjem in omrežjem Wi-Fi ter tako pomaga ohraniti stabilno internetno povezavo. To lahko poveča porabo podatkov."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Izključujem..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Izbrana je kartica %s.\n\nČe se ne uspete povezati z dostopno točko, v upravitelju kartic SIM spremenite kartico SIM, ki jo uporabljate za potrditev. Nato izberite kartico SIM, ki jo želite uporabljati za funkcijo Prenos podatkov prek mobilnega omrežja in za večpredstavnostna sporočila. Lahko pa tudi odstranite kartico SIM, ki je ne želite uporabljati."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nepodprto"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Pritisnite WPS na dostopni točki Wi-Fi v %d minutah."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Odprto omrežje"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ne najdem dostopne točke Wi-Fi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Povezava s trenutnim omrežjem bo prekinjena."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Pokaži geslo"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Vključeno"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Izključeno"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Pozabi omrežje"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Preklop pametnega omrežja"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Moč signala"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Manjša poraba mob. podat."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prednost ima hitrost"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Povezovanje omrežij"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Podatki o omrežju Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Izberite način WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Naslov strežnika proxy"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Geslo"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Vnesite geslo."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Gumb WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Preišči"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Naprave Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Poišči skrito omrežje"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Na voljo so omrežja Wi-Fi."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Samo med polnjenjem"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Šibko"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Uporab.certifikat"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Ni določeno"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Neznano"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Za hitrejši prenos večjih datotek uporabite omrežje Wi-Fi in mobilno omrežje hkrati."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Maska podomrežja"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statični IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Uredi po"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Pregledujem..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Prejemanje obvestil, ko so omrežja na voljo"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Pritisnite za povezavo"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Vrata strežnika proxy"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Ime"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "Naslov MAC"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP naslov"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identiteta"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Naslov prehoda"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Vnesite identiteto."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Način EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Povezujem..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Poveži"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Preklic povezave"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Shranjeno"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Zaznano je omrežje Wi-Fi. Povezava bo vzpostavljena."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Napredne nastavitve"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Varnostni pravilnik omejuje uporabo omrežja Wi-Fi."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "O Wi-Fi Direct"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pritisnite tukaj za povezavo."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct napravam Wi-Fi olajša neposredno povezovanje, tiskanje, skupno rabo datotek, sinhronizacijo in skupno rabo zaslona. Povezava z napravami, ki podpirajo Wi-Fi Direct, z uporabo različnih programov omogoča skupno rabo vsebine, sinhronizacijo podatkov, druženje s prijatelji v družabnih omrežjih, igranje iger, predvajanje zvočnih in video vsebin ter še veliko več."
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Naprava se povezuje z dostopno točko %1$s. To omrežje morda ne omogoča dostopa do interneta.\nPritisnite V redu, da ohranite povezavo z %1$s, vendar hkrati funkciji Preklop pametnega omrežja preprečite, da se v prihodnje poveže s tem omrežjem."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi in mobilna DT ne moreta biti vklopljeni hkrati. Izklopim mobilno DT?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prijava v omrežje Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet morda ne bo na voljo"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne vprašaj znova"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Odpri nastavitve za Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nobena naprava ni najdena"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Da"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Prekliči"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Preimenujte napravo"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Ime moje naprave"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Ni uspelo."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Prekliči"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Povezano"
+
+msgid "IDS_BR_SK_OK"
+msgstr "V redu"
+
+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_SK_RENAME"
+msgstr "Preimenuj"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Pritisnite za spreminjanje nastavitev"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Vnesli ste neveljaven znak. Poskusite znova"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodprto."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Na voljo"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Povezava ni uspela"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Naprave Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Pritisnite za povezavo."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Preklic povezave"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Povezane naprave"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Izberi vse"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Zasedene naprave"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Povezano z drugo napravo"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Povezujem..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Čakanje na povezavo"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Povezava ni uspela"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Povezava ni uspela."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Več povezav"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Prekini vse"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Prekini"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Ni najdenih naprav"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Po uporabi onemogoči Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Po uporabi onemogoči Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Po uporabi onemogoči Wi-Fi Direct, da se prihrani baterija"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Po up. onem. Wi-Fi Direct, da se prihrani baterija"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s zahteva povezavo Wi-Fi Direct. Dovolite?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Uporaba storitve Wi-Fi Direct bo prekinila trenutno povezavo Wi-Fi. Želite nadaljevati?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Uporaba storitve Wi-Fi Direct bo prekinila trenutno privezovanje prek Wi-Fi. Želite nadaljevati?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Povezava Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Izklopi Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Želite preklicati povezavo Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Ni naprav"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Poveži se z drugimi napravami prek Wi-Fi Direct."
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Naprava ni dejavna že %d min od vklopa Wi-Fi Direct. Življenjsko dobo baterije lahko podaljšate, če onemogočite Wi-Fi Direct."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Preišči"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "Ustavi"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Izklop ni uspel"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Izklop ni uspel."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Vklop ni uspel"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Vklop ni uspel."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Trenutna povezava bo prekinjena. Nadaljujem?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Razpoložljive naprave"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Hkrati lahko povežete do %d naprav."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Razpoložlj. naprave"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Ni mogoče povezati z %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Naprava je povezana z drugo napravo."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Povezava vzpostavljena z omrežjem %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Kodi PIN se ne ujemata."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Izključujem..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Trenutna povezava bo prekinjena, da se bo iskanje lahko začelo. Želite nadaljevati?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Naprave, ki se jim ni uspelo povezati"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Vnesite kodo PIN za povezavo z %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Vzpostavitev povezave z napravo %s čez %d s."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Koda PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Izberite naprave"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Povezava Wi-Fi Direct je izgubljena."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Poveži se z %s čez %d sekund."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Preimenujte napravo"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Ni mogoče povezati"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Prekini povezavo"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Dovoli"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Vključujem..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Poveži"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Povezano."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Vnesite ime naprave"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Povezano z %d drugimi napravami prek Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Ni povezano"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Ta povezava Wi-Fi Direct bo preklicana."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Hkrati lahko povežete do %d naprav"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Če želite prihraniti energijo baterije, onemogočite Wi-Fi Direct po uporabi."
diff --git a/ug-wifidirect/po/sr.po b/ug-wifidirect/po/sr.po
index eb77249..832dd13 100644..100755
--- a/ug-wifidirect/po/sr.po
+++ b/ug-wifidirect/po/sr.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Povezan"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Unesi svoj ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Povezivanje..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Dostignut maksimalan broj karaktera."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Prekidanje veze..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Izabrano: %d"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Povezan"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Omogući"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Nepoznata greška"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-ovi se ne slažu!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Dostignut je maksimalan broj od %d karaktera."
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktiviranje..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Neuspešno dobijanje IP adrese."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "Izabran je %d"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Povezan na Wi-Fi mrežu %s."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deaktivacija..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Nikad"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Nepodržano"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Pr. pod. put. Wi-Fi i 4G mreže"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Pr. pod. put. Wi-Fi i 3G mreže"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Zaboravi"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Otkaži"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Veza je uspostavljena"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Automatski prelazi sa Wi-Fi mreže na mobilne mreže radi održavanja stabilne Internet veze."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Došlo je do greške u autentikaciji"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi i mobilne mreže će se istovremeno koristiti radi bržeg preuzimanja fajlova. Ovo može da poveća upotrebu podataka mobilnog telefona."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Pametna promena mreže je omogućena. Ova funkcija pomaže održavanje stabilne Internet veze prelaskom sa mobilne mreže na Wi-Fi mrežu. To može da poveća upotrebu podataka."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s kartica je izabrana.\n\nAko ne možeš da uspostaviš vezu sa pristupnom tačkom, promeni SIM karticu koju koristiš za potvrdu tako što ćeš otići na Menadžer SIM kartice. Zatim izaberi SIM karticu koju želiš da koristiš za Mobilne podatke i multimedijalne poruke. Alternativno, možeš da isključiš SIM karticu koju ne želiš da koristiš."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Pritisni WPS dugme na Wi-Fi pristupnoj tački u roku od %d minuta."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Otvorena"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nema Wi-Fi pristupne tačke."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Trenutna mreža će biti isključena."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Prikaži lozinku"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Uključeno"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Isključeno"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Zaboravi mrežu"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Pametna promena mreže"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Jačina signala"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Smanji up. pod. mob. tel."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Daj prioritet brzini"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Osiguravanje mreže"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Informacije o Wi-Fi mreži"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Izaberi WPS metodu"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Adresa proksija"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Lozinka"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Unesi šifru."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS dugme"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Skeniraj"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct uređaji"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Nađi skrivenu mrežu"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Dostupne su Wi-Fi mreže."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Samo tokom punjenja"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Slabo"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Korisnički sert."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Neodređeno"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Nepoznato"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Radi bržeg preuzimanja većih fajlova, istovremeno koristi Wi-Fi i mobilne mreže."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Maska podmreže"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statička IP adresa"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sortiraj po"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Skeniranje..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Primi obaveštenja o dostupnosti mreža"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Port proksija"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Kucni za povezivanje"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Ime"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC adresa"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP adresa"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identitet"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Adresa mrežnog prolaza"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Unesi identitet."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP način"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Povezivanje..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Poveži se"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Otkaži povezivanje"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Sačuvano"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Detektovana je Wi-Fi mreža. Bićeš povezan/a."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Napredna podešavanja"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Politika bezbednosti ograničava upotrebu Wi-Fija."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Kucni ovde za povezivanje."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "O Wi-Fi Direct-u"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Uređaj se povezuje na %1$s. Međutim, ova mreža možda ne obezbeđuje pristup Internetu.\nKucni na OK da bi se sada zadržala veza sa %1$s, ali takođe spreči da se Pametna promena mreže više ne povezuje na ovu mrežu u buduće."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct omogućava direktno povezivanje Wi-Fi uređaja čime štampanje, deljenje fajlova, sinhronizacija i deljenje ekrana postaje jednostavnije i prihvatljivije. Povezivanje na uređaje koji podržavaju Wi-Fi Direct omogućava deljenje sadržaja, sinhronizovanje podataka, druženje sa prijateljima, igranje igara, audio, video i još mnogo toga, koristeći različite aplikacije"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi i mobilna pristupna tačka se ne mogu uključiti istovremeno. Isključi mobilnu pristupnu tačku?"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prijavi se na Wi-Fi mrežu"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet možda nije dostupan"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne pitaj ponovo"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otvori Wi-Fi podešavanja"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Nema uređaja"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Da"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ne"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Otkaži"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Preimenuj uređaj"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Naziv mog uređaja"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Neuspešno."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Otkaži"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Povezan"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Preimenuj"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Kucni za promenu podešavanja"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Unet je neispravan karakter. Pokušaj ponovo"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodržano."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Dostupno"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Poveziv. nije uspelo"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct uređaji"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Kucni za povezivanje."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Otkaži povezivanje"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Povezani uređaji"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Izaberi sve"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Zauzeti uređaji"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Povezan sa drugim uređajem"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Povezivanje..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Čekanje na povezivanje"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Neuspešno povezivanje"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Neuspešno povezivanje."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Višestruko povezivanje"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Otkači sve"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Prekini vezu"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Nema uređaja"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Onemogući Wi-Fi Direct nakon korišćenja"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Onemog. Wi-Fi Direct nakon korišć."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Onemogući Wi-Fi Direct nakon korišćenja radi štednje baterije"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Onem. Wi-Fi Direct nakon korišć. radi štednje bat."
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s zahteva povezivanje na Wi-Fi Direct. Dozvoliti?"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Korišćenje Wi-Fi Direct-a će prekinuti aktuelnu Wi-Fi vezu. Nastaviti?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Korišćenje Wi-Fi Direct-a će prekinuti aktuelno Wi-Fi vezivanje. Nastaviti?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct veza"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Isključi Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Prekinuti Wi-Fi Direct vezu?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Nema uređaja"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Poveži se sa drugim uređajima preko Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Nije bilo nikakvih aktivnosti %d minuta otkako je omogućen Wi-Fi Direct. Da bi se produžilo trajanje baterije, Wi-Fi Direct je onemogućen."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Skeniraj"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stop"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Deaktivacija neuspešna"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Deaktivacija neuspešna."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Uključivanje neuspešno"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Uključivanje neuspešno."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Trenutna veza će biti prekinuta. Nastavak?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Možeš da povežeš do %d uređaja istovremeno."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Dostupni uređaji"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Možeš da povežeš do %d uređaja istovremeno"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Neuspešno povezivanje na %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Uređaj je povezan na drugi uređaj."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Povezano sa %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-ovi se ne slažu."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deaktivacija..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Trenutna veza će biti prekinuta da bi se pokrenulo skeniranje. Nastaviti?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Uređaji čije povezivanje nije uspelo"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Unesi PIN radi povezivanja na %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Poveži se na %s za %d sekundi."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN kod %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Izaberi uređaje"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct veza je izgubljena."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Poveži na %s za %d sek."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Preimenuj uređaj"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN kod"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Povezivanje nemoguće"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Prekini vezu"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Dozvoli"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktiviranje..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Poveži se"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Povezan."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Unesi naziv uređaja"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Povezano sa %d druga(ih) uređaja preko Wi-Fi Direct-a."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Nije povezan"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Ova Wi-Fi Direct veza će biti otkazana."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Za uštedu napajanja baterije onemogući Wi-Fi Direct nakon korišćenja."
diff --git a/ug-wifidirect/po/sv.po b/ug-wifidirect/po/sv.po
index 0c412c7..d404ca8 100644..100755
--- a/ug-wifidirect/po/sv.po
+++ b/ug-wifidirect/po/sv.po
@@ -1,114 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Ansluten"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Ange ditt ID."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Ansluter..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximalt antal tecken har använts."
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d valda"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Aktivera"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Högsta antal tecken %d har uppnåtts."
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Det gick inte att hämta IP-adress."
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Ansluten till Wi-Fi-nätverket %s."
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Aldrig"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Kopplar från..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Hämta data via Wi-Fi och 4G"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Hämta data via Wi-Fi och 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Glöm"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Avbryt"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "Ansluten"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Okänt fel"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Växla automatiskt mellan Wi-Fi-nätverk och mobilnät för att upprätthålla en stabil internetanslutning."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-koder matchar inte!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Ett autentiseringsfel inträffade"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Aktiverar..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi-nätverk och mobilnät används tillsammans för att hämta filer snabbare. Det kan öka mobildataanvändningen."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d markerade"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Smart nätverksbyte har aktiverats. Denna funktion hjälper dig att upprätthålla en stabil internetanslutning genom att växla mellan mobilnät och Wi-Fi-nätverk. Detta kan höja din förbrukning av data."
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Deaktiverar..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s har valts.\n\nOm du inte kan ansluta till en åtkomstpunkt byter du SIM-kort för verifiering genom att gå till SIM-kortshanteraren. Välj sedan SIM-kortet som du vill använda för mobildata och MMS. Alternativt kan du ta ur SIM-kortet som du inte vill använda."
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Kan ej användas"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Tryck på WPS på Wi-Fi-åtkomstpunkten inom %d minuter."
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Öppen"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Det finns ingen Wi-Fi-åtkomstpunkt."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Aktuellt nätverk kopplas från."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Visa lösenord"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "På"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Av"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Glöm nätverk"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Smart nätverksbyte"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signalstyrka"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Minska mobildataanvändn."
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Prioritera hastighet"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Nätverksbindning"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Information om Wi-Fi-nätverk"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Välj WPS-metod"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy-adress"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Lösenord"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Ange lösenord."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS-knapp"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Skanna"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct-enheter"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Hitta dolt nätverk"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Tillgängliga Wi-Fi-nätverk."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Endast vid laddning"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Svag"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Användarcert."
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Ospecificerad"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Okänd"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Hämta större filer snabbare genom att använda Wi-Fi-nätverk och mobilnät tillsammans."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Nätmask"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statisk IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sortera efter"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Skannar..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Ta emot meddelanden när nätverk är tillgängliga."
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxyport"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Tryck för att ansluta"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Namn"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-adress"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-adress"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identitet"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Gateway-adress"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Ange identitet."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP-metod"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Ansluter..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Anslut"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Avbryt anslutning"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Sparad"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Ett Wi-Fi-nätverk har identifierats. Du kommer att anslutas."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Avancerade inställningar"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nej"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Säkerhetspolicy begränsar användningen av Wi-Fi."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tryck här för att ansluta."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Om Wi-Fi Direct"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Enheten ansluter till %1$s. Detta nätverk erbjuder eventuellt inte åtkomst till internet.\nTryck på OK om du vill förbli ansluten till %1$s, men förhindra även Smart nätverksbyte från att ansluta till detta nätverk i framtiden."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Med Wi-Fi Direct kan Wi-Fi-enheter ansluta direkt, blir det enklare och bekvämare att skriva ut, dela filer, synkronisera och dela skärm. Anslutningar till enheter som stödjer Wi-Fi Direct gör det möjligt att dela innehåll, synkronisera data, interagera med vänner, spela spel, lyssna på ljud och visa video m.m. med en rad olika program"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Det går inte att aktivera både Wi-Fi och Mobile AP samtidigt. Avaktivera Mobile AP?"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Logga in på Wi-Fi-nätv."
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet är ev. inte tillg."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Fråga inte igen"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Öppna Wi-Fi-inställningar"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Inga enheter hittades"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ja"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Nej"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Avbryt"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Byt namn på enhet"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Namn för min enhet"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Misslyckades."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Avbryt"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Ansluten"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Byt namn"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Tryck för att ändra inställningarna."
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Ogiltigt tecken har angivits. Försök igen."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Kan ej användas."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Tillgänglig"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Anslutning misslyck."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct-enheter"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Tryck för att ansluta."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Avbryt anslutning"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Anslutna enheter"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Välj alla"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Upptagna enheter"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Ansluten med en annan enhet"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Ansluter..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Väntar på anslutning"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Det gick inte att ansluta"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Det gick inte att ansluta."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Multianslutning"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Koppla från alla"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Koppla från"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Inga enheter hittades"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Inaktivera Wi-Fi Direct efter användning"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Inaktivera Wi-Fi Direct efter anv."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Inaktivera Wi-Fi Direct efter användning för att spara batteri"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Inakt. Wi-Fi Direct efter anv. och spara batteri"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s begär en Wi-Fi Direct-anslutning. Tillåt?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "När Wi-Fi Direct används kopplas den aktuella Wi-Fi-anslutningen bort. Vill du fortsätta?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "När Wi-Fi Direct används kopplas den aktuella Wi-Fi-internetdelningen bort. Vill du fortsätta?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct-anslutning"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Koppla från Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Vill du avbryta Wi-Fi Direct-anslutningen?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Inga enheter"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Anslut till andra enheter via Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Ingen aktivitet har förekommit på %d minuter sedan Wi-Fi Direct aktiverades. För att förlänga batteritiden har Wi-Fi Direct inaktiverats."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Sök"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Stopp"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Avaktiveringen misslyckades"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Avaktiveringen misslyckades."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Aktiveringsfel"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Aktiveringsfel."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Aktuell anslutning bryts. Fortsätta?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Du kan ansluta upp till %d enheter samtidigt."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Tillängliga enheter"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Du kan ansluta upp till %d enheter samtidigt"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Det gick inte att ansluta till %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Enheten är ansluten till en annan enhet."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Ansluten till %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-koder matchar inte."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Deaktiverar..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Den aktuella anslutningen kopplas bort så att sökningen kan starta. Fortsätt?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Enheter som inte kunde ansluta"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Ange PIN för att ansluta till %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Anslut till %s om %d sekunder."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-kod %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Välj enheter"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct-anslutningen bröts."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Anslut till %s om %d s."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Byt namn på enhet"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Det går inte att ansluta"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Stoppa anslutning"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Tillåt"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Aktiverar..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Anslut"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Ansluten."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Ange enhetsnamn"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Ansluten till %d enheter via Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Inte ansluten"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Denna Wi-Fi Direct-anslutning kommer att avbrytas."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Om du vill spara ström inaktiverar du Wi-Fi Direct efter användning."
diff --git a/ug-wifidirect/po/ta.po b/ug-wifidirect/po/ta.po
new file mode 100644
index 0000000..761cd21
--- /dev/null
+++ b/ug-wifidirect/po/ta.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "சாதனங்கள் எதுவும் கண்டறியப்படவில்லை"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "எனது சாதனப் பெயர்"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "சாதனம் மறுபெயரிடுக"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "அருகிலுள்ள சாதனங்களில் கிடைக்கின்ற மற்றும் ப்ளூடூத், Wi-Fi Direct மற்றும் பிற முறைகள் வழியாக சாதனங்கள் ஒவ்வொன்றையும் வேறுபடுத்துவதற்கு சாதனப் பெயர்கள் காட்டப்படுகின்றன."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "அதிகபட்ச எழுத்துக்களின் எண்ணிக்கையை அடைந்தது."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "இணைகிறது…"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "ரத்து"
+
+msgid "IDS_BR_SK_YES"
+msgstr "ஆம்"
+
+msgid "IDS_BR_SK_NO"
+msgstr "இல்லை"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "சரி"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "ரத்து"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "தோல்வியுற்றது."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "செயல்படுத்துக"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d தேர்வாகியுள்ளன"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "இணைக்கபட்டது"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "தவறான எழுத்து உள்ளிடப்பட்டது. மீண்டும் முயலுக."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "அமைவுகளை மாற்ற டேப் செய்க."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "ரத்து"
+
+msgid "IDS_BR_SK_OK"
+msgstr "சரி"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "ஆதரிக்கவில்லை."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Wi-Fi பயன்படுத்துவதை பாதுகாப்பு கொள்கை தடைசெய்கிறது."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "மறுபெயர்"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "கிடைக்கக்கூடிய"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "இணைப்பு தோல்வி"
+
+msgid "IDS_COM_SK_NO"
+msgstr "இல்லை"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct சாதனங்கள்"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "இணைப்பதற்கு டேப் செய்க."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "இணைப்பை ரத்துசெய்க"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "இணைக்கப்பட்ட சாதனங்கள்"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "எல்லாம் தேர்வு"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "பிஸியாக உள்ள சாதனங்கள்"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "மற்றொரு சாதனத்துடன் இணைக்கப்பட்டது"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "இணைப்புக்காக காத்திருக்கிறது"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "இணைப்பு தோல்வி."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "பல-இணைப்பு"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "அனைத்தையும் துண்டிக்கவும்"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "துண்டி"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "பயன்பாட்டிற்கு பிறகு Wi-Fi Direct செயல்நீக்கவும்"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "உபயோகம். பிறகு Wi-Fi Direct செயல்நீக்கு"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "மின்கலம் சேமிக்க பயன்பாட்டிற்கு பிறகு Wi-Fi Direct செயல்நீக்கவும்"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "மின்கலம் சேமிக்கவென உபயோகத்திற்கு பிறகு Wi-Fi Direct செயல்நீக்கவும்"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s Wi-Fi Direct இணைப்பைக் கோருகிறது. அனுமதிக்கவா?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct பயன்படுத்துவது நடப்பு Wi-Fi இணைப்பைத் துண்டிக்கும். தொடரவா?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct பயன்படுத்துவது நடப்பு Wi-Fi இணைப்பைத் துண்டிக்கும். தொடரவா?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct இணைப்பு"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct துண்டி."
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct இணைப்பை ரத்துசெய்யவா?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct வழியே மற்ற சாதனங்களுடன் இணைக்கவும்."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct செயல்படுத்தப்பட்டிருப்பதில் இருந்து %d நிமிடங்களுக்கு செயல்பாடுகள் எதுவுமில்லை. மின்கல ஆயுளை நீட்டிக்க Wi-Fi Direct செயல்நீக்கப்பட்டது."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "ஸ்கேன்"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "நிறுத்துக"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "செயல்நீக்குதல் தோல்வி."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "செயல்படுத்துவதில் தோல்வி."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "தற்போதைய இணைப்பு துண்டிக்கப்படும். தொடரவா?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "ஒரே நேரத்தில் %d சாதனங்கள் வரை நீங்கள் இணைக்கலாம்."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "கிடைக்கும் சாதனங்கள்"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s உடன் இணைத்தல் தோல்வி."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "சாதனம் மற்றொரு சாதனத்துடன் இணைக்கப்பட்டது."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s உடன் இணைக்கப்பட்டது."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINs பொருந்தவில்லை."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "செயலிழக்கிறது..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "ஸ்கேனிங் துவங்கும் விதத்தில் தற்போதைய இணைப்பு துண்டிக்கப்படும். தொடரவா?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "இணைப்பதில் தோல்வியுற்ற சாதனங்கள்"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s உடன் இணைக்க PIN உள்ளிடுக."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d நொடிகளில் %s என்பதில் இணைக்கவும்."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "சாதனங்களை தேர்வு செய்க"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct இணைப்பு தவறிவிட்டது."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s உடன் %d விநாடிகளில் இணைக்கவும்."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "சாதனத்தை மறுபெயரிடவும்"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "இணைக்க இயலவில்லை"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "இணைப்பை நிறுத்தவும்"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "அனுமதி"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "இயக்கத்தில்…"
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "இணை"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "இணைக்கபட்டது."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "சாதனப் பெயரை உள்ளிடவும்"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct வழியாக %d சாதனங்களுடன் இணைக்கப்பட்டது."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "இணைக்கப்படவில்லை"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "இந்த Wi-Fi Direct இணைப்பு ரத்து செய்யப்படும்."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "மின்கலன் ஆற்றலைச் சேமிக்கவென பயன்பாட்டுக்குப் பிறகு Wi-Fi Direct செயல்நீக்கவும்."
+
diff --git a/ug-wifidirect/po/te.po b/ug-wifidirect/po/te.po
new file mode 100644
index 0000000..312d66d
--- /dev/null
+++ b/ug-wifidirect/po/te.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "పరికరాలు కనుగొనబడలేదు"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "నా పరికరం పేరు"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "పరికరం పేరు మార్చు"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "అందుబాటులో ఉన్న ప్రతి పరికరం ప్రత్యేకంగా కనిపించడానికి సమీప పరికరాల జాబితాలో పరికరం పేర్లు మరియు బ్లూటూత్, Wi-Fi Direct మరియు ఇతర పద్ధతులు ద్వారా ప్రదర్శించబడతాయి."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "అక్షరాల గరిష్ఠ సంఖ్యకు చేరుకున్నారు."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "కనెక్ట్ అవుతోంది..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "రద్దు"
+
+msgid "IDS_BR_SK_YES"
+msgstr "అవును"
+
+msgid "IDS_BR_SK_NO"
+msgstr "కాదు"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "సరే"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "రద్దు"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "విఫలమైనది."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "ఎనేబుల్ చేయి"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d ఎన్నుకోబడింది"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "కనెక్ట్ చేయబడింది"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "చెల్లని అక్షరం నమోదు చేయబడింది. మళ్లీ ప్రయత్నించండి."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "సెట్టింగ్‌లను మార్చడానికి ట్యాప్ చేయండి."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "రద్దు"
+
+msgid "IDS_BR_SK_OK"
+msgstr "సరే"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "మద్దతు లేదు."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Wi-Fi యొక్క ఉపయోగంను భద్రత పాలసీ పరిమితం చేస్తుంది."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "పేరు మార్చు"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "లభ్యము"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "కనెక్షన్ విఫలమైంది"
+
+msgid "IDS_COM_SK_NO"
+msgstr "కాదు"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi డైరెక్ట్ పరికరాలు"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "కనెక్ట్ చేసేందుకు టాప్ చేయండి."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "కనెక్షన్‌ని రద్దు చేయి"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "కనెక్ట్ అయిన పరికరాలు"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "అన్నీ ఎంచుకోండి"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "పనిలో ఉన్న పరికరాలు"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "మరొక పరికరంతో కనెక్టయింది"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "అనుసంధానం కోసం వేచి ఉంది"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "కనెక్ట్ చెయ్యడంలో విఫలమైంది."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "బహుళ అనుసంధానం"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "అన్నింటీ అనుసంధానాన్ని తీసివేయి"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "డిస్కనెక్ట్ చేయి"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ఉపయోగించిన తర్వాత Wi-Fi డైరెక్టును నిలిపివేయి"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "ఉపయోగించిన తర్వాత Wi-Fi డైరెక్టును నిలిపివేయండి"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "బ్యాటరీని ఆదా చేయడానికి ఉపయోగించిన తర్వాత Wi-Fi డైరెక్టును నిలిపివేయి"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "బ్యాటరీ ఆదా చేయడానికి ఉపయోగించిన తర్వాత Wi-Fi డైరెక్టును నిలిపివేయండి"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s Wi-Fi డైరెక్ట్ అనుసంధానాన్ని అభ్యర్థిస్తోంది. అనుమతించాలా?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi డైరెక్టును ఉపయోగించడం వల్ల ప్రస్తుత Wi-Fi కనెక్షన్ డిస్‌కనెక్ట్ చేయబడుతుంది. కొనసాగించాలా?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi డైరెక్టును ఉపయోగించడం వల్ల ప్రస్తుత Wi-Fi టీథరింగ్ డిస్‌కనెక్ట్ చేయబడుతుంది. కొనసాగించాలా?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi డైరెక్ట్ కనెక్షన్"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi డైరెక్ట్ డిస్కనెక్ట్ చేయి"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct కనెక్షన్ రద్దు చెయ్యాలా?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi డైరెక్ట్ ద్వారా ఇతర పరికరాలను కనెక్ట్ చేయండి."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct ప్రారంభించబడిన తర్వాత %d నిమిషాలు కోసం కార్యాచరణ లేదు. బ్యాటరీ జీవితాన్ని విస్తరించడానికి, Wi-Fi Direct నిలిపివేయబడింది."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "స్కాన్"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "ఆపు"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "డియాక్టివేషన్ విఫలమయింది."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "యాక్టివేషన్ విఫలమైంది."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "ప్రస్తుత కనెక్షన్ డిస్కనెక్ట్ చేయబడుతుంది. కొనసాగవచ్చా?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "ఒకేసారి మీరు %d పరికరాల వరకు కనెక్ట్ చేయవచ్చు."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "లభ్యంలో ఉన్న పరికరాలు"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s కు కనెక్ట్ అవ్వడంలో విఫలమైంది."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "పరికరం మరొక పరికరం కు కనెక్టయింది."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s కు కనెక్టయింది."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PINs సరిపోలలేదు."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "డియాక్టివేట్ చేస్తోంది..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "ప్రస్తుత అనుసంధానం తొలగించబడుతుంది దీని వలన స్కానింగ్ ప్రారంభించవచ్చు. కొనసాగాలా?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "కనెక్ట్ కావడంలో విఫలమైన పరికరాలు"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s తో కనెక్ట్ చేసేందుకు పిన్‌ను నమోదు చెయ్యండి."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d సెకన్లల్లో %s కు అనుసంధానించండి."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "పరికరాలను ఎంచుకోండి"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct అనుసంధానం పోయింది."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%d సెకన్లులలో %s తో కనెక్ట్ చేయి."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "పరికరం పేరు మార్చు"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "కనెక్ట్ చేయడం సాధ్యం కాదు"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "కనెక్షన్‌ని ఆపివేయి"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "అనుమతించు"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "యాక్టివేట్ చేస్తోంది..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "కనెక్ట్"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "కనెక్టయింది."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "పరికరం పేరును నమోదు చేయండి"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ద్వారా %d పరికరాల తో కనెక్టయింది."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "కనెక్ట్ చేయబడలేదు"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "ఈ Wi-Fi Direct అనుసంధానం రద్దు చేయబడుతుంది."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "బ్యాటరీ శక్తిని ఆదా చేయడానికి, ఉపయోగించిన తర్వాత Wi-Fi డైరెక్ట్ డిసేబుల్ చేయండి."
+
diff --git a/ug-wifidirect/po/th.po b/ug-wifidirect/po/th.po
new file mode 100644
index 0000000..c181d4e
--- /dev/null
+++ b/ug-wifidirect/po/th.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "ไม่พบอุปกรณ์ใดๆ"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "ชื่ออุปกรณ์ของฉัน"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "เปลี่ยน​ชื่อ​อุปกรณ์"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "แสดงชื่ออุปกรณ์ เพื่อแยกแยะอุปกรณ์แต่ละตัว ที่มีในรายชื่ออุปกรณ์ใกล้เคียงและผ่าน Bluetooth, Wi-Fi Direct และวิธีการอื่นๆ"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "มีจำนวนตัวอักษร มากที่สุดแล้ว"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "กำลัง​เชื่อม​ต่อ..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "ยกเลิก"
+
+msgid "IDS_BR_SK_YES"
+msgstr "ใช่"
+
+msgid "IDS_BR_SK_NO"
+msgstr "ไม่"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ตกลง"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "ยกเลิก"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "ผิด​พลาด"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "เปิดใช้งาน"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "เลือก %d รายการ"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "เชื่อม​ต่อ​แล้ว"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "อักขระที่ใส่ไม่ถูกต้อง ลองใหม่"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "สัมผัสเพื่อเปลี่ยนการตั้งค่า"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "ยกเลิก"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ตกลง"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "ไม่​รอง​รับ"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "นโยบาย​ความ​ปลอดภัย​จำกัด​การ​ใช้ Wi-Fi"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "เปลี่ยน​ชื่อ"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "ใช้​ได้"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "การ​เชื่อม​ต่อ​ผิด​พลาด"
+
+msgid "IDS_COM_SK_NO"
+msgstr "ไม่"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "อุปกรณ์ Wi-Fi ​Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "สัมผัส​เพื่อ​เชื่อม​ต่อ"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "ยกเลิกการเชื่อมต่อ"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "อุปกรณ์​ที่​เชื่อม​ต่อ"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "เลือก​ทั้ง​หมด"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "อุปกรณ์​ไม่​ว่าง"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "เชื่อม​ต่อ​กับ​อุปกรณ์​อื่น"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "กำลังรอการเชื่อมต่อ"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "เชื่อม​ต่อ​ล้ม​เหลว"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "เชื่อมต่อหลายราย"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "หยุดการเชื่อมต่อทั้งหมด"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "หยุด​ต่อ"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ปิด Wi-Fi Direct หลังใช้งาน"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "ปิด Wi-Fi Direct หลังใช้งาน"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "ปิด Wi-Fi Direct หลังใช้งานเพื่อประหยัดแบตเตอรี่"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "ปิด Wi-Fi Direct หลังใช้งานเพื่อประหยัดแบตเตอรี่"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s กำลังขอการเชื่อมต่อ Wi-Fi Direct อนุญาต?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "การใช้ Wi-Fi Direct จะยกเลิก การเชื่อมต่อ Wi-Fi ปัจจุบัน ทำต่อ?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "การใช้ Wi-Fi Direct จะยกเลิก การแชร์อินเทอร์เน็ต Wi-Fi ปัจจุบัน ทำต่อ?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "การ​เชื่อม​ต่อ Wi-Fi ​Direct"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "หยุด​เชื่อม​ต่อ Wi-Fi ​Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "ยก​เลิก​การ​เชื่อม​ต่อ Wi-Fi ​Direct?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "เชื่อม​ต่อ​กับ​อุปกรณ์​อื่นๆ ทาง Wi-Fi ​Direct"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "ไม่มีกิจกรรมเป็นเวลา %d นาทีตั้งแต่เปิดใช้งาน Wi-Fi Direct เพื่อยืดอายุแบตเตอรี่ จึงปิดใช้งาน Wi-Fi Direct"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "ค้นหา"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "หยุด"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "การ​เลิก​ใช้​งาน​ไม่​เรียบร้อย"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "การ​ใช้​งาน​ผิดพลาด"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "การ​เชื่อม​ต่อ​ปัจจุบัน​ถูก​ยก​เลิก ทำ​ต่อ?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "คุณ​สามารถ​เชื่อม​ต่อ​กับ​อุปกรณ์​ได้​ถึง %d ​อุปกรณ์​ใน​เวลา​เดียว​กัน"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "อุปกรณ์ที่ใช้งานได้"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "ไม่​สามารถ​เชื่อม​ต่อ​กับ %s"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "เชื่อม​ต่อ​อุปกรณ์​กับ​อุปกรณ์​อื่น​แล้ว"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "เชื่อมต่อกับ %s แล้ว"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN ​ไม่​ตรง​กัน"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "เลิกทำงาน..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "การเชื่อมต่อปัจจุบันจะหยุดลงเพื่อให้การค้นหาเริ่มทำงาน ดำเนินการต่อ?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "อุปกรณ์ที่เชื่อมต่อล้มเหลว"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "ใส่​รหัส PIN ​เพื่อ​เชื่อม​ต่อ​กับ %s"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "เชื่อมต่อกับ %s ใน %d วินาที"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "รหัส PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "เลือกอุปกรณ์"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "การเชื่อมต่อ Wi-Fi Direct สูญหาย"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "เชื่อม​ต่อ​กับ %s ​ใน %d ​วินาที"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "เปลี่ยน​ชื่อ​อุปกรณ์"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "เชื่อมต่อไม่ได้"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "หยุดการเชื่อมต่อ"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "อนุญาต"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "ทำ​งาน..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "เชื่อม​ต่อ"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "เชื่อม​ต่อ​แล้ว"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "ใส่​ชื่อ​อุปกรณ์"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "เชื่อม​ต่อ​กับ %d ​อุปกรณ์​ผ่าน Wi-Fi ​Direct"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "ไม่ได้ต่อ"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "การเชื่อมต่อ Wi-Fi Direct นี้จะถูกยกเลิก"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "ปิดใช้งาน Wi-Fi Direct หลังใช้งานเพื่อประหยัดพลังงานแบตเตอรี่"
+
diff --git a/ug-wifidirect/po/tl.po b/ug-wifidirect/po/tl.po
new file mode 100644
index 0000000..5ca6ba3
--- /dev/null
+++ b/ug-wifidirect/po/tl.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Walang mga device na nakita"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Pangalan ng aking device"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Palitan ang pangalan ng device"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Ipinapakita ang mga pangalan ng device para makilala ang bawat device na available sa listahan ng mga device na malapit, at sa pamamagitan ng Bluetooth, Wi-Fi Direct, at iba pang mga paraan."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Naabot na ang maximum na bilang ng mga character."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Kumokonekta..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Ikansela"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Oo"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Hindi"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Ikansela"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nabigo."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Paganahin"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d ang pinili"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Nakakonekta"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Nagpasok ng di-wastong character. Subukang muli"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "I-tap upang baguhin ang mga setting"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Kanselahin"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Hindi sinusuportahan."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Pinaghihigpitan ng patakaran sa seguridad ang paggamit ng Wi-Fi."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "I-rename"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Available"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Hindi nakakonekta"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Hindi"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Mga Wi-Fi Direct na device"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "I-tap upang kumonekta."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Kanselahin ang koneksyon."
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "Mga nakakonektang device"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Piliin lahat"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "Mga busy na device"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "Nakakonekta sa isa pang device."
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "Hintayin ang koneksyon"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Hindi nakakonekta."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "Multi-connect"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "Idiskonekta lahat"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "Diskonekta"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Huwag paganahin ang Wi-Fi Direct matapos gamitin"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Patayin ang Wi-Fi Direct pagkagamit"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Huwag paganahin ang Wi-Fi Direct matapos gamitin upang makatipid ng baterya"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Patayin Wi-Fi Direct pagkagamit para tipid baterya"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "Humihiling si %s ng koneksyon sa Wi-Fi Direct. Payagan?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Kapag ginamit ang Wi-Fi Direct, madidiskonekta ang kasalukuyang koneksyon sa Wi-Fi. Magpatuloy?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Kapag ginamit ang Wi-Fi Direct, madidiskonekta ang kasalukuyang Wi-Fi tethering. Magpatuloy?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct connection"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Disconnect Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Kanselahin ang koneksyon sa Wi-Fi Direct?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Kumonekta sa iba pang mga device sa pamamagitan ng Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Walang naging aktibidad sa loob ng %d (na) minuto mula nang pinagana ang Wi-Fi Direct. Upang pahabain ang buhay ng baterya, hindi pinagana ang Wi-Fi Direct."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "I-scan"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "Ihinto"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Nabigo ang pag-deactivate."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Nabigo ang pag-activate."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "Madidiskonekta ang kasalukuyang koneksyon. Magpatuloy?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Maaari kang magkonekta ng hanggang %d device nang sabay-sabay."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Mga available device"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Nabigong kumonekta sa %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Nakakonekta ang device sa isa pang device."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Nakakonekta sa %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Hindi nagtutugma ang mga PIN."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Dini-deactivate..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Madidiskonekta ang kasalukuyang koneksyon upang makapagsimula ang pag-scan. Magpatuloy?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Mga device na hindi nakakonekta."
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Ipasok ang PIN upang kumonekta sa %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Kumonekta sa %s sa loob ng %d (na) segundo."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Pumili ng mga device"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Nawala ang koneksyon sa Wi-Fi Direct."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Kumonekta sa %s sa %d seg."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Palitan ang pangalan ng device."
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Hindi makakonekta"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Ihinto koneksyon"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Payagan"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Ina-activate..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Kumonekta"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Nakakonekta."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Ipasok ang pangalan ng device"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Nakakonekta sa %d device sa pamamagitan ng Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Hindi nakakonekta"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Kakanselahin ang koneksyon sa Wi-Fi Direct na ito."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Upang magtipid ng power ng baterya, huwag paganahin ang Wi-Fi Direct pagkatapos gamitin."
+
diff --git a/ug-wifidirect/po/tr_TR.po b/ug-wifidirect/po/tr_TR.po
index f5d2db6..42b08b1 100644..100755
--- a/ug-wifidirect/po/tr_TR.po
+++ b/ug-wifidirect/po/tr_TR.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Bağlantı kuruldu"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "ID'nizi girin"
-msgid "IDS_WFD_CONNECTING"
-msgstr "Bağlanılıyor..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maksimum karakter sayısına ulaşıldı."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Bağlantı kesiliyor..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d seçildi"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Bağlantı kuruldu"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Etkinleştir"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Bilinmeyen hata"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN’ler uyuşmuyor!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Maksimum karakter sayısına %d ulaşıldı"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Etkinleştiriliyor…"
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP adresi alınamadı."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d seçildi"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Wi-Fi ağına %s bağlandı"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Devreden çıkartılıyor..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Hiçbir zaman"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Desteklenmiyor"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Wi-Fi ve 4G yoluyla veri indir"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Wi-Fi ve 3G yoluyla veri indir"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Unut"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "İptal"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "Tamam"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Bağlandı"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Sabit bir İnternet bağlantısı sağlamak için Wi-Fi ve mobil ağlar arasında otomatik geçiş yapın."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Kimlik denetimi hatası oluştu"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Dosyaları daha hızlı indirmek için Wi-Fi ve mobil ağlar birlikte kullanılacak. Bu işlem mobil veri kullanımınızı artırabilir."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Akıllı ağ anahtarı etkinleştirildi. Bu işlev, mobil ve Wi-Fi ağları arasında geçiş yaparak dengeli bir İnternet bağlantısının korunmasını sağlar. Bu, veri kullanımınızı artırabilir."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s seçildi.\n\nBir AP'ye bağlanamıyorsanız SIM kart yöneticisine giderek doğrulama için kullanılan SIM kartı değiştirin. Ardından, Mobil veri ve multimedya mesajları için kullanmak istediğiniz SIM kartı seçin. Alternatif olarak, kullanmak istemediğiniz SIM kartı çıkarabilirsiniz."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "%d dakika içinde Wi-Fi erişim noktanızdaki WPS tuşuna basın."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Aç"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Hiç Wi-Fi AP bulunamadı."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Geçerli ağ bağlantısı kesilecek."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Şifreyi göster"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Açık"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Kapalı"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Ağı unut"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Akıllı ağ anahtarı"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Sinyal kuvveti"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Mobil veri kull. azalt"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Hıza öncelik tanı"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Ağ bağlama"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi ağı bilgisi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS yöntemi seç"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proxy adresi"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Şifre"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Şifreyi girin."
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS tuşu"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Tara"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct cihazları"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Gizli ağ bul"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi ağları mevcut."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Sadece şarj ederken"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Zayıf"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Kullanıcı srtfksı"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Belirsiz"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Bilinmeyen"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Büyük dosyaları daha hızlı indirmek için Wi-Fi ve mobil ağları birlikte kullanın."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Alt ağ maskesi"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statik IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Sıralama ölçütü"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Taranıyor..."
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Bağlanmak için dokunun"
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Kullanılabilir ağlar olduğunda bildirim al"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proxy portu"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "İsim"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC adresi"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP adresi"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Kimlik"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Ağ geçidi adresi"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Kimlik girin."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP yöntemi"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Bağlanılıyor..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Bağlan"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Bağlantıyı iptal et"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Kaydedildi"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Bir Wi-Fi ağı saptandı. Bu ağa bağlanacaksınız."
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Gelişmiş ayarlar"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Hayır"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Direct hakkında"
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Güvenlik ilkesi Wi-Fi kullanımını kısıtlıyor."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct Wi-Fi cihazlarının doğrudan bağlanmasını sağlar, yazdırmayı, dosya paylaşmayı, eşitlemeyi ve ekran paylaşımını daha basit ve daha güvenli hale getirir. Wi-Fi Direct destekli cihazlara bağlanmak, çeşitli uygulamalar kullanarak içeriklerinizi paylaşmayı, verilerinizi eşitlemeyi, arkadaşlarla sosyalleşmeyi, oyun oynamayı, ses, video oynatmayı ve fazlasını mümkün kılar"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Bağlanmak için buraya dokunun."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Cihazınız %1$s öğesine bağlanıyor. Ancak bu ağ İnternet erişimi sağlamayabilir.\n%1$s uygulamasına bağlı kalmak için Tamam öğesine dokunun; ayrıca, Akıllı ağ anahtarının gelecekte bu ağa bağlanmasını da engelleyin."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Hem Wi-Fi hem de Mobil AP aynı anda etkinleştirilemez. Mobil AP devre dışı bırakılsın mı?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi ağına oturum açın"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "İnternet kullanılamıyor"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Tekrar sorma"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi ayarlarını açın"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Cihaz bulunamadı"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Evet"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Hayır"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "İptal"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Cihazı yeniden adlandır"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Cihazımın adı"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Başarısız oldu."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "İptal"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Bağlantı kuruldu."
+
+msgid "IDS_BR_SK_OK"
+msgstr "Tamam"
+
+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_SK_RENAME"
+msgstr "Yen. ad."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Ayarları değiştirmek için dokun"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Geçersiz karakter girildi. Yeniden deneyin."
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Desteklenmiyor."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Uygun"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Bağlantı kurulamadı"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct cihazları"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Bağlanmak için dokunun."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Bağlantıyı iptal et"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Bağlı cihazlar"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Hepsini seç"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Meşgul cihazlar"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Başka cihazla bağlandı"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Bağlanılıyor..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Bağlantı bekleniyor"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Bağlanamadı"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Bağlanamadı."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Çoklu-bağlantı"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Hepsini kes"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Bağlantıyı kes"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Aygıt bulunamadı"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Kullanımdan sonra Wi-Fi Direct devre dışı bırak"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Kul sonra Wi-Fi Direct dvr dş brkr"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Pil tassarrufu için, kullandıktan snr Wi-Fi Direct devre dışı bırak"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Pil ömrü içn, kllndktn snr Wi-Fi Direct dvr dş brkr"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s Wi-Fi Direct bağlantısı talep ediyor. İzin veriyor musunuz?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct kullanmak mevcut Wi-Fi bağlantısını kesecek. Devam edilsin mi?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct kullanmak mevcut Wi-Fi bağlanmayı kesecek. Devam edilsin mi?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct bağlantısı"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct bağlntsnı ks"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Wi-Fi Direct bağlantısı iptal edilsin mi?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Cihaz yok"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct üzerinden diğer cihazlara bağlan."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct etkinleştirildikten sonra %d dakika boyunca hiçbir etkinlik olmadı. Pil ömrünü uzatmak için Wi-Fi Direct kapatıldı."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Tara"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Durdur"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Devre dışı bırakma başarısız"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Devre dışı bırakma başarısız."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Etkinleştirme başarısız"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Etkinleştirme başarısız."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Geçerli bağlantı kesilecek. Devam edilsin mi?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "Kullanılabilir cihazlar"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Aynı anda en fazla %d cihaz bağlayabilirsiniz."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Kllanılablr cihazlar"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%s ile bağlantı başarısız."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Cihaz başka bir cihaza bağlandı."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s ağı ile bağlantı kuruldu."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN'ler eşleşmiyor."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Devreden çıkartılıyor..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Tarama başlatmak için mevcut bağlantı kesilecek. Devam edilsin mi?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Bağlanamayan cihazlar"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%s cihazına bağlanmak için PIN girin."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%s cihazına %d saniyede bağlan."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN kodu %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Cihazları seçin"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct bağlantısı kesildi"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s ile %d sn içinde bağlanın."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Cihazı yeniden adlandır"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Bağlanamıyor"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Bağlantıyı durdur"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "İzin ver"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Etkinleştiriliyor…"
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Bağlan"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Bağlantı kuruldu."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Cihaz adı girin"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct ile %d cihaza bağlandı."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Bağlı değil"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Bu Wi-Fi Direct bağlantısı iptal edilecek."
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Aynı anda en fazla %d cihaz bağlayabilirsiniz"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Pil gücünden tasarruf etmek için kullandıktan sonra Wi-Fi Direct'i devre dışı bırakın."
diff --git a/ug-wifidirect/po/uk.po b/ug-wifidirect/po/uk.po
index 95a0ed4..b25f38a 100644..100755
--- a/ug-wifidirect/po/uk.po
+++ b/ug-wifidirect/po/uk.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "З'єднано"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "Введіть ідентифікатор."
-msgid "IDS_WFD_CONNECTING"
-msgstr "З'єднання..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Досягнуто максимальної кількості символів."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Роз'єднання..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Вибрано %d"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "З'єднано"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Увімкнути"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Невідома помилка"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN-коди не збігаються."
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Досягнуто максимальної кількості символів: %d"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Активація..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "Не вдалося отримати IP-адресу."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "Вибрано %d"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Підключено до мережі Wi-Fi %s"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "Деактивація..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Ніколи"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Не підтримується"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Завант. даних через Wi-Fi та 4G"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Завант. даних через Wi-Fi та 3G"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "PIN-код WPS"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Забути"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Скасувати"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ОК"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Підключено"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Автоматичне переключення між мережею Wi-Fi і мобільними мережами для забезпечення стабільного підключення до Інтернету."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Сталася помилка ідентифікації"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Wi-Fi і мобільні мережі будуть використовуватися разом для прискореного завантаження файлів. Це може призвести до збільшення використання мобільних даних."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Розумний перемикач мережі ввімкнено. Ця функція допомагає забезпечити стабільне підключення до Інтернету за допомогою переключення між мобільною мережею та мережею Wi-Fi. Це може призвести до збільшення використання даних."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "Вибрано %s.\n\nЯкщо вам не вдається підключитися до точки доступу, у меню «Диспетчер SIM-карти» змініть SIM-карту, що використовується для підтвердження. Потім виберіть SIM-карту, яку потрібно використовувати для мобільних даних і MMS-повідомлень. Також можна вийняти непотрібну SIM-карту."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Натисніть кнопку WPS на точці доступу Wi-Fi протягом %d хвилин."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Відкрита"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Жодної ТД Wi-Fi не знайдено."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Поточну мережу буде відключено."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Показати пароль"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Увімкнено"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "Вимкнено"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Забути мережу"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Розумний перемикач мережі"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Потужність сигналу"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Зменш. викор. моб. даних"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Пріоритет швидкості"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Зв’язок мереж"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Відомості щодо мережі Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "Вибір способу WPS"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Адреса проксі"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Пароль"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Введіть пароль."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "Кнопка WPS"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "Сканувати"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Пристрої Wi-Fi Direct"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Пошук прихованої мережі"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Доступні мережі Wi-Fi."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Лише під час зарядження"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Слабкий"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "Серт. користувача"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Не визначено"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Невідомо"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Для прискореного завантаження великих файлів використовуйте разом мережу Wi-Fi та мобільні мережі."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Маска підмережі"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Статична IP-адреса"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Вигляд"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Натисніть, щоб підключитися"
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Сканування..."
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Отримання сповіщень у разі доступності мереж"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Порт проксі"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Iм'я"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC-адреса"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-адреса"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Ідентифікація"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Адреса шлюзу"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Введіть ідентифікатор."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "Метод EAP"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "З'єднання..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "З'єднати"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Скасувати підключення"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Збережено"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Виявлено мережу Wi-Fi. Буде встановлено підключення"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Додаткові налаштування"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Про Wi-Fi Direct"
+msgid "IDS_COM_SK_NO"
+msgstr "Ні"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct дає змогу пристроям Wi-Fi здійснювати безпосереднє підключення, завдяки чому спільний доступ до файлів, синхронізація та друк стають набагато простішими та зручнішими. Підключення до пристроїв із підтримкою Wi-Fi Direct надає можливість відкрити спільний доступ до вмісту, синхронізувати дані, спілкуватись із друзями, грати в ігри, відтворювати аудіо, відео та інше, а також використовувати різноманітні програми."
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Використання мережі Wi-Fi обмежено політикою безпеки."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Натисніть тут, щоб підключитися."
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Пристрій підключено до мережі %1$s. Проте ця мережа може не підтримувати надання доступу до Інтернету.\n Торкніться «OK», щоб зберегти поточне підключення до %1$s, але забороніть підключатися до цієї мережі в майбутньому за допомогою розумного перемикача мережі."
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Мережі Wi-Fi та Mobile AP не можна активувати одночасно. Вимкнути Mobile AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Реєстрація в мережі Wi-Fi"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Інтернет може бути недоступний"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Більше не запитувати"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Відкрити установки Wi-Fi"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Пристрої не знайдено"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Так"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Ні"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Скасувати"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Перейменувати пристрій"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Ім’я мого пристрою"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Збій."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Скасувати"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "З'єднано"
+
+msgid "IDS_BR_SK_OK"
+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_SK_RENAME"
+msgstr "Перейменувати"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Натисніть, щоб змінити установки"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Введено хибний символ. Cпробуйте ще раз"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Не підтримується."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Доступний"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Збій підключення"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Пристрої Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Натисніть, щоб підключитися."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Скасувати підключення"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Підключені пристрої"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Вибрати всі"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Зайняті пристрої"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Підключено до іншого пристрою"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "З'єднання..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Очікується підключення"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Не вдалося підключитися"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Не вдалося підключитися."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Мульти-підключення"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Відключити всі"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Роз'єднати"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Не знайдено пристроїв"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Вимкнути Wi-Fi Direct після використання"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Вимк.Wi-Fi Direct після використ."
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Вимкнути Wi-Fi Direct після використання для збереження заряду акумулятора"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Вимк.Wi-Fi Direct після вик., щоб збер.заряд акум."
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s запитує дозвіл на підключення Wi-Fi Direct. Дозволити?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Використання Wi-Fi Direct призведе до розірвання поточного підключення Wi-Fi. Продовжити?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Використання Wi-Fi Direct призведе до вимкнення поточної прив'язки Wi-Fi. Продовжити?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Підключення Wi-Fi Direct"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Відключити Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Скасувати підключення Wi-Fi Direct?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Немає пристроїв"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Підключатися до інших пристроїв за допомогою Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Не зафіксовано активності протягом %d хвилин після ввімкнення Wi-Fi Direct. Wi-Fi Direct вимкнено, щоб заощадити заряд акумулятора."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Сканувати"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "Стоп"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "Збій деактивації"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Збій деактивації."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Збій активації"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Збій активації."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Поточне з’єднання буде роз’єднано. Продовжити?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Одночасно можна підключити не більше %d пристроїв."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Доступні пристрої"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Одночасно можна підключити не більше %d пристроїв"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Неможливо підключитися до %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Пристрій підключено до іншого пристрою."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Підключено до %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-коди не збігаються."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Деактивація..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Щоб почати пошук поточне підключення буде розірвано. Продовжити?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Пристрої, яким не вдалося встановити підключення"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Введіть PIN-код, щоб підключитися до %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Підключення до %s через %d секунд."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-код %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Виберіть пристрої"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Підключення Wi-Fi Direct втрачено."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Підключення до %s через %d сек."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Перейменувати пристрій"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Неможливо підключитися"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Розірвати підключ."
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Дозволити"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Активація..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "З'єднати"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Підключено."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Введення імені пристрою"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Підключено до %d пристроїв через Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Не підключено"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Це підключення Wi-Fi Direct буде скасовано."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Щоб заощадити заряд акумулятора, вимкніть Wi-Fi Direct після використання."
diff --git a/ug-wifidirect/po/ur.po b/ug-wifidirect/po/ur.po
new file mode 100644
index 0000000..f667287
--- /dev/null
+++ b/ug-wifidirect/po/ur.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "کوئی آلہ جات نہیں ملے"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "میرے آلہ کا نام"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "آلہ کو نیا نام دیں"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "آلہ کے ناموں کو قریب میں موجود آلات کی فہرست میں دستیاب آلات میں سے ہر آلہ کو منفرد بنانے، اور بلوٹوتھ، Wi-Fi Direct اور دیگر طریقوں کے ذریعے ڈسپلے کیا جاتا ہے۔"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "کریکٹر کی حد ہو گئی۔"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "کنیکٹ کر رہا ہے…"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "منسوخ"
+
+msgid "IDS_BR_SK_YES"
+msgstr "ہاں"
+
+msgid "IDS_BR_SK_NO"
+msgstr "نہیں"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "ٹھیک ہے"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "منسوخ"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "ناکام ہوا۔"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "فعال"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d منتخب ہوگیا"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "منسلک ہوگیا"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "غیر مجاز حرف داخل کیا۔ دوبارہ کوشش کریں۔"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "ترتیبات تبدیل کرنے کے لئے تھپتھپائیں"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "منسوخ"
+
+msgid "IDS_BR_SK_OK"
+msgstr "ٹھیک ہے"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "غیر شناسا۔"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "سلامتی پالیسی Wi-Fi کے استعمال کو پابندی لگاتی ہے"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "نام بدلیں"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "موجود"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "کنکشن ناکام ہوگیا"
+
+msgid "IDS_COM_SK_NO"
+msgstr "نہیں"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct آلات"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "جڑنے کے لئے تھپتھپائیں"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "کنکشن منسوخ کریں"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "کنکٹ شدہ آلات"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "تمام منتخب کریں"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "مصروف آلے"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "کسی دوسرے آلے سے جڑا ہوا"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "کنکشن کا انتظار کررہا ہے"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "جڑنے سے ناکام ہوگیا۔"
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "کثیر العناصر-جڑنا"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "سب منقطع کریں"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "غیر متصل کریں"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "استعمال کے بعد Wi-Fi Direct نا اہل بنائیں"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "استعمال کے بعد Wi-Fi Direct نا اہل بنائیں"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "بیٹری بچانے کے لئے استعمال کے بعد Wi-Fi Direct نااہل بنائیں"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "استعمال کے بعد Wi-Fi Direct نااہل بنا کر بیٹری بچائیں"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s ایک Wi-Fi Direct کنکشن کی درخواست کررہا ہے۔ اجازت دیں؟"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Direct استعمال کرنے سے موجودہ Wi-Fi کنکشن منقطع ہوجائے گا۔ جاری رکھیں؟"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Direct استعمال کرنے سے موجودہ Wi-Fi پالہنگ منقطع ہوجائے گا۔ جاری رکھیں؟"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi Direct کنکشن"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct منقطع کریں"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Wi-Fi Direct کنکشن منسوخ کریں؟"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "براستہ Wi-Fi Direct دیگر آلات سے جڑیں"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct اہل بنائے جانے کے %d منٹ بعد تک کوئی سرگرمی نہیں ہوئی۔ بیٹری کی عمر بڑھانے کے لئے، Wi-Fi Direct نا اہل بنادیا گیا ہے۔"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "اسکین کریں"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "رکیں"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "غیرکارآمد کرنا ناکام ہوگیا۔"
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "کارآمد ناکام رہا۔"
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "موجودہ کنکشن منقطع کردیا جائے گا۔ جاری رکھیں؟"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "آپ بیک وقت تقریبا %d تک آلوں کو کنکٹ کرسکتے ہیں"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "دستیاب آلہ جات"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%sسے متصل کرنا ناکام۔"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "آلہ کسی اور آلے سے کنکٹ ہے۔"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%s سے جڑا ہوا۔"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN مشابہت نہیں رکھتے"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "غیر فعال ۔۔۔"
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "موجودہ کنکشن منقطع ہوجائے گا تا کہ اسکیننگ شروع ہوسکے۔ جاری رکھیں؟"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "آلہ جات جو جڑنے میں ناکام ہوگئے"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "داخل کریں پن جڑنے کے لئے %s سے"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%d سیکنڈ میں %s سے جڑیں"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN کوڈ %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "آلہ جات منتخب کریں"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct کھو گیا ہے"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s سے کنکٹ کریں %d سیکنڈ میں"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "آلہ کو نیا نام دیں"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "پن"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "مربوط کرنے سے قاصر"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "کنکشن روکیں"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "اجازت دیں"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "دیکھنے کی قسم"
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "منسلک"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "منسلک ہوگیا۔"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "آلے کا نام درج کریں"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct کے ذریعے %d آلات سے کنکٹ شدہ۔"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "مربوط نہیں"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "یہ Wi-Fi Direct کنکشن منسوخ ہو جائے گا۔"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "بیٹری کی قوت بچانے کے لئے، استعمال کے بعد Wi-Fi Direct نااہل بنائیں"
+
diff --git a/ug-wifidirect/po/uz.po b/ug-wifidirect/po/uz.po
index de32d53..12678bc 100644..100755
--- a/ug-wifidirect/po/uz.po
+++ b/ug-wifidirect/po/uz.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "Ulangan"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "IDingizni kiriting."
-msgid "IDS_WFD_CONNECTING"
-msgstr "Ulanmoqda..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Belgilar soni ruxsat etilgan maksimal miqdorga yetdi."
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "Uzilmoqda..."
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d tanlangan"
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "Ulangan"
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Yoqish"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "Noma’lum xato"
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "."
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PINs don't match!"
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "Belgilar soni ruxsat etilgan maksimal miqdorga %d yetdi"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "Faollashtirilmoqda..."
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "IP-manzilni olib bo‘lmadi."
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "%d tanlangan"
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "%s Wi-Fi tarmog‘iga ulangan"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "O‘chirilmoqda..."
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "Hech qachon"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "Ma’l. Wi-Fi va 4G orq yuklab ol"
+
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "Ma’l. Wi-Fi va 3G orq yuklab ol"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "Unutish"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Bekor qilish"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
+msgstr "Ulandi"
+
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "Barqaror Internet ulanishini ta’minlash uchun Wi-Fi va mobil tarmoqlar o‘rtasida avtomatik ravishda almashish."
+
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "Haqiqiylik tekshiruvi xatosi yuz berdi"
+
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "Fayllarni tezroq yuklab olish uchun Wi-Fi va mobil tarmoqlar birgalikda ishlatiladi. Bu mobil ma’lumot ishlatilishini oshirishi mumkin."
+
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "Smart tarmoq almashish yoqilgan. Ushbu funksiya mobil va Wi-Fi tarmoqlar o‘rtasida almashish orqali barqaror Internet ulanishini ta’minlashga yordam beradi. Bu ma’lumot ishlatilishini oshirishi mumkin."
+
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "%s tanlandi.\n\nAP-ga ulana olmasangiz, SIM-karta menejeriga o‘tish orqali tasdiqlash uchun foydalanilgan SIM-kartani o‘zgartiring. So‘ngra Mobil ma’lumot va multimedia xabarlari uchun foydalaniladigan SIM-kartani tanlang. Yoki foydalanishni istamagan SIM-kartani chiqarib olishingiz mumkin."
+
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "Wi-Fi kirishda WPSni %d daqiqa bosib turing."
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "Ochiq"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi AP topilmadi."
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "Joriy tarmoq uziladi."
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "Parol ko‘rsatilsin"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "Yoq."
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "O‘ch."
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "Tarmoqni unutish"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "Smart tarmoqni almashtir"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "Signal kuchi"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "Mobil ma’l. sarfini kamay"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "Xususiyat tezligi"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "Tarmoq bog‘lanishi"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi tarmoq ma’lumoti"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "WPS uslubini tanlash"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "Qo‘llab-quvvatlanmaydi"
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "Proksi manzili"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "Parol"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "Parol kiriting."
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS tugmasi"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
+msgstr "Qidirish"
+
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "Yashirin tarmoqni topish"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi tarmoqlar mavjud."
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
msgstr "Wi-Fi Direct"
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "Scan"
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct qurilmalari"
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "Faqat zaryadlanayotganda"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "Kuchsiz"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "User certificate"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "Aniqlanmagan"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "Noma’lum"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "Katta fayllarni tezroq yuklab olish uchun Wi-Fi va mobil tarmoqlardan birgalikda foydalaning."
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "Tagtarmoq maskasi"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "Statik IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "Saralash"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "Qidirish"
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "Tarmoqlar mavjudligida bildirishnomalarni olish"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "Ulanish uchun cherting"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "Proksi porti"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "Ism"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC manzili"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP-manzil"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "Identifikatsiya"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "Shluz manzili"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "Identifikatsiyani kiriting."
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP uslub"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Ulanmoqda..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "Ulanish"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "Ulanishni bekor qilish"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "Saqlandi"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "Wi-Fi tarmoq aniqlandi. Tarmoqdan uzilasiz"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "Takomillashgan parametrlar"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Yo‘q"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Xavfsizlik siyosati Wi-Fidan foydalanishni cheklaydi."
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "Wi-Fi Direct haqida"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Ulanish uchun bu yerga teging."
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct to‘g‘ridan-to‘g‘ri ulanish, chop etish, faylni ulashish va ekranni baham ko‘rishni soddaroq va osonroq qilish uchun Wi-Fi qurilmalarini yoqadi. Wi-Fi Directni qo‘llab-quvvatlovchi qurilmalarga ulanish turli ilovalar yordamida tarkibni baham ko‘rish, ma’lumotlarni sinxronlash, do‘stlar bilan suhbatlashish, o‘yinlar o‘ynash, audio, video tomosha qilish va boshq. amalga oshirishingiz mumkin"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "Qurilmangiz %1$sga ulanmoqda. Vaholanki, ushbu tarmoq Internet tarmoqni ta’minlay olmasligi mumkin.\n%1$sga ulangan holda turish uchun OKga teging, lekin Smart tarmoq almashishning ushbu tarmoqqa kelajakda ulanishiga yo‘l qo‘ymang."
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Bir vaqtning o‘zida Wi-Fi va Mobile APni faollashtirib bo‘lmaydi. Mobile AP o‘chirilsinmi?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi tarmoqqa kirish"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "Internet yo‘q bo‘lishi mumkin"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Qayta so‘ralmasin"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi parametrlarini oching"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Qurilmalar topilmadi"
+
+msgid "IDS_BR_SK_YES"
+msgstr "Ha"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Yo‘q"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Bekor qilish"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Qurilma nomini o'zgartirish"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Qurilmam nomi"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Xato."
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Bekor qilish"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Ulangan"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+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_SK_RENAME"
+msgstr "Nom o‘zg."
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Parametrlarni o‘zgartirish uchun bosing"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Mumkin bo‘lmagan belgi kiritildi. Qayta urinib ko‘ring"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Qo‘llab-quvvatlanmaydi."
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Mavjud"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Aloqa uzildi"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct qurilmalari"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Ulanish uchun cherting."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Ulanishni bekor qilish"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "Ulangan qurilmalar"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Barchasini tanlash"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "Band qurilmalar"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "Boshqa qurilma bilan ulandi"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "Ulanmoqda..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "Ulanish kutilmoqda"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "Ulanib bo‘lmadi"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Ulanib bo‘lmadi."
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "Ko‘p-ulanish"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "Barini uzish"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "Uzish"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "Qurilmalar topilmadi"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Wi-Fi Directdan foydalangandan so‘ng, uni o‘chiring"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Wi-Fi Direct ishlatil so‘ng o‘chir"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Batareya quvvatini tejash uchun, Wi-Fi Directdan foydalangandan so‘ng, uni o‘chiring"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Batareya tejash u-n Wi-Fi Direct ishl so‘ng o‘chir"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s Wi-Fi Direct ulanishini talab qilmoqda. Ruxsat berilsinmi?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Wi-Fi Directdan foydalanish joriy Wi-Fi ulanishini uzadi. Davom ettirilsinmi?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Wi-Fi Directdan foydalanish joriy Wi-Fi bog‘lanishni uzadi. Davom ettirilsinmi?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct ulanishi"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Wi-Fi Directni uzish"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "Wi-Fi Direct ulanishi bekor qilinsinmi?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "Qurilmalar yo‘q"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct orqali boshqa qurilmalarga ulanish."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Wi-Fi Direct yoqilganidan beri, %d daqiqa davomida amal bajarilmadi. Batareya xizmat qilish vaqtini uzaytirish uchun, Wi-Fi Direct o‘chirildi."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Qidirish"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "To‘xtatish"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "O‘chirib bo‘lmadi"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "O‘chirib bo‘lmadi."
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "Faollashtirish bajarilmadi"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Faollashtirish bajarilmadi."
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "Joriy ulanish uziladi. Davom ettirilsinmi?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Bir vaqtda ko‘pi bilan %d qurilma ulanishi mumkin."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "Mavjud qurilmalar"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "Bir vaqtda ko‘pi bilan %d qurilma ulanishi mumkin"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "%sga ulanib bo‘lmadi."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Qurilma boshqa qurilmaga ulangan."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "%sga ulangan."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN-kodlar mos kelmaydi."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "O‘chirilmoqda..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Joriy ulanish uziladi hamda qidirish boshlanishi mumkin. Davom ettirilsinmi?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Ulana olmagan qurilmalar"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "%sga ulanish uchun, PIN-kodni kiriting."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "%sga %d soniyada ulanish."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN-kod %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Qurilmalarni tanlash"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct ulanishi yo‘qotildi."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "%s bilan %d soniyada ulanish."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Qurilma nomini o'zgartirish"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN-kod"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Ulanib bo‘lmaydi"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Aloqani to‘xtatish"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Ruxsat ber"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Faollashtirilmoqda..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Ulanish"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Ulangan."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Qurilma nomini kiririting"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct orqali %d qurilma bilan ulangan."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Ulanmagan"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Wi-Fi Direct ulanishi bekor qilinadi."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Batareya quvvatini tejash uchun, Wi-Fi Directni ishlatib bo‘lganingizdan so‘ng uni o‘chiring."
diff --git a/ug-wifidirect/po/vi.po b/ug-wifidirect/po/vi.po
new file mode 100644
index 0000000..d072a88
--- /dev/null
+++ b/ug-wifidirect/po/vi.po
@@ -0,0 +1,249 @@
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "Không tìm thấy thiết bị nào"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "Tên thiết bị của bạn"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "Đổi tên thiết bị"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "Các tên thiết bị được hiển thị để phân biệt mỗi thiết bị có trong danh sách thiết bị ở gần và thông qua Bluetooth, Wi-Fi Direct và các phương pháp khác."
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Đã đạt số ký tự tối đa."
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "Đang kết nối..."
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "Hủy"
+
+msgid "IDS_BR_SK_YES"
+msgstr "OK"
+
+msgid "IDS_BR_SK_NO"
+msgstr "Không"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "OK"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "Hủy"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "Lỗi."
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "Bật"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "Đã chọn %d"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "Đã kết nối"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "Ký tự đã nhập không hợp lệ. Hãy thử lại"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "Chạm để thay đổi cài đặt"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "Thoát"
+
+msgid "IDS_BR_SK_OK"
+msgstr "OK"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Không tương thích."
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Chính sách bảo mật hạn chế việc sử dụng Wi-Fi."
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "Đổi tên"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "Sẵn sàng"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "Kết nối bị lỗi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Không"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Thiết bị Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "Chạm để kết nối."
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "Hủy kết nối"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
+msgstr "Thiết bị đã kết nối"
+
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "Chọn tất cả"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
+msgstr "Thiết bị bận"
+
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
+msgstr "Đã kết nối với thiết bị khác"
+
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
+msgstr "Đang chờ để kết nối"
+
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "Lỗi kết nối."
+
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
+msgstr "Đa kết nối"
+
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
+msgstr "Ngắt toàn bộ kết nối"
+
+msgid "IDS_WIFI_SK_DISCONNECT"
+msgstr "Ngắt"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Tắt Wi-Fi Direct sau khi sử dụng"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "Tắt Wi-Fi Direct sau khi sử dụng"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "Tắt Wi-Fi Direct sau khi sử dụng để tiết kiệm pin"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "Tắt Wi-Fi Direct sau khi sử dụng để tiết kiệm pin"
+
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s yêu cầu một kết nối Wi-Fi Direct. Cho phép?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "Việc sử dụng Wi-Fi Direct sẽ ngắt kết nối Wi-Fi hiện tại. Tiếp tục?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "Việc sử dụng Wi-Fi Direct sẽ ngắt kết nối Wi-Fi hiện tại. Tiếp tục?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Kết nối Wi-Fi Direct"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "Ngắt kết nối Wi-Fi Direct"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
+msgstr "Hủy bỏ kết nối Wi-Fi Direct?"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Kết nối đến thiết bị khác qua Wi-Fi Direct."
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "Không có hoạt động nào trong %d phút kể từ khi Wi-Fi Direct được bật. Để kéo dài tuổi thọ pin, Wi-Fi Direct đã tắt."
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "Dò"
+
+msgid "IDS_WIFI_SK_STOP"
+msgstr "Dừng"
+
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
+msgstr "Xảy ra lỗi."
+
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
+msgstr "Kích hoạt bị lỗi."
+
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
+msgstr "Kết nối hiện tại sẽ bị ngắt. Tiếp tục?"
+
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "Bạn có thể kết nối tối đa %d thiết bị cùng lúc."
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "Các thiết bị sẵn có"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "Không thể kết nối đến %s."
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "Thiết bị đã kết nối đến thiết bị khác."
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "Đã kết nối đến %s."
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "Mã PIN không khớp."
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "Đang tắt..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "Kết nối hiện tại sẽ bị ngắt để quá trình dò tìm có thể bắt đầu. Tiếp tục?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "Các thiết bị kết nối không thành công"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "Nhập PIN để kết nối đến %s."
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "Kết nối với %s trong %d giây."
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "Mã PIN %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "Chọn thiết bị"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Đã mất kết nối Wi-Fi Direct."
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "Kết nối với %s trong %d giây."
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "Đổi tên thiết bị"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "Không thể kết nối"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "Dừng kết nối"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "Cho phép"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "Đang bật..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "Kết nối"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Đã kết nối."
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "Nhập tên thiết bị"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Đã kết nối với %d thiết bị qua Wi-Fi Direct."
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "Chưa kết nối"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "Kết nối Wi-Fi Direct này sẽ bị hủy."
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "Để tiết kiệm nguồn pin, tắt Wi-Fi Direct sau khi sử dụng."
+
diff --git a/ug-wifidirect/po/zh_CN.po b/ug-wifidirect/po/zh_CN.po
index 9889d6e..9c56085 100644
--- a/ug-wifidirect/po/zh_CN.po
+++ b/ug-wifidirect/po/zh_CN.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "已连接"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "输入您的 ID。"
-msgid "IDS_WFD_CONNECTING"
-msgstr "连接中..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "已达到最大字符限制"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d 已选择"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "启动"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "。"
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "达到的最大字符数 %d"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "获取 IP 地址失败"
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "已连接至 Wi-Fi 网络 %s"
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "从不"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "正在断开..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "通过 Wi-Fi 和 4G 下载数据"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "通过 Wi-Fi 和 3G 下载数据"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "忘记"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "取消"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "确定"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "已连接"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "未知错误"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "在移动网络和无线网络之间自动切换以保持互联网连接稳定。"
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN 码不匹配!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "发生验证错误"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "激活中..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "将同时使用 Wi-Fi 和移动网络以使下载文件更快。此操作可能增加移动数据使用量。"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "已选择%d"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "智能网络切换已启用。该功能可通过在移动网络和 Wi-Fi 网络之间进行切换来帮助保持稳定的互联网连接。此操作可能增加您的数据使用量。"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "正在取消..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "已选择 %s。\n\n如果无法连接至 AP,请通过进入 SIM 卡管理器更改用于验证的 SIM 卡。然后选择您想要用于移动数据和彩信的 SIM 卡。或者,也可以卸载您不想使用的 SIM 卡。"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "不支持"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "%d分钟内在Wi-Fi接入点按下WPS钮。"
+
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "开放"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi直连"
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "未找到Wi-Fi AP。"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "当前网络将断开。"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "显示密码"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "开"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "关"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "忘记网络"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "智能网络切换"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "信号强度"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "减少移动数据使用量"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "速度优先"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "网络绑定"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi 网络信息"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "选择 WPS 方式"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "代理服务器地址"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "密码"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "输入密码"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS按钮"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "扫描"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi直连设备"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "查找隐藏网络"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "点击并连接"
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi网络可用。"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi 直连"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "仅在充电时"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "弱"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "用户证书"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "不明确的"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "未知"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "若要更快下载大文件,请同时使用 Wi-Fi 和移动网络。"
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "子网时标"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "静态IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "排序方式"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "扫描中..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "网络可用时接收通知"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "代理服务器端口"
+
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "名称"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC 地址"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP 地址"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "身份"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "网关地址"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "输入 ID。"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP 方法"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "连接中..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "连接"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "取消连接"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "已保存"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "已检测到 Wi-Fi 网络。您将连接。"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "高级设定"
+
+msgid "IDS_COM_SK_NO"
+msgstr "否"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "安全政策限制使用Wi-Fi。"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "轻敲此处以连接"
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "您的设备正在连接至 %1$s。然而,该网络可能不提供上网服务。\n点击确定不但可以立即保持连接至 %1$s,而且还可以防止智能网络切换在将来连接至该网络。"
+
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi和移动接入无法同时启动。取消移动接入?"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "关于 Wi-Fi 直连"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "登录至 Wi-Fi 网络"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi 直连使 Wi-Fi 设备能直接连接,让打印、文件共享、同步和屏幕共享更简单更方便。连接至支持 Wi-Fi 直连的设备使其能使用各种应用程序共享您的内容、同步您的数据、与好友进行社交、玩游戏、播放音频、视频以及其他"
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "互联网可能不可用"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "不要再询问"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "开放Wi-Fi设置"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "未找到设备"
+
+msgid "IDS_BR_SK_YES"
+msgstr "是"
+
+msgid "IDS_BR_SK_NO"
+msgstr "否"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "取消"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "重命名设备"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "我的设备名称"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "失败"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "取消"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "已连接"
+
+msgid "IDS_BR_SK_OK"
+msgstr "确定"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "显示设备名称以区分附近设备列表中可用的、以及通过蓝牙、Wi-Fi 直连及其他方式可用的各个设备。"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "重命名"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "轻敲以更改设定"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "输入的字符无效。请重试。"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "不支持"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "适用"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "连接失败"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi直连设备"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "点击并连接。"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "取消连接"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "已连接设备"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "全选"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "使用中的设备"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "已与另一设备连接"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "连接中..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "等待连接"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "连接失败"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "连接失败。"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "多连接"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "断开所有"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "断开"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "未找到设备"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "使用后禁用 Wi-Fi直连"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "使用后禁用Wi-Fi直连"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "使用后禁用 Wi-Fi直连以节省电池电量"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "在使用后禁用Wi-Fi直连以节省电池"
-msgid "IDS_WFD_POP_WIFI_OFF"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s 正在请求 Wi-Fi 直连连接。是否允许?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
msgstr "使用 Wi-Fi 直连将断开当前 Wi-Fi 连接。是否继续?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
msgstr "使用 Wi-Fi 直连将断开当前 Wi-Fi 网络共享。是否继续?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
-msgstr "Wi-Fi直连连"
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
+msgstr "Wi-Fi 直连连接"
+
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "断开Wi-Fi直连"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "是否取消 Wi-Fi直连 连接?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "没有设备"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "通过Wi-Fi直连连接到其它设备。"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "自 Wi-Fi直连 启用后已 %d 分钟无活动。若要延长电池寿命,Wi-Fi直连 已禁用。"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "扫描"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "停止"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "停用失败"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "激活失败"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "当前连接将断开。 继续?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "您同时可连接最多 %d 台设备。"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
msgstr "可用设备"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "您同时可连接最多 %d 台设备"
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "连接到 %s 失败。"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "设备已连接至另一设备。"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "已连接%s。"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN码不匹配。"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "正在取消..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "当前连接将断开使得扫描可开始。是否继续?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "连接失败的设备"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "输入PIN码以连接到%s。"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "在 %d 秒内连接至 %s。"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN 码 %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "选择设备"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi 直连连接已丢失。"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "请在 %d 秒内与 %s 连接。"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "重命名设备"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN 码"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "无法连接"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "停止连接"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "允许"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "激活中..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "连接"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "已连接"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "输入设备名称"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "已通过 Wi-Fi 直连与 %d 台设备连接。"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "未连接"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "该 Wi-Fi 直连连接将取消"
+
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "若要节省电池电力,使用后禁用 Wi-Fi 直连。"
diff --git a/ug-wifidirect/po/zh_HK.po b/ug-wifidirect/po/zh_HK.po
index e8515aa..cbe38dc 100644..100755
--- a/ug-wifidirect/po/zh_HK.po
+++ b/ug-wifidirect/po/zh_HK.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "已連接"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "輸入您的 ID。"
-msgid "IDS_WFD_CONNECTING"
-msgstr "連接中..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "字元數目已達上限。"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d 已選擇"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "啟用"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "。"
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "已達字元數量上限 %d"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "取得 IP 地址失敗。"
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "已連接至 Wi-Fi 網絡 %s"
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "從不"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "正在中斷連接..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "透過 Wi-Fi 和 4G 下載數據"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "透過 Wi-Fi 和 3G 下載數據"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS PIN"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "忘記"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "取消"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "確定"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "已連接"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "未知錯誤"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "在流動網絡與無線網絡之間自動切換以保持互聯網連接穩定。"
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN 碼不相符!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "發生認證錯誤"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "正在啟動..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "將同時使用 Wi-Fi 與流動網絡以使下載檔案更快。此操作可能增加流動數據使用量。"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "已選擇 %d"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "智能網絡切換已啟用。此功能可通過在流動網絡與 Wi-Fi 網絡之間進行切換來協助保持穩定的互聯網連接。此操作可能增加您的數據使用量。"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "正在關閉..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "已選擇 %s。\n\n若您無法連接至 AP,請通過前往 SIM 卡管理員變更用於驗證的 SIM 卡。然後選擇您想要用於流動數據與多媒體訊息的 SIM 卡。或者,您也可卸載不想使用的 SIM 卡。"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "不支援"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "在%d分鐘內按下Wi-Fi接入點的WPS。"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "開啟"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "找不到 Wi-Fi AP。"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "將中斷目前網絡的連接。"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "顯示密碼"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "開"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "關"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "忘記網絡"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "智能網絡切換"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "訊號強度"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "減少流動數據使用量"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "速度優先"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "網絡合併"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi 網絡資訊"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "選擇 WPS 方式"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "代理伺服器位址"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "密碼"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "輸入密碼。"
+
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS鍵"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "掃描"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct 裝置"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "尋找隱藏的網絡"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "Wi-Fi 網絡可用。"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "僅在充電時"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "弱"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "用戶證書"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "未指定"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "未知"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "若要使下載大檔案更快,請同時使用 Wi-Fi 和流動網絡。"
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "子網絡範圍"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "靜態 IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "排序方式"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "正在掃描..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "網絡可用時接收通知。"
+
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "代理伺服器端口"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "輕觸以連接"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "名稱"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC 地址"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP 地址"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "身份"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "網關地址"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "輸入身分。"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP 方法"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "連接中..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "連接"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "取消連接"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "已儲存"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "已偵測到 Wi-Fi 網絡。將會連接。"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "進階設定"
+
+msgid "IDS_COM_SK_NO"
+msgstr "否"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "安全政策限制使用 Wi-Fi。"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "輕觸此處以連接。"
+
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "您的裝置正在連接至 %1$s。然而,此網絡可能不提供互聯網存取功能。\n輕觸確定不但可以立即保持連接至 %1$s,而且還可以防止智能網絡切換在將來連接至此網絡。"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "關於 Wi-Fi Direct"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi-Fi和Mobile AP不可同時啟動。關閉Mobile AP嗎?"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct 讓 Wi-Fi 裝置可直接連接、列印、檔案共享、同步和螢幕共享更加容易且簡便。與支援 Wi-Fi Direct 的裝置連接,使用各種應用程式分享您的內容、同步數據、社群活動、玩遊戲、聽音樂、看影片以及其他。"
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "登入至 Wi-Fi 網絡"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "互聯網可能不可用"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "不再詢問"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "開啟 Wi-Fi 設定"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "找不到裝置"
+
+msgid "IDS_BR_SK_YES"
+msgstr "是"
+
+msgid "IDS_BR_SK_NO"
+msgstr "否"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "取消"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "重新命名裝置"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "我的裝置名稱"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "失敗。"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "取消"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "已連接"
+
+msgid "IDS_BR_SK_OK"
+msgstr "確定"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "顯示裝置名稱可區分附近裝置清單中通過藍牙、Wi-Fi Direct 與其他方式連接的所有可用裝置。"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "重新命名"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "輕觸以更改設定。"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "輸入的字元無效。請重試。"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "不支援"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "可用"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "連接失敗"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct 裝置"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "輕觸以連接。"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "取消連接"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "已連接裝置"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "選擇全部"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "裝置忙碌"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "已與其他裝置連接"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "連接中..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "正在等待連接"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "連接失敗"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "連接失敗。"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "多點連接"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "中斷所有連線"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "中斷連接"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "找不到裝置"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "使用後停用 Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "使用後停用 Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "使用後停用 Wi-Fi Direct 以節省電力"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "使用後停用 Wi-Fi Direct 以節省電池電力"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s 正在請求 Wi-Fi Direct 連接。允許嗎?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "使用 Wi-Fi Direct 將中斷目前 Wi-Fi 連接。繼續嗎?"
+
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "使用 Wi-Fi Direct 將中斷目前 Wi-Fi 網絡共享。繼續嗎?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct 連接"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "中斷 Wi-Fi Direct 的連接"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "取消 Wi-Fi Direct 連接嗎?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "無裝置"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "透過 Wi-Fi Direct 連接至其他裝置。"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "自 Wi-Fi Direct 啟用後,已有 %d 分鐘無活動。若要延長電池壽命,Wi-Fi Direct 已停用。"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "掃描"
+
+msgid "IDS_WIFI_SK_STOP"
msgstr "停止"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "關閉失敗"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "啟動失敗"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "目前連接將中斷。要繼續嗎?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "可用的裝置"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "最多可同時連接 %d 個裝置。"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "可用裝置"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "連接到 %s 失敗。"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "裝置已連接至其他裝置。"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "已連接至 %s。"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN 碼不符。"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "正在關閉..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "將中斷目前的連接以開始掃描。繼續嗎?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "無法連接的裝置"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "輸入 PIN 碼以連接至 %s。"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "在 %d 秒內連接至 %s。"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN 碼 %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "選擇裝置"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct 連接已中斷。"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "在 %d 秒內與 %s 連接。"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "重新命名裝置"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN 碼"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "無法連接"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "停止連接"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "允許"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "正在啟動..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "連接"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "已連接"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "輸入裝置名稱"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "已透過 Wi-Fi Direct 與 %d 裝置連接。"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "未連接"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "將取消此 Wi-Fi Direct 連接。"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "最多可同時連接 %d 個裝置"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "若要節省電量,請在使用後停用 Wi-Fi Direct。"
diff --git a/ug-wifidirect/po/zh_SG.po b/ug-wifidirect/po/zh_SG.po
deleted file mode 100644
index 078e07c..0000000
--- a/ug-wifidirect/po/zh_SG.po
+++ /dev/null
@@ -1,117 +0,0 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "已连接"
-
-msgid "IDS_WFD_CONNECTING"
-msgstr "连接中…"
-
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "正在中断连接…"
-
-msgid "IDS_WFD_POP_CONNECTED"
-msgstr "已连接"
-
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "未知的故障"
-
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN 码不匹配!"
-
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "启动中……"
-
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "已选择%d"
-
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "取消中…"
-
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "不支持"
-
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "直接Wi-Fi"
-
-msgid "IDS_WFD_BUTTON_SCAN"
-msgstr "扫描"
-
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "直接Wi-Fi设备"
-
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "点击并连接"
-
-msgid "IDS_WFD_BUTTON_CONNECT"
-msgstr "连接"
-
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "取消连接"
-
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "关于 WLAN 直连"
-
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "直接 Wi-Fi 使 Wi-Fi 设备能直接连接,让打印、文件共享、同步和屏幕共享更简单更方便。连接至支持 Wi-Fi Direct 的设备使其能使用各种应用程序共享您的内容、同步您的数据、与好友进行社交、玩游戏、播放音频、视频以及其他。"
-
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
-msgstr "已连接设备"
-
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
-msgstr "忙碌设备"
-
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
-msgstr "已与另一设备连接"
-
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "连接中…"
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
-msgstr "等待连接"
-
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "连接失败"
-
-msgid "IDS_WFD_BUTTON_MULTI"
-msgstr "多连接"
-
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
-msgstr "断开所有"
-
-msgid "IDS_WFD_BUTTON_DISCONNECT"
-msgstr "断开"
-
-msgid "IDS_WFD_NOCONTENT"
-msgstr "未找到设备"
-
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "使用WLAN直连将断开当前 Wi-Fi 连接。是否继续?"
-
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "使用WLAN直连将断开当前 Wi-Fi 网络共享。是否继续?"
-
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
-msgstr "直接Wi-Fi连接"
-
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
-msgstr "是否取消直接Wi-Fi连接?"
-
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "没有设备"
-
-msgid "IDS_WFD_BUTTON_STOPSCAN"
-msgstr "停止"
-
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
-msgstr "停用失败"
-
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
-msgstr "激活失败"
-
-msgid "IDS_WFD_POP_DISCONNECT"
-msgstr "当前连接将断开。 继续?"
-
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "可用设备"
-
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "您同时可连接至多 %d 台设备"
-
diff --git a/ug-wifidirect/po/zh_TW.po b/ug-wifidirect/po/zh_TW.po
index d851004..2641e13 100644..100755
--- a/ug-wifidirect/po/zh_TW.po
+++ b/ug-wifidirect/po/zh_TW.po
@@ -1,117 +1,471 @@
-msgid "IDS_WFD_CONNECTED"
-msgstr "已連線"
+msgid "IDS_WIFI_BODY_ENTER_YOUR_ID"
+msgstr "輸入您的 ID。"
-msgid "IDS_WFD_CONNECTING"
-msgstr "連線中..."
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "已達字元數上限。"
+
+msgid "IDS_ST_HEADER_PD_SELECTED"
+msgstr "%d已選擇"
+
+msgid "IDS_ST_BUTTON_ENABLE"
+msgstr "啟用"
+
+msgid "IDS_WIFI_BODY_DOT"
+msgstr "。"
+
+msgid "IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED"
+msgstr "已達字元數量上限 %d"
+
+msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS"
+msgstr "無法取得 IP 位址。"
+
+msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "已連接至 Wi-Fi 網路 %s"
+
+msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF"
+msgstr "從不"
-msgid "IDS_WFD_DISCONNECTING"
-msgstr "正在中斷連線..."
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_4G"
+msgstr "經 Wi-Fi 與 4G 下載資料"
-msgid "IDS_WFD_POP_CONNECTED"
+msgid "IDS_WIFI_TMBODY_DOWNLOAD_DATA_VIA_WI_FI_AND_3G"
+msgstr "經 Wi-Fi 與 3G 下載資料"
+
+msgid "IDS_WIFI_SK_WPS_PIN"
+msgstr "WPS的密碼"
+
+msgid "IDS_WIFI_SK_FORGET"
+msgstr "清除"
+
+msgid "IDS_WIFI_SK_CANCEL"
+msgstr "取消"
+
+msgid "IDS_WIFI_SK2_OK"
+msgstr "確定"
+
+msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS"
msgstr "已連線"
-msgid "IDS_WFD_POP_UNKNOWN_ERROR"
-msgstr "未知錯誤"
+msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION"
+msgstr "自動於 Wi-Fi 與行動網路間切換至維持穩定的網際網路連線。"
-msgid "IDS_WFD_POP_PIN_INVALID"
-msgstr "PIN 不符合!"
+msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS"
+msgstr "認證發生錯誤"
-msgid "IDS_WFD_BODY_ACTIVATING"
-msgstr "正在啟動..."
+msgid "IDS_WIFI_POP_WI_FI_AND_MOBILE_NETWORKS_WILL_BE_USED_TOGETHER_TO_DOWNLOAD_FILES_FASTER_MSG"
+msgstr "將同時使用 Wi-Fi 與行動網路以加速檔案的下載。這可能增加您的數據用量。"
-msgid "IDS_WFD_POP_SELECTED_DEVICE_NUM"
-msgstr "已選擇 %d"
+msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG"
+msgstr "智慧網路切換已啟用。此功能可於行動網路與 Wi-Fi 網路間切換以協助維持穩定的網路連線。可能產生數據用量。"
-msgid "IDS_WFD_BODY_DEACTIVATING"
-msgstr "正在停用..."
+msgid "IDS_WIFI_POP_PS_IS_SELECTED_N_NIF_YOU_ARE_UNABLE_TO_CONNECT_TO_AN_AP_CHANGE_THE_SIM_CARD_USED_FOR_VERIFICATION_BY_GOING_TO_SIM_CARD_MANAGER_MSG"
+msgstr "已選擇 %s。\n\n若您無法連線至 AP,請前往 SIM 卡管理工具來變更用於驗證的 SIM 卡。然後選擇欲用於行動數據與多媒體訊息的 SIM 卡。除此之外也可以卸除不想要使用的 SIM 卡。"
-msgid "IDS_WFD_POP_NOT_SUPPORTED_DEVICE"
-msgstr "不支援"
+msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES"
+msgstr "在%d分鐘內按下你的Wi - Fi WPS存取點。"
-msgid "IDS_WFD_HEADER_WIFI_DIRECT"
-msgstr "Wi-Fi Direct"
+msgid "IDS_WIFI_POP_OPEN"
+msgstr "開啟"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "找不到 Wi-Fi AP。"
+
+msgid "IDS_WIFI_POP_CURRENT_NETWORK_WILL_BE_DISCONNECTED"
+msgstr "即將中斷目前的網路連線。"
+
+msgid "IDS_WIFI_OPT_WPS"
+msgstr "WPS"
+
+msgid "IDS_WIFI_OPT_SHOW_PASSWORD"
+msgstr "顯示密碼"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON"
+msgstr "開"
+
+msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF"
+msgstr "關"
+
+msgid "IDS_WIFI_OPT_FORGET_NETWORK"
+msgstr "清除網路"
+
+msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH"
+msgstr "智慧網路切換"
+
+msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT"
+msgstr "訊號強度"
+
+msgid "IDS_WIFI_MBODY_REDUCE_MOBILE_DATA_USAGE"
+msgstr "降低行動數據用量"
+
+msgid "IDS_WIFI_MBODY_PRIORITISE_SPEED"
+msgstr "速度優先排序"
+
+msgid "IDS_WIFI_MBODY_NETWORK_BONDING"
+msgstr "網路合併"
+
+msgid "IDS_WIFI_HEADER_WI_FI_NETWORK_INFO_ABB"
+msgstr "Wi-Fi 網路資訊"
+
+msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB"
+msgstr "選擇 WPS 方式"
+
+msgid "IDS_WIFI_HEADER_PROXY_ADDRESS"
+msgstr "代理伺服器位址"
+
+msgid "IDS_WIFI_HEADER_PASSWORD"
+msgstr "密碼"
+
+msgid "IDS_WIFI_HEADER_ENTER_PASSWORD"
+msgstr "輸入密碼。"
-msgid "IDS_WFD_BUTTON_SCAN"
+msgid "IDS_WIFI_BUTTON_WPS_BUTTON"
+msgstr "WPS 按鈕"
+
+msgid "IDS_WIFI_BUTTON_SCAN"
msgstr "掃描"
-msgid "IDS_WFD_BODY_WIFI_DIRECT_DEVICES"
-msgstr "Wi-Fi Direct設備"
+msgid "IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK"
+msgstr "尋找隱藏的網路"
+
+msgid "IDS_WIFI_BODY_WI_FI_NETWORKS_AVAILABLE_ABB"
+msgstr "可用的 Wi-Fi 網路。"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"
+msgstr "Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WHILE_CHARGING_ONLY_ABB"
+msgstr "只在充電時"
+
+msgid "IDS_WIFI_BODY_WEAK_M_STRENGTH"
+msgstr "弱"
+
+msgid "IDS_WIFI_BODY_USER_CERTIFICATE_ABB"
+msgstr "使用者憑證"
+
+msgid "IDS_WIFI_BODY_UNSPECIFIED"
+msgstr "未指定"
+
+msgid "IDS_WIFI_BODY_UNKNOWN"
+msgstr "未知"
+
+msgid "IDS_WIFI_BODY_TO_DOWNLOAD_LARGE_FILES_FASTER_USE_WI_FI_AND_MOBILE_NETWORKS_TOGETHER_T_HELP"
+msgstr "若要加速下載大型檔案,可同時使用 Wi-Fi 與行動網路。"
+
+msgid "IDS_WIFI_BODY_SUBNET_MASK"
+msgstr "子網路遮罩"
+
+msgid "IDS_WIFI_BODY_STATIC_IP"
+msgstr "靜態 IP"
+
+msgid "IDS_WIFI_BODY_SSID"
+msgstr "SSID"
+
+msgid "IDS_WIFI_BODY_SORT_BY"
+msgstr "排序依據"
+
+msgid "IDS_WIFI_BODY_SCANNING_ING"
+msgstr "正在掃描..."
+
+msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE"
+msgstr "網路可用時接收通知"
-msgid "IDS_WFD_TAP_TO_CONNECT"
-msgstr "輕觸連接"
+msgid "IDS_WIFI_BODY_PROXY_PORT"
+msgstr "代理伺服器連接埠"
-msgid "IDS_WFD_BUTTON_CONNECT"
+msgid "IDS_WIFI_BODY_NAME"
+msgstr "名稱"
+
+msgid "IDS_WIFI_BODY_MAC_ADDRESS"
+msgstr "MAC 位址"
+
+msgid "IDS_WIFI_BODY_IP_ADDRESS"
+msgstr "IP 位址"
+
+msgid "IDS_WIFI_BODY_IDENTITY"
+msgstr "使用者"
+
+msgid "IDS_WIFI_BODY_GATEWAY_ADDRESS"
+msgstr "閘道位址"
+
+msgid "IDS_WIFI_BODY_ENTER_IDENTITY"
+msgstr "輸入身分。"
+
+msgid "IDS_WIFI_BODY_EAP_METHOD"
+msgstr "EAP 方法"
+
+msgid "IDS_WIFI_BODY_EAP"
+msgstr "EAP"
+
+msgid "IDS_WIFI_BODY_DNS_2"
+msgstr "DNS 2"
+
+msgid "IDS_WIFI_BODY_DNS_1"
+msgstr "DNS 1"
+
+msgid "IDS_WIFI_BODY_CONNECTING_ING"
+msgstr "連線中..."
+
+msgid "IDS_WIFI_BODY_CONNECT"
msgstr "連線"
-msgid "IDS_WFD_BUTTON_CANCEL"
-msgstr "取消連線"
+msgid "IDS_WIFI_BODY_CONFIGURATION_SAVED_M_STATUS"
+msgstr "已儲存"
+
+msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED"
+msgstr "已偵測到 Wi-Fi 網路。將會連接。"
+
+msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS"
+msgstr "進階設定"
+
+msgid "IDS_COM_SK_NO"
+msgstr "否"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "由於安全政策,使用Wi-Fi被限制。"
-msgid "IDS_WFD_TITLE_ABOUT_WIFI"
-msgstr "關於 Wi-Fi Direct"
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "輕觸此處以連接。"
-msgid "IDS_WFD_BODY_ABOUT_WIFI"
-msgstr "Wi-Fi Direct 是一個全新的連線技術,即使沒有連線到 Wi-Fi 網路你仍可透過 Wi-Fi 直接連接裝置,並簡單且方便的操作像列印,分享,同步和輸出顯示等功能。WiFi Direct 連接後,各種應用程式可以被分享其內容如同步您的資料,社群,玩遊戲,播放音樂和影片以及更多功能。"
+msgid "IDS_WIFI_POP_YOUR_DEVICE_IS_CONNECTING_TO_P1SS_HOWEVER_THIS_NETWORK_MAY_NOT_PROVIDE_INTERNET_ACCESS_MSG"
+msgstr "您的裝置正連接至 %1$s。\n現在請輕觸確定保持目前與 %1$s 的連接,同時防止智慧網路開關未來與此網路的連接。"
-msgid "IDS_WFD_BODY_CONNECTED_DEVICES"
+msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q"
+msgstr "Wi - Fi和行動AP不能在同一時間被啟動。停用行動AP?"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "登入 Wi-Fi 網路"
+
+msgid "IDS_WIFI_HEADER_INTERNET_MAY_NOT_BE_AVAILABLE_ABB"
+msgstr "網際網路可能無法使用"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "不要再詢問"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "開啟 Wi-Fi 設定"
+
+msgid "IDS_BT_BODY_NO_DEVICES_FOUND_ABB"
+msgstr "找不到裝置"
+
+msgid "IDS_BR_SK_YES"
+msgstr "是"
+
+msgid "IDS_BR_SK_NO"
+msgstr "否"
+
+msgid "IDS_BR_SK_CANCEL"
+msgstr "取消"
+
+msgid "IDS_ST_HEADER_RENAME_DEVICE"
+msgstr "重新命名裝置"
+
+msgid "IDS_ST_HEADER_MY_DEVICE_NAME"
+msgstr "我的裝置名稱"
+
+msgid "IDS_COM_POP_FAILED"
+msgstr "失敗。"
+
+msgid "IDS_COM_POP_CANCEL"
+msgstr "取消"
+
+msgid "IDS_COM_BODY_CONNECTED_M_STATUS"
+msgstr "已連線"
+
+msgid "IDS_BR_SK_OK"
+msgstr "確定"
+
+msgid "IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"
+msgstr "將顯示裝置名稱以區別附近裝置清單中各個可用的裝置,並顯示經藍牙、Wi-Fi Direct、與其他連接方式。"
+
+msgid "IDS_ST_SK_RENAME"
+msgstr "重新命名"
+
+msgid "IDS_ST_BODY_TAP_TO_CHANGE_SETTINGS"
+msgstr "輕觸以變更設定"
+
+msgid "IDS_ST_POP_INVALID_CHARACTER_ENTERED_TRY_AGAIN"
+msgstr "輸入的字元無效。請重試。"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "不支援"
+
+msgid "IDS_CHATON_BODY_AVAILABLE"
+msgstr "可用"
+
+msgid "IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"
+msgstr "連線失敗"
+
+msgid "IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES"
+msgstr "Wi-Fi Direct設備"
+
+msgid "IDS_WIFI_POP_TAP_TO_CONNECT"
+msgstr "輕觸連接。"
+
+msgid "IDS_WIFI_SK2_CANCEL_CONNECTION"
+msgstr "取消連線"
+
+msgid "IDS_ST_HEADER_CONNECTED_DEVICES"
msgstr "已連接的裝置"
-msgid "IDS_WFD_BODY_BUSY_DEVICES"
+msgid "IDS_WIFI_BODY_SELECT_ALL"
+msgstr "全選"
+
+msgid "IDS_ST_HEADER_BUSY_DEVICES"
msgstr "設備忙碌"
-msgid "IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"
+msgid "IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"
msgstr "已與其他裝置連接"
-msgid "IDS_WFD_POP_CONNECTING"
-msgstr "連線中..."
-
-msgid "IDS_WFD_WAITING_FOR_CONNECT"
+msgid "IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"
msgstr "正在等待連接"
-msgid "IDS_WFD_FAILED_TO_CONNECT"
-msgstr "連接失敗"
+msgid "IDS_ST_POP_FAILED_TO_CONNECT"
+msgstr "連接失敗。"
-msgid "IDS_WFD_BUTTON_MULTI"
+msgid "IDS_WIFI_BUTTON_MULTI_CONNECT"
msgstr "多點連線"
-msgid "IDS_WFD_BUTTON_DISCONNECT_ALL"
+msgid "IDS_WIFI_BUTTON_DISCONNECT_ALL"
msgstr "中斷所有連線"
-msgid "IDS_WFD_BUTTON_DISCONNECT"
+msgid "IDS_WIFI_SK_DISCONNECT"
msgstr "中斷連接"
-msgid "IDS_WFD_NOCONTENT"
-msgstr "沒有找到裝置"
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "使用後停用 Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB"
+msgstr "使用後停用 Wi-Fi Direct"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY"
+msgstr "使用後將停用 Wi-Fi Direct 以節省電力"
+
+msgid "IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_TO_SAVE_BATTERY_ABB"
+msgstr "使用後將停用 Wi-Fi Direct 以節省電力"
-msgid "IDS_WFD_POP_WIFI_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"
+msgid "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"
+msgstr "%s 正在請求 Wi-Fi Direct 連接。允許嗎?"
-msgid "IDS_WFD_POP_HOTSPOT_OFF"
-msgstr "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"
+msgstr "使用 Wi-Fi Direct 將中斷目前 Wi-Fi 連接。繼續嗎?"
-msgid "IDS_WFD_POP_TITILE_CONNECTION"
+msgid "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"
+msgstr "使用 Wi-Fi Direct 將中斷目前 Wi-Fi 網路共享。繼續嗎?"
+
+msgid "IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"
msgstr "Wi-Fi Direct 連線"
-msgid "IDS_WFD_POP_CANCEL_CONNECT"
+msgid "IDS_WIFI_MBODY_DISCONNECT_WI_FI_DIRECT"
+msgstr "中斷 Wi-Fi Direct 連接"
+
+msgid "IDS_WIFI_POP_CANCEL_WI_FI_DIRECT_CONNECTION_Q"
msgstr "取消 Wi-Fi Direct 連線嗎?"
-msgid "IDS_WFD_BODY_NO_DEVICES"
-msgstr "沒有找到裝置"
+msgid "IDS_WIFI_POP_CONNECT_TO_OTHER_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "透過 Wi-Fi Direct 連接至其他裝置。"
+
+msgid "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG"
+msgstr "自 Wi-Fi Direct 啟用後,已有 %d 分鐘未出現活動。Wi-Fi Direct 已停用以延長電池壽命。"
+
+msgid "IDS_WIFI_SK4_SCAN"
+msgstr "掃描"
-msgid "IDS_WFD_BUTTON_STOPSCAN"
+msgid "IDS_WIFI_SK_STOP"
msgstr "停止"
-msgid "IDS_WFD_POP_DEACTIVATE_FAIL"
+msgid "IDS_WIFI_POP_DEACTIVATION_FAILED"
msgstr "無法停用"
-msgid "IDS_WFD_POP_ACTIVATE_FAIL"
+msgid "IDS_WIMAX_POP_ACTIVATION_FAILED"
msgstr "啟動失敗"
-msgid "IDS_WFD_POP_DISCONNECT"
+msgid "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"
msgstr "目前連線將中斷。繼續?"
-msgid "IDS_WFD_BODY_AVAILABLE_DEVICES"
-msgstr "可用的裝置"
+msgid "IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"
+msgstr "最多可同時連接 %d 個裝置。"
+
+msgid "IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"
+msgstr "可用裝置"
+
+msgid "IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"
+msgstr "無法連線到 %s。"
+
+msgid "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"
+msgstr "裝置已連接至其他裝置。"
+
+msgid "IDS_WIFI_BODY_CONNECTED_TO_PS"
+msgstr "連接到%s。"
+
+msgid "IDS_COM_BODY_PINS_DO_NOT_MATCH"
+msgstr "PIN 碼不符合。"
+
+msgid "IDS_COM_POP_DEACTIVATING_ING"
+msgstr "正在停用..."
+
+msgid "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"
+msgstr "將中斷目前的連接以開始掃描。繼續嗎?"
+
+msgid "IDS_WIFI_HEADER_DEVICES_THAT_FAILED_TO_CONNECT"
+msgstr "無法連接的裝置"
+
+msgid "IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"
+msgstr "輸入 PIN 碼以連結至 %s。"
+
+msgid "IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"
+msgstr "在 %2$d 秒內連接至 %1$s。"
+
+msgid "IDS_WIFI_POP_PIN_CODE_PS"
+msgstr "PIN 碼 %s"
+
+msgid "IDS_DLNA_HEADER_SELECT_DEVICES_ABB"
+msgstr "選擇裝置"
+
+msgid "IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST"
+msgstr "Wi-Fi Direct 連接已中斷。"
+
+msgid "IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"
+msgstr "於 %d 秒內與 %s 連接。"
+
+msgid "IDS_ST_BODY_RENAME_DEVICE_ABB"
+msgstr "重新命名裝置"
+
+msgid "IDS_WIFI_POP_PIN"
+msgstr "PIN"
+
+msgid "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2"
+msgstr "無法連接"
+
+msgid "IDS_WIFI_BUTTON_STOP_CONNECTION_ABB"
+msgstr "停止連線"
+
+msgid "IDS_WIFI_BUTTON_ALLOW"
+msgstr "允許"
+
+msgid "IDS_COM_POP_ACTIVATING"
+msgstr "正在啟動..."
+
+msgid "IDS_WIFI_SK_CONNECT"
+msgstr "連線"
+
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "已連線"
+
+msgid "IDS_STU_HEADER_ENTER_DEVICE_NAME"
+msgstr "輸入裝置名稱"
+
+msgid "IDS_ST_POP_CONNECTED_WITH_PD_DEVICES_VIA_WI_FI_DIRECT"
+msgstr "Wi-Fi Direct 已連接 %d 台裝置。"
+
+msgid "IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"
+msgstr "未連接"
+
+msgid "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"
+msgstr "將取消此 Wi-Fi Direct 連線。"
-msgid "IDS_WFD_POP_MULTI_CONNECT"
-msgstr "最多可同時連接 %d 個裝置"
+msgid "IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE"
+msgstr "若要節省電量,請在使用後停用 Wi-Fi Direct。"
diff --git a/ug-wifidirect/resources/icons/settings_wifi_direct.png b/ug-wifidirect/resources/icons/settings_wifi_direct.png
new file mode 100644
index 0000000..9027a3c
--- /dev/null
+++ b/ug-wifidirect/resources/icons/settings_wifi_direct.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_Connect.png b/ug-wifidirect/resources/images/A09_Connect.png
deleted file mode 100755
index ef2821d..0000000
--- a/ug-wifidirect/resources/images/A09_Connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_NoDevice.png b/ug-wifidirect/resources/images/A09_NoDevice.png
deleted file mode 100755
index 5b859c0..0000000
--- a/ug-wifidirect/resources/images/A09_NoDevice.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_Medical.png b/ug-wifidirect/resources/images/A09_device_Medical.png
new file mode 100644
index 0000000..cf76d51
--- /dev/null
+++ b/ug-wifidirect/resources/images/A09_device_Medical.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_audio_devices.png b/ug-wifidirect/resources/images/A09_device_audio_devices.png
deleted file mode 100755
index a9eddde..0000000
--- a/ug-wifidirect/resources/images/A09_device_audio_devices.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_audio_devices_connect.png b/ug-wifidirect/resources/images/A09_device_audio_devices_connect.png
deleted file mode 100644
index afc8967..0000000
--- a/ug-wifidirect/resources/images/A09_device_audio_devices_connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_camera.png b/ug-wifidirect/resources/images/A09_device_camera.png
index ee1cc73..9e45d9e 100755..100644
--- a/ug-wifidirect/resources/images/A09_device_camera.png
+++ b/ug-wifidirect/resources/images/A09_device_camera.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_camera_connect.png b/ug-wifidirect/resources/images/A09_device_camera_connect.png
deleted file mode 100644
index 623056a..0000000
--- a/ug-wifidirect/resources/images/A09_device_camera_connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_computer.png b/ug-wifidirect/resources/images/A09_device_computer.png
index 293deb7..5003bc5 100755..100644
--- a/ug-wifidirect/resources/images/A09_device_computer.png
+++ b/ug-wifidirect/resources/images/A09_device_computer.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_display.png b/ug-wifidirect/resources/images/A09_device_display.png
index 87aa317..da5986e 100755..100644
--- a/ug-wifidirect/resources/images/A09_device_display.png
+++ b/ug-wifidirect/resources/images/A09_device_display.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_display_connect.png b/ug-wifidirect/resources/images/A09_device_display_connect.png
deleted file mode 100644
index 361009a..0000000
--- a/ug-wifidirect/resources/images/A09_device_display_connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_gaming.png b/ug-wifidirect/resources/images/A09_device_gaming.png
new file mode 100644
index 0000000..bf281f4
--- /dev/null
+++ b/ug-wifidirect/resources/images/A09_device_gaming.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_gaming_devices.png b/ug-wifidirect/resources/images/A09_device_gaming_devices.png
deleted file mode 100755
index 8672a46..0000000
--- a/ug-wifidirect/resources/images/A09_device_gaming_devices.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_headphone.png b/ug-wifidirect/resources/images/A09_device_headphone.png
new file mode 100644
index 0000000..07eb0cb
--- /dev/null
+++ b/ug-wifidirect/resources/images/A09_device_headphone.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_headset.png b/ug-wifidirect/resources/images/A09_device_headset.png
new file mode 100644
index 0000000..4077a49
--- /dev/null
+++ b/ug-wifidirect/resources/images/A09_device_headset.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_input_device.png b/ug-wifidirect/resources/images/A09_device_input_device.png
index 4130993..6416886 100755..100644
--- a/ug-wifidirect/resources/images/A09_device_input_device.png
+++ b/ug-wifidirect/resources/images/A09_device_input_device.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_input_device_connect.png b/ug-wifidirect/resources/images/A09_device_input_device_connect.png
deleted file mode 100644
index 5de49c3..0000000
--- a/ug-wifidirect/resources/images/A09_device_input_device_connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_mouse.png b/ug-wifidirect/resources/images/A09_device_mouse.png
new file mode 100644
index 0000000..05436ca
--- /dev/null
+++ b/ug-wifidirect/resources/images/A09_device_mouse.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_multimedia.png b/ug-wifidirect/resources/images/A09_device_multimedia.png
new file mode 100644
index 0000000..7500b9e
--- /dev/null
+++ b/ug-wifidirect/resources/images/A09_device_multimedia.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_multimedia_devices.png b/ug-wifidirect/resources/images/A09_device_multimedia_devices.png
deleted file mode 100755
index 0d10f38..0000000
--- a/ug-wifidirect/resources/images/A09_device_multimedia_devices.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_multimedia_devices_connect.png b/ug-wifidirect/resources/images/A09_device_multimedia_devices_connect.png
deleted file mode 100644
index 367209f..0000000
--- a/ug-wifidirect/resources/images/A09_device_multimedia_devices_connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_network_infrastructure.png b/ug-wifidirect/resources/images/A09_device_network_infrastructure.png
index f0ef92c..fbd618f 100755..100644
--- a/ug-wifidirect/resources/images/A09_device_network_infrastructure.png
+++ b/ug-wifidirect/resources/images/A09_device_network_infrastructure.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_network_infrastructure_connect.png b/ug-wifidirect/resources/images/A09_device_network_infrastructure_connect.png
deleted file mode 100644
index 8699a57..0000000
--- a/ug-wifidirect/resources/images/A09_device_network_infrastructure_connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_printer.png b/ug-wifidirect/resources/images/A09_device_printer.png
index 3b36c01..1fe3d9e 100755..100644
--- a/ug-wifidirect/resources/images/A09_device_printer.png
+++ b/ug-wifidirect/resources/images/A09_device_printer.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_printer_connect.png b/ug-wifidirect/resources/images/A09_device_printer_connect.png
deleted file mode 100644
index 13d860f..0000000
--- a/ug-wifidirect/resources/images/A09_device_printer_connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_storage.png b/ug-wifidirect/resources/images/A09_device_storage.png
index d0d94e9..34a28c7 100755..100644
--- a/ug-wifidirect/resources/images/A09_device_storage.png
+++ b/ug-wifidirect/resources/images/A09_device_storage.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_storage_connect.png b/ug-wifidirect/resources/images/A09_device_storage_connect.png
deleted file mode 100644
index c63de69..0000000
--- a/ug-wifidirect/resources/images/A09_device_storage_connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_telephone.png b/ug-wifidirect/resources/images/A09_device_telephone.png
index 83d7507..9a4bfa6 100755..100644
--- a/ug-wifidirect/resources/images/A09_device_telephone.png
+++ b/ug-wifidirect/resources/images/A09_device_telephone.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_telephone_connect.png b/ug-wifidirect/resources/images/A09_device_telephone_connect.png
deleted file mode 100644
index b6a7e14..0000000
--- a/ug-wifidirect/resources/images/A09_device_telephone_connect.png
+++ /dev/null
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_unknown.png b/ug-wifidirect/resources/images/A09_device_unknown.png
new file mode 100644
index 0000000..a8b93cf
--- /dev/null
+++ b/ug-wifidirect/resources/images/A09_device_unknown.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/U04_device_BD.png b/ug-wifidirect/resources/images/U04_device_BD.png
new file mode 100644
index 0000000..cb75b50
--- /dev/null
+++ b/ug-wifidirect/resources/images/U04_device_BD.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/U04_device_Dongle.png b/ug-wifidirect/resources/images/U04_device_Dongle.png
new file mode 100644
index 0000000..9ac05e4
--- /dev/null
+++ b/ug-wifidirect/resources/images/U04_device_Dongle.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/U04_device_Home_Theater.png b/ug-wifidirect/resources/images/U04_device_Home_Theater.png
new file mode 100644
index 0000000..e0e98cf
--- /dev/null
+++ b/ug-wifidirect/resources/images/U04_device_Home_Theater.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/U04_device_STB.png b/ug-wifidirect/resources/images/U04_device_STB.png
new file mode 100644
index 0000000..7cdd58c
--- /dev/null
+++ b/ug-wifidirect/resources/images/U04_device_STB.png
Binary files differ
diff --git a/ug-wifidirect/resources/images/A09_device_computer_connect.png b/ug-wifidirect/resources/images/icon_select_all.png
index 8968996..0c531fc 100644
--- a/ug-wifidirect/resources/images/A09_device_computer_connect.png
+++ b/ug-wifidirect/resources/images/icon_select_all.png
Binary files differ
diff --git a/ug-wifidirect/resources/wfd_ug.edc b/ug-wifidirect/resources/wfd_ug.edc
index e05691d..aa7fad1 100644
--- a/ug-wifidirect/resources/wfd_ug.edc
+++ b/ug-wifidirect/resources/wfd_ug.edc
@@ -1,248 +1,535 @@
+#define RENAME_POPUP_ENTRY_2BUTTON_BG_MIN 0 374
+#define TOOLBAR_H 108
+#define INDICATOR_H 32
+#define TITLE_P_H 65
+#define TITLE_L_H 30
+#define TOOLBAR_H 108
+#define POPUP_WITH_2_GL_ITEMS 200
+
+#define RESOURCE_IMAGE( FILE_NAME ) \
+ group { \
+ name: FILE_NAME; \
+ images.image: FILE_NAME COMP; \
+ parts { \
+ part { name: "image"; \
+ description { \
+ state: "default" 0.0; \
+ image.normal: FILE_NAME; \
+ aspect: 1 1; \
+ aspect_preference: BOTH; \
+ } \
+ repeat_events: 1; \
+ } \
+ } \
+ }
+
+#define RESOURCE_IMAGE_MORE( FILE_NAME ) \
+ group { \
+ name: FILE_NAME; \
+ images.image: FILE_NAME COMP; \
+ parts { \
+ part { name: "image"; \
+ description { \
+ state: "default" 0.0; \
+ image.normal: FILE_NAME; \
+ fixed: 1 1; \
+ min: 60 60; \
+ max: 60 60; \
+ } \
+ } \
+ } \
+ }
+
+#define IMG_SELECT_ALL "icon_select_all.png"
+
+images {
+ image: IMG_SELECT_ALL COMP;
+}
+
collections {
+ RESOURCE_IMAGE("A09_device_computer.png");
+ RESOURCE_IMAGE("A09_device_input_device.png");
+ RESOURCE_IMAGE("A09_device_printer.png");
+ RESOURCE_IMAGE("A09_device_camera.png");
+ RESOURCE_IMAGE("A09_device_storage.png");
+ RESOURCE_IMAGE("A09_device_network_infrastructure.png");
+ RESOURCE_IMAGE("A09_device_display.png");
+ RESOURCE_IMAGE("A09_device_multimedia.png");
+ RESOURCE_IMAGE("A09_device_gaming.png");
+ RESOURCE_IMAGE("A09_device_telephone.png");
+ RESOURCE_IMAGE("A09_device_headset.png");
+ RESOURCE_IMAGE("A09_device_unknown.png");
+
+ RESOURCE_IMAGE("U04_device_BD.png");
+ RESOURCE_IMAGE("U04_device_Dongle.png");
+ RESOURCE_IMAGE("U04_device_Home_Theater.png");
+ RESOURCE_IMAGE("U04_device_STB.png");
+
+ RESOURCE_IMAGE("A09_device_headphone.png");
+ RESOURCE_IMAGE("A09_device_Medical.png");
+ RESOURCE_IMAGE("A09_device_mouse.png");
+
+ base_scale: 1.8;
+
+ styles{
+ style {
+ name: "textblock_style";
+ base: "font=Tizen tyle=Regular font_size=32 align=left color=#808080 linesize=38 wrap=word";
+ tag: "br" "\n";
+ tag: "hilight" "+ font_weight=Bold";
+ tag: "b" "+ font_weight=Bold";
+ tag: "tab" "\t";
+ }
+ }
+
+ group {
+ name: "icon.select_all";
+ images { image: IMG_SELECT_ALL COMP; }
+ parts {
+ part { name: "icon";
+ type: IMAGE;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ image.normal: IMG_SELECT_ALL;
+ }
+ }
+ }
+}
+
group {
- name: "progress_popup";
+ name: "genlist_button";
parts {
part {
name: "base";
type: RECT;
description {
state: "default" 0.0;
- min: 426 270;
- fixed: 1 1;
- rel1 { relative: 0 0; /*offset: 0 0;*/ }
- rel2 { relative: 1 1; /*offset: -1 -1;*/ }
+ align: 0.5 0.5;
color: 0 0 0 0;
}
}
part {
- name: "popup_pb";
+ name: "elm.swallow.icon";
+ type: SWALLOW;
+ description {
+ state: "default" 0.0;
+ min: 0 72;
+ fixed: 0 1;
+ rel1 {
+ relative: 0.1 0.1; to: "base";
+ }
+ rel2 {
+ relative: 0.9 0.9; to: "base";
+ }
+ }
+ }
+ }
+ }
+ group {
+ name: "main_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: "help_layout";
+ parts{
+ part
+ {
+ name: "left_pad";
+ type: RECT;
+ scale: 1;
+ description
+ {
+ state: "default" 0.0;
+ color : 0 0 0 0;
+ min: 38 32;
+ max: 38 32;
+ fixed: 1 1;
+ rel1 {relative: 0 0;}
+ align: 0 0;
+ }
+ }
+ part
+ {
+ name: "right_pad";
+ type: RECT;
+ scale: 1;
+ description
+ {
+ state: "default" 0.0;
+ color : 0 0 0 0;
+ min: 30 32;
+ max: 30 32;
+ fixed: 1 1;
+ rel2 {relative: 1 1;}
+ align: 1 1;
+ }
+ }
+ part
+ {
+ name: "entry_part";
+ type: SWALLOW;
+ mouse_events: 1;
+ scale:1;
+
+ description
+ {
+ state: "default" 0.0;
+ align: 0 0;
+ fixed: 1 1;
+ rel1 {relative: 1 1; to: "left_pad";}
+ rel2 {relative: 0 0; to: "right_pad";}
+ }
+ }
+ }
+ }
+
+ group { name: "main_layout";
+ parts {
+ part { name: "bg";
+ type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1 { relative: 0.0 0.0;}
+ rel2 { relative: 1.0 1.0; }
+ color: 0 0 0 0;
+ }
+ description { state: "horizontal" 0.0;
+ rel1 { relative: 0.0 0.0;}
+ rel2 { relative: 1.0 1.0; }
+ color: 0 0 0 0;
+ }
+ }
+ part {
+ name: "button_bg";
+ type: RECT;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ min: 400 TOOLBAR_H;
+ max: -1 TOOLBAR_H;
+ fixed: 0 0;
+ rel1 {
+ relative: 0.0 1.0;
+ offset: 0 -TOOLBAR_H;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: 0 0;
+ }
+ color_class: "B062";
+ }
+ }
+ part {
+ name: "button.big";
+ type: SWALLOW;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ min: 0 74;
+ max: -1 TOOLBAR_H;
+ fixed: 0 0;
+ rel1 {
+ relative: 0.0 1.0;
+ offset: 21 -TOOLBAR_H;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -21 0;
+ }
+ }
+ description { state: "horizontal" 0.0;
+ inherit: "default" 0.0;
+ }
+ }
+ part {
+ name: "button.prev";
type: SWALLOW;
+ scale: 1;
description {
state: "default" 0.0;
- min: 118 100;
- max: 118 100;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 0.2 1.0; }
+ min: 0 74;
+ max: -1 TOOLBAR_H;
+ fixed: 0 0;
+ rel1 {
+ relative: 0.0 1.0;
+ offset: 21 -TOOLBAR_H;
+ }
+ rel2 {
+ relative: 0.5 1.0;
+ offset: -6 0;
+ }
+ }
+ description { state: "horizontal" 0.0;
+ inherit: "default" 0.0;
}
}
part {
- name: "popup_progress_text";
+ name: "button.next";
type: SWALLOW;
+ scale: 1;
description {
state: "default" 0.0;
- rel1 { relative: 0.2 0.1; to: "base";}
- rel2 { relative: 1.0 0.9; to: "base";}
+ min: 0 74;
+ max: -1 TOOLBAR_H;
+ fixed: 0 0;
+ rel1 {
+ relative: 0.5 1.0;
+ offset: 6 -TOOLBAR_H;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -21 0;
+ }
+ }
+ description { state: "horizontal" 0.0;
+ inherit: "default" 0.0;
+ }
+ }
+ part { name: "genlist-bg";
+ type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
+ offset: 0 -TOOLBAR_H;
+ }
+ color_class: "B041";
+ }
+ description { state: "horizontal" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
+ offset: 0 -TOOLBAR_H;
+ }
+ color_class: "B041";
+ }
+ }
+ part { name: "elm.swallow.content";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 0 0;
+ rel1 {
+ relative: 0.0 0.0;
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
+ offset: 0 -TOOLBAR_H;
+ }
+ }
+ description { state: "horizontal" 0.0;
+ fixed: 0 0;
+ rel1 {
+ relative: 0.0 0.0;
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
+ offset: 0 -TOOLBAR_H;
+ }
}
}
}
}
- group { name: "elm/genlist/item/variable_height/default/default";
- alias: "elm/genlist/item_odd/variable_height/default/default";
-
- data.item: "stacking" "above";
- data.item: "selectraise" "on";
- data.item: "texts" "elm.text";
- data.item: "contents" "elm.icon";
- data.item: "treesize" "20";
- images {
- image: "00_list_bar_press_1x80.png" COMP;
- }
- parts {
- part { name: "base";
- type: RECT;
- repeat_events: 1;
- scale: 1;
- description { state: "default" 0.0;
- min: 0 0;
- color: 0 0 0 0;
+ //this is for custom genlist item
+ group { name: "elm/genlist/item/custom.multiview.subtitle/default";
+
+ data.item: "stacking" "above";
+ data.item: "selectraise" "on";
+ data.item: "texts" "elm.text";
+ data.item: "contents" "elm.icon";
+
+ parts {
+ part {
+ name: "base";
+ type: RECT;
+ mouse_events: 0;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 0;
+ min: 0 76;
+ }
+ }
+ part {
+ name: "left_padding";
+ type: SPACER;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ min: 28 0;
+ fixed: 1 0;
+ align: 0.0 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ }
+ rel2 {
+ relative: 0.0 1.0;
+ }
+ }
+ }
+ part {
+ name: "elm.text";
+ scale: 1;
+ type: TEXT;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ align: 0.0 0.0;
+ min: 360 0;
+ fixed: 1 0;
+ color_class: "T027";
+ rel1 {
+ relative: 1.0 0.0; to: "left_padding";
+ }
+ rel2 {
+ relative: 1.0 1.0; to: "left_padding";
+ }
+ text {
+ align: 0.0 0.5;
+ min: 0 1;
+ font: "Tizen:style=Regular";
+ size: 32;
+ text_class: "list_item";
+ }
+ }
+ }
+ part {
+ name: "elm.icon";
+ scale: 0;
+ type: SWALLOW;
+ description {
+ state: "default" 0.0;
+ align: 1.0 0.0;
+ fixed: 1 1;
+ rel1 {
+ relative: 1.0 23/76; to: "base";
+ }
+ rel2 {
+ relative: 1.0 59/76; to: "base"; offset: -26 0;
+ }
+ min: 36 36;
+ max: 36 36;
+ }
+ }
+
+ part { name: "bottom_line";
+ scale: 1;
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ min: 0 4;
+ color_class: "W021L2";
+ fixed: 0 1;
+ align: 0.5 1.0;
+ rel1 {
+ relative: 0.0 1.0; to_x: "base"; to_y: "elm.icon"; offset: 4 13;
+ }
+ rel2 {
+ relative: 1.0 1.0; to_x: "base"; to_y: "elm.icon"; offset: -5 17;
+ }
+ visible: 1;
+ }
}
- }
-
- part { name: "bg_image";
- clip_to: "disclip";
- mouse_events: 0;
- description { state: "default" 0.0;
- visible: 0;
- image.normal: "00_list_bar_press_1x80.png";
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
-
- part { name: "bottom_line";
- type: RECT;
- clip_to: "disclip";
- mouse_events: 0;
- description { state: "default" 0.0;
- min: 0 1;
- fixed: 0 1;
- visible: 1;
- color: 212 212 212 255;
- rel1 {
- relative: 0.0 1.0;
- offset: 0 -1;
- }
- }
- }
-
- part { name: "elm.padding.left";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 15 0;
- fixed: 1 0;
- visible: 0;
- rel2.relative: 0.0 1.0;
- align: 0.0 0.0;
- }
- }
-
- part { name: "elm.padding.right";
- type: RECT;
- scale: 1;
- description { state: "default" 0.0;
- min: 15 0;
- fixed: 1 0;
- visible: 0;
- rel1.relative: 1.0 0.0;
- align: 1.0 0.0;
- }
- }
-
- part { name: "elm.padding.top";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 0 10;
- fixed: 0 1;
- visible: 0;
- rel2.relative: 1.0 0.0;
- align: 0.0 0.0;
- }
- }
-
- part { name: "elm.padding.bottom";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 0 10;
- fixed: 0 1;
- visible: 0;
- rel1.relative: 0.0 1.0;
- align: 0.0 1.0;
- }
- }
-
- part { name: "elm.text";
- clip_to: "text_clip";
- type: TEXTBLOCK;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- align: 0.0 0.5;
- min: 460 0;
- fixed: 1 0;
- rel1 {
- relative: 1 1.0;
- to_x: "elm.padding.left";
- to_y: "elm.padding.top";
- }
- rel2 {
- relative: 1 0.0;
- to_x: "elm.padding.left";
- to_y: "elm.padding.bottom";
- }
- text {
- style: textblock_style_variable_height;
- min: 1 1;
- align: 0 0.5;
- }
- }
- }
- part { name: "text_clip";
- clip_to: "disclip";
- type: RECT;
- description { state: "default" 0.0;
- align: 0.0 0.5;
- rel1 {
- relative: 1 1;
- to_x: "elm.padding.left";
- to_y: "elm.padding.top";
- }
- rel2 {
- relative: 0 0;
- to_x: "elm.padding.right";
- to_y: "elm.padding.bottom";
- }
- }
- }
- part { name: "elm.icon";
- clip_to: "disclip";
- type: SWALLOW;
- mouse_events: 1;
- scale: 1;
- description { state: "default" 0.0;
- align: 0.5 0.5;
- rel1 {
- relative: 1 1;
- to_x: "elm.padding.left";
- to_y: "elm.padding.top";
- }
- rel2 {
- relative: 0 0;
- to_x: "elm.padding.right";
- to_y: "elm.padding.bottom";
- }
- }
- }
-
- part { name: "disclip";
- type: RECT;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
-// color: 255 255 255 64;
- color: 0 0 0 0;
- }
- }
-
- }
- programs {
- program { name: "go_active";
- signal: "elm,state,selected";
- source: "elm";
- action: STATE_SET "selected" 0.0;
- target: "bg_image";
- }
- program { name: "go_passive";
- signal: "elm,state,unselected";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "bg_image";
- transition: LINEAR 0.1;
- }
- program { name: "go_disabled";
- signal: "elm,state,disabled";
- source: "elm";
- action: STATE_SET "disabled" 0.0;
- target: "disclip";
- }
- program { name: "go_enabled";
- signal: "elm,state,enabled";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "disclip";
- }
- }
- }
+ }
+ }
}
diff --git a/ug-wifidirect/setting-wifidirect-efl.xml b/ug-wifidirect/setting-wifidirect-efl.xml
new file mode 100644
index 0000000..44d05e1
--- /dev/null
+++ b/ug-wifidirect/setting-wifidirect-efl.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="setting-wifidirect-efl" version="1.1.2" install-location="internal-only">
+ <label>Wi-Fi Direct Setting</label>
+ <author email="sungsik.jang@samsung.com" href="www.samsung.com">Sungsik Jang</author>
+ <description>Wi-Fi Direct setting UG</description>
+ <ui-application appid="setting-wifidirect-efl" exec="/usr/apps/setting-wifidirect-efl/bin/ug-setting-wifidirect-efl" ui-gadget="true" nodisplay="true" multiple="false" type="capp" taskmanage="false" process-pool="true" hw-acceleration="use-GL">
+ <icon>/usr/apps/setting-wifidirect-efl/shared/icons/settings_wifi_direct.png</icon>
+ <label>Wi-Fi Direct Setting</label>
+ <label xml:lang="en-us">Wi-Fi Direct Setting</label>
+ </ui-application>
+</manifest>
diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c
index d0c3ae9..8bd357b 100755..100644
--- a/ug-wifidirect/src/wfd_client.c
+++ b/ug-wifidirect/src/wfd_client.c
@@ -22,936 +22,1941 @@
#include <libintl.h>
#include <Elementary.h>
-#include <pmapi.h>
#include <vconf.h>
-//#include <vconf-keys.h>
+#include <vconf-keys.h>
+
#include <tethering.h>
+
#include <network-cm-intf.h>
#include <network-wifi-intf.h>
+
#include <wifi-direct.h>
#include "wfd_ug.h"
#include "wfd_ug_view.h"
#include "wfd_client.h"
+bool _wfd_discoverd_peer_cb(wifi_direct_discovered_peer_info_s *peer, void *user_data);
+
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
+/**
+ * This function let the ug make a change callback for wifi state
+ * @return void
+ * @param[in] key the pointer to the key
+ * @param[in] data the pointer to the main data structure
+ */
static void _wifi_state_cb(keynode_t *key, void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int res;
- int wifi_state;
-
- res = vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
- if (res != 0)
- {
- DBG(LOG_ERROR, "Failed to get wifi state from vconf. [%d]\n", res);
- // TODO: set genlist head item as "WiFi Direct"
- return;
- }
-
- if(wifi_state == VCONFKEY_WIFI_OFF)
- {
- DBG(LOG_VERBOSE, "WiFi is turned off\n");
- wfd_client_swtch_force(ugd, TRUE);
- }
- else
- {
- DBG(LOG_VERBOSE, "WiFi is turned on\n");
- }
-
- res = net_deregister_client();
- if(res != NET_ERR_NONE)
- {
- DBG(LOG_ERROR, "Failed to deregister network client. [%d]\n", res);
- }
-
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ int res;
+ int wifi_state;
+
+ res = vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
+ if (res != 0) {
+ DBG(LOG_ERROR, "Failed to get wifi state from vconf. [%d]\n", res);
+ return;
+ }
+
+ if (wifi_state == VCONFKEY_WIFI_OFF) {
+ DBG(LOG_INFO, "WiFi is turned off\n");
+ wfd_client_swtch_force(ugd, TRUE);
+ } else {
+ DBG(LOG_INFO, "WiFi is turned on\n");
+ }
+
+ res = net_deregister_client();
+ if (res != NET_ERR_NONE) {
+ DBG(LOG_ERROR, "Failed to deregister network client. [%d]\n", res);
+ }
+
+ __FUNC_EXIT__;
}
+/**
+ * This function let the ug make a event callback for network registering
+ * @return void
+ * @param[in] event_info the pointer to the information of network event
+ * @param[in] user_data the pointer to the user data
+ */
static void _network_event_cb(net_event_info_t *event_info, void *user_data)
{
- __FUNC_ENTER__;
- DBG(LOG_VERBOSE, "Event from network. [%d]\n", event_info->Event);
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+ DBG(LOG_INFO, "Event from network. [%d]\n", event_info->Event);
+ __FUNC_EXIT__;
}
+/**
+ * This function let the ug turn wifi off
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int wfd_wifi_off(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int res;
-
- res = vconf_notify_key_changed(VCONFKEY_WIFI_STATE, _wifi_state_cb, ugd);
- if (res == -1)
- {
- DBG(LOG_ERROR, "Failed to register vconf callback\n");
- return -1;
- }
- DBG(LOG_VERBOSE, "Vconf key callback is registered\n");
- res = net_register_client((net_event_cb_t) _network_event_cb, NULL);
- if(res != NET_ERR_NONE)
- {
- DBG(LOG_ERROR, "Failed to register network client. [%d]\n", res);
- return -1;
- }
- DBG(LOG_VERBOSE, "Network client is registered\n");
- res = net_wifi_power_off();
- if(res != NET_ERR_NONE)
- {
- DBG(LOG_ERROR, "Failed to turn off wifi. [%d]\n", res);
- return -1;
- }
- DBG(LOG_VERBOSE, "WiFi power off\n");
- __FUNC_EXIT__;
- return 0;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ int res;
+
+ res = vconf_notify_key_changed(VCONFKEY_WIFI_STATE, _wifi_state_cb, ugd);
+ if (res == -1) {
+ DBG(LOG_ERROR, "Failed to register vconf callback\n");
+ return -1;
+ }
+
+ DBG(LOG_INFO, "Vconf key callback is registered\n");
+
+ res = net_register_client((net_event_cb_t) _network_event_cb, NULL);
+ if (res != NET_ERR_NONE) {
+ DBG(LOG_ERROR, "Failed to register network client. [%d]\n", res);
+ return -1;
+ }
+
+ DBG(LOG_INFO, "Network client is registered\n");
+
+ res = net_wifi_power_off();
+ if (res != NET_ERR_NONE) {
+ DBG(LOG_ERROR, "Failed to turn off wifi. [%d]\n", res);
+ return -1;
+ }
+
+ DBG(LOG_INFO, "WiFi power off\n");
+
+ __FUNC_EXIT__;
+ return 0;
+}
+#endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
+
+
+/**
+ * This function let the ug make a callback for setting tethering mode enabled
+ * @return void
+ * @param[in] error the returned error code
+ * @param[in] type the type of tethering
+ * @param[in] is_requested whether tethering mode is enabled
+ * @param[in] data the pointer to the user data
+ */
+static void __enabled_cb(tethering_error_e error, tethering_type_e type, bool is_requested, void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ tethering_error_e ret = TETHERING_ERROR_NONE;
+ tethering_h th = NULL;
+ bool is_wifi_enabled = false;
+
+ if (error != TETHERING_ERROR_NONE) {
+ if (is_requested != TRUE) {
+ return;
+ }
+
+ DBG(LOG_ERROR, "error !!! TETHERING is not enabled.\n");
+ return;
+ }
+
+ th = ugd->hotspot_handle;
+ if (th != NULL) {
+ is_wifi_enabled = tethering_is_enabled(th, TETHERING_TYPE_WIFI);
+ if (is_wifi_enabled) {
+ DBG(LOG_INFO, "Mobile hotspot is activated\n");
+ }
+
+ /* Deregister cbs */
+ ret = tethering_unset_enabled_cb(th, TETHERING_TYPE_WIFI);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_unset_enabled_cb is failed(%d)\n", ret);
+ }
+
+ /* Destroy tethering handle */
+ ret = tethering_destroy(th);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_destroy is failed(%d)\n", ret);
+ }
+
+ ugd->hotspot_handle = NULL;
+ }
+
+ DBG(LOG_INFO, "TETHERING is enabled.\n");
+
+ __FUNC_EXIT__;
+ return;
}
+/**
+ * This function let the ug make a callback for setting tethering mode disabled
+ * @return void
+ * @param[in] error the returned error code
+ * @param[in] type the type of tethering
+ * @param[in] code whether tethering mode is enabled
+ * @param[in] data the pointer to the user data
+ */
static void __disabled_cb(tethering_error_e error, tethering_type_e type, tethering_disabled_cause_e code, void *data)
{
__FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ tethering_error_e ret = TETHERING_ERROR_NONE;
+ tethering_h th = NULL;
+ bool is_wifi_enabled = false;
+ bool is_wifi_ap_enabled = false;
+
if (error != TETHERING_ERROR_NONE) {
-
if (code != TETHERING_DISABLED_BY_REQUEST) {
return;
}
+
DBG(LOG_ERROR, "error !!! TETHERING is not disabled.\n");
return;
}
- DBG(LOG_VERBOSE, "TETHERING is disabled.\n");
+ th = ugd->hotspot_handle;
+ if (th != NULL) {
+ is_wifi_enabled = tethering_is_enabled(th, TETHERING_TYPE_WIFI);
+ is_wifi_ap_enabled = tethering_is_enabled(th, TETHERING_TYPE_RESERVED);
+ if (is_wifi_enabled || is_wifi_ap_enabled) {
+ DBG(LOG_ERROR, "error !!! TETHERING is not disabled.\n");
+ DBG(LOG_ERROR, "is_wifi_enabled:%d is_wifi_ap_enabled:%d\n", is_wifi_enabled, is_wifi_ap_enabled);
+ return;
+ }
- __FUNC_EXIT__;
+ DBG(LOG_INFO, "Mobile hotspot is deactivated\n");
+ wfd_client_swtch_force(ugd, TRUE);
+
+ ret = tethering_unset_disabled_cb(th, TETHERING_TYPE_WIFI);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_unset_disabled_cb is failed(%d)\n", ret);
+ }
+
+ ret = tethering_unset_disabled_cb(th, TETHERING_TYPE_RESERVED);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_unset_disabled_cb is failed(%d)\n", ret);
+ }
+ /* Destroy tethering handle */
+ ret = tethering_destroy(th);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_destroy is failed(%d)\n", ret);
+ }
+
+ ugd->hotspot_handle = NULL;
+ }
+
+ DBG(LOG_INFO, "TETHERING is disabled.\n");
+
+ __FUNC_EXIT__;
return;
}
+/**
+ * This function let the ug turn AP on
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_mobile_ap_on(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ tethering_error_e ret = TETHERING_ERROR_NONE;
+ WFD_RETV_IF(ugd == NULL, -1, "Incorrect parameter(NULL)\n");
+
+ if (NULL == ugd->hotspot_handle) {
+ ret = tethering_create(&(ugd->hotspot_handle));
+ if (TETHERING_ERROR_NONE != ret) {
+ DBG(LOG_ERROR, "Failed to tethering_create() [%d]\n", ret);
+ ugd->hotspot_handle = NULL;
+ return -1;
+ }
+ DBG(LOG_INFO, "Succeeded to tethering_create()\n");
+ }
+ /* Register cbs */
+ ret = tethering_set_enabled_cb(ugd->hotspot_handle, TETHERING_TYPE_WIFI, __enabled_cb, ugd);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_set_enabled_cb is failed\n", ret);
+ return -1;
+ }
+
+ /* Enable tethering */
+ ret = tethering_enable(ugd->hotspot_handle, TETHERING_TYPE_WIFI);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to turn on mobile hotspot. [%d]\n", ret);
+ return -1;
+ } else {
+ DBG(LOG_INFO, "Succeeded to turn on mobile hotspot\n");
+ }
+
+ ugd->is_hotspot_off = FALSE;
-#if 0
-static device_type_s *wfd_client_find_peer_by_ssid(void *data, const char *ssid)
+ __FUNC_EXIT__;
+ return 0;
+}
+
+/**
+ * This function let the ug turn AP off
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_mobile_ap_off(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int i;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ WFD_RETV_IF(ugd == NULL || ugd->hotspot_handle == NULL, -1, "Incorrect parameter(NULL)\n");
+ tethering_error_e ret = TETHERING_ERROR_NONE;
+ bool is_wifi_enabled = false;
+ bool is_wifi_ap_enabled = false;
+
+ is_wifi_enabled = tethering_is_enabled(ugd->hotspot_handle, TETHERING_TYPE_WIFI);
+ is_wifi_ap_enabled = tethering_is_enabled(ugd->hotspot_handle, TETHERING_TYPE_RESERVED);
+
+ if (is_wifi_enabled) {
+ /* Register cbs */
+ ret = tethering_set_disabled_cb(ugd->hotspot_handle, TETHERING_TYPE_WIFI, __disabled_cb, ugd);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_set_disabled_cb is failed\n", ret);
+ return -1;
+ }
+ /* Disable tethering */
+ ret = tethering_disable(ugd->hotspot_handle, TETHERING_TYPE_WIFI);
+ } else if (is_wifi_ap_enabled) {
+ ret = tethering_set_disabled_cb(ugd->hotspot_handle, TETHERING_TYPE_RESERVED, __disabled_cb, ugd);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_set_disabled_cb is failed\n", ret);
+ return -1;
+ }
+ ret = tethering_disable(ugd->hotspot_handle, TETHERING_TYPE_RESERVED);
+ }
- if(ugd == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to turn off mobile hotspot. [%d]\n", ret);
+ return -1;
+ } else {
+ DBG(LOG_INFO, "Succeeded to turn off mobile hotspot\n");
+ }
- for(i=0; i<ugd->gl_available_peer_cnt; i++)
- {
- DBG(LOG_VERBOSE, "check %dth peer\n", i);
- if(!strcmp(ugd->gl_available_peers[i].ssid, ssid))
- {
- DBG(LOG_VERBOSE, "found peer. [%d]\n", i);
- __FUNC_EXIT__;
- return &ugd->gl_available_peers[i];
- }
- }
- __FUNC_EXIT__;
+ ugd->is_hotspot_off = TRUE;
- return NULL;
+ __FUNC_EXIT__;
+ return 0;
}
-#endif
-static device_type_s *wfd_client_find_peer_by_mac(void *data, const char *mac_addr)
+void wfd_client_free_raw_discovered_peers(struct ug_data *ugd)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int i;
+ __FUNC_ENTER__;
+ WFD_RET_IF(ugd->raw_discovered_peer_list == NULL, "Incorrect parameter(NULL)\n");
- if(ugd == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
+ g_list_free(ugd->raw_discovered_peer_list);
+ ugd->raw_discovered_peer_list = NULL;
- if (ugd->multi_connect_mode != WFD_MULTI_CONNECT_MODE_NONE)
- {
- for(i=0; i<ugd->raw_multi_selected_peer_cnt; i++)
- {
- DBG(LOG_VERBOSE, "[Multi Connect] check %dth peer\n", i);
- if(!strncmp(mac_addr, (const char*) ugd->raw_multi_selected_peers[i].mac_addr, MAC_LENGTH))
- {
- DBG(LOG_VERBOSE, "selected found peer. [%d]\n", i);
- __FUNC_EXIT__;
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug find the peer by mac address
+ * @return the found peer
+ * @param[in] data the pointer to the main data structure
+ * @param[in] mac_addr the pointer to mac address
+ */
+static device_type_s *wfd_client_find_peer_by_mac(void *data, const char *mac_addr)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ wifi_direct_discovered_peer_info_s *peer_info = NULL;
+ GList *iterator = NULL;
+ int i;
+ WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
+
+ if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
+ for (i = 0; i < ugd->raw_multi_selected_peer_cnt; i++) {
+ if (!strncmp(mac_addr, (const char *)ugd->raw_multi_selected_peers[i].mac_addr, MAC_LENGTH)) {
return &ugd->raw_multi_selected_peers[i];
}
}
- }
- else
- {
- for(i=0; i<ugd->raw_discovered_peer_cnt; i++)
- {
- DBG(LOG_VERBOSE, "check %dth peer\n", i);
- if(!strncmp(mac_addr, (const char*) ugd->raw_discovered_peers[i].mac_addr, MAC_LENGTH))
- {
- DBG(LOG_VERBOSE, "found peer. [%d]\n", i);
- __FUNC_EXIT__;
- return &ugd->raw_discovered_peers[i];
+ } else {
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ if (!strncmp(mac_addr, ((device_type_s *)iterator->data)->mac_addr, MAC_LENGTH)) {
+ return (device_type_s *)iterator->data;
}
}
+ }
- }
- __FUNC_EXIT__;
+ /*
+ * In case, device is not in raw discovered list, then get peer info.
+ * There could be situation in which device is not yet discovered and
+ * connected process started.
+ */
+ if (WIFI_DIRECT_ERROR_NONE != wifi_direct_get_peer_info((char *)mac_addr, &peer_info) ||
+ NULL == peer_info) {
+ DBG(LOG_ERROR, "Peer Not Found !!!");
+ return NULL;
+ }
- return NULL;
-}
+ /* Update peer list */
+ DBG(LOG_INFO, "Update Peer info");
+ _wfd_discoverd_peer_cb(peer_info, (void *)ugd);
-int _wfd_ug_view_clean_on_off(struct ug_data *ugd)
-{
- wfd_ug_view_update_peers(ugd);
- return 0;
+ /* Get the device from peer list */
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ if (!strncmp(mac_addr, ((device_type_s *)iterator->data)->mac_addr, MAC_LENGTH)) {
+ return (device_type_s *)iterator->data;
+ }
+ }
+
+ __FUNC_EXIT__;
+ return NULL;
}
+/**
+ * This function let the ug make a callback for registering activation event
+ * @return void
+ * @param[in] error_code the returned error code
+ * @param[in] device_state the state of device
+ * @param[in] user_data the pointer to the main data structure
+ */
void _activation_cb(int error_code, wifi_direct_device_state_e device_state, void *user_data)
{
- __FUNC_ENTER__;
- int res;
- struct ug_data *ugd = (struct ug_data*) user_data;
-
- wfd_refresh_wifi_direct_state(ugd);
+ __FUNC_ENTER__;
+ int res = -1;
+ struct ug_data *ugd = (struct ug_data *)user_data;
+ wfd_refresh_wifi_direct_state(ugd);
- switch(device_state)
- {
- case WIFI_DIRECT_DEVICE_STATE_ACTIVATED:
- DBG(LOG_VERBOSE, "WIFI_DIRECT_DEVICE_STATE_ACTIVATED\n");
- if(error_code != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Error in Activation/Deactivation [%d]\n", error_code);
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_ACTIVATE_FAIL"), POPUP_TYPE_ACTIVATE_FAIL);
+ switch (device_state) {
+ case WIFI_DIRECT_DEVICE_STATE_ACTIVATED:
+ DBG(LOG_INFO, "WIFI_DIRECT_DEVICE_STATE_ACTIVATED\n");
+ if(ugd->scan_toolbar == NULL) {
+ scan_button_create(ugd);
+ }
+ if (error_code != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Error in Activation/Deactivation [%d]\n", error_code);
+ if (WIFI_DIRECT_ERROR_AUTH_FAILED == error_code) {
+ wfd_ug_warn_popup(ugd, _("IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"), POPUP_TYPE_ACTIVATE_FAIL_POLICY_RESTRICTS);
+ } else {
+ wfd_ug_warn_popup(ugd, _("IDS_COM_POP_FAILED"), POPUP_TYPE_ACTIVATE_FAIL);
+ }
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- ugd->wfd_onoff = 0;
- wfd_ug_view_refresh_glitem(ugd->head);
- return;
- }
+#ifdef WFD_ON_OFF_GENLIST
+ ugd->wfd_onoff = 0;
+ wfd_ug_refresh_on_off_check(ugd);
+#endif
+ return;
+ }
- ugd->head_text_mode = HEAD_TEXT_TYPE_ACTIVATED;
- ugd->wfd_onoff = 1;
- wfd_ug_view_refresh_glitem(ugd->head);
+ ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_NONE;
+#ifdef WFD_ON_OFF_GENLIST
+ ugd->wfd_onoff = 1;
+ wfd_ug_refresh_on_off_check(ugd);
+#endif
+ wfg_ug_act_popup_remove(ugd);
- wfg_ug_act_popup_remove(ugd);
+ if (ugd->wfd_discovery_status == WIFI_DIRECT_DISCOVERY_BACKGROUND) {
+ DBG(LOG_INFO, "Background mode\n");
+ return;
+ }
- res = vconf_ignore_key_changed(VCONFKEY_WIFI_STATE, _wifi_state_cb);
- if(res == -1)
- {
- DBG(LOG_ERROR, "Failed to ignore vconf key callback for wifi state\n");
- }
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
+ res = vconf_ignore_key_changed(VCONFKEY_WIFI_STATE, _wifi_state_cb);
+ if (res == -1) {
+ DBG(LOG_ERROR, "Failed to ignore vconf key callback for wifi state\n");
+ }
+#endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
+
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ res = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", res);
+ wifi_direct_cancel_discovery();
+ }
- res = wifi_direct_start_discovery(FALSE, 0);
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", res);
- }
- DBG(LOG_VERBOSE, "Discovery is started\n");
- break;
+ break;
+ case WIFI_DIRECT_DEVICE_STATE_DEACTIVATED:
+ DBG(LOG_INFO, "WIFI_DIRECT_DEVICE_STATE_DEACTIVATED\n");
+ if (error_code != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Error in Activation/Deactivation [%d]\n", error_code);
+ wfd_ug_warn_popup(ugd, _("IDS_WIFI_POP_DEACTIVATION_FAILED"), POPUP_TYPE_DEACTIVATE_FAIL);
+#ifdef WFD_ON_OFF_GENLIST
+ ugd->wfd_onoff = 1;
+ wfd_ug_refresh_on_off_check(ugd);
+#endif
+ return;
+ }
- case WIFI_DIRECT_DEVICE_STATE_DEACTIVATED:
- DBG(LOG_VERBOSE, "WIFI_DIRECT_DEVICE_STATE_DEACTIVATED\n");
- if(error_code != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Error in Activation/Deactivation [%d]\n", error_code);
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_DEACTIVATE_FAIL"), POPUP_TYPE_DEACTIVATE_FAIL);
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- ugd->wfd_onoff = 1;
- wfd_ug_view_refresh_glitem(ugd->head);
- return;
- }
+ WFD_IF_DEL_ITEM(ugd->multi_connect_toolbar_item);
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- ugd->wfd_onoff = 0;
+ if (ugd->ctxpopup) {
+ ctxpopup_dismissed_cb(ugd, NULL, NULL);
+ }
- wfd_ug_view_update_peers(ugd);
+ /*
+ * When multi-connect is on ongoing and deactivte happened destroy
+ * disconnect button.
+ */
+ if (ugd->disconnect_btn) {
+ Evas_Object *content;
+ content = elm_object_part_content_unset(ugd->layout, "button.next");
+ WFD_IF_DEL_OBJ(content);
+ ugd->disconnect_btn = NULL;
+ elm_object_part_content_set(ugd->layout, "button.big",
+ ugd->scan_toolbar);
+ }
- break;
- default:
- break;
- }
+ /* When connect is on ongoing and deactivte happened refresh scan */
+ if (ugd->scan_toolbar) {
+ wfd_ug_view_refresh_button(ugd->scan_toolbar,
+ "IDS_WIFI_SK4_SCAN", FALSE);
+ }
+ /* Delete pop-up when deactivate happens */
+ WFD_IF_DEL_OBJ(ugd->act_popup);
+ /* Remove timeout handlers */
+ if (ugd->timer_stop_progress_bar > 0)
+ g_source_remove(ugd->timer_stop_progress_bar);
- wfd_ug_view_refresh_glitem(ugd->head);
+ if (ugd->timer_delete_not_alive_peer > 0)
+ g_source_remove(ugd->timer_delete_not_alive_peer);
- if (ugd->scan_btn) {
- wfd_ug_view_refresh_button(ugd->scan_btn, _("IDS_WFD_BUTTON_SCAN"), TRUE);
- }
+ if (ugd->g_source_multi_connect_next > 0)
+ g_source_remove(ugd->g_source_multi_connect_next);
- if (ugd->multi_connect_btn) {
- wfd_ug_view_refresh_button(ugd->multi_scan_btn, _("IDS_WFD_BUTTON_SCAN"), TRUE);
- }
+ if (ugd->timer_multi_reset > 0)
+ g_source_remove(ugd->timer_multi_reset);
- __FUNC_EXIT__;
- return;
-}
+ /* Delete warn popups for Airplane mode */
+ if (NULL != ugd->warn_popup) {
+ evas_object_del( ugd->warn_popup);
+ ugd->warn_popup = NULL;
+ }
-bool _wfd_discoverd_peer_cb(wifi_direct_discovered_peer_info_s* peer, void *user_data)
-{
- __FUNC_ENTER__;
+#ifdef WFD_ON_OFF_GENLIST
+ ugd->wfd_onoff = 0;
+ wfd_ug_refresh_on_off_check(ugd);
+#endif
+ /*
+ * when deactivated, clear all the
+ * discovered peers and connected peers
+ */
+ wfd_client_free_raw_discovered_peers(ugd);
+ if (ugd->raw_connected_peer_cnt > 0) {
+ memset(ugd->raw_connected_peers, 0x00, ugd->raw_connected_peer_cnt*sizeof(device_type_s));
+ }
+
+ ugd->raw_discovered_peer_cnt = 0;
+ ugd->raw_connected_peer_cnt = 0;
+
+ wfd_free_nodivice_item(ugd);
+ wfd_ug_view_init_genlist(ugd, true);
+
+ if (ugd->multi_navi_item != NULL) {
+ elm_naviframe_item_pop(ugd->naviframe);
+ }
+
+ if (TRUE == ugd->is_hotspot_off && TRUE == ugd->is_hotspot_locally_disabled) {
+ if (0 == wfd_mobile_ap_on(ugd)) {
+ ugd->is_hotspot_locally_disabled = FALSE;
+ }
+ }
+
+ if(ugd->scan_toolbar) {
+ evas_object_del(ugd->scan_toolbar);
+ ugd->scan_toolbar = NULL;
+ }
+ break;
+ default:
+ break;
+ }
+
+ /*if (ugd->scan_toolbar) {
+ wfd_ug_view_refresh_button(ugd->scan_toolbar, _("IDS_WIFI_SK4_SCAN"), TRUE);
+ }*/
+
+ if (ugd->multiconn_scan_stop_btn) {
+ wfd_ug_view_refresh_button(ugd->multiconn_scan_stop_btn, "IDS_WIFI_SK4_SCAN", TRUE);
+ }
- struct ug_data *ugd = (struct ug_data*) user_data;
- int peer_cnt = ugd->raw_discovered_peer_cnt;
+ if (ugd->back_btn) {
+ elm_object_disabled_set(ugd->back_btn, FALSE);
+ }
- DBG(LOG_VERBOSE, "%dth discovered peer. [%s] [%s]\n", peer_cnt, peer->ssid, peer->mac_address);
+ __FUNC_EXIT__;
+ return;
+}
- strncpy(ugd->raw_discovered_peers[peer_cnt].ssid, peer->ssid, sizeof(ugd->raw_discovered_peers[peer_cnt].ssid));
- ugd->raw_discovered_peers[peer_cnt].category = peer->primary_device_type;
- strncpy(ugd->raw_discovered_peers[peer_cnt].mac_addr, peer->mac_address, MAC_LENGTH);
- strncpy(ugd->raw_discovered_peers[peer_cnt].if_addr, peer->interface_address, MAC_LENGTH);
- ugd->raw_discovered_peers[peer_cnt].is_group_owner = peer->is_group_owner;
- ugd->raw_discovered_peers[peer_cnt].is_persistent_group_owner = peer->is_persistent_group_owner;
- ugd->raw_discovered_peers[peer_cnt].is_connected = peer->is_connected;
+/**
+ * This function let the ug make a callback for discovering peer
+ * @return TRUE
+ * @param[in] peer the pointer to the discovered peer
+ * @param[in] user_data the pointer to the main data structure
+ */
+bool _wfd_discoverd_peer_cb(wifi_direct_discovered_peer_info_s *peer, void *user_data)
+{
+ __FUNC_ENTER__;
+ WFD_RETV_IF(NULL == peer || NULL == user_data, FALSE, "Incorrect parameter(NULL)\n");
+
+ struct ug_data *ugd = (struct ug_data *)user_data;
+ int peer_cnt = ugd->raw_discovered_peer_cnt;
+ device_type_s *peer_tmp = g_new(device_type_s, 1);
+ int i;
+
+ DBG_SECURE(LOG_INFO, "%dth discovered peer. [%s] ["MACSECSTR"]\n", peer_cnt,
+ peer->device_name, MAC2SECSTR(peer->mac_address));
+
+ if (ugd->device_filter < 0 || peer->primary_device_type == ugd->device_filter) {
+ strncpy(peer_tmp->ssid, peer->device_name, sizeof(peer_tmp->ssid) - 1);
+ peer_tmp->ssid[SSID_LENGTH - 1] = '\0';
+ peer_tmp->category = peer->primary_device_type;
+ peer_tmp->sub_category = peer->secondary_device_type;
+ strncpy(peer_tmp->mac_addr, peer->mac_address, MAC_LENGTH - 1);
+ peer_tmp->mac_addr[MAC_LENGTH - 1] = '\0';
+ strncpy(peer_tmp->if_addr, peer->interface_address, MAC_LENGTH - 1);
+ peer_tmp->if_addr[MAC_LENGTH - 1] = '\0';
+ peer_tmp->is_group_owner = peer->is_group_owner;
+ peer_tmp->is_persistent_group_owner = peer->is_persistent_group_owner;
+ peer_tmp->is_connected = peer->is_connected;
+ peer_tmp->dev_sel_state = FALSE;
+
+ if (TRUE == peer->is_connected) {
+ peer_tmp->conn_status = PEER_CONN_STATUS_CONNECTED;
+ } else {
+ peer_tmp->conn_status = PEER_CONN_STATUS_DISCONNECTED;
+ }
- if (TRUE == peer->is_connected) {
- ugd->raw_discovered_peers[peer_cnt].conn_status = PEER_CONN_STATUS_CONNECTED;
- } else {
- ugd->raw_discovered_peers[peer_cnt].conn_status = PEER_CONN_STATUS_DISCONNECTED;
- }
+ ugd->raw_discovered_peer_list = g_list_append(ugd->raw_discovered_peer_list, peer_tmp);
+ DBG(LOG_INFO, "\tSSID: [%s]\n", peer_tmp->ssid);
+ DBG(LOG_INFO, "\tPeer category [%d] -> [%d]\n", peer->primary_device_type, peer_tmp->category);
+ DBG(LOG_INFO, "\tStatus: [%d]\n", peer_tmp->conn_status);
+ DBG(LOG_INFO, "\tservice_count: [%d]\n", peer->service_count);
+ ugd->raw_discovered_peer_cnt++;
+ } else {
+ DBG(LOG_INFO, "Unavailable WiFi-Direct Device\n");
+ }
- DBG(LOG_VERBOSE, "\tSSID: [%s]\n", ugd->raw_discovered_peers[peer_cnt].ssid);
- DBG(LOG_VERBOSE, "\tPeer category [%d] -> [%d]\n", peer->primary_device_type, ugd->raw_discovered_peers[peer_cnt].category);
- DBG(LOG_VERBOSE, "\tStatus: [%d]\n", ugd->raw_discovered_peers[peer_cnt].conn_status);
+ WFD_IF_FREE_MEM(peer->device_name);
+ WFD_IF_FREE_MEM(peer->mac_address);
+ WFD_IF_FREE_MEM(peer->interface_address);
- ugd->raw_discovered_peer_cnt ++;
+ if (NULL != peer->service_list)
+ {
+ for (i=0; i<peer->service_count && peer->service_list[i] != NULL; i++) {
+ free(peer->service_list[i]);
+ }
+ WFD_IF_FREE_MEM(peer->service_list);
+ }
- free(peer->ssid);
- free(peer->mac_address);
- free(peer->interface_address);
- free(peer);
+ WFD_IF_FREE_MEM(peer);
- __FUNC_EXIT__;
- return TRUE;
+ __FUNC_EXIT__;
+ return TRUE;
}
-bool _wfd_connected_peer_cb(wifi_direct_connected_peer_info_s* peer, void *user_data)
+/**
+ * This function let the ug make a callback for connected peer
+ * @return TRUE
+ * @param[in] peer the pointer to the connected peer
+ * @param[in] user_data the pointer to the main data structure
+ */
+bool _wfd_connected_peer_cb(wifi_direct_connected_peer_info_s *peer, void *user_data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) user_data;
- int peer_cnt = ugd->raw_connected_peer_cnt;
+ __FUNC_ENTER__;
+ WFD_RETV_IF(NULL == peer || NULL == user_data, FALSE, "Incorrect parameter(NULL)\n");
+
+ struct ug_data *ugd = (struct ug_data *)user_data;
+ int peer_cnt = ugd->raw_connected_peer_cnt;
+ int i;
+
+ DBG_SECURE(LOG_INFO, "%dth connected peer. [%s] ["MACSECSTR"]\n", peer_cnt,
+ peer->device_name, MAC2SECSTR(peer->mac_address));
+
+ /*
+ * check wether ug needs to exit
+ * automatically after successed connection
+ */
+
+ char services[256] = {0,};
+ DBG(LOG_INFO, "\tservice_count: [%d]\n", peer->service_count);
+ if (peer->service_count>0) {
+ unsigned int len = 0;
+ for (i=0; i<peer->service_count && peer->service_list != NULL; i++) {
+ snprintf(services + len, 256-len, "%s ", peer->service_list[i]);
+ len = len + strlen(peer->service_list[i]) + 1;
+ }
+ DBG(LOG_INFO, "\tServices: [%s]\n", services);
+ }
+
+ strncpy(ugd->raw_connected_peers[peer_cnt].ssid, peer->device_name, sizeof(ugd->raw_connected_peers[peer_cnt].ssid) - 1);
+ ugd->raw_connected_peers[peer_cnt].category = peer->primary_device_type;
+ ugd->raw_connected_peers[peer_cnt].sub_category = peer->secondary_device_type;
+ strncpy(ugd->raw_connected_peers[peer_cnt].mac_addr, peer->mac_address, MAC_LENGTH - 1);
+ strncpy(ugd->raw_connected_peers[peer_cnt].if_addr, peer->interface_address, MAC_LENGTH - 1);
+ ugd->raw_connected_peers[peer_cnt].conn_status = PEER_CONN_STATUS_CONNECTED;
+
+ DBG(LOG_INFO, "\tStatus: [%d]\n", ugd->raw_connected_peers[peer_cnt].conn_status);
+ DBG(LOG_INFO, "\tCategory: [%d]\n", ugd->raw_connected_peers[peer_cnt].category);
+ DBG(LOG_INFO, "\tSSID: [%s]\n", ugd->raw_connected_peers[peer_cnt].ssid);
+
+ ugd->raw_connected_peer_cnt++;
+
+ int error = -1;
+ bool is_group_owner = FALSE;
+ error = wifi_direct_is_group_owner(&is_group_owner);
+ if (error != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Fail to get group_owner_state. ret=[%d]", error);
+ return FALSE;
+ }
- DBG(LOG_VERBOSE, "%dth connected peer. [%s] [%s]\n", peer_cnt, peer->ssid, peer->mac_address);
+ if (FALSE == is_group_owner) {
+ /* to send ip_addr*/
+ int ret = -1;
+ app_control_h control = NULL;
+ ret = app_control_create(&control);
+ if (ret) {
+ DBG(LOG_ERROR, "Failed to create control");
+ return FALSE;
+ }
- strncpy(ugd->raw_connected_peers[peer_cnt].ssid, peer->ssid, sizeof(ugd->raw_connected_peers[peer_cnt].ssid));
- ugd->raw_connected_peers[peer_cnt].category = peer->primary_device_type;
- strncpy(ugd->raw_connected_peers[peer_cnt].mac_addr, peer->mac_address, MAC_LENGTH);
- strncpy(ugd->raw_connected_peers[peer_cnt].if_addr, peer->interface_address, MAC_LENGTH);
- ugd->raw_connected_peers[peer_cnt].conn_status = PEER_CONN_STATUS_CONNECTED;
+ if(peer->ip_address != NULL && strlen(services) != 0 ) {
+ app_control_add_extra_data(control, "ip_address", peer->ip_address);
+ app_control_add_extra_data(control, "wfds", services);
+ ug_send_result(ugd->ug, control);
+ }
+ app_control_destroy(control);
+ }
- DBG(LOG_VERBOSE, "\tStatus: [%d]\n", ugd->raw_connected_peers[peer_cnt].conn_status);
- DBG(LOG_VERBOSE, "\tCategory: [%d]\n", ugd->raw_connected_peers[peer_cnt].category);
- DBG(LOG_VERBOSE, "\tSSID: [%s]\n", ugd->raw_connected_peers[peer_cnt].ssid);
+ WFD_IF_FREE_MEM(peer->device_name);
+ WFD_IF_FREE_MEM(peer->mac_address);
+ WFD_IF_FREE_MEM(peer->interface_address);
- ugd->raw_connected_peer_cnt++;
+ if (NULL != peer->service_list)
+ {
+ for (i=0; i<peer->service_count && peer->service_list[i] != NULL; i++) {
+ free(peer->service_list[i]);
+ }
+ WFD_IF_FREE_MEM(peer->service_list);
+ }
- free(peer->ssid);
- free(peer->mac_address);
- free(peer->interface_address);
- free(peer);
- __FUNC_EXIT__;
- return TRUE;
+ WFD_IF_FREE_MEM(peer);
+
+ __FUNC_EXIT__;
+ return TRUE;
}
+/**
+ * This function let the ug get the found peers
+ * @return If success, return 0, else return -1
+ * @param[in] ugd the pointer to the main data structure
+ */
int wfd_ug_get_discovered_peers(struct ug_data *ugd)
{
+ __FUNC_ENTER__;
int res = 0;
+ WFD_RETV_IF(ugd == NULL, -1, "Incorrect parameter(NULL)\n");
+
+ ugd->raw_discovered_peer_cnt = 0;
+ wfd_client_free_raw_discovered_peers(ugd);
+ res = wifi_direct_foreach_discovered_peers(_wfd_discoverd_peer_cb, (void *)ugd);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ ugd->raw_discovered_peer_cnt = 0;
+ DBG(LOG_ERROR, "Get discovery result failed: %d\n", res);
+ }
+
+ __FUNC_EXIT__;
+ return 0;
+}
- if (ugd==NULL)
+/**
+ * This function let the ug get the connecting peer
+ * @return If success, return 0, else return -1
+ * @param[in] ugd the pointer to the main data structure
+ */
+int wfd_ug_get_connecting_peer(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
+ int res = 0;
+ WFD_RETV_IF(ugd == NULL, -1, "Incorrect parameter(NULL)\n");
+ char *mac_addr = NULL;
+ GList *iterator = NULL;
+
+ ugd->mac_addr_connecting = NULL;
+ res = wifi_direct_get_connecting_peer(&mac_addr);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Get connecting device mac failed: %d\n", res);
return -1;
+ }
+ DBG_SECURE(LOG_INFO, "Mac Addr Connecting: ["MACSECSTR"]\n",
+ MAC2SECSTR(mac_addr));
+ ugd->mac_addr_connecting = mac_addr;
- ugd->raw_discovered_peer_cnt = 0;
- res = wifi_direct_foreach_discovered_peers(_wfd_discoverd_peer_cb, (void*) ugd);
- if (res != WIFI_DIRECT_ERROR_NONE)
- {
- ugd->raw_discovered_peer_cnt = 0;
- DBG(LOG_ERROR, "Get discovery result failed: %d\n", res);
- }
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ if (!strncmp(mac_addr, ((device_type_s *)iterator->data)->mac_addr, MAC_LENGTH)) {
+ ((device_type_s *)iterator->data)->conn_status = PEER_CONN_STATUS_CONNECTING;
+ }
+ }
+
+ __FUNC_EXIT__;
return 0;
}
+/**
+ * This function let the ug get the connected peers
+ * @return If success, return 0, else return -1
+ * @param[in] ugd the pointer to the main data structure
+ */
int wfd_ug_get_connected_peers(struct ug_data *ugd)
{
+ __FUNC_ENTER__;
int res = 0;
-
- if (ugd==NULL)
- return -1;
+ WFD_RETV_IF(ugd == NULL, -1, "Incorrect parameter(NULL)\n");
ugd->raw_connected_peer_cnt = 0;
- res = wifi_direct_foreach_connected_peers(_wfd_connected_peer_cb, (void*) ugd);
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
+ res = wifi_direct_foreach_connected_peers(_wfd_connected_peer_cb, (void *)ugd);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
ugd->raw_connected_peer_cnt = 0;
DBG(LOG_ERROR, "Get connected peer failed: %d\n", res);
}
+
+ __FUNC_EXIT__;
return 0;
}
-void _discover_cb(int error_code, wifi_direct_discovery_state_e discovery_state, void *user_data)
+/**
+ * This function let the ug exits automatically after successed connection
+ * @return void
+ * @param[in] user_data the pointer to the main data structure
+ */
+void _wfd_ug_auto_exit(void *user_data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) user_data;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)user_data;
+ WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
- if(ugd == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return;
- }
+ usleep(1000);
+ deinit_wfd_client(ugd);
+ wfd_destroy_ug(ugd);
- if(discovery_state == WIFI_DIRECT_ONLY_LISTEN_STARTED)
- {
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- }
- else if(discovery_state == WIFI_DIRECT_DISCOVERY_STARTED)
- {
- ugd->head_text_mode = HEAD_TEXT_TYPE_SCANING;
- }
- else if(discovery_state == WIFI_DIRECT_DISCOVERY_FOUND)
- {
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- }
+ __FUNC_EXIT__;
+}
+
+gboolean wfd_delete_not_alive_peer_cb(void *user_data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)user_data;
+ WFD_RETV_IF(ugd == NULL, FALSE, "Incorrect parameter(NULL)\n");
+
+ delete_not_alive_peers(ugd, &ugd->gl_avlb_peers_start, &ugd->gl_available_peer_cnt);
+ delete_not_alive_peers(ugd, &ugd->gl_busy_peers_start, &ugd->gl_busy_peer_cnt);
+ delete_not_alive_peers(ugd, &ugd->multi_conn_dev_list_start, &ugd->gl_available_dev_cnt_at_multiconn_view);
+ wfd_ug_view_init_genlist(ugd, false);
+ wfd_update_multiconnect_device(ugd, false);
+ __FUNC_EXIT__;
+ return FALSE;
+}
- wfd_ug_view_refresh_glitem(ugd->head);
- if (WIFI_DIRECT_DISCOVERY_STARTED == discovery_state) {
- if (ugd->scan_btn) {
- wfd_ug_view_refresh_button(ugd->scan_btn, _("IDS_WFD_BUTTON_STOPSCAN"), TRUE);
+gboolean wfd_delete_progressbar_cb(void *user_data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)user_data;
+ WFD_RETV_IF(ugd == NULL, FALSE, "Incorrect parameter(NULL)\n");
+
+ ugd->title_content_mode = TITLE_CONTENT_TYPE_NONE;
+ if (ugd->raw_discovered_peer_cnt == 0 &&
+ ugd->nodevice_title_item == NULL &&
+ ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_NONE &&
+ ugd->gl_available_peer_cnt == 0) {
+ _create_no_device_genlist(ugd);
+ };
+
+ wfd_ug_view_refresh_glitem(ugd->mcview_title_item);
+ wfd_ug_view_refresh_glitem(ugd->avlbl_wfd_item);
+
+ if (0 == ugd->gl_available_dev_cnt_at_multiconn_view) {
+ _create_no_device_multiconnect_genlist(ugd);
}
- if (ugd->multi_connect_btn) {
- wfd_ug_view_refresh_button(ugd->multi_scan_btn, _("IDS_WFD_BUTTON_STOPSCAN"), TRUE);
+ wfd_refresh_wifi_direct_state(ugd);
+ if (WIFI_DIRECT_STATE_CONNECTING != ugd->wfd_status &&
+ WIFI_DIRECT_STATE_DISCONNECTING != ugd->wfd_status) {
+ if (ugd->scan_toolbar) {
+ wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN", TRUE);
+ evas_object_data_set(ugd->toolbar, "scan", "scan");
+ }
+
+ if (ugd->multiconn_layout) {
+ wfd_ug_view_refresh_button(ugd->multiconn_scan_stop_btn, "IDS_WIFI_SK4_SCAN", TRUE);
+ DBG(LOG_INFO, "Multiconn button text IDS_WIFI_SK4_SCAN \n");
+
+ }
}
- } else {
- if (ugd->scan_btn) {
- wfd_ug_view_refresh_button(ugd->scan_btn, _("IDS_WFD_BUTTON_SCAN"), TRUE);
+
+ __FUNC_EXIT__;
+ return FALSE;
+}
+
+/**
+ * This function let the ug make a callback for registering discover event
+ * @return void
+ * @param[in] error_code the returned error code
+ * @param[in] discovery_state the state of discover
+ * @param[in] user_data the pointer to the main data structure
+ */
+void discover_cb(int error_code, wifi_direct_discovery_state_e discovery_state, void *user_data)
+{
+ __FUNC_ENTER__;
+ int ret;
+ struct ug_data *ugd = (struct ug_data *)user_data;
+
+ if (ugd == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
}
- if (ugd->multi_connect_btn) {
- wfd_ug_view_refresh_button(ugd->multi_scan_btn, _("IDS_WFD_BUTTON_SCAN"), TRUE);
+ if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
+ return;
}
- }
- wfd_ug_get_discovered_peers(ugd);
- wfd_ug_get_connected_peers(ugd);
+ DBG(LOG_INFO, "Discovery event [%d], error_code [%d]\n", discovery_state, error_code);
+
+ if (discovery_state == WIFI_DIRECT_DISCOVERY_STARTED) {
+ if (ugd->wfd_discovery_status == WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START) {
+ ugd->title_content_mode = TITLE_CONTENT_TYPE_SCANNING;
+ wfd_cancel_progressbar_stop_timer(ugd);
+ ugd->timer_stop_progress_bar = g_timeout_add(1000*30, wfd_delete_progressbar_cb, ugd);
+ /* clear all the previous discovered peers */
+ wfd_client_free_raw_discovered_peers(ugd);
+
+ ugd->raw_discovered_peer_cnt = 0;
+ wfd_ug_view_init_genlist(ugd, false);
- wfd_ug_view_update_peers(ugd);
+ if (ugd->avlbl_wfd_item == NULL) {
+ _create_available_dev_genlist(ugd);
+ }
+
+ wfd_ug_view_refresh_glitem(ugd->mcview_title_item);
+ /* clear not alive peers after 5 secs */
+ wfd_cancel_not_alive_delete_timer(ugd);
+ ugd->timer_delete_not_alive_peer = g_timeout_add(1000*5, wfd_delete_not_alive_peer_cb, ugd);
+ set_not_alive_peers(ugd->gl_avlb_peers_start);
+ set_not_alive_peers(ugd->gl_busy_peers_start);
+ set_not_alive_peers(ugd->multi_conn_dev_list_start);
+ }
+ } else if (discovery_state == WIFI_DIRECT_DISCOVERY_FOUND) {
+ if (ugd->wfd_discovery_status != WIFI_DIRECT_DISCOVERY_NONE) {
+ wfd_ug_get_discovered_peers(ugd);
+ wfd_ug_update_available_peers(ugd);
+ wfd_update_multiconnect_device(ugd, false);
+ }
+ } else if (discovery_state == WIFI_DIRECT_DISCOVERY_FINISHED) {
+ if (ugd->wfd_discovery_status == WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_FULL_SCAN_START;
+ ret = wifi_direct_start_discovery_specific_channel(false, 0, WIFI_DIRECT_DISCOVERY_FULL_SCAN);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery with full scan. [%d]\n", ret);
+ wifi_direct_cancel_discovery();
+ }
+ }
+ }
- _wfd_free_multiconnect_device(ugd);
- _wfd_update_multiconnect_device(ugd);
- //_change_multi_button_title(ugd);
+ if (WIFI_DIRECT_DISCOVERY_STARTED == discovery_state &&
+ ugd->wfd_discovery_status == WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START) {
+ WFD_IF_DEL_ITEM(ugd->multi_connect_toolbar_item);
+ if (!ugd->conn_wfd_item) {
+ elm_object_part_content_set(ugd->layout, "button.big", ugd->scan_toolbar);
+ }
+ wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK_STOP", TRUE);
+ if (ugd->multiconn_scan_stop_btn) {
+ wfd_ug_view_refresh_button(ugd->multiconn_scan_stop_btn, "IDS_WIFI_SK_STOP", TRUE);
+ }
+ }
- __FUNC_EXIT__;
- return;
+ __FUNC_EXIT__;
+ return;
}
+/**
+ * This function let the ug make a callback for registering connection event
+ * @return void
+ * @param[in] error_code the returned error code
+ * @param[in] connection_state the state of connection
+ * @param[in] mac_address the mac address of peer
+ * @param[in] user_data the pointer to the main data structure
+ */
void _connection_cb(int error_code, wifi_direct_connection_state_e connection_state, const char *mac_address, void *user_data)
{
- __FUNC_ENTER__;
-
- struct ug_data *ugd = (struct ug_data*) user_data;
- device_type_s *peer = NULL;
- bool owner = FALSE;
- int res = 0;
-
- DBG(LOG_VERBOSE, "Connection event [%d], error_code [%d]\n", connection_state, error_code);
-
- if(mac_address == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(peer mac is NULL)\n");
- return;
- }
- DBG(LOG_VERBOSE, "Connection event from %s", mac_address);
-
- if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS)
- {
- peer = wfd_client_find_peer_by_mac(ugd, mac_address);
- if (peer != NULL)
- {
- switch(connection_state)
- {
- case WIFI_DIRECT_CONNECTION_RSP:
- if(error_code == WIFI_DIRECT_ERROR_NONE)
- {
- ugd->wfd_status = WFD_LINK_STATUS_CONNECTED;
- peer->conn_status = PEER_CONN_STATUS_CONNECTED;
- }
- else
- {
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)user_data;
+ device_type_s *peer = NULL;
+ bool owner = FALSE;
+ int res = 0;
+
+ if (mac_address == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(peer mac is NULL)\n");
+ return;
+ }
+
+ DBG_SECURE(LOG_INFO, "Connection event [%d], error_code [%d], multi_connect_mode [%d] mac ["MACSECSTR"]\n",
+ connection_state, error_code, ugd->multi_connect_mode, MAC2SECSTR(mac_address));
+
+ /* when not in connection, mac_address is empty */
+ if (connection_state <= WIFI_DIRECT_DISASSOCIATION_IND) {
+ peer = wfd_client_find_peer_by_mac(ugd, mac_address);
+
+ if (NULL == peer || '\0' == peer->ssid[0]) {
+ DBG(LOG_ERROR, "invalid peer from connection !!\n");
+ ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_NONE;
+ goto refresh_button;
+ }
+ }
+
+ if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
+ switch (connection_state) {
+ case WIFI_DIRECT_CONNECTION_RSP:
+ DBG(LOG_INFO, "MULTI: WIFI_DIRECT_CONNECTION_RSP\n");
+ ugd->mac_addr_connecting = NULL;
+ if (error_code == WIFI_DIRECT_ERROR_NONE) {
+ peer->conn_status = PEER_CONN_STATUS_CONNECTED;
+ wfd_ug_get_connected_peers(ugd);
+ wfd_ug_update_connected_peers(ugd);
+ } else {
+ peer->conn_status = PEER_CONN_STATUS_FAILED_TO_CONNECT;
+ peer = find_peer_in_glist(ugd->gl_mul_conn_peers_start, peer->mac_addr);
+ if ( peer != NULL) {
peer->conn_status = PEER_CONN_STATUS_FAILED_TO_CONNECT;
+ wfd_ug_view_refresh_glitem(peer->gl_item);
}
- ugd->g_source_multi_connect_next = g_timeout_add(1000, wfd_multi_connect_next_cb, ugd);
- break;
- default:
- break;
}
+ /* connect the next peer */
+ ugd->g_source_multi_connect_next = g_timeout_add(500, wfd_multi_connect_next_cb, ugd);
+ break;
+ case WIFI_DIRECT_CONNECTION_IN_PROGRESS:
+ DBG(LOG_INFO, "MULTI: WIFI_DIRECT_CONNECTION_IN_PROGRESS\n");
+ peer->conn_status = PEER_CONN_STATUS_CONNECTING;
+ peer = find_peer_in_glist(ugd->gl_mul_conn_peers_start, peer->mac_addr);
+
+ if ( peer != NULL) {
+ peer->conn_status = PEER_CONN_STATUS_CONNECTING;
+ wfd_ug_view_refresh_glitem(peer->gl_item);
+ }
+
+ wfd_ug_update_toolbar(ugd);
+ break;
+ case WIFI_DIRECT_GROUP_CREATED:
+ DBG(LOG_INFO, "MULTI: WIFI_DIRECT_GROUP_CREATED\n");
+ wfd_cancel_progressbar_stop_timer(ugd);
+ wfd_delete_progressbar_cb(ugd);
+
+ wfd_ug_view_init_genlist(ugd, true);
+ wfd_ug_view_update_multiconn_peers(ugd);
+ wfd_multi_connect_next_cb(ugd);
+ break;
+ default:
+ break;
+ }
+ } else {
+ switch (connection_state) {
+ case WIFI_DIRECT_CONNECTION_RSP:
+ DBG(LOG_INFO, "WIFI_DIRECT_CONNECTION_RSP\n");
+ wfd_delete_progressbar_cb(ugd);
+
+ if (ugd->act_popup) {
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ }
+ ugd->mac_addr_connecting = NULL;
+
+ if (error_code == WIFI_DIRECT_ERROR_NONE) {
+ peer->conn_status = PEER_CONN_STATUS_CONNECTED;
+ wfd_ug_get_connected_peers(ugd);
+
+ /* when auto_exit and not multi-connect*/
+ if ((ugd->is_auto_exit)&&(ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_NONE)) {
+ _wfd_ug_auto_exit(ugd);
+ }
+
+ if(ugd->ctxpopup != NULL && ugd->more_btn_multiconnect_item) {
+ elm_object_item_disabled_set(ugd->more_btn_multiconnect_item, TRUE);
+ }
+
+ wfd_ug_update_connected_peers(ugd);
+ } else {
+ peer->conn_status = PEER_CONN_STATUS_FAILED_TO_CONNECT;
+ wfd_ug_update_failed_peers(ugd);
+ }
+
+ wfd_ug_update_toolbar(ugd);
+ break;
+ case WIFI_DIRECT_DISASSOCIATION_IND:
+ DBG(LOG_INFO, "WIFI_DIRECT_DISASSOCIATION_IND\n");
+ /* remove any possible popup */
+ WFD_IF_DEL_OBJ(ugd->act_popup);
+ wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN", TRUE);
+
+ /* change the multi connection mode, it can be connected now */
+ if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_COMPLETED) {
+ ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_NONE;
+ }
+
+ /* if other peer disconnected, get connected peers and update */
+ peer->conn_status = PEER_CONN_STATUS_DISCONNECTED;
wfd_ug_get_connected_peers(ugd);
- wfd_ug_view_update_peers(ugd);
- }
- else
- {
- DBG(LOG_VERBOSE, "peer is not found [%s]", mac_address);
- }
- goto refresh_button;
- }
-
-
- peer = wfd_client_find_peer_by_mac(ugd, mac_address);
-
- if (NULL == peer || NULL == peer->ssid) {
- DBG(LOG_ERROR, "SSID from connection is NULL !!\n");
- goto refresh_button;
- }
-
- switch(connection_state)
- {
- case WIFI_DIRECT_CONNECTION_RSP:
- DBG(LOG_VERBOSE, "WIFI_DIRECT_CONNECTION_RSP\n");
-
- if(error_code == WIFI_DIRECT_ERROR_NONE)
- {
- ugd->wfd_status = WFD_LINK_STATUS_CONNECTED;
- peer->conn_status = PEER_CONN_STATUS_CONNECTED;
- }
- else
- {
- peer->conn_status = PEER_CONN_STATUS_FAILED_TO_CONNECT;
- }
-
- wfd_ug_get_connected_peers(ugd);
- wfd_ug_view_update_peers(ugd);
- break;
- case WIFI_DIRECT_DISCONNECTION_RSP:
- case WIFI_DIRECT_DISCONNECTION_IND:
- case WIFI_DIRECT_DISASSOCIATION_IND:
- DBG(LOG_VERBOSE, "WIFI_DIRECT_DISCONNECTION_X\n");
- if(error_code != WIFI_DIRECT_ERROR_NONE)
- {
- // TODO: show disconnection error popup
- return;
- }
-
- if (peer!=NULL)
- peer->conn_status = PEER_CONN_STATUS_DISCONNECTED;
- else
- {
- // In case of disconnect_all(), no specific peer is found.
- }
-
- wifi_direct_start_discovery(FALSE, 0);
- ugd->wfd_status = WFD_LINK_STATUS_DISCOVERING;
- ugd->head_text_mode = HEAD_TEXT_TYPE_SCANING;
-
- wfd_ug_view_refresh_glitem(ugd->head);
-
- wfd_ug_get_discovered_peers(ugd);
- wfd_ug_get_connected_peers(ugd);
- wfd_ug_view_update_peers(ugd);
- break;
-
- case WIFI_DIRECT_CONNECTION_IN_PROGRESS:
- DBG(LOG_VERBOSE, "WIFI_DIRECT_CONNECTION_IN_PROGRESS\n");
- peer->conn_status = PEER_CONN_STATUS_CONNECTING;
- break;
- case WIFI_DIRECT_CONNECTION_REQ:
- case WIFI_DIRECT_CONNECTION_WPS_REQ:
- DBG(LOG_VERBOSE, "WIFI_DIRECT_CLI_EVENT_CONNECTION_REQ\n");
- break;
- default:
- break;
- }
-
- if(peer != NULL)
- wfd_ug_view_refresh_glitem(peer->gl_item);
-
- _change_multi_button_title(ugd);
+ wfd_ug_update_available_peers(ugd);
+ break;
+ case WIFI_DIRECT_DISCONNECTION_RSP:
+ case WIFI_DIRECT_DISCONNECTION_IND:
+ DBG(LOG_INFO, "WIFI_DIRECT_DISCONNECTION_X\n");
+ WFD_IF_DEL_OBJ(ugd->act_popup);
+
+ Evas_Object *content;
+ content = elm_object_part_content_unset(ugd->layout, "button.next");
+ WFD_IF_DEL_OBJ(content);
+ /* when disconnection, clear all the connected peers */
+ if (ugd->raw_connected_peer_cnt > 0) {
+ memset(ugd->raw_connected_peers, 0x00, ugd->raw_connected_peer_cnt*sizeof(device_type_s));
+ }
-refresh_button:
- /* refresh the scan button */
- wfd_refresh_wifi_direct_state(ugd);
- if (WIFI_DIRECT_STATE_CONNECTING == ugd->wfd_status ||
- WIFI_DIRECT_STATE_DISCONNECTING == ugd->wfd_status) {
+ ugd->raw_connected_peer_cnt = 0;
+ wfd_ug_view_init_genlist(ugd, true);
+ if (ugd->wfd_discovery_status == WIFI_DIRECT_DISCOVERY_BACKGROUND) {
+ DBG(LOG_INFO, "Background mode\n");
+ break;
+ }
+
+ if (ugd->is_paused == false) {
+ /* start discovery again */
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ res = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", res);
+ wifi_direct_cancel_discovery();
+ }
+ }
- res = wifi_direct_is_group_owner(&owner);
- if (res == WIFI_DIRECT_ERROR_NONE) {
- if (!owner) {
- if (ugd->scan_btn) {
- wfd_ug_view_refresh_button(ugd->scan_btn, _("IDS_WFD_BUTTON_SCAN"), FALSE);
+ break;
+ case WIFI_DIRECT_CONNECTION_IN_PROGRESS:
+ DBG(LOG_INFO, "WIFI_DIRECT_CONNECTION_IN_PROGRESS\n");
+ wfd_ug_update_toolbar(ugd);
+ wfd_cancel_progressbar_stop_timer(ugd);
+ wfd_delete_progressbar_cb(ugd);
+
+ if (ugd->multi_navi_item) {
+ elm_naviframe_item_pop(ugd->naviframe);
+ }
+
+ ugd->mac_addr_connecting = peer->mac_addr;
+ ugd->is_conn_incoming = FALSE;
+ peer->conn_status = PEER_CONN_STATUS_CONNECTING;
+ peer = find_peer_in_glist(ugd->gl_avlb_peers_start, peer->mac_addr);
+ if (peer != NULL) {
+ peer->conn_status = PEER_CONN_STATUS_CONNECTING;
+ wfd_ug_view_refresh_glitem(peer->gl_item);
+ } else {
+ wfd_ug_get_discovered_peers(ugd);
+ wfd_ug_update_available_peers(ugd);
+ }
+
+ break;
+ case WIFI_DIRECT_CONNECTION_REQ:
+ case WIFI_DIRECT_CONNECTION_WPS_REQ:
+ ugd->mac_addr_connecting = peer->mac_addr;
+ ugd->is_conn_incoming = TRUE;
+ DBG(LOG_INFO, "WIFI_DIRECT_CLI_EVENT_CONNECTION_REQ\n");
+ break;
+ case WIFI_DIRECT_GROUP_DESTROYED:
+ wfd_ug_update_toolbar(ugd);
+ if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_COMPLETED) {
+ ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_NONE;
+ } else {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ res = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", res);
+ wifi_direct_cancel_discovery();
+ }
+ }
+
+ break;
+ default:
+ break;
}
+ }
- if (ugd->multi_connect_btn) {
- wfd_ug_view_refresh_button(ugd->multi_scan_btn, _("IDS_WFD_BUTTON_SCAN"), FALSE);
+refresh_button:
+ /* refresh the scan button */
+ wfd_refresh_wifi_direct_state(ugd);
+ if (WIFI_DIRECT_STATE_CONNECTING == ugd->wfd_status ||
+ WIFI_DIRECT_STATE_DISCONNECTING == ugd->wfd_status) {
+ res = wifi_direct_is_group_owner(&owner);
+ if (res == WIFI_DIRECT_ERROR_NONE) {
+ if (!owner) {
+ if (ugd->scan_toolbar) {
+ evas_object_data_set(ugd->toolbar, "scan", "scan");
+ }
+
+ if (ugd->multiconn_scan_stop_btn) {
+ wfd_ug_view_refresh_button(ugd->multiconn_scan_stop_btn, "IDS_WIFI_SK4_SCAN", FALSE);
+ }
+ }
+ } else {
+ DBG(LOG_ERROR, "Failed to get whether client is group owner. [%d]\n", res);
}
- }
} else {
- DBG(LOG_ERROR, "Failed to get whether client is group owner. [%d]\n", res);
+ if (ugd->scan_toolbar) {
+ evas_object_data_set(ugd->toolbar, "scan", "scan");
+ }
+
+ if (ugd->multiconn_scan_stop_btn) {
+ wfd_ug_view_refresh_button(ugd->multiconn_scan_stop_btn, "IDS_WIFI_SK4_SCAN", TRUE);
+ }
}
- } else {
- if (ugd->scan_btn) {
- wfd_ug_view_refresh_button(ugd->scan_btn, _("IDS_WFD_BUTTON_SCAN"), TRUE);
+
+ __FUNC_EXIT__;
+ return;
+}
+
+/**
+ * This function let the ug make a callback for registering ip assigned event
+ * @return void
+ * @param[in] mac_address the mac address of peer
+ * @param[in] ip_address the ip address of peer
+ * @param[in] interface_address the interface address
+ * @param[in] user_data the pointer to the main data structure
+ */
+void _ip_assigned_cb(const char *mac_address, const char *ip_address, const char *interface_address, void *user_data)
+{
+ __FUNC_ENTER__;
+
+ if (!user_data) {
+ DBG(LOG_ERROR, "The user_data is NULL\n");
+ return;
}
- if (ugd->multi_connect_btn) {
- wfd_ug_view_refresh_button(ugd->multi_scan_btn, _("IDS_WFD_BUTTON_SCAN"), TRUE);
+ struct ug_data *ugd = (struct ug_data *)user_data;
+
+ if (!ip_address || 0 == strncmp(ip_address, "0.0.0.0", 7)) {
+ DBG(LOG_ERROR,"ip address is invalid.\n");
+ return;
}
- }
- __FUNC_EXIT__;
- return;
+ ugd->peer_ip_address = strdup(ip_address);
+
+
+ /* to send ip_addr*/
+ int ret = -1;
+ app_control_h control = NULL;
+ ret = app_control_create(&control);
+ if (ret) {
+ DBG(LOG_ERROR, "Failed to create control");
+ return;
+ }
+ app_control_add_extra_data(control, "ip_address", ugd->peer_ip_address);
+ app_control_add_extra_data(control, "wfds", ugd->service_name);
+ ug_send_result(ugd->ug, control);
+ app_control_destroy(control);
+
+ /* when auto_exit and not multi-connect*/
+ if ((ugd->is_auto_exit)&&(ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_NONE)) {
+ _wfd_ug_auto_exit(ugd);
+ }
+
+ __FUNC_EXIT__;
}
-int wfd_get_vconf_status(void *data)
+/**
+ * This function let the ug get wi-fi direct status from vconf
+ * @return If success, return the wfd status, else return -1
+ * @param[in] void
+ */
+int wfd_get_vconf_status()
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- char *dev_name;
+ __FUNC_ENTER__;
+ int wifi_direct_state = 0;
- // TODO: get wifi direct status from vconf
- // db/mobile_hotspot/wifi_key (string)
+ /* get wifi direct status from vconf */
+ if (vconf_get_int(VCONFKEY_WIFI_DIRECT_STATE, &wifi_direct_state) < 0) {
+ DBG(LOG_ERROR, "Error reading vconf (%s)\n", VCONFKEY_WIFI_DIRECT_STATE);
+ return -1;
+ }
+ DBG(LOG_INFO, "WiFi Direct State [%d]", wifi_direct_state);
- dev_name = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR); // "db/setting/device_name" (VCONF_WFD_APNAME)
- if (dev_name == NULL)
- {
- ugd->dev_name = strdup(DEFAULT_DEV_NAME);
- DBG(LOG_ERROR, "The AP name is NULL(setting default value)\n");
- }
- else
- {
- ugd->dev_name = strdup(dev_name);
- free(dev_name);
- }
+ __FUNC_EXIT__;
+ return wifi_direct_state;
+}
+
+/**
+ * This function let the ug get device name from vconf
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_get_vconf_device_name(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ char *dev_name = NULL;
+
+ /* get device name from vconf */
+ dev_name = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+ if (dev_name == NULL) {
+ ugd->dev_name = strdup(DEFAULT_DEV_NAME);
+ DBG(LOG_ERROR, "The AP name is NULL(setting default value)\n");
+ return -1;
+ }
- __FUNC_EXIT__;
+ ugd->dev_name = strdup(dev_name);
+ WFD_IF_FREE_MEM(dev_name);
- return 0;
+ __FUNC_EXIT__;
+ return 0;
}
+/**
+ * This function let the ug refresh current status of wi-fi direct
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int wfd_refresh_wifi_direct_state(void *data)
{
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
int res;
wifi_direct_state_e wfd_status;
- res = wifi_direct_get_state(&wfd_status);
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to get link status. [%d]\n", res);
- return -1;
- }
- DBG(LOG_VERBOSE, "WFD status [%d]", wfd_status);
- ugd->wfd_status = wfd_status;
- return 0;
+
+ res = wifi_direct_get_state(&wfd_status);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to get link status. [%d]\n", res);
+ return -1;
+ }
+
+ DBG(LOG_INFO, "WFD status [%d]", wfd_status);
+ ugd->wfd_status = wfd_status;
+
+ __FUNC_EXIT__;
+ return 0;
}
-int init_wfd_client(void *data)
+void wfd_init_ug_by_status(void *user_data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int res = 0;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)user_data;
+ int res = 0;
- res = wifi_direct_initialize();
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to initialize wifi direct. [%d]\n", res);
- return -1;
- }
+ if(ugd == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
+ }
- res = wifi_direct_set_device_state_changed_cb(_activation_cb, (void*) ugd);
- res = wifi_direct_set_discovery_state_changed_cb(_discover_cb, (void*) ugd);
- res = wifi_direct_set_connection_state_changed_cb(_connection_cb, (void*) ugd);
+ if (ugd->wfd_status >= WIFI_DIRECT_STATE_ACTIVATED) {
+ //wfd_ug_get_discovered_peers(ugd);
+ ugd->title_content_mode = TITLE_CONTENT_TYPE_NONE;
+ }
- /* update WFD status */
- wfd_refresh_wifi_direct_state(ugd);
- if (ugd->wfd_status > WIFI_DIRECT_STATE_ACTIVATING)
- ugd->wfd_onoff = 1;
- else
- ugd->wfd_onoff = 0;
+ if (ugd->wfd_status >= WIFI_DIRECT_STATE_CONNECTED) {
+ wfd_ug_get_connected_peers(ugd);
+ wfd_ug_update_connected_peers(ugd);
+ ugd->title_content_mode = TITLE_CONTENT_TYPE_NONE;
+ wfd_ug_get_discovered_peers(ugd);
+ wfd_ug_update_available_peers(ugd);
+ wfd_ug_update_toolbar(ugd);
+ }
- DBG(LOG_VERBOSE, "WFD link status. [%d]\n", ugd->wfd_status);
+ if (ugd->wfd_status == WIFI_DIRECT_STATE_CONNECTING) {
+ ugd->title_content_mode = TITLE_CONTENT_TYPE_NONE;
+ wfd_ug_get_discovered_peers(ugd);
+ wfd_ug_get_connecting_peer(ugd);
+ wfd_ug_update_available_peers(ugd);
+ wfd_ug_update_toolbar(ugd);
+ }
- __FUNC_EXIT__;
+ if (ugd->wfd_status == WIFI_DIRECT_STATE_ACTIVATED ||
+ ugd->wfd_status == WIFI_DIRECT_STATE_DISCOVERING) {
+ /* start discovery */
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ res = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", res);
+ wifi_direct_cancel_discovery();
+ }
+ }
- return 0;
+ __FUNC_EXIT__;
}
-int deinit_wfd_client(void *data)
+/**
+ * This function let the ug do initialization
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int init_wfd_client(void* data)
{
__FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ WFD_RETV_IF(data == NULL, -1, "Incorrect parameter(NULL)\n");
+ struct ug_data *ugd = (struct ug_data *)data;
int res = 0;
+
+ res = wifi_direct_initialize();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ if (res != WIFI_DIRECT_ERROR_ALREADY_INITIALIZED) {
+ DBG(LOG_ERROR, "Failed to initialize wifi direct. [%d]\n", res);
+ return -1;
+ } else {
+ DBG(LOG_ERROR, "Already registered\n");
+ }
+ }
+
+ res = wifi_direct_set_device_state_changed_cb(_activation_cb, (void *)ugd);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to register _cb_activation. error code = [%d]\n", res);
+ return -1;
+ }
+
+ res = wifi_direct_set_discovery_state_changed_cb(discover_cb, (void *)ugd);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to register _cb_discover. error code = [%d]\n", res);
+ return -1;
+ }
+
+ res = wifi_direct_set_connection_state_changed_cb(_connection_cb, (void *)ugd);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to register _cb_connection. error code = [%d]\n", res);
+ return -1;
+ }
+
+ res = wifi_direct_set_client_ip_address_assigned_cb(_ip_assigned_cb, (void *)ugd);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to register _ip_assigned_cb. error code = [%d]\n", res);
+ return -1;
+ }
+
+ /* update WFD status */
+ wfd_refresh_wifi_direct_state(ugd);
+#ifdef WFD_ON_OFF_GENLIST
+ if (ugd->wfd_status > WIFI_DIRECT_STATE_ACTIVATING) {
+ ugd->wfd_onoff = 1;
+ wfd_ug_refresh_on_off_check(ugd);
+ } else {
+ ugd->wfd_onoff = 0;
+ }
+#endif
+
+ DBG(LOG_INFO, "WFD link status. [%d]\n", ugd->wfd_status);
+ ugd->is_init_ok = TRUE;
+ wfd_init_ug_by_status(ugd);
+
+ __FUNC_EXIT__;
+ return 0;
+}
+
+#ifdef WFD_DBUS_LAUNCH
+void wfd_gdbus_callback(GObject *source_object, GAsyncResult *result, gpointer user_data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)user_data;
+ WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
+ int res = -1;
+
+ GError *error = NULL;
+ GVariant *return_data;
+
+ g_object_unref(ugd->dbus_cancellable);
+ ugd->dbus_cancellable = NULL;
+ ugd->conn = G_DBUS_CONNECTION (source_object);
+ return_data = g_dbus_connection_call_finish(ugd->conn, result, &error);
+
+ if (error != NULL) {
+ DBG(LOG_ERROR,"DBus action failed. Error Msg [%s]\n", error->message);
+ g_clear_error(&error);
+ } else {
+ DBG(LOG_INFO, "error msg is NULL\n");
+ }
+
+ if (return_data)
+ g_variant_unref(return_data);
+
+ if (ugd->conn) {
+ g_object_unref(ugd->conn);
+ ugd->conn = NULL;
+ }
+
+ res = init_wfd_client(ugd);
+ WFD_RET_IF(res != 0, "Failed to initialize WFD client library\n");
+
+ /* Activate WiFi Direct */
+ /*
+ DBG(LOG_INFO, "Activating WiFi Direct...");
+ if (ugd->wfd_status <= WIFI_DIRECT_STATE_DEACTIVATING) {
+ res = wfd_client_switch_on(ugd);
+ WFD_RET_IF(res != 0, "Failed to activate WFD\n");
+ }
+ */
+
+ __FUNC_EXIT__;
+}
+
+int launch_wifi_direct_manager(void *data)
+{
+ __FUNC_ENTER__;
+
+ gchar *addr = NULL;
+ GError *error = NULL;
+
+ struct ug_data *ugd = (struct ug_data *)data;
+ WFD_RETV_IF(ugd == NULL, -1, "Incorrect parameter(NULL)\n");
+
+ ugd->dbus_cancellable = g_cancellable_new();
+
+ addr = g_dbus_address_get_for_bus_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
+ WFD_RETV_IF(addr == NULL, -1, "Fail to get dbus addr.\n");
+
+ ugd->conn = g_dbus_connection_new_for_address_sync(addr,G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
+ G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION, NULL, NULL, NULL);
+
+ if(ugd->conn == NULL) {
+ DBG(LOG_ERROR,"g_dbus_conn is NULL\n");
+ return -1;
+ } else {
+ g_dbus_connection_call(ugd->conn, "net.netconfig", "/net/netconfig/wifi","net.netconfig.wifi",
+ "LaunchDirect", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, -1, ugd->dbus_cancellable, wfd_gdbus_callback, data);
+ }
+
+ __FUNC_EXIT__;
+ return 0;
+}
+#endif
+
+void wfd_client_destroy_tethering(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
+
tethering_error_e ret = TETHERING_ERROR_NONE;
- tethering_h th = NULL;
+
+ if (ugd->hotspot_handle != NULL) {
+ /* Deregister cbs */
+ ret = tethering_unset_enabled_cb(ugd->hotspot_handle, TETHERING_TYPE_WIFI);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_unset_enabled_cb is failed(%d)\n", ret);
+ }
+
+ ret = tethering_unset_disabled_cb(ugd->hotspot_handle, TETHERING_TYPE_WIFI);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_unset_disabled_cb is failed(%d)\n", ret);
+ }
+
+ ret = tethering_unset_disabled_cb(ugd->hotspot_handle, TETHERING_TYPE_RESERVED);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_unset_disabled_cb is failed(%d)\n", ret);
+ }
+
+ /* Destroy tethering handle */
+ ret = tethering_destroy(ugd->hotspot_handle);
+ if (ret != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "tethering_destroy is failed(%d)\n", ret);
+ }
+
+ ugd->hotspot_handle = NULL;
+ }
+
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug do de-initialization
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int deinit_wfd_client(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ int res = 0;
wfd_refresh_wifi_direct_state(ugd);
- if(ugd->wfd_status == WIFI_DIRECT_STATE_DISCOVERING)
- {
- DBG(LOG_VERBOSE, "Stop discovery before deregister client\n");
- wifi_direct_cancel_discovery();
+ if ((WIFI_DIRECT_STATE_DISCOVERING == ugd->wfd_status) &&
+ (WIFI_DIRECT_ERROR_NONE != wifi_direct_cancel_discovery())) {
+ DBG(LOG_ERROR, "Failed to send cancel discovery state [%d]\n", ugd->wfd_status);
+ }
+
+ wfd_cancel_progressbar_stop_timer(ugd);
+ wfd_cancel_not_alive_delete_timer(ugd);
+
+ if(ugd->timer_multi_reset > 0) {
+ g_source_remove(ugd->timer_multi_reset);
+ }
+ ugd->timer_multi_reset = 0;
+
+ if (ugd->g_source_multi_connect_next > 0) {
+ g_source_remove(ugd->g_source_multi_connect_next);
+ }
+ ugd->g_source_multi_connect_next = 0;
+
+ res = wifi_direct_unset_discovery_state_changed_cb();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to unset discovery state changed cb. [%d]\n", res);
+ }
+
+ wifi_direct_unset_device_state_changed_cb();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to unset device state changed cb. [%d]\n", res);
+ }
+
+ wifi_direct_unset_connection_state_changed_cb();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to unset connection state changed cb. [%d]\n", res);
+ }
+
+ wifi_direct_unset_client_ip_address_assigned_cb();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to unset client ip address assigned cb. [%d]\n", res);
}
+ if (ugd->wfd_status == WIFI_DIRECT_STATE_CONNECTING &&
+ NULL != ugd->mac_addr_connecting) {
+ if (ugd->is_conn_incoming) {
+ DBG(LOG_INFO, "Reject the incoming connection before client deregister \n");
+ res = wifi_direct_reject_connection(ugd->mac_addr_connecting);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to send reject request [%d]\n", res);
+ }
+ } else {
+ DBG(LOG_INFO, "Cancel the outgoing connection before client deregister \n");
+ res = wifi_direct_cancel_connection(ugd->mac_addr_connecting);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to send cancel request [%d]\n", res);
+ }
+ }
+ ugd->mac_addr_connecting = NULL;
+ }
+
+
res = wifi_direct_deinitialize();
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
+ if (res != WIFI_DIRECT_ERROR_NONE) {
DBG(LOG_ERROR, "Failed to deregister client. [%d]\n", res);
}
+ /* release vconf, hotspot.. */
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
res = vconf_ignore_key_changed(VCONFKEY_WIFI_STATE, _wifi_state_cb);
- if(res == -1)
- {
+ if (res == -1) {
DBG(LOG_ERROR, "Failed to ignore vconf key callback for wifi state\n");
}
res = net_deregister_client();
- if(res != NET_ERR_NONE)
- {
+ if (res != NET_ERR_NONE) {
DBG(LOG_ERROR, "Failed to deregister network client. [%d]\n", res);
}
+#endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
- __FUNC_EXIT__;
+ wfd_client_destroy_tethering(ugd);
+
+ __FUNC_EXIT__;
return 0;
}
+/**
+ * This function let the ug turn wi-fi direct on
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int wfd_client_switch_on(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int res;
-
- DBG(LOG_VERBOSE, "WFD status [%d]\n", ugd->wfd_status);
-
- if(ugd->wfd_status < WFD_LINK_STATUS_ACTIVATING)
- {
- ugd->wfd_status = WFD_LINK_STATUS_ACTIVATING;
-
- int wifi_state;
- res = vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
- if (res != 0)
- {
- DBG(LOG_ERROR, "Failed to get wifi state from vconf. [%d]\n", res);
- // TODO: set genlist head item as "WiFi Direct"
- return -1;
- }
-
- if(wifi_state > VCONFKEY_WIFI_OFF)
- {
- DBG(LOG_VERBOSE, "WiFi is connected, so have to turn off WiFi");
- wfd_ug_act_popup(ugd, _("IDS_WFD_POP_WIFI_OFF"), POPUP_TYPE_WIFI_OFF); // "This will turn off Wi-Fi client operation.<br>Continue?"
- }
- else // (wifi_state < VCONFKEY_WIFI_CONNECTED && !(hotspot_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI))
- {
- res = wifi_direct_activate();
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to activate Wi-Fi Direct. error code = [%d]\n", res);
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_ACTIVATE_FAIL"), POPUP_TYPE_TERMINATE);
-
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- wfd_ug_view_refresh_glitem(ugd->head);
- return -1;
- }
- }
- }
- else
- {
- DBG(LOG_VERBOSE, "Wi-Fi Direct is already activated\n");
- }
-
- __FUNC_EXIT__;
- return 0;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ int res;
+
+ bool is_wifi_enabled = false;
+ bool is_wifi_ap_enabled = false;
+
+
+ if(!ugd->is_init_ok) {
+ DBG(LOG_ERROR, "device is initializing, please wait\n");
+ return -1;
+ }
+
+ wfd_refresh_wifi_direct_state(ugd);
+ DBG(LOG_INFO, "WFD status [%d]\n", ugd->wfd_status);
+
+ if (ugd->wfd_status < WIFI_DIRECT_STATE_ACTIVATING) {
+
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
+ int wifi_state;
+ res = vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
+ if (res != 0) {
+ DBG(LOG_ERROR, "Failed to get wifi state from vconf. [%d]\n", res);
+ return -1;
+ }
+#endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
+
+ ugd->hotspot_handle = NULL;
+ res = tethering_create(&(ugd->hotspot_handle));
+ if (res != TETHERING_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to tethering_create() [%d]\n", res);
+ return -1;
+ } else {
+ DBG(LOG_INFO, "Succeeded to tethering_create()\n");
+ }
+
+ is_wifi_enabled = tethering_is_enabled(ugd->hotspot_handle, TETHERING_TYPE_WIFI);
+ is_wifi_ap_enabled = tethering_is_enabled(ugd->hotspot_handle, TETHERING_TYPE_RESERVED);
+
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
+ if (wifi_state > VCONFKEY_WIFI_OFF) {
+ DBG(LOG_INFO, "WiFi is connected, so have to turn off WiFi");
+ wfd_ug_act_popup(ugd, _("IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"), POPUP_TYPE_WIFI_OFF);
+ } else
+#endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
+
+ if (is_wifi_enabled || is_wifi_ap_enabled) {
+ DBG(LOG_INFO, "WiFi is connected, so have to turn off WiFi");
+ wfd_ug_act_popup(ugd, _("IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"), POPUP_TYPE_HOTSPOT_OFF);
+ } else
+
+ {
+ res = wifi_direct_activate();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to activate Wi-Fi Direct. error code = [%d]\n", res);
+ wfd_ug_warn_popup(ugd, _("IDS_COM_POP_FAILED"), POPUP_TYPE_TERMINATE);
+#ifdef WFD_ON_OFF_GENLIST
+ wfd_ug_refresh_on_off_check(ugd);
+#endif
+ return -1;
+ }
+
+#ifdef WFD_ON_OFF_GENLIST
+ if (ugd->on_off_check) {
+ elm_check_state_set(ugd->on_off_check, TRUE);
+ elm_object_disabled_set(ugd->on_off_check, TRUE);
+ }
+#endif
+ /* while activating, disable the buttons */
+ if (ugd->scan_toolbar == NULL) {
+ scan_button_create(ugd);
+ }
+
+ if (ugd->scan_toolbar) {
+ wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN", FALSE);
+ }
+
+ if (ugd->multiconn_scan_stop_btn) {
+ wfd_ug_view_refresh_button(ugd->multiconn_scan_stop_btn, "IDS_WIFI_SK4_SCAN", FALSE);
+ }
+
+ if (ugd->back_btn) {
+ elm_object_disabled_set(ugd->back_btn, TRUE);
+ }
+ }
+ } else {
+ DBG(LOG_INFO, "Wi-Fi Direct is already activated\n");
+ }
+
+ __FUNC_EXIT__;
+ return 0;
}
+/**
+ * This function let the ug turn wi-fi direct off
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int wfd_client_switch_off(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int res;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ int res;
- DBG(LOG_VERBOSE, "WFD status [%d]\n", ugd->wfd_status);
+ wfd_ug_view_free_peers(ugd);
+ wfd_free_nodivice_item(ugd);
- if(ugd->wfd_status < WFD_LINK_STATUS_ACTIVATING)
- {
- DBG(LOG_VERBOSE, "Wi-Fi Direct is already deactivated\n");
- }
- else
- {
- ugd->wfd_status = WFD_LINK_STATUS_DEACTIVATING;
+ wfd_refresh_wifi_direct_state(ugd);
+ DBG(LOG_INFO, "WFD status [%d]\n", ugd->wfd_status);
- res = wifi_direct_deactivate();
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to deactivate Wi-Fi Direct. error code = [%d]\n", res);
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_DEACTIVATE_FAIL"), POPUP_TYPE_TERMINATE);
+ if (ugd->wfd_status < WIFI_DIRECT_STATE_ACTIVATING) {
+ DBG(LOG_INFO, "Wi-Fi Direct is already deactivated\n");
+ } else {
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- wfd_ug_view_refresh_glitem(ugd->head);
- return -1;
- }
- }
+ wfd_client_destroy_tethering(ugd);
- __FUNC_EXIT__;
- return 0;
-}
+ wfd_cancel_progressbar_stop_timer(ugd);
+ wfd_cancel_not_alive_delete_timer(ugd);
-int wfd_client_swtch_force(void *data, int onoff)
-{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int res;
-
- if(onoff)
- {
- res = wifi_direct_activate();
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to activate Wi-Fi Direct. error code = [%d]\n", res);
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_ACTIVATE_FAIL"), POPUP_TYPE_TERMINATE);
-
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- wfd_ug_view_refresh_glitem(ugd->head);
- return -1;
- }
- }
- else
- {
- res = wifi_direct_deactivate();
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to deactivate Wi-Fi Direct. error code = [%d]\n", res);
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_DEACTIVATE_FAIL"), POPUP_TYPE_TERMINATE);
-
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- wfd_ug_view_refresh_glitem(ugd->head);
- return -1;
- }
- }
- __FUNC_EXIT__;
- return 0;
-}
-
-int wfd_client_start_discovery(void *data)
-{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int res = -1;
-
-#if 0
- ret = wifi_direct_cancel_discovery();
-// ret = wifi_direct_cancel_discovery();
- if (ret != WIFI_DIRECT_ERROR_NONE) {
- DBG(LOG_ERROR, "Failed wfd discover() : %d", ret);
- return FALSE;
- }
-
-
- if(ugd->wfd_status >= WIFI_DIRECT_STATE_ACTIVATED)
- {
- res = wifi_direct_start_discovery(FALSE, 30);
- if (res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to start wfd discovery. [%d]", res);
- return -1;
- }
- }
+ if(ugd->timer_multi_reset > 0) {
+ g_source_remove(ugd->timer_multi_reset);
+ }
+ ugd->timer_multi_reset = 0;
+
+ if (ugd->g_source_multi_connect_next > 0) {
+ g_source_remove(ugd->g_source_multi_connect_next);
+ }
+ ugd->g_source_multi_connect_next = 0;
+
+ /*if connected, disconnect all devices*/
+ if (WIFI_DIRECT_STATE_CONNECTED == ugd->wfd_status) {
+ res = wifi_direct_disconnect_all();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to send disconnection request to all. [%d]\n", res);
+ return -1;
+ }
+ }
+
+ res = wifi_direct_deactivate();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to deactivate Wi-Fi Direct. error code = [%d]\n", res);
+ wfd_ug_warn_popup(ugd, _("IDS_WIFI_POP_DEACTIVATION_FAILED"), POPUP_TYPE_TERMINATE_DEACTIVATE_FAIL);
+#ifdef WFD_ON_OFF_GENLIST
+ wfd_ug_refresh_on_off_check(ugd);
#endif
+ return -1;
+ }
- ugd->wfd_status = WIFI_DIRECT_DISCOVERY_STARTED;
- wfd_refresh_wifi_direct_state(ugd);
- ugd->head_text_mode = HEAD_TEXT_TYPE_SCANING;
- wfd_ug_view_refresh_glitem(ugd->head);
- wifi_direct_cancel_discovery();
+ /* while deactivating, disable the buttons */
+ if (ugd->scan_toolbar) {
+ wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN", FALSE);
+ evas_object_del(ugd->scan_toolbar);
+ ugd->scan_toolbar = NULL;
+ }
- res = wifi_direct_start_discovery(FALSE, 0);
- if (res != WIFI_DIRECT_ERROR_NONE) {
- DBG(LOG_ERROR, "Fail to restart scanning. %d\n", res);
- return -1;
- }
+ if (ugd->multiconn_scan_stop_btn) {
+ wfd_ug_view_refresh_button(ugd->multiconn_scan_stop_btn, "IDS_WIFI_SK4_SCAN", FALSE);
+ }
- ugd->wfd_status = WIFI_DIRECT_DISCOVERY_FOUND;
- wfd_refresh_wifi_direct_state(ugd);
+ if (ugd->multi_connect_toolbar_item) {
+ elm_object_item_disabled_set(ugd->multi_connect_toolbar_item, TRUE);
+ }
- __FUNC_EXIT__;
- return 0;
+ if (ugd->back_btn) {
+ elm_object_disabled_set(ugd->back_btn, TRUE);
+ }
+ }
+
+ __FUNC_EXIT__;
+ return 0;
}
-int wfd_client_connect(const char *mac_addr)
+#ifdef WFD_ON_OFF_GENLIST
+/**
+ * This function let the ug turn wi-fi direct on/off forcely
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ * @param[in] onoff whether to turn on/off wi-fi direct
+ */
+int wfd_client_swtch_force(void *data, int onoff)
{
- __FUNC_ENTER__;
- int res;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ int res;
- DBG(LOG_ERROR, "connect to peer=[%s]\n", mac_addr);
- res = wifi_direct_connect(mac_addr);
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to send connection request. [%d]\n", res);
- return -1;
- }
- __FUNC_EXIT__;
- return 0;
+ if (onoff) {
+ res = wifi_direct_activate();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to activate Wi-Fi Direct. error code = [%d]\n", res);
+ wfd_ug_warn_popup(ugd, _("IDS_COM_POP_FAILED"), POPUP_TYPE_TERMINATE);
+ wfd_ug_refresh_on_off_check(ugd);
+ return -1;
+ }
+ } else {
+ res = wifi_direct_deactivate();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to deactivate Wi-Fi Direct. error code = [%d]\n", res);
+ wfd_ug_warn_popup(ugd, _("IDS_WIFI_POP_DEACTIVATION_FAILED"), POPUP_TYPE_TERMINATE);
+ wfd_ug_refresh_on_off_check(ugd);
+ return -1;
+ }
+ }
+
+ __FUNC_EXIT__;
+ return 0;
}
+#endif
-int wfd_client_disconnect(const char *mac_addr)
+/**
+ * This function let the ug create a group
+ * @return If success, return 0, else return -1
+ */
+int wfd_client_group_add()
{
- __FUNC_ENTER__;
- int res;
-
- if(mac_addr == NULL)
- {
- res = wifi_direct_disconnect_all();
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to send disconnection request to all. [%d]\n", res);
- return -1;
- }
- }
- else
- {
- res = wifi_direct_disconnect(mac_addr);
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to send disconnection request. [%d]\n", res);
- return -1;
- }
- }
- __FUNC_EXIT__;
- return 0;
+ __FUNC_ENTER__;
+ int res;
+
+ res = wifi_direct_create_group();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to add group");
+ __FUNC_EXIT__;
+ return -1;
+ }
+
+ __FUNC_EXIT__;
+ return 0;
}
-int wfd_client_set_p2p_group_owner_intent(int go_intent)
+/**
+ * This function let the ug connect to the device by mac address
+ * @return If success, return 0, else return -1
+ * @param[in] mac_addr the pointer to the mac address of device
+ */
+int wfd_client_connect(const char *mac_addr)
{
- __FUNC_ENTER__;
- int res;
+ __FUNC_ENTER__;
+ int res;
- res = wifi_direct_set_group_owner_intent(go_intent);
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to wifi_direct_set_go_intent(%d). [%d]\n", go_intent, res);
+ DBG_SECURE(LOG_INFO, "connect to peer=["MACSECSTR"]\n", MAC2SECSTR(mac_addr));
+ res = wifi_direct_connect((char *)mac_addr);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to send connection request. [%d]\n", res);
return -1;
}
- __FUNC_EXIT__;
- return 0;
+
+ __FUNC_EXIT__;
+ return 0;
}
-int wfd_client_get_peers(struct ug_data *ugd)
+/**
+ * This function let the ug disconnect to the device by mac address
+ * @return If success, return 0, else return -1
+ * @param[in] mac_addr the pointer to the mac address of device
+ */
+int wfd_client_disconnect(const char *mac_addr)
{
+ __FUNC_ENTER__;
+ int res;
- if(ugd->wfd_status < WFD_LINK_STATUS_ACTIVATED)
- {
- ugd->raw_discovered_peer_cnt = 0;
- ugd->raw_connected_peer_cnt = 0;
- return 0;
+ wifi_direct_cancel_discovery();
+ /*
+ * No need to handle return in cancel discovery as there maybe case
+ * when framework can return failure.
+ */
+
+ if (mac_addr == NULL) {
+ res = wifi_direct_disconnect_all();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to send disconnection request to all. [%d]\n", res);
+ return -1;
+ }
+ } else {
+ res = wifi_direct_disconnect((char *)mac_addr);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to send disconnection request. [%d]\n", res);
+ return -1;
+ }
}
- if(ugd->wfd_status > WIFI_DIRECT_STATE_ACTIVATING)
- {
- wfd_ug_get_discovered_peers(ugd);
- }
+ __FUNC_EXIT__;
+ return 0;
+}
- if(ugd->wfd_status >= WIFI_DIRECT_STATE_CONNECTED)
- {
- wfd_ug_get_connected_peers(ugd);
- }
+/**
+ * This function let the ug set the intent of a group owner
+ * @return If success, return 0, else return -1
+ * @param[in] go_intent the intent parameter
+ */
+int wfd_client_set_p2p_group_owner_intent(int go_intent)
+{
+ __FUNC_ENTER__;
+ int res;
+
+ res = wifi_direct_set_group_owner_intent(go_intent);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to wifi_direct_set_go_intent(%d). [%d]\n", go_intent, res);
+ return -1;
+ }
- wfd_ug_view_update_peers(ugd);
- _change_multi_button_title(ugd);
- return 0;
+ __FUNC_EXIT__;
+ return 0;
}
diff --git a/ug-wifidirect/src/wfd_motion_control.c b/ug-wifidirect/src/wfd_motion_control.c
new file mode 100755
index 0000000..385f557
--- /dev/null
+++ b/ug-wifidirect/src/wfd_motion_control.c
@@ -0,0 +1,204 @@
+/*
+ * Wi-Fi direct
+ *
+ * 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 <vconf.h>
+#include <sensor_internal.h>
+#include <vconf-keys.h>
+
+#include <libintl.h>
+#include <glib.h>
+
+#include <Elementary.h>
+#include <vconf.h>
+#include <ui-gadget-module.h>
+#include <wifi-direct.h>
+
+#include "wfd_motion_control.h"
+#include "wfd_ug_view.h"
+#include "wfd_client.h"
+
+
+static int motion_handle = -1;
+
+static TARGET_VIEW_FOCUS __motion_target_view_focus_get(void *data)
+{
+ struct ug_data *ugd = (struct ug_data *)data;
+
+ if ((ugd == NULL) || (ugd->naviframe == NULL)) {
+ return MOTION_TARGET_VIEW_FOCUS_OFF;
+ }
+
+ if (elm_object_focus_get(ugd->naviframe)) {
+ return MOTION_TARGET_VIEW_FOCUS_ON;
+ } else {
+ return MOTION_TARGET_VIEW_FOCUS_OFF;
+ }
+}
+
+
+static void __motion_shake_cb(unsigned int event_type, sensor_event_data_t *event_data, void *data)
+{
+ __FUNC_ENTER__;
+
+ gboolean motion_activated = FALSE;
+ struct ug_data *ugd = (struct ug_data *) data;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR,"NULL pointer!");
+ return;
+ }
+ TARGET_VIEW_FOCUS focus_state = __motion_target_view_focus_get(ugd);
+
+ DBG(LOG_DEBUG, "event type: %d, focus state: %d\n", event_type, focus_state);
+
+ if (focus_state != MOTION_TARGET_VIEW_FOCUS_ON) {
+ return;
+ }
+
+ if (vconf_get_bool(VCONFKEY_SETAPPL_MOTION_ACTIVATION,
+ (void *)&motion_activated)) {
+ DBG(LOG_ERROR,"Get motion activation status fail");
+ return;
+ }
+
+ if (FALSE == motion_activated) {
+ DBG(LOG_INFO,"Motion value is false");
+ return;
+ }
+
+ if (vconf_get_bool(VCONFKEY_SETAPPL_USE_SHAKE,
+ (void *)&motion_activated)) {
+ DBG(LOG_ERROR, "Get use shake status fail");
+ return;
+ }
+
+ if (FALSE == motion_activated) {
+ DBG(LOG_INFO,"Shake status is false");
+ return;
+ }
+
+ int ret = -1;
+ const char *btn_text = NULL;
+
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
+ }
+
+ wfd_refresh_wifi_direct_state(ugd);
+
+ if (NULL == ugd->scan_toolbar) {
+ DBG(LOG_ERROR, "NULL == ugd->scan_toolbar\n");
+ return;
+ }
+
+ btn_text = elm_object_part_text_get(ugd->scan_toolbar, "default");
+ if (NULL == btn_text) {
+ DBG(LOG_ERROR, "Incorrect button text(NULL)\n");
+ return;
+ }
+
+ GList *iterator = NULL;
+
+ if (0 == strcmp(btn_text, _("IDS_WIFI_SK4_SCAN"))) {
+ if (WIFI_DIRECT_STATE_CONNECTED == ugd->wfd_status) {
+ ret = wfd_client_disconnect(NULL);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed wfd_client_disconnect() [%d]\n", ret);
+ __FUNC_EXIT__;
+ return;
+ }
+
+ if (ugd->multi_connect_mode != WFD_MULTI_CONNECT_MODE_NONE) {
+ wfd_free_multi_selected_peers(ugd);
+ } else {
+ /* update the connecting icon */
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ ((device_type_s *)iterator->data)->conn_status = PEER_CONN_STATUS_DISCONNECTED;
+ wfd_ug_view_refresh_glitem(((device_type_s *)iterator->data)->gl_item);
+ }
+ }
+ } else if (WIFI_DIRECT_STATE_DEACTIVATED == ugd->wfd_status) {
+ wfd_client_switch_on(ugd);
+ } else if ((WIFI_DIRECT_STATE_DISCOVERING == ugd->wfd_status) || (WIFI_DIRECT_STATE_ACTIVATED == ugd->wfd_status)) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ ret = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", ret);
+ wifi_direct_cancel_discovery();
+ }
+ }
+ }
+
+ __FUNC_EXIT__;
+}
+
+void motion_create(struct ug_data *ugd)
+{
+ int ret = -1;
+
+ motion_handle = sf_connect(MOTION_SENSOR);
+ if (motion_handle < 0) {
+ DBG(LOG_ERROR, "Failed Operation sf_connect.\n");
+ return;
+ }
+ ret = sf_register_event(motion_handle, MOTION_ENGINE_EVENT_SHAKE, NULL,
+ __motion_shake_cb, ugd);
+ if (ret < 0) {
+ DBG(LOG_ERROR, "Failed Operation sf_register_event. [%d]\n", ret);
+ goto fail;
+ }
+ ret = sf_start(motion_handle, 0);
+ if (ret < 0) {
+ DBG(LOG_ERROR, "Failed Operation sf_start. [%d]\n", ret);
+ goto fail;
+ }
+
+ DBG(LOG_INFO, "Succesfully, Init Sensor Handle\n");
+ return;
+
+fail:
+ ret = sf_disconnect(motion_handle);
+ if (ret < 0) {
+ DBG(LOG_ERROR, "Failed Operation sf_disconnect. [%d]\n", ret);
+ }
+}
+
+void motion_destroy(void)
+{
+ int ret = -1;
+
+ if (motion_handle < 0) {
+ DBG(LOG_ERROR, "Motion Handle Not valid !!!");
+ return;
+ }
+
+ ret = sf_stop(motion_handle);
+ if (ret < 0) {
+ DBG(LOG_ERROR, "Failed Operation sf_stop. [%d]\n", ret);
+ }
+ ret = sf_unregister_event(motion_handle, MOTION_ENGINE_EVENT_SHAKE);
+ if (ret < 0) {
+ DBG(LOG_ERROR, "Failed Operation sf_unregister_event. [%d]\n", ret);
+ }
+ ret = sf_disconnect(motion_handle);
+ if (ret < 0) {
+ DBG(LOG_ERROR, "Failed Operation sf_disconnect. [%d]\n", ret);
+ }
+}
diff --git a/ug-wifidirect/src/wfd_ug.c b/ug-wifidirect/src/wfd_ug.c
index 9c43fca..de5db8c 100755..100644
--- a/ug-wifidirect/src/wfd_ug.c
+++ b/ug-wifidirect/src/wfd_ug.c
@@ -27,13 +27,18 @@
#include <libintl.h>
#include <sys/utsname.h>
+#include <vconf.h>
#include <Elementary.h>
#include <ui-gadget-module.h>
-#include <wifi-direct.h>
+#include <app_control.h>
+#include <wifi-direct.h>
#include "wfd_ug.h"
#include "wfd_ug_view.h"
#include "wfd_client.h"
+#ifdef MOTION_CONTROL_ENABLE
+#include "wfd_motion_control.h"
+#endif
void initialize_gen_item_class();
@@ -44,386 +49,837 @@ struct ug_data *wfd_get_ug_data()
return global_ugd;
}
+static void __wfd_main_vconf_change_cb(keynode_t *key, void *data)
+{
+ __FUNC_ENTER__;
+ WFD_RET_IF(NULL == key, "ERROR : key is NULL !!\n");
+ WFD_RET_IF(NULL == data, "ERROR : data is NULL");
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ char *vconf_name = vconf_keynode_get_name(key);
+
+ if (!g_strcmp0(vconf_name, VCONFKEY_SETAPPL_DEVICE_NAME_STR)){
+ char *name_value = NULL;
+ name_value = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+ WFD_RET_IF (!name_value, "Get string is failed");
+ DBG(LOG_INFO,"name : %s", name_value);
+
+ if (ugd->device_name_item && g_strcmp0(ugd->dev_name, name_value))
+ wfd_ug_view_refresh_glitem(ugd->device_name_item);
+
+ free(name_value);
+ } else {
+ DBG(LOG_ERROR, "vconf_name is error");
+ }
+ __FUNC_EXIT__;
+}
+
+#ifdef WIFI_STATE_CB
+static void _wifi_on_state_cb(keynode_t *key, void *data)
+{
+ WFD_RET_IF(NULL == key, "ERROR : key is NULL !!\n");
+ WFD_RET_IF(NULL == data, "ERROR : data is NULL");
+
+ struct ug_data *ugd = (struct ug_data *)data;
+ int wifi_state = 0;
+
+ if (vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) {
+ DBG(LOG_ERROR, "Failed to get vconf VCONFKEY_WIFI_STATE\n");
+ return;
+ }
+
+ DBG(LOG_INFO, "WiFi State [%d]\n", wifi_state);
+ if (wifi_state > VCONFKEY_WIFI_OFF && wifi_state < VCONFKEY_WIFI_STATE_MAX) {
+ if (WIFI_DIRECT_ERROR_NONE != wifi_direct_get_state(&ugd->wfd_status)) {
+ DBG(LOG_ERROR, "Failed to Get WiFi Direct State");
+ return;
+ }
+ if (ugd->wfd_status <= WIFI_DIRECT_STATE_DEACTIVATING) {
+ DBG(LOG_INFO, "Activate WiFi Direct...");
+ if (FALSE != wfd_client_switch_on(ugd)) {
+ DBG(LOG_ERROR, "Failed to Activate WiFi Direct");
+ }
+ }
+ }
+}
+#endif
+
+
+static void __wfd_hotspot_mode_vconf_change_cb(keynode_t *key, void *data)
+{
+ DBG(LOG_INFO, "__wfd_hotspot_mode_vconf_change_cb");
+ if (NULL == key || NULL == data) {
+ DBG(LOG_INFO, "Invalid parameters \n");
+ return;
+ }
+ struct ug_data *ugd = (struct ug_data *) data;
+ int hotspot_mode = 0;
+ int res = 0;
+
+ res = vconf_get_int(VCONFKEY_MOBILE_HOTSPOT_MODE, &hotspot_mode);
+ if (res) {
+ WDS_LOGE("Failed to get vconf value for PLMN(%d)", res);
+ return;
+ }
+ DBG(LOG_INFO, "__wfd_hotspot_mode_vconf_change_cb mode %d", hotspot_mode);
+
+ if (VCONFKEY_MOBILE_HOTSPOT_MODE_NONE == hotspot_mode) {
+ if (NULL != ugd->act_popup) {
+ evas_object_del(ugd->act_popup);
+ }
+#ifdef WFD_ON_OFF_GENLIST
+ wfd_ug_refresh_on_off_check(ugd);
+#endif
+ } else if (hotspot_mode == VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI ||
+ hotspot_mode == VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI_AP) {
+ if (NULL != ugd->warn_popup) {
+ evas_object_del(ugd->warn_popup);
+ ugd->warn_popup = NULL;
+ }
+ }
+
+}
+
+Ea_Theme_Color_Table *_color_table_set(void)
+{
+ Ea_Theme_Color_Table *table;
+
+ table = ea_theme_color_table_new(COLOR_TABLE);
+ DBG(LOG_INFO, "Wi-Fi direct color table : %p", table);
+ 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(LOG_INFO, "Wi-Fi direct font table : %p", table);
+ ea_theme_fonts_set(table);
+
+ return table;
+}
+
+/**
+ * This function let the ug create backgroud
+ * @return backgroud
+ * @param[in] ugd the pointer to the parent object
+ * @param[in] ugd the pointer to the main data structure
+ */
static Evas_Object *_create_bg(Evas_Object *parent, char *style)
{
- __FUNC_ENTER__;
- Evas_Object *bg;
+ __FUNC_ENTER__;
+ Evas_Object *bg;
- bg = elm_bg_add(parent);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_object_style_set(bg, style);
- elm_win_resize_object_add(parent, bg);
- evas_object_show(bg);
+ bg = elm_bg_add(parent);
+ evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_object_style_set(bg, style);
+ evas_object_show(bg);
- __FUNC_EXIT__;
- return bg;
+ __FUNC_EXIT__;
+ return bg;
}
+/**
+ * This function let the ug create full view
+ * @return full view
+ * @param[in] ugd the pointer to the parent object
+ * @param[in] ugd the pointer to the main data structure
+ */
static Evas_Object *_create_fullview(Evas_Object *parent, struct ug_data *ugd)
{
- __FUNC_ENTER__;
- Evas_Object *base;
-
- if(parent == NULL)
- {
- DBG(LOG_ERROR, "Incorrenct parameter");
- return NULL;
- }
-
- /* Create Full view */
- base = elm_layout_add(parent);
- if(!base)
- {
- DBG(LOG_ERROR, "Failed to add layout");
- return NULL;
- }
-
- elm_layout_theme_set(base, "layout", "application", "default");
- evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(base, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
- __FUNC_EXIT__;
- return base;
+ __FUNC_ENTER__;
+ Evas_Object *base;
+
+ if (parent == NULL) {
+ DBG(LOG_ERROR, "Incorrenct parameter");
+ return NULL;
+ }
+
+ /* Create Full view */
+ base = elm_layout_add(parent);
+ if (!base) {
+ DBG(LOG_ERROR, "Failed to add layout");
+ return NULL;
+ }
+
+ elm_layout_theme_set(base, "layout", "application", "default");
+ evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(base, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+ __FUNC_EXIT__;
+ return base;
}
+/**
+ * This function let the ug create frame view
+ * @return frame view
+ * @param[in] ugd the pointer to the parent object
+ * @param[in] ugd the pointer to the main data structure
+ */
static Evas_Object *_create_frameview(Evas_Object *parent, struct ug_data *ugd)
{
- __FUNC_ENTER__;
- Evas_Object *base;
-
- if(parent == NULL)
- {
- DBG(LOG_ERROR, "Incorrenct parameter");
- return NULL;
- }
-
- /* Create Frame view */
- base = elm_layout_add(parent);
- if(!base)
- {
- DBG(LOG_ERROR, "Failed to add layout");
- return NULL;
- }
-
- elm_layout_theme_set(base, "layout", "application", "default");
- evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(base, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
- __FUNC_EXIT__;
- return base;
+ __FUNC_ENTER__;
+ Evas_Object *base;
+
+ if (parent == NULL) {
+ DBG(LOG_ERROR, "Incorrenct parameter");
+ return NULL;
+ }
+
+ /* Create Frame view */
+ base = elm_layout_add(parent);
+ if (!base) {
+ DBG(LOG_ERROR, "Failed to add layout");
+ return NULL;
+ }
+
+ elm_layout_theme_set(base, "layout", "application", "default");
+ evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(base, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+ __FUNC_EXIT__;
+ return base;
}
+/**
+ * This function let the ug destroy the ug
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_destroy_ug(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+
+#ifdef WFD_DBUS_LAUNCH
+ if (ugd->dbus_cancellable != NULL) {
+ g_cancellable_cancel(ugd->dbus_cancellable);
+ g_object_unref(ugd->dbus_cancellable);
+ ugd->dbus_cancellable = NULL;
+ if (ugd->conn) {
+ g_object_unref(ugd->conn);
+ ugd->conn = NULL;
+ }
+ DBG(LOG_INFO, "Cancelled dbus call");
+ return;
+ } else
+#endif
+ {
+ DBG(LOG_INFO, "dbus_cancellable is NULL");
+ ug_destroy_me(ugd->ug);
+ }
-void destroy_wfd_ug_view(void *data)
+ __FUNC_EXIT__;
+ return;
+}
+
+static void wfd_ug_layout_del_cb(void *data , Evas *e, Evas_Object *obj, void *event_info)
{
- __FUNC_ENTER__;
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd = (struct ug_data *) data;
+ if (ugd == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)");
+ return;
+ }
+
+ wfd_client_free_raw_discovered_peers(ugd);
+ wfd_ug_view_free_peers(ugd);
+ destroy_wfd_ug_view(ugd);
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_EXIT__;
+}
+
+#ifdef WFD_DBUS_LAUNCH
+/**
+ * This function let the ug initialize wfd
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] evas the pointer to the evas canvas
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _wfd_init_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ int res = -1;
+ struct ug_data *ugd = (struct ug_data *)data;
+ WFD_RET_IF(ugd == NULL || ugd->base == NULL, "Incorrect parameter(NULL)\n");
- if(ugd->genlist)
- {
- evas_object_del(ugd->genlist);
- ugd->genlist = NULL;
- }
+ evas_object_event_callback_del(ugd->base, EVAS_CALLBACK_SHOW, _wfd_init_cb);
- if(ugd->naviframe)
- {
- evas_object_del(ugd->naviframe);
- ugd->naviframe = NULL;
- }
+ res = launch_wifi_direct_manager(ugd);
+ if (res != 0) {
+ DBG(LOG_ERROR, "Failed to launch wifi direct manager\n");
+ }
- __FUNC_EXIT__;
+ __FUNC_EXIT__;
+ return;
}
+#endif
-static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service,
- void *priv)
+static void *on_create(ui_gadget_h ug, enum ug_mode mode, app_control_h control, void *priv)
{
- __FUNC_ENTER__;
- struct ug_data *ugd;
- int res = 0;
-
- if (!ug || !priv)
- return NULL;
-
- ugd = priv;
- ugd->ug = ug;
-
- bindtextdomain(PACKAGE, LOCALEDIR);
-
- ugd->win = ug_get_window();
- if (!ugd->win)
- return NULL;
-
- if (mode == UG_MODE_FULLVIEW)
- ugd->base = _create_fullview(ugd->win, ugd);
- else
- ugd->base = _create_frameview(ugd->win, ugd);
-
- if(ugd->base)
- {
- ugd->bg = _create_bg(ugd->win, "group_list");
- elm_object_part_content_set(ugd->base, "elm.swallow.bg", ugd->bg);
- }
- else
- {
- DBG(LOG_ERROR, "Failed to create base layout\n");
- return NULL;
- }
-
- wfd_get_vconf_status(ugd);
-
- initialize_gen_item_class();
-
- res = init_wfd_client(ugd);
- if(res != 0)
- {
- DBG(LOG_ERROR, "Failed to initialize WFD client library\n");
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_PROBLEM_WITH_WFD"), POPUP_TYPE_TERMINATE);
- }
-
- create_wfd_ug_view(ugd);
-
- wfd_ug_view_refresh_glitem(ugd->head);
- if (ugd->scan_btn) {
- wfd_ug_view_refresh_button(ugd->scan_btn, _("IDS_WFD_BUTTON_SCAN"), TRUE);
- }
-
- if(ugd->wfd_status > WIFI_DIRECT_STATE_ACTIVATING)
- {
- wfd_ug_get_discovered_peers(ugd);
- }
-
- if(ugd->wfd_status >= WIFI_DIRECT_STATE_CONNECTED)
- {
- wfd_ug_get_connected_peers(ugd);
- }
-
- wfd_ug_view_update_peers(ugd);
-
- if (ugd->wfd_status == WIFI_DIRECT_STATE_ACTIVATED)
- {
- res = wifi_direct_start_discovery(FALSE, 0);
- if(res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", res);
- }
- DBG(LOG_VERBOSE, "Discovery is started\n");
- }
-
- evas_object_show(ugd->base);
-
- __FUNC_EXIT__;
- return ugd->base;
+ __FUNC_ENTER__;
+ struct ug_data *ugd;
+ int wfd_status = -1;
+ int rots[4] = { 0, 90, 180, 270 };
+ int ret;
+
+ if (!ug || !priv) {
+ return NULL;
+ }
+
+ ugd = priv;
+ ugd->ug = ug;
+
+ bindtextdomain(PACKAGE, LOCALEDIR);
+
+ ugd->win = ug_get_window();
+ if (!ugd->win) {
+ return NULL;
+ }
+
+ elm_win_wm_rotation_available_rotations_set(ugd->win, rots, 1);
+
+
+ /* check the input parameters from app at first */
+ ugd->wfds = NULL;
+ ugd->device_filter = -1; /* show all devices */
+ ugd->is_auto_exit = false;
+ ugd->is_multi_connect = true;
+ ugd->is_init_ok = false;
+ ugd->title = strdup(_("IDS_WIFI_BODY_WI_FI_DIRECT_ABB"));
+
+ if (control) {
+ char *wfds = NULL;
+ char *device_filter = NULL;
+ char *auto_exit = NULL;
+ char *multi_connect = NULL;
+ char *title = NULL;
+ char* viewtype = NULL;
+
+ /*
+ * get the control name
+ * default value: Wi-Fi Direct
+ */
+ ret = app_control_get_extra_data(control, "wfds", &wfds);
+ if (ret == APP_CONTROL_ERROR_NONE && wfds) {
+ DBG_SECURE(LOG_INFO, "Wfds name: %s", wfds);
+ ugd->wfds = strdup(wfds);
+ WFD_IF_FREE_MEM(wfds);
+ }
+
+ ret = app_control_get_extra_data(control, "viewtype", &viewtype);
+ if(ret == APP_CONTROL_ERROR_NONE && viewtype) {
+ DBG(LOG_INFO, "viewtype: %s\n", viewtype);
+ ugd->view_type = strdup(viewtype);
+ WFD_IF_FREE_MEM(viewtype);
+ }
+
+ /*
+ * get the device filter
+ * default value: NULL
+ */
+ ret = app_control_get_extra_data(control, "device_filter", &device_filter);
+ if (ret == APP_CONTROL_ERROR_NONE && device_filter) {
+ DBG(LOG_INFO, "Device filter: %s", device_filter);
+ if (0 == strncmp(device_filter, "computer", 8)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_COMPUTER;
+ } else if (0 == strncmp(device_filter, "input_device", 12)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_INPUT_DEVICE;
+ } else if (0 == strncmp(device_filter, "printer", 6)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_PRINTER;
+ } else if (0 == strncmp(device_filter, "camera", 6)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_CAMERA;
+ } else if (0 == strncmp(device_filter, "storage", 7)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_STORAGE;
+ } else if (0 == strncmp(device_filter, "network_infra", 13)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_NW_INFRA;
+ } else if (0 == strncmp(device_filter, "display", 7)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_DISPLAYS;
+ } else if (0 == strncmp(device_filter, "multimedia_device", 17)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_MM_DEVICES;
+ } else if (0 == strncmp(device_filter, "game_device", 11)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_GAME_DEVICES;
+ } else if (0 == strncmp(device_filter, "telephone", 9)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_TELEPHONE;
+ } else if (0 == strncmp(device_filter, "audio", 5)) {
+ ugd->device_filter = WFD_DEVICE_TYPE_AUDIO;
+ } else {
+ ugd->device_filter = WFD_DEVICE_TYPE_OTHER;
+ }
+ WFD_IF_FREE_MEM(device_filter);
+ }
+
+ /*
+ * get whether support auto exit after connection
+ * default value: false
+ */
+ ret = app_control_get_extra_data(control, "auto_exit", &auto_exit);
+ if (ret == APP_CONTROL_ERROR_NONE && auto_exit) {
+ DBG(LOG_INFO, "Auto exit: %s", auto_exit);
+ if (0 == strncmp(auto_exit, "on", 2)) {
+ ugd->is_auto_exit = true;
+ } else {
+ ugd->is_auto_exit = false;
+ }
+ WFD_IF_FREE_MEM(auto_exit);
+ }
+
+ /*
+ * get whether support multi connection,
+ * default value: true
+ */
+ ret = app_control_get_extra_data(control, "multi_connect", &multi_connect);
+ if (ret == APP_CONTROL_ERROR_NONE && multi_connect) {
+ DBG(LOG_INFO, "Multi connection: %s", multi_connect);
+ if (0 == strncmp(multi_connect, "off", 2)) {
+ ugd->is_multi_connect = false;
+ } else {
+ ugd->is_multi_connect = true;
+ }
+ WFD_IF_FREE_MEM(multi_connect);
+ }
+
+ /*
+ * get the title of UG
+ * default value: Wi-Fi Direct
+ */
+ ret = app_control_get_extra_data(control, "title_string", &title);
+ if (ret == APP_CONTROL_ERROR_NONE && title) {
+ DBG(LOG_INFO, "Title of UG: %s", title);
+ WFD_IF_FREE_MEM(ugd->title);
+ ugd->title = strdup(title);
+ WFD_IF_FREE_MEM(title);
+ }
+ }
+
+ if (mode == UG_MODE_FULLVIEW) {
+ ugd->base = _create_fullview(ugd->win, ugd);
+ } else {
+ ugd->base = _create_frameview(ugd->win, ugd);
+ }
+
+ if (ugd->base) {
+ evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_DEL, wfd_ug_layout_del_cb, ugd);
+ ugd->bg = _create_bg(ugd->win, "group_list");
+ elm_object_part_content_set(ugd->base, "elm.swallow.bg", ugd->bg);
+ } else {
+ DBG(LOG_ERROR, "Failed to create base layout\n");
+ return NULL;
+ }
+
+ /* check status of wifi-direct from vconf */
+ wfd_status = wfd_get_vconf_status();
+ if (wfd_status < 0) {
+ return NULL;
+ }
+
+ /* Enablee Changeable UI feature */
+ ea_theme_changeable_ui_enabled_set(EINA_TRUE);
+
+ ugd->color_table = _color_table_set();
+ ugd->font_table = _font_table_set();
+
+ /* draw UI */
+ initialize_gen_item_class();
+ create_wfd_ug_view(ugd);
+ wfd_ug_view_init_genlist(ugd, true);
+#ifdef MOTION_CONTROL_ENABLE
+ motion_create(ugd);
+#endif
+
+ /*
+ * if not deactivated, do initialization at once;
+ * otherwise, do initialization later
+ */
+ if (wfd_status != VCONFKEY_WIFI_DIRECT_DEACTIVATED) {
+ init_wfd_client(ugd);
+ } else {
+ ugd->wfd_status = WIFI_DIRECT_STATE_DEACTIVATED;
+
+#ifdef WFD_DBUS_LAUNCH
+ evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_SHOW, _wfd_init_cb, ugd);
+#else
+ ret = init_wfd_client(ugd);
+ WFD_RETV_IF(ret != 0, NULL, "Failed to initialize WFD client library\n");
+
+ /* Activate WiFi Direct */
+ DBG(LOG_INFO, "Activating WiFi Direct...");
+ if (ugd->wfd_status <= WIFI_DIRECT_STATE_DEACTIVATING) {
+ ret = wfd_client_switch_on(ugd);
+ WFD_RETV_IF(ret != 0, NULL, "Failed to activate WFD\n");
+ }
+#endif
+ }
+ ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_DEVICE_NAME_STR,
+ __wfd_main_vconf_change_cb, ugd);
+ if (ret) {
+ DBG(LOG_ERROR, "Failed to set vconf notification callback(VCONFKEY_SETAPPL_DEVICE_NAME_STR)");
+ }
+
+#ifdef WIFI_STATE_CB
+ ret = vconf_notify_key_changed(VCONFKEY_WIFI_STATE, _wifi_on_state_cb, ugd);
+ if (ret) {
+ DBG(LOG_ERROR, "Failed to set vconf notification callback(VCONFKEY_WIFI_STATE)");
+
+ }
+#endif
+
+ ret = vconf_notify_key_changed(VCONFKEY_MOBILE_HOTSPOT_MODE,
+ __wfd_hotspot_mode_vconf_change_cb, ugd);
+ if (ret) {
+ DBG(LOG_ERROR, "Failed to set vconf notification callback(MOBILE_HOTSPOT_MODE)");
+ }
+
+ __FUNC_EXIT__;
+ return ugd->base;
}
-static void on_start(ui_gadget_h ug, service_h service, void *priv)
+static void on_start(ui_gadget_h ug, app_control_h control, void *priv)
{
- __FUNC_ENTER__;
- struct ug_data *ugd;
- int res;
-
- if (!ug || !priv)
- return;
-
- ugd = priv;
-
- struct utsname kernel_info;
- res = uname(&kernel_info);
- if(res != 0)
- {
- DBG(LOG_ERROR, "Failed to detect target type\n");
- }
- else
- {
- DBG(LOG_VERBOSE, "HW ID of this device [%s]\n", kernel_info.machine);
- if(strncmp(kernel_info.machine, "arm", 3) != 0)
- {
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_NOT_SUPPORTED_DEVICE"), POPUP_TYPE_TERMINATE);
- return;
- }
- }
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+ struct ug_data *ugd;
+ int res;
+
+ if (!ug || !priv) {
+ return;
+ }
+
+ ugd = priv;
+
+ struct utsname kernel_info;
+ res = uname(&kernel_info);
+ if (res != 0) {
+ DBG(LOG_ERROR, "Failed to detect target type\n");
+ } else {
+ DBG_SECURE(LOG_INFO, "HW ID of this device [%s]\n", kernel_info.machine);
+ if (strncmp(kernel_info.machine, "arm", 3) != 0) {
+ wfd_ug_warn_popup(ugd, _("IDS_ST_POP_NOT_SUPPORTED"), POPUP_TYPE_TERMINATE_NOT_SUPPORT);
+ return;
+ }
+ }
+
+ __FUNC_EXIT__;
}
-static void on_pause(ui_gadget_h ug, service_h service, void *priv)
+static void on_pause(ui_gadget_h ug, app_control_h control, void *priv)
{
- __FUNC_ENTER__;
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+
+ WFD_RET_IF(ug == NULL || priv == NULL, "The param is NULL\n");
+ struct ug_data *ugd = priv;
+ ugd->is_paused = true;
+
+ wfd_refresh_wifi_direct_state(ugd);
+ DBG(LOG_INFO, "on pause, wfd status: %d\n", ugd->wfd_status);
+
+ if ((WIFI_DIRECT_STATE_DISCOVERING == ugd->wfd_status) &&
+ (WIFI_DIRECT_ERROR_NONE != wifi_direct_cancel_discovery())) {
+ DBG(LOG_ERROR, "Failed to send cancel discovery state [%d]\n", ugd->wfd_status);
+ __FUNC_EXIT__;
+ return;
+ }
+
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_STOPPED;
+
+ __FUNC_EXIT__;
}
-static void on_resume(ui_gadget_h ug, service_h service, void *priv)
+static void on_resume(ui_gadget_h ug, app_control_h control, void *priv)
{
- __FUNC_ENTER__;
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+
+ WFD_RET_IF(ug == NULL || priv == NULL, "The param is NULL\n");
+ struct ug_data *ugd = priv;
+ ugd->is_paused = false;
+ int ret;
+ wfd_refresh_wifi_direct_state(ugd);
+ DBG(LOG_INFO, "on resume, status: %d\n", ugd->wfd_status);
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_STOPPED;
+
+ elm_genlist_realized_items_update(ugd->genlist);
+
+ if (ugd->wfd_status > WIFI_DIRECT_STATE_DEACTIVATED && ugd->wfd_status < WIFI_DIRECT_STATE_CONNECTED) {
+ DBG(LOG_INFO, "Start discovery again\n");
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ ret = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", ret);
+ wifi_direct_cancel_discovery();
+ }
+ }
+
+ __FUNC_EXIT__;
}
-static void on_destroy(ui_gadget_h ug, service_h service, void *priv)
+static void on_destroy(ui_gadget_h ug, app_control_h control, void *priv)
{
- __FUNC_ENTER__;
-
- if (!ug || !priv)
- {
- DBG(LOG_ERROR, "The param is NULL\n");
- return;
- }
-
- struct ug_data *ugd = priv;
- if (ugd == NULL || ugd->base == NULL)
- {
- DBG(LOG_ERROR, "The param is NULL\n");
- return;
- }
-
- deinit_wfd_client(ugd);
- DBG(LOG_VERBOSE, "WFD client deregistered");
-
- destroy_wfd_ug_view(ugd);
- DBG(LOG_VERBOSE, "Destroying About item");
-
- wfd_ug_view_free_peers(ugd);
-
- DBG(LOG_VERBOSE, "WFD client deregistered");
- if(ugd->bg)
- {
- evas_object_del(ugd->bg);
- ugd->bg = NULL;
- }
- DBG(LOG_VERBOSE, "WFD client deregistered");
-
- if(ugd->base)
- {
- evas_object_del(ugd->base);
- ugd->base = NULL;
- }
-
- __FUNC_EXIT__;
- return;
+ __FUNC_ENTER__;
+
+ WFD_RET_IF(ug == NULL || priv == NULL, "The param is NULL\n");
+
+ struct ug_data *ugd = priv;
+ int ret;
+ WFD_RET_IF(ugd->base == NULL, "The param is NULL\n");
+
+#ifdef MOTION_CONTROL_ENABLE
+ motion_destroy();
+#endif
+
+ /* DeInit WiFi Direct */
+ ret = deinit_wfd_client(ugd);
+ if (ret) {
+ DBG(LOG_ERROR,"Failed to DeInit WiFi Direct");
+ }
+
+ if (ugd->scan_toolbar) {
+ wfd_ug_view_refresh_button(ugd->scan_toolbar,
+ _("IDS_WIFI_SK4_SCAN"), FALSE);
+ }
+
+ ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_DEVICE_NAME_STR,
+ __wfd_main_vconf_change_cb);
+ if (ret == -1) {
+ DBG(LOG_ERROR,"Failed to ignore vconf key callback\n");
+ }
+
+#ifdef WIFI_STATE_CB
+ ret = vconf_ignore_key_changed(VCONFKEY_WIFI_STATE, _wifi_on_state_cb);
+ if (ret == -1) {
+ DBG(LOG_ERROR,"Failed to ignore vconf key callback\n");
+ }
+#endif
+
+ ret = vconf_ignore_key_changed(VCONFKEY_MOBILE_HOTSPOT_MODE,
+ __wfd_hotspot_mode_vconf_change_cb);
+ if (ret == -1) {
+ DBG(LOG_ERROR,"Failed to ignore vconf key callback MOBILE_HOTSPOT_MODE\n");
+ }
+
+ wfd_ug_view_free_peers(ugd);
+ WFD_IF_FREE_MEM(ugd->title);
+ WFD_IF_FREE_MEM(ugd->wfds);
+ WFD_IF_FREE_MEM(ugd->view_type);
+
+ WFD_IF_DEL_OBJ(ugd->bg);
+
+#ifdef WFD_DBUS_LAUNCH
+ if (ugd->base)
+ evas_object_event_callback_del(ugd->base, EVAS_CALLBACK_SHOW, _wfd_init_cb);
+#endif
+ WFD_IF_DEL_OBJ(ugd->base);
+ DBG(LOG_INFO, "WFD client deregistered");
+
+ __FUNC_EXIT__;
+ return;
}
-static void on_message(ui_gadget_h ug, service_h msg, service_h service,
- void *priv)
+static void on_message(ui_gadget_h ug, app_control_h msg, app_control_h control, void *priv)
{
- __FUNC_ENTER__;
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+ char* app_msg = NULL;
+ struct ug_data *ugd = priv;
+
+ if (!ug || !priv) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return;
+ }
+
+ if (msg) {
+ app_control_get_extra_data(msg, "msg", &app_msg);
+ DBG(LOG_DEBUG, "Msg from app: %s", app_msg);
+
+ if (!strcmp(app_msg, "destroy")) {
+ if(!ugd->rename_popup) {
+ DBG(LOG_INFO, "Destroying UG.");
+ wfd_ug_view_free_peers(ugd);
+ wfd_destroy_ug(ugd);
+ }
+ }
+ WFD_IF_FREE_MEM(app_msg);
+ }
+ __FUNC_EXIT__;
}
-static void on_event(ui_gadget_h ug, enum ug_event event, service_h service,
- void *priv)
+static void on_event(ui_gadget_h ug, enum ug_event event, app_control_h control, void *priv)
{
- __FUNC_ENTER__;
-
- if (!ug || !priv)
- {
- DBG(LOG_ERROR, "The param is NULL\n");
- return;
- }
-
- switch (event)
- {
- case UG_EVENT_LOW_MEMORY:
- DBG(LOG_VERBOSE, "UG_EVENT_LOW_MEMORY\n");
- break;
- case UG_EVENT_LOW_BATTERY:
- DBG(LOG_VERBOSE, "UG_EVENT_LOW_BATTERY\n");
- break;
- case UG_EVENT_LANG_CHANGE:
- DBG(LOG_VERBOSE, "UG_EVENT_LANG_CHANGE\n");
- break;
- case UG_EVENT_ROTATE_PORTRAIT:
- DBG(LOG_VERBOSE, "UG_EVENT_ROTATE_PORTRAIT\n");
- break;
- case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
- DBG(LOG_VERBOSE, "UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN\n");
- break;
- case UG_EVENT_ROTATE_LANDSCAPE:
- DBG(LOG_VERBOSE, "UG_EVENT_ROTATE_LANDSCAPE\n");
- break;
- case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
- DBG(LOG_VERBOSE, "UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN\n");
- break;
- default:
- DBG(LOG_VERBOSE, "default\n");
- break;
- }
-
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+
+ if (!ug || !priv) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return;
+ }
+
+ switch (event) {
+ case UG_EVENT_LOW_MEMORY:
+ DBG(LOG_INFO, "UG_EVENT_LOW_MEMORY\n");
+ break;
+ case UG_EVENT_LOW_BATTERY:
+ DBG(LOG_INFO, "UG_EVENT_LOW_BATTERY\n");
+ break;
+ case UG_EVENT_LANG_CHANGE:
+ DBG(LOG_INFO, "UG_EVENT_LANG_CHANGE\n");
+ break;
+ case UG_EVENT_ROTATE_PORTRAIT:
+ _ctxpopup_move();
+ DBG(LOG_INFO, "UG_EVENT_ROTATE_PORTRAIT\n");
+ break;
+ case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
+ DBG(LOG_INFO, "UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN\n");
+ break;
+ case UG_EVENT_ROTATE_LANDSCAPE:
+ _ctxpopup_move();
+ DBG(LOG_INFO, "UG_EVENT_ROTATE_LANDSCAPE\n");
+ break;
+ case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
+ _ctxpopup_move();
+ DBG(LOG_INFO, "UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN\n");
+ break;
+ default:
+ DBG(LOG_INFO, "default\n");
+ break;
+ }
+
+ __FUNC_EXIT__;
}
-static void on_key_event(ui_gadget_h ug, enum ug_key_event event,
- service_h service, void *priv)
+static void on_key_event(ui_gadget_h ug, enum ug_key_event event, app_control_h control, void *priv)
{
- __FUNC_ENTER__;
-
- if (!ug || !priv)
- {
- DBG(LOG_ERROR, "The param is NULL\n");
- return;
- }
-
- switch (event)
- {
- case UG_KEY_EVENT_END:
- DBG(LOG_VERBOSE, "UG_KEY_EVENT_END\n");
- break;
- default:
- break;
- }
-
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+
+ if (!ug || !priv) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return;
+ }
+
+ switch (event) {
+ case UG_KEY_EVENT_END:
+ DBG(LOG_INFO, "UG_KEY_EVENT_END\n");
+ break;
+ default:
+ break;
+ }
+
+ __FUNC_EXIT__;
}
UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
{
- __FUNC_ENTER__;
- struct ug_data *ugd;
-
- if (!ops)
- {
- DBG(LOG_ERROR, "The param is NULL\n");
- return -1;
- }
-
- ugd = calloc(1, sizeof(struct ug_data));
- if (ugd == NULL)
- {
- DBG(LOG_ERROR, "Failed to allocate memory for UG data\n");
- return -1;
- }
-
- global_ugd = ugd;
-
- ops->create = on_create;
- ops->start = on_start;
- ops->pause = on_pause;
- ops->resume = on_resume;
- ops->destroy = on_destroy;
- ops->message = on_message;
- ops->event = on_event;
- ops->key_event = on_key_event;
- ops->priv = ugd;
- ops->opt = UG_OPT_INDICATOR_ENABLE;
-
- __FUNC_EXIT__;
- return 0;
+ __FUNC_ENTER__;
+ struct ug_data *ugd;
+
+ if (!ops) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return -1;
+ }
+
+ ugd = calloc(1, sizeof(struct ug_data));
+ if (ugd == NULL) {
+ DBG(LOG_ERROR, "Failed to allocate memory for UG data\n");
+ return -1;
+ }
+
+ global_ugd = ugd;
+
+ ops->create = on_create;
+ ops->start = on_start;
+ ops->pause = on_pause;
+ ops->resume = on_resume;
+ ops->destroy = on_destroy;
+ ops->message = on_message;
+ ops->event = on_event;
+ ops->key_event = on_key_event;
+ ops->priv = ugd;
+ ops->opt = UG_OPT_INDICATOR_ENABLE;
+
+ __FUNC_EXIT__;
+ return 0;
}
UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
{
- __FUNC_ENTER__;
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd;
- struct ug_data *ugd;
+ if (!ops) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return;
+ }
- if (!ops)
- {
- DBG(LOG_ERROR, "The param is NULL\n");
- return;
- }
+ ugd = ops->priv;
- ugd = ops->priv;
+ WFD_IF_FREE_MEM(ugd);
- if (ugd)
- free(ugd);
+ __FUNC_EXIT__;
+}
- __FUNC_EXIT__;
+UG_MODULE_API int setting_plugin_reset(app_control_h control, void *priv)
+{
+ __FUNC_ENTER__;
+ int res = -1;
+ wifi_direct_state_e state;
+
+ res = wifi_direct_initialize();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to initialize wifi direct. [%d]\n", res);
+ return -1;
+ }
+
+ res = wifi_direct_get_state(&state);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to get link status. [%d]\n", res);
+ return -1;
+ }
+
+ if (state < WIFI_DIRECT_STATE_ACTIVATING) {
+ DBG(LOG_INFO, "No need to reset Wi-Fi Direct.\n");
+ } else {
+ /*if connected, disconnect all devices*/
+ if (WIFI_DIRECT_STATE_CONNECTED == state) {
+ res = wifi_direct_disconnect_all();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to send disconnection request to all. [%d]\n", res);
+ return -1;
+ }
+ }
+
+ res = wifi_direct_deactivate();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to reset Wi-Fi Direct. [%d]\n", res);
+ return -1;
+ }
+ }
+
+ res = wifi_direct_deinitialize();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to deinitialize wifi direct. [%d]\n", res);
+ return -1;
+ }
+
+ __FUNC_EXIT__;
+ return 0;
}
+
+UG_MODULE_API int setting_plugin_search_init(app_control_h control, void *priv, char** applocale)
+{
+ __FUNC_ENTER__;
+
+ *applocale = strdup("ug-setting-wifidirect-efl");
+ void *node = NULL;
+
+ Eina_List **pplist = (Eina_List**)priv;
+
+ node = setting_plugin_search_item_add("IDS_WIFI_BUTTON_MULTI_CONNECT", "viewtype:IDS_WIFI_BUTTON_MULTI_CONNECT", NULL, 5, NULL);
+ *pplist = eina_list_append(*pplist, node);
+
+ __FUNC_EXIT__;
+ return 0;
+}
+
diff --git a/ug-wifidirect/src/wfd_ug_about_view.c b/ug-wifidirect/src/wfd_ug_about_view.c
deleted file mode 100644
index 5c1f7d2..0000000
--- a/ug-wifidirect/src/wfd_ug_about_view.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-* WiFi-Direct UG
-*
-* 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 <libintl.h>
-
-#include <assert.h>
-#include <glib.h>
-
-#include <Elementary.h>
-#include <vconf.h>
-#include <ui-gadget-module.h>
-#include <wifi-direct.h>
-
-#include "wfd_ug.h"
-#include "wfd_ug_view.h"
-#include "wfd_client.h"
-
-static Elm_Genlist_Item_Class itc;
-
-static char *_wfd_gl_label_help_dialogue_get(void *data, Evas_Object *obj, const char *part)
-{
- DBG(LOG_VERBOSE, "Adding text");
-
- if (!strcmp(part, "elm.text.2")) {
- return strdup(_("IDS_WFD_BODY_ABOUT_WIFI"));
- }
- return NULL;
-}
-
-static Evas_Object *_wfd_gl_help_icon_get(void *data, Evas_Object * obj, const char *part)
-{
- __FUNC_ENTER__;
-
- DBG(LOG_VERBOSE, "Current part: %s\n", part);
- Evas_Object *label = NULL;
- char content[1024] = {0};
-
- label = elm_label_add(obj);
- snprintf(content, 1024, "<color=#7C7C7CFF><font_size=32>%s</font_size></color>", _("IDS_WFD_BODY_ABOUT_WIFI"));
- elm_label_line_wrap_set(label, ELM_WRAP_WORD);
- elm_object_text_set(label, content);
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(label, EVAS_HINT_FILL, 0.0);
- evas_object_show(label);
-
- __FUNC_EXIT__;
- return label;
-}
-
-void _about_view_back_btn_cb(void *data, Evas_Object * obj, void *event_info)
-{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
-
- if(!ugd)
- {
- DBG(LOG_ERROR, "The param is NULL\n");
- return;
- }
-
- elm_naviframe_item_pop(ugd->naviframe);
-
- __FUNC_EXIT__;
- return;
-}
-
-void _wifid_create_about_view(struct ug_data *ugd)
-{
-
- Evas_Object *back_btn = NULL;
- Elm_Object_Item *navi_item = NULL;
- Evas_Object *control_bar = NULL;
- Elm_Object_Item *item = NULL;
- Evas_Object *genlist = NULL;
- if(ugd == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)");
- return;
- }
-
- genlist = elm_genlist_add(ugd->naviframe);
- elm_object_style_set(genlist, "dialogue");
-
- DBG(LOG_VERBOSE, "creating about view");
- elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
-#if 0
- itc.item_style = "multiline/1text";
- itc.func.text_get = _wfd_gl_label_help_dialogue_get;
- itc.func.content_get = NULL;
-#else
- itc.item_style = "1icon";
- itc.func.text_get = NULL;
- itc.func.content_get = _wfd_gl_help_icon_get;
-#endif
- itc.func.state_get = NULL;
- itc.func.del = NULL;
- back_btn = elm_button_add(ugd->naviframe);
- elm_object_style_set(back_btn, "naviframe/back_btn/default");
- evas_object_smart_callback_add(back_btn, "clicked", _about_view_back_btn_cb, (void*) ugd);
- elm_object_focus_allow_set(back_btn, EINA_FALSE);
-
- item = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
- elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- evas_object_show(genlist);
- navi_item = elm_naviframe_item_push(ugd->naviframe, _("IDS_WFD_TITLE_ABOUT_WIFI"), back_btn, NULL, genlist, NULL);
-
- control_bar = elm_toolbar_add(ugd->naviframe);
- elm_toolbar_shrink_mode_set(control_bar, ELM_TOOLBAR_SHRINK_EXPAND);
- evas_object_show(control_bar);
- elm_object_item_part_content_set(navi_item, "controlbar", control_bar);
-
-}
diff --git a/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c
index 836c5b3..0a0a025 100755
--- a/ug-wifidirect/src/wfd_ug_genlist.c
+++ b/ug-wifidirect/src/wfd_ug_genlist.c
@@ -18,8 +18,6 @@
*/
#include <libintl.h>
-
-#include <assert.h>
#include <glib.h>
#include <Elementary.h>
@@ -31,15 +29,17 @@
#include "wfd_ug_view.h"
#include "wfd_client.h"
-Elm_Gen_Item_Class sep_itc;
-Elm_Gen_Item_Class sep_itc_end;
-Elm_Gen_Item_Class head_itc;
-Elm_Gen_Item_Class name_itc;
+Elm_Gen_Item_Class device_name_title_itc;
+#ifdef WFD_ON_OFF_GENLIST
+Elm_Gen_Item_Class wfd_onoff_itc;
+#endif
+Elm_Gen_Item_Class device_name_itc;
Elm_Gen_Item_Class title_itc;
+Elm_Gen_Item_Class multi_view_title_itc;
Elm_Gen_Item_Class peer_itc;
+Elm_Gen_Item_Class title_no_device_itc;
Elm_Gen_Item_Class noitem_itc;
-Elm_Gen_Item_Class help_itc;
-Elm_Gen_Item_Class button_itc;
+Elm_Gen_Item_Class title_available_itc;
Elm_Gen_Item_Class title_conn_itc;
Elm_Gen_Item_Class peer_conn_itc;
@@ -49,163 +49,226 @@ Elm_Gen_Item_Class peer_busy_itc;
Elm_Gen_Item_Class title_multi_connect_itc;
Elm_Gen_Item_Class peer_multi_connect_itc;
+Elm_Gen_Item_Class select_all_multi_connect_itc;
Elm_Gen_Item_Class title_conn_failed_itc;
Elm_Gen_Item_Class peer_conn_failed_itc;
+#ifdef WFD_ON_OFF_GENLIST
+static char *_gl_wfd_onoff_text_get(void *data, Evas_Object *obj,
+ const char *part)
+{
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd = (struct ug_data *) data;
+ DBG(LOG_INFO, "%s", part);
+ WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
+ wfd_get_vconf_device_name(ugd);
+ char *dev_name;
+
+ if (!g_strcmp0(part,"elm.text.main.left.bottom")) {
+ DBG(LOG_INFO, "%s", ugd->dev_name);
+ if (ugd->dev_name) {
+ dev_name = elm_entry_utf8_to_markup(ugd->dev_name);
+ if (NULL == dev_name) {
+ DBG(LOG_ERROR, "elm_entry_utf8_to_markup failed.\n");
+ __FUNC_EXIT__;
+ return NULL;
+ }
+ __FUNC_EXIT__;
+ return dev_name;
+ }
+ } else if (!g_strcmp0(part, "elm.text.sub.left.top")) {
+ return g_strdup(_("IDS_ST_HEADER_MY_DEVICE_NAME"));
+ }
+ __FUNC_EXIT__;
+ return NULL;
+}
-static char *_gl_header_label_get(void *data, Evas_Object * obj, const char *part)
+static Evas_Object *_gl_wfd_onoff_content_get(void *data,Evas_Object *obj,
+ const char *part)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- DBG(LOG_VERBOSE, "%s", part);
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
-
- if(!strcmp(part, "elm.text.1"))
- {
- DBG(LOG_VERBOSE, "Current text mode [%d]\n", ugd->head_text_mode);
- switch(ugd->head_text_mode)
- {
- case HEAD_TEXT_TYPE_DIRECT:
- case HEAD_TEXT_TYPE_ACTIVATED:
- case HEAD_TEXT_TYPE_SCANING:
- return strdup(dgettext("sys_string", "IDS_COM_OPT1_WI_FI_DIRECT"));
- break;
- case HEAD_TEXT_TYPE_DEACTIVATING:
- return strdup(_("IDS_WFD_BODY_DEACTIVATING")); // "Deactivating Wi-Fi Direct..."
- break;
- case HEAD_TEXT_TYPE_ACTIVATING:
- return strdup(_("IDS_WFD_BODY_ACTIVATING")); //"Activating Wi-Fi Direct..."
- break;
- default:
- break;
- }
- }
- else if(!strcmp(part, "elm.text.1"))
- {
- return strdup(dgettext("sys_string", "IDS_COM_OPT1_WI_FI_DIRECT"));
- } else if(!strcmp(part, "elm.text.2"))
- {
- return strdup(ugd->dev_name);
- }
-
- __FUNC_EXIT__;
- return NULL;
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd = (struct ug_data *) data;
+ WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
+ Evas_Object *btn = NULL;
+ Evas_Object *icon = NULL;
+ icon = elm_layout_add(obj);
+
+ if (g_strcmp0(part, "elm.icon.2")) {
+ return NULL;
+ }
+ elm_layout_theme_set(icon, "layout", "list/C/type.3", "default");
+ btn = elm_check_add(icon);
+ /* Wi-Fi on indication button */
+ btn= elm_check_add(icon);
+ elm_object_style_set(btn, "on&off");
+ evas_object_propagate_events_set(btn, EINA_FALSE);
+ elm_check_state_set(btn, ugd->wfd_onoff);
+ evas_object_propagate_events_set(btn, EINA_FALSE);
+ evas_object_smart_callback_add(btn, "changed",_onoff_changed_cb, ugd);
+ ugd->on_off_check = btn;
+ evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND,
+ EVAS_HINT_EXPAND);
+ elm_layout_content_set(icon, "elm.swallow.content", btn);
+ __FUNC_EXIT__;
+ return icon;
}
+#endif
-static Evas_Object *_gl_header_icon_get(void *data, Evas_Object * obj, const char *part)
+/**
+ * This function let the ug get the label of header
+ * @return the label of header
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_device_name_label_get(void *data, Evas_Object *obj,
+ const char *part)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- Evas_Object *onoff = NULL;
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
-
- if(ugd->head_text_mode == HEAD_TEXT_TYPE_ACTIVATING ||
- ugd->head_text_mode == HEAD_TEXT_TYPE_DEACTIVATING)
- return NULL;
-
- DBG(LOG_VERBOSE, "%s", part);
- onoff = elm_check_add(obj);
- elm_object_style_set(onoff, "on&off");
- elm_check_state_set(onoff, ugd->wfd_onoff);
- evas_object_smart_callback_add(onoff, "changed", _wfd_onoff_btn_cb, ugd);
- evas_object_show(onoff);
-
- __FUNC_EXIT__;
-
- return onoff;
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd = (struct ug_data *) data;
+ DBG(LOG_INFO, "%s", part);
+ WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
+ wfd_get_vconf_device_name(ugd);
+ char *dev_name;
+
+ if (!g_strcmp0(part,"elm.text.main.left.bottom")) {
+ DBG(LOG_INFO, "%s", ugd->dev_name);
+ if (ugd->dev_name) {
+ dev_name = elm_entry_utf8_to_markup(ugd->dev_name);
+ if (NULL == dev_name) {
+ DBG(LOG_ERROR, "elm_entry_utf8_to_markup failed.\n");
+ __FUNC_EXIT__;
+ return NULL;
+ }
+ __FUNC_EXIT__;
+ return dev_name;
+ }
+ } else if (!g_strcmp0(part, "elm.text.sub.left.top")) {
+ return g_strdup(_("IDS_ST_HEADER_MY_DEVICE_NAME"));
+ }
+ __FUNC_EXIT__;
+ return NULL;
+}
+
+/**
+ * This function let the ug get the label of title
+ * @return the label of titile
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_title_label_get(void *data, Evas_Object *obj, const char *part)
+{
+ __FUNC_ENTER__;
+
+ WFD_RETV_IF(data == NULL, NULL, "Incorrect parameter(NULL)\n");
+ DBG(LOG_INFO, "%s", part);
+ if (!g_strcmp0(part, "elm.text.main")) {
+ return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
+ }
+ __FUNC_EXIT__;
+ return NULL;
}
-static char *_gl_name_label_get(void *data, Evas_Object *obj, const char *part)
+static char *_gl_title_no_device_label_get(void *data, Evas_Object *obj,
+ const char *part)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
+ WFD_RETV_IF(data == NULL, NULL, "Incorrect parameter(NULL)\n");
+ DBG(LOG_INFO, "%s", part);
+ if (!g_strcmp0(part, "elm.text.main")) {
+ return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
+ }
- DBG(LOG_VERBOSE, "%s", part);
+ __FUNC_EXIT__;
+ return NULL;
+}
- if(!strcmp(part, "elm.text"))
- {
- return strdup(_("IDS_WFD_TITLE_ABOUT_WIFI")); // "Device name"
- }
- else if(!strcmp(part, "elm.text.2"))
- {
- return strdup(ugd->dev_name);
- }
+static char *_gl_multi_title_label_get(void *data, Evas_Object *obj, const char *part)
+{
+ __FUNC_ENTER__;
- __FUNC_EXIT__;
+ WFD_RETV_IF(data == NULL, NULL, "Incorrect parameter(NULL)\n");
+ if (!g_strcmp0(part, "elm.text.main")) {
+ return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
+ }
- return NULL;
+ __FUNC_EXIT__;
+ return NULL;
}
+static Evas_Object *_gl_multi_title_content_get(void *data, Evas_Object *obj, const char *part)
+{
+ __FUNC_ENTER__;
+
+ Evas_Object *progressbar = NULL;
+ struct ug_data *ugd = (struct ug_data *) data;
+ WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
-static char *_gl_title_label_get(void *data, Evas_Object *obj,
- const char *part)
+ if (!g_strcmp0(part, "elm.icon")) {
+ if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) {
+ progressbar = elm_progressbar_add(obj);
+ elm_object_style_set(progressbar, "process_small");
+ elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
+ elm_progressbar_pulse(progressbar, EINA_TRUE);
+ evas_object_show(progressbar);
+ return progressbar;
+ }
+ }
+
+ __FUNC_EXIT__;
+ return NULL;
+}
+
+static char *_gl_available_title_label_get(void *data, Evas_Object *obj, const char *part)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
-
- if (!strcmp(part, "elm.text"))
- {
- if (ugd->multiconn_view_genlist != NULL)
- {
- // It's called at Multi connect view...
- if(ugd->gl_available_dev_cnt_at_multiconn_view > 0)
- return strdup(_("IDS_WFD_BODY_AVAILABLE_DEVICES")); // "Available devices"
- else
- return strdup(_("IDS_WFD_BODY_WIFI_DIRECT_DEVICES")); // "Wi-Fi Direct devices"
- }
- else
- {
- // It's called at Main View
- if(ugd->gl_available_peer_cnt > 0)
- return strdup(_("IDS_WFD_BODY_AVAILABLE_DEVICES")); // "Available devices"
- else
- return strdup(_("IDS_WFD_BODY_WIFI_DIRECT_DEVICES")); // "Wi-Fi Direct devices"
- }
- }
-
- __FUNC_EXIT__;
-
- return NULL;
+ __FUNC_ENTER__;
+
+ if (data == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return NULL;
+ }
+ DBG(LOG_INFO, "available- %s", part);
+ if (!g_strcmp0(part, "elm.text.main")) {
+ return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
+ }
+
+ __FUNC_EXIT__;
+ return NULL;
}
+/**
+ * This function let the ug get the content of titile
+ * @return the content of titile
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
static Evas_Object *_gl_title_content_get(void *data, Evas_Object *obj, const char *part)
{
+ __FUNC_ENTER__;
+
Evas_Object *progressbar = NULL;
- struct ug_data *ugd = (struct ug_data*) data;
+ struct ug_data *ugd = (struct ug_data *) data;
if (data == NULL) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
return NULL;
}
- if (!strcmp(part, "elm.icon")) {
- if (HEAD_TEXT_TYPE_SCANING == ugd->head_text_mode) {
+ DBG(LOG_INFO, "Title content- %s", part);
+
+ if (!g_strcmp0(part, "elm.icon")) {
+ if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) {
progressbar = elm_progressbar_add(obj);
- elm_object_style_set(progressbar, "list_process_small");
+ elm_object_style_set(progressbar, "process_small");
elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
elm_progressbar_pulse(progressbar, EINA_TRUE);
evas_object_show(progressbar);
@@ -214,589 +277,756 @@ static Evas_Object *_gl_title_content_get(void *data, Evas_Object *obj, const ch
}
}
+ __FUNC_EXIT__;
return progressbar;
}
-static char *_gl_peer_label_get(void *data, Evas_Object * obj, const char *part)
+/**
+ * This function let the ug get the label of peer item
+ * @return the label of peer item
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_peer_label_get(void *data, Evas_Object *obj, const char *part)
{
- __FUNC_ENTER__;
- assertm_if(NULL == obj, "NULL!!");
- assertm_if(NULL == part, "NULL!!");
-
- device_type_s *peer = (device_type_s*) data;
- char buf[WFD_GLOBALIZATION_STR_LENGTH] = { 0, };
- DBG(LOG_VERBOSE, "%s", part);
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
-
- if (!strcmp(part, "elm.text.1"))
- {
- __FUNC_EXIT__;
- return strdup(peer->ssid);
- }
- else if (!strcmp(part, "elm.text.2"))
- {
- switch (peer->conn_status) {
- case PEER_CONN_STATUS_DISCONNECTED:
- g_strlcpy(buf, _("IDS_WFD_TAP_TO_CONNECT"),
- WFD_GLOBALIZATION_STR_LENGTH);
- break;
-
- case PEER_CONN_STATUS_CONNECTING:
- g_strlcpy(buf, _("IDS_WFD_CONNECTING"),
- WFD_GLOBALIZATION_STR_LENGTH);
- break;
-
- case PEER_CONN_STATUS_CONNECTED:
- g_strlcpy(buf, _("IDS_WFD_CONNECTED"),
- WFD_GLOBALIZATION_STR_LENGTH);
- break;
-
- case PEER_CONN_STATUS_FAILED_TO_CONNECT:
- g_strlcpy(buf, _("IDS_WFD_FAILED_TO_CONNECT"),
- WFD_GLOBALIZATION_STR_LENGTH);
- break;
-
- case PEER_CONN_STATUS_WAIT_FOR_CONNECT:
- g_strlcpy(buf, _("IDS_WFD_WAITING_FOR_CONNECT"),
- WFD_GLOBALIZATION_STR_LENGTH);
- break;
-
- default:
- g_strlcpy(buf, _("IDS_WFD_TAP_TO_CONNECT"),
- WFD_GLOBALIZATION_STR_LENGTH);
- break;
- }
- }
- else
- {
- __FUNC_EXIT__;
- return NULL;
- }
-
- __FUNC_EXIT__;
- return strdup(buf);
+ __FUNC_ENTER__;
+
+ assertm_if(NULL == obj, "NULL!!");
+ assertm_if(NULL == part, "NULL!!");
+ device_type_s *peer = (device_type_s *) data;
+ char buf[WFD_GLOBALIZATION_STR_LENGTH] = { 0, };
+ char *ssid;
+
+ DBG(LOG_INFO, "%s", part);
+
+ if (data == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return NULL;
+ }
+
+ if (!g_strcmp0(part, "elm.text.main.left.top")) {
+ if (strlen(peer->ssid) != 0) {
+ ssid = elm_entry_utf8_to_markup(peer->ssid);
+ if (NULL == ssid) {
+ DBG(LOG_ERROR, "elm_entry_utf8_to_markup failed.\n");
+ __FUNC_EXIT__;
+ return NULL;
+ }
+ __FUNC_EXIT__;
+ return ssid;
+ }
+ } else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) {
+ switch (peer->conn_status) {
+ case PEER_CONN_STATUS_DISCONNECTED:
+ g_strlcpy(buf, _("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH);
+ break;
+ case PEER_CONN_STATUS_CONNECTING:
+ g_strlcpy(buf, _("IDS_WIFI_BODY_CONNECTING_ING"), WFD_GLOBALIZATION_STR_LENGTH);
+ break;
+ case PEER_CONN_STATUS_CONNECTED:
+ if (peer->is_group_owner == FALSE) {
+ g_strlcpy(buf, _("IDS_COM_BODY_CONNECTED_M_STATUS"), WFD_GLOBALIZATION_STR_LENGTH);
+ } else {
+ g_strlcpy(buf, _("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH);
+ }
+ break;
+ case PEER_CONN_STATUS_FAILED_TO_CONNECT:
+ g_strlcpy(buf, _("IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"), WFD_GLOBALIZATION_STR_LENGTH);
+ break;
+ case PEER_CONN_STATUS_WAIT_FOR_CONNECT:
+ g_strlcpy(buf, _("IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"), WFD_GLOBALIZATION_STR_LENGTH);
+ break;
+ default:
+ g_strlcpy(buf, _("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH);
+ break;
+ }
+ } else {
+ __FUNC_EXIT__;
+ return NULL;
+ }
+
+ __FUNC_EXIT__;
+ return g_strdup(buf);
}
-static Evas_Object *_gl_peer_icon_get(void *data, Evas_Object * obj, const char *part)
+/**
+ * This function let the ug get the icon of peer item
+ * @return the icon of peer item
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static Evas_Object *_gl_peer_icon_get(void *data, Evas_Object *obj, const char *part)
{
- __FUNC_ENTER__;
- assertm_if(NULL == obj, "NULL!!");
- assertm_if(NULL == part, "NULL!!");
-
- device_type_s *peer = (device_type_s*) data;
- Evas_Object *icon = NULL;
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
-
- if(!strcmp(part, "elm.icon.2"))
- {
- DBG(LOG_VERBOSE, "elm.icon.2 - connection status [%d]\n", peer->conn_status);
- if(peer->conn_status == PEER_CONN_STATUS_CONNECTING)
- {
- icon = elm_progressbar_add(obj);
- elm_object_style_set(icon, "list_process");
- elm_progressbar_pulse(icon, EINA_TRUE);
- }
- else if(peer->conn_status == PEER_CONN_STATUS_CONNECTED)
- {
-#if 0
- icon = elm_icon_add(obj);
- elm_icon_file_set(icon, WFD_ICON_CONNECTED, NULL);
-#endif
- return NULL;
- }
-
- evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
- elm_icon_resizable_set(icon, 1, 1);
- evas_object_show(icon);
- }
- else if(!strcmp(part, "elm.icon.1"))
- {
- DBG(LOG_VERBOSE, "elm.icon.1 - category [%d]\n", peer->category);
- char *img_path = NULL;
- switch(peer->category)
- {
+ __FUNC_ENTER__;
+
+ assertm_if(NULL == obj, "NULL!!");
+ assertm_if(NULL == part, "NULL!!");
+ device_type_s *peer = (device_type_s *) data;
+ Evas_Object *icon = NULL;
+ Evas_Object *layout = NULL;
+
+ if (data == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return NULL;
+ }
+ DBG(LOG_INFO, "part = %s", part);
+ if (!g_strcmp0(part, "elm.icon.2")) {
+ DBG(LOG_INFO, "elm.icon.2 - connection status [%d]\n", peer->conn_status);
+ if (peer->conn_status == PEER_CONN_STATUS_CONNECTING) {
+ layout = elm_layout_add(obj);
+ elm_layout_theme_set(layout, "layout", "list/C/type.2", "default");
+ icon = elm_progressbar_add(layout);
+ elm_object_style_set(icon, "process_medium");
+ elm_progressbar_pulse(icon, EINA_TRUE);
+ } else if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
+ return NULL;
+ }
+ evas_object_show(icon);
+ elm_layout_content_set(layout, "elm.swallow.content", icon);
+ } else if (!g_strcmp0(part, "elm.icon.1")) {
+ DBG(LOG_INFO, "elm.icon.1 - category [%d]\n", peer->category);
+ char *img_name = NULL;
+ layout = elm_layout_add(obj);
+ elm_layout_theme_set(layout, "layout", "list/B/type.3", "default");
+ /*
+ * the icon of connected device is
+ * different from available and busy device
+ */
+ switch (peer->category) {
case WFD_DEVICE_TYPE_COMPUTER:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_COMPUTER_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_COMPUTER;
- }
+ img_name = WFD_ICON_DEVICE_COMPUTER;
break;
case WFD_DEVICE_TYPE_INPUT_DEVICE:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_INPUT_DEVICE_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_INPUT_DEVICE;
- }
+ img_name = WFD_ICON_DEVICE_INPUT_DEVICE;
break;
case WFD_DEVICE_TYPE_PRINTER:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_PRINTER_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_PRINTER;
- }
+ img_name = WFD_ICON_DEVICE_PRINTER;
break;
case WFD_DEVICE_TYPE_CAMERA:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_CAMERA_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_CAMERA;
- }
+ img_name = WFD_ICON_DEVICE_CAMERA;
break;
case WFD_DEVICE_TYPE_STORAGE:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_STORAGE_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_STORAGE;
- }
+ img_name = WFD_ICON_DEVICE_STORAGE;
break;
case WFD_DEVICE_TYPE_NW_INFRA:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_NETWORK_INFRA_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_NETWORK_INFRA;
- }
+ img_name = WFD_ICON_DEVICE_NETWORK_INFRA;
break;
case WFD_DEVICE_TYPE_DISPLAYS:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_DISPLAY_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_DISPLAY;
- }
+ img_name = WFD_ICON_DEVICE_DISPLAY;
break;
case WFD_DEVICE_TYPE_MM_DEVICES:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_MULTIMEDIA_DEVICE_CONNECT;
+ if (peer->sub_category == WIFI_DIRECT_SECONDARY_DEVICE_TYPE_MULTIMEDIA_STB) {
+ img_name = WFD_ICON_DEVICE_STB;
+ } else if (peer->sub_category == WIFI_DIRECT_SECONDARY_DEVICE_TYPE_MULTIMEDIA_MS_MA_ME) {
+ img_name = WFD_ICON_DEVICE_DONGLE;
+ } else if (peer->sub_category == WIFI_DIRECT_SECONDARY_DEVICE_TYPE_MULTIMEDIA_PVP) {
+ img_name = WFD_ICON_DEVICE_BD;
} else {
- img_path = WFD_ICON_DEVICE_MULTIMEDIA_DEVICE;
+ img_name = WFD_ICON_DEVICE_MULTIMEDIA;
}
break;
case WFD_DEVICE_TYPE_GAME_DEVICES:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_GAMING_DEVICE_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_GAMING_DEVICE;
- }
+ img_name = WFD_ICON_DEVICE_GAMING;
break;
case WFD_DEVICE_TYPE_TELEPHONE:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_TELEPHONE_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_TELEPHONE;
- }
+ img_name = WFD_ICON_DEVICE_TELEPHONE;
break;
case WFD_DEVICE_TYPE_AUDIO:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_AUDIO_DEVICE_CONNECT;
+ if (peer->sub_category == WIFI_DIRECT_SECONDARY_DEVICE_TYPE_AUDIO_TUNER) {
+ img_name = WFD_ICON_DEVICE_HOME_THEATER;
} else {
- img_path = WFD_ICON_DEVICE_AUDIO_DEVICE;
+ img_name = WFD_ICON_DEVICE_HEADSET;
}
break;
default:
- if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
- img_path = WFD_ICON_DEVICE_COMPUTER_CONNECT;
- } else {
- img_path = WFD_ICON_DEVICE_COMPUTER;
- }
+ img_name = WFD_ICON_DEVICE_UNKNOWN;
break;
- }
-
- if(img_path != NULL)
- {
- icon = elm_icon_add(obj);
- elm_icon_file_set(icon, img_path, NULL);
- evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
- elm_icon_resizable_set(icon, 1, 1);
- evas_object_show(icon);
- }
- else
- {
- return NULL;
- }
- }
-
- __FUNC_EXIT__;
- return icon;
-}
+ }
+
+ icon = elm_image_add(layout);
+ elm_image_file_set(icon, WFD_UG_EDJ_PATH, img_name);
+ evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ ea_theme_object_color_set(icon, "AO001");
+ evas_object_show(icon);
+ evas_object_propagate_events_set(icon, EINA_FALSE);
+ elm_layout_content_set(layout, "elm.swallow.content", icon);
+ }
+ if (layout)
+ evas_object_show(layout);
+ __FUNC_EXIT__;
+ return layout;
+}
-static char *_gl_noitem_text_get(void *data, Evas_Object * obj,
- const char *part)
+/**
+ * This function let the ug get the icon of peer item
+ * @return the icon of peer item
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static Evas_Object *_gl_conn_peer_icon_get(void *data, Evas_Object *obj, const char *part)
{
- __FUNC_ENTER__;
+ __FUNC_ENTER__;
+ assertm_if(NULL == obj, "NULL!!");
+ assertm_if(NULL == part, "NULL!!");
+ device_type_s *peer = (device_type_s *) data;
+ Evas_Object *icon = NULL;
+ Evas_Object *layout = NULL;
- if(data == NULL)
- {
+ if (data == NULL) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
return NULL;
}
+ DBG(LOG_INFO, "part[%s]\n", part);
+ if (!g_strcmp0(part, "elm.icon.1")) {
+ DBG(LOG_INFO, "elm.icon.1 - category [%d]\n", peer->category);
+ char *img_name = NULL;
+ layout = elm_layout_add(obj);
+ elm_layout_theme_set(layout, "layout", "list/B/type.3", "default");
+ /*
+ * the icon of connected device is
+ * different from available and busy device
+ */
+ switch (peer->category) {
+ case WFD_DEVICE_TYPE_COMPUTER:
+ img_name = WFD_ICON_DEVICE_COMPUTER;
+ break;
+ case WFD_DEVICE_TYPE_INPUT_DEVICE:
+ img_name = WFD_ICON_DEVICE_INPUT_DEVICE;
+ break;
+ case WFD_DEVICE_TYPE_PRINTER:
+ img_name = WFD_ICON_DEVICE_PRINTER;
+ break;
+ case WFD_DEVICE_TYPE_CAMERA:
+ img_name = WFD_ICON_DEVICE_CAMERA;
+ break;
+ case WFD_DEVICE_TYPE_STORAGE:
+ img_name = WFD_ICON_DEVICE_STORAGE;
+ break;
+ case WFD_DEVICE_TYPE_NW_INFRA:
+ img_name = WFD_ICON_DEVICE_NETWORK_INFRA;
+ break;
+ case WFD_DEVICE_TYPE_DISPLAYS:
+ img_name = WFD_ICON_DEVICE_DISPLAY;
+ break;
+ case WFD_DEVICE_TYPE_MM_DEVICES:
+ if (peer->sub_category == WIFI_DIRECT_SECONDARY_DEVICE_TYPE_MULTIMEDIA_STB) {
+ img_name = WFD_ICON_DEVICE_STB;
+ } else if (peer->sub_category == WIFI_DIRECT_SECONDARY_DEVICE_TYPE_MULTIMEDIA_MS_MA_ME) {
+ img_name = WFD_ICON_DEVICE_DONGLE;
+ } else if (peer->sub_category == WIFI_DIRECT_SECONDARY_DEVICE_TYPE_MULTIMEDIA_PVP) {
+ img_name = WFD_ICON_DEVICE_BD;
+ } else {
+ img_name = WFD_ICON_DEVICE_MULTIMEDIA;
+ }
+ break;
+ case WFD_DEVICE_TYPE_GAME_DEVICES:
+ img_name = WFD_ICON_DEVICE_GAMING;
+ break;
+ case WFD_DEVICE_TYPE_TELEPHONE:
+ img_name = WFD_ICON_DEVICE_TELEPHONE;
+ break;
+ case WFD_DEVICE_TYPE_AUDIO:
+ if (peer->sub_category == WIFI_DIRECT_SECONDARY_DEVICE_TYPE_AUDIO_TUNER) {
+ img_name = WFD_ICON_DEVICE_HOME_THEATER;
+ } else {
+ img_name = WFD_ICON_DEVICE_HEADSET;
+ }
+ break;
+ default:
+ img_name = WFD_ICON_DEVICE_UNKNOWN;
+ break;
+ }
+ icon = elm_image_add(layout);
+ elm_image_file_set(icon, WFD_UG_EDJ_PATH, img_name);
+ evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ ea_theme_object_color_set(icon, "AO001");
+ evas_object_show(icon);
+ evas_object_propagate_events_set(icon, EINA_FALSE);
+ elm_layout_content_set(layout, "elm.swallow.content", icon);
+ }
+ if (layout)
+ evas_object_show(layout);
__FUNC_EXIT__;
- return strdup(_("IDS_WFD_NOCONTENT"));
+ return layout;
}
-
-static char *_gl_help_label_get(void *data, Evas_Object * obj, const char *part)
+/**
+ * This function let the ug get the text of no device item
+ * @return the text of no device item
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_noitem_text_get(void *data, Evas_Object *obj, const char *part)
{
- __FUNC_ENTER__;
- DBG(LOG_VERBOSE, "%s", part);
- __FUNC_EXIT__;
- return strdup("Help");
-}
+ __FUNC_ENTER__;
+
+ if (data == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return NULL;
+ }
+ DBG(LOG_INFO,"part = %s",part);
+ if (!g_strcmp0(part, "elm.text.main.left")) {
+ return g_strdup(_("IDS_BT_BODY_NO_DEVICES_FOUND_ABB"));
+ }
+ __FUNC_EXIT__;
+ return NULL;
+}
-static Evas_Object *_gl_button_get(void *data, Evas_Object * obj, const char *part)
+/**
+ * This function let the ug get the title label of connected device list
+ * @return the title label of connected device list
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_conn_dev_title_label_get(void *data, Evas_Object *obj, const char *part)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ if (data == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return NULL;
+ }
+ DBG(LOG_INFO,"part = %s",part);
+ if (!g_strcmp0(part, "elm.text.main")) {
+ return g_strdup(_("IDS_ST_HEADER_CONNECTED_DEVICES"));
+ }
- DBG(LOG_VERBOSE, "%s", part);
+ __FUNC_EXIT__;
+ return NULL;
+}
- ugd->multi_btn = elm_button_add(obj);
+char* ConvertRGBAtoHex(int r, int g, int b, int a)
+{
+ int hexcolor = 0;
+ char *string = NULL;
+ string = g_try_malloc0(sizeof(char )* 255);
+ if (string == NULL) {
+ return string;
+ }
+ hexcolor = (r << 24) + (g << 16) + (b << 8) + a;
+ sprintf(string, "%08x", hexcolor );
+ return string;
+}
- wfd_refresh_wifi_direct_state(ugd);
+/**
+ * This function let the ug get the label of connected device
+ * @return the label of connected device
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object *obj, const char *part)
+{
+ __FUNC_ENTER__;
- if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_COMPLETED)
- {
- elm_object_text_set(ugd->multi_btn, _("IDS_WFD_BUTTON_DISCONNECT"));
- DBG(LOG_VERBOSE, "button: Disconnect\n");
+ assertm_if(NULL == obj, "NULL!!");
+ assertm_if(NULL == part, "NULL!!");
+ device_type_s *peer = (device_type_s *) data;
+ DBG(LOG_INFO, "%s", part);
+ char *det = NULL;
+ char *buf = NULL;
+ char *str = NULL;
+ char *ssid;
+ int r = 0, g = 0, b = 0, a = 0;
- // Don't connect "clicked" callback.
- return ugd->multi_btn;
+ if (data == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return NULL;
}
- if (ugd->wfd_status == WFD_LINK_STATUS_CONNECTING)
- {
- elm_object_text_set(ugd->multi_btn, _("IDS_WFD_BUTTON_CANCEL"));
- DBG(LOG_VERBOSE, "button: Cancel connect\n");
- }
- else if (ugd->wfd_status >= WFD_LINK_STATUS_CONNECTED)
- {
- if (ugd->gl_connected_peer_cnt > 1)
- {
- elm_object_text_set(ugd->multi_btn, _("IDS_WFD_BUTTON_DISCONNECT_ALL"));
- DBG(LOG_VERBOSE, "button: Disconnect All\n");
+ if (!g_strcmp0(part, "elm.text.main.left.top")) {
+ if (strlen(peer->ssid) != 0) {
+ ssid = elm_entry_utf8_to_markup(peer->ssid);
+ if (NULL == ssid) {
+ DBG(LOG_ERROR, "elm_entry_utf8_to_markup failed.\n");
+ __FUNC_EXIT__;
+ return NULL;
+ }
+ __FUNC_EXIT__;
+ return ssid;
}
- else
- {
- elm_object_text_set(ugd->multi_btn, _("IDS_WFD_BUTTON_DISCONNECT"));
- DBG(LOG_VERBOSE, "button: Disconnect\n");
+ } else if(!g_strcmp0(part, "elm.text.sub.left.bottom")){
+ det = elm_entry_utf8_to_markup(_("IDS_COM_BODY_CONNECTED_M_STATUS"));
+ ea_theme_color_get("T024S",&r, &g, &b, &a,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL);
+ str = ConvertRGBAtoHex(r, g, b, a);
+ buf = g_strdup_printf("<color=#%s>%s</color>",
+ str, det);
+ if (det != NULL) {
+ g_free(det);
}
+ if (str != NULL) {
+ g_free(str);
+ }
+ __FUNC_EXIT__;
+ return buf;
}
- else
- {
- elm_object_text_set(ugd->multi_btn, _("IDS_WFD_BUTTON_MULTI"));
- DBG(LOG_VERBOSE, "button: Multi connect\n");
- }
-
- evas_object_smart_callback_add(ugd->multi_btn, "clicked", _wifid_create_multibutton_cb, ugd);
- evas_object_show(ugd->multi_btn);
-
- __FUNC_EXIT__;
-
- return ugd->multi_btn;
+ __FUNC_EXIT__;
+ return NULL;
}
-
-static char *_gl_conn_dev_title_label_get(void *data, Evas_Object *obj,
+/**
+ * This function let the ug get the title label of connected failed device list
+ * @return the label of connected device
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_conn_failed_dev_title_label_get(void *data, Evas_Object *obj,
const char *part)
{
- __FUNC_ENTER__;
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
+ __FUNC_ENTER__;
- if (!strcmp(part, "elm.text"))
- {
- return strdup(_("IDS_WFD_BODY_CONNECTED_DEVICES"));
- }
+ if (data == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return NULL;
+ }
- __FUNC_EXIT__;
+ if (!g_strcmp0(part, "elm.text")) {
+ return g_strdup(_("IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"));
+ }
- return NULL;
+ __FUNC_EXIT__;
+ return NULL;
}
-
-static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object * obj, const char *part)
+/**
+ * This function let the ug get the label of connected failed device
+ * @return the label of connected device
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_peer_conn_failed_dev_label_get(void *data, Evas_Object *obj, const char *part)
{
__FUNC_ENTER__;
+
assertm_if(NULL == obj, "NULL!!");
assertm_if(NULL == part, "NULL!!");
-
- device_type_s *peer = (device_type_s*) data;
-
+ device_type_s *peer = (device_type_s *) data;
char buf[WFD_GLOBALIZATION_STR_LENGTH] = { 0, };
- DBG(LOG_VERBOSE, "%s", part);
- if(data == NULL)
- {
+ char *ssid;
+ DBG(LOG_INFO, "%s", part);
+
+ if (data == NULL) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
return NULL;
}
- if (!strcmp(part, "elm.text.1"))
- {
- return strdup(peer->ssid);
- }
- else
- {
- g_strlcpy(buf, _("IDS_WFD_CONNECTED"),
- WFD_GLOBALIZATION_STR_LENGTH);
+ if (!g_strcmp0(part, "elm.text.1")) {
+ if (strlen(peer->ssid) != 0) {
+ ssid = elm_entry_utf8_to_markup(peer->ssid);
+ if (NULL == ssid) {
+ DBG(LOG_ERROR, "elm_entry_utf8_to_markup failed.\n");
+ __FUNC_EXIT__;
+ return NULL;
+ }
+ __FUNC_EXIT__;
+ return ssid;
+ }
+ } else {
+ g_strlcpy(buf, _("IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"),
+ WFD_GLOBALIZATION_STR_LENGTH);
__FUNC_EXIT__;
- return strdup(buf);
+ return g_strdup(buf);
}
+ return NULL;
}
-static char *_gl_conn_failed_dev_title_label_get(void *data, Evas_Object *obj,
- const char *part)
+/**
+ * This function let the ug get the title label of multi connect list
+ * @return the label of connected device
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_multi_connect_dev_title_label_get(void *data, Evas_Object *obj, const char *part)
{
- __FUNC_ENTER__;
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
+ __FUNC_ENTER__;
+ struct ug_data *ugd = wfd_get_ug_data();
- if (!strcmp(part, "elm.text"))
- {
- return strdup(IDS_WFD_BODY_FAILED_DEVICES);
- }
+ if (data == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return NULL;
+ }
+ DBG(LOG_INFO, "%s", part);
- __FUNC_EXIT__;
+ if (!g_strcmp0(part, "elm.text.main")) {
+ if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
+ return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
+ } else if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_COMPLETED) {
+ return g_strdup(_("IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"));
+ }
+ }
- return NULL;
+ __FUNC_EXIT__;
+ return NULL;
}
-
-static char *_gl_peer_conn_failed_dev_label_get(void *data, Evas_Object * obj, const char *part)
+/**
+ * This function let the ug get the title label of select all in multi connect
+ * @return the label of select all string
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_multi_connect_select_all_title_label_get(void *data, Evas_Object *obj, const char *part)
{
__FUNC_ENTER__;
- assertm_if(NULL == obj, "NULL!!");
- assertm_if(NULL == part, "NULL!!");
-
- device_type_s *peer = (device_type_s*) data;
- char buf[WFD_GLOBALIZATION_STR_LENGTH] = { 0, };
- DBG(LOG_VERBOSE, "%s", part);
- if(data == NULL)
- {
+ if (data == NULL) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
return NULL;
}
+ DBG(LOG_INFO, "%s", part);
- if (!strcmp(part, "elm.text.1"))
- {
- return strdup(peer->ssid);
- }
- else
- {
- g_strlcpy(buf, _("IDS_WFD_FAILED_TO_CONNECT"),
- WFD_GLOBALIZATION_STR_LENGTH);
+ if (!g_strcmp0(part, "elm.text.main.left")) {
__FUNC_EXIT__;
- return strdup(buf);
+ return g_strdup(_("IDS_WIFI_BODY_SELECT_ALL"));
}
+ __FUNC_EXIT__;
+ return NULL;
}
-static char *_gl_multi_connect_dev_title_label_get(void *data, Evas_Object *obj,
- const char *part)
+/**
+ * This function let the ug get the icon of select all genlist
+ * @return the icon of select all genlist
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static Evas_Object *_wfd_gl_select_all_icon_get(void *data, Evas_Object *obj, const char *part)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = wfd_get_ug_data();
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
-
- if (!strcmp(part, "elm.text"))
- {
- if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS)
- return strdup(_("IDS_WFD_BODY_AVAILABLE_DEVICES")); // "Available devices"
- else if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_COMPLETED)
- return strdup(IDS_WFD_BODY_FAILED_DEVICES); // "Available devices"
- }
-
- __FUNC_EXIT__;
-
- return NULL;
-}
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ Evas_Object *check = NULL;
+ Evas_Object *icon_layout = NULL;
+ DBG(LOG_INFO, "Part %s", part);
+
+ if (!g_strcmp0(part, "elm.icon.2")) {
+ icon_layout = elm_layout_add(obj);
+ elm_layout_theme_set(icon_layout, "layout", "list/C/type.2", "default");
+ DBG(LOG_INFO, "Part %s", part);
+ check = elm_check_add(icon_layout);
+ ugd->select_all_icon = check;
+ if (ugd->is_select_all_checked == EINA_TRUE) {
+ elm_check_state_set(ugd->select_all_icon, TRUE);
+ }
+ elm_object_style_set(check, "default/genlist");
+ evas_object_propagate_events_set(check, EINA_FALSE);
+ evas_object_smart_callback_add(check, "changed",
+ wfd_genlist_select_all_check_changed_cb, (void *)data);
+ elm_layout_content_set(icon_layout, "elm.swallow.content", check);
+ }
+ __FUNC_EXIT__;
+ return icon_layout;
+}
+
+/**
+ * This function let the ug get the title label of busy device list
+ * @return the label of connected device
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
static char *_gl_busy_dev_title_label_get(void *data, Evas_Object *obj,
const char *part)
{
- __FUNC_ENTER__;
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
+ __FUNC_ENTER__;
- if (!strcmp(part, "elm.text"))
- {
- return strdup(_("IDS_WFD_BODY_BUSY_DEVICES"));
- }
+ if (data == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return NULL;
+ }
+ DBG(LOG_INFO, "%s", part);
- __FUNC_EXIT__;
+ if (!g_strcmp0(part,"elm.text.main")) {
+ return g_strdup(_("IDS_ST_HEADER_BUSY_DEVICES"));
+ }
- return NULL;
+ __FUNC_EXIT__;
+ return NULL;
}
-
-static char *_gl_peer_busy_dev_label_get(void *data, Evas_Object * obj, const char *part)
+/**
+ * This function let the ug get the label of busy device
+ * @return the label of connected device
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_gl_peer_busy_dev_label_get(void *data, Evas_Object *obj, const char *part)
{
__FUNC_ENTER__;
assertm_if(NULL == obj, "NULL!!");
assertm_if(NULL == part, "NULL!!");
- device_type_s *peer = (device_type_s*) data;
+ device_type_s *peer = (device_type_s *) data;
char buf[WFD_GLOBALIZATION_STR_LENGTH] = { 0, };
- DBG(LOG_VERBOSE, "%s", part);
- if(data == NULL)
- {
+ char *ssid;
+ DBG(LOG_INFO, "%s", part);
+
+ if (data == NULL) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
return NULL;
}
- DBG(LOG_VERBOSE, "peer->ssid = %s", peer->ssid);
- if (!strcmp(part, "elm.text.1"))
- {
- return strdup(peer->ssid);
- }
- else
- {
- g_strlcpy(buf, _("IDS_WFD_CONNECTED_WITH_OTHER_DEVICE"),
- WFD_GLOBALIZATION_STR_LENGTH);
+
+ DBG(LOG_INFO, "peer->ssid = %s", peer->ssid);
+
+ if (!g_strcmp0(part, "elm.text.main.left.top")) {
+ if (strlen(peer->ssid) != 0) {
+ ssid = elm_entry_utf8_to_markup(peer->ssid);
+ if (NULL == ssid) {
+ DBG(LOG_ERROR, "elm_entry_utf8_to_markup failed.\n");
+ __FUNC_EXIT__;
+ return NULL;
+ }
+ __FUNC_EXIT__;
+ return ssid;
+ }
+ } else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) {
+ g_strlcpy(buf, _("IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"),
+ WFD_GLOBALIZATION_STR_LENGTH);
__FUNC_EXIT__;
- return strdup(buf);
+ return g_strdup(buf);
}
+ return NULL;
+
}
-static void _gl_peer_del(void *data, Evas_Object * obj)
+/**
+ * This function let the ug delete the peer item
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ */
+static void _gl_peer_del(void *data, Evas_Object *obj)
{
- __FUNC_ENTER__;
- assertm_if(NULL == obj, "NULL!!");
- assertm_if(NULL == data, "NULL!!");
+ __FUNC_ENTER__;
+
+ assertm_if(NULL == obj, "NULL!!");
+ assertm_if(NULL == data, "NULL!!");
- __FUNC_EXIT__;
- return;
+ __FUNC_EXIT__;
+ return;
}
+/**
+ * This function let the ug initialize the items of genlist
+ * @return void
+ */
void initialize_gen_item_class()
{
- sep_itc.item_style = "dialogue/separator";
- sep_itc.func.text_get = NULL;
- sep_itc.func.content_get = NULL;
- sep_itc.func.state_get = NULL;
- sep_itc.func.del = NULL;
-
- sep_itc_end.item_style = "dialogue/separator/end";
- sep_itc_end.func.text_get = NULL;
- sep_itc_end.func.content_get = NULL;
- sep_itc_end.func.state_get = NULL;
- sep_itc_end.func.del = NULL;
-
- head_itc.item_style = "dialogue/2text.1icon.6";
- head_itc.func.text_get = _gl_header_label_get;
- head_itc.func.content_get = _gl_header_icon_get;
- head_itc.func.state_get = NULL;
-
- name_itc.item_style = "dialogue/1text";
- name_itc.func.text_get = _gl_name_label_get;
- name_itc.func.content_get = NULL;
- name_itc.func.state_get = NULL;
- name_itc.func.del = NULL;
-
- title_itc.item_style = "dialogue/title";
- title_itc.func.text_get = _gl_title_label_get;
- title_itc.func.content_get = _gl_title_content_get;
- title_itc.func.state_get = NULL;
- title_itc.func.del = NULL;
-
- peer_itc.item_style = "dialogue/2text.2icon.3";
- peer_itc.func.text_get = _gl_peer_label_get;
- peer_itc.func.content_get = _gl_peer_icon_get;
- peer_itc.func.state_get = NULL;
- peer_itc.func.del = _gl_peer_del;
-
- noitem_itc.item_style ="dialogue/1text";
- noitem_itc.func.text_get = _gl_noitem_text_get;
- noitem_itc.func.content_get = NULL;
- noitem_itc.func.state_get = NULL;
- noitem_itc.func.del = NULL;
-
- help_itc.item_style = "dialogue/1text";
- help_itc.func.text_get = _gl_help_label_get;
- help_itc.func.content_get = NULL;
- help_itc.func.state_get = NULL;
- help_itc.func.del = NULL;
-
- button_itc.item_style = "1icon";
- button_itc.func.text_get = NULL;
- button_itc.func.content_get = _gl_button_get;
- button_itc.func.state_get = NULL;
- button_itc.func.del = NULL;
-
- title_conn_itc.item_style = "dialogue/title";
- title_conn_itc.func.text_get = _gl_conn_dev_title_label_get;
- title_conn_itc.func.content_get = NULL;
- title_conn_itc.func.state_get = NULL;
- title_conn_itc.func.del = NULL;
-
- peer_conn_itc.item_style = "dialogue/2text.2icon.3";
- peer_conn_itc.func.text_get = _gl_peer_conn_dev_label_get;
- peer_conn_itc.func.content_get = _gl_peer_icon_get;
- peer_conn_itc.func.state_get = NULL;
- peer_conn_itc.func.del = _gl_peer_del;
-
- title_conn_failed_itc.item_style = "dialogue/title";
- title_conn_failed_itc.func.text_get = _gl_conn_failed_dev_title_label_get;
- title_conn_failed_itc.func.content_get = NULL;
- title_conn_failed_itc.func.state_get = NULL;
- title_conn_failed_itc.func.del = NULL;
-
- peer_conn_failed_itc.item_style = "dialogue/2text.2icon.3";
- peer_conn_failed_itc.func.text_get = _gl_peer_conn_failed_dev_label_get;
- peer_conn_failed_itc.func.content_get = _gl_peer_icon_get;
- peer_conn_failed_itc.func.state_get = NULL;
- peer_conn_failed_itc.func.del = _gl_peer_del;
-
- title_busy_itc.item_style = "dialogue/title";
- title_busy_itc.func.text_get = _gl_busy_dev_title_label_get;
- title_busy_itc.func.content_get = NULL;
- title_busy_itc.func.state_get = NULL;
- title_busy_itc.func.del = NULL;
-
- peer_busy_itc.item_style = "dialogue/2text.2icon.3";
- peer_busy_itc.func.text_get = _gl_peer_busy_dev_label_get;
- peer_busy_itc.func.content_get = _gl_peer_icon_get;
- peer_busy_itc.func.state_get = NULL;
- peer_busy_itc.func.del = _gl_peer_del;
-
- title_multi_connect_itc.item_style = "dialogue/title";
- title_multi_connect_itc.func.text_get = _gl_multi_connect_dev_title_label_get;
- title_multi_connect_itc.func.content_get = NULL;
- title_multi_connect_itc.func.state_get = NULL;
- title_multi_connect_itc.func.del = NULL;
-
-#if 0
- peer_multi_connect_itc.item_style = "dialogue/2text.2icon.3";
- peer_multi_connect_itc.func.text_get = _gl_peer_label_get;
- peer_multi_connect_itc.func.content_get = _gl_peer_icon_get;
- peer_multi_connect_itc.func.state_get = NULL;
- peer_multi_connect_itc.func.del = _gl_peer_del;
+ elm_theme_extension_add(NULL, WFD_UG_EDJ_PATH);
+
+ device_name_itc.item_style = "dialogue/2text.2";
+ device_name_itc.func.text_get = NULL;
+ device_name_itc.func.content_get = NULL;
+ device_name_itc.func.state_get = NULL;
+
+#ifdef WFD_ON_OFF_GENLIST
+ wfd_onoff_itc.item_style = "2line.bottom";
+ wfd_onoff_itc.func.text_get = _gl_wfd_onoff_text_get;
+ wfd_onoff_itc.func.content_get = _gl_wfd_onoff_content_get;
+ wfd_onoff_itc.func.state_get = NULL;
+ wfd_onoff_itc.func.del = NULL;
#endif
+
+
+ title_itc.item_style = "groupindex";
+ title_itc.func.text_get = _gl_title_label_get;
+ title_itc.func.content_get = _gl_title_content_get;
+ title_itc.func.state_get = NULL;
+ title_itc.func.del = NULL;
+
+ multi_view_title_itc.item_style = "groupindex";
+ multi_view_title_itc.func.text_get = _gl_multi_title_label_get;
+ multi_view_title_itc.func.content_get = _gl_multi_title_content_get;
+ multi_view_title_itc.func.state_get = NULL;
+ multi_view_title_itc.func.del = NULL;
+
+ title_no_device_itc.item_style = "groupindex";
+ title_no_device_itc.func.text_get = _gl_title_no_device_label_get;
+ title_no_device_itc.func.content_get = NULL;
+ title_no_device_itc.func.state_get = NULL;
+ title_no_device_itc.func.del = NULL;
+
+ title_available_itc.item_style = "groupindex";
+ title_available_itc.func.text_get = _gl_available_title_label_get;
+ title_available_itc.func.content_get = _gl_title_content_get;
+ title_available_itc.func.state_get = NULL;
+ title_available_itc.func.del = NULL;
+
+ peer_itc.item_style = "2line.top";
+ peer_itc.func.text_get = _gl_peer_label_get;
+ peer_itc.func.content_get = _gl_peer_icon_get;
+ peer_itc.func.state_get = NULL;
+ peer_itc.func.del = _gl_peer_del;
+
+ noitem_itc.item_style = "1line";
+ noitem_itc.func.text_get = _gl_noitem_text_get;
+ noitem_itc.func.content_get = NULL;
+ noitem_itc.func.state_get = NULL;
+ noitem_itc.func.del = NULL;
+
+ title_conn_itc.item_style = "groupindex";
+ title_conn_itc.func.text_get = _gl_conn_dev_title_label_get;
+ title_conn_itc.func.content_get = NULL;
+ title_conn_itc.func.state_get = NULL;
+ title_conn_itc.func.del = NULL;
+
+ peer_conn_itc.item_style = "2line.top";
+ peer_conn_itc.func.text_get = _gl_peer_conn_dev_label_get;
+ peer_conn_itc.func.content_get = _gl_conn_peer_icon_get;
+ peer_conn_itc.func.state_get = NULL;
+ peer_conn_itc.func.del = _gl_peer_del;
+
+ title_conn_failed_itc.item_style = "dialogue/title";
+ title_conn_failed_itc.func.text_get = _gl_conn_failed_dev_title_label_get;
+ title_conn_failed_itc.func.content_get = NULL;
+ title_conn_failed_itc.func.state_get = NULL;
+ title_conn_failed_itc.func.del = NULL;
+
+ peer_conn_failed_itc.item_style = "dialogue/2text.2icon.3";
+ peer_conn_failed_itc.func.text_get = _gl_peer_conn_failed_dev_label_get;
+ peer_conn_failed_itc.func.content_get = _gl_peer_icon_get;
+ peer_conn_failed_itc.func.state_get = NULL;
+ peer_conn_failed_itc.func.del = _gl_peer_del;
+
+ title_busy_itc.item_style = "groupindex";
+ title_busy_itc.func.text_get = _gl_busy_dev_title_label_get;
+ title_busy_itc.func.content_get = NULL;
+ title_busy_itc.func.state_get = NULL;
+ title_busy_itc.func.del = NULL;
+
+ peer_busy_itc.item_style = "2line.top";
+ peer_busy_itc.func.text_get = _gl_peer_busy_dev_label_get;
+ peer_busy_itc.func.content_get = _gl_peer_icon_get;
+ peer_busy_itc.func.state_get = NULL;
+ peer_busy_itc.func.del = _gl_peer_del;
+
+ title_multi_connect_itc.item_style = "groupindex";
+ title_multi_connect_itc.func.text_get = _gl_multi_connect_dev_title_label_get;
+ title_multi_connect_itc.func.content_get = NULL;
+ title_multi_connect_itc.func.state_get = NULL;
+ title_multi_connect_itc.func.del = NULL;
+
+ select_all_multi_connect_itc.item_style = "1line";
+ select_all_multi_connect_itc.func.text_get =
+ _gl_multi_connect_select_all_title_label_get;
+ select_all_multi_connect_itc.func.content_get = _wfd_gl_select_all_icon_get;
+ select_all_multi_connect_itc.func.state_get = NULL;
+ select_all_multi_connect_itc.func.del = NULL;
}
diff --git a/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c
index 1849e63..dfe5b73 100755..100644
--- a/ug-wifidirect/src/wfd_ug_main_view.c
+++ b/ug-wifidirect/src/wfd_ug_main_view.c
@@ -19,1135 +19,1955 @@
#include <libintl.h>
-
-#include <assert.h>
#include <glib.h>
#include <Elementary.h>
#include <vconf.h>
#include <ui-gadget-module.h>
+#include <app_control.h>
#include <wifi-direct.h>
#include "wfd_ug.h"
#include "wfd_ug_view.h"
#include "wfd_client.h"
-void _wfd_onoff_btn_cb(void *data, Evas_Object *obj, void *event_info);
+void scan_button_create(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
+ Evas_Object *btn;
+ btn = elm_button_add(ugd->layout);
+ /* Use "bottom" style button */
+ elm_object_style_set(btn, "bottom");
+ elm_object_domain_translatable_text_set(btn, PACKAGE, "IDS_WIFI_SK4_SCAN");
+ ugd->scan_toolbar = btn;
+ if (ugd->wfd_status <= WIFI_DIRECT_STATE_DEACTIVATING) {
+ wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN",
+ FALSE);
+ }
+ evas_object_smart_callback_add(btn, "clicked",_scan_btn_cb, (void *)ugd);
+ /* Set button into "toolbar" swallow part */
+ elm_object_part_content_set(ugd->layout, "button.big", btn);
+ evas_object_show(ugd->scan_toolbar);
-void _back_btn_cb(void *data, Evas_Object * obj, void *event_info)
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug call it when click 'back' button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+Eina_Bool _back_btn_cb(void *data, Elm_Object_Item *it)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
-
- if(!ugd)
- {
- DBG(LOG_ERROR, "The param is NULL\n");
- return;
- }
-
- wfd_ug_view_free_peers(ugd);
-#if 0
- bundle *b;
- b = bundle_create();
- if(!b)
- {
- DBG(LOG_ERROR, "Failed to create bundle");
- return;
- }
-
- wfd_refresh_wifi_direct_state(ugd);
- if (ugd->wfd_status > WIFI_DIRECT_STATE_CONNECTING)
- bundle_add(b, "Connection", "TRUE");
- else
- bundle_add(b, "Connection", "FALSE");
-
- ug_send_result(ugd->ug, b);
-
- bundle_free(b);
-#else
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ WFD_RETV_IF(ugd == NULL, FALSE, "The param is NULL\n");
int ret = -1;
- service_h service = NULL;
- ret = service_create(&service);
- if(ret)
- {
- DBG(LOG_ERROR, "Failed to create service");
- return;
+ bool owner = FALSE;
+ app_control_h control = NULL;
+
+#ifdef WFD_DBUS_LAUNCH
+ if (ugd->dbus_cancellable != NULL) {
+ g_cancellable_cancel(ugd->dbus_cancellable);
+ g_object_unref(ugd->dbus_cancellable);
+ ugd->dbus_cancellable = NULL;
+ if (ugd->conn) {
+ g_object_unref(ugd->conn);
+ ugd->conn = NULL;
+ }
+ DBG(LOG_INFO, "Cancel dbus call");
}
+#endif
wfd_refresh_wifi_direct_state(ugd);
- if (ugd->wfd_status > WIFI_DIRECT_STATE_CONNECTING)
- service_add_extra_data(service, "Connection", "TRUE");
- else
- service_add_extra_data(service, "Connection", "FALSE");
+ if (ugd->wfd_status <= WIFI_DIRECT_STATE_DEACTIVATING) {
+ DBG(LOG_INFO, "WiFi direct is already deactivated\n");
+ goto cleanup;
+ }
- ug_send_result(ugd->ug, service);
- service_destroy(service);
-#endif
- ug_destroy_me(ugd->ug);
+ if (NULL != ugd->mac_addr_connecting) {
+ if (ugd->is_conn_incoming) {
+ DBG(LOG_INFO, "Reject the incoming connection before client deregister \n");
+ ret = wifi_direct_reject_connection(ugd->mac_addr_connecting);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to send reject request [%d]\n", ret);
+ }
+ } else {
+ DBG(LOG_INFO, "Cancel the outgoing connection before client deregister \n");
+ ret = wifi_direct_cancel_connection(ugd->mac_addr_connecting);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed to send cancel request [%d]\n", ret);
+ }
+ }
+ ugd->mac_addr_connecting = NULL;
+ }
- __FUNC_EXIT__;
- return;
+ if (ugd->raw_connected_peer_cnt == 0) {
+ ret = wifi_direct_is_group_owner(&owner);
+ if (ret == WIFI_DIRECT_ERROR_NONE) {
+ if (owner) {
+ wifi_direct_destroy_group();
+ }
+ }
+ }
+
+cleanup:
+ wfd_ug_view_free_peers(ugd);
+ ret = app_control_create(&control);
+ if (ret) {
+ DBG(LOG_ERROR, "Failed to create control");
+ } else {
+ if (ugd->wfd_status > WIFI_DIRECT_STATE_CONNECTING) {
+ app_control_add_extra_data(control, "Connection", "TRUE");
+ } else {
+ app_control_add_extra_data(control, "Connection", "FALSE");
+ }
+
+ ug_send_result(ugd->ug, control);
+ app_control_destroy(control);
+ }
+
+ ug_destroy_me(ugd->ug);
+ __FUNC_EXIT__;
+ return FALSE;
}
-void _scan_btn_cb(void *data, Evas_Object * obj, void *event_info)
+void wfd_cancel_progressbar_stop_timer(struct ug_data *ugd)
{
- __FUNC_ENTER__;
+ __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- Elm_Object_Item *btn = event_info;
- char *btn_text = NULL;
+ if(ugd->timer_stop_progress_bar > 0) {
+ g_source_remove(ugd->timer_stop_progress_bar);
+ }
+ ugd->timer_stop_progress_bar = 0;
- if (NULL == ugd || NULL == btn) {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return;
- }
+ __FUNC_EXIT__;
+}
- btn_text = elm_object_item_text_get(btn);
- if (0 == strcmp(btn_text, _("IDS_WFD_BUTTON_SCAN"))) {
- wfd_refresh_wifi_direct_state(ugd);
- DBG(LOG_VERBOSE, "Start discovery again, status: %d\n", ugd->wfd_status);
+void wfd_cancel_not_alive_delete_timer(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
- /* if connected, show the popup*/
- if (ugd->wfd_status >= WIFI_DIRECT_STATE_CONNECTED) {
- wfd_ug_act_popup(ugd, IDS_WFD_POP_SCAN_AGAIN, POP_TYPE_SCAN_AGAIN);
- } else if (WIFI_DIRECT_STATE_ACTIVATED == ugd->wfd_status) {
- wfd_client_start_discovery(ugd);
- } else if (WIFI_DIRECT_STATE_DEACTIVATED == ugd->wfd_status) {
- _wfd_onoff_btn_cb(ugd, NULL, NULL);
- __FUNC_EXIT__;
- return;
+ if(ugd->timer_delete_not_alive_peer > 0) {
+ g_source_remove(ugd->timer_delete_not_alive_peer);
}
+ ugd->timer_delete_not_alive_peer = 0;
+
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug call it when click failed devices item
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _gl_failed_peer_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
- if (ugd->scan_btn) {
- wfd_ug_view_refresh_button(ugd->scan_btn, _("IDS_WFD_BUTTON_STOPSCAN"), TRUE);
+ struct ug_data *ugd = wfd_get_ug_data();
+ int ret = -1;
+
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
}
- if (ugd->multi_scan_btn) {
- wfd_ug_view_refresh_button(ugd->multi_scan_btn, _("IDS_WFD_BUTTON_STOPSCAN"), TRUE);
+ if (ugd->display_timer != NULL) {
+ ecore_timer_del(ugd->display_timer);
+ ugd->display_timer = NULL;
}
- } else if (0 == strcmp(btn_text, _("IDS_WFD_BUTTON_STOPSCAN"))) {
- DBG(LOG_VERBOSE, "Stop discoverying.\n");
- ugd->wfd_status = WIFI_DIRECT_STATE_ACTIVATED;
+
wfd_refresh_wifi_direct_state(ugd);
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- wfd_ug_view_refresh_glitem(ugd->head);
- wifi_direct_cancel_discovery();
- }
+ DBG(LOG_INFO, "Start discovery again, status: %d\n", ugd->wfd_status);
+
+ /* if connected, show the popup*/
+ if (ugd->wfd_status >= WIFI_DIRECT_STATE_CONNECTED) {
+ wfd_ug_act_popup(ugd, _("IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"), POP_TYPE_SCAN_AGAIN);
+ } else {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ ret = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", ret);
+ wifi_direct_cancel_discovery();
+ }
+ }
- __FUNC_EXIT__;
- return;
+ __FUNC_EXIT__;
+ return;
}
-Eina_Bool _is_wifi_on()
+/**
+ * This function let the ug call it when click 'scan' button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _scan_btn_cb(void *data, Evas_Object *obj, void *event_info)
{
- __FUNC_ENTER__;
- int wifi_state;
-
- vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
-
- if (wifi_state >= VCONFKEY_WIFI_CONNECTED)
- {
- return TRUE;
- }
- else
- {
- return FALSE;
- }
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd = (struct ug_data *) data;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
+ }
+ int ret = -1;
+ const char *btn_text = NULL;
+ btn_text = elm_object_part_text_get(ugd->scan_toolbar, "default");
+ WFD_RET_IF(btn_text == NULL, "The btn_text is NULL\n");
+ DBG(LOG_INFO, "Button text=%s",btn_text);
+
+ if (!g_strcmp0(elm_object_text_get(obj), _("IDS_WIFI_SK4_SCAN"))) {
+ wfd_refresh_wifi_direct_state(ugd);
+ DBG(LOG_INFO, "Start discovery again, status: %d\n", ugd->wfd_status);
+ /* if connected, show the popup*/
+ if (ugd->wfd_status >= WIFI_DIRECT_STATE_CONNECTED || ugd->raw_connected_peer_cnt > 0) {
+ wfd_ug_act_popup(ugd, _("IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"), POP_TYPE_SCAN_AGAIN);
+ } else if (WIFI_DIRECT_STATE_DEACTIVATED == ugd->wfd_status) {
+ wfd_client_switch_on(ugd);
+ __FUNC_EXIT__;
+ return;
+ } else {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ ret = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", ret);
+ wifi_direct_cancel_discovery();
+ }
+ }
+ } else if (!g_strcmp0(elm_object_text_get(obj), _("IDS_WIFI_SK_STOP"))) {
+ DBG(LOG_INFO, "Stop pressed.\n");
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_STOPPED;
+ wfd_cancel_progressbar_stop_timer(ugd);
+ wfd_delete_progressbar_cb(ugd);
+ wfd_cancel_not_alive_delete_timer(ugd);
+ } else if (0 == strcmp(_("IDS_WIFI_SK2_CANCEL_CONNECTION"), btn_text)) {
+ DBG(LOG_INFO, "Cancel Connection");
+ wfd_ug_act_popup(ugd, _("IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"), POP_TYPE_CANCEL_CONNECT);
+ } else {
+ DBG(LOG_INFO, "Invalid Case\n");
+ }
+ __FUNC_EXIT__;
+ return;
}
-void _wfd_onoff_btn_cb(void *data, Evas_Object *obj, void *event_info)
+void wfd_check_gl_busy_peers(struct ug_data *ugd)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
-
- wfd_refresh_wifi_direct_state(ugd);
-
- if(!ugd->wfd_onoff)
- {
- if(ugd->wfd_status < 0)
- {
- DBG(LOG_VERBOSE, "bad wfd status\n");
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_ACTIVATE_FAIL"), POPUP_TYPE_TERMINATE);
-
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- wfd_ug_view_refresh_glitem(ugd->head);
- return;
- }
- DBG(LOG_VERBOSE, "wifi-direct switch on\n");
- ugd->head_text_mode = HEAD_TEXT_TYPE_ACTIVATING;
- wfd_client_switch_on(ugd);
- }
- else
- {
- if(ugd->wfd_status < 0)
- {
- DBG(LOG_VERBOSE, "bad wfd status\n");
- wfd_ug_warn_popup(ugd, _("IDS_WFD_POP_DEACTIVATE_FAIL"), POPUP_TYPE_TERMINATE);
-
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- wfd_ug_view_refresh_glitem(ugd->head);
- return;
- }
- DBG(LOG_VERBOSE, "wifi-direct switch off\n");
- ugd->head_text_mode = HEAD_TEXT_TYPE_DEACTIVATING;
- wfd_client_switch_off(ugd);
- }
-
- wfd_ug_view_refresh_glitem(ugd->head);
-
- if (ugd->scan_btn) {
- wfd_ug_view_refresh_button(ugd->scan_btn, _("IDS_WFD_BUTTON_SCAN"), FALSE);
- }
-
- if (ugd->multi_scan_btn) {
- wfd_ug_view_refresh_button(ugd->multi_scan_btn, _("IDS_WFD_BUTTON_SCAN"), FALSE);
- }
-
-
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+ if (ugd->gl_busy_peer_cnt == 0) {
+ WFD_IF_DEL_ITEM(ugd->busy_wfd_item);
+ }
+ __FUNC_EXIT__;
}
-
-static void _gl_header_sel(void *data, Evas_Object *obj, void *event_info)
+void wfd_check_gl_available_peers(struct ug_data *ugd)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- Elm_Object_Item *item = (Elm_Object_Item *)event_info;
+ __FUNC_ENTER__;
+ if (ugd->gl_available_peer_cnt == 0 && ugd->avlbl_wfd_item != NULL) {
+ WFD_IF_DEL_ITEM(ugd->avlbl_wfd_item);
+ }
+ __FUNC_EXIT__;
+}
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return;
- }
+/**
+ * This function let the ug free some peer in genlist
+ * @return void
+ * @param[in] start_pos the start position of peers list
+ * @param[in] mac_addr the mac_addr of peer for free
+ * @param[in] cnt the count of gl peers in list
+ */
+void free_gl_peer(device_type_s **start_pos, const char *mac_addr, int *cnt)
+{
+ __FUNC_ENTER__;
+ device_type_s *peer = *start_pos;
+ device_type_s *peer_tmp = peer;
- if(item != NULL)
- elm_genlist_item_selected_set(item, EINA_FALSE);
+ if (peer == NULL) {
+ DBG(LOG_INFO, "no peer in genlist");
+ return;
+ }
- _wfd_onoff_btn_cb(ugd, NULL, NULL);
+ while (peer) {
+ if(strcmp(peer->mac_addr, mac_addr)) {
+ peer_tmp = peer;
+ peer = peer->next;
+ } else {
+ if(peer->next != NULL) {
+ peer_tmp->next = peer->next;
+ break;
+ } else {
+ peer_tmp->next = NULL;
+ break;
+ }
+ }
+ }
- __FUNC_EXIT__;
-}
+ if (peer == *start_pos) {
+ DBG(LOG_INFO, "the head is free");
+ *start_pos = peer->next;
+ }
-#if 0
-static Evas_Object *_gl_noitem_icon_get(void *data, Evas_Object * obj,
- const char *part)
-{
- __FUNC_ENTER__;
- Evas_Object *nocontent;
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return NULL;
- }
-
-#if 1 // use nocontent
- nocontent = elm_layout_add(obj);
- if(nocontent == NULL)
- {
- DBG(LOG_ERROR, "Failed to add nocontent");
- return NULL;
- }
- elm_layout_theme_set(nocontent, "layout", "nocontents", "unnamed");
- elm_object_part_text_set(nocontent, "elm.text", _("IDS_WFD_BODY_NO_DEVICES"));
- evas_object_size_hint_min_set(nocontent, 400, 200);
- evas_object_size_hint_max_set(nocontent, 400, 200);
- evas_object_resize(nocontent, 400, 200);
-
- __FUNC_EXIT__;
-
- return nocontent;
-#else // use image
- Evas_Object *icon;
- icon = elm_icon_add(obj);
- elm_icon_file_set(icon, "/opt/ug/res/images/ug-wifi-direct/A09_NoDevice.png", NULL);
- evas_object_size_hint_min_set(icon, 400, 200);
- evas_object_size_hint_max_set(icon, 400, 200);
- evas_object_resize(icon, 400, 200);
-
- return icon;
-#endif
+ (*cnt)--;
+ if (peer) {
+ WFD_IF_DEL_ITEM(peer->gl_item);
+ peer->next = NULL;
+ free(peer);
+ }
+ __FUNC_EXIT__;
}
-#endif
+/**
+ * This function let the ug call it when click avaliable peer to connect
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
static void _gl_peer_sel(void *data, Evas_Object *obj, void *event_info)
{
- __FUNC_ENTER__;
- assertm_if(NULL == obj, "NULL!!");
- assertm_if(NULL == data, "NULL!!");
- device_type_s *peer = (device_type_s*) data;
- Elm_Object_Item *item = (Elm_Object_Item *)event_info;
- struct ug_data* ugd = wfd_get_ug_data();
- int res;
-
- if(data == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return;
- }
-
- if(item != NULL)
- elm_genlist_item_selected_set(item, EINA_FALSE);
-
- if(peer->conn_status == PEER_CONN_STATUS_DISCONNECTED)
- {
-#if 0 // for new connection during link_status is CONNECTING
- wfd_refresh_wifi_direct_state(ugd);
- if(ugd->wfd_status == WFD_LINK_STATUS_CONNECTING)
- {
- res = wfd_client_disconnect(NULL);
- if(res != 0)
- {
- DBG(LOG_ERROR, "Failed to send disconnection request. [%d]\n", res);
- return;
- }
- }
-#endif
- DBG(LOG_VERBOSE, "Connect with peer [%s]\n", peer->mac_addr);
- res = wfd_client_connect((const char*) peer->mac_addr);
- if(res != 0)
- {
- DBG(LOG_ERROR, "Failed to send connection request. [%d]\n", res);
- return;
- }
- peer->conn_status = PEER_CONN_STATUS_CONNECTING;
- }
- else // PEER_CONN_STATUS_CONNECTED or PEER_CONN_STATUS_CONNECTING)
- {
- res = wfd_client_disconnect((const char*) peer->mac_addr);
- if(res != 0)
- {
- DBG(LOG_ERROR, "Failed to send disconnection request. [%d]\n", res);
- return;
- }
- peer->conn_status = PEER_CONN_STATUS_DISCONNECTED;
- }
-
- wfd_ug_view_refresh_glitem(peer->gl_item);
- wfd_ug_view_refresh_glitem(ugd->multi_button_item);
-
- __FUNC_EXIT__;
- return;
+ __FUNC_ENTER__;
+
+ int res = -1;
+ char txt[MAX_POPUP_TEXT_SIZE] = {0,};
+ char popup_text[MAX_POPUP_TEXT_SIZE] = {0, };
+ bool is_peer_alive = false;
+ struct ug_data *ugd = wfd_get_ug_data();
+ device_type_s *peer = (device_type_s *)data;
+ Elm_Object_Item *item = (Elm_Object_Item *)event_info;
+
+ if (!ugd || !peer) {
+ DBG(LOG_ERROR, "NULL parameters.\n");
+ return;
+ }
+
+ wfd_ug_get_connected_peers(ugd);
+ DBG(LOG_INFO, "No of connected peers= %d",ugd->raw_connected_peer_cnt);
+
+ if (ugd->raw_connected_peer_cnt >= MAX_CONNECTED_PEER_NUM) {
+ snprintf(popup_text, MAX_POPUP_TEXT_SIZE, _("IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"), MAX_CONNECTED_PEER_NUM);
+ wfd_ug_warn_popup(ugd, popup_text, POP_TYPE_MULTI_CONNECT_POPUP);
+ if (item) {
+ elm_genlist_item_selected_set(item, EINA_FALSE);
+ }
+ return;
+ }
+
+ if (ugd->disconnect_btn) {
+ Evas_Object *content;
+ content = elm_object_part_content_unset(ugd->layout, "button.next");
+ WFD_IF_DEL_OBJ(content);
+ ugd->disconnect_btn = NULL;
+ elm_object_part_content_set(ugd->layout, "button.big",
+ ugd->scan_toolbar);
+ }
+
+ if (item) {
+ elm_genlist_item_selected_set(item, EINA_FALSE);
+ }
+
+ GList *iterator = NULL;
+
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ if (!strncmp(peer->mac_addr, (const char *)((device_type_s *)iterator->data)->mac_addr, MAC_LENGTH)) {
+ /* peer is found in last discovery */
+ is_peer_alive = true;
+ break;
+ }
+ }
+
+ if (!is_peer_alive) {
+ /* peer exists only in genlist, waiting to be deleted */
+ device_type_s *peer_start = ugd->gl_avlb_peers_start;
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ if(!strncmp(peer_start->mac_addr, peer->mac_addr, MAC_LENGTH)) {
+ DBG(LOG_INFO, "Device [%s] found in genlist, but it is already lost", ((device_type_s *)iterator->data)->ssid);
+ sprintf(txt, "Cannot find device %s", ((device_type_s *)iterator->data)->ssid);
+ free_gl_peer(&ugd->gl_avlb_peers_start, ((device_type_s *)iterator->data)->mac_addr, &ugd->gl_available_peer_cnt);
+ wfd_check_gl_available_peers(ugd);
+ wfd_ug_warn_popup(ugd, txt, POPUP_TYPE_INFO);
+ return;
+ }
+ }
+ }
+
+ wfd_cancel_not_alive_delete_timer(ugd);
+
+ /* get WFD status */
+ wfd_refresh_wifi_direct_state(ugd);
+
+ if (PEER_CONN_STATUS_DISCONNECTED == peer->conn_status ||
+ peer->is_group_owner == TRUE) {
+ DBG_SECURE(LOG_DEBUG, "Connect with peer ["MACSECSTR"]\n",
+ MAC2SECSTR(peer->mac_addr));
+
+ if (WIFI_DIRECT_STATE_CONNECTING == ugd->wfd_status) {
+ DBG(LOG_DEBUG, "It's in connecting status now.\n");
+ return;
+ }
+
+ ugd->mac_addr_connecting = peer->mac_addr;
+ res = wfd_client_connect((const char *)peer->mac_addr);
+ if (res != 0) {
+ DBG(LOG_ERROR, "Failed to send connection request. [%d]\n", res);
+ return;
+ }
+ }
+
+ __FUNC_EXIT__;
+ return;
}
+/**
+ * This function let the ug call it when click busy peer
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
static void _gl_busy_peer_sel(void *data, Evas_Object *obj, void *event_info)
{
- __FUNC_ENTER__;
-
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)wfd_get_ug_data();
+ Elm_Object_Item *item = (Elm_Object_Item *)event_info;
- elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+ if (item) {
+ elm_genlist_item_selected_set(item, EINA_FALSE);
+ }
- DBG(LOG_VERBOSE, "Busy device is clicked");
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Data is NULL\n");
+ return;
+ }
- wfd_ug_warn_popup(ugd, IDS_WFD_POP_WARN_BUSY_DEVICE, POP_TYPE_BUSY_DEVICE_POPUP);
+ wfd_ug_warn_popup(ugd, _("IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE"), POP_TYPE_BUSY_DEVICE_POPUP);
- __FUNC_EXIT__;
+ __FUNC_EXIT__;
}
-static void _gl_about_wifi_sel(void *data, Evas_Object *obj, void *event_info)
+void ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void *event_info)
{
- struct ug_data *ugd = (struct ug_data*) data;
+ struct ug_data *ugd = (struct ug_data *) data;
- DBG(LOG_VERBOSE, "About wifi clicked");
+ if (!ugd) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return;
+ }
- _wifid_create_about_view(ugd);
- elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+ if (ugd->ctxpopup) {
+ evas_object_del(ugd->ctxpopup);
+ ugd->ctxpopup = NULL;
+ }
}
-void _wifid_create_multibutton_cb(void *data, Evas_Object * obj, void *event_info)
+void _ctxpopup_move()
{
- struct ug_data *ugd = (struct ug_data*) data;
- const char *text_lbl = NULL;
-
- text_lbl = elm_object_text_get(ugd->multi_btn);
- DBG(LOG_VERBOSE, "text_lbl = %s", text_lbl);
-
- if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS)
- {
- ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_NONE;
- if (0 == strcmp(_("IDS_WFD_BUTTON_CANCEL"), text_lbl))
- {
- wfd_ug_act_popup(ugd, _("IDS_WFD_POP_CANCEL_CONNECT"), POP_TYPE_DISCONNECT_ALL);
- }
- else
- {
- DBG(LOG_VERBOSE, "Invalid Case\n");
- }
- }
- else
- {
- if (0 == strcmp(_("IDS_WFD_BUTTON_MULTI"), text_lbl))
- {
- _wifid_create_multiconnect_view(ugd);
- }
- else if (0 == strcmp(_("IDS_WFD_BUTTON_CANCEL"), text_lbl))
- {
- wfd_ug_act_popup(ugd, _("IDS_WFD_POP_CANCEL_CONNECT"), POP_TYPE_DISCONNECT_ALL);
- }
- else if (0 == strcmp(_("IDS_WFD_BUTTON_DISCONNECT_ALL"), text_lbl))
- {
- wfd_ug_act_popup(ugd, _("IDS_WFD_POP_DISCONNECT"), POP_TYPE_DISCONNECT_ALL);
- }
- else if (0 == strcmp(_("IDS_WFD_BUTTON_DISCONNECT"), text_lbl))
- {
- wfd_ug_act_popup(ugd, _("IDS_WFD_POP_DISCONNECT"), POP_TYPE_DISCONNECT);
- }
- else
- {
- DBG(LOG_VERBOSE, "Invalid Case\n");
- }
- }
+ __FUNC_ENTER__;
+
+ int win_w = 0, win_h = 0;
+ int move_x = 0, move_y = 0;
+ int changed_ang = 0;
+ struct ug_data *ugd = wfd_get_ug_data();
+
+ if (!ugd || !ugd->win) {
+ DBG(LOG_ERROR, "NULL parameters.\n");
+ return;
+ }
+
+ if (!ugd->ctxpopup) {
+ DBG(LOG_INFO, "NULL parameters.\n");
+ return;
+ }
+
+ elm_win_screen_size_get(ugd->win, NULL, NULL, &win_w, &win_h);
+ changed_ang = elm_win_rotation_get(ugd->win);
+
+ switch (changed_ang) {
+ case 0:
+ case 180:
+ move_x = win_w/2;
+ move_y = win_h;
+ break;
+
+ case 90:
+ move_x = win_h/2;
+ move_y = win_w;
+ break;
+
+ case 270:
+ move_x = win_h/2;
+ move_y = win_w;
+ break;
+
+ default:
+ move_x = 0;
+ move_y = 0;
+ break;
+ }
+
+ evas_object_move(ugd->ctxpopup, move_x, move_y);
+
+ __FUNC_EXIT__;
}
+void _create_mluti_connect_view(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ WFD_RET_IF(ugd == NULL, "The param is NULL\n");
+ WFD_IF_DEL_OBJ(ugd->ctxpopup);
+ int ret = 0;
+
+ wfd_client_free_raw_discovered_peers(ugd);
+ ugd->raw_discovered_peer_cnt = 0;
+ wfd_create_multiconnect_view(ugd);
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ ret = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", ret);
+ wifi_direct_cancel_discovery();
+ }
-int _change_multi_button_title(void *data)
+ __FUNC_EXIT__;
+}
+
+void _more_button_cb(void *data, Evas_Object *obj, void *event_info)
{
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+
+ Evas_Object *naviframe = (Evas_Object *)data;
+ Elm_Object_Item *multi_connect_item = NULL;
+ Elm_Object_Item *rename_item = NULL;
+ struct ug_data *ugd = wfd_get_ug_data();
+
+ if (!naviframe || !ugd) {
+ DBG(LOG_ERROR, "NULL parameters.\n");
+ return;
+ }
+
+ ugd->more_btn_multiconnect_item = NULL;
+
+ if (ugd->ctxpopup) {
+ evas_object_del(ugd->ctxpopup);
+ }
- if(ugd->multi_button_item == NULL) /*Needs to be check as the peer count is not getting updated*/
- {
- return -1;
- }
+ ugd->ctxpopup = elm_ctxpopup_add(naviframe);
+ elm_object_style_set(ugd->ctxpopup, "more/default");
+ ea_object_event_callback_add(ugd->ctxpopup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb, NULL);
+ ea_object_event_callback_add(ugd->ctxpopup, EA_CALLBACK_MORE, ea_ctxpopup_back_cb, NULL);
+ evas_object_smart_callback_add(ugd->ctxpopup, "dismissed", ctxpopup_dismissed_cb, ugd);
+ elm_ctxpopup_auto_hide_disabled_set(ugd->ctxpopup, EINA_TRUE);
+
+ elm_ctxpopup_direction_priority_set(ugd->ctxpopup, ELM_CTXPOPUP_DIRECTION_UP,
+ ELM_CTXPOPUP_DIRECTION_LEFT,
+ ELM_CTXPOPUP_DIRECTION_RIGHT,
+ ELM_CTXPOPUP_DIRECTION_DOWN);
+
+ _ctxpopup_move();
+
+ multi_connect_item = elm_ctxpopup_item_append(ugd->ctxpopup, "IDS_WIFI_BUTTON_MULTI_CONNECT", NULL, _create_mluti_connect_view, ugd);
+ elm_object_item_domain_text_translatable_set(multi_connect_item, PACKAGE, EINA_TRUE);
+ ugd->more_btn_multiconnect_item = multi_connect_item;
wfd_refresh_wifi_direct_state(ugd);
- if (ugd->wfd_status == WFD_LINK_STATUS_CONNECTING)
- {
- //if (conn_prog_count > 0)
- elm_object_text_set(ugd->multi_btn, _("IDS_WFD_BUTTON_CANCEL"));
+ if (WIFI_DIRECT_STATE_CONNECTING == ugd->wfd_status ||
+ WIFI_DIRECT_STATE_CONNECTED == ugd->wfd_status ||
+ WIFI_DIRECT_STATE_DEACTIVATED == ugd->wfd_status ||
+ ugd->raw_connected_peer_cnt > 0) {
+ elm_object_item_disabled_set(multi_connect_item, TRUE);
+ }
+
+ rename_item = elm_ctxpopup_item_append(ugd->ctxpopup, "IDS_ST_BODY_RENAME_DEVICE_ABB", NULL, _gl_rename_device_sel, ugd);
+ elm_object_item_domain_text_translatable_set(rename_item, PACKAGE, EINA_TRUE);
+ evas_object_show(ugd->ctxpopup);
+
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function make items into group
+*/
+void _wfd_realize_item(Elm_Object_Item *pre_item, int count)
+{
+ __FUNC_ENTER__;
+ int i = 0;
+ if (count < 1 || pre_item == NULL) {
+ return;
+ }
+
+ Elm_Object_Item *item = elm_genlist_item_next_get(pre_item);
+ if (item == NULL) {
+ return;
+ }
+
+ if (count == 1) {
+ elm_object_item_signal_emit(item, "elm,state,normal", "");
+ return;
}
- else if (ugd->wfd_status > WFD_LINK_STATUS_CONNECTING)
- {
- if (ugd->gl_connected_peer_cnt > 1)
- elm_object_text_set(ugd->multi_btn, _("IDS_WFD_BUTTON_DISCONNECT_ALL"));
- else
- elm_object_text_set(ugd->multi_btn, _("IDS_WFD_BUTTON_DISCONNECT"));
+
+ for (i = 0; i < count; i++) {
+ if (i == 0) {
+ elm_object_item_signal_emit(item, "elm,state,top", "");
+ } else if (i == count - 1) {
+ elm_object_item_signal_emit(item, "elm,state,bottom", "");
+ } else {
+ elm_object_item_signal_emit(item, "elm,state,center", "");
+ }
+
+ item = elm_genlist_item_next_get(item);
+ }
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug call it when unresized event is received
+*/
+static void _gl_unrealized(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+
+ _wfd_realize_item(ugd->avlbl_wfd_item, ugd->gl_available_peer_cnt);
+ _wfd_realize_item(ugd->conn_wfd_item, ugd->gl_connected_peer_cnt);
+ _wfd_realize_item(ugd->multi_connect_wfd_item, ugd->gl_multi_connect_peer_cnt);
+ _wfd_realize_item(ugd->busy_wfd_item, ugd->gl_busy_peer_cnt);
+ _wfd_realize_item(ugd->conn_failed_wfd_item, ugd->gl_connected_failed_peer_cnt);
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug call it when resized event is received
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _gl_realized(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+
+ if (!data || !event_info) {
+ DBG(LOG_ERROR, "Invalid parameters");
+ return;
}
- else
- {
- elm_object_text_set(ugd->multi_btn, _("IDS_WFD_BUTTON_MULTI"));
+
+ struct ug_data *ugd = (struct ug_data *)data;
+#ifdef ACCESSIBILITY_FEATURE
+ Elm_Object_Item *item = (Elm_Object_Item *)event_info;
+ int index = elm_genlist_item_index_get(item);
+ char *sr_msg = NULL;
+#endif
+
+ _wfd_realize_item(ugd->avlbl_wfd_item, ugd->gl_available_peer_cnt);
+ _wfd_realize_item(ugd->conn_wfd_item, ugd->gl_connected_peer_cnt);
+ _wfd_realize_item(ugd->multi_connect_wfd_item, ugd->gl_multi_connect_peer_cnt);
+ _wfd_realize_item(ugd->busy_wfd_item, ugd->gl_busy_peer_cnt);
+ _wfd_realize_item(ugd->conn_failed_wfd_item, ugd->gl_connected_failed_peer_cnt);
+
+#ifdef ACCESSIBILITY_FEATURE
+ /* screen reader */
+ if (GENLIST_HEADER_POS == index && item != NULL) {
+ Evas_Object *check = elm_object_item_part_content_get(item, "elm.icon");
+ if (check) {
+ Eina_Bool state = elm_check_state_get(check);
+ if (state) {
+ sr_msg = strdup(SR_CHECKBOX_ON_MSG);
+ } else {
+ sr_msg = strdup(SR_CHECKBOX_OFF_MSG);
+ }
+
+ if (sr_msg) {
+ Evas_Object *ao = NULL;
+ ao = elm_object_item_access_object_get(item);
+ elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, sr_msg);
+ free(sr_msg);
+ } else {
+ DBG(LOG_ERROR, "index = %d, screen reader message create fail!", index);
+ }
+ } else {
+ DBG(LOG_ERROR, "index = %d, get check box fail!", index);
+ }
}
+#endif
+
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug call it when click 'disconnect' button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _wfd_ug_disconnect_button_cb(void *data, Evas_Object * obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
- evas_object_show(ugd->multi_btn);
+ wfd_ug_act_popup(ugd, _("IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q"), POP_TYPE_DISCONNECT);
- return 0;
+ __FUNC_EXIT__;
}
+/**
+ * This function let the ug call it when click "cancel connection" button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _wfd_ug_cancel_connection_button_cb(void *data, Evas_Object * obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
-void wfd_ug_view_refresh_glitem(void *obj)
+ wfd_ug_act_popup(ugd, _("IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED"), POP_TYPE_CANCEL_CONNECT);
+
+ __FUNC_EXIT__;
+}
+
+
+/**
+ * This function let the ug update the genlist item
+ * @return void
+ * @param[in] gl_item the pointer to genlist item
+ */
+void wfd_ug_view_refresh_glitem(Elm_Object_Item *gl_item)
{
- __FUNC_ENTER__;
- elm_genlist_item_update(obj);
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+ if (gl_item != NULL) {
+ elm_genlist_item_update(gl_item);
+ }
+ __FUNC_EXIT__;
}
-void wfd_ug_view_refresh_button(void *obj, const char *text, int enable)
+/**
+ * This function let the ug refresh the attributes of button
+ * @return void
+ * @param[in] tb_item the pointer to the toolbar button
+ * @param[in] text the pointer to the text of button
+ * @param[in] enable whether the button is disabled
+ */
+void wfd_ug_view_refresh_button(Evas_Object *tb_item, const char *text,
+ int enable)
{
__FUNC_ENTER__;
- if (NULL == obj || NULL == text) {
+ if (NULL == tb_item || NULL == text) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
return;
}
- DBG(LOG_VERBOSE, "Set the attributes of button: text[%s], enabled[%d]\n", text, enable);
- elm_object_item_text_set(obj, text);
- elm_object_item_disabled_set(obj, !enable);
+ DBG(LOG_INFO, "Set the attributes of button: text[%s], enabled[%d]\n", text, enable);
+ elm_object_domain_translatable_part_text_set(tb_item, "default",
+ PACKAGE, text);
+ elm_object_disabled_set(tb_item, !enable);
__FUNC_EXIT__;
}
+/**
+ * This function let the ug know whether current device is connected by me
+ * @return If connected, return TRUE, else return FALSE
+ * @param[in] ugd the pointer to the main data structure
+ * @param[in] dev the pointer to the device
+ */
static bool __wfd_is_device_connected_with_me(struct ug_data *ugd, device_type_s *dev)
{
- int i;
+ __FUNC_ENTER__;
+ int i = 0;
- for(i=0; i<ugd->raw_connected_peer_cnt; i++)
- {
- if (strncmp(ugd->raw_connected_peers[i].mac_addr, dev->mac_addr, strlen(ugd->raw_connected_peers[i].mac_addr)) == 0)
+ for (i = 0; i < ugd->raw_connected_peer_cnt; i++) {
+ if (strncmp(ugd->raw_connected_peers[i].mac_addr,
+ dev->mac_addr, strlen(ugd->raw_connected_peers[i].mac_addr)) == 0) {
return TRUE;
+ }
}
+
+ __FUNC_EXIT__;
return FALSE;
}
+/**
+ * This function let the ug know whether current device is connected by other peer
+ * @return If connected, return TRUE, else return FALSE
+ * @param[in] ugd the pointer to the main data structure
+ * @param[in] dev the pointer to the device
+ */
static bool __wfd_is_device_busy(struct ug_data *ugd, device_type_s *dev)
{
- if (__wfd_is_device_connected_with_me(ugd, dev) == TRUE)
- return FALSE;
+ __FUNC_ENTER__;
- if (ugd->I_am_group_owner == TRUE)
- {
- if (dev->is_connected || dev->is_group_owner)
+ if (ugd->I_am_group_owner == TRUE) {
+ if (dev->is_connected || dev->is_group_owner) {
return TRUE;
- else
+ } else {
return FALSE;
- }
- else
- {
- if (dev->is_connected == TRUE && dev->is_group_owner == TRUE)
+ }
+ } else {
+ if (dev->is_connected == TRUE && dev->is_group_owner == TRUE) {
return FALSE;
- if (dev->is_connected == TRUE && dev->is_group_owner == FALSE)
+ }
+
+ if (dev->is_connected == TRUE && dev->is_group_owner == FALSE) {
return TRUE;
- if (dev->is_connected == FALSE)
+ }
+
+ if (dev->is_connected == FALSE) {
return FALSE;
+ }
}
+ __FUNC_EXIT__;
return FALSE;
}
+/**
+ * This function let the ug calculate how many devices are avaliable
+ * @return TRUE
+ * @param[in] ugd the pointer to the main data structure
+ * @param[in] dev the pointer to the number of avaliable devices
+ */
static bool __wfd_is_any_device_available(struct ug_data *ugd, int* no_of_available_dev)
{
- int i =0 ;
- for (i = 0; i < ugd->raw_discovered_peer_cnt; i++)
- {
- if (!__wfd_is_device_busy(ugd, &ugd->raw_discovered_peers[i]) &&
- ugd->raw_discovered_peers[i].conn_status == PEER_CONN_STATUS_DISCONNECTED)
- (*no_of_available_dev)++;
- }
- return TRUE;
+ __FUNC_ENTER__;
+ GList *iterator = NULL;
+
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ /* Not include the device which is connected with me */
+ if (__wfd_is_device_connected_with_me(ugd, (device_type_s *)iterator->data)) {
+ continue;
+ }
+ if (!__wfd_is_device_busy(ugd, (device_type_s *)iterator->data) &&
+ ((device_type_s *)iterator->data)->conn_status != PEER_CONN_STATUS_FAILED_TO_CONNECT) {
+ (*no_of_available_dev)++;
+ }
+ }
+
+ __FUNC_EXIT__;
+ return TRUE;
}
+/**
+ * This function let the ug calculate how many devices are busy
+ * @return TRUE
+ * @param[in] ugd the pointer to the main data structure
+ * @param[in] dev the pointer to the number of busy devices
+ */
static bool __wfd_is_any_device_busy(struct ug_data *ugd, int* no_of_busy_dev)
{
- int i =0 ;
- for (i = 0; i < ugd->raw_discovered_peer_cnt; i++)
- {
- if (__wfd_is_device_busy(ugd, &ugd->raw_discovered_peers[i]))
- (*no_of_busy_dev)++;
- }
- return TRUE;
+ __FUNC_ENTER__;
+ GList *iterator = NULL;
+
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ /* Not include the device which is connected with me */
+ if (__wfd_is_device_connected_with_me(ugd, (device_type_s *)iterator->data)) {
+ continue;
+ }
+ if (__wfd_is_device_busy(ugd, (device_type_s *)iterator->data)) {
+ (*no_of_busy_dev)++;
+ }
+ }
+
+ __FUNC_EXIT__;
+ return TRUE;
}
+/**
+ * This function let the ug calculate how many devices are connected failed
+ * @return TRUE
+ * @param[in] ugd the pointer to the main data structure
+ * @param[in] dev the pointer to the number of connected failed devices
+ */
static bool __wfd_is_any_device_connect_failed(struct ug_data *ugd, int* no_of_connect_failed_dev)
{
- int i =0 ;
- for (i = 0; i < ugd->raw_discovered_peer_cnt; i++)
- {
- if (!__wfd_is_device_busy(ugd, &ugd->raw_discovered_peers[i]) &&
- ugd->raw_discovered_peers[i].conn_status == PEER_CONN_STATUS_FAILED_TO_CONNECT)
- (*no_of_connect_failed_dev)++;
-
- }
- return TRUE;
+ __FUNC_ENTER__;
+ GList *iterator = NULL;
+
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ /* Not include the device which is connected with me */
+ if (__wfd_is_device_connected_with_me(ugd, (device_type_s *)iterator->data)) {
+ continue;
+ }
+ if (!__wfd_is_device_busy(ugd, (device_type_s *)iterator->data) &&
+ ((device_type_s *)iterator->data)->conn_status == PEER_CONN_STATUS_FAILED_TO_CONNECT) {
+ (*no_of_connect_failed_dev)++;
+ }
+ }
+
+ __FUNC_EXIT__;
+ return TRUE;
}
+/**
+ * This function let the ug create the main genlist
+ * @return the main genlist
+ * @param[in] data the pointer to the main data structure
+ */
static Evas_Object *_create_basic_genlist(void *data)
{
__FUNC_ENTER__;
-
- struct ug_data *ugd = (struct ug_data*) data;
+ struct ug_data *ugd = (struct ug_data *) data;
Evas_Object *genlist;
- Elm_Object_Item *separator_item;
+ genlist = elm_genlist_add(ugd->layout);
+ elm_genlist_homogeneous_set(genlist, EINA_TRUE);
+ elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+ 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);
+
+ /* Wifi ON/OFF toggle button */
+#ifdef WFD_ON_OFF_GENLIST
+ ugd->item_wifi_onoff = elm_genlist_item_append(genlist, &wfd_onoff_itc, ugd,
+ NULL, ELM_GENLIST_ITEM_NONE,_onoff_changed_cb, ugd);
+ elm_genlist_item_selected_set(ugd->item_wifi_onoff,
+ EINA_FALSE);
+#endif
+ evas_object_smart_callback_add(genlist, "realized", _gl_realized, ugd);
+ evas_object_smart_callback_add(genlist, "unrealized", _gl_unrealized, ugd);
+ ugd->device_name_item = elm_genlist_item_append(genlist, &device_name_itc, ugd, NULL,
+ ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->device_name_item != NULL)
+ elm_genlist_item_select_mode_set(ugd->device_name_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+ __FUNC_EXIT__;
+ return genlist;
+}
+
+/**
+ * This function let the ug create no device item to append the genlist
+ * @return the main item
+ * @param[in] data the pointer to the main data structure
+ */
+Evas_Object *_create_no_device_genlist(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ Elm_Object_Item *last_item = NULL;
+ int i = 0;
- genlist = elm_genlist_add(ugd->naviframe);
+ WFD_IF_DEL_ITEM(ugd->avlbl_wfd_item);
+ if (ugd->conn_wfd_item != NULL) {
+ last_item = ugd->conn_wfd_item;
+ for (i = 0; i < ugd->gl_connected_peer_cnt; i++) {
+ last_item = elm_genlist_item_next_get(last_item);
+ }
+ } else {
+ last_item = ugd->device_name_item;
+ }
- separator_item = elm_genlist_item_append(genlist, &sep_itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
- elm_genlist_item_select_mode_set(separator_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ ugd->nodevice_title_item = elm_genlist_item_insert_after(ugd->genlist,
+ &title_no_device_itc, (void *)ugd, NULL, last_item,
+ ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->nodevice_title_item != NULL)
+ elm_genlist_item_select_mode_set(ugd->nodevice_title_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- ugd->head = elm_genlist_item_append(genlist, &head_itc, ugd, NULL, ELM_GENLIST_ITEM_NONE, _gl_header_sel, (void*) ugd);
+ ugd->nodevice_item = elm_genlist_item_insert_after(ugd->genlist, &noitem_itc, (void *)ugd, NULL,
+ ugd->nodevice_title_item, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->nodevice_item != NULL)
+ elm_genlist_item_select_mode_set(ugd->nodevice_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- //elm_genlist_item_select_mode_set(ugd->head, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ __FUNC_EXIT__;
+ return ugd->genlist;
+}
+/**
+ * This function let the ug create busy device list
+ * @return 0
+ * @param[in] data the pointer to the main data structure
+ */
+int _create_busy_dev_list(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ ugd->busy_wfd_item = elm_genlist_item_append(ugd->genlist, &title_busy_itc, (void *)ugd,
+ NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->busy_wfd_item != NULL)
+ elm_genlist_item_select_mode_set(ugd->busy_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
__FUNC_EXIT__;
+ return 0;
+}
- return genlist;
+void wfd_free_nodivice_item(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
+ WFD_IF_DEL_ITEM(ugd->nodevice_title_item);
+ WFD_IF_DEL_ITEM(ugd->nodevice_item);
+ __FUNC_EXIT__;
}
-static Evas_Object *_create_about_genlist(void *data)
+/**
+ * This function let the ug create avaliable device list
+ * @return 0
+ * @param[in] data the pointer to the main data structure
+ */
+int _create_available_dev_genlist(void *data)
{
- __FUNC_ENTER__;
+ __FUNC_ENTER__;
+ int i = 0;
+ struct ug_data *ugd = (struct ug_data *) data;
+ Elm_Object_Item *last_item = NULL;
+
+ wfd_free_nodivice_item(ugd);
+
+ if (ugd->conn_wfd_item != NULL) {
+ last_item = ugd->conn_wfd_item;
+ for (i=0; i<ugd->gl_connected_peer_cnt; i++) {
+ last_item = elm_genlist_item_next_get(last_item);
+ }
+ } else {
+ last_item = ugd->device_name_item;
+ }
+
+ ugd->avlbl_wfd_item = elm_genlist_item_insert_after(ugd->genlist, &title_available_itc, (void *)ugd, NULL,
+ last_item, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->avlbl_wfd_item != NULL) {
+ elm_genlist_item_select_mode_set(ugd->avlbl_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ elm_genlist_item_update(ugd->avlbl_wfd_item);
+ }
+ __FUNC_EXIT__;
+ return 0;
+}
- struct ug_data *ugd = (struct ug_data*) data;
+/**
+ * This function let the ug create multi connect device list
+ * @return 0
+ * @param[in] data the pointer to the main data structure
+ */
+static int _create_multi_connect_dev_genlist(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ ugd->multi_connect_wfd_item = elm_genlist_item_insert_after(ugd->genlist, &title_multi_connect_itc, (void *)ugd,
+ NULL, ugd->device_name_item, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->multi_connect_wfd_item != NULL)
+ elm_genlist_item_select_mode_set(ugd->multi_connect_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ __FUNC_EXIT__;
+ return 0;
+}
+
+/**
+ * This function let the ug create connected device list
+ * @return 0
+ * @param[in] data the pointer to the main data structure
+ */
+int _create_connected_dev_genlist(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
- ugd->about_wfd_item = elm_genlist_item_append(ugd->genlist, &name_itc, ugd, NULL, ELM_GENLIST_ITEM_NONE, _gl_about_wifi_sel, (void*) ugd);
+ ugd->conn_wfd_item = elm_genlist_item_insert_after(ugd->genlist, &title_conn_itc, (void *)ugd, NULL,
+ ugd->device_name_item, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->conn_wfd_item != NULL) {
+ elm_genlist_item_select_mode_set(ugd->conn_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ elm_genlist_item_update(ugd->conn_wfd_item);
+ }
- /* add end separator */
- ugd->about_wfdsp_sep_end_item = elm_genlist_item_append(ugd->genlist, &sep_itc_end, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
- elm_genlist_item_select_mode_set(ugd->about_wfdsp_sep_end_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ __FUNC_EXIT__;
+ return 0;
+}
- __FUNC_EXIT__;
+/**
+ * This function let the ug create connected falied device list
+ * @return 0
+ * @param[in] data the pointer to the main data structure
+ */
+int _create_connected_failed_dev_genlist(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ Elm_Object_Item *last_item = NULL;
+ int i = 0;
+
+ if (ugd->avlbl_wfd_item != NULL) {
+ last_item = ugd->avlbl_wfd_item;
+ for (i=0; i<ugd->gl_available_peer_cnt; i++) {
+ last_item = elm_genlist_item_next_get(last_item);
+ }
+ } else if (ugd->conn_wfd_item != NULL) {
+ last_item = ugd->conn_wfd_item;
+ for (i=0; i<ugd->gl_connected_peer_cnt; i++) {
+ last_item = elm_genlist_item_next_get(last_item);
+ }
+ } else {
+ last_item = ugd->device_name_item;
+ }
- return ugd->genlist;
+ ugd->conn_failed_wfd_item = elm_genlist_item_insert_after(ugd->genlist, &title_conn_failed_itc, (void *)ugd,
+ NULL, last_item, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->conn_failed_wfd_item != NULL)
+ elm_genlist_item_select_mode_set(ugd->conn_failed_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ __FUNC_EXIT__;
+ return 0;
}
-static Evas_Object *_create_no_device_genlist(void *data)
+/**
+ * This function let the ug make the display callback for connect failed peers
+ * @return if stop the timer, return ECORE_CALLBACK_CANCEL, else return ECORE_CALLBACK_RENEW
+ * @param[in] data the pointer to the user data
+ */
+static Eina_Bool _connect_failed_peers_display_cb(void *user_data)
{
- __FUNC_ENTER__;
+ __FUNC_ENTER__;
+ int interval = 0;
+ int res = -1;
+ struct ug_data *ugd = (struct ug_data *) user_data;
+
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "NULL parameters.\n");
+ return ECORE_CALLBACK_CANCEL;
+ }
- struct ug_data *ugd = (struct ug_data*) data;
+ if (ugd->avlbl_wfd_item == NULL) {
+ _create_available_dev_genlist(ugd);
+ }
- ugd->nodevice_title_item = elm_genlist_item_append(ugd->genlist, &title_itc, (void*)ugd, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if (ugd->wfd_discovery_status == WIFI_DIRECT_DISCOVERY_BACKGROUND) {
+ DBG(LOG_INFO, "Background mode\n");
+ ugd->display_timer = NULL;
+ return ECORE_CALLBACK_CANCEL;
+ }
- ugd->nodevice_item = elm_genlist_item_append(ugd->genlist, &noitem_itc, (void*)ugd, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ /* check the timeout, if not timeout, keep the cb */
+ interval = time(NULL) - ugd->last_display_time;
+ if (interval < MAX_DISPLAY_TIME_OUT) {
+ return ECORE_CALLBACK_RENEW;
+ }
+
+ if (ugd->is_paused == false) {
+ DBG(LOG_INFO, "Not Paused");
+ /* start discovery again */
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ res = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", res);
+ wifi_direct_cancel_discovery();
+ }
+ }
- ugd->nodevice_sep_low_item = elm_genlist_item_append(ugd->genlist, &sep_itc, NULL, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ ugd->display_timer = NULL;
+ __FUNC_EXIT__;
+ return ECORE_CALLBACK_CANCEL;
+}
- elm_genlist_item_select_mode_set(ugd->nodevice_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+void wfd_ug_view_free_peer(device_type_s *gl_peers_start)
+{
+ __FUNC_ENTER__;
+ device_type_s *peer_for_free = NULL;
+ device_type_s *peer = gl_peers_start;
+
+ while (peer != NULL && peer->gl_item != NULL) {
+ DBG(LOG_INFO, "Deleted item, ssid:%s\n", peer->ssid);
+ elm_object_item_del(peer->gl_item);
+ peer->gl_item = NULL;
+ peer_for_free = peer;
+ peer = peer->next;
+ free(peer_for_free);
+ }
+ __FUNC_EXIT__;
+}
- __FUNC_EXIT__;
- return ugd->genlist;
+void wfd_check_gl_conn_peers(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
+ if (ugd->gl_connected_peer_cnt == 0) {
+ WFD_IF_DEL_ITEM(ugd->conn_wfd_item);
+ }
+ __FUNC_EXIT__;
}
-int _create_multi_button_genlist(void *data)
+/**
+ * This function let the ug free the peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_ug_view_free_peers(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ ugd->gl_connected_peer_cnt = 0;
+
+ if (ugd->gl_conn_peers_start != NULL) {
+ wfd_ug_view_free_peer(ugd->gl_conn_peers_start);
+ ugd->gl_conn_peers_start = NULL;
+ }
+
+ ugd->gl_available_peer_cnt = 0;
- ugd->multi_button_sep_high_item = elm_genlist_item_append(ugd->genlist, &sep_itc, NULL, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if (ugd->gl_avlb_peers_start != NULL) {
+ wfd_ug_view_free_peer(ugd->gl_avlb_peers_start);
+ ugd->gl_avlb_peers_start = NULL;
+ }
- /* if not connected and number of devices is less than 2, don't show the button */
- if (ugd->raw_multi_selected_peer_cnt > 1 ||
- ugd->gl_available_peer_cnt > 1 ||
- ugd->gl_connected_peer_cnt > 0) {
- ugd->multi_button_item = elm_genlist_item_append(ugd->genlist, &button_itc, ugd, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
- ugd->multi_button_sep_low_item = elm_genlist_item_append(ugd->genlist, &sep_itc, NULL, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ ugd->gl_busy_peer_cnt = 0;
+
+ if (ugd->gl_busy_peers_start != NULL) {
+ wfd_ug_view_free_peer(ugd->gl_busy_peers_start);
+ ugd->gl_busy_peers_start = NULL;
}
- evas_object_show(ugd->multi_btn);
- __FUNC_EXIT__;
- return 0;
+ ugd->gl_multi_connect_peer_cnt = 0;
+
+ if (ugd->gl_mul_conn_peers_start != NULL) {
+ wfd_ug_view_free_peer(ugd->gl_mul_conn_peers_start);
+ ugd->gl_mul_conn_peers_start = NULL;
+ }
+
+ if (ugd->gl_connected_peer_cnt == 0) {
+ WFD_IF_DEL_ITEM(ugd->conn_wfd_item);
+ }
+
+ if (ugd->display_timer != NULL) {
+ ecore_timer_del(ugd->display_timer);
+ ugd->display_timer = NULL;
+ }
+
+ WFD_IF_DEL_ITEM(ugd->multi_connect_wfd_item);
+ WFD_IF_DEL_ITEM(ugd->multi_connect_sep_item);
+ WFD_IF_DEL_ITEM(ugd->avlbl_wfd_item);
+ WFD_IF_DEL_ITEM(ugd->busy_wfd_item);
+
+ __FUNC_EXIT__;
}
+void wfd_ug_update_toolbar(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
+ int no_of_conn_dev = ugd->raw_connected_peer_cnt;
+ Evas_Object *btn;
-int _create_busy_dev_list(void *data)
+ wfd_refresh_wifi_direct_state(ugd);
+ if (ugd->wfd_status == WIFI_DIRECT_STATE_CONNECTING) {
+ DBG(LOG_INFO, "WIFI_DIRECT_STATE_CONNECTING\n");
+ if( ugd->multi_connect_wfd_item != NULL) {
+ DBG(LOG_INFO, "multi_connect_toolbar_item\n");
+ btn = elm_button_add(ugd->layout);
+ /* Use "bottom" style button */
+ elm_object_style_set(btn, "bottom");
+ elm_object_domain_translatable_text_set(btn, PACKAGE,
+ "IDS_WIFI_SK2_CANCEL_CONNECTION");
+ evas_object_smart_callback_add(btn, "clicked",
+ _wfd_ug_cancel_connection_button_cb, (void *)ugd);
+ /* Set button into "toolbar" swallow part */
+ elm_object_part_content_set(ugd->layout, "button.next", btn);
+ ugd->disconnect_btn = btn;
+ evas_object_show(ugd->disconnect_btn);
+ elm_object_part_content_set(ugd->layout, "button.prev",
+ ugd->scan_toolbar);
+ wfd_ug_view_refresh_button(ugd->scan_toolbar,
+ "IDS_WIFI_SK4_SCAN", FALSE);
+ evas_object_data_set(ugd->disconnect_btn, "multi", "disconnect");
+ DBG(LOG_INFO, "button: disconnect button added\n");
+ } else {
+ DBG(LOG_INFO, "scan_toolbar\n");
+ WFD_IF_DEL_ITEM(ugd->multi_connect_toolbar_item);
+ wfd_ug_view_refresh_button(ugd->scan_toolbar,
+ "IDS_WIFI_SK2_CANCEL_CONNECTION", TRUE);
+ evas_object_data_set(ugd->scan_btn, "multi", "cancel");
+ DBG(LOG_INFO, "button: stop connect button added\n");
+ }
+ } else if (no_of_conn_dev > 0) {
+ if (!ugd->multi_connect_toolbar_item) {
+ btn = elm_button_add(ugd->layout);
+ /* Use "bottom" style button */
+ elm_object_style_set(btn, "bottom");
+ elm_object_domain_translatable_text_set(btn, PACKAGE,
+ "IDS_WIFI_SK_DISCONNECT");
+ evas_object_smart_callback_add(btn, "clicked",
+ _wfd_ug_disconnect_button_cb, (void *)ugd);
+ /* Set button into "toolbar" swallow part */
+ elm_object_part_content_set(ugd->layout, "button.next", btn);
+ ugd->disconnect_btn = btn;
+ evas_object_show(ugd->disconnect_btn);
+ }
+ elm_object_part_content_set(ugd->layout, "button.prev",
+ ugd->scan_toolbar);
+ wfd_ug_view_refresh_button(ugd->scan_toolbar,
+ "IDS_WIFI_SK4_SCAN", TRUE);
+ evas_object_data_set(ugd->disconnect_btn, "multi", "disconnect");
+ DBG(LOG_INFO, "button: disconnect button added\n");
+ }else {
+ if (no_of_conn_dev == 0 && ugd->disconnect_btn != NULL) {
+ DBG(LOG_INFO, "disconnect btn removed when conn failed\n");
+ Evas_Object *content;
+ content = elm_object_part_content_unset(ugd->layout, "button.next");
+ WFD_IF_DEL_OBJ(content);
+ ugd->disconnect_btn = NULL;
+ elm_object_part_content_set(ugd->layout, "button.big",
+ ugd->scan_toolbar);
+ }
+ wfd_ug_view_refresh_button(ugd->scan_toolbar,
+ "IDS_WIFI_SK4_SCAN", TRUE);
+ evas_object_data_set(ugd->scan_toolbar, "multi", "connect");
+ DBG(LOG_INFO, "button: scan button added\n");
+ }
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug init the genlist
+ */
+void wfd_ug_view_init_genlist(void *data, bool is_free_all_peers)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ int no_of_busy_dev = 0;
+ int no_of_available_dev = 0;
+ int no_of_conn_failed_dev = 0;
- ugd->busy_wfd_item = elm_genlist_item_append(ugd->genlist, &title_busy_itc, (void*)ugd, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if (is_free_all_peers) {
+ wfd_ug_view_free_peers(ugd);
+ }
+
+ if (ugd->gl_failed_peers_start != NULL) {
+ DBG(LOG_INFO, "These are failed peers, must clear them");
+ ugd->gl_connected_failed_peer_cnt = 0;
+ wfd_ug_view_free_peer(ugd->gl_failed_peers_start);
+ ugd->gl_failed_peers_start = NULL;
+ WFD_IF_DEL_ITEM(ugd->conn_failed_wfd_item);
+ }
- elm_genlist_item_select_mode_set(ugd->busy_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ if (ugd->avlbl_wfd_item != NULL) {
+ DBG(LOG_INFO, "There are available peers in genlist");
+ wfd_ug_view_refresh_glitem(ugd->avlbl_wfd_item);
+ return;
+ }
+ __wfd_is_any_device_busy(ugd, &no_of_busy_dev);
+ __wfd_is_any_device_available(ugd, &no_of_available_dev);
+ __wfd_is_any_device_connect_failed(ugd, &no_of_conn_failed_dev);
- __FUNC_EXIT__;
- return 0;
+ __FUNC_EXIT__;
}
-static int _create_available_dev_genlist(void *data)
+/**
+ * This function let the ug find a peer in genlist
+ */
+device_type_s *find_peer_in_glist(device_type_s *start_pos, const char *mac_addr)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+
+ if (start_pos == NULL) {
+ DBG(LOG_INFO, "no peer in genlist");
+ return NULL;
+ }
- ugd->avlbl_wfd_item = elm_genlist_item_append(ugd->genlist, &title_itc, (void*)ugd, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ device_type_s *peer = start_pos;
- // elm_genlist_item_select_mode_set(ugd->avlbl_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ while (peer != NULL) {
+ if (!strncmp(peer->mac_addr, mac_addr, MAC_LENGTH - 1)) {
+ peer->is_alive = true;
+ DBG(LOG_INFO, "device [%s] found in genlist", peer->ssid);
+ __FUNC_EXIT__;
+ return peer;
+ }
+ peer = peer->next;
+ }
- __FUNC_EXIT__;
- return 0;
+ __FUNC_EXIT__;
+ return NULL;
}
-static int _create_multi_connect_dev_genlist(void *data)
+void delete_not_alive_peers(struct ug_data *ugd, device_type_s **start_pos, int *cnt)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
-
- ugd->multi_connect_wfd_item = elm_genlist_item_append(ugd->genlist, &title_multi_connect_itc, (void*)ugd, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ __FUNC_ENTER__;
+ if (*start_pos == NULL) {
+ DBG(LOG_INFO, "no peer in genlist");
+ return;
+ }
- // elm_genlist_item_select_mode_set(ugd->avlbl_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ device_type_s *peer = *start_pos;
+ device_type_s *peer_tmp = NULL;
+ while (peer != NULL) {
+ peer_tmp = peer->next;
+ if(peer->is_alive == false) {
+ free_gl_peer(start_pos, peer->mac_addr, cnt);
+ }
+ peer = peer_tmp;
+ }
- __FUNC_EXIT__;
- return 0;
+// wfd_check_gl_available_peers(ugd);
+ if (ugd->gl_busy_peer_cnt == 0) {
+ WFD_IF_DEL_ITEM(ugd->busy_wfd_item);
+ }
+ __FUNC_EXIT__;
+ return;
}
-int _create_connected_dev_genlist(void *data)
+void set_not_alive_peers(device_type_s *start_pos)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ if (start_pos == NULL) {
+ DBG(LOG_INFO, "no peer in genlist");
+ return;
+ }
- ugd->conn_wfd_item = elm_genlist_item_append(ugd->genlist, &title_conn_itc, (void*)ugd, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ device_type_s *peer = start_pos;
+ while (peer != NULL) {
+ peer->is_alive = false;
+ peer = peer->next;
+ }
- elm_genlist_item_select_mode_set(ugd->conn_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- __FUNC_EXIT__;
- return 0;
+ __FUNC_EXIT__;
+ return;
}
-int _create_connected_failed_dev_genlist(void *data)
+/**
+ * This function let the ug get the insert position for next item
+ */
+Elm_Object_Item *get_insert_postion(device_type_s *peer, Elm_Object_Item *pre_item, int peer_cnt)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ int i = 0;
+ device_type_s *peer_ite = NULL;
+ Elm_Object_Item *head = elm_genlist_item_next_get(pre_item);
+ Elm_Object_Item *item = NULL;
+
+ if(peer_cnt == 0) {
+ DBG(LOG_INFO, "first peer [%s] would be added", peer->ssid);
+ return pre_item;
+ }
- ugd->conn_failed_wfd_item = elm_genlist_item_append(ugd->genlist, &title_conn_failed_itc, (void*)ugd, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ peer_ite = (device_type_s *)elm_object_item_data_get(head);
+ WFD_RETV_IF(peer_ite == NULL, NULL, "peer_ite is NULL\n");
+
+ if(peer_ite->gl_item != NULL) {
+ for(i=0; i < peer_cnt; i++) {
+ if (strcasecmp(peer_ite->ssid, peer->ssid) > 0) {
+ /* if peer_ite is greater than peer, return previous item */
+ __FUNC_EXIT__;
+ return elm_genlist_item_prev_get(head);
+ } else {
+ item = elm_genlist_item_next_get(head);
+ if (item == NULL) {
+ /* return the last item */
+ return head;
+ } else {
+ head = item;
+ peer_ite = (device_type_s *)elm_object_item_data_get(head);
+ }
+ }
+ }
+ }
+ __FUNC_EXIT__;
+ return elm_genlist_item_prev_get(head);
+}
+
+/**
+ * This function let the ug insert peer item to genlist
+ */
+int insert_gl_item(Evas_Object *genlist, Elm_Object_Item *item, Elm_Gen_Item_Class *itc, device_type_s **start_pos,
+ device_type_s *peer_for_insert, void *callback)
+{
+ __FUNC_ENTER__;
+ WFD_RETV_IF(item == NULL, -1, "Item is NULL\n");
+ device_type_s *peer = NULL;
+ device_type_s *peer_ite = NULL;
+
+ peer = (device_type_s *)malloc(sizeof(device_type_s));
+ WFD_RETV_IF(peer == NULL, -1, "malloc failed\n");
+
+ memcpy(peer, peer_for_insert, sizeof(device_type_s));
+ peer->next = NULL;
+
+ if(*start_pos == NULL) {
+ *start_pos = peer;
+ } else {
+ peer_ite = *start_pos;
+ while(peer_ite->next != NULL) {
+ /* move pointer to the last peer */
+ peer_ite = peer_ite->next;
+ }
+ peer_ite->next = peer;
+ }
- elm_genlist_item_select_mode_set(ugd->conn_failed_wfd_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- __FUNC_EXIT__;
- return 0;
+ peer->is_alive = true;
+ peer->gl_item = elm_genlist_item_insert_after(genlist, itc, (void *)peer, NULL, item,
+ ELM_GENLIST_ITEM_NONE, callback, (void *)peer);
+ if (callback == NULL && peer->gl_item != NULL) {
+ elm_genlist_item_select_mode_set(peer->gl_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ }
+ __FUNC_EXIT__;
+ return 0;
}
-static Eina_Bool _connect_failed_peers_display_cb(void *user_data)
+/**
+ * This function let the ug update connected peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_ug_update_connected_peers(void *data)
{
- int interval = 0;
- struct ug_data *ugd = (struct ug_data*) user_data;
+ __FUNC_ENTER__;
- if (NULL == ugd) {
- DBG(LOG_ERROR, "NULL parameters.\n");
- return ECORE_CALLBACK_CANCEL;
+ struct ug_data *ugd = (struct ug_data *) data;
+ int i = 0 ;
+ int res;
+ bool is_group_owner = FALSE;
+ Elm_Object_Item *item = NULL;
+
+ res = wifi_direct_is_group_owner(&is_group_owner);
+ if (res == WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_INFO, "is_group_owner=[%d]", is_group_owner);
}
- /* check the timeout, if not timeout, keep the cb */
- interval = time(NULL) - ugd->last_display_time;
- if (interval < MAX_DISPLAY_TIME_OUT) {
- return ECORE_CALLBACK_RENEW;
+ if (!ugd->conn_wfd_item) {
+ _create_connected_dev_genlist(ugd);
}
- /* re-discovery */
- wfd_client_start_discovery(ugd);
+ for (i = 0; i < ugd->raw_connected_peer_cnt; i++) {
+ if (find_peer_in_glist(ugd->gl_conn_peers_start, ugd->raw_connected_peers[i].mac_addr) == NULL) {
+ if (find_peer_in_glist(ugd->gl_avlb_peers_start, ugd->raw_connected_peers[i].mac_addr) != NULL) {
+ free_gl_peer(&ugd->gl_avlb_peers_start, ugd->raw_connected_peers[i].mac_addr,
+ &ugd->gl_available_peer_cnt);
+ wfd_check_gl_available_peers(ugd);
+ }
- /* get peers and update the view */
- wfd_ug_get_discovered_peers(ugd);
- wfd_ug_get_connected_peers(ugd);
- wfd_ug_view_update_peers(ugd);
+ if (find_peer_in_glist(ugd->gl_mul_conn_peers_start, ugd->raw_connected_peers[i].mac_addr) != NULL) {
+ free_gl_peer(&ugd->gl_mul_conn_peers_start, ugd->raw_connected_peers[i].mac_addr,
+ &ugd->gl_multi_connect_peer_cnt);
+ if (ugd->gl_multi_connect_peer_cnt == 0) {
+ WFD_IF_DEL_ITEM(ugd->multi_connect_wfd_item);
+ WFD_IF_DEL_ITEM(ugd->multi_connect_sep_item);
+ }
+ }
- return ECORE_CALLBACK_CANCEL;
+ item = get_insert_postion(&(ugd->raw_connected_peers[i]), ugd->conn_wfd_item,
+ ugd->gl_connected_peer_cnt);
+ res = insert_gl_item(ugd->genlist, item, &peer_conn_itc, &ugd->gl_conn_peers_start,
+ &ugd->raw_connected_peers[i], NULL);
+ if (res != 0) {
+ break;
+ }
+ ugd->gl_connected_peer_cnt++;
+ }
+ }
+
+ /* if is not GO, free all available peers */
+ if (is_group_owner == FALSE) {
+ ugd->gl_available_peer_cnt = 0;
+ WFD_IF_DEL_ITEM(ugd->avlbl_wfd_item);
+
+ if (ugd->gl_avlb_peers_start != NULL) {
+ wfd_ug_view_free_peer(ugd->gl_avlb_peers_start);
+ ugd->gl_avlb_peers_start = NULL;
+ }
+ }
+
+ /* free busy peers */
+ if (ugd->gl_busy_peers_start != NULL) {
+ ugd->gl_busy_peer_cnt = 0;
+ WFD_IF_DEL_ITEM(ugd->busy_wfd_item);
+
+ wfd_ug_view_free_peer(ugd->gl_busy_peers_start);
+ ugd->gl_busy_peers_start = NULL;
+
+ }
+
+ __FUNC_EXIT__;
}
-void wfd_ug_view_free_peers(void *data)
+/**
+ * This function let the ug update the multi-connect peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_ug_view_update_multiconn_peers(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int i;
-
- for(i = 0; i < ugd->gl_connected_peer_cnt; i++)
- {
- DBG(LOG_VERBOSE, "%dth connected peer = %x is deleted\n", i, ugd->gl_connected_peers[i]);
- if (ugd->gl_connected_peers[i].gl_item != NULL)
- {
- elm_object_item_del(ugd->gl_connected_peers[i].gl_item);
- ugd->gl_connected_peers[i].gl_item = NULL;
- DBG(LOG_VERBOSE, "Deleted item\n");
- }
- }
- ugd->gl_connected_peer_cnt = 0;
+ __FUNC_ENTER__;
- for(i = 0; i < ugd->gl_connected_failed_peer_cnt; i++)
- {
- DBG(LOG_VERBOSE, "%dth connected failed peer = %x is deleted\n", i, ugd->gl_connected_failed_peers[i]);
- if (ugd->gl_connected_failed_peers[i].gl_item != NULL)
- {
- elm_object_item_del(ugd->gl_connected_failed_peers[i].gl_item);
- ugd->gl_connected_failed_peers[i].gl_item = NULL;
- DBG(LOG_VERBOSE, "Deleted item\n");
- }
- }
-
- ugd->gl_connected_failed_peer_cnt = 0;
-
- for(i = 0; i < ugd->gl_available_peer_cnt; i++)
- {
- DBG(LOG_VERBOSE, "%dth discovered peer = %x is deleted\n", i, ugd->gl_available_peers[i]);
- if (ugd->gl_available_peers[i].gl_item != NULL)
- {
- elm_object_item_del(ugd->gl_available_peers[i].gl_item);
- ugd->gl_available_peers[i].gl_item = NULL;
- DBG(LOG_VERBOSE, "Deleted item\n");
- }
- }
- ugd->gl_available_peer_cnt = 0;
+ struct ug_data *ugd = (struct ug_data *) data;
+ int i;
+ int res;
+ Elm_Object_Item *item = NULL;
- for(i = 0; i < ugd->gl_busy_peer_cnt; i++)
- {
- DBG(LOG_VERBOSE, "%dth busy peer = %x is deleted\n", i, ugd->gl_busy_peers[i]);
- if (ugd->gl_busy_peers[i].gl_item != NULL)
- {
- elm_object_item_del(ugd->gl_busy_peers[i].gl_item);
- ugd->gl_busy_peers[i].gl_item = NULL;
- DBG(LOG_VERBOSE, "Deleted item\n");
- }
- }
- ugd->gl_busy_peer_cnt = 0;
+ if (ugd->raw_multi_selected_peer_cnt > 0) {
+ if (ugd->raw_connected_peer_cnt < ugd->raw_multi_selected_peer_cnt &&
+ ugd->multi_connect_wfd_item == NULL) {
+ _create_multi_connect_dev_genlist(ugd);
+ }
- for(i = 0; i < ugd->gl_multi_connect_peer_cnt; i++)
- {
- DBG(LOG_VERBOSE, "%dth busy peer = %x is deleted\n", i, ugd->gl_multi_connect_peers[i]);
- if (ugd->gl_multi_connect_peers[i].gl_item != NULL)
- {
- elm_object_item_del(ugd->gl_multi_connect_peers[i].gl_item);
- ugd->gl_multi_connect_peers[i].gl_item = NULL;
- DBG(LOG_VERBOSE, "Deleted item\n");
- }
- }
- ugd->gl_multi_connect_peer_cnt = 0;
+ for (i = 0; i < ugd->raw_multi_selected_peer_cnt; i++) {
+ if (ugd->raw_multi_selected_peers[i].conn_status != PEER_CONN_STATUS_CONNECTED) {
+ item = get_insert_postion(&(ugd->raw_multi_selected_peers[i]),
+ ugd->multi_connect_wfd_item, ugd->gl_multi_connect_peer_cnt);
+ res = insert_gl_item(ugd->genlist, item, &peer_itc, &ugd->gl_mul_conn_peers_start,
+ &ugd->raw_multi_selected_peers[i], NULL);
+ if (res != 0) {
+ break;
+ }
+ ugd->gl_multi_connect_peer_cnt++;
+ }
+ }
+ }
- if(ugd->nodevice_title_item != NULL)
- {
- elm_object_item_del(ugd->nodevice_title_item);
- ugd->nodevice_title_item = NULL;
- }
- if(ugd->nodevice_item != NULL)
- {
- elm_object_item_del(ugd->nodevice_item);
- ugd->nodevice_item = NULL;
- }
- if(ugd->nodevice_sep_low_item != NULL)
- {
- elm_object_item_del(ugd->nodevice_sep_low_item);
- ugd->nodevice_sep_low_item = NULL;
- }
- if(ugd->about_wfd_item != NULL)
- {
- elm_object_item_del(ugd->about_wfd_item);
- ugd->about_wfd_item = NULL;
- }
-
- if(ugd->conn_wfd_item != NULL)
- {
- elm_object_item_del(ugd->conn_wfd_item);
- ugd->conn_wfd_item = NULL;
- }
- if(ugd->conn_failed_wfd_item != NULL)
- {
- elm_object_item_del(ugd->conn_failed_wfd_item);
- ugd->conn_failed_wfd_item = NULL;
- }
- if(ugd->conn_failed_wfd_sep_item != NULL)
- {
- elm_object_item_del(ugd->conn_failed_wfd_sep_item);
- ugd->conn_failed_wfd_sep_item = NULL;
- }
- if(ugd->display_timer != NULL)
- {
- elm_object_item_del(ugd->display_timer);
- ugd->display_timer = NULL;
- }
- if(ugd->multi_connect_wfd_item != NULL)
- {
- elm_object_item_del(ugd->multi_connect_wfd_item);
- ugd->multi_connect_wfd_item = NULL;
- }
- if(ugd->avlbl_wfd_item != NULL)
- {
- elm_object_item_del(ugd->avlbl_wfd_item);
- ugd->avlbl_wfd_item = NULL;
- }
- if(ugd->busy_wfd_item != NULL)
- {
- elm_object_item_del(ugd->busy_wfd_item);
- ugd->busy_wfd_item = NULL;
- }
- if(ugd->busy_wfd_sep_item != NULL)
- {
- elm_object_item_del(ugd->busy_wfd_sep_item);
- ugd->busy_wfd_sep_item = NULL;
- }
-
- if(ugd->multi_button_item != NULL)
- {
- elm_object_item_del(ugd->multi_button_item);
- ugd->multi_button_item = NULL;
- }
- if(ugd->multi_button_sep_high_item != NULL)
- {
- elm_object_item_del(ugd->multi_button_sep_high_item);
- ugd->multi_button_sep_high_item = NULL;
- }
- if(ugd->multi_button_sep_low_item != NULL)
- {
- elm_object_item_del(ugd->multi_button_sep_low_item);
- ugd->multi_button_sep_low_item = NULL;
- }
- if(ugd->about_wfdsp_sep_end_item != NULL)
- {
- elm_object_item_del(ugd->about_wfdsp_sep_end_item);
- ugd->about_wfdsp_sep_end_item = NULL;
- }
-
- __FUNC_EXIT__;
+ __FUNC_EXIT__;
}
-
-void wfd_ug_view_update_peers(void *data)
+/**
+ * This function let the ug update the available and busy peers
+ */
+void wfd_ug_update_available_peers(void *data)
{
- __FUNC_ENTER__;
-
- struct ug_data *ugd = (struct ug_data*) data;
- int no_of_busy_dev = 0;
- int no_of_available_dev = 0;
- int no_of_conn_dev = 0;
- int no_of_conn_failed_dev = 0;
- int i = 0 ;
- int res = 0;
- bool is_group_owner = FALSE;
- int count = 0;
-
- wfd_ug_view_free_peers(ugd);
-
- if(ugd->wfd_status == WFD_LINK_STATUS_DEACTIVATED)
- {
- DBG(LOG_VERBOSE, "Device is deactivated, no need to update UI.");
- // Add seperator...
- ugd->multi_button_sep_high_item = elm_genlist_item_append(ugd->genlist, &sep_itc, NULL, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
- _create_about_genlist(ugd);
- return;
- }
-
- res = wifi_direct_is_group_owner(&is_group_owner);
- if (res != WIFI_DIRECT_ERROR_NONE)
- {
- DBG(LOG_VERBOSE, "Fail to get group_owner_state. ret=[%d]", res);
- ugd->I_am_group_owner = FALSE;
- // continue...
- }
- else
- {
- ugd->I_am_group_owner = is_group_owner;
- }
-
- __wfd_is_any_device_busy(ugd, &no_of_busy_dev);
- __wfd_is_any_device_available(ugd, &no_of_available_dev);
- __wfd_is_any_device_connect_failed(ugd, &no_of_conn_failed_dev);
- no_of_conn_dev = ugd->raw_connected_peer_cnt;
-
- ugd->gl_available_peer_cnt = no_of_available_dev;
- ugd->gl_connected_peer_cnt = no_of_conn_dev;
- ugd->gl_connected_failed_peer_cnt = no_of_conn_failed_dev;
- ugd->gl_busy_peer_cnt = no_of_busy_dev;
-
- DBG(LOG_VERBOSE, "conn_dev=[%d], conn_failed_dev=[%d], avail_dev=[%d], busy_dev=[%d], GO=[%d]\n",
- no_of_conn_dev, no_of_conn_failed_dev, no_of_available_dev, no_of_busy_dev, is_group_owner);
-
- if (no_of_conn_dev == 0 && no_of_conn_failed_dev == 0 &&
- no_of_available_dev == 0 && no_of_busy_dev == 0)
- {
- DBG(LOG_ERROR, "There are No peers\n");
- _create_no_device_genlist(ugd);
- _create_about_genlist(ugd);
- return;
- }
-
- if (no_of_conn_dev > 0)
- {
- if (!ugd->conn_wfd_item)
- _create_connected_dev_genlist(ugd);
-
- count = 0;
- for(i = 0; i < ugd->raw_connected_peer_cnt; i++)
- {
- if (ugd->gl_connected_peers[count].gl_item)
- elm_object_item_del(ugd->gl_connected_peers[count].gl_item);
-
- memcpy(&ugd->gl_connected_peers[count], &ugd->raw_connected_peers[i], sizeof(device_type_s));
-
- ugd->gl_connected_peers[count].gl_item =
- elm_genlist_item_append(ugd->genlist, &peer_conn_itc, (void*) &(ugd->gl_connected_peers[i]), NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
- elm_genlist_item_select_mode_set(ugd->gl_connected_peers[count].gl_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- count++;
- }
- }
-
- if (ugd->multi_connect_mode != WFD_MULTI_CONNECT_MODE_NONE)
- {
- if (ugd->raw_multi_selected_peer_cnt > 0)
- {
- if (ugd->avlbl_wfd_item == NULL)
- _create_multi_connect_dev_genlist(ugd);
-
- count = 0;
- for (i = 0; i < ugd->raw_multi_selected_peer_cnt; i++)
- {
- if (ugd->raw_multi_selected_peers[i].conn_status != PEER_CONN_STATUS_CONNECTED)
- {
- if (ugd->gl_multi_connect_peers[count].gl_item)
- elm_object_item_del(ugd->gl_multi_connect_peers[count].gl_item);
-
- memcpy(&ugd->gl_multi_connect_peers[count], &ugd->raw_multi_selected_peers[i], sizeof(device_type_s));
-
- ugd->gl_multi_connect_peers[count].gl_item =
- elm_genlist_item_append(ugd->genlist, &peer_itc, (void*) &(ugd->gl_multi_connect_peers[count]), NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
- count++;
- }
- else
- {
- // device is connected..
- // skip it...
- }
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd = (struct ug_data *) data;
+ int no_of_busy_dev = 0;
+ int no_of_available_dev = 0;
+ int no_of_conn_dev = 0;
+ bool is_group_owner = FALSE;
+ int res = 0;
+ Elm_Object_Item *item = NULL;
+ device_type_s *peer = NULL;
+ GList *iterator = NULL;
+
+ __wfd_is_any_device_busy(ugd, &no_of_busy_dev);
+ __wfd_is_any_device_available(ugd, &no_of_available_dev);
+ no_of_conn_dev = ugd->raw_connected_peer_cnt;
+
+ res = wifi_direct_is_group_owner(&is_group_owner);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_INFO, "Fail to get group_owner_state. ret=[%d]", res);
+ ugd->I_am_group_owner = FALSE;
+ } else {
+ ugd->I_am_group_owner = is_group_owner;
+ }
+
+ DBG(LOG_INFO, "avail_dev=[%d], busy_dev=[%d], GO=[%d]\n", no_of_available_dev, no_of_busy_dev, is_group_owner);
+ if (no_of_available_dev != 0 || no_of_busy_dev != 0) {
+ DBG(LOG_INFO, "There are available or busy peers\n");
+ wfd_free_nodivice_item(ugd);
+ }
+
+ if (no_of_conn_dev == 0 || is_group_owner == TRUE) {
+ if (ugd->avlbl_wfd_item == NULL) {
+ _create_available_dev_genlist(ugd);
+ }
+
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ /* Not include the device which is connected with me */
+ if (__wfd_is_device_connected_with_me(ugd, (device_type_s *)iterator->data)) {
+ continue;
}
- ugd->gl_multi_connect_peer_cnt = count;
- }
-
- _create_multi_button_genlist(ugd);
- }
- else
- {
- // Note that
- // If GC, no display available peers
- // Otherwise, display available peers
-#if 0
- if (no_of_available_dev > 0 && (no_of_conn_dev == 0 || is_group_owner==TRUE))
-#else
- // display available peers
- if (no_of_available_dev > 0)
-#endif
- {
- if (ugd->avlbl_wfd_item == NULL)
- _create_available_dev_genlist(ugd);
-
- count = 0;
- for (i = 0; i < ugd->raw_discovered_peer_cnt; i++)
- {
- if (!__wfd_is_device_busy(ugd, &ugd->raw_discovered_peers[i]) &&
- ugd->raw_discovered_peers[i].conn_status == PEER_CONN_STATUS_DISCONNECTED)
- {
- if (ugd->gl_available_peers[count].gl_item)
- elm_object_item_del(ugd->gl_available_peers[count].gl_item);
-
- memcpy(&ugd->gl_available_peers[count], &ugd->raw_discovered_peers[i], sizeof(device_type_s));
-
- ugd->gl_available_peers[count].gl_item =
- elm_genlist_item_append(ugd->genlist, &peer_itc, (void*) &(ugd->gl_available_peers[count]), NULL,
- ELM_GENLIST_ITEM_NONE, _gl_peer_sel, (void*) &(ugd->gl_available_peers[count]));
- count++;
+ if (!__wfd_is_device_busy(ugd, (device_type_s *)iterator->data) &&
+ ((device_type_s *)iterator->data)->conn_status != PEER_CONN_STATUS_FAILED_TO_CONNECT &&
+ ((device_type_s *)iterator->data)->conn_status != PEER_CONN_STATUS_CONNECTED) {
+ /* free disconnected gl peer */
+ if (find_peer_in_glist(ugd->gl_conn_peers_start, ((device_type_s *)iterator->data)->mac_addr) != NULL) {
+ free_gl_peer(&ugd->gl_conn_peers_start, ((device_type_s *)iterator->data)->mac_addr,
+ &ugd->gl_connected_peer_cnt);
}
- else
- {
- // device is busy or connected..
- // skip it...
+
+ /* free busy gl peer, which is available now */
+ if (find_peer_in_glist(ugd->gl_busy_peers_start, ((device_type_s *)iterator->data)->mac_addr) != NULL) {
+ free_gl_peer(&ugd->gl_busy_peers_start, ((device_type_s *)iterator->data)->mac_addr, &ugd->gl_busy_peer_cnt);
+ if (ugd->gl_busy_peer_cnt == 0) {
+ WFD_IF_DEL_ITEM(ugd->busy_wfd_item);
+ }
}
- }
- }
- _create_multi_button_genlist(ugd);
-
- // If connected, not display busy device...
- if (no_of_conn_dev == 0 && no_of_busy_dev > 0)
- {
- if (ugd->busy_wfd_item == NULL)
- _create_busy_dev_list(ugd);
-
- count = 0;
- for (i = 0; i < ugd->raw_discovered_peer_cnt; i++)
- {
- if (__wfd_is_device_busy(ugd, &ugd->raw_discovered_peers[i]) == TRUE)
- {
- if (ugd->gl_busy_peers[count].gl_item)
- elm_object_item_del(ugd->gl_busy_peers[count].gl_item);
-
- memcpy(&ugd->gl_busy_peers[count], &ugd->raw_discovered_peers[i], sizeof(device_type_s));
-
- ugd->gl_busy_peers[count].gl_item =
- elm_genlist_item_append(ugd->genlist, &peer_busy_itc, (void*) &(ugd->gl_busy_peers[count]), NULL,
- ELM_GENLIST_ITEM_NONE, _gl_busy_peer_sel, ugd);
- //elm_genlist_item_select_mode_set(ugd->gl_busy_peers[count].gl_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- count++;
+ if (find_peer_in_glist(ugd->gl_failed_peers_start, (const char *)((device_type_s *)iterator->data)->mac_addr) != NULL) {
+ continue;
}
- else
- {
- // device is available or connected..
- // skip it...
+
+ peer = find_peer_in_glist(ugd->gl_avlb_peers_start, (const char *)((device_type_s *)iterator->data)->mac_addr);
+ if (peer == NULL) {
+ item = get_insert_postion((device_type_s *)iterator->data,
+ ugd->avlbl_wfd_item, ugd->gl_available_peer_cnt);
+ res = insert_gl_item(ugd->genlist, item, &peer_itc, &ugd->gl_avlb_peers_start,
+ (device_type_s *)iterator->data, _gl_peer_sel);
+ if (res != 0) {
+ break;
+ }
+ ugd->gl_available_peer_cnt++;
+ } else if (no_of_conn_dev > 0 && ((device_type_s *)iterator->data)->is_group_owner == TRUE) {
+ /* if peer is GO, free it */
+ free_gl_peer(&ugd->gl_avlb_peers_start, ((device_type_s *)iterator->data)->mac_addr,
+ &ugd->gl_available_peer_cnt);
}
}
- ugd->busy_wfd_sep_item = elm_genlist_item_append(ugd->genlist, &sep_itc, NULL, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
}
+ }
- /* display connect failed peers */
- if (no_of_conn_failed_dev > 0)
- {
- if (!ugd->conn_failed_wfd_item)
- _create_connected_failed_dev_genlist(ugd);
+ wfd_check_gl_available_peers(ugd);
+ wfd_check_gl_conn_peers(ugd);
- /* add timer for disappearing failed peers after N secs */
- if (NULL == ugd->display_timer) {
- ugd->last_display_time = time(NULL);
- ugd->display_timer = ecore_timer_add(5.0, (Ecore_Task_Cb)_connect_failed_peers_display_cb, ugd);
- }
+ if (no_of_conn_dev == 0 && no_of_busy_dev > 0) {
+ if (ugd->busy_wfd_item == NULL) {
+ _create_busy_dev_list(ugd);
+ }
- count = 0;
- for (i = 0; i < ugd->raw_discovered_peer_cnt; i++)
- {
- if (!__wfd_is_device_busy(ugd, &ugd->raw_discovered_peers[i]) &&
- ugd->raw_discovered_peers[i].conn_status == PEER_CONN_STATUS_FAILED_TO_CONNECT)
- {
- if (ugd->gl_connected_failed_peers[count].gl_item)
- elm_object_item_del(ugd->gl_connected_failed_peers[count].gl_item);
-
- memcpy(&ugd->gl_connected_failed_peers[count], &ugd->raw_discovered_peers[i], sizeof(device_type_s));
-
- ugd->gl_connected_failed_peers[count].gl_item =
- elm_genlist_item_append(ugd->genlist, &peer_conn_failed_itc, (void*) &(ugd->gl_connected_failed_peers[count]), NULL,
- ELM_GENLIST_ITEM_NONE, NULL, ugd);
- elm_genlist_item_select_mode_set(ugd->gl_connected_failed_peers[count].gl_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- count++;
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ /* Not include the device which is connected with me */
+ if (__wfd_is_device_connected_with_me(ugd, (device_type_s *)iterator->data)) {
+ continue;
+ }
+ if (__wfd_is_device_busy(ugd, (device_type_s *)iterator->data) == TRUE) {
+ if (find_peer_in_glist(ugd->gl_busy_peers_start, ((device_type_s *)iterator->data)->mac_addr) == NULL) {
+ if (find_peer_in_glist(ugd->gl_avlb_peers_start,
+ ((device_type_s *)iterator->data)->mac_addr) != NULL) {
+ free_gl_peer(&ugd->gl_avlb_peers_start, ((device_type_s *)iterator->data)->mac_addr,
+ &ugd->gl_available_peer_cnt);
+ wfd_check_gl_available_peers(ugd);
+ }
+ item = get_insert_postion((device_type_s *)iterator->data, ugd->busy_wfd_item,
+ ugd->gl_busy_peer_cnt);
+ res = insert_gl_item(ugd->genlist, item, &peer_busy_itc, &ugd->gl_busy_peers_start,
+ (device_type_s *)iterator->data, _gl_busy_peer_sel);
+ if (res != 0) {
+ break;
+ }
+ ugd->gl_busy_peer_cnt++;
}
}
-
- ugd->conn_failed_wfd_sep_item = elm_genlist_item_append(ugd->genlist, &sep_itc, NULL, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
-
}
- }
- _create_about_genlist(ugd);
+ }
- __FUNC_EXIT__;
-}
+ wfd_check_gl_busy_peers(ugd);
+ __FUNC_EXIT__;
+}
-void create_wfd_ug_view(void *data)
+/**
+ * This function let the ug update the failed peers
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_ug_update_failed_peers(void *data)
{
- __FUNC_ENTER__;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ int no_of_conn_failed_dev = 0;
+ GList *iterator = NULL;
- struct ug_data *ugd = (struct ug_data*) data;
- Evas_Object *back_btn = NULL;
- Elm_Object_Item *navi_item = NULL;
- Evas_Object *control_bar = NULL;
- Elm_Object_Item *item = NULL;
+ __wfd_is_any_device_connect_failed(ugd, &no_of_conn_failed_dev);
+ DBG(LOG_INFO, "conn_failed_dev=[%d]", no_of_conn_failed_dev);
- if(ugd == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)");
- return;
- }
+ if (no_of_conn_failed_dev == 0) {
+ return;
+ }
+
+ /* add timer for disappearing failed peers after N secs */
+ if (NULL == ugd->display_timer) {
+ ugd->last_display_time = time(NULL);
+ ugd->display_timer = ecore_timer_add(0.05, (Ecore_Task_Cb)_connect_failed_peers_display_cb, ugd);
+ }
+
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ if (!__wfd_is_device_busy(ugd, (device_type_s *)iterator->data) &&
+ ((device_type_s *)iterator->data)->conn_status == PEER_CONN_STATUS_FAILED_TO_CONNECT) {
+ if (find_peer_in_glist(ugd->gl_failed_peers_start, ((device_type_s *)iterator->data)->mac_addr) == NULL) {
+ if (find_peer_in_glist(ugd->gl_avlb_peers_start, ((device_type_s *)iterator->data)->mac_addr) != NULL) {
+ free_gl_peer(&ugd->gl_avlb_peers_start, ((device_type_s *)iterator->data)->mac_addr,
+ &ugd->gl_available_peer_cnt);
+ wfd_check_gl_available_peers(ugd);
+ }
+ }
+ }
+ }
+
+ __FUNC_EXIT__;
+}
+
+#ifdef WFD_ON_OFF_GENLIST
+/**
+ * This function is called when user swipes on/off button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _onoff_changed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
+ WFD_RET_IF(ugd->on_off_check == NULL, "on_off_check(NULL)\n");
+ wfd_refresh_wifi_direct_state(ugd);
+ if(ugd->device_name_item != NULL)
+ elm_genlist_item_update(ugd->device_name_item);
+
+ elm_object_disabled_set(ugd->on_off_check, TRUE);
+ if(ugd->disconnect_btn) {
+ Evas_Object *content;
+ content = elm_object_part_content_unset(ugd->layout, "button.next");
+ WFD_IF_DEL_OBJ(content);
+ ugd->disconnect_btn = NULL;
+ }
+ elm_object_part_content_set(ugd->layout, "button.big", ugd->scan_toolbar);
+
+ /* turn on/off wfd */
+ if (!ugd->wfd_onoff) {
+ if (ugd->wfd_status <= WIFI_DIRECT_STATE_DEACTIVATING) {
+ DBG(LOG_INFO, "wifi-direct switch on\n");
+ elm_genlist_item_selected_set(ugd->item_wifi_onoff,
+ EINA_FALSE);
+ wfd_client_switch_on(ugd);
+ }
+ } else {
+ if (ugd->wfd_status >= WIFI_DIRECT_STATE_ACTIVATING) {
+ DBG(LOG_INFO, "wifi-direct switch off\n");
+ elm_genlist_item_selected_set(ugd->item_wifi_onoff,
+ EINA_FALSE);
+ wfd_client_switch_off(ugd);
+ }
+ }
- ugd->naviframe = elm_naviframe_add(ugd->base);
- elm_object_part_content_set(ugd->base, "elm.swallow.content", ugd->naviframe);
- evas_object_show(ugd->naviframe);
+ __FUNC_EXIT__;
+}
- back_btn = elm_button_add(ugd->naviframe);
- elm_object_style_set(back_btn, "naviframe/back_btn/default");
- evas_object_smart_callback_add(back_btn, "clicked", _back_btn_cb, (void*) ugd);
- elm_object_focus_allow_set(back_btn, EINA_FALSE);
+void wfd_ug_refresh_on_off_check(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
+ WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
+ WFD_RET_IF(ugd->on_off_check == NULL, "on_off_check(NULL)\n");
+ wfd_refresh_wifi_direct_state(ugd);
+ if (ugd->wfd_status == WIFI_DIRECT_STATE_DEACTIVATING ||
+ ugd->wfd_status == WIFI_DIRECT_STATE_ACTIVATING ) {
+ elm_object_disabled_set(ugd->on_off_check, TRUE);
+ } else {
+ elm_object_disabled_set(ugd->on_off_check, FALSE);
+ }
+ if (ugd->wfd_status > WIFI_DIRECT_STATE_ACTIVATING) {
+ elm_check_state_set(ugd->on_off_check, TRUE);
+ } else {
+ elm_check_state_set(ugd->on_off_check, FALSE);
+ }
- ugd->genlist = _create_basic_genlist(ugd);
- if(ugd->genlist == NULL)
- {
- DBG(LOG_ERROR, "Failed to create basic genlist");
- return;
- }
- elm_object_style_set (ugd->genlist, "dialogue");
- evas_object_show(ugd->genlist);
- wfd_refresh_wifi_direct_state(ugd);
- if (ugd->wfd_status > WIFI_DIRECT_STATE_ACTIVATING)
- ugd->wfd_onoff = TRUE;
+ __FUNC_EXIT__;
+}
- navi_item = elm_naviframe_item_push(ugd->naviframe, _("IDS_WFD_HEADER_WIFI_DIRECT"), back_btn, NULL, ugd->genlist, NULL); // dgettext("sys_string", "IDS_COM_OPT1_WI_FI_DIRECT")
+void wfd_ug_create_on_off_check(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
+ WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
+ WFD_RET_IF(ugd->naviframe == NULL, "naviframe NULL\n");
+
+ Evas_Object *check = elm_check_add(ugd->naviframe);
+ elm_object_style_set(check, "naviframe/title_on&off");
+ elm_check_state_set(check, ugd->wfd_onoff);
+ evas_object_propagate_events_set(check, EINA_FALSE);
+ evas_object_smart_callback_add(check, "changed", _onoff_changed_cb, ugd);
+ elm_object_focus_allow_set(check, EINA_TRUE);
+ elm_object_item_part_content_set(ugd->navi_item, "title_right_btn", check);
+ evas_object_show(check);
+ ugd->on_off_check = check;
- control_bar = elm_toolbar_add(ugd->naviframe);
- elm_toolbar_shrink_mode_set(control_bar, ELM_TOOLBAR_SHRINK_EXPAND);
- evas_object_show(control_bar);
+ __FUNC_EXIT__;
+}
+#endif
- ugd->scan_btn = elm_toolbar_item_append(control_bar, NULL, _("IDS_WFD_BUTTON_SCAN"), _scan_btn_cb, (void*) ugd);
- item = elm_toolbar_item_append(control_bar, NULL, NULL, NULL, NULL);
- elm_object_item_disabled_set(item, EINA_TRUE);
+/**
+ * This function let the ug create the main view
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void create_wfd_ug_view(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
+ Evas_Object *more_btn;
+ Evas_Object *layout;
+
+ ugd->naviframe = elm_naviframe_add(ugd->base);
+ elm_naviframe_prev_btn_auto_pushed_set(ugd->naviframe, EINA_FALSE);
+ ea_object_event_callback_add(ugd->naviframe, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL);
+ ea_object_event_callback_add(ugd->naviframe, EA_CALLBACK_MORE, ea_naviframe_more_cb, NULL);
+ elm_object_part_content_set(ugd->base, "elm.swallow.content", ugd->naviframe);
+
+ ugd->back_btn = elm_button_add(ugd->naviframe);
+ elm_object_style_set(ugd->back_btn, "naviframe/back_btn/default");
+// evas_object_smart_callback_add(ugd->back_btn, "clicked", _back_btn_cb, (void *)ugd);
+ elm_object_focus_allow_set(ugd->back_btn, EINA_FALSE);
+
+ /* Create layout */
+ layout = elm_layout_add(ugd->naviframe);
+ elm_layout_file_set(layout, WFD_UG_EDJ_PATH, "main_layout");
+ ugd->layout = layout;
+
+ ugd->genlist = _create_basic_genlist(ugd);
+ if (ugd->genlist == NULL) {
+ DBG(LOG_ERROR, "Failed to create basic genlist");
+ return;
+ }
+ elm_object_part_content_set(layout, "elm.swallow.content", ugd->genlist);
+
+ elm_genlist_fx_mode_set(ugd->genlist, EINA_FALSE);
+ evas_object_show(ugd->base);
+ elm_object_focus_set(ugd->base, EINA_TRUE);
+
+ ugd->navi_item = elm_naviframe_item_push(ugd->naviframe, ugd->title,
+ ugd->back_btn, NULL, layout, NULL);
+ elm_naviframe_item_pop_cb_set(ugd->navi_item, _back_btn_cb, ugd);
+
+ more_btn = elm_button_add(ugd->naviframe);
+ elm_object_style_set(more_btn, "naviframe/more/default");
+ evas_object_smart_callback_add(more_btn, "clicked",
+ _more_button_cb, ugd->win);
+ elm_object_item_part_content_set(ugd->navi_item, "toolbar_more_btn",
+ more_btn);
+
+ wifi_direct_initialize();
+ wifi_direct_get_state(&ugd->wfd_status);
+ if (ugd->wfd_status > WIFI_DIRECT_STATE_DEACTIVATING) {
+ scan_button_create(ugd);
+ }
- elm_object_item_disabled_set(ugd->scan_btn, !ugd->wfd_onoff);
+ if (ugd->view_type && g_strcmp0(_(ugd->view_type), _("IDS_WIFI_BUTTON_MULTI_CONNECT")) == 0) {
+ int ret = 0;
+ ugd->raw_discovered_peer_cnt = 0;
+ wfd_create_multiconnect_view(ugd);
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ ret = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", ret);
+ wifi_direct_cancel_discovery();
+ }
+ return;
+ }
- elm_object_item_part_content_set(navi_item, "controlbar", control_bar);
+ __FUNC_EXIT__;
+}
- __FUNC_EXIT__;
+/**
+ * This function let the ug destroy the main view
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void destroy_wfd_ug_view(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ WFD_IF_DEL_ITEM(ugd->device_name_item);
+ WFD_IF_DEL_ITEM(ugd->multi_connect_toolbar_item);
+ WFD_IF_DEL_ITEM(ugd->conn_wfd_item);
+
+ WFD_IF_DEL_OBJ(ugd->scan_toolbar);
+ WFD_IF_DEL_OBJ(ugd->back_btn);
+ WFD_IF_DEL_OBJ(ugd->toolbar);
+ WFD_IF_DEL_OBJ(ugd->genlist);
+ WFD_IF_DEL_OBJ(ugd->naviframe);
+ __FUNC_EXIT__;
}
diff --git a/ug-wifidirect/src/wfd_ug_multiconnect_view.c b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
index aea5ce5..ef36a62 100755..100644
--- a/ug-wifidirect/src/wfd_ug_multiconnect_view.c
+++ b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
@@ -18,8 +18,6 @@
*/
#include <libintl.h>
-
-#include <assert.h>
#include <glib.h>
#include <Elementary.h>
@@ -31,113 +29,203 @@
#include "wfd_ug_view.h"
#include "wfd_client.h"
-Elm_Gen_Item_Class select_all_itc;
Elm_Gen_Item_Class device_itc;
-
-void _multiconnect_view_back_btn_cb(void *data, Evas_Object * obj, void *event_info)
+/**
+ * This function let the ug call it when click 'back' button in multi connect view
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+Eina_Bool _multiconnect_view_pop_cb(void *data, Elm_Object_Item *it)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ int ret = 0;
+ device_type_s *peer_for_free = NULL;
+ device_type_s *peer = NULL;
+
+ if (!ugd) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return EINA_FALSE;
+ }
- if(!ugd)
- {
- DBG(LOG_ERROR, "The param is NULL\n");
- return;
- }
+ peer = ugd->multi_conn_dev_list_start;
- ugd->multiconn_view_genlist = NULL;
- elm_naviframe_item_pop(ugd->naviframe);
+ while (peer != NULL) {
+ DBG(LOG_INFO, "Free peer, ssid:%s\n", peer->ssid);
+ peer_for_free = peer;
+ peer = peer->next;
+ free(peer_for_free);
+ peer_for_free = NULL;
+ }
- __FUNC_EXIT__;
- return;
-}
+ ugd->multi_conn_dev_list_start = NULL;
+ ugd->multiconn_view_genlist = NULL;
+ ugd->mcview_title_item = NULL;
+ ugd->mcview_nodevice_item = NULL;
+ ugd->multi_navi_item = NULL;
+ ugd->multiconn_conn_btn = NULL;
+ ugd->multiconn_layout = NULL;
+ ugd->multiconn_scan_stop_btn = NULL;
+
+ DBG(LOG_INFO, "MultiConnectMode: %d\n", ugd->multi_connect_mode);
+
+ /* if pressing connect for multi-connecting, it should not start discovery again */
+ if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_NONE) {
+ if (ugd->view_type == NULL) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ DBG(LOG_INFO, "Discovery started\n");
+ ret = wifi_direct_start_discovery_specific_channel(false, 1,
+ WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", ret);
+ wifi_direct_cancel_discovery();
+ }
+ } else if (g_strcmp0(_(ugd->view_type),
+ _("IDS_WIFI_BUTTON_MULTI_CONNECT")) == 0) {
+ DBG(LOG_INFO, "Discovery not started\n");
+ ug_destroy_me(ugd->ug);
+ }
+ }
-void reset_multi_conn_dev_list(void *data)
-{
- struct ug_data *ugd = (struct ug_data*) data;
- int i;
- for (i = 0; i < MAX_PEER_NUM; i++)
- {
- ugd->multi_conn_dev_list[i].dev_sel_state = FALSE;
- ugd->multi_conn_dev_list[i].peer.gl_item = NULL;
- }
- ugd->gl_available_dev_cnt_at_multiconn_view = 0;
+ __FUNC_EXIT__;
+ return EINA_TRUE;
}
+/**
+ * This function let the ug reset the connected failed peers
+ * @return false
+ * @param[in] event_info the pointer to the event information
+ */
gboolean __wfd_multi_connect_reset_cb(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
- ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_NONE;
- ugd->raw_multi_selected_peer_cnt = 0;
- wfd_ug_view_update_peers(ugd);
+ if (!data) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return false;
+ }
+
+ device_type_s *peer = NULL;
+ struct ug_data *ugd = (struct ug_data *)data;
+
+ peer = ugd->gl_mul_conn_peers_start;
+ while (peer != NULL) {
+ elm_object_item_del(peer->gl_item);
+ peer->gl_item = NULL;
+ peer = peer->next;
+ }
+
+ WFD_IF_DEL_ITEM(ugd->multi_connect_wfd_item);
+ WFD_IF_DEL_ITEM(ugd->multi_connect_sep_item);
+
+ wfd_ug_update_available_peers(ugd);
__FUNC_EXIT__;
return false;
}
+/**
+ * This function let the ug free the selected peers in multi connect view
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+void wfd_free_multi_selected_peers(void *data)
+{
+ __FUNC_ENTER__;
+
+ int i = 0;
+ struct ug_data *ugd = (struct ug_data *)data;
+
+ /* destroy the created group */
+ wifi_direct_destroy_group();
+
+ /* release the selected peers */
+ for (i = 0; i < ugd->raw_multi_selected_peer_cnt; i++) {
+ memset(&ugd->raw_multi_selected_peers[i], 0x00, sizeof(device_type_s));
+ }
+
+ ugd->raw_multi_selected_peer_cnt = 0;
+ ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_NONE;
+
+ __FUNC_EXIT__;
+
+}
+
+/**
+ * This function let the ug stop to connect to selected peer
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
int wfd_stop_multi_connect(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+
+ if (ugd->act_popup) {
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ }
- ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_COMPLETED;
- wfd_client_set_p2p_group_owner_intent(7);
+ /* change the title of failed peers */
+ ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_COMPLETED;
+ wfd_ug_view_refresh_glitem(ugd->multi_connect_wfd_item);
+ wfd_ug_update_toolbar(ugd);
- g_timeout_add(1000 /*ms*/, __wfd_multi_connect_reset_cb, ugd);
+ if (ugd->gl_connected_peer_cnt > 0) {
+ wfd_client_set_p2p_group_owner_intent(7);
+ } else {
+ wifi_direct_destroy_group();
+ }
+
+ if(ugd->timer_multi_reset > 0) {
+ g_source_remove(ugd->timer_multi_reset);
+ }
+ /* after 30s, remove the failed peers */
+ ugd->timer_multi_reset = g_timeout_add(30000 /*ms*/,
+ __wfd_multi_connect_reset_cb, ugd);
+
+ if (ugd->g_source_multi_connect_next > 0) {
+ g_source_remove(ugd->g_source_multi_connect_next);
+ }
+ ugd->g_source_multi_connect_next = 0;
+
+ /*when multi-connect end and auto_exit is true, exit UG*/
+ if (ugd->is_auto_exit) {
+ _wfd_ug_auto_exit(ugd);
+ }
- __FUNC_EXIT__;
+ __FUNC_EXIT__;
return 0;
}
-int wfd_start_multi_connect(void* data)
+/**
+ * This function let the ug start to connect the selected peers
+ * @return If success, return 0, else return -1
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_start_multi_connect(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int i;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
int res;
- if (ugd->raw_multi_selected_peer_cnt > 0)
- {
+ if (ugd->raw_multi_selected_peer_cnt > 0) {
ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_IN_PROGRESS;
- if (wfd_client_set_p2p_group_owner_intent(15) == WIFI_DIRECT_ERROR_NONE)
- {
- for (i=0;i<ugd->raw_multi_selected_peer_cnt; i++)
- {
- res = wfd_client_connect(ugd->raw_multi_selected_peers[i].mac_addr);
- if (res == -1)
- {
- DBG(LOG_VERBOSE, "Failed to connect [%s].\n", ugd->raw_multi_selected_peers[i].ssid);
- ugd->raw_multi_selected_peers[i].conn_status = PEER_CONN_STATUS_FAILED_TO_CONNECT;
- }
- else
- {
- ugd->raw_multi_selected_peers[i].conn_status = PEER_CONN_STATUS_CONNECTING;
- break;
- }
- }
- if (i >= ugd->raw_multi_selected_peer_cnt)
- {
- wfd_client_set_p2p_group_owner_intent(7);
+ res = wfd_client_group_add();
+ if (res == -1) {
+ DBG(LOG_ERROR, "Failed to add group");
+ wfd_free_multi_selected_peers(ugd);
- DBG(LOG_VERBOSE, "All connect trails are failed.\n");
- return -1;
- }
- }
- else
- {
- // error popup...
- DBG(LOG_VERBOSE, "Setting GO intent is failed.\n");
+ __FUNC_EXIT__;
return -1;
}
-
- }
- else
- {
- DBG(LOG_VERBOSE, "No selected peers.\n");
+ } else {
+ DBG(LOG_INFO, "No selected peers.\n");
return -1;
}
@@ -145,551 +233,769 @@ int wfd_start_multi_connect(void* data)
return 0;
}
-gboolean wfd_multi_connect_next_cb(void* data)
+void wfd_sort_multi_selected_peers(struct ug_data *ugd)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ int i = 0;
+ int j = 0;
+ device_type_s peer;
+
+ for(i = 0; i < ugd->raw_multi_selected_peer_cnt; i++) {
+ for(j = 0; j < ugd->raw_multi_selected_peer_cnt-i-1; j++) {
+ if (strcasecmp(ugd->raw_multi_selected_peers[j].ssid, ugd->raw_multi_selected_peers[j + 1].ssid) > 0) {
+ peer = ugd->raw_multi_selected_peers[j];
+ ugd->raw_multi_selected_peers[j] = ugd->raw_multi_selected_peers[j + 1];
+ ugd->raw_multi_selected_peers[j + 1] = peer;
+ }
+ }
+ }
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug connect to the next selected peer automatically
+ * @return If stop the timer, return false, else return true
+ * @param[in] data the pointer to the main data structure
+ */
+gboolean wfd_multi_connect_next_cb(void *data)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
int i;
int res;
// Reset g_source handler..
+ if (ugd->g_source_multi_connect_next > 0) {
+ g_source_remove(ugd->g_source_multi_connect_next);
+ }
ugd->g_source_multi_connect_next = 0;
- if (ugd->raw_multi_selected_peer_cnt > 0)
- {
+ if (ugd->raw_multi_selected_peer_cnt > 0) {
ugd->multi_connect_mode = WFD_MULTI_CONNECT_MODE_IN_PROGRESS;
- for (i=0;i<ugd->raw_multi_selected_peer_cnt; i++)
- {
- if (ugd->raw_multi_selected_peers[i].conn_status == PEER_CONN_STATUS_WAIT_FOR_CONNECT)
- {
+ for (i = 0; i < ugd->raw_multi_selected_peer_cnt; i++) {
+ if (ugd->raw_multi_selected_peers[i].conn_status == PEER_CONN_STATUS_WAIT_FOR_CONNECT) {
+ ugd->mac_addr_connecting = ugd->raw_multi_selected_peers[i].mac_addr;
res = wfd_client_connect(ugd->raw_multi_selected_peers[i].mac_addr);
- if (res == -1)
- {
- DBG(LOG_VERBOSE, "Failed to connect [%s].\n", ugd->raw_multi_selected_peers[i].ssid);
+ if (res == -1) {
ugd->raw_multi_selected_peers[i].conn_status = PEER_CONN_STATUS_FAILED_TO_CONNECT;
- }
- else
- {
+ } else {
ugd->raw_multi_selected_peers[i].conn_status = PEER_CONN_STATUS_CONNECTING;
break;
}
}
}
- if (i >= ugd->raw_multi_selected_peer_cnt)
- {
+ if (i >= ugd->raw_multi_selected_peer_cnt) {
// All selected peers are touched.
- DBG(LOG_VERBOSE, "Stop Multi Connect...\n");
+ DBG(LOG_INFO, "Stop Multi Connect...\n");
wfd_stop_multi_connect(ugd);
}
- }
- else
- {
- DBG(LOG_VERBOSE, "No selected peers.\n");
- return -1;
+ } else {
+ DBG(LOG_INFO, "No selected peers.\n");
}
__FUNC_EXIT__;
return false;
}
-
-void _connect_btn_cb(void *data, Evas_Object * obj, void *event_info)
+/**
+ * This function let the ug call it when click 'connect' button in multi connect view
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _connect_btn_cb(void *data, Evas_Object *obj, void *event_info)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- int i = 0;
- int count = 0;
- char popup_text[MAX_POPUP_TEXT_SIZE] = {0};
- DBG(LOG_VERBOSE, "_connect_btn_cb \n");
-
- for (i = 0; i < ugd->gl_available_peer_cnt ; i++)
- {
- if (TRUE == ugd->multi_conn_dev_list[i].dev_sel_state)
- {
- DBG(LOG_VERBOSE, "ugd->peers[i].mac_addr = %s, i = %d\n", ugd->multi_conn_dev_list[i].peer.mac_addr, i);
-
- memcpy(&ugd->raw_multi_selected_peers[count], &ugd->multi_conn_dev_list[i].peer,sizeof(device_type_s));
- ugd->raw_multi_selected_peers[count].conn_status = PEER_CONN_STATUS_WAIT_FOR_CONNECT;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ int count = 0;
+ char popup_text[MAX_POPUP_TEXT_SIZE] = {0};
+ device_type_s *peer = NULL;
+
+ peer = ugd->multi_conn_dev_list_start;
+ while (peer != NULL) {
+ if(peer->dev_sel_state) {
count++;
- }
- }
-
- ugd->raw_multi_selected_peer_cnt = count;
+ }
+ peer = peer->next;
+ }
+ DBG(LOG_INFO, "MultiSelected Peer Count: %d", count);
- /* if more than 7 device selected, show the popup */
- if (count > MAX_POPUP_PEER_NUM) {
- snprintf(popup_text, MAX_POPUP_TEXT_SIZE, _("IDS_WFD_POP_MULTI_CONNECT"), count);
+ /* if more than 7 device selected, show the popup */
+ if (count > MAX_CONNECTED_PEER_NUM) {
+ snprintf(popup_text, MAX_POPUP_TEXT_SIZE, _("IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"), MAX_CONNECTED_PEER_NUM);
wfd_ug_warn_popup(ugd, popup_text, POP_TYPE_MULTI_CONNECT_POPUP);
- }
+ __FUNC_EXIT__;
+ return;
+ }
- if (wfd_start_multi_connect(ugd) != -1)
- {
- wfd_ug_view_update_peers(ugd);
- }
+ peer = ugd->multi_conn_dev_list_start;
+ count = 0;
+ while (peer != NULL) {
+ if(peer->dev_sel_state) {
+ DBG(LOG_INFO, "peer_name[%s] select state[%d]", peer->ssid, peer->dev_sel_state);
+ memcpy(&ugd->raw_multi_selected_peers[count], peer, sizeof(device_type_s));
+ ugd->raw_multi_selected_peers[count].conn_status = PEER_CONN_STATUS_WAIT_FOR_CONNECT;
+ count++;
+ }
+ peer = peer->next;
+ }
- elm_naviframe_item_pop(ugd->naviframe);
+ DBG(LOG_INFO, "MultiSelected Peer Count2: %d", count);
+ ugd->raw_multi_selected_peer_cnt = count;
+ wfd_sort_multi_selected_peers(ugd);
+ wfd_cancel_progressbar_stop_timer(ugd);
+ wfd_cancel_not_alive_delete_timer(ugd);
- //ToDo: Do we need to free multiconn_view_genlist?
- ugd->multiconn_view_genlist = NULL;
- _change_multi_button_title(ugd);
+ /* start multi connection */
+ wfd_start_multi_connect(ugd);
+
+ elm_naviframe_item_pop(ugd->naviframe);
__FUNC_EXIT__;
return;
}
+void wfd_naviframe_title_set(struct ug_data *ugd, const char *title)
+{
+ if (!ugd || !ugd->multi_navi_item) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return;
+ }
+ elm_object_item_part_text_set(ugd->multi_navi_item, "default", title);
+}
+/**
+ * This function let the ug call it when click the peer in multi connect view
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
static void _wfd_gl_multi_sel_cb(void *data, Evas_Object *obj, void *event_info)
{
__FUNC_ENTER__;
- int i = 0;
- int index = 0;
int sel_count = 0;
bool is_sel = FALSE;
- bool is_selct_all = TRUE;
- Eina_Bool state = 0;
+
+ Eina_Bool state = EINA_FALSE;
Evas_Object *chk_box = NULL;
- char msg[MAX_POPUP_TEXT_SIZE] = {0};
- struct ug_data *ugd = (struct ug_data*) data;
- Elm_Object_Item *item = (Elm_Object_Item *)event_info;
+ const char *object_type = NULL;
+ struct ug_data *ugd = (struct ug_data *)wfd_get_ug_data();
+ device_type_s *peer = (device_type_s *)data;
- if (NULL == ugd || NULL == item) {
- DBG(LOG_ERROR, "The param is NULL\n");
- return;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "ugd is NULL\n");
+ return;
}
- elm_genlist_item_selected_set(item, EINA_FALSE);
- index = elm_genlist_item_index_get(item) - 3; /* subtract the previous items */
- DBG(LOG_VERBOSE, "selected index = %d \n", index);
- if (index < 0) {
- DBG(LOG_ERROR, "The index is invalid.\n");
- return;
+ ugd->is_multi_check_all_selected = TRUE;
+
+ if(event_info != NULL) {
+ Evas_Object *content = elm_object_item_part_content_get(event_info, "elm.icon.2");
+ chk_box = elm_object_part_content_get(content, "elm.swallow.content");
+ state = elm_check_state_get(chk_box);
+ DBG(LOG_INFO, "state = %d \n", state);
+ if (chk_box == NULL) {
+ DBG(LOG_INFO, "Check box is null\n");
+ }
}
- chk_box = elm_object_item_part_content_get((Elm_Object_Item *)event_info, "elm.icon.1");
- state = elm_check_state_get(chk_box);
- DBG(LOG_VERBOSE, "state = %d \n", state);
- elm_check_state_set(chk_box, !state);
+ object_type = evas_object_type_get(obj);
+ if (g_strcmp0(object_type, "elm_genlist") == 0) {
+ Elm_Object_Item *item = (Elm_Object_Item *)event_info;
+ if (item) {
+ elm_genlist_item_selected_set(item, EINA_FALSE);
+ }
+ DBG(LOG_INFO, "State elm_genlist %d\n", state);
+ elm_check_state_set(chk_box, !state);
+ peer->dev_sel_state = !state;
+ } else if (g_strcmp0(object_type, "elm_check") == 0){
+ DBG(LOG_INFO, "elm_check state; %d\n", peer->dev_sel_state);
+ peer->dev_sel_state = !peer->dev_sel_state;
+ }
- ugd->multi_conn_dev_list[index].dev_sel_state = !state;
- DBG(LOG_VERBOSE, "ptr->dev_sel_state = %d \n", ugd->multi_conn_dev_list[index].dev_sel_state);
- DBG(LOG_VERBOSE, "ptr->peer.mac_addr = %s \n", ugd->multi_conn_dev_list[index].peer.mac_addr);
+ DBG(LOG_INFO, "ptr->dev_sel_state = %d \n", peer->dev_sel_state);
+ DBG_SECURE(LOG_INFO, "ptr->peer.mac_addr = ["MACSECSTR"]\n",
+ MAC2SECSTR(peer->mac_addr));
- /* update the checkbox and button */
- for (; i < ugd->gl_available_dev_cnt_at_multiconn_view; i++) {
- if (ugd->multi_conn_dev_list[i].dev_sel_state) {
+ peer = ugd->multi_conn_dev_list_start;
+ while (peer != NULL) {
+ if(peer->dev_sel_state) {
is_sel = TRUE;
sel_count++;
} else {
- is_selct_all = FALSE;
+ ugd->is_multi_check_all_selected = FALSE;
}
+ peer = peer->next;
}
- chk_box = elm_object_item_part_content_get(ugd->mcview_select_all_item, "elm.icon");
- elm_check_state_set(chk_box, is_selct_all);
-
- if (ugd->multi_connect_btn) {
- wfd_ug_view_refresh_button(ugd->multi_connect_btn, _("IDS_WFD_BUTTON_CONNECT"), is_sel);
+ if (is_sel) {
+ char title[MAX_POPUP_TEXT_SIZE] = {0};
+ snprintf(title, MAX_POPUP_TEXT_SIZE, _("IDS_ST_HEADER_PD_SELECTED"), sel_count);
+ wfd_naviframe_title_set(ugd, title);
+ } else {
+ wfd_naviframe_title_set(ugd, _("IDS_DLNA_HEADER_SELECT_DEVICES_ABB"));
}
- if (sel_count > 0) {
- snprintf(msg, MAX_POPUP_TEXT_SIZE, _("IDS_WFD_POP_SELECTED_DEVICE_NUM"), sel_count);
- wfd_ug_tickernoti_popup(msg);
+ state = elm_check_state_get(ugd->select_all_icon);
+ if (ugd->multiconn_layout) {
+ if (state != EINA_TRUE && ugd->is_multi_check_all_selected == TRUE) {
+ elm_check_state_set(ugd->select_all_icon, TRUE);
+ ugd->is_select_all_checked = TRUE;
+ } else if (ugd->is_multi_check_all_selected == FALSE) {
+ elm_check_state_set(ugd->select_all_icon, FALSE);
+ ugd->is_select_all_checked = FALSE;
+ }
+ wfd_ug_view_refresh_button(ugd->multiconn_conn_btn,
+ "IDS_WIFI_SK_CONNECT", is_sel);
}
__FUNC_EXIT__;
}
-static void _wfd_gl_sel_cb(void *data, Evas_Object *obj, void *event_info)
+/**
+ * This function let the ug get the label of peer
+ * @return the label of peer
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static char *_wfd_gl_device_label_get(void *data, Evas_Object *obj, const char *part)
{
- int sel_count = 0;
- char msg[MAX_POPUP_TEXT_SIZE] = {0};
- struct ug_data *ugd = (struct ug_data*) data;
-
- elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+ __FUNC_ENTER__;
+ DBG(LOG_INFO, "part %s", part);
+ device_type_s *peer = (device_type_s *)data;
+ char *ssid;
- if (NULL == ugd || NULL == obj) {
- DBG(LOG_ERROR, "NULL parameters.\n");
- return;
+ if (NULL == peer) {
+ return NULL;
}
- Evas_Object *sel_chkbox = elm_object_item_part_content_get(ugd->mcview_select_all_item, "elm.icon");
- if (sel_chkbox==NULL)
- {
- DBG(LOG_VERBOSE, "select-all chkbox is NULL\n");
- return;
+ if (!g_strcmp0(part, "elm.text.main.left")) {
+ if (strlen(peer->ssid) != 0) {
+ ssid = elm_entry_utf8_to_markup(peer->ssid);
+ if (NULL == ssid) {
+ DBG(LOG_ERROR, "elm_entry_utf8_to_markup failed.\n");
+ __FUNC_EXIT__;
+ return NULL;
+ }
+ __FUNC_EXIT__;
+ return ssid;
+ }
}
- Eina_Bool state = elm_check_state_get(sel_chkbox);
+ return NULL;
+}
- if (state==TRUE)
- state = FALSE;
- else
- state = TRUE;
- elm_check_state_set(sel_chkbox, state);
+/**
+ * This function let the ug get the icon path of peer
+ * @return the icon path of titile
+ * @param[in] peer the pointer to the peer
+ */
+static char *__wfd_get_device_icon_path(device_type_s *peer)
+{
+ __FUNC_ENTER__;
+ char *img_name = NULL;
+
+ switch (peer->category) {
+ case WFD_DEVICE_TYPE_COMPUTER:
+ img_name = WFD_ICON_DEVICE_COMPUTER;
+ break;
+ case WFD_DEVICE_TYPE_INPUT_DEVICE:
+ img_name = WFD_ICON_DEVICE_INPUT_DEVICE;
+ break;
+ case WFD_DEVICE_TYPE_PRINTER:
+ img_name = WFD_ICON_DEVICE_PRINTER;
+ break;
+ case WFD_DEVICE_TYPE_CAMERA:
+ img_name = WFD_ICON_DEVICE_CAMERA;
+ break;
+ case WFD_DEVICE_TYPE_STORAGE:
+ img_name = WFD_ICON_DEVICE_STORAGE;
+ break;
+ case WFD_DEVICE_TYPE_NW_INFRA:
+ img_name = WFD_ICON_DEVICE_NETWORK_INFRA;
+ break;
+ case WFD_DEVICE_TYPE_DISPLAYS:
+ img_name = WFD_ICON_DEVICE_DISPLAY;
+ break;
+ case WFD_DEVICE_TYPE_MM_DEVICES:
+ img_name = WFD_ICON_DEVICE_MULTIMEDIA;
+ break;
+ case WFD_DEVICE_TYPE_GAME_DEVICES:
+ img_name = WFD_ICON_DEVICE_GAMING;
+ break;
+ case WFD_DEVICE_TYPE_TELEPHONE:
+ img_name = WFD_ICON_DEVICE_TELEPHONE;
+ break;
+ case WFD_DEVICE_TYPE_AUDIO:
+ img_name = WFD_ICON_DEVICE_HEADSET;
+ break;
+ default:
+ img_name = WFD_ICON_DEVICE_UNKNOWN;
+ break;
+ }
+ return img_name;
+}
- DBG(LOG_VERBOSE, "state = %d \n", state);
+/**
+ * This function let the ug get the icon of peer
+ * @return the icon of peer
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] part the pointer to the part of item
+ */
+static Evas_Object *_wfd_gl_device_icon_get(void *data, Evas_Object *obj, const char *part)
+{
+ __FUNC_ENTER__;
+ char *img_name = NULL;
+ device_type_s *peer = (device_type_s *) data;
+ Evas_Object *icon = NULL;
+ Evas_Object *icon_layout = NULL;
+
+
+ DBG(LOG_INFO, "Part %s", part);
+
+ if (!g_strcmp0(part, "elm.icon.2")) {
+ icon_layout = elm_layout_add(obj);
+ elm_layout_theme_set(icon_layout, "layout", "list/C/type.2", "default");
+ DBG(LOG_INFO, "Part %s", part);
+ icon = elm_check_add(icon_layout);
+ elm_object_style_set(icon, "default/genlist");
+ evas_object_propagate_events_set(icon, EINA_FALSE);
+ if (peer->dev_sel_state == EINA_TRUE) {
+ elm_check_state_set(icon, EINA_TRUE);
+ }
+ evas_object_smart_callback_add(icon,
+ "changed", _wfd_gl_multi_sel_cb, (void *)data);
+ elm_layout_content_set(icon_layout, "elm.swallow.content", icon);
+ }else if (!g_strcmp0(part, "elm.icon.1")) {
+ DBG(LOG_INFO, "Part %s", part);
+ icon_layout = elm_layout_add(obj);
+ elm_layout_theme_set(icon_layout, "layout", "list/B/type.3", "default");
+ img_name = __wfd_get_device_icon_path(peer);
+ icon = elm_image_add(icon_layout);
+ elm_image_file_set(icon, WFD_UG_EDJ_PATH, img_name);
+ evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ ea_theme_object_color_set(icon, "AO001");
+ evas_object_show(icon);
+ evas_object_propagate_events_set(icon, EINA_FALSE);
+ elm_layout_content_set(icon_layout, "elm.swallow.content", icon);
+ }
+ evas_object_show(icon_layout);
+ return icon_layout;
+}
- int i = 0;
+/**
+ * This function let the ug call it when unresized event is received
+*/
+static void _gl_unrealized(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ int sel_count = 0;
bool is_sel = FALSE;
- Elm_Object_Item *item = NULL;
- Evas_Object *chk_box = NULL;
+ device_type_s *peer = NULL;
- /* set the state of all the available devices */
- for (i = 0; i < ugd->gl_available_dev_cnt_at_multiconn_view; i++) {
- is_sel = state;
- ugd->multi_conn_dev_list[i].dev_sel_state = state;
- item = ugd->multi_conn_dev_list[i].peer.gl_item;
- chk_box = elm_object_item_part_content_get(item, "elm.icon.1");
- elm_check_state_set(chk_box, state);
+ if (!ugd->multiconn_conn_btn) {
+ DBG(LOG_INFO, "popup naviframe, no need to update UI\n");
+ return;
+ }
- if (state) {
- sel_count++;
+ if (ugd->gl_available_dev_cnt_at_multiconn_view > 0) {
+ peer = ugd->multi_conn_dev_list_start;
+ while (peer != NULL) {
+ if(peer->dev_sel_state) {
+ is_sel = TRUE;
+ sel_count++;
+ }
+ peer = peer->next;
}
}
- /* update the connect button */
- if (ugd->multi_connect_btn) {
- wfd_ug_view_refresh_button(ugd->multi_connect_btn, _("IDS_WFD_BUTTON_CONNECT"), is_sel);
+ if (is_sel) {
+ char title[MAX_POPUP_TEXT_SIZE] = {0};
+ snprintf(title, MAX_POPUP_TEXT_SIZE, _("IDS_ST_HEADER_PD_SELECTED"), sel_count);
+ wfd_naviframe_title_set(ugd, title);
+ } else {
+ wfd_naviframe_title_set(ugd, _("IDS_DLNA_HEADER_SELECT_DEVICES_ABB"));
}
- /* tickernoti popup */
- if (sel_count > 0) {
- snprintf(msg, MAX_POPUP_TEXT_SIZE, _("IDS_WFD_POP_SELECTED_DEVICE_NUM"), sel_count);
- wfd_ug_tickernoti_popup(msg);
+ if (ugd->multiconn_conn_btn) {
+ wfd_ug_view_refresh_button(ugd->multiconn_conn_btn,
+ "IDS_WIFI_SK_CONNECT", is_sel);
}
- //elm_check_state_set(ugd->mcview_select_all_icon, EINA_FALSE);
+ __FUNC_EXIT__;
}
-
-static char *_wfd_gl_device_label_get(void *data, Evas_Object *obj, const char *part)
+/**
+ * This function let the ug free the multi connect devices
+ * @return 0
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_free_multiconnect_device(struct ug_data *ugd)
{
- DBG(LOG_VERBOSE, "part %s", part);
- device_type_s *peer = (device_type_s*) data;
+ __FUNC_ENTER__;
- if (NULL == peer)
- return NULL;
+ if (ugd->multiconn_view_genlist == NULL) {
+ return 0;
+ }
- if (!strcmp(part, "elm.text")) {
- return strdup(peer->ssid);
+ ugd->gl_available_dev_cnt_at_multiconn_view = 0;
+ if (ugd->multi_conn_dev_list_start != NULL) {
+ wfd_ug_view_free_peer(ugd->multi_conn_dev_list_start);
+ ugd->multi_conn_dev_list_start = NULL;
}
- return NULL;
-}
+ __FUNC_EXIT__;
+ return 0;
+}
-static char *__wfd_get_device_icon_path(device_type_s *peer)
+/**
+ * This function let the ug create "no device found" item
+*/
+Evas_Object *_create_no_device_multiconnect_genlist(struct ug_data *ugd)
{
- char *img_path = NULL;
-
- switch(peer->category)
- {
- case WFD_DEVICE_TYPE_COMPUTER:
- img_path = WFD_ICON_DEVICE_COMPUTER;
- break;
- case WFD_DEVICE_TYPE_INPUT_DEVICE:
- img_path = WFD_ICON_DEVICE_INPUT_DEVICE;
- break;
- case WFD_DEVICE_TYPE_PRINTER:
- img_path = WFD_ICON_DEVICE_PRINTER;
- break;
- case WFD_DEVICE_TYPE_CAMERA:
- img_path = WFD_ICON_DEVICE_CAMERA;
- break;
- case WFD_DEVICE_TYPE_STORAGE:
- img_path = WFD_ICON_DEVICE_STORAGE;
- break;
- case WFD_DEVICE_TYPE_NW_INFRA:
- img_path = WFD_ICON_DEVICE_NETWORK_INFRA;
- break;
- case WFD_DEVICE_TYPE_DISPLAYS:
- img_path = WFD_ICON_DEVICE_DISPLAY;
- break;
- case WFD_DEVICE_TYPE_MM_DEVICES:
- img_path = WFD_ICON_DEVICE_MULTIMEDIA_DEVICE;
- break;
- case WFD_DEVICE_TYPE_GAME_DEVICES:
- img_path = WFD_ICON_DEVICE_GAMING_DEVICE;
- break;
- case WFD_DEVICE_TYPE_TELEPHONE:
- img_path = WFD_ICON_DEVICE_TELEPHONE;
- break;
- case WFD_DEVICE_TYPE_AUDIO:
- img_path = WFD_ICON_DEVICE_AUDIO_DEVICE;
- break;
- default:
- img_path = WFD_ICON_DEVICE_COMPUTER;
- break;
- }
-
- return img_path;
-}
+ __FUNC_ENTER__;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "NULL parameters.\n");
+ return NULL;
+ }
+ if (!ugd->mcview_nodevice_item) {
+ ugd->mcview_nodevice_item = elm_genlist_item_append(ugd->multiconn_view_genlist, &noitem_itc, (void *)ugd, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->mcview_nodevice_item != NULL)
+ elm_genlist_item_select_mode_set(ugd->mcview_nodevice_item , ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ }
-static void _wfd_check_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+ __FUNC_EXIT__;
+ return ugd->multiconn_view_genlist;
+}
+
+/**
+ * This function let the ug update the multi connect devices
+ * @return 0
+ * @param[in] data the pointer to the main data structure
+ */
+int wfd_update_multiconnect_device(struct ug_data *ugd, bool is_free_all_peers)
{
- struct ug_data *ugd = (struct ug_data*) data;
- if (NULL == ugd || NULL == obj) {
- DBG(LOG_ERROR, "NULL parameters.\n");
- return;
- }
+ __FUNC_ENTER__;
- int i = 0;
- bool is_sel = FALSE;
+ int count = 0;
+ device_type_s *device = NULL;
+ Evas_Object *genlist = NULL;
Elm_Object_Item *item = NULL;
- Evas_Object *chk_box = NULL;
- Eina_Bool state = elm_check_state_get(obj);
- elm_check_state_set(obj, !state);
+ int res = 0;
- DBG(LOG_VERBOSE, "state = %d \n", state);
-
-#if 0
- /* set the state of all the available devices */
- for (i = 0; i < ugd->gl_available_dev_cnt_at_multiconn_view; i++) {
- is_sel = state;
- ugd->multi_conn_dev_list[i].dev_sel_state = state;
- item = ugd->multi_conn_dev_list[i].peer.gl_item;
- chk_box = elm_object_item_part_content_get(item, "elm.icon.1");
- elm_check_state_set(chk_box, state);
+ genlist = ugd->multiconn_view_genlist;
+ if (ugd->multiconn_view_genlist == NULL) {
+ return 0;
}
- /* update the connect button */
- wfd_ug_view_refresh_button(ugd->multi_connect_btn, _("IDS_WFD_BUTTON_CONNECT"), is_sel);
-#endif
-}
+ if (is_free_all_peers) {
+ wfd_free_multiconnect_device(ugd);
+ }
+ GList *iterator = NULL;
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ device = (device_type_s *)iterator->data;
+ if (device->is_connected == FALSE && device->is_group_owner == FALSE) {
+ count++;
+ }
+ }
-static Evas_Object *_wfd_gl_device_icon_get(void *data, Evas_Object *obj, const char *part)
-{
- char *img_path = NULL;
- device_type_s *peer = (device_type_s*) data;
- Evas_Object* icon = NULL;
-
- DBG(LOG_VERBOSE, "Part %s", part);
-
- if (!strcmp(part, "elm.icon.1")) {
- DBG(LOG_VERBOSE, "Part %s", part);
- icon = elm_check_add(obj);
- elm_check_state_set(icon, EINA_FALSE);
- evas_object_smart_callback_add(icon, "changed", _wfd_check_clicked_cb, (void *)data);
- } else if (!strcmp(part, "elm.icon.2")) {
- img_path = __wfd_get_device_icon_path(peer);
- icon = elm_icon_add(obj);
- elm_icon_file_set(icon, img_path, NULL);
- evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
- elm_icon_resizable_set(icon, 1, 1);
- evas_object_show(icon);
+ if (count == 0) {
+ DBG(LOG_INFO, "There are No peers\n");
+ if (!ugd->mcview_title_item) {
+ ugd->mcview_title_item = elm_genlist_item_append(genlist, &multi_view_title_itc, ugd, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(ugd->mcview_title_item != NULL)
+ elm_genlist_item_select_mode_set(ugd->mcview_title_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ } else {
+ wfd_ug_view_refresh_glitem(ugd->mcview_title_item);
+ }
+ elm_check_state_set(ugd->select_all_icon, EINA_FALSE);
+ ugd->is_select_all_checked = FALSE;
+ wfd_free_multiconnect_device(ugd);
+ wfd_naviframe_title_set(ugd, _("IDS_DLNA_HEADER_SELECT_DEVICES_ABB"));
+ } else {
+ WFD_IF_DEL_ITEM(ugd->mcview_nodevice_item);
+ wfd_ug_view_refresh_glitem(ugd->mcview_title_item);
+
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ device = (device_type_s *)iterator->data;
+ if (device->is_connected == FALSE && device->is_group_owner == FALSE) {
+ if (!find_peer_in_glist(ugd->multi_conn_dev_list_start, device->mac_addr)) {
+ item = get_insert_postion(device, ugd->mcview_title_item, ugd->gl_available_dev_cnt_at_multiconn_view);
+ res = insert_gl_item(genlist, item, &device_itc, &ugd->multi_conn_dev_list_start,
+ device, _wfd_gl_multi_sel_cb);
+ if (res != 0) {
+ break;
+ }
+ elm_check_state_set(ugd->select_all_icon, EINA_FALSE);
+ ugd->is_select_all_checked = FALSE;
+
+ ugd->gl_available_dev_cnt_at_multiconn_view++;
+ }
+ }
+ }
}
+ ugd->is_multi_check_all_selected = FALSE;
- return icon;
+ __FUNC_EXIT__;
+ return 0;
}
-
-static char *_wfd_gl_select_all_label_get(void *data, Evas_Object *obj, const char *part)
+void wfd_genlist_select_all_check_changed_cb(void *data, Evas_Object * obj, void *event_info)
{
- if (!strcmp(part, "elm.text")) {
- DBG(LOG_VERBOSE, "Adding text %s", part);
- return strdup("Select all");
+ __FUNC_ENTER__;
+ Elm_Object_Item *item = NULL;
+ Evas_Object *chk_box = NULL;
+ Evas_Object *content = NULL;
+ const char *object_type;
+ Eina_Bool state;
+
+
+ struct ug_data *ugd = (struct ug_data *)data;
+ if (NULL == ugd || NULL == obj) {
+ DBG(LOG_ERROR, "NULL parameters.\n");
+ return;
}
- return NULL;
-}
-static Evas_Object *_wfd_gl_select_all_icon_get(void *data, Evas_Object *obj, const char *part)
-{
- struct ug_data *ugd = (struct ug_data*) data;
- Evas_Object* icon = NULL;
+ if (ugd->multi_conn_dev_list_start == NULL) {
+ elm_genlist_item_selected_set(ugd->select_all_view_genlist, EINA_FALSE);
+ elm_check_state_set(ugd->select_all_icon, EINA_FALSE);
+ ugd->is_select_all_checked = FALSE;
- if (!strcmp(part, "elm.icon")) {
- DBG(LOG_VERBOSE, "Part %s", part);
- icon = elm_check_add(obj);
- elm_check_state_set(icon, EINA_FALSE);
- evas_object_smart_callback_add(icon, "changed", _wfd_check_clicked_cb, (void *)data);
+ DBG(LOG_INFO, "No devices in multi-connect view.\n");
+ return;
}
- return icon;
-}
+ device_type_s *peer = ugd->multi_conn_dev_list_start;
+ elm_genlist_item_selected_set(ugd->select_all_view_genlist, EINA_FALSE);
+ object_type = evas_object_type_get(obj);
+ if (g_strcmp0(object_type, "elm_genlist") == 0) {
+ state = elm_check_state_get(ugd->select_all_icon);
+ elm_check_state_set(ugd->select_all_icon, !state);
+ ugd->is_select_all_checked = !state;
+ }
+ state = elm_check_state_get(ugd->select_all_icon);
+ DBG(LOG_INFO, "state = %d",state);
+ if (state == EINA_TRUE) {
+ if (ugd->is_multi_check_all_selected == FALSE) {
+ int sel_count = 0;
+ while (peer != NULL) {
+ peer->dev_sel_state = TRUE;
+ item = peer->gl_item;
+ content = elm_object_item_part_content_get(item, "elm.icon.2");
+ chk_box = elm_object_part_content_get(content, "elm.swallow.content");
+ elm_check_state_set(chk_box, TRUE);
+ sel_count++;
+ peer = peer->next;
+ }
+ ugd->is_multi_check_all_selected = TRUE;
-int _wfd_free_multiconnect_device(struct ug_data *ugd)
-{
- __FUNC_ENTER__;
-
- int count = 0;
- int i = 0;
-
- if (ugd->multiconn_view_genlist == NULL)
- {
- return 0;
- }
-
- if (ugd->mcview_title_item != NULL)
- {
- elm_object_item_del(ugd->mcview_title_item);
- ugd->mcview_title_item = NULL;
- }
-
- if (ugd->mcview_select_all_item != NULL)
- {
- elm_object_item_del(ugd->mcview_select_all_item);
- ugd->mcview_select_all_item = NULL;
- }
-
- if (ugd->mcview_nodevice_item != NULL)
- {
- elm_object_item_del(ugd->mcview_nodevice_item);
- ugd->mcview_nodevice_item = NULL;
- }
-
- for(i = 0; i < ugd->gl_available_dev_cnt_at_multiconn_view; i++)
- {
- if (ugd->multi_conn_dev_list[i].peer.gl_item != NULL)
- {
- elm_object_item_del(ugd->multi_conn_dev_list[i].peer.gl_item);
- ugd->multi_conn_dev_list[i].peer.gl_item = NULL;
- }
- }
- ugd->gl_available_dev_cnt_at_multiconn_view = 0;
-
- __FUNC_EXIT__;
- return 0;
-}
+ char title[MAX_POPUP_TEXT_SIZE] = {0};
+ snprintf(title, MAX_POPUP_TEXT_SIZE,
+ _("IDS_ST_HEADER_PD_SELECTED"), sel_count);
+ wfd_naviframe_title_set(ugd, title);
-int _wfd_update_multiconnect_device(struct ug_data *ugd)
-{
- __FUNC_ENTER__;
-
- int count = 0;
- device_type_s *device = NULL;
- Evas_Object *genlist = NULL;
- int i = 0;
-
- genlist = ugd->multiconn_view_genlist;
- if (ugd->multiconn_view_genlist == NULL)
- {
- return 0;
- }
-
- _wfd_free_multiconnect_device(ugd);
-
- count = 0;
- for(i = 0; i < ugd->raw_discovered_peer_cnt; i++)
- {
- device = &ugd->raw_discovered_peers[i];
- if (device->is_connected == FALSE)
- {
- count++;
- }
- }
- ugd->gl_available_dev_cnt_at_multiconn_view = count;
-
- if (ugd->gl_available_dev_cnt_at_multiconn_view == 0)
- {
- DBG(LOG_ERROR, "There are No peers\n");
- ugd->mcview_title_item = elm_genlist_item_append(genlist, &title_itc, ugd, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
- elm_genlist_item_select_mode_set(ugd->mcview_title_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- ugd->mcview_nodevice_item = elm_genlist_item_append(genlist, &noitem_itc, (void*)ugd, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
- elm_genlist_item_select_mode_set(ugd->mcview_nodevice_item , ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- }
- else
- {
- ugd->mcview_title_item = elm_genlist_item_append(genlist, &title_itc, ugd, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
- elm_genlist_item_select_mode_set(ugd->mcview_title_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- ugd->mcview_select_all_item = elm_genlist_item_append(genlist, &select_all_itc, ugd, NULL, ELM_GENLIST_ITEM_NONE, _wfd_gl_sel_cb, ugd);
-
- count = 0;
- for(i = 0; i < ugd->raw_discovered_peer_cnt; i++)
- {
- device = &ugd->raw_discovered_peers[i];
- if (device->is_connected == FALSE)
- {
- DBG(LOG_VERBOSE, "%dth peer being added on genlist\n", i);
-
- if (ugd->multi_conn_dev_list[count].peer.gl_item != NULL)
- elm_object_item_del(ugd->multi_conn_dev_list[count].peer.gl_item);
- ugd->multi_conn_dev_list[count].peer.gl_item = NULL;
-
- memcpy(&ugd->multi_conn_dev_list[count].peer, device, sizeof(device_type_s));
-
- ugd->multi_conn_dev_list[count].dev_sel_state = FALSE;
- ugd->multi_conn_dev_list[count].peer.gl_item =
- elm_genlist_item_append(genlist, &device_itc, (void*) &ugd->multi_conn_dev_list[count].peer,
- NULL, ELM_GENLIST_ITEM_NONE, _wfd_gl_multi_sel_cb, ugd);
- count++;
+ if (ugd->multiconn_layout) {
+ wfd_ug_view_refresh_button(ugd->multiconn_conn_btn,
+ "IDS_WIFI_SK_CONNECT", TRUE);
}
}
- }
+ } else {
+ while (peer != NULL) {
+ peer->dev_sel_state = FALSE;
+ item = peer->gl_item;
+ content = elm_object_item_part_content_get(item, "elm.icon.2");
+ chk_box = elm_object_part_content_get(content, "elm.swallow.content");
+ elm_check_state_set(chk_box, FALSE);
+ peer = peer->next;
+ }
+ ugd->is_multi_check_all_selected = FALSE;
+ wfd_naviframe_title_set(ugd,
+ _("IDS_DLNA_HEADER_SELECT_DEVICES_ABB"));
- __FUNC_EXIT__;
- return 0;
+ if (ugd->multiconn_layout) {
+ wfd_ug_view_refresh_button(ugd->multiconn_conn_btn,
+ "IDS_WIFI_SK_CONNECT", FALSE);
+ }
+ }
}
-void _wifid_create_multiconnect_view(struct ug_data *ugd)
+/**
+ * This function let the ug call it when click 'scan' button
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _multi_scan_btn_cb(void *data, Evas_Object *obj, void *event_info)
{
__FUNC_ENTER__;
+ int ret = -1;
+ const char *btn_text = NULL;
+ device_type_s *peer = NULL;
+ struct ug_data *ugd = (struct ug_data *) data;
- Evas_Object *back_btn = NULL;
- Evas_Object *control_bar = NULL;
- Evas_Object *genlist = NULL;
-
- Elm_Object_Item *navi_item = NULL;
- Elm_Object_Item *item = NULL;
-
- if(ugd == NULL)
- {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)");
- return;
- }
-
- select_all_itc.item_style = "1text.1icon.3";
- select_all_itc.func.text_get = _wfd_gl_select_all_label_get;
- select_all_itc.func.content_get = _wfd_gl_select_all_icon_get;
- select_all_itc.func.state_get = NULL;
- select_all_itc.func.del = NULL;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
+ }
- device_itc.item_style = "1text.2icon.2";
- device_itc.func.text_get = _wfd_gl_device_label_get;
- device_itc.func.content_get = _wfd_gl_device_icon_get;
- device_itc.func.state_get = NULL;
- device_itc.func.del = NULL;
+ if (ugd->multiconn_conn_btn) {
+ peer = ugd->multi_conn_dev_list_start;
+ while (peer) {
+ if(peer->dev_sel_state) {
+ wfd_ug_view_refresh_button(ugd->multiconn_conn_btn, "IDS_WIFI_SK_CONNECT", TRUE);
+ break;
+ }
+ peer = peer->next;
+ }
+ if (!peer) {
+ wfd_ug_view_refresh_button(ugd->multiconn_conn_btn, "IDS_WIFI_SK_CONNECT", FALSE);
+ }
+ }
- DBG(LOG_VERBOSE, "_wifid_create_multiconnect_view");
- back_btn = elm_button_add(ugd->naviframe);
- elm_object_style_set(back_btn, "naviframe/back_btn/default");
- evas_object_smart_callback_add(back_btn, "clicked", _multiconnect_view_back_btn_cb, (void*) ugd);
- elm_object_focus_allow_set(back_btn, EINA_FALSE);
+ btn_text = elm_object_text_get(ugd->multiconn_scan_stop_btn);
+ if (NULL == btn_text) {
+ DBG(LOG_ERROR, "Incorrect button text(NULL)\n");
+ return;
+ }
- genlist = elm_genlist_add(ugd->naviframe);
- ugd->multiconn_view_genlist = genlist;
- elm_object_style_set(ugd->multiconn_view_genlist, "dialogue");
+ if (0 == strcmp(btn_text, _("IDS_WIFI_SK4_SCAN"))) {
+ wfd_refresh_wifi_direct_state(ugd);
+ DBG(LOG_INFO, "Start discovery again, status: %d\n", ugd->wfd_status);
+
+ /* if connected, show the popup*/
+ if (ugd->wfd_status >= WIFI_DIRECT_STATE_CONNECTED) {
+ wfd_ug_act_popup(ugd, _("IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q"), POP_TYPE_SCAN_AGAIN);
+ } else if (WIFI_DIRECT_STATE_DEACTIVATED == ugd->wfd_status) {
+ wfd_client_switch_on(ugd);
+ __FUNC_EXIT__;
+ return;
+ } else {
+ WFD_IF_DEL_ITEM(ugd->mcview_nodevice_item);
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ ret = wifi_direct_start_discovery_specific_channel(false, 1, WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL);
+ if (ret != WIFI_DIRECT_ERROR_NONE) {
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_NONE;
+ DBG(LOG_ERROR, "Failed to start discovery. [%d]\n", ret);
+ wifi_direct_cancel_discovery();
+ }
+ }
+ elm_object_domain_translatable_text_set(ugd->multiconn_scan_stop_btn,
+ PACKAGE, "IDS_WIFI_SK_STOP");
+ } else if (0 == strcmp(btn_text, _("IDS_WIFI_SK_STOP"))) {
+ DBG(LOG_INFO, "Stop pressed.\n");
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_STOPPED;
+ wfd_cancel_progressbar_stop_timer(ugd);
+ wfd_delete_progressbar_cb(ugd);
+ wfd_cancel_not_alive_delete_timer(ugd);
+ }
- ugd->mcview_title_item = NULL;
+ __FUNC_EXIT__;
+ return;
+}
- _wfd_update_multiconnect_device(ugd);
+/**
+ * This function let the ug create the view for multi connection
+ * @return void
+ * @param[in] ugd the pointer to the main data structure
+ */
+void wfd_create_multiconnect_view(struct ug_data *ugd)
+{
+ __FUNC_ENTER__;
- evas_object_show(genlist);
+ Evas_Object *genlist = NULL;
+ Elm_Object_Item *navi_item = NULL;
+ Evas_Object *btn1 = NULL;
+ Evas_Object *btn2 = NULL;
+ Evas_Object *layout = NULL;
- navi_item = elm_naviframe_item_push(ugd->naviframe, _("Multi connect"), back_btn, NULL, genlist, NULL);
+ if (ugd == NULL) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)");
+ return;
+ }
- control_bar = elm_toolbar_add(ugd->naviframe);
- elm_toolbar_shrink_mode_set(control_bar, ELM_TOOLBAR_SHRINK_EXPAND);
- evas_object_show(control_bar);
+ device_itc.item_style = "1line";
+ device_itc.func.text_get = _wfd_gl_device_label_get;
+ device_itc.func.content_get = _wfd_gl_device_icon_get;
+ device_itc.func.state_get = NULL;
+ device_itc.func.del = NULL;
+
+ /* Create layout */
+ layout = elm_layout_add(ugd->naviframe);
+ elm_layout_file_set(layout, WFD_UG_EDJ_PATH, "main_layout");
+ ugd->multiconn_layout = layout;
+
+
+ genlist = elm_genlist_add(ugd->multiconn_layout);
+ elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+ 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);
+ evas_object_smart_callback_add(genlist, "unrealized", _gl_unrealized, ugd);
+
+ elm_object_part_content_set(layout, "elm.swallow.content", genlist);
+ elm_genlist_fx_mode_set(genlist, EINA_FALSE);
+ elm_genlist_homogeneous_set(genlist, EINA_TRUE);
+ elm_genlist_realization_mode_set(genlist, TRUE);
+
+
+ ugd->multiconn_view_genlist = genlist;
+ ugd->mcview_title_item = NULL;
+ ugd->mcview_nodevice_item = NULL;
+ ugd->gl_available_dev_cnt_at_multiconn_view = 0;
+ evas_object_show(genlist);
+
+ navi_item = elm_naviframe_item_push(ugd->naviframe,
+ "IDS_DLNA_HEADER_SELECT_DEVICES_ABB", NULL, NULL, layout, NULL);
+ elm_object_item_domain_text_translatable_set(navi_item, PACKAGE, EINA_TRUE);
+
+ elm_naviframe_item_pop_cb_set(navi_item, _multiconnect_view_pop_cb, (void *)ugd);
+ ugd->select_all_view_genlist = elm_genlist_item_append(genlist,
+ &select_all_multi_connect_itc, ugd, NULL, ELM_GENLIST_ITEM_NONE,
+ wfd_genlist_select_all_check_changed_cb, (void *)ugd );
+
+
+ btn1 = elm_button_add(ugd->multiconn_layout);
+ elm_object_style_set(btn1, "bottom");
+ if (ugd->view_type && g_strcmp0(_(ugd->view_type),
+ _("IDS_WIFI_BUTTON_MULTI_CONNECT")) == 0) {
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_WIFI_SK4_SCAN");
+ } else {
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_WIFI_SK_STOP");
+ }
+ elm_object_part_content_set(ugd->multiconn_layout, "button.prev", btn1);
+ evas_object_smart_callback_add(btn1, "clicked",_multi_scan_btn_cb, (void *)ugd);
+ evas_object_show(btn1);
+ ugd->multiconn_scan_stop_btn = btn1;
- ugd->multi_scan_btn = elm_toolbar_item_append(control_bar, NULL, _("IDS_WFD_BUTTON_SCAN"), _scan_btn_cb, (void*) ugd);
- item = elm_toolbar_item_append(control_bar, NULL, NULL, NULL, NULL);
- elm_object_item_disabled_set(item, EINA_TRUE);
- ugd->multi_connect_btn = elm_toolbar_item_append(control_bar, NULL, _("IDS_WFD_BUTTON_CONNECT"), _connect_btn_cb, (void*) ugd);
+ btn2 = elm_button_add(ugd->multiconn_layout);
+ elm_object_style_set(btn2, "bottom");
+ elm_object_domain_translatable_text_set(btn2, PACKAGE,
+ "IDS_WIFI_SK_CONNECT");
+ elm_object_part_content_set(ugd->multiconn_layout, "button.next", btn2);
+ evas_object_smart_callback_add(btn2, "clicked",_connect_btn_cb, (void *)ugd);
+ evas_object_show(btn2);
+ ugd->multiconn_conn_btn = btn2;
+ elm_object_disabled_set(ugd->multiconn_conn_btn, EINA_TRUE);
- if (ugd->multi_connect_btn) {
- wfd_ug_view_refresh_button(ugd->multi_connect_btn, _("IDS_WFD_BUTTON_CONNECT"), FALSE);
- }
+ ugd->multi_navi_item = navi_item;
- item = elm_toolbar_item_append(control_bar, NULL, NULL, NULL, NULL);
- elm_object_item_disabled_set(item, EINA_TRUE);
- elm_object_item_part_content_set(navi_item, "controlbar", control_bar);
+ wfd_update_multiconnect_device(ugd, true);
- __FUNC_EXIT__;
+ __FUNC_EXIT__;
}
diff --git a/ug-wifidirect/src/wfd_ug_popup.c b/ug-wifidirect/src/wfd_ug_popup.c
index 254a4e9..83f038d 100755
--- a/ug-wifidirect/src/wfd_ug_popup.c
+++ b/ug-wifidirect/src/wfd_ug_popup.c
@@ -18,121 +18,381 @@
*/
#include <libintl.h>
-
-#include <assert.h>
#include <glib.h>
#include <Elementary.h>
#include <vconf.h>
#include <ui-gadget-module.h>
#include <wifi-direct.h>
+#include "utilX.h"
#include "wfd_ug.h"
#include "wfd_ug_view.h"
#include "wfd_client.h"
-static void _wfd_ug_act_popup_wifi_ok_cb(void *data, Evas_Object *obj, void *event_info)
+static void delete_popup(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
-
- // TODO: Turn off WiFi
- ugd->wfd_status = WFD_LINK_STATUS_DEACTIVATED;
- wfd_wifi_off(ugd);
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
+ }
- evas_object_del(ugd->act_popup);
- ugd->act_popup = NULL;
- __FUNC_EXIT__;
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ __FUNC_EXIT__;
}
-static void _wfd_ug_act_popup_wifi_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+static void pushbutton_accept_connect_cb(void *data, Evas_Object * obj,
+ void *event_info)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
- // TODO: set genlist head item as "WiFi Direct"
- ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
- wfd_ug_view_refresh_glitem(ugd->head);
+ struct ug_data *ugd = (struct ug_data *) data;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
+ }
+ int result = -1;
+ result = wifi_direct_accept_connection(ugd->mac_addr_req);
+ if (result != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_INFO,"Failed to connect");
+ }
+ delete_popup(ugd);
- evas_object_del(ugd->act_popup);
- ugd->act_popup = NULL;
- __FUNC_EXIT__;
+ __FUNC_EXIT__;
}
-static void _wfd_ug_act_popup_disconnect_ok_cb(void *data, Evas_Object *obj, void *event_info)
+static void pushbutton_reject_connect_cb(void *data, Evas_Object * obj,
+ void *event_info)
{
__FUNC_ENTER__;
- char *mac_addr = NULL;
- struct ug_data *ugd = (struct ug_data*) data;
-
+ struct ug_data *ugd = (struct ug_data *) data;
if (NULL == ugd) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
return;
}
+ int result = -1;
+ if (ugd->mac_addr_req[0] != '\0') {
+ result = wifi_direct_reject_connection(ugd->mac_addr_req);
+ if (result != WIFI_DIRECT_ERROR_NONE)
+ DBG(LOG_INFO,"Failed to reject connection");
+ } else {
+ DBG(LOG_INFO,"No Peer mac address");
+ }
+ delete_popup(ugd);
+
+ __FUNC_EXIT__;
+}
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
+static void _mouseup_wifi_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Mouse_Up *ev = event_info;
+ if (ev->button == 3) {
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ }
+}
+
+static void _keydown_wifi_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Key_Down *ev = event_info;
+ if (!strcmp(ev->keyname, KEY_BACK)) {
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
+ wfd_ug_view_refresh_glitem(ugd->head);
- if (ugd->gl_connected_peer_cnt < 1) {
- DBG(LOG_ERROR, "No connected peer\n");
evas_object_del(ugd->act_popup);
ugd->act_popup = NULL;
- return;
}
+}
+#endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
+
+
+static void _mouseup_hotspot_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Mouse_Up *ev = event_info;
+ if (ev->button == 3) {
+ struct ug_data *ugd = (struct ug_data *) data;
- /* just one peer */
- mac_addr = ugd->gl_connected_peers[0].mac_addr;
- wfd_client_disconnect(mac_addr);
- if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
- wfd_stop_multi_connect(ugd);
+#ifdef WFD_ON_OFF_GENLIST
+ wfd_ug_refresh_on_off_check(ugd);
+#endif
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ }
+}
+static void _keydown_hotspot_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Key_Down *ev = event_info;
+ if (!strcmp(ev->keyname, KEY_BACK)) {
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ ugd->head_text_mode = HEAD_TEXT_TYPE_DIRECT;
+ wfd_ug_view_refresh_glitem(ugd->head);
+
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ }
+}
+
+static void _mouseup_disconnect_all_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Mouse_Up *ev = event_info;
+ if (ev->button == 3) {
+ struct ug_data *ugd = (struct ug_data *) data;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
+ }
+
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ }
+}
+
+/*static void _keydown_disconnect_all_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Key_Down *ev = event_info;
+ if (!strcmp(ev->keyname, KEY_BACK)) {
+ struct ug_data *ugd = (struct ug_data *) data;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
+ }
+
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ }
+}*/
+
+
+/**
+ * This function let the ug call it when click 'ok' button in hotspot action popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _wfd_ug_act_popup_hotspot_ok_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ int result = -1;
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ result = wfd_mobile_ap_off(ugd);
+ if (0 == result) {
+#ifdef WFD_ON_OFF_GENLIST
+ /* refresh the header */
+ if (ugd->on_off_check) {
+ elm_check_state_set(ugd->on_off_check, TRUE);
+ elm_object_disabled_set(ugd->on_off_check, TRUE);
+ }
+#endif
+
+ /* while activating/deactivating, disable the buttons */
+ if (ugd->scan_toolbar) {
+ wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN", FALSE);
+ }
+
+ if (ugd->multiconn_scan_stop_btn) {
+ wfd_ug_view_refresh_button(ugd->multiconn_scan_stop_btn, "IDS_WIFI_SK4_SCAN", FALSE);
+ }
+
+ if (ugd->back_btn) {
+ elm_object_disabled_set(ugd->back_btn, TRUE);
+ }
+ ugd->is_hotspot_locally_disabled = TRUE;
}
evas_object_del(ugd->act_popup);
ugd->act_popup = NULL;
-
__FUNC_EXIT__;
}
-static void _wfd_ug_act_popup_disconnect_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+/**
+ * This function let the ug call it when click 'cancel' button in hotspot action popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _wfd_ug_act_popup_hotspot_cancel_cb(void *data, Evas_Object *obj, void *event_info)
{
__FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
- struct ug_data *ugd = (struct ug_data*) data;
- if (NULL == ugd) {
- DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return;
+#ifdef WFD_ON_OFF_GENLIST
+ wfd_ug_refresh_on_off_check(ugd);
+#endif
+
+ wfd_client_destroy_tethering(ugd);
+
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ __FUNC_EXIT__;
+}
+
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
+/**
+ * This function let the ug call it when click 'ok' button in wifi action popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _wfd_ug_act_popup_wifi_ok_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ int result = -1;
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ result = wfd_wifi_off(ugd);
+ if (0 == result) {
+#ifdef WFD_ON_OFF_GENLIST
+ /* refresh the header */
+ if (ugd->on_off_check) {
+ elm_check_state_set(ugd->on_off_check, TRUE);
+ elm_object_disabled_set(ugd->on_off_check, TRUE);
+ }
+#endif
+ /* while activating/deactivating, disable the buttons */
+ if (ugd->scan_toolbar) {
+ wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN", FALSE);
+ }
+
+ if (ugd->multiconn_scan_stop_btn) {
+ wfd_ug_view_refresh_button(ugd->multiconn_scan_stop_btn, "IDS_WIFI_SK4_SCAN", FALSE);
+ }
+
+ if (ugd->back_btn) {
+ elm_object_disabled_set(ugd->back_btn, TRUE);
+ }
}
evas_object_del(ugd->act_popup);
ugd->act_popup = NULL;
+ __FUNC_EXIT__;
+}
+/**
+ * This function let the ug call it when click 'cancel' button in wifi action popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _wfd_ug_act_popup_wifi_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+
+#ifdef WFD_ON_OFF_GENLIST
+ wfd_ug_refresh_on_off_check(ugd);
+#endif
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
__FUNC_EXIT__;
}
-static void _wfd_ug_act_popup_disconnect_all_ok_cb(void *data, Evas_Object *obj, void *event_info)
+#endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
+
+gboolean _wfd_disconnect_idle_cb(gpointer user_data)
{
__FUNC_ENTER__;
+ GList *iterator = NULL;
- struct ug_data *ugd = (struct ug_data*) data;
+ struct ug_data *ugd = (struct ug_data *) user_data;
if (NULL == ugd) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
- return;
+ return FALSE;
}
+ Evas_Object *content;
+ content = elm_object_part_content_unset(ugd->layout, "button.next");
+ WFD_IF_DEL_OBJ(content);
+
+ wfd_ug_view_init_genlist(ugd, true);
- wfd_client_disconnect(NULL);
- if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
- wfd_stop_multi_connect(ugd);
+ if (0 != wfd_client_disconnect(NULL)) {
+ DBG(LOG_ERROR, "Disconnection Failed !!!\n");
}
- evas_object_del(ugd->act_popup);
- ugd->act_popup = NULL;
+ ugd->wfd_discovery_status = WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START;
+ discover_cb(WIFI_DIRECT_ERROR_NONE, WIFI_DIRECT_DISCOVERY_STARTED, ugd);
+
+ if (ugd->multi_connect_mode != WFD_MULTI_CONNECT_MODE_NONE) {
+ wfd_free_multi_selected_peers(ugd);
+ } else {
+ /* update the connecting icon */
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ ((device_type_s *)iterator->data)->conn_status = PEER_CONN_STATUS_DISCONNECTED;
+ wfd_ug_view_refresh_glitem(((device_type_s *)iterator->data)->gl_item);
+ }
+ }
__FUNC_EXIT__;
+ return FALSE;
}
-static void _wfd_ug_act_popup_disconnect_all_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+gboolean _wfd_cancel_connect_idle_cb(gpointer user_data)
{
__FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ int res;
+ GList *iterator = NULL;
+ struct ug_data *ugd = (struct ug_data *) user_data;
+ if (NULL == ugd || NULL == ugd->mac_addr_connecting) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return FALSE;
+ }
+
+ res = wifi_direct_cancel_connection(ugd->mac_addr_connecting);
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed wifi_direct_cancel_connection() [%d]\n", res);
+ return FALSE;
+ }
+
+ ugd->mac_addr_connecting = NULL;
+ if (ugd->multi_connect_mode != WFD_MULTI_CONNECT_MODE_NONE) {
+ if (ugd->raw_connected_peer_cnt > 0) {
+ res = wifi_direct_disconnect_all();
+ if (res != WIFI_DIRECT_ERROR_NONE) {
+ DBG(LOG_ERROR, "Failed wifi_direct_disconnect_all() [%d]\n", res);
+ return FALSE;
+ }
+ }
+
+ wfd_free_multi_selected_peers(ugd);
+ wfd_ug_view_init_genlist(ugd, true);
+ } else {
+ /* update the connecting icon */
+ for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
+ ((device_type_s *)iterator->data)->conn_status = PEER_CONN_STATUS_DISCONNECTED;
+ }
+ wfd_ug_view_init_genlist(ugd, false);
+ }
+
+ __FUNC_EXIT__;
+ return FALSE;
+}
+
+/**
+ * This function let the ug call it when click 'ok' button in cancel connection popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _wfd_ug_act_popup_cancel_connect_ok_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd = (struct ug_data *) data;
if (NULL == ugd) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
return;
@@ -141,92 +401,232 @@ static void _wfd_ug_act_popup_disconnect_all_cancel_cb(void *data, Evas_Object *
evas_object_del(ugd->act_popup);
ugd->act_popup = NULL;
+ g_idle_add(_wfd_cancel_connect_idle_cb, ugd);
+
__FUNC_EXIT__;
}
-static void _wfd_ug_act_popup_scan_again_ok_cb(void *data, Evas_Object *obj, void *event_info)
+/**
+ * This function let the ug call it when click 'ok' button in disconnect all popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _wfd_ug_act_popup_disconnect_all_ok_cb(void *data, Evas_Object *obj, void *event_info)
{
__FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ struct ug_data *ugd = (struct ug_data *) data;
if (NULL == ugd) {
DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
return;
}
- if (ugd->conn_wfd_item != NULL) {
- elm_object_item_del(ugd->conn_wfd_item);
- ugd->conn_wfd_item = NULL;
- }
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
- /* cancel the current connection */
- wfd_client_disconnect(NULL);
- if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
- wfd_stop_multi_connect(ugd);
+ g_idle_add(_wfd_disconnect_idle_cb, ugd);
+
+ __FUNC_EXIT__;
+}
+
+/**
+ * This function let the ug call it when click 'cancel' button in disconnect all popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _wfd_ug_act_popup_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+
+ struct ug_data *ugd = (struct ug_data *) data;
+ if (NULL == ugd) {
+ DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
+ return;
}
- /* start discovery again */
- wfd_client_start_discovery(ugd);
evas_object_del(ugd->act_popup);
ugd->act_popup = NULL;
__FUNC_EXIT__;
}
-static void _wfd_ug_act_popup_scan_again_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+void act_popup_language_changed(void *data, Evas_Object *obj, void *event_info)
{
__FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ int popup_type = (int)data;
+ Evas_Object *btn1 = NULL;
+ Evas_Object *btn2 = NULL;
+ struct ug_data *ugd = wfd_get_ug_data();
- evas_object_del(ugd->act_popup);
- ugd->act_popup = NULL;
+ if (!ugd || !ugd->act_popup) {
+ DBG(LOG_ERROR, "NULL parameters.\n");
+ return;
+ }
+
+ btn1 = elm_object_part_content_get(ugd->act_popup, "button1");
+ btn2 = elm_object_part_content_get(ugd->act_popup, "button2");
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_BR_SK_CANCEL");
+ elm_object_domain_translatable_text_set(btn2, PACKAGE,
+ "IDS_BR_SK_OK");
+
+ switch(popup_type) {
+
+ case POPUP_TYPE_HOTSPOT_OFF:
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_BR_SK_NO");
+ elm_object_domain_translatable_text_set(btn2, PACKAGE,
+ "IDS_BR_SK_YES");
+ elm_object_domain_translatable_text_set(ugd->act_popup, PACKAGE,
+ "IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q");
+ break;
+
+ case POP_TYPE_DISCONNECT:
+ elm_object_domain_translatable_text_set(ugd->act_popup, PACKAGE,
+ "IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q");
+ break;
+ case POP_TYPE_SCAN_AGAIN:
+ elm_object_domain_translatable_text_set(ugd->act_popup, PACKAGE,
+ "IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q");
+ break;
+ case POP_TYPE_CANCEL_CONNECT:
+ elm_object_domain_translatable_text_set(ugd->act_popup, PACKAGE,
+ "IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED");
+ break;
+ case POP_TYPE_ACCEPT_CONNECTION:
+ elm_object_domain_translatable_text_set(ugd->act_popup, PACKAGE,
+ "IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q");
+ break;
+ default:
+ break;
+ }
__FUNC_EXIT__;
}
+/**
+ * This function let the ug create a action popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] message the pointer to the text of popup
+ * @param[in] popup_type the message type
+ */
void wfd_ug_act_popup(void *data, const char *message, int popup_type)
{
__FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ struct ug_data *ugd = (struct ug_data *) data;
Evas_Object *popup = NULL;
Evas_Object *btn1 = NULL, *btn2 = NULL;
+ WFD_IF_DEL_OBJ(ugd->act_popup);
+
popup = elm_popup_add(ugd->base);
+ elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+ ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_object_text_set(popup, message);
+ elm_object_domain_translatable_part_text_set(popup, "title,text",
+ PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
+ elm_object_domain_translatable_text_set(popup, PACKAGE, message);
+ evas_object_smart_callback_add(popup, "language,changed", act_popup_language_changed, (void *)popup_type);
btn1 = elm_button_add(popup);
btn2 = elm_button_add(popup);
- elm_object_style_set(btn1, "popup_button/default");
- elm_object_style_set(btn2, "popup_button/default");
+ elm_object_style_set(btn1, "popup");
+ elm_object_style_set(btn2, "popup");
/* set the different text by type */
- if (popup_type == POPUP_TYPE_WIFI_OFF) {
- elm_object_text_set(btn1, S_("IDS_COM_SK_YES"));
- elm_object_text_set(btn2, S_("IDS_COM_SK_NO"));
+ if (
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
+ popup_type == POPUP_TYPE_WIFI_OFF ||
+#endif
+
+ popup_type == POPUP_TYPE_HOTSPOT_OFF ||
+
+ FALSE) {
+ elm_object_domain_translatable_part_text_set(popup, "title,text",
+ PACKAGE, "IDS_WIFI_BODY_WI_FI_DIRECT_ABB");
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_BR_SK_CANCEL");
+ elm_object_domain_translatable_text_set(btn2, PACKAGE,
+ "IDS_ST_BUTTON_ENABLE");
+ } else if (popup_type == POP_TYPE_CANCEL_CONNECT) {
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_BR_SK_CANCEL");
+ elm_object_domain_translatable_text_set(btn2, PACKAGE,
+ "IDS_WIFI_SK_STOP");
+ } else if (popup_type == POP_TYPE_DISCONNECT) {
+ elm_object_domain_translatable_part_text_set(popup, "title,text",
+ PACKAGE, "IDS_WIFI_SK_DISCONNECT");
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_BR_SK_CANCEL");
+ elm_object_domain_translatable_text_set(btn2, PACKAGE,
+ "IDS_BR_SK_OK");
+
+ } else if (popup_type == POP_TYPE_SCAN_AGAIN) {
+ elm_object_domain_translatable_part_text_set(popup, "title,text",
+ PACKAGE, "IDS_WIFI_SK4_SCAN");
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_BR_SK_CANCEL");
+ elm_object_domain_translatable_text_set(btn2, PACKAGE,
+ "IDS_BR_SK_OK");
+ } else if (popup_type == POP_TYPE_ACCEPT_CONNECTION) {
+ elm_object_domain_translatable_part_text_set(popup, "title,text",
+ PACKAGE, "IDS_WIFI_BODY_WI_FI_DIRECT_ABB");
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_BR_SK_CANCEL");
+ elm_object_domain_translatable_text_set(btn2, PACKAGE,
+ "IDS_WIFI_SK_CONNECT");
} else {
- elm_object_text_set(btn1, S_("IDS_COM_SK_OK"));
- elm_object_text_set(btn2, S_("IDS_COM_SK_CANCEL"));
+ elm_object_domain_translatable_text_set(btn1, PACKAGE,
+ "IDS_BR_SK_CANCEL");
+ elm_object_domain_translatable_text_set(btn2, PACKAGE,
+ "IDS_BR_SK_OK");
}
elm_object_part_content_set(popup, "button1", btn1);
elm_object_part_content_set(popup, "button2", btn2);
/* set the different callback by type */
+#ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
if (popup_type == POPUP_TYPE_WIFI_OFF) {
- evas_object_smart_callback_add(btn1, "clicked", _wfd_ug_act_popup_wifi_ok_cb, (void*) ugd);
- evas_object_smart_callback_add(btn2, "clicked", _wfd_ug_act_popup_wifi_cancel_cb, (void*) ugd);
- } else if (popup_type == POP_TYPE_DISCONNECT) {
- //evas_object_smart_callback_add(btn1, "clicked", _wfd_ug_act_popup_disconnect_ok_cb, (void*) ugd);
- evas_object_smart_callback_add(btn1, "clicked", _wfd_ug_act_popup_disconnect_all_ok_cb, (void*) ugd);
- evas_object_smart_callback_add(btn2, "clicked", _wfd_ug_act_popup_disconnect_cancel_cb, (void*) ugd);
- } else if (popup_type == POP_TYPE_DISCONNECT_ALL) {
- evas_object_smart_callback_add(btn1, "clicked", _wfd_ug_act_popup_disconnect_all_ok_cb, (void*) ugd);
- evas_object_smart_callback_add(btn2, "clicked", _wfd_ug_act_popup_disconnect_all_cancel_cb, (void*) ugd);
- } else if (popup_type == POP_TYPE_SCAN_AGAIN) {
- evas_object_smart_callback_add(btn1, "clicked", _wfd_ug_act_popup_scan_again_ok_cb, (void*) ugd);
- evas_object_smart_callback_add(btn2, "clicked", _wfd_ug_act_popup_scan_again_cancel_cb, (void*) ugd);
+ evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, _mouseup_wifi_cb, (void *)ugd);
+// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, _keydown_wifi_cb, (void *)ugd);
+
+ evas_object_smart_callback_add(btn1, "clicked", _wfd_ug_act_popup_wifi_cancel_cb, (void *)ugd);
+ evas_object_smart_callback_add(btn2, "clicked", _wfd_ug_act_popup_wifi_ok_cb, (void *)ugd);
+ } else
+#endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
+
+ if (popup_type == POPUP_TYPE_HOTSPOT_OFF) {
+ evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, _mouseup_hotspot_cb, (void *)ugd);
+// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, _keydown_hotspot_cb, (void *)ugd);
+
+ evas_object_smart_callback_add(btn1, "clicked", _wfd_ug_act_popup_hotspot_cancel_cb, (void *)ugd);
+ evas_object_smart_callback_add(btn2, "clicked", _wfd_ug_act_popup_hotspot_ok_cb, (void *)ugd);
+ } else
+
+ if (popup_type == POP_TYPE_DISCONNECT ||
+ popup_type == POP_TYPE_SCAN_AGAIN) {
+ evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, _mouseup_disconnect_all_cb, (void *)ugd);
+// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, _keydown_disconnect_all_cb, (void *)ugd);
+
+ evas_object_smart_callback_add(btn1, "clicked", _wfd_ug_act_popup_cancel_cb, (void *)ugd);
+ evas_object_smart_callback_add(btn2, "clicked", _wfd_ug_act_popup_disconnect_all_ok_cb, (void *)ugd);
+ } else if (popup_type == POP_TYPE_CANCEL_CONNECT) {
+ evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, _mouseup_disconnect_all_cb, (void *)ugd);
+
+ evas_object_smart_callback_add(btn1, "clicked", _wfd_ug_act_popup_cancel_cb, (void *)ugd);
+ evas_object_smart_callback_add(btn2, "clicked", _wfd_ug_act_popup_cancel_connect_ok_cb, (void *)ugd);
+ } else if (popup_type == POP_TYPE_ACCEPT_CONNECTION ) {
+ evas_object_smart_callback_add(btn1, "clicked",
+ pushbutton_reject_connect_cb, (void *)ugd);
+ evas_object_smart_callback_add(btn2, "clicked",
+ pushbutton_accept_connect_cb, (void *)ugd);
}
evas_object_show(popup);
@@ -234,135 +634,178 @@ void wfd_ug_act_popup(void *data, const char *message, int popup_type)
__FUNC_EXIT__;
}
+/**
+ * This function let the ug remove the action popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
void wfg_ug_act_popup_remove(void *data)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
-
- if(ugd->act_popup)
- {
- evas_object_del(ugd->act_popup);
- ugd->act_popup = NULL;
- }
- __FUNC_EXIT__;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ if (ugd->act_popup) {
+ evas_object_del(ugd->act_popup);
+ ugd->act_popup = NULL;
+ }
+ __FUNC_EXIT__;
}
+/**
+ * This function let the ug call it when click 'ok' button in warning popup of terminated problem
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
static void _wfd_ug_terminate_popup_cb(void *data, Evas_Object *obj, void *event_info)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
- evas_object_del(ugd->warn_popup);
- ugd->warn_popup = NULL;
+ evas_object_del(ugd->warn_popup);
+ ugd->warn_popup = NULL;
- wfd_ug_view_free_peers(ugd);
+ wfd_ug_view_free_peers(ugd);
- ug_destroy_me(ugd->ug);
- __FUNC_EXIT__;
+ ug_destroy_me(ugd->ug);
+ __FUNC_EXIT__;
}
-static void _wfd_ug_warn_popup_cb(void *data, Evas_Object *obj, void *event_info)
+/**
+ * This function let the ug call it when click 'ok' button in warning popup of turning off WFD automatically
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+/*static void _wfd_ug_automatic_turn_off_popup_cb(void *data, Evas_Object *obj, void *event_info)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
-
- evas_object_del(ugd->warn_popup);
- ugd->warn_popup = NULL;
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
- __FUNC_EXIT__;
-}
+ evas_object_del(ugd->warn_popup);
+ ugd->warn_popup = NULL;
-void wfd_ug_warn_popup(void *data, const char *message, int popup_type)
+ __FUNC_EXIT__;
+}*/
+
+/**
+ * This function let the ug call it when click 'ok' button in warning popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+static void _wfd_ug_warn_popup_cb(void *data, Evas_Object *obj, void *event_info)
{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
- Evas_Object *popup = NULL;
- Evas_Object *btn = NULL;
-
- popup = elm_popup_add(ugd->base);
- evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_object_text_set(popup, message);
-
- btn = elm_button_add(popup);
- elm_object_style_set(btn, "popup_button/default");
- elm_object_text_set(btn, S_("IDS_COM_SK_OK"));
- elm_object_part_content_set(popup, "button1", btn);
- if(popup_type == POPUP_TYPE_TERMINATE)
- evas_object_smart_callback_add(btn, "clicked", _wfd_ug_terminate_popup_cb, (void*) ugd);
- else
- evas_object_smart_callback_add(btn, "clicked", _wfd_ug_warn_popup_cb, (void*) ugd);
-
- evas_object_show(popup);
- ugd->warn_popup = popup;
- __FUNC_EXIT__;
-}
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
-void wfg_ug_warn_popup_remove(void *data)
-{
- __FUNC_ENTER__;
- struct ug_data *ugd = (struct ug_data*) data;
-
- if(ugd->warn_popup)
- {
- evas_object_del(ugd->warn_popup);
- ugd->warn_popup = NULL;
- }
- __FUNC_EXIT__;
-}
+ evas_object_del(ugd->warn_popup);
+ ugd->warn_popup = NULL;
+ if (ugd->rename_entry) {
+ elm_object_focus_set(ugd->rename_entry, EINA_TRUE);
+ }
+
+ __FUNC_EXIT__;
+}
-void wfd_ug_tickernoti_popup(char *msg)
+void warn_popup_language_changed(void *data, Evas_Object *obj, void *event_info)
{
__FUNC_ENTER__;
- int ret = -1;
- bundle *b = NULL;
+ int popup_type = (int)data;
+ struct ug_data *ugd = wfd_get_ug_data();
+ char popup_text[MAX_POPUP_TEXT_SIZE] = {0};
+ Evas_Object *btn = NULL;
- b = bundle_create();
- if (!b) {
- DBG(LOG_ERROR, "FAIL: bundle_create()\n");
+ if (!ugd || !ugd->warn_popup) {
+ DBG(LOG_ERROR, "NULL parameters.\n");
return;
}
- /* tickernoti style */
- ret = bundle_add(b, "0", "info");
- if (ret) {
- DBG(LOG_ERROR, "Fail to add tickernoti style\n");
- bundle_free(b);
- return;
+ btn = elm_object_part_content_get(ugd->warn_popup, "button1");
+ elm_object_domain_translatable_text_set(btn, PACKAGE,
+ "IDS_BR_SK_OK");
+
+ switch(popup_type) {
+ case POPUP_TYPE_ACTIVATE_FAIL_POLICY_RESTRICTS:
+ elm_object_domain_translatable_text_set(ugd->warn_popup, PACKAGE,
+ "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI");
+ break;
+ case POPUP_TYPE_TERMINATE:
+ elm_object_domain_translatable_text_set(ugd->warn_popup, PACKAGE,
+ "IDS_COM_POP_FAILED");
+ break;
+ case POPUP_TYPE_TERMINATE_DEACTIVATE_FAIL:
+ elm_object_domain_translatable_text_set(ugd->warn_popup, PACKAGE,
+ "IDS_WIFI_POP_DEACTIVATION_FAILED");
+ break;
+ case POPUP_TYPE_TERMINATE_NOT_SUPPORT:
+ elm_object_domain_translatable_text_set(ugd->warn_popup, PACKAGE,
+ "IDS_ST_POP_NOT_SUPPORTED");
+ break;
+ case POP_TYPE_BUSY_DEVICE_POPUP:
+ elm_object_domain_translatable_text_set(ugd->warn_popup, PACKAGE,
+ "IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE");
+ break;
+ case POP_TYPE_MULTI_CONNECT_POPUP:
+ snprintf(popup_text, MAX_POPUP_TEXT_SIZE, _("IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME"), MAX_CONNECTED_PEER_NUM);
+ elm_object_domain_translatable_text_set(ugd->warn_popup, PACKAGE,
+ popup_text);
+ break;
+ default:
+ break;
}
- /* popup text */
- ret = bundle_add(b, "1", msg);
- if (ret) {
- DBG(LOG_ERROR, "Fail to add popup text\n");
- bundle_free(b);
- return;
- }
+ __FUNC_EXIT__;
+}
- /* orientation of tickernoti */
- ret = bundle_add(b, "2", "1");
- if (ret) {
- DBG(LOG_ERROR, "Fail to add orientation of tickernoti\n");
- bundle_free(b);
- return;
- }
+/**
+ * This function let the ug create a warning popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] message the pointer to the text of popup
+ * @param[in] popup_type the message type
+ */
+void wfd_ug_warn_popup(void *data, const char *message, int popup_type)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ Evas_Object *popup = NULL;
+ Evas_Object *btn = NULL;
- /* timeout(second) of tickernoti */
- ret = bundle_add(b, "3", "3");
- if (ret) {
- DBG(LOG_ERROR, "Fail to add timeout of tickernoti\n");
- bundle_free(b);
- return;
+ popup = elm_popup_add(ugd->base);
+ elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+ ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+ evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ if (popup_type == POP_TYPE_MULTI_CONNECT_POPUP ||
+ popup_type == POP_TYPE_BUSY_DEVICE_POPUP) {
+ elm_object_domain_translatable_part_text_set(popup, "title,text",
+ PACKAGE, "IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2");
+ } else {
+ elm_object_domain_translatable_part_text_set(popup, "title,text",
+ PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
}
-
- /* launch tickernoti */
- ret = syspopup_launch(TICKERNOTI_SYSPOPUP, b);
- if (ret) {
- DBG(LOG_ERROR, "Fail to launch syspopup\n");
+ elm_object_domain_translatable_text_set(popup, PACKAGE, message);
+ evas_object_smart_callback_add(popup, "language,changed", warn_popup_language_changed, (void *)popup_type);
+
+ btn = elm_button_add(popup);
+ elm_object_style_set(btn, "popup");
+ elm_object_domain_translatable_text_set(btn, PACKAGE, "IDS_BR_SK_OK");
+ elm_object_part_content_set(popup, "button1", btn);
+ if (popup_type == POPUP_TYPE_TERMINATE ||
+ popup_type == POPUP_TYPE_TERMINATE_DEACTIVATE_FAIL ||
+ popup_type == POPUP_TYPE_TERMINATE_NOT_SUPPORT) {
+ evas_object_smart_callback_add(btn, "clicked", _wfd_ug_terminate_popup_cb, (void *)ugd);
+ } else {
+ evas_object_smart_callback_add(btn, "clicked", _wfd_ug_warn_popup_cb, (void *)ugd);
}
- bundle_free(b);
+ evas_object_show(popup);
+ ugd->warn_popup = popup;
__FUNC_EXIT__;
}
diff --git a/ug-wifidirect/src/wfd_ug_rename_popup.c b/ug-wifidirect/src/wfd_ug_rename_popup.c
new file mode 100644
index 0000000..7014fa5
--- /dev/null
+++ b/ug-wifidirect/src/wfd_ug_rename_popup.c
@@ -0,0 +1,415 @@
+/*
+* WiFi-Direct UG
+*
+* 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 <Elementary.h>
+#include <vconf.h>
+#include <wifi-direct.h>
+
+#include "wfd_ug.h"
+#include "wfd_ug_view.h"
+#include "wfd_client.h"
+
+#define WSC_SPEC_DEVICE_NAME_MAX_LEN 32
+static char special_char[30] = "'!@$%^&*()-_=+[];:,<.>/?";
+
+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;
+}
+
+/**
+ * This function check the max length of the device name
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ */
+static void _rename_popop_entry_changed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ WFD_RET_IF(ugd == NULL || obj == NULL, "Incorrect parameter(NULL)\n");
+ WFD_RET_IF(ugd->rename_button == NULL, "ugd->rename_button(NULL)\n");
+
+ 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(ugd->rename_button, TRUE);
+ elm_entry_input_panel_return_key_disabled_set(ugd->rename_entry, TRUE);
+ WFD_IF_FREE_MEM(input_str);
+ return;
+ }
+
+ is_space_string = is_space_str(input_str);
+ if (is_space_string) {
+ elm_object_disabled_set(ugd->rename_button, TRUE);
+ elm_entry_input_panel_return_key_disabled_set(ugd->rename_entry, TRUE);
+ WFD_IF_FREE_MEM(input_str);
+ return;
+ }
+
+ if (strlen(input_str) > 0) {
+ elm_object_disabled_set(ugd->rename_button, FALSE);
+ elm_entry_input_panel_return_key_disabled_set(ugd->rename_entry, FALSE);
+ }
+
+ WFD_IF_FREE_MEM(input_str);
+ __FUNC_EXIT__;
+}
+
+static void _rename_popup_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ WFD_IF_DEL_OBJ(ugd->rename_popup);
+ WFD_IF_DEL_OBJ(ugd->rename_entry);
+
+ __FUNC_EXIT__;
+}
+
+int _check_device_name(const char *device_name)
+{
+ __FUNC_ENTER__;
+
+ int i = 0;
+ int j = 0;
+ bool is_unavailable_char_found = true;
+
+ if ((device_name == NULL) || (strlen(device_name) == 0)) {
+ return -1;
+ }
+
+ for (i = 0; i < strlen(device_name); i++) {
+ if ((device_name[i] >= '0' && device_name[i] <= '9') ||
+ (device_name[i] >= 'a' && device_name[i] <= 'z') ||
+ (device_name[i] >= 'A' && device_name[i] <= 'Z') ||
+ device_name[i] == ' ') {
+ continue;
+ }
+ is_unavailable_char_found = true;
+ for (j = 0; j < strlen(special_char); j++) {
+ if (special_char[j] == device_name[i]) {
+ is_unavailable_char_found = false;
+ break;
+ }
+ }
+
+ if (is_unavailable_char_found) {
+ DBG(LOG_ERROR, "Unavailable char:[%c]\n", device_name[i]);
+ return -1;
+ }
+ }
+
+ __FUNC_EXIT__;
+ return 0;
+}
+
+static void _rename_popup_ok_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+
+ const char *entry_str = elm_entry_entry_get(ugd->rename_entry);
+ char *device_name_str = NULL;
+ device_name_str = elm_entry_markup_to_utf8(entry_str);
+
+ DBG(LOG_INFO, "New device name:[%s]\n", device_name_str);
+ _check_device_name(device_name_str);
+
+ if (0 != vconf_set_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR, device_name_str)) {
+ DBG(LOG_ERROR, "Set vconf[%s] failed\n",VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+ }
+#ifdef WFD_ON_OFF_GENLIST
+ wfd_ug_view_refresh_glitem(ugd->item_wifi_onoff);
+#endif
+ wfd_ug_view_refresh_glitem(ugd->device_name_item);
+ WFD_IF_DEL_OBJ(ugd->rename_popup);
+ WFD_IF_DEL_OBJ(ugd->rename_entry);
+ WFD_IF_FREE_MEM(device_name_str);
+ __FUNC_EXIT__;
+}
+
+static void _eraser_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
+ WFD_RET_IF(ugd->rename_entry == NULL, "ugd->rename_entry(NULL)\n");
+ elm_entry_entry_set(ugd->rename_entry, "");
+ elm_object_domain_translatable_part_text_set(ugd->rename_entry, "elm.guide",
+ PACKAGE, "IDS_STU_HEADER_ENTER_DEVICE_NAME");
+
+ WFD_RET_IF(ugd->rename_button == NULL, "ugd->rename_button(NULL)\n");
+ elm_object_disabled_set(ugd->rename_button, TRUE);
+ elm_entry_input_panel_return_key_disabled_set(ugd->rename_entry, TRUE);
+ __FUNC_EXIT__;
+}
+
+static void __device_name_maxlength_reached_cb(void *data, Evas_Object *obj,
+ void *event_info)
+{
+ __FUNC_ENTER__;
+
+ if (data == NULL || obj == NULL) {
+ DBG(LOG_ERROR, "The param is NULL\n");
+ return;
+ }
+
+ int ret = notification_status_message_post(
+ _("IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"));
+ if (ret != NOTIFICATION_ERROR_NONE) {
+ DBG(LOG_ERROR, "notification_status_message_post() ERROR [%d]", ret);
+ }
+
+ __FUNC_EXIT__;
+}
+
+static void _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", "");
+}
+
+static void _rename_entry_keydown_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+
+ Evas_Event_Key_Down *ev;
+ Evas_Object *entry = obj;
+
+ WFD_RET_IF(data == NULL, "Incorrect parameter data(NULL)\n");
+ WFD_RET_IF(event_info == NULL, "Incorrect parameter event_info(NULL)\n");
+ WFD_RET_IF(entry == NULL, "Incorrect parameter entry(NULL)\n");
+
+ ev = (Evas_Event_Key_Down *)event_info;
+ DBG(LOG_INFO, "ENTER ev->key:%s", ev->key);
+
+ if (g_strcmp0(ev->key, "KP_Enter") == 0 || g_strcmp0(ev->key, "Return") == 0) {
+ Ecore_IMF_Context *imf_context;
+
+ imf_context = (Ecore_IMF_Context*)elm_entry_imf_context_get(entry);
+ if (imf_context) {
+ ecore_imf_context_input_panel_hide(imf_context);
+ }
+
+ elm_object_focus_set(entry, EINA_FALSE);
+ }
+}
+static char *__wfd_main_rename_desc_label_get(void *data, Evas_Object *obj,
+ const char *part)
+{
+ __FUNC_ENTER__;
+
+ DBG(LOG_INFO,"Part = %s", part);
+ if (obj == NULL || part == NULL) {
+ return NULL;
+ }
+
+ if (!strcmp(part, "elm.text.multiline")) {
+ return g_strdup(_("IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"));
+ }
+ __FUNC_EXIT__;
+ return NULL;
+}
+
+static Evas_Object *__wfd_main_rename_entry_icon_get(
+ void *data, Evas_Object *obj, const char *part)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *)data;
+ WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
+ Evas_Object *entry = NULL;
+ Evas_Object *layout = NULL;
+ Evas_Object *button = NULL;
+ Ecore_IMF_Context *imf_context;
+ char *name_value = NULL;
+
+ static Elm_Entry_Filter_Limit_Size limit_filter_data;
+
+ if (!strcmp(part, "elm.icon.entry")) {
+
+ name_value = elm_entry_utf8_to_markup(ugd->dev_name);
+ entry = ea_editfield_add(obj, EA_EDITFIELD_SCROLL_SINGLELINE);
+ limit_filter_data.max_char_count = WSC_SPEC_DEVICE_NAME_MAX_LEN;
+ 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, "IDS_STU_HEADER_ENTER_DEVICE_NAME");
+
+ imf_context = (Ecore_IMF_Context*)elm_entry_imf_context_get(entry);
+ if (imf_context) {
+ ecore_imf_context_input_panel_return_key_type_set(imf_context,
+ ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
+ }
+
+ ugd->rename_entry = entry;
+ elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
+ elm_entry_entry_set(entry, name_value);
+ WFD_IF_FREE_MEM(name_value);
+ elm_entry_cursor_end_set(entry);
+
+ evas_object_smart_callback_add(entry, "changed,user", _rename_popop_entry_changed_cb, ugd);
+ evas_object_smart_callback_add(entry, "changed", _rename_popop_entry_changed_cb, ugd);
+ evas_object_smart_callback_add(entry, "preedit,changed", _rename_popop_entry_changed_cb, ugd);
+ evas_object_smart_callback_add(entry, "maxlength,reached",
+ __device_name_maxlength_reached_cb, ugd);
+
+ 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, ugd);
+
+ evas_object_smart_callback_add(entry, "focused", _entry_focused_cb, NULL);
+ evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN, _rename_entry_keydown_cb, ugd);
+ elm_object_part_content_set(layout, "entry_part", entry);
+ evas_object_show(entry);
+ elm_object_focus_set(entry, EINA_TRUE);
+
+ __FUNC_EXIT__;
+ return entry;
+ }
+ __FUNC_EXIT__;
+ return NULL;
+}
+
+
+/**
+ * This function let the ug create rename popup
+ * @return void
+ * @param[in] data the pointer to the main data structure
+ * @param[in] obj the pointer to the evas object
+ * @param[in] event_info the pointer to the event information
+ */
+void _gl_rename_device_sel(void *data, Evas_Object *obj, void *event_info)
+{
+ __FUNC_ENTER__;
+ struct ug_data *ugd = (struct ug_data *) data;
+ WFD_RET_IF(ugd == NULL, "The param is NULL\n");
+ WFD_IF_DEL_OBJ(ugd->ctxpopup);
+ WFD_IF_DEL_OBJ(ugd->rename_popup);
+ Evas_Object *popup;
+ Evas_Object *button;
+ Evas_Object *genlist = NULL;
+ Evas_Object *layout = NULL;
+ Elm_Object_Item *git = NULL;
+
+ popup = elm_popup_add(ugd->layout);
+// elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+ ea_object_event_callback_add(popup, EA_CALLBACK_BACK, _rename_popup_cancel_cb, ugd);
+ 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");
+
+ layout = elm_layout_add(popup);
+ elm_layout_file_set(layout, WFD_UG_EDJ_PATH, "main_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 */
+ ugd->rename_entry_itc = elm_genlist_item_class_new();
+ WFD_RET_IF(ugd->rename_entry_itc == NULL, "rename_entry_itc is NULL\n");
+ ugd->rename_entry_itc->item_style = "entry";
+ ugd->rename_entry_itc->func.text_get = NULL;
+ ugd->rename_entry_itc->func.content_get = __wfd_main_rename_entry_icon_get;
+ ugd->rename_entry_itc->func.state_get = NULL;
+ ugd->rename_entry_itc->func.del = NULL;
+
+ elm_genlist_item_append(genlist, ugd->rename_entry_itc, ugd,
+ NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+
+ ugd->rename_desc_itc = elm_genlist_item_class_new();
+ WFD_RET_IF(ugd->rename_desc_itc == NULL, "rename_desc_itc is NULL\n");
+ ugd->rename_desc_itc->item_style = "multiline_sub";
+ ugd->rename_desc_itc->func.text_get = __wfd_main_rename_desc_label_get;
+ ugd->rename_desc_itc->func.content_get = NULL;
+ ugd->rename_desc_itc->func.state_get = NULL;
+ ugd->rename_desc_itc->func.del = NULL;
+
+ git = elm_genlist_item_append(genlist, ugd->rename_desc_itc, NULL, NULL,
+ ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(git != NULL)
+ elm_genlist_item_select_mode_set(git,
+ ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+ button = elm_button_add(popup);
+ elm_object_style_set(button, "popup");
+ elm_object_domain_translatable_text_set(button, PACKAGE,
+ "IDS_BR_SK_CANCEL");
+ elm_object_part_content_set(popup, "button1", button);
+ evas_object_smart_callback_add(button, "clicked", _rename_popup_cancel_cb, ugd);
+
+ button = elm_button_add(popup);
+ elm_object_style_set(button, "popup");
+ elm_object_domain_translatable_text_set(button, PACKAGE,
+ "IDS_ST_SK_RENAME");
+ elm_object_part_content_set(popup, "button2", button);
+ evas_object_smart_callback_add(button, "clicked", _rename_popup_ok_cb, ugd);
+ ugd->rename_button = button;
+ evas_object_show(button);
+
+ 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);
+ elm_object_focus_set(ugd->rename_entry, EINA_TRUE);
+ ugd->rename_popup = popup;
+ evas_object_show(button);
+
+ __FUNC_EXIT__;
+}
+
diff --git a/ug-wifidirect/tables/setting-wifidirect-efl_ChangeableColorTable.xml b/ug-wifidirect/tables/setting-wifidirect-efl_ChangeableColorTable.xml
new file mode 100644
index 0000000..a1e9f77
--- /dev/null
+++ b/ug-wifidirect/tables/setting-wifidirect-efl_ChangeableColorTable.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ChangeableColorTables>
+ <ChangeableColorTable num="1">
+ <Theme style="Dark">
+ </Theme>
+ <Theme style="Light">
+ <ChangeableColorInfo id="AO001" inputColor="1" hue="0" saturation="0" value="0" alpha="80" />
+ </Theme>
+ </ChangeableColorTable>
+ <ChangeableColorTable num="2">
+ <Theme style="Dark">
+ </Theme>
+ <Theme style="Light">
+ <ChangeableColorInfo id="AO001" inputColor="1" hue="0" saturation="0" value="0" alpha="80" maxValue="94" />
+ </Theme>
+ </ChangeableColorTable>
+ <ChangeableColorTable num="3">
+ <Theme style="Dark">
+ </Theme>
+ <Theme style="Light">
+ <ChangeableColorInfo id="AO001" inputColor="1" hue="0" saturation="0" value="0" alpha="80" />
+ </Theme>
+ </ChangeableColorTable>
+</ChangeableColorTables>
diff --git a/ug-wifidirect/tables/setting-wifidirect-efl_FontInfoTable.xml b/ug-wifidirect/tables/setting-wifidirect-efl_FontInfoTable.xml
new file mode 100644
index 0000000..573b1b7
--- /dev/null
+++ b/ug-wifidirect/tables/setting-wifidirect-efl_FontInfoTable.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FontInfoTable>
+</FontInfoTable>