Update for tizen_2.1

66 files changed, 964 insertions, 119 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e588be..0f1e7b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,15 +28,12 @@ pkg_check_modules(pkgs REQUIRED
 	appsvc)
 
 FOREACH(flag ${pkgs_CFLAGS})
-	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall -g")
+	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
-#SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -finstrument-functions")
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g ")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fvisibility=hidden")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
-#This is flag for Gprof
-#SET(CMAKE_C_FLAGS_RELEASE "-pg")
 
 FIND_PROGRAM(UNAME NAMES uname)
 EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
@@ -46,26 +43,20 @@ IF("${ARCH}" STREQUAL "arm")
 ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
-ADD_DEFINITIONS("-DSLP_DEBUG")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
-#ADD_CUSTOM_TARGET(custom_popup.edj
-#COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data
-#${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edc
-#${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edj DEPENDS
-#${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edc
-#)
-
-#ADD_DEPENDENCIES(${PROJECT_NAME} custom_popup.edj)
-
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/org.tizen.net-popup/bin)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
 # install desktop file & icon
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-INSTALL(FILES ${CMAKE_BINARY_DIR}/resources/org.tizen.net-popup.xml DESTINATION /usr/share/packages/)
-#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/org.tizen.net-popup.png DESTINATION /usr/share/icons/default/small)
-#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edj DESTINATION /usr/apps/org.tizen.net-popup/res/edje)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/resources/net.netpopup.xml DESTINATION ${PREFIX}/share/packages/)
+
+
+# install ini file
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/${PROJECT_NAME}.ini DESTINATION share/process-info)
+
+ADD_SUBDIRECTORY(po)
diff --git a/debian/changelog b/debian/changelog
index 50dac7a..f9850ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,80 @@
-net-popup (0.2.01-3) precise; urgency=low
+net-popup (0.2.1-10) unstable; urgency=low
 
-  * Update for trunk SR
+  * Set text domain to support language change
   * Git: magnolia/apps/home/net-popup
-  * Tag: net.netpopup_0.2.01-3
+  * Tag: net.netpopup_0.2.1-10
 
- -- sunil85.kim <isurit@sunil85.kim>  Fri, 15 Mar 2013 14:19:39 +0900
+ -- Sanghoon Cho <sanghoon80.cho@samsung.com>  Thu, 21 Mar 2013 11:55:55 +0900
 
-net-popup (0.2.01-2) precise; urgency=low
+net-popup (0.2.1-9) unstable; urgency=low
 
-  * Update for SR
+  * Update strings in po files
   * Git: magnolia/apps/home/net-popup
-  * Tag: net.netpopup_0.2.01-2
+  * Tag: net.netpopup_0.2.1-9
 
- -- sunil85.kim <isurit@sunil85.kim>  Mon, 25 Feb 2013 18:03:36 +0900
+ -- Nishant Kumar Sharma <nishant.vns@samsung.com>  Mon, 11 Mar 2013 16:41:19 +0530
 
-net-popup (0.2.01-1) unstable; urgency=low
+net-popup (0.2.1-8) unstable; urgency=low
+
+  * SMACK label updated
+  * Git: magnolia/apps/home/net-popup
+  * Tag: net.netpopup_0.2.1-8
+
+ -- Sanghoon Cho <sanghoon80.cho@samsung.com>  Tue, 26 Feb 2013 16:52:13 +0900
+
+net-popup (0.2.1-7) unstable; urgency=low
+
+  * Set CFLAGS fvisibility hidden
+  * Git: magnolia/apps/home/net-popup
+  * Tag: net.netpopup_0.2.1-7
+
+ -- Danny Jeongseok Seo <s.seo@samsung.com>  Thu, 21 Feb 2013 21:25:57 +0900
+
+net-popup (0.2.1-6) unstable; urgency=low
+
+  * Update adding Wi-Fi found notification
+  * Git: magnolia/apps/home/net-popup
+  * Tag: net.netpopup_0.2.1-6
+
+ -- Sanghoon Cho <sanghoon80.cho@samsung.com>  Tue, 19 Feb 2013 22:02:29 +0900
+
+net-popup (0.2.1-5) unstable; urgency=low
+
+  * SMACK rules updated
+  * Git: magnolia/apps/home/net-popup
+  * Tag: net.netpopup_0.2.1-5
+
+ -- Danny Jeongseok Seo <s.seo@samsung.com>  Thu, 14 Feb 2013 21:52:24 +0900
+
+net-popup (0.2.1-4) unstable; urgency=low
+
+  * SMACK rules updated
+  * Git: magnolia/apps/home/net-popup
+  * Tag: net.netpopup_0.2.1-4
+
+ -- Danny Jeongseok Seo <s.seo@samsung.com>  Fri, 01 Feb 2013 17:31:40 +0900
+
+net-popup (0.2.1-3) unstable; urgency=low
+
+  * Change the package name.
+  * Git: magnolia/apps/home/net-popup
+  * Tag: net.netpopup_0.2.1-3
+
+ -- Praveen C <pravin.c@samsung.com>  Tue, 29 Jan 2013 16:57:46 +0530
+
+net-popup (0.2.1-2) unstable; urgency=low
+
+  * Fix del_notification param to pkg name from fullpath
+  * Git: magnolia/apps/home/net-popup
+  * Tag: net.netpopup_0.2.1-2
+
+ -- Sanghoon Cho <sanghoon80.cho@samsung.com>  Fri, 25 Jan 2013 21:15:32 +0900
+
+net-popup (0.2.1-1) unstable; urgency=low
 
   * Change net-popup to app-svc application.
   * Git: magnolia/apps/home/net-popup
-  * Tag: net.netpopup_0.2.01-1
+  * Tag: net.netpopup_0.2.1-1
 
  -- Praveen C <pravin.c@samsung.com>  Wed, 19 Dec 2012 14:21:35 +0530
 
diff --git a/debian/control b/debian/control
index c4164a6..0bcc07e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,13 @@ Uploaders: Sanghoon Cho <sanghoon80.cho@samsung.com>, Danny Jeongseok Seo <s.seo
 Build-Depends: debhelper (>= 5),libevas-dev, libecore-dev, libethumb-dev, libelm-dev, libefreet-dev, libappcore-efl-dev, libdevman-dev, syspopup-dev, syspopup-caller-dev, dlog-dev
 Standards-Version: 0.1.0 
 
-Package: org.tizen.net-popup
+Package: net.netpopup
 Section: main
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libslp-utilx-0, libdlog-0
 Description: network system-popup application
 
-Package: org.tizen.net-popup-dbg
+Package: net.netpopup-dbg
 Section: debug
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/net.netpopup.install.in b/debian/net.netpopup.install.in
index 5e02569..42ba002 100644
--- a/debian/net.netpopup.install.in
+++ b/debian/net.netpopup.install.in
@@ -2,3 +2,4 @@
 @PREFIX@/share/locale/*
 @PREFIX@/share/applications/net.netpopup.desktop
 @PREFIX@/share/process-info/net-popup.ini
+@PREFIX@/share/packages/net.netpopup.xml
diff --git a/debian/org.tizen.net-popup.install.in b/debian/org.tizen.net-popup.install.in
deleted file mode 100644
index d643957..0000000
--- a/debian/org.tizen.net-popup.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-/opt/apps/org.tizen.net-popup/bin/net-popup
-/opt/share/icons/*
-/opt/share/process-info/net-popup.ini
-
diff --git a/debian/rules b/debian/rules
index 26def98..040ea38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 CFLAGS ?= -Wall -g
 CXXFLAGS ?= -Wall -g
 LDFLAGS ?=
-PREFIX ?= /opt/apps/org.tizen.net-popup
+PREFIX ?= /usr
 DATADIR ?= /opt
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
diff --git a/include/net-popup-strings.h b/include/net-popup-strings.h
index d79a79a..91c0ec9 100644
--- a/include/net-popup-strings.h
+++ b/include/net-popup-strings.h
@@ -17,10 +17,11 @@
 *
 */
 
-#ifndef __DEF_NET_POPUP_STRINGS_H_
-#define __DEF_NET_POPUP_STRINGS_H_
+#ifndef __DEF_NET_POPUP_STRINGS_H__
+#define __DEF_NET_POPUP_STRINGS_H__
 
 #include <libintl.h>
+
 #include "net-popup.h"
 
 #define ALERT_STR_MOBILE_NETWORKS_CHARGE		dgettext(PACKAGE, "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN")
@@ -30,5 +31,4 @@
 #define ALERT_STR_WIFI_CONNECTED		dgettext(PACKAGE, "IDS_WIFI_BODY_CONNECTED")
 #define ALERT_STR_RESTRICTED_USE_WIFI	dgettext(PACKAGE, "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI")
 
-
-#endif				/* __DEF_NET_POPUP_STRINGS_H_ */
+#endif /* __DEF_NET_POPUP_STRINGS_H__ */
diff --git a/include/net-popup.h b/include/net-popup.h
index 3720353..6280ffc 100644
--- a/include/net-popup.h
+++ b/include/net-popup.h
@@ -17,22 +17,17 @@
 *
 */
 
-#ifndef __DEF_NET_POPUP_H_
-#define __DEF_NET_POPUP_H_
+#ifndef __DEF_NET_POPUP_H__
+#define __DEF_NET_POPUP_H__
 
-#include <Elementary.h>
 #include <dlog.h>
-
-#ifndef PREFIX
-#define PREFIX "/usr"
-#endif
+#include <Elementary.h>
 
 #define PACKAGE		"net-popup"
-#define ALERT_STR_LEN_MAX 100
+#define ALERT_STR_LEN_MAX	100
 
 #define NET_POPUP	"NET_POPUP"
 #define log_print(tag, format, args...) LOG(LOG_DEBUG, \
-	tag, "%s:%d "format, __func__, __LINE__, ##args)
-
+		tag, "%s:%d "format, __func__, __LINE__, ##args)
 
-#endif				/* __DEF_NET_POPUP_H_ */
+#endif /* __DEF_NET_POPUP_H__ */
diff --git a/net.netpopup.manifest b/net.netpopup.manifest
index 97e8c31..3100a71 100644
--- a/net.netpopup.manifest
+++ b/net.netpopup.manifest
@@ -1,5 +1,64 @@
 <manifest>
+	<define>
+		<domain name="net.netpopup"/>
+	</define>
+	<assign>
+		<filesystem path="/usr/share/license/net.netpopup" label="_"/>
+		<filesystem path="/usr/share/packages/net.netpopup.xml" label="_"/>
+		<filesystem path="/usr/share/process-info/net-popup.ini" label="_"/>
+		<filesystem path="/usr/share/locale/ar/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/az/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/bg/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/ca/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/cs/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/da/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/de_DE/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/el_GR/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/en/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/en_PH/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/en_US/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/es_ES/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/es_US/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/et/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/eu/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/fi/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/fr_CA/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/fr_FR/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/ga/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/gl/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/hi/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/hr/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/hu/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/hy/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/is/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/it_IT/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/ja_JP/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/ka/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/kk/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/ko_KR/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/lt/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/lv/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/mk/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/nb/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/nl_NL/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/pl/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/pt_BR/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/pt_PT/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/ro/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/ru_RU/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/sk/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/sl/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/sr/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/sv/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/tr_TR/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/uk/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/uz/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/zh_CN/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/zh_HK/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/zh_SG/LC_MESSAGES/net-popup.mo" label="_"/>
+		<filesystem path="/usr/share/locale/zh_TW/LC_MESSAGES/net-popup.mo" label="_"/>
+	</assign>
 	<request>
-		<domain name="_"/>
+		<domain name="net.netpopup"/>
 	</request>
 </manifest>
diff --git a/net.netpopup.rule b/net.netpopup.rule
new file mode 100644
index 0000000..ba35ed3
--- /dev/null
+++ b/net.netpopup.rule
@@ -0,0 +1,19 @@
+e17 net.netpopup w
+net.netpopup xorg w
+net.netpopup isf rwx
+net.netpopup dbus rwx
+net.netpopup ail::db rw
+net.netpopup mdm-server w
+net.netpopup csc-manager x
+net.netpopup sound_server rw
+net.netpopup pulseaudio rwxat
+net.netpopup syspopup::db rw
+net.netpopup notification::db rw
+net.netpopup system::vconf rwxat
+net.netpopup system::media rwxat
+net.netpopup system::share rwxat
+net.netpopup device::app_logging w
+net.netpopup system::homedir rwxat
+net.netpopup sys-assert::core rwxat
+net.netpopup system::use_internet r
+com.samsung.app-tray net.netpopup rx
diff --git a/org.tizen.net-popup.manifest b/org.tizen.net-popup.manifest
deleted file mode 100644
index 41b6ed1..0000000
--- a/org.tizen.net-popup.manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-<manifest>
-    <define>
-        <domain name="org.tizen.net-popup"/>
-    </define>
-    <assign>
-        <filesystem path="/usr/share/applications/org.tizen.net-popup.desktop" label="_"/>
-        <filesystem path="/opt/share/process-info/net-popup.ini" label="_"/>
-    </assign>
-    <request>
-        <domain name="org.tizen.net-popup"/>
-    </request>
-</manifest>
diff --git a/packaging/org.tizen.net-popup.spec b/packaging/net.netpopup.spec
index 6b24d31..f817b6a 100644
--- a/packaging/org.tizen.net-popup.spec
+++ b/packaging/net.netpopup.spec
@@ -1,9 +1,6 @@
-%define _usrdir /usr
-%define _appdir %{_usrdir}/apps
-
-Name:       org.tizen.net-popup
+Name:       net.netpopup
 Summary:    Network Notification Popup application
-Version:    0.2.01_3
+Version:    0.2.1_10
 Release:    1
 Group:      App/Network
 License:    Flora License
@@ -32,22 +29,27 @@ Network Notification Popup application
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_appdir}/org.tizen.net-popup
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 
 %install
 %make_install
 
+mkdir -p %{buildroot}%{_sysconfdir}/smack/accesses2.d/
+cp -v net.netpopup.rule %{buildroot}%{_sysconfdir}/smack/accesses2.d/
+
 #License
 mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE.Flora %{buildroot}%{_datadir}/license/org.tizen.net-popup
+cp LICENSE.Flora %{buildroot}%{_datadir}/license/net.netpopup
 
 
 %files
-%manifest org.tizen.net-popup.manifest
-%defattr(-,root,root,-)
-%{_usrdir}/share/packages/org.tizen.net-popup.xml
-%{_appdir}/org.tizen.net-popup/bin/net-popup
-%{_datadir}/license/org.tizen.net-popup
+%manifest net.netpopup.manifest
+%{_bindir}/net-popup
+%{_datadir}/process-info/net-popup.ini
+%{_datadir}/packages/net.netpopup.xml
+%{_datadir}/locale/*/LC_MESSAGES/net-popup.mo
+%{_datadir}/license/net.netpopup
+%{_sysconfdir}/smack/accesses2.d/net.netpopup.rule
diff --git a/po/ar.po b/po/ar.po
index f0ae0b2..e09a024 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -16,3 +16,12 @@ msgstr "الخدمة غير متوفرة، حاول ثانية"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "جاري الاتصال بشبكات الهاتف المحمول...\nقد يتم فرض رسوم إضافية إذا كنت لا تستخدم خطة بيانات ذات سعر موحد"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "شبكات Wi-Fi المتاحة"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "فتح إعدادات Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "الشبكة المحددة (%s) غير متاحة"
+
diff --git a/po/az.po b/po/az.po
index 565db24..43231ea 100644
--- a/po/az.po
+++ b/po/az.po
@@ -16,3 +16,12 @@ msgstr "Xidmətdən istifadə etmək mümkün deyil. Bir az sonra cəhd edin"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Mobil şəbəkələrə qoşulur...\nSabit qiymət planından istifadə etmirsinizsə, əlavə xərclər tətbiq oluna bilər"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi şəbəkələr mövcuddur"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi parametrlərini aç"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Seçilmiş şəbəkə (%s) mövcud deyil"
+
diff --git a/po/bg.po b/po/bg.po
index f1f1a11..62da9de 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -16,3 +16,12 @@ msgstr "Услугата не е достъпна. опитайте отново
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Свързване към мобилни мрежи...\nМоже да бъдат начислени допълнителни такси, ако не използвате план с твърда ценова тарифа"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Наличие на Wi-Fi мрежи"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Отворете настройките за Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Избраната мрежа не е достъпна (%s)"
+
diff --git a/po/ca.po b/po/ca.po
index b7bbe5e..4a10160 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -16,3 +16,12 @@ msgstr "Servei no disponible. Intenti-ho més tard"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Connectant a xarxes mòbils...\nPot comportar càrrecs addicionals si no utilitza una tarifa plana de dades"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Xarxes Wi-Fi disponibles"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Obrir ajustaments Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Xarxa seleccionada (%s) no disponible"
+
diff --git a/po/cs.po b/po/cs.po
index 66476d0..564036f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -16,3 +16,12 @@ msgstr "Služba je nedostupná. opakujte akci později"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Připojování k mobilním sítím...\nPokud nepoužíváte paušální datový tarif, mohou vám být účtovány další poplatky"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Dostupné sítě Wi-Fi"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otevřít nastavení Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Vybraná síť (%s) není dostupná"
+
diff --git a/po/da.po b/po/da.po
index 89ad117..e79f2f0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -16,3 +16,12 @@ msgstr "Tjenesten er ikke tilgængelig. Prøv igen senere"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Opretter forbindelse til mobile netværk ...\nYderligere gebyrer kan forekomme, hvis du ikke bruger et fast abonnement"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi-netværk tilgængelige"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Åbn Wi-Fi-indstillinger"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Valgt netværk (%s) ikke tilgængeligt"
+
diff --git a/po/de_DE.po b/po/de_DE.po
index 835a9dc..47eaa89 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -16,3 +16,12 @@ msgstr "Dienst nicht verfügbar. Später erneut versuchen"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Verbindung mit mobilem Netzwerk wird hergestellt...\nHierbei können zusätzliche Kosten anfallen, wenn Sie keine Flatrate besitzen."
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "WLAN-Netzwerke verfügbar"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "WLAN-Einstellungen öffnen"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Ausgewähltes Netz (%s) nicht verfügbar"
+
diff --git a/po/el_GR.po b/po/el_GR.po
index e5939a4..3df2829 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -16,3 +16,12 @@ msgstr "Η υπηρεσία δεν είναι διαθέσιμη, δοκιμάσ
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Σύνδεση σε δίκτυα κινητής τηλεφωνίας...\nΕνδέχεται να υπάρξουν πρόσθετες χρεώσεις σε περίπτωση που δεν χρησιμοποιείτε πρόγραμμα δεδομένων σταθερής χρέωσης"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Διαθέσιμα δίκτυα Wi-Fi"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Άνοιγμα ρυθμίσεων Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Το επιλεγμένο δίκτυο (%s) δεν είναι διαθέσιμο"
+
diff --git a/po/en.po b/po/en.po
index 2155e12..38947d1 100644
--- a/po/en.po
+++ b/po/en.po
@@ -11,8 +11,17 @@ msgid "IDS_ST_POP_NOT_SUPPORTED"
 msgstr "Not supported"
 
 msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Service not available. Try later"
+msgstr "Service not available. Try later."
 
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
-msgstr "Connecting to mobile networks...\nAdditional charges may be incurred if you are not using a flat rate data plan"
+msgstr "Connecting to mobile networks...\nAdditional charges may be incurred if you are not using a flat rate data plan."
+
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi networks available"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Open Wi-Fi settings"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Selected network (%s) not available"
 
diff --git a/po/en_PH.po b/po/en_PH.po
index 691a733..c2f2983 100644
--- a/po/en_PH.po
+++ b/po/en_PH.po
@@ -16,3 +16,12 @@ msgstr "Service is temporarily offline. Try again later"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Connecting to mobile networks...\nAdditional charges may be incurred if you are not using a flat rate data plan"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi networks available"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Open Wi-Fi settings"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Selected network (%s) not available"
+
diff --git a/po/en_US.po b/po/en_US.po
index a5136e3..6f31b22 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -11,8 +11,17 @@ msgid "IDS_ST_POP_NOT_SUPPORTED"
 msgstr "Not supported"
 
 msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Service unavailable. Try later"
+msgstr "Service unavailable. Try later."
 
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
-msgstr "Connecting to mobile networks...\nAdditional charges may be incurred if you are not using a flat rate data plan"
+msgstr "Connecting to mobile networks...\nAdditional charges may be incurred if you are not using a flat rate data plan."
+
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi networks available"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Open Wi-Fi settings"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Selected network (%s) not available"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index ea9e9ee..2ad185c 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -16,3 +16,12 @@ msgstr "Servicio no disponible. Inténtelo más tarde."
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Conectando a redes móviles...\nPuede suponer costes adicionales si no utiliza una tarifa plana de datos"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Redes Wi-Fi disponibles"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Abrir ajustes Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Red seleccionada (%s) no disponible"
+
diff --git a/po/es_MX.po b/po/es_MX.po
new file mode 100644
index 0000000..5b14bf7
--- /dev/null
+++ b/po/es_MX.po
@@ -0,0 +1,27 @@
+msgid "IDS_WIFI_BODY_CONNECTED"
+msgstr "Conectado"
+
+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_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
+msgstr "No se puede conectar a la red"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "No soportado"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Servicio no disponible. Inténtelo más tarde."
+
+msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
+msgstr "Conectando a redes móviles...\nPuede generar cobros adicionales si no utiliza un plan de datos de tarifa fija"
+
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Redes Wi-Fi disponibles"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Abrir configuración de Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Red seleccionada (%s) no disponible"
+
diff --git a/po/et.po b/po/et.po
index 4f2c3b7..03f2739 100644
--- a/po/et.po
+++ b/po/et.po
@@ -16,3 +16,12 @@ msgstr "Teenus ei ole saadaval. proovi hiljem"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Ühenduse loomine mobiilsidevõrkudega...\nKui te ei kasuta püsitasuga andmepaketti, võivad rakenduda lisatasud"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi võrgud on saadaval"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Ava Wi-Fi seaded"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Valitud võrk (%s) ei ole saadaval"
+
diff --git a/po/eu.po b/po/eu.po
index 1e7ae87..540ab8c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -16,3 +16,12 @@ msgstr "Zerbitzua ez dago eskuragarri. Geroago saiatu"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Sare mugikorretara konektatzen...\nBaliteke kostu osagarriak eragitea, ez baduzu tarifa finko planik erabiltzen"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi sareak erabilgarri"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Ireki Wi-Fi ezarpenak"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Aukeratutako sarea (%s) ez dago eskuragarri"
+
diff --git a/po/fi.po b/po/fi.po
index b61eef4..9a0ca56 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -16,3 +16,12 @@ msgstr "Palvelu ei ole saatavilla. Yritä myöhemmin uudelleen."
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Yhdistetään matkapuhelinverkkoihin...\nLisämaksut ovat mahdollisia, jos et käytä kiinteää hinnoittelua"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Käytettävissä olevat Wi-Fi-verkot"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Avaa Wi-Fi-asetukset"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Valittu verkko (%s) ei ole käytettävissä"
+
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 4939f3f..0fca9e0 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -16,3 +16,12 @@ msgstr "Service non disponible. Réessayez plus tard"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Connexion aux réseaux mobiles...\nDes frais supplémentaires peuvent vous être facturés si vous ne disposez pas d'un forfait"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Réseaux wifi disponibles"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Ouvrir paramètres Wifi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Réseau sélectionné (%s) non disponible"
+
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 2bc58da..6f5d851 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -16,3 +16,12 @@ msgstr "Service non disponible. Réessayez plus tard"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Connexion aux réseaux mobiles...\nDes frais supplémentaires peuvent être facturés si vous ne disposez pas d'un forfait adapté"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Réseaux Wi-Fi disponibles"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Ouvrir paramètres Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Réseau sélectionné (%s) non disponible"
+
diff --git a/po/ga.po b/po/ga.po
index 9af6a21..08438bd 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -16,3 +16,12 @@ msgstr "Níl seirbhís ar fáil. Triail arís níos moille"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Ag nascadh le líonraí móibíleacha...\nIs féidir go ngearrfar táillí breise  mura bhfuil plean sonraí bunrata á úsáid agat"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Líonraí Wi-Fi ar fáil"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Oscail socruithe Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Níl an líonra roghnaithe (%s) ar fáil"
+
diff --git a/po/gl.po b/po/gl.po
index d56d505..2d8ef40 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -16,3 +16,12 @@ msgstr "Servizo non dispoñible. Inténteo máis tarde"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Conectando con redes móbiles...\nÉ posible que se deriven custos adicionais se non estás a usar un plan de datos de tarifa plana"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Redes Wi-Fi dispoñibles"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Abrir axustes de Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Rede seleccionada (%s) non dispoñible"
+
diff --git a/po/hi.po b/po/hi.po
index 91bff62..97c25a6 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -16,3 +16,12 @@ msgstr "सेवा अनुपलब्‍ध। बाद में को�
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "मोबाइल नेटवर्क्स से कनेक्ट किया जा रहा है...\nअतिरिक्त शुल्क लागू हो सकते हैं यदि आप फ़्लैट रेट प्लान का उपयोग नही कर रहे हैं"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "WI-FI नेटवर्क्स उपलब्ध"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "खुले Wi-Fi सेटिंग्स"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "चयनित नेटवर्क (%s) उपलब्ध नहीं"
+
diff --git a/po/hr.po b/po/hr.po
index 06bf30a..b969fb8 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -16,3 +16,12 @@ msgstr "Usluga nije dostupna, Pokušajte poslije!"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Spajanje na mobilne mreže...\nMogući su dodatni troškovi ako ne koristite tarifu bez ograničenja"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Dostupne WiFi mreže"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otvori postavke za Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Odabrana mreža (%s) nije dostupna"
+
diff --git a/po/hu.po b/po/hu.po
index d16756f..3e3bf46 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -16,3 +16,12 @@ msgstr "A szolgáltatás nem elérhető. próbálja meg később"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Mobilhálózati kapcsolat létesítése...\nHa nem átalánydíjas adatcsomagra fizetett elő, akkor további költségek merülhetnek fel"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi-hálózat elérhető"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi beállítások megnyitása"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "A kiválasztott hálózat (%s) nem elérhető"
+
diff --git a/po/hy.po b/po/hy.po
index b44f011..eea9366 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -16,3 +16,12 @@ msgstr "Ծառայությունը հասանելի չէ. Փորձեք ավել�
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Միանում է շարժական կապի ցանցերին...\nԼրացուցիչ վճար կարող է պահանջվել, եթե չեք օգտագործում հաստատուն սակագնով տվյալների փոխանցման պլան"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi ցանցերը մատչելի են"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Բացել Wi-Fi կարգավորումները"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Ընտրված ցանցը (%s) մատչելի չէ"
+
diff --git a/po/is.po b/po/is.po
index 254d069..2ebc3d5 100644
--- a/po/is.po
+++ b/po/is.po
@@ -16,3 +16,12 @@ msgstr "Þjónustan er ekki tiltæk. Reynið aftur síðar"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Tengi við farsímakerfi...\nViðbótargjöld kunna að fylgja ef þú borgar ekki fast gjald"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi-net eru í boði"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Opna Wi-Fi stillingar"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Valið kerfi (%s) er ekki í boði"
+
diff --git a/po/it_IT.po b/po/it_IT.po
index 4c297b2..5571693 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -16,3 +16,12 @@ msgstr "Servizio non disponibile. Riprovare più tardi."
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Connessione a reti mobili in corso...\nPotrebbero essere applicati addebiti aggiuntivi se non si usa un piano dati a tariffa fissa"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Reti Wi-Fi disponibili"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Apri impostazioni Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Rete selezionata (%s) non disponibile"
+
diff --git a/po/ja_JP.po b/po/ja_JP.po
index b95bbc8..b34b5c7 100644
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -5,14 +5,23 @@ msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
 msgstr "Wi-Fiの使用は、セキュリティポリシーによって制限されています。"
 
 msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "ネット​ワーク​に​接続​できません"
+msgstr "ネットワークに接続できません"
 
 msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "サポート​されて​いません。"
+msgstr "サポートされていません。"
 
 msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "サービス​を​利用​できません。​後ほどお試しください"
+msgstr "サービスを利用できません。後ほどお試しください"
 
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "モバイルネットワークに接続中...\n定額フラットプランを適用していない場合、追加料金が発生する可能性があります。"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "使用可能なWi-Fiネットワーク"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi設定を表示"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "選択したネットワーク（%s）は利用できません。"
+
diff --git a/po/ka.po b/po/ka.po
index 955e234..798076a 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -16,3 +16,12 @@ msgstr "მომსახურება არ არის. მოგვი�
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "მყარდება კავშირი მობილურ ქსელებთან...\nშეიძლება დაგერიცხოთ დამატებითი გადასახადი, თუ არ იყენებთ ფიქსირებულ გადასახადს"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "მისაწვდომი Wi-Fi ქსელები"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi პარამეტრების გახსნა"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "არჩეული ქსელი (%s) მიუწვდომელია"
+
diff --git a/po/kk.po b/po/kk.po
index 5724f7d..2594758 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -16,3 +16,12 @@ msgstr "Қызмет Жоқ. Кейінрек Қайталаңыз"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Ұялы байланыс желілірені қосылуда...\nБіркелкі тарифтік жоспар пайдаланылмаса, қосымша ақылар алыуны мүмкін"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Қол жетімді Wi-Fi желілері"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi параметрлерін ашу"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Таңдалған желі (%s) қол жетімді емес"
+
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 78f4c64..20d47a0 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -11,8 +11,17 @@ msgid "IDS_ST_POP_NOT_SUPPORTED"
 msgstr "사용할 수 없습니다"
 
 msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "서비스를 이용할 수 없습니다. 잠시 후 다시 시도하세요"
+msgstr "서비스를 이용할 수 없습니다. 잠시 후 다시 시도하세요."
 
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "데이터 네트워크에 연결합니다. 정액요금제 또는 무료이용 서비스가 아닌 경우 데이터 통화료가 부과됩니다."
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi 사용할 수 있음"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi 설정 열기"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "선택한 네트워크(%s)를 사용할 수 없습니다"
+
diff --git a/po/lt.po b/po/lt.po
index 0aa856c..e769287 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -16,3 +16,12 @@ msgstr "Paslauga neteikiama. pamėginkite vėliau"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Jungiantis prie mobiliųjų tinklų...\ngali būti taikomas papildomas mokestis, jei nesinaudojate fiksuoto dydžio įmokos planu"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Pasiekiami „Wi-Fi“ tinklai"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Atidaryti „Wi-Fi“ nustatymus"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Pasirinktas tinklas (%s) nepasiekiamas"
+
diff --git a/po/lv.po b/po/lv.po
index 5583779..aac9550 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -16,3 +16,12 @@ msgstr "Pakalpojums nav pieejams. mēģiniet vēlāk"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Veido savienojumu ar mobilajiem tīkliem...\nJa neizmantojat vienoto tarifa plānu, var rasties papildu izmaksas"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi tīkli pieejami"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Atvērt Wi-Fi iestatījumus"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Izvēlētais tīkls (%s) nav pieejams"
+
diff --git a/po/mk.po b/po/mk.po
index 17f0597..fa47d9e 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -16,3 +16,12 @@ msgstr "Услугата е недостапна. обидете се подоц
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Се поврзува со мобилни мрежи...\nМоже да има дополнителни трошоци ако не користите тарифен план за неограничен пристап до податоци"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Достапни се мрежи Wi-Fi"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Отвори опции за Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Избраната мрежа (%s) не е достапна"
+
diff --git a/po/nb.po b/po/nb.po
index a086f51..67632b1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -16,3 +16,12 @@ msgstr "Tjenester er ikke tilgjengelig. forsøk senere"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Kobler til mobilnettverk...\nDette kan medføre ekstra kostnader hvis du ikke bruker en fastpris"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi-nettverk tilgjengelige"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Åpne Wi-Fi-innstillinger"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Valgt nettverk (%s) er ikke tilgjengelig"
+
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 920ec8d..4cd536f 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -16,3 +16,12 @@ msgstr "Dienst niet beschikbaar. Probeer het later opnieuw."
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Verbinden met mobiele netwerken...\nEr kunnen extra kosten gelden, als u geen abonnement met een vast tarief hebt"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi-netwerken beschikbaar"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Open Wi-Fi-instellingen"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Geselecteerd netwerk (%s) niet beschikbaar"
+
diff --git a/po/pl.po b/po/pl.po
index 8b55627..25a410e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,3 +16,12 @@ msgstr "Usługa niedostępna. Spróbuj później"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Łączenie z sieciami komórkowymi...\nMogą zostać naliczone dodatkowe opłaty, jeżeli nie używasz planu jednolitych taryf"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Dostępne sieci Wi-Fi"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otwórz ustawienia Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Wybrana sieć (%s) jest niedostępna"
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4b6d3bf..9af4811 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,3 +16,12 @@ msgstr "Serviço indisponível. Tente mais tarde"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Conectando às redes móveis...\nCobranças adicionais podem estar sujeitas se você não estiver usando um plano de tarifa fixa"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Redes Wi-Fi disponíveis"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Abrir configurações de Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "A rede selecionada (%s) não está disponível"
+
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 3653f3c..b95ba19 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -16,3 +16,12 @@ msgstr "Serviço indisponível. tente mais tarde"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "A ligar a redes móveis...\nPode incorrer em taxas adicionais se não estiver a utilizar um tarifário de taxa fixa"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Redes Wi-Fi disponíveis"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Definições de abertura de Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Rede seleccionada (%s) indisponível"
+
diff --git a/po/ro.po b/po/ro.po
index 8eabef3..77645f5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -16,3 +16,12 @@ msgstr "Serviciu indisponibil, încercaţi mai târziu!"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Se conectează la reţelele mobile...\nSe pot genera taxe suplimentare dacă nu utilizaţi un plan de date cu tarife fixe"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Reţele Wi-Fi disponibile"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Deschidere setări Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Reţeaua selectată (%s) nu este disponibilă"
+
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 9177c83..04e54c3 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -16,3 +16,12 @@ msgstr "Услуга недоступна. повторите попытку п�
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Подключение к мобильной сети...\nЕсли не используется безлимитный тариф, за это может взиматься дополнительная плата"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Сети Wi-Fi доступны"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Открыть параметры Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Выбранная сеть (%s) недоступна"
+
diff --git a/po/sk.po b/po/sk.po
index 2108467..5fd2df3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -16,3 +16,12 @@ msgstr "Služba je nedostupná. skúste to znova."
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Pripája sa k mobilným sieťam...\nAk nepoužívate paušálny dátový tarifný program, môžu sa účtovať ďalšie poplatky"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Siete Wi-Fi sú k dispozícii"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otvoriť nastavenia siete Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Vybratá sieť (%s) nie je k dispozícii"
+
diff --git a/po/sl.po b/po/sl.po
index b1bf1dd..e29fb9e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -16,3 +16,12 @@ msgstr "Storitve ni na voljo. poskusite znova"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Povezovanje z mobilnimi omrežji ...\nČe nimate pavšalne mesečne naročnine, lahko pride do dodatnih stroškov"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Na voljo so omrežja Wi-Fi"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Odpri nastavitve za Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Izbrano omrežje (%s) ni na voljo"
+
diff --git a/po/sr.po b/po/sr.po
index 0e07e1d..e56c7f2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -16,3 +16,12 @@ msgstr "Usluga nedostupna. probaj kasnije"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Povezivanje na mobilne mreže...\nMože doći do dodatnih troškova ako ne koristiš paušalni plan plaćanja za prenos podataka"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi mreže dostupne"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Otvori Wi-Fi podešavanja"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Izabrana mreža (%s) nije dostupna"
+
diff --git a/po/sv.po b/po/sv.po
index 5b3017b..e5d1bb8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -16,3 +16,12 @@ msgstr "Tjänsten är inte tillgänglig. försök senare."
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Ansluter till mobilnätverk...\nYtterligare avgifter kan tillkomma om du inte har en dataplan med fast taxa"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi-nätverk är tillgängliga"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Öppna Wi-Fi-inställningar"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Valt nätverk (%s) är inte tillgängligt"
+
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 6c1bb34..7ab6cd4 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -16,3 +16,12 @@ msgstr "Hizmete Erişilemiyor. Daha Sonra Deneyin"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Mobil ağlara bağlanıyor...\nSabit fiyatlı tarife kullanmıyorsanız ek ücrete tabi olabilirsiniz"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi ağları mevcut"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi ayarlarını açın"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Seçili ağ (%s) mevcut değil"
+
diff --git a/po/uk.po b/po/uk.po
index 33142b5..c119c33 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -16,3 +16,12 @@ msgstr "Послуга недоступна. спробуйте пізніше"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Підключення до мобільних мереж...\nУ разі використання тарифного плану, відмінного від фіксованого, може стягуватися додаткова плата"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Доступні мережі Wi-Fi"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Відкрити установки Wi-Fi"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Вибрана мережа (%s) недоступна"
+
diff --git a/po/uz.po b/po/uz.po
index 07ec5f3..bf504a7 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -16,3 +16,12 @@ msgstr "Xizmatdan foydalanib bo‘lmaydi. Keyinroq urinib ko‘ring"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "Mobil tarmoqqa ulanmoqda...\nAgar o‘zgarmas narxlar tarifidan foydalanmayotgan bo‘lsangiz, qo‘shimcha to‘lov olinishi mumkin"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi tarmoqlari mavjud"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "Wi-Fi parametrlarini oching"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "Tanlangan tarmoq (%s)dan foydalanib bo‘lmaydi"
+
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6070245..bd3e465 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,3 +16,12 @@ msgstr "服务不可用,稍后再试"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "正在连接至移动网络…\n如果您未使用统一收费数据方案可能产生额外费用"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi网络可用"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "开放Wi-Fi设置"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "选定网络（%s）不可用"
+
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3e43e9f..53dc3b2 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -16,3 +16,12 @@ msgstr "無可用服務。請稍後再試"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "正在連接至流動網絡...\n若您並非使用固定收費計劃，將會產生額外費用"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi 網絡可用"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "開啟 Wi-Fi 設定"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "選擇的網絡（%s）不可用"
+
diff --git a/po/zh_SG.po b/po/zh_SG.po
index aea0c6f..e85b933 100644
--- a/po/zh_SG.po
+++ b/po/zh_SG.po
@@ -16,3 +16,12 @@ msgstr "服务暂时离线。请稍后再试"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "正在连接至移动网络…\n如果您未使用统一收费数据方案可能产生额外费用"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi网络可用"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "开放Wi-Fi设置"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "选定网络（%s）不可用"
+
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bb3b4bd..4448a1a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -16,3 +16,12 @@ msgstr "無法使用服務。請稍後再試"
 msgid "IDS_ST_POP_CONNECTING_TO_MOBILE_NETWORKS_ING_N_ADDITIONAL_CHARGES_MAY_BE_INCURRED_IF_YOU_ARE_NOT_USING_A_FLAT_RATE_DATA_PLAN"
 msgstr "連接至行動網路...\n若您並非使用固定費率，將會產生額外費用"
 
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "可用的Wi-Fi 網路"
+
+msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
+msgstr "開啟 Wi-Fi 設定"
+
+msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
+msgstr "選取的網路 (%s) 無法使用"
+
diff --git a/resources/images/Q02_Notification__wifi_in_range.png b/resources/images/Q02_Notification__wifi_in_range.png
deleted file mode 100644
index 957d352..0000000
--- a/resources/images/Q02_Notification__wifi_in_range.png
+++ /dev/null
diff --git a/resources/org.tizen.net-popup.xml b/resources/org.tizen.net-popup.xml
deleted file mode 100644
index a6aefc4..0000000
--- a/resources/org.tizen.net-popup.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.net-popup" version="0.1.01-1" install-location="internal-only">
-	<label>Network popup</label>
-	<author email="sanghoon80.cho@samsung.com" href="www.samsung.com">Sanghoon Cho</author>
-	<description>Network popup</description>
-	<ui-application appid="org.tizen.net-popup" exec="/usr/apps/org.tizen.net-popup/bin/net-popup" nodisplay="true" multiple="false" type="capp" taskmanage="false">
-		<label>Network popup</label>
-	</ui-application>
-</manifest>
diff --git a/src/net-popup.c b/src/net-popup.c
index 0497f9e..cb76f44 100644
--- a/src/net-popup.c
+++ b/src/net-popup.c
@@ -29,34 +29,33 @@
 #include "net-popup.h"
 #include "net-popup-strings.h"
 
-#define NETCONFIG_NOTIFICATION_WIFI_FOUND_PRIV_ID	1000
+#define LOCALEDIR			"/usr/share/locale"
+
 #define NETCONFIG_NOTIFICATION_WIFI_ICON \
 					"/usr/share/icon/Q02_Notification__wifi_in_range.png"
-#define NETCONFIG_NOTIFICATION_WIFI_FOUND_TITLE		"Wi-Fi networks found"
-#define NETCONFIG_NOTIFICATION_WIFI_FOUND_CONTENT	"Open Wi-Fi setting"
+#define NETCONFIG_NOTIFICATION_WIFI_FOUND_TITLE \
+		dgettext(PACKAGE, "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE")
+#define NETCONFIG_NOTIFICATION_WIFI_FOUND_CONTENT \
+		dgettext(PACKAGE, "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB")
+#define NETCONFIG_NOTIFICATION_MANUAL_NETWORK_FAIL_NO_SERVICE \
+		dgettext("sys_string", "IDS_COM_BODY_NO_SERVICE")
+#define NETCONFIG_NOTIFICATION_MANUAL_NETWORK_FAIL_NOT_AVAILABLE \
+		dgettext(PACKAGE, "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE")
 
 static int __net_popup_show_tickernoti(bundle *b, void *data);
 static int __net_popup_show_popup(bundle *b, void *data);
 static void __net_popup_add_found_ap_noti(void);
 static void __net_popup_del_found_ap_noti(void);
-
-static int __net_popup_term(bundle *b, void *data)
-{
-	log_print(NET_POPUP, "\nnet-popup: terminate");
-	return 0;
-}
-
-static int __net_popup_timeout(bundle *b, void *data)
-{
-	log_print(NET_POPUP, "\nnet-popup: timeout");
-	return 0;
-}
+static void __net_popup_add_manual_network_fail_noti(bundle *b);
+static void __net_popup_del_manual_network_fail_noti(void);
+static void __net_popup_add_restricted_state_noti(bundle *b);
+static void __net_popup_del_restricted_state_noti(void);
 
 static int __net_popup_create(void *data)
 {
 	log_print(NET_POPUP, "__net_popup_create()\n");
 
-//	bindtextdomain(PACKAGE, LOCALEDIR);
+	bindtextdomain(PACKAGE, LOCALEDIR);
 
 	return 0;
 }
@@ -94,12 +93,24 @@ static int __net_popup_reset(bundle *b, void *data)
 		elm_exit();
 	} else if (g_str_equal(type, "popup")) {
 		__net_popup_show_popup(b, data);
-	} else 	if (g_str_equal(type, "add_found_ap_noti")) {
+	} else if (g_str_equal(type, "add_found_ap_noti")) {
 		__net_popup_add_found_ap_noti();
 		elm_exit();
-	} else 	if (g_str_equal(type, "del_found_ap_noti")) {
+	} else if (g_str_equal(type, "del_found_ap_noti")) {
 		__net_popup_del_found_ap_noti();
 		elm_exit();
+	} else if (g_str_equal(type, "add_manual_network_fail_noti")) {
+		__net_popup_add_manual_network_fail_noti(b);
+		elm_exit();
+	} else if (g_str_equal(type, "del_manual_network_fail_noti")) {
+		__net_popup_del_manual_network_fail_noti();
+		elm_exit();
+	} else if (g_str_equal(type, "add_restricted_state_noti")) {
+		__net_popup_add_restricted_state_noti(b);
+		elm_exit();
+	} else if (g_str_equal(type, "del_restricted_state_noti")) {
+		__net_popup_del_restricted_state_noti();
+		elm_exit();
 	} else {
 		__net_popup_show_tickernoti(b, data);
 		elm_exit();
@@ -229,13 +240,19 @@ static void __net_popup_add_found_ap_noti(void)
 {
 	int noti_flags = 0;
 	notification_h noti = NULL;
+	notification_list_h noti_list = NULL;
 	notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
 	bundle *b = NULL;
 
-	__net_popup_del_found_ap_noti();
+	notification_get_detail_list("net.netpopup", NOTIFICATION_GROUP_ID_NONE,
+			NOTIFICATION_PRIV_ID_NONE, -1, &noti_list);
+	if (noti_list != NULL) {
+		notification_free_list(noti_list);
+		return;
+	}
 
 	noti = notification_new(NOTIFICATION_TYPE_ONGOING, NOTIFICATION_GROUP_ID_NONE,
-			NETCONFIG_NOTIFICATION_WIFI_FOUND_PRIV_ID);
+			NOTIFICATION_PRIV_ID_NONE);
 	if (noti == NULL) {
 		log_print(NET_POPUP, "fail to create notification");
 		return;
@@ -254,9 +271,22 @@ static void __net_popup_add_found_ap_noti(void)
 		goto error;
 	}
 
+	noti_err = notification_set_layout(noti, NOTIFICATION_LY_ONGOING_EVENT);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_layout : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_text_domain(noti, PACKAGE,
+			LOCALEDIR);
+	if(noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_text_domain : %d", noti_err);
+		goto error;
+	}
+
 	noti_err = notification_set_text(noti, NOTIFICATION_TEXT_TYPE_TITLE,
 			NETCONFIG_NOTIFICATION_WIFI_FOUND_TITLE,
-			NETCONFIG_NOTIFICATION_WIFI_FOUND_TITLE,
+			"IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE",
 			NOTIFICATION_VARIABLE_TYPE_NONE);
 	if (noti_err != NOTIFICATION_ERROR_NONE) {
 		log_print(NET_POPUP, "fail to notification_set_title : %d", noti_err);
@@ -265,7 +295,7 @@ static void __net_popup_add_found_ap_noti(void)
 
 	noti_err = notification_set_text(noti, NOTIFICATION_TEXT_TYPE_CONTENT,
 			NETCONFIG_NOTIFICATION_WIFI_FOUND_CONTENT,
-			NETCONFIG_NOTIFICATION_WIFI_FOUND_CONTENT,
+			"IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB",
 			NOTIFICATION_VARIABLE_TYPE_NONE);
 	if (noti_err != NOTIFICATION_ERROR_NONE) {
 		log_print(NET_POPUP, "fail to notification_set_content : %d", noti_err);
@@ -311,7 +341,127 @@ static void __net_popup_del_found_ap_noti(void)
 {
 	notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
 
-	noti_err = notification_delete_all_by_type("org.tizen.net-popup",NOTIFICATION_TYPE_ONGOING);
+	noti_err = notification_delete_all_by_type("net.netpopup",
+			NOTIFICATION_TYPE_ONGOING);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_delete_by_priv_id");
+		return;
+	}
+
+	log_print(NET_POPUP, "Successfully deleted notification");
+}
+
+static void __net_popup_add_manual_network_fail_noti(bundle *b)
+{
+	int noti_flags = 0;
+	notification_h noti = NULL;
+	notification_list_h noti_list = NULL;
+	notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
+	char *buf;
+	const char *type;
+	char *tmp = NETCONFIG_NOTIFICATION_MANUAL_NETWORK_FAIL_NOT_AVAILABLE;
+
+	if (!b || !tmp) {
+		log_print(NET_POPUP, "failed, bundle=%p, tmp=%p", b, tmp);
+		return;
+	}
+
+	type = bundle_get_val(b, "_SYSPOPUP_NETWORK_NAME_");
+	if (!type) {
+		log_print(NET_POPUP, "failed, type=%p", type);
+		return;
+	}
+
+	buf = g_strdup_printf(tmp, type);
+	if (!buf) {
+		log_print(NET_POPUP, "failed, buf=%p", buf);
+		return;
+	}
+
+	/* Tickernoti */
+	status_message_post(buf);
+
+	notification_get_detail_list("setting-network-efl",
+			NOTIFICATION_GROUP_ID_NONE,
+			NOTIFICATION_PRIV_ID_NONE, -1, &noti_list);
+	if (noti_list != NULL) {
+		notification_free_list(noti_list);
+		__net_popup_del_manual_network_fail_noti();
+	}
+
+	noti = notification_new(NOTIFICATION_TYPE_ONGOING,
+			NOTIFICATION_GROUP_ID_NONE,
+			NOTIFICATION_PRIV_ID_NONE);
+	if (noti == NULL) {
+		log_print(NET_POPUP, "fail to create notification");
+		goto error;
+	}
+
+	noti_err = notification_set_pkgname(noti, "setting-network-efl");
+	if(noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_pkgname : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_time(noti, time(NULL));
+	if(noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_time : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_layout(noti, NOTIFICATION_LY_ONGOING_EVENT);
+	if(noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_layout : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_text(noti, NOTIFICATION_TEXT_TYPE_TITLE,
+			NETCONFIG_NOTIFICATION_MANUAL_NETWORK_FAIL_NO_SERVICE,
+			NULL,
+			NOTIFICATION_VARIABLE_TYPE_NONE);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_title : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_text(noti, NOTIFICATION_TEXT_TYPE_CONTENT,
+			buf, NULL,
+			NOTIFICATION_VARIABLE_TYPE_NONE);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_content : %d", noti_err);
+		goto error;
+	}
+
+	noti_flags = NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY;
+	noti_err = notification_set_display_applist(noti, noti_flags);
+	if(noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_display_applist : %d",
+				noti_err);
+		goto error;
+	}
+
+	noti_err = notification_insert(noti, NULL);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_insert");
+		goto error;
+	}
+
+	log_print(NET_POPUP, "Successfully added notification");
+
+error:
+	if (noti != NULL)
+		notification_free(noti);
+
+	if (buf)
+		g_free (buf);
+}
+
+static void __net_popup_del_manual_network_fail_noti(void)
+{
+	notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
+
+	noti_err = notification_delete_all_by_type("setting-network-efl",
+			NOTIFICATION_TYPE_ONGOING);
 	if (noti_err != NOTIFICATION_ERROR_NONE) {
 		log_print(NET_POPUP, "fail to notification_delete_by_priv_id");
 		return;
@@ -320,6 +470,126 @@ static void __net_popup_del_found_ap_noti(void)
 	log_print(NET_POPUP, "Successfully deleted notification");
 }
 
+static void __net_popup_add_restricted_state_noti_real (const char *pkgname,
+		const char *text)
+{
+	notification_h noti;
+	notification_error_e noti_err;
+
+	if (!pkgname || !text)
+		return;
+
+	/* Tickernoti */
+	status_message_post(text);
+
+	noti = notification_new(NOTIFICATION_TYPE_ONGOING,
+			NOTIFICATION_GROUP_ID_NONE,
+			NOTIFICATION_PRIV_ID_NONE);
+	if (noti == NULL) {
+		log_print(NET_POPUP, "fail to create notification");
+		goto error;
+	}
+
+	noti_err = notification_set_property(noti,
+			NOTIFICATION_PROP_DISABLE_APP_LAUNCH);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_property : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_pkgname(noti, pkgname);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_pkgname : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_time(noti, time(NULL));
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_time : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_layout(noti, NOTIFICATION_LY_ONGOING_EVENT);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_layout : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_text(noti, NOTIFICATION_TEXT_TYPE_CONTENT,
+			text, NULL,
+			NOTIFICATION_VARIABLE_TYPE_NONE);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_content : %d", noti_err);
+		goto error;
+	}
+
+	noti_err = notification_set_display_applist(noti,
+			NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_display_applist : %d",
+				noti_err);
+		goto error;
+	}
+
+	noti_err = notification_insert(noti, NULL);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_insert");
+		goto error;
+	}
+
+	log_print(NET_POPUP, "Successfully added notification");
+
+error:
+	if (noti != NULL)
+		notification_free(noti);
+}
+
+static void __net_popup_add_restricted_state_noti(bundle *b)
+{
+	const char *text_cs;
+	const char *text_ps;
+
+	if (!b) {
+		log_print(NET_POPUP, "failed, bundle=%p", b);
+		return;
+	}
+
+	__net_popup_del_restricted_state_noti();
+
+	text_cs = bundle_get_val(b, "_SYSPOPUP_NETWORK_NAME_");
+	if (text_cs)
+		__net_popup_add_restricted_state_noti_real (
+				"net.netpopup.restricted_state_cs", text_cs);
+
+	text_ps = bundle_get_val(b, "_SYSPOPUP_NETWORK_NAME2_");
+	if (text_ps)
+		__net_popup_add_restricted_state_noti_real (
+				"net.netpopup.restricted_state_ps", text_ps);
+
+	if (!text_cs && !text_ps)
+		log_print(NET_POPUP, "failed, text_cs=%p, text_ps=%p",
+				text_cs, text_ps);
+}
+
+static void __net_popup_del_restricted_state_noti(void)
+{
+	notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
+
+	noti_err = notification_delete_all_by_type("net.netpopup.restricted_state_cs",
+			NOTIFICATION_TYPE_ONGOING);
+	if (noti_err != NOTIFICATION_ERROR_NONE)
+		log_print(NET_POPUP, "fail to notification_delete_by_priv_id");
+	else
+		log_print(NET_POPUP, "Successfully deleted cs notification");
+
+	noti_err = notification_delete_all_by_type("net.netpopup.restricted_state_ps",
+			NOTIFICATION_TYPE_ONGOING);
+	if (noti_err != NOTIFICATION_ERROR_NONE)
+		log_print(NET_POPUP, "fail to notification_delete_by_priv_id");
+	else
+		log_print(NET_POPUP, "Successfully deleted ps notification");
+}
+
 int main(int argc, char *argv[])
 {
 	struct appcore_ops ops = {