Initialize and remove Ecore_X dependency for waylandsubmit/tizen_common/20151229.154718submit/tizen_common/20151229.144031submit/tizen_common/20151229.142028submit/tizen/20151224.021654accepted/tizen/wearable/20151224.064119accepted/tizen/tv/20151224.064043accepted/tizen/mobile/20151224.064006

Change-Id: I4b90c57c49aa0487738c502c8bc0254898261795
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

72 files changed, 3548 insertions, 1441 deletions

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 9973c94..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Sanghoon Cho <sanghoon80.cho@samsung.com>

-Danny Jeongseok Seo <s.seo@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d2ea03..cc44736 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,18 +22,22 @@ pkg_check_modules(pkgs REQUIRED
 	edje
 	elementary
 	evas
-	status
 	syspopup
 	notification
-	appsvc)
+	capi-appfw-application
+	dbus-glib-1
+	glib-2.0
+	appsvc
+	vconf
+	efl-extension)
 
 FOREACH(flag ${pkgs_CFLAGS})
 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-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")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fvisibility=hidden -fPIE")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fPIE")
+SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE")
 
 FIND_PROGRAM(UNAME NAMES uname)
 EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
@@ -44,19 +48,24 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 
-IF(WAYLAND_SUPPORT)
-    ADD_DEFINITIONS("-DWAYLAND")
-ENDIF(WAYLAND_SUPPORT)
-
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -pie)
+
+ADD_CUSTOM_TARGET(netpopup-custom.edj
+	COMMAND edje_cc ${CMAKE_CURRENT_SOURCE_DIR}/edcs/netpopup-custom.edc
+		${CMAKE_CURRENT_SOURCE_DIR}/edcs/netpopup-custom.edj
+		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edcs/netpopup-custom.edc
+)
+
+ADD_DEPENDENCIES(${PROJECT_NAME} netpopup-custom.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 ${PREFIX}/share/packages/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/netpopup-custom.edj DESTINATION /usr/ug/res/edje/net-popup/)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/resources/net.netpopup.xml DESTINATION ${PREFIX}/share/packages/)
 
 ADD_SUBDIRECTORY(po)
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..571fe79
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,206 @@
+Flora License
+
+Version 1.1, April, 2013
+
+http://floralicense.org/license/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and
+all other entities that control, are controlled by, or are
+under common control with that entity. For the purposes of
+this definition, "control" means (i) the power, direct or indirect,
+to cause the direction or management of such entity,
+whether by contract or otherwise, or (ii) ownership of fifty percent (50%)
+or more of the outstanding shares, or (iii) beneficial ownership of
+such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source,
+and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form,
+made available under the License, as indicated by a copyright notice
+that is included in or attached to the work (an example is provided
+in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form,
+that is based on (or derived from) the Work and for which the editorial
+revisions, annotations, elaborations, or other modifications represent,
+as a whole, an original work of authorship. For the purposes of this License,
+Derivative Works shall not include works that remain separable from,
+or merely link (or bind by name) to the interfaces of, the Work and
+Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original
+version of the Work and any modifications or additions to that Work or
+Derivative Works thereof, that is intentionally submitted to Licensor
+for inclusion in the Work by the copyright owner or by an individual or
+Legal Entity authorized to submit on behalf of the copyright owner.
+For the purposes of this definition, "submitted" means any form of
+electronic, verbal, or written communication sent to the Licensor or
+its representatives, including but not limited to communication on
+electronic mailing lists, source code control systems, and issue
+tracking systems that are managed by, or on behalf of, the Licensor
+for the purpose of discussing and improving the Work, but excluding
+communication that is conspicuously marked or otherwise designated
+in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+"Tizen Certified Platform" shall mean a software platform that complies
+with the standards set forth in the Tizen Compliance Specification
+and passes the Tizen Compliance Tests as defined from time to time
+by the Tizen Technical Steering Group and certified by the Tizen
+Association or its designated agent.
+
+2. Grant of Copyright License.  Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License.  Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work
+solely as incorporated into a Tizen Certified Platform, where such
+license applies only to those patent claims licensable by such
+Contributor that are necessarily infringed by their Contribution(s)
+alone or by combination of their Contribution(s) with the Work solely
+as incorporated into a Tizen Certified Platform to which such
+Contribution(s) was submitted. If You institute patent litigation
+against any entity (including a cross-claim or counterclaim
+in a lawsuit) alleging that the Work or a Contribution incorporated
+within the Work constitutes direct or contributory patent infringement,
+then any patent licenses granted to You under this License for that
+Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.  You may reproduce and distribute copies of the
+Work or Derivative Works thereof pursuant to the copyright license
+above, in any medium, with or without modifications, and in Source or
+Object form, provided that You meet the following conditions:
+
+  1. You must give any other recipients of the Work or Derivative Works
+     a copy of this License; and
+  2. You must cause any modified files to carry prominent notices stating
+     that You changed the files; and
+  3. You must retain, in the Source form of any Derivative Works that
+     You distribute, all copyright, patent, trademark, and attribution
+     notices from the Source form of the Work, excluding those notices
+     that do not pertain to any part of the Derivative Works; and
+  4. If the Work includes a "NOTICE" text file as part of its distribution,
+     then any Derivative Works that You distribute must include a readable
+     copy of the attribution notices contained within such NOTICE file,
+     excluding those notices that do not pertain to any part of
+     the Derivative Works, in at least one of the following places:
+     within a NOTICE text file distributed as part of the Derivative Works;
+     within the Source form or documentation, if provided along with the
+     Derivative Works; or, within a display generated by the Derivative Works,
+     if and wherever such third-party notices normally appear.
+     The contents of the NOTICE file are for informational purposes only
+     and do not modify the License. You may add Your own attribution notices 
+     within Derivative Works that You distribute, alongside or as an addendum 
+     to the NOTICE text from the Work, provided that such additional attribution 
+     notices cannot be construed as modifying the License. You may add Your own
+     copyright statement to Your modifications and may provide additional or
+     different license terms and conditions for use, reproduction, or
+     distribution of Your modifications, or for any such Derivative Works
+     as a whole, provided Your use, reproduction, and distribution of
+     the Work otherwise complies with the conditions stated in this License
+     and your own copyright statement or terms and conditions do not conflict
+     the conditions stated in the License including section 3.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks.  This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Flora License to your work
+
+To apply the Flora License to your work, attach the following
+boilerplate notice, with the fields enclosed by brackets "[]"
+replaced with your own identifying information. (Don't include
+the brackets!) The text should be enclosed in the appropriate
+comment syntax for the file format. We also recommend that a
+file or class name and description of purpose be included on the
+same "printed page" as the copyright notice for easier
+identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Flora License, Version 1.1 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://floralicense.org/license/
+
+   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.
+
diff --git a/LICENSE.APLv2 b/LICENSE.APLv2
deleted file mode 100644
index d645695..0000000
--- a/LICENSE.APLv2
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
-
-   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.
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index cd5467a..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Apache License, Version 2.0
-Please, see the LICENSE.APLv2 file for Apache License terms and conditions.
diff --git a/edcs/netpopup-custom.edc b/edcs/netpopup-custom.edc
new file mode 100644
index 0000000..8d49736
--- /dev/null
+++ b/edcs/netpopup-custom.edc
@@ -0,0 +1,359 @@
+collections {
+	group { name: "popup_checkview";
+		parts {
+			part { name: "pad_t";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.5 0.0;
+					min: 0 32;
+					fixed: 0 1;
+					rel1 {
+						relative: 1.0 0.0;
+						to_x: "pad_l";
+					}
+					rel2 {
+						relative: 0.0 0.0;
+						to_x: "pad_r";
+					}
+				}
+			}
+			part { name: "pad_l";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					min: 48 0;
+					max: 48 0;
+					fixed: 1 0;
+					rel1 {
+						relative: 0.0 0.0;
+					}
+					rel2 {
+						relative: 0.0 1.0;
+					}
+					align: 0.0 0.0;
+				}
+			}
+			part { name: "pad_r";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					min: 48 0;
+					max: 48 0;
+					fixed: 1 0;
+					rel1 {
+						relative: 1.0 0.0;
+					}
+					rel2 {
+						relative: 1.0 1.0;
+					}
+					align: 1.0 0.0;
+				}
+			}
+			part { name: "elm.swallow.content";
+				type: SWALLOW;
+				scale: 1;
+				description { state: "default" 0.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: "bottom_pad";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 1.0;
+					min: 0 24;
+					fixed: 0 1;
+					rel1 {
+						relative: 1.0 1.0;
+						to_x: "pad_l";
+					}
+					rel2 {
+						relative: 0.0 1.0;
+						to_x: "pad_r";
+					}
+				}
+			}
+			part { name: "pad_b";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 1.0;
+					min: 0 84;
+					fixed: 0 1;
+					rel1 {
+						relative: 0.0 0.0;
+						to: "bottom_pad";
+					}
+					rel2 {
+						relative: 1.0 0.0;
+						to: "bottom_pad";
+					}
+				}
+			}
+			part { name: "end_field";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 1.0;
+					min: 0 63;
+					fixed: 0 1;
+					rel1 {
+						relative: 0.0 1.0;
+						to: "pad_b";
+					}
+					rel2 {
+						relative: 1.0 1.0;
+						to: "pad_b";
+					}
+				}
+			}
+			part { name: "elm.swallow.end";
+				type: SWALLOW;
+				scale: 1;
+				mouse_events: 1;
+				repeat_events: 1;
+				description { state: "default" 0.0;
+					fixed: 1 1;
+					align: 0.0 0.5;
+					rel1.to: "end_field";
+					rel2.to: "end_field";
+				}
+			}
+		}
+	}
+
+	group { name: "popup";
+		parts {
+			part { name: "pad_t";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.5 0.0;
+					min: 0 32;
+					fixed: 0 1;
+					rel1 {
+						relative: 1.0 0.0;
+						to_x: "pad_l";
+					}
+					rel2 {
+						relative: 0.0 0.0;
+						to_x: "pad_r";
+					}
+				}
+			}
+			part { name: "pad_l";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					min: 36 0;
+					max: 36 0;
+					fixed: 1 0;
+					rel1 {
+						relative: 0.0 0.0;
+					}
+					rel2 {
+						relative: 0.0 1.0;
+					}
+					align: 0.0 0.0;
+				}
+			}
+			part { name: "pad_r";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					min: 36 0;
+					max: 36 0;
+					fixed: 1 0;
+					rel1 {
+						relative: 1.0 0.0;
+					}
+					rel2 {
+						relative: 1.0 1.0;
+					}
+					align: 1.0 0.0;
+				}
+			}
+			part { name: "elm.swallow.content";
+				type: SWALLOW;
+				scale: 1;
+				description { state: "default" 0.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: "bottom_pad";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 1.0;
+					min: 0 24;
+					fixed: 0 1;
+					rel1 {
+						relative: 1.0 1.0;
+						to_x: "pad_l";
+					}
+					rel2 {
+						relative: 0.0 1.0;
+						to_x: "pad_r";
+					}
+				}
+			}
+			part { name: "pad_b";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 1.0;
+					min: 0 24;
+					fixed: 0 1;
+					rel1 {
+						relative: 0.0 0.0;
+						to: "bottom_pad";
+					}
+					rel2 {
+						relative: 1.0 0.0;
+						to: "bottom_pad";
+					}
+				}
+			}
+			part { name: "end_field";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 1.0;
+					min: 0 63;
+					fixed: 0 1;
+					rel1 {
+						relative: 0.0 1.0;
+						to: "pad_b";
+					}
+					rel2 {
+						relative: 1.0 1.0;
+						to: "pad_b";
+					}
+				}
+			}
+			part { name: "elm.swallow.end";
+				type: SWALLOW;
+				scale: 1;
+				mouse_events: 1;
+				repeat_events: 1;
+				description { state: "default" 0.0;
+					fixed: 1 1;
+					align: 0.0 0.5;
+					rel1.to: "end_field";
+					rel2.to: "end_field";
+				}
+			}
+		}
+	}
+	
+	group { name: "label_layout";
+		parts {
+			part { name: "pad_t";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.5 0.0;
+					min: 0 20;
+					max: 0 20;
+					fixed: 0 1;
+					rel1 {
+						relative: 1.0 0.0;
+						to_x: "pad_l";
+					}
+					rel2 {
+						relative: 0.0 0.0;
+						to_x: "pad_r";
+					}
+				}
+			}
+			part { name: "pad_l";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					min: 16 0;
+					max: 16 0;
+					fixed: 1 0;
+					rel1 {
+						relative: 0.0 0.0;
+					}
+					rel2 {
+						relative: 0.0 1.0;
+					}
+					align: 0.0 0.0;
+				}
+			}
+			part { name: "pad_r";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					min: 16 0;
+					max: 16 0;
+					fixed: 1 0;
+					rel1 {
+						relative: 1.0 0.0;
+					}
+					rel2 {
+						relative: 1.0 1.0;
+					}
+					align: 1.0 0.0;
+				}
+			}
+			part { name: "pad_b";
+				type: SPACER;
+				scale: 1;
+				description { state: "default" 0.0;
+					align: 0.0 1.0;
+					min: 0 20;
+					max: 0 20;
+					fixed: 0 1;
+					rel1 {
+						relative: 0.0 1.0;
+					}
+					rel2 {
+						relative: 1.0 1.0;
+					}
+				}
+			}
+			part { name: "elm.swallow.content";
+				type: SWALLOW;
+				scale: 1;
+				description {
+					state: "default" 0.0;
+					fixed: 1 0;
+					min: 0 200;
+					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";
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/include/net-popup-strings.h b/include/net-popup-strings.h
index 4158297..568b7c1 100644
--- a/include/net-popup-strings.h
+++ b/include/net-popup-strings.h
@@ -1,13 +1,13 @@
 /*
 *  net-popup
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 *
-* Licensed under the Apache License, Version 2.0 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
-* http://www.apache.org/licenses/LICENSE-2.0
+* 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,
@@ -24,11 +24,20 @@
 
 #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")
-#define ALERT_STR_ERR_UNAVAILABLE		dgettext(PACKAGE, "IDS_IM_POP_SERVICE_NOT_AVAIL")
-#define ALERT_STR_ERR_CONNECT			dgettext(PACKAGE, "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK")
-#define ALERT_STR_ERR_NOT_SUPPORT		dgettext(PACKAGE, "IDS_ST_POP_NOT_SUPPORTED")
-#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")
+#define ALERT_STR_MOBILE_NETWORKS_CHARGE		dgettext(PACKAGE, "IDS_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES")
+#define ALERT_STR_ERR_UNAVAILABLE			dgettext(PACKAGE, "IDS_IM_POP_SERVICE_NOT_AVAIL")
+#define ALERT_STR_ERR_CONNECT				dgettext(PACKAGE, "IDS_WIFI_POP_UNABLE_TO_CONNECT")
+#define ALERT_STR_ERR_WRONG_PASSWORD		dgettext(PACKAGE, "IDS_ST_POP_WRONG_PASSWORD")
+#define ALERT_STR_ERR_NOT_SUPPORT			dgettext(PACKAGE, "IDS_ST_POP_NOT_SUPPORTED")
+#define ALERT_STR_WIFI_CONNECTED			dgettext(PACKAGE, _("IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"))
+#define ALERT_STR_RESTRICTED_USE_WIFI		dgettext(PACKAGE, "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI")
+#define ALERT_STR_NO_AP_FOUND			dgettext(PACKAGE, "IDS_WIFI_POP_NO_WI_FI_AP_FOUND")
+#define ALERT_STR_WIFI_MOBILE_AP_ON			dgettext(PACKAGE, "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING")
+#define ALERT_STR_LENGHTY_PASSWORD			dgettext(PACKAGE, "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED")
+#define ALERT_STR_DONT_ASK_AGAIN			dgettext(PACKAGE, "IDS_WIFI_BUTTON_DONT_ASK_AGAIN")
+#define ALERT_STR_OK						dgettext(PACKAGE, "IDS_COM_SK_OK")
+#define ALERT_STR_NO						dgettext(PACKAGE, "IDS_COM_SK_NO")
+#define ALERT_STR_CANCEL						dgettext(PACKAGE, "IDS_COM_SK_CANCEL")
+#define ALERT_STR_WIFI 							dgettext(PACKAGE, "IDS_WIFI_BODY_WI_FI")
 
 #endif /* __DEF_NET_POPUP_STRINGS_H__ */
diff --git a/include/net-popup.h b/include/net-popup.h
index cf8853f..d370935 100644
--- a/include/net-popup.h
+++ b/include/net-popup.h
@@ -1,13 +1,13 @@
 /*
 *  net-popup
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 *
-* Licensed under the Apache License, Version 2.0 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
-* http://www.apache.org/licenses/LICENSE-2.0
+* 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,
@@ -24,10 +24,13 @@
 #include <Elementary.h>
 
 #define PACKAGE		"net-popup"
-#define ALERT_STR_LEN_MAX	100
+#define ALERT_STR_LEN_MAX	1024
 
 #define NET_POPUP	"NET_POPUP"
-#define log_print(tag, format, args...) LOG(LOG_DEBUG, \
-		tag, "%s:%d "format, __func__, __LINE__, ##args)
+#define log_print(MID, format, args...) \
+	SLOG(LOG_INFO, MID, "\033[0m[%s:%d]\033[0m " format, __func__, __LINE__, ##args)
+
+#define secure_log_print(tag, format, args...) SECURE_SLOG(LOG_DEBUG, \
+			tag, "%s:%d "format, __func__, __LINE__, ##args)
 
 #endif /* __DEF_NET_POPUP_H__ */
diff --git a/net.netpopup.efl b/net.netpopup.efl
new file mode 100644
index 0000000..d1cd8d1
--- /dev/null
+++ b/net.netpopup.efl
@@ -0,0 +1,23 @@
+e17 net.netpopup -w---- ------
+net.netpopup xorg rw---- ------
+net.netpopup isf rwx--- ------
+net.netpopup data-provider-master::notification rw---- ------
+net.netpopup data-provider-master::notification.client rw---- ------
+net.netpopup dbus rwx--- ------
+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::media rwxat- ------
+net.netpopup system::media::root rwxat- ------
+net.netpopup system::share rwxat- ------
+net.netpopup device::app_logging -w---- ------
+net.netpopup deviced::haptic rw---- ------
+net.netpopup system::homedir rwxat- ------
+net.netpopup sys-assert::core rwxat- ------
+net.netpopup system::use_internet r----- ------
+net.netpopup e17::notification rw---- ------
+org.tizen.app-tray net.netpopup r-x--- ------
+org.tizen.indicator net.netpopup rwx--- ------
diff --git a/packaging/org.tizen.net-popup.manifest b/net.netpopup.manifest
index 97e8c31..97e8c31 100644
--- a/packaging/org.tizen.net-popup.manifest
+++ b/net.netpopup.manifest
diff --git a/packaging/net.netpopup.spec b/packaging/net.netpopup.spec
new file mode 100644
index 0000000..c9646e5
--- /dev/null
+++ b/packaging/net.netpopup.spec
@@ -0,0 +1,59 @@
+Name:       net.netpopup
+Summary:    Network Notification Popup applicationa
+Version:    0.2.78
+Release:    1
+Group:      App/Network
+License:    Flora-1.1
+Source0:    %{name}-%{version}.tar.gz
+BuildRequires: cmake
+BuildRequires: pkgconfig(appcore-efl)
+BuildRequires: pkgconfig(bundle)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(ecore)
+BuildRequires: pkgconfig(edje)
+BuildRequires: pkgconfig(elementary)
+BuildRequires: pkgconfig(evas)
+BuildRequires: pkgconfig(syspopup)
+BuildRequires: pkgconfig(syspopup-caller)
+BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(notification)
+BuildRequires: pkgconfig(appsvc)
+BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(efl-extension)
+BuildRequires: gettext
+BuildRequires: edje-tools
+
+%description
+Network Notification Popup application
+
+%prep
+%setup -q
+
+
+%build
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+
+make %{?_smp_mflags}
+
+
+%install
+%make_install
+
+mkdir -p %{buildroot}%{_sysconfdir}/smack/accesses.d/
+cp -v net.netpopup.efl %{buildroot}%{_sysconfdir}/smack/accesses.d/
+
+#License
+mkdir -p %{buildroot}%{_datadir}/license
+cp LICENSE %{buildroot}%{_datadir}/license/net.netpopup
+
+
+%files
+%manifest net.netpopup.manifest
+%{_bindir}/net-popup
+%{_datadir}/packages/net.netpopup.xml
+/usr/ug/res/edje/net-popup/*.edj
+%{_datadir}/locale/*/LC_MESSAGES/net-popup.mo
+%{_datadir}/license/net.netpopup
+%{_sysconfdir}/smack/accesses.d/net.netpopup.efl
diff --git a/packaging/org.tizen.net-popup.spec b/packaging/org.tizen.net-popup.spec
deleted file mode 100644
index e11356d..0000000
--- a/packaging/org.tizen.net-popup.spec
+++ /dev/null
@@ -1,69 +0,0 @@
-%bcond_with wayland
-%bcond_with x
-
-%define _usrdir /usr
-%define _appdir %{_usrdir}/apps
-
-Name:       org.tizen.net-popup
-Summary:    Network Notification Popup application
-Version:    0.2.1_19
-Release:    0
-Group:      App/Network
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
-Source1001:    org.tizen.net-popup.manifest
-BuildRequires: cmake
-BuildRequires: pkgconfig(appcore-efl)
-BuildRequires: pkgconfig(bundle)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(ecore)
-BuildRequires: pkgconfig(edje)
-BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(syspopup)
-BuildRequires: pkgconfig(syspopup-caller)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(status)
-BuildRequires: pkgconfig(notification)
-BuildRequires: pkgconfig(appsvc)
-BuildRequires: gettext
-
-%description
-Network Notification Popup application
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-
-%build
-%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-%if %{with wayland}
-        -DWAYLAND_SUPPORT=On \
-%else
-        -DWAYLAND_SUPPORT=Off \
-%endif
-%if %{with x}
-        -DX11_SUPPORT=On \
-%else
-        -DX11_SUPPORT=Off \
-%endif
-        #eol
-
-make %{?_smp_mflags} V=1
-
-
-%install
-%make_install
-
-#License
-mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/org.tizen.net-popup
-
-
-%files
-%manifest %{name}.manifest
-%{_appdir}/org.tizen.net-popup/bin/net-popup
-%{_datadir}/packages/org.tizen.net-popup.xml
-%license %{_datadir}/license/org.tizen.net-popup
-%{_datadir}/locale/*/LC_MESSAGES/net-popup.mo
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index be593ba..2ee6d20 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,6 +1,6 @@
 # for i18n
 
-SET(POFILES ar.po az.po bg.po ca.po cs.po da.po de_DE.po el_GR.po en.po en_PH.po en_US.po es_ES.po es_US.po eu.po et.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.po en_PH.po en_US.po es_ES.po es_US.po et.po eu.po fi.po fr.po fr_CA.po ga.po gl.po hi.po hr.po hu.po hy.po is.po it_IT.po ja_JP.po ka.po kk.po ko_KR.po lt.po lv.po mk.po nb.po nl.po pl.po pt_BR.po pt_PT.po ro.po ru_RU.po sk.po sl.po sr.po sv.po tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_TW.po)
 
 SET(MSGFMT "/usr/bin/msgfmt")
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 07e42dc..07e42dc 100755..100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
diff --git a/po/ar.po b/po/ar.po
index e09a024..b5cd81c 100644..100755
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "تم التوصيل"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "إلغاء"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "سياسة الأمان تقيد استخدام Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "موافق"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "تعذر الاتصال بالشبكة"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "تم الوصول إلى أقصى عدد من الحروف."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "غير مدعوم"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "كلمة المرور خاطئة."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "الخدمة غير متوفرة، حاول ثانية"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "سيؤدي تشغيل شبكة Wi-Fi إلى إلغاء تفعيل الربط باستخدام Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "لا يتوفر Wi-Fi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "لا"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "سياسة الأمان تقيد استخدام Wi-Fi."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "سيتم توصيلك بشبكة الهاتف المحمول. قد يترتب على ذلك فرض تكاليف إضافية."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "تم الاتصال بشبكة Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "انقر هنا للاتصال."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "تسجيل الدخول لشبكة Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "عدم السؤال مرة أخرى"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "غير مدعوم."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "الخدمة غير متوفرة، حاول ثانية."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "الشبكة المحددة (%s) غير متاحة"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "يتعذر التوصيل."
 
diff --git a/po/az.po b/po/az.po
index 43231ea..094290c 100644..100755
--- a/po/az.po
+++ b/po/az.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Qoşuldu"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Ləğv et"
 
-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_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Şəbəkəyə qoşulmaq mümkün deyil"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Simvol sayı maksimuma çatıb."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Dəstəklənmir"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Yanlış şifrə."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Xidmətdən istifadə etmək mümkün deyil. Bir az sonra cəhd edin"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi-ın yandırılması Wi-Fi bağlantısını qeyri-aktiv edəcək."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi AP tapılmadı."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Siz mobil şəbəkənizə qoşulacaqsınız. Bu, əlavə xərclərə səbəb ola bilər."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Wi-Fi şəbəkəsinə %s qoşuldu."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Qoşulmaq üçün vurun."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi şəbəkəsinə daxil ol"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Təkrar soruşma"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Dəstəklənmir."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Xidmətdən istifadə etmək mümkün deyil. Bir az sonra cəhd edin."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Seçilmiş şəbəkə (%s) mövcud deyil"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Qoşulmaq mümkün deyil."
 
diff --git a/po/bg.po b/po/bg.po
index 62da9de..fe0e992 100644..100755
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Свързан"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Отмени"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Правилата за защита ограничават използването на Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Невъзможно свързване с мрежата"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Достигнат максимален брой знаци."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Не се поддържа"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Грешна парола."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Услугата не е достъпна. опитайте отново"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Включването на Wi-Fi ще деактивира Wi-Fi привързване."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Не е намерена Wi-Fi AP."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Не"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Правилата за защита ограничават използването на Wi-Fi."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Ще бъдете свързани към мобилната си мрежа. Това може да доведе до допълнителни такси."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Свързано към Wi-Fi мрежа %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Чукнете тук, за да се свържете."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Влизане в Wi-Fi мрежа"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Не питай повече"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Не се поддържа."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Услугата не е достъпна. опитайте отново."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Избраната мрежа не е достъпна (%s)"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Не може да се свърже."
 
diff --git a/po/ca.po b/po/ca.po
index 4a10160..802629e 100644..100755
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Connectat"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancel"
 
-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_COM_SK_OK"
+msgstr "Acceptar"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Error en la connexió a la xarxa"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "S'ha assolit el nombre màxim de caràcters"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "No s'admet"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Contrasenya incorrecta"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Servei no disponible. Intenti-ho més tard"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Si activa el Wi-Fi, es deshabilitarà el tethering Wi-Fi"
 
-msgid "IDS_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_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No es troba Wi-Fi AP"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Se'l connectarà a la seva xarxa mòbil. Això pot comportar càrrecs addicionals."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connectat a la xarxa Wi-Fi %s"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toqui aquí per connectar."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Iniciar ses a xarxa Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "No ho tornis a preguntar"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "No s'admet"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Servei no disponible. Intenti-ho més tard."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Xarxa seleccionada (%s) no disponible"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "No es pot connectar"
 
diff --git a/po/cs.po b/po/cs.po
index 564036f..83d07b8 100644..100755
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Připojeno"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Zrušit"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Zásady zabezpečení omezují použití Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Připojení k síti se nezdařilo"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Bylo dosaženo maximálního počtu znaků."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nepodporováno"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Nesprávné heslo."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Služba je nedostupná. opakujte akci později"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Zapnutím Wi-Fi vypnete sdílení připojení k Internetu pomocí Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nebyl nalezen žádný přístupový bod Wi-Fi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Budete připojeni k mobilní síti. Mohou být účtovány další poplatky."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Připojeno k síti Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Připojte klepnutím sem."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Přihlásit se k síti Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Příště se neptat"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodporováno."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Služba je nedostupná. opakujte akci později."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Vybraná síť (%s) není dostupná"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Nelze se připojit."
 
diff --git a/po/da.po b/po/da.po
index e79f2f0..894aad8 100644..100755
--- a/po/da.po
+++ b/po/da.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Forbundet"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annullér"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Sikkerhedspolitik begrænser brug af Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Kan ikke slutte til netværk"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Det maksimale antal tegn er nået."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Understøttes ikke"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Forkert adgangskode."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Tjenesten er ikke tilgængelig. Prøv igen senere"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Aktivering af Wi-Fi vil deaktivere Wi-Fi-internetdeling."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ingen Wi-Fi-AP fundet."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nej"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Sikkerhedspolitik begrænser brug af Wi-Fi."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Du vil blive tilsluttet via dit mobile netværk. Dette kan medføre yderligere gebyrer."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Forbundet til Wi-Fi-netværk %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tap her for at forbinde."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Log på Wi-Fi-netværk"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Spørg ikke igen"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Understøttes ikke."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Tjenesten er ikke tilgængelig. Prøv igen senere."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Valgt netværk (%s) ikke tilgængeligt"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Der kan ikke oprettes forbindelse."
 
diff --git a/po/de.po b/po/de.po
new file mode 100755
index 0000000..6b6df54
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,54 @@
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Abbrechen"
+
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximal zulässige Zeichenanzahl erreicht."
+
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Falsches Passwort"
+
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Durch das Einschalten von WLAN wird WLAN-Tethering deaktiviert."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Keine WLAN-AP gefunden"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "WLAN"
+
+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_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "WLAN-Netzwerke verfügbar"
+
+msgid "IDS_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Sie werden mit Ihrem mobilen Netzwerk verbunden. Dabei fallen möglicherweise zusätzliche Gebühren an."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Mit WLAN-Netz %s verbunden."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Zum Verbinden hier tippen."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Im WLAN-Netzwerk anmelden"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Nicht erneut fragen"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nicht unterstützt"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Dienst nicht verfügbar. Später erneut versuchen"
+
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Verbinden nicht möglich"
+
diff --git a/po/de_DE.po b/po/de_DE.po
deleted file mode 100644
index 47eaa89..0000000
--- a/po/de_DE.po
+++ /dev/null
@@ -1,27 +0,0 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Verbunden"
-
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Sicherheitsrichtlinie schränkt die Verwendung von WLAN ein."
-
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Verbindung mit Netzwerk nicht möglich"
-
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nicht unterstützt"
-
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-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 3df2829..85d4dab 100644..100755
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Συνδέθηκε"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Άκυρο"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Η πολιτική ασφαλείας περιορίζει τη χρήση του Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Δεν είναι δυνατή η σύνδεση σε δίκτυο"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Ο μέγιστος αριθμός χαρακτήρων συμπληρώθηκε."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Δεν υποστηρίζεται"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Λάθος κωδικός."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Η υπηρεσία δεν είναι διαθέσιμη, δοκιμάστε αργότερα!"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Η ενεργοποίηση του Wi-Fi θα απενεργοποιήσει το tethering μέσω Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Δεν βρέθηκε εφαρμογή Wi-Fi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Όχι"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Η πολιτική ασφαλείας περιορίζει τη χρήση του Wi-Fi."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Θα συνδεθείτε στο δίκτυό σας κινητής τηλεφωνίας. Αυτή η ενέργεια ενδέχεται να επιφέρει πρόσθετες χρεώσεις."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Συνδέθηκε στο δίκτυο Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Πατήστε εδώ για σύνδεση."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Σύνδεση στο δίκτυο Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Να μην ερωτηθώ ξανά"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Δεν υποστηρίζεται."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Η υπηρεσία δεν είναι διαθέσιμη, δοκιμάστε αργότερα!."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Το επιλεγμένο δίκτυο (%s) δεν είναι διαθέσιμο"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Δεν είναι δυνατή η σύνδεση."
 
diff --git a/po/en.po b/po/en.po
index 38947d1..9e2fe32 100644..100755
--- a/po/en.po
+++ b/po/en.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Connected"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Security policy restricts use of Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Unable to connect to network"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximum number of characters reached."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Not supported"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Wrong password."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Service not available. Try later."
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Turning on Wi-Fi will disable Wi-Fi tethering."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No Wi-Fi AP found."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "You will be connected to your mobile network. This may result in additional charges."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connected to Wi-Fi network %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tap here to connect."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Sign in to Wi-Fi network"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Don't ask again"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Not supported."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Service not available. Try later."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Selected network (%s) not available"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Unable to connect."
 
diff --git a/po/en_PH.po b/po/en_PH.po
index c2f2983..fc80dbc 100644..100755
--- a/po/en_PH.po
+++ b/po/en_PH.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Connected"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Security policy restricts use of Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Unable to connect to network"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximum number of characters reached."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Not supported"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Wrong password."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Service is temporarily offline. Try again later"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Turning on Wi-Fi will disable Wi-Fi tethering."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No Wi-Fi AP found."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "You will be connected to your mobile network. This may result in additional charges."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connected to Wi-Fi network %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tap here to connect."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Sign in to Wi-Fi network"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Don't ask again"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Not supported."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Service is temporarily offline. Try again later"
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Selected network (%s) not available"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Unable to connect."
 
diff --git a/po/en_US.po b/po/en_US.po
index 6f31b22..683b176 100644..100755
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Connected"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancel"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Security policy restricts use of Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Unable to connect to network"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximum number of characters reached."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Not supported"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Wrong password"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Service unavailable. Try later."
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Turning on Wi-Fi will turn off Wi-Fi tethering."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No Wi-Fi AP found."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "You will be connected to your mobile network. This may result in additional charges."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connected to Wi-Fi network %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tap here to connect."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Sign in to Wi-Fi network"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Don't ask again"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Not supported."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Service unavailable. Try later."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Selected network (%s) not available"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Unable to connect."
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 2ad185c..5be2a5b 100644..100755
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,11 +1,47 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Conectado"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_COM_SK_OK"
+msgstr "Aceptar"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Alcanzado el número máximo de caracteres"
+
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Contraseña incorrecta"
+
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Si activa la red Wi-Fi, se desactivará la Conexión compartida"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No se ha encontrado ningún AP Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "No se puede conectar a la red"
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Redes Wi-Fi disponibles"
+
+msgid "IDS_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Se conectará a su red móvil. Esto puede suponer costes adicionales."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Conectado a red Wi-Fi %s"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pulse aquí para conectarse."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Inicie sesión red Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "No volver a preguntar"
 
 msgid "IDS_ST_POP_NOT_SUPPORTED"
 msgstr "No admitido"
@@ -13,15 +49,6 @@ msgstr "No admitido"
 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 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"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "No se puede conectar"
 
diff --git a/po/es_MX.po b/po/es_MX.po
deleted file mode 100644
index 5b14bf7..0000000
--- a/po/es_MX.po
+++ /dev/null
@@ -1,27 +0,0 @@
-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/es_US.po b/po/es_US.po
index 018bc00..5157ce8 100644..100755
--- a/po/es_US.po
+++ b/po/es_US.po
@@ -1,18 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Conectado"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_COM_SK_OK"
+msgstr "Aceptar"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Se ha alcanzado el número máximo de caracteres."
+
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Contraseña incorrecta"
+
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "La activación de Wi-Fi desactivará el anclaje a red Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "No se ha encontrado ningún Punto de Acceso de Wi-Fi."
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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"
+msgstr "La política de seguridad restringe el uso del Wi-Fi."
+
+msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Redes Wi-Fi disponibles"
+
+msgid "IDS_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Se conectará a su red móvil. Esto puede generar un coste adicional."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Conectado a red Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pulse aquí para conectar."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Acceder a la red Wi-Fi"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "No se puede conectar a la red"
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "No volver a preguntar"
 
 msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "No soportado"
+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_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Error al conectar."
 
diff --git a/po/et.po b/po/et.po
index 03f2739..e0a2e14 100644..100755
--- a/po/et.po
+++ b/po/et.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Ühendatud"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Tühista"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Turvalisuse poliis piirab Wi-Fi kasutuse"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Võrguga ei saa ühendust luua"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Lubatud arv märke on täis."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Tugi puudub"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Vale parool."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Teenus ei ole saadaval. proovi hiljem"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi sisselulitamine desaktiveerib Wi-Fi modemi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi pääsupunkti ei leitud."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Teid ühendatakse mobiilsidevõrgu kaudu. Sellega võivad rakenduda lisatasud."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Ühendus loodud Wi-Fi võrguga %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toksake ühendamiseks siia."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Logi Wi-Fi võrku"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ära küsi enam"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Tugi puudub."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Teenus ei ole saadaval. proovi hiljem."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Valitud võrk (%s) ei ole saadaval"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Ei saa ühendada."
 
diff --git a/po/eu.po b/po/eu.po
index 540ab8c..8109c37 100644..100755
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Konektatuta"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Ezeztatu"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Segurtasun politikak Wi-Fi erabilera mugatzen du"
+msgid "IDS_COM_SK_OK"
+msgstr "Ados"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Ezin da sarera konektatu"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Gehienezko karaktere kopurura heldu zara"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Bateraezina"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Pasahitz okerra"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Zerbitzua ez dago eskuragarri. Geroago saiatu"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi piztuz gero Wi-Fi ainguraketa ezgaituko du"
 
-msgid "IDS_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_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ez da Wi-Fi APrik aurkitu"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Zure sare mugikorrera konektatuko zara. Baliteke kostu osagarriak eragitea."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "%s Wi-Fi sarera konektatuta"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Ukitu hemen konektatzeko."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Hasi saioa Wi-Fi sarean"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ez galdetu berriz"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Bateraezina"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Zerbitzua ez dago eskuragarri. Geroago saiatu."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Aukeratutako sarea (%s) ez dago eskuragarri"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Ezin da konektatu"
 
diff --git a/po/fi.po b/po/fi.po
index 9a0ca56..e65fa95 100644..100755
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Yhdistetty"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Peruuta"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Suojauskäytäntö estää Wi-Fi-yhteyden käytön"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Verkkoyhteyttä ei voi muodostaa"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Merkkien enimmäismäärä saavutettu."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Ei tuettu"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Väärä salasana"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Palvelu ei ole saatavilla. Yritä myöhemmin uudelleen."
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi-yhteyden ottaminen käyttöön poistaa Wi-Fi-yhteyden jakamisen käytöstä."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "WI-Fi-yhteyspistettä ei löydy."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Muodostetaan yhteys matkapuhelinverkkoon. Tästä voi aiheutua lisämaksuja."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Yhdistetty Wi-Fi-verkkoon %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Muodosta yhteys napauttamalla tätä."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Kirjaudu Wi-Fi-verkkoon"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Älä kysy uudelleen"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Ei tuettu."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Palvelu ei ole saatavilla. Yritä myöhemmin uudelleen."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Valittu verkko (%s) ei ole käytettävissä"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Yhdistäminen epäonnistui."
 
diff --git a/po/fr.po b/po/fr.po
new file mode 100755
index 0000000..365a581
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,54 @@
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annuler"
+
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Nb max de caractères atteint"
+
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Mot de passe incorrect"
+
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "L'activation du Wi-Fi va désactiver le modem Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Aucune application Wi-Fi trouvée."
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Réseaux Wi-Fi disponibles"
+
+msgid "IDS_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Vous allez être connecté à votre réseau mobile. Des frais supplémentaires peuvent être facturés."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connecté au réseau Wi-Fi %s"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Appuyez ici pour vous connecter."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Connexion au réseau Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne plus demander"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Non pris en charge"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Service non disponible. Réessayez plus tard."
+
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Connexion impossible"
+
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 0fca9e0..13da9c7 100644..100755
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Connecté"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annuler"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "La politique de sécurité limite l'utilisation du Wifi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Impossible de se connecter au réseau"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Nb max de caractères atteint."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Non pris en charge"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Mot de passe incorrect."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Service non disponible. Réessayez plus tard"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "L'activation du Wifi va désactiver le modem Wifi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Aucune application wifi trouvée"
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wifi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Vous allez être connecté à votre réseau mobile. Des frais supplémentaires peuvent être facturés."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connecté au réseau Wifi %s"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Touchez ici pour vous connecter."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Conn. au réseau Wifi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne plus demander"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Non pris en charge."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Service non disponible. Réessayez plus tard."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Réseau sélectionné (%s) non disponible"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Connexion impossible."
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
deleted file mode 100644
index 6f5d851..0000000
--- a/po/fr_FR.po
+++ /dev/null
@@ -1,27 +0,0 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Connecté"
-
-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_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Impossible de se connecter au réseau"
-
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Non pris en charge"
-
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-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 08438bd..abfb9a6 100644..100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Nasctha"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cuir ar ceal"
 
-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_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Ní féidir nascadh le líonra"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Uaslíon na gcarachtar bainte amach."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Gan tacú"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Pasfhocal contráilte."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Níl seirbhís ar fáil. Triail arís níos moille"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Díchumasófar nascaireacht Wi-Fi má chastar Wi-Fi air"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Níor aimsíodh AP Wi-Fi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Nascfar le do líonra móibíleach tú. Is féidir go ngearrfaí táillí breise dá réir."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Nasctha le líonra Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tapáil anseo le nascadh."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Sínigh ist. líonra Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ná hiarr arís"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Gan tacú."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Níl seirbhís ar fáil. Triail arís níos moille."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Níl an líonra roghnaithe (%s) ar fáil"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Ní féidir nascadh."
 
diff --git a/po/gl.po b/po/gl.po
index 2d8ef40..75a795c 100644..100755
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Conectado"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
 
-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_COM_SK_OK"
+msgstr "Aceptar"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Non se pode conectar á rede"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Número máximo de caracteres alcanzado"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Non admitido"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Contrasinal incorrecto"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Servizo non dispoñible. Inténteo máis tarde"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "A activación da Wi-Fi desactivará a ancoraxe á rede Wi-Fi"
 
-msgid "IDS_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_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Non se atopou ningún punto de acceso Wi-Fi"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Conectaraste á túa rede móbil. Isto pode carrexar custos adicionais."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Conectado á rede Wi-Fi %s"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toca aquí para conectarte."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Inic. sesi. na rede Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Non volver preguntar"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Non admitido"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Servizo non dispoñible. Inténteo máis tarde."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Rede seleccionada (%s) non dispoñible"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Non se pode conectar"
 
diff --git a/po/hi.po b/po/hi.po
index 97c25a6..32573ac 100644..100755
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "जोड़ा गया"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "रद्द"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "सुरक्षा नीति Wi-Fi के उपयोग को प्रतिबंधित करती है"
+msgid "IDS_COM_SK_OK"
+msgstr "ओके"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "नेटवर्क से जोड़ने में अक्षम"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "वर्णो की संख्‍या अधिकतम पहुँची।"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "असमर्थित"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "गलत पासवर्ड।"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "सेवा अनुपलब्‍ध। बाद में कोशिश करें"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi चालू करने पर Wi-Fi टेथरिंग अक्षम हो जाएगा"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "कोई Wi-Fi AP नहीं मिला।"
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "नहीं"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "सुरक्षा नीति Wi-Fi के उपयोग को प्रतिबंधित करती है।"
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "आपको अपने मोबाइल नेटवर्क से कनेक्ट किया जाएगा। इसके परिणाम स्वरूप अतिरिक्त शुल्क लग सकते हैं।"
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Wi-Fi नेटवर्क %s से कनेक्ट किया गया।"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "कनेक्ट करने के लिए यहाँ टैप करें।"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi नेटवर्क साइन इन करे"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "दोबारा न पूछें"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "असमर्थित।"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "सेवा अनुपलब्‍ध। बाद में कोशिश करें।"
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "चयनित नेटवर्क (%s) उपलब्ध नहीं"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "कनेक्‍ट करने में अक्षम।"
 
diff --git a/po/hr.po b/po/hr.po
index b969fb8..8fc930d 100644..100755
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Spojeno"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Prekid"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Sigurnosne odredbe ograničavaju Wi-Fi korištenje"
+msgid "IDS_COM_SK_OK"
+msgstr "U redu"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Greška spajanja na mrežu"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maks. broj znakova."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nepodržan"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Neispravna lozinka."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Usluga nije dostupna, Pokušajte poslije!"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Uključivanjem Wi-Fi isključit će se Wi-Fi dijeljenje."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nije nađena Wi-Fi pristupna točka."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Spojit ćete se na svoju mobilnu mrežu. To može dovesti do dodatnih troškova."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Spojeno na Wi-Fi mrežu %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Dotaknite ovdje za spajanje."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prijava na Wi-Fi mrežu"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne pitaj više"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodržan."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Usluga nije dostupna, Pokušajte poslije!."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Odabrana mreža (%s) nije dostupna"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Spajanje nemoguće."
 
diff --git a/po/hu.po b/po/hu.po
index 3e3bf46..b5b3c35 100644..100755
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Csatlakoztatva"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Mégse"
 
-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_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Nem lehet kapcsolódni a hálózathoz"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Nincs hely több karakternek."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nem támogatott"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Téves jelszó"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "A szolgáltatás nem elérhető. próbálja meg később"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "A Wi-Fi bekapcsolásával letiltja a Wi-Fi internetmegosztást."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nem található Wi-Fi hozzáférési pont."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nem"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Kapcsolódni fog a mobilhálózathoz. Ez további költséggel járhat."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "A(z) %s Wi-Fi hálózathoz kapcsolódva."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Érintse meg a kapcsolódáshoz."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Bejel. a Wi-Fi hálózatba"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Máskor ne legyen kérdés"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nem támogatott."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "A szolgáltatás nem elérhető. próbálja meg később."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "A kiválasztott hálózat (%s) nem elérhető"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "A csatlakozás sikertelen."
 
diff --git a/po/hy.po b/po/hy.po
index eea9366..d7d6631 100644..100755
--- a/po/hy.po
+++ b/po/hy.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Միացված է"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Չեղարկել"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Անվտանգության քաղաքականությունը սահմանափակում է Wi-Fi-ի օգտագործումը"
+msgid "IDS_COM_SK_OK"
+msgstr "Ընդունել"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Անհնար է միանալ ցանցին"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Հասել եք նիշերի առավելագույն քանակին:"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Չի սատարվում"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Սխալ գաղտնաբառ:"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Ծառայությունը հասանելի չէ. Փորձեք ավելի ուշ"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi-ը միացնելը կկասեցնի Wi-Fi տեղակապումը:"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi մատչման կետ չի գտնեվել:"
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ոչ"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Անվտանգության քաղաքականությունը սահմանափակում է Wi-Fi-ի օգտագործումը:"
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Դուք կմիանաք Ձեր շարժական կապի ցանցին: Դա կարող է լրացուցիչ վճարների հանգեցնել:"
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Միացել է %s Wi-Fi ցանցին:"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Միանալու համար թակեք այստեղ:"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Մտեք Wi-Fi ցանց"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Այլևս չհարցնել"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Չի սատարվում:"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Ծառայությունը հասանելի չէ. Փորձեք ավելի ուշ:"
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Ընտրված ցանցը (%s) մատչելի չէ"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Հնարավոր չէ միանալ:"
 
diff --git a/po/is.po b/po/is.po
index 2ebc3d5..d56b6e5 100644..100755
--- a/po/is.po
+++ b/po/is.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Tengt"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Hætta við"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Öryggisreglur takmarka notkun Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "Í lagi"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Mistókst að tengjast við kerfi"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Hámarksfjölda stafa hefur verið náð."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Óstutt"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Rangt lykilorð."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Þjónustan er ekki tiltæk. Reynið aftur síðar"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Ef kveikt er á Wi-Fi verður slökkt á Wi-Fi tjóðrun."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Enginn Wi-Fi aðgangsstaður fannst."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nei"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Öryggisreglur takmarka notkun Wi-Fi."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Tengingu verður komið á í gegnum farsímakerfið þitt. Þetta getur haft viðbótarkostnað í för með sér."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Tengt við Wi-Fi netið %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pikkaðu hér til að tengja."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Skrá inn á Wi-Fi-net"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ekki spyrja aftur"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Óstutt."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Þjónustan er ekki tiltæk. Reyndu síðar."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Valið kerfi (%s) er ekki í boði"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Mistókst að tengja."
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 5571693..f15620f 100644..100755
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Connesso"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annulla"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "I criteri di sicurezza limitano l'uso del Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Impossibile connettersi alla rete"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Raggiunto numero massimo di caratteri."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Non supportato"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Password errata."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Servizio non disponibile. Riprovare più tardi."
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "L'attivazione del Wi-Fi causa la disattivazione del tethering Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nessun punto di accesso Wi-Fi trovato."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Verrà stabilita una connessione alla rete mobile, che potrebbe comportare l'addebito di spese aggiuntive."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Connesso alla rete Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tocca qui per connetterti."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Accedi a rete Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Non chiedere più"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Non supportato."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Servizio non disponibile. Riprovare più tardi."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Rete selezionata (%s) non disponibile"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Impossibile stabilire connessione."
 
diff --git a/po/ja_JP.po b/po/ja_JP.po
index b34b5c7..7ecea87 100644..100755
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "接続しました。"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "キャンセル"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Wi-Fiの使用は、セキュリティポリシーによって制限されています。"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "ネットワークに接続できません"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "最大文字数に達しました。"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "サポートされていません。"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "パスワードが正しくありません。"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "サービスを利用できません。後ほどお試しください"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-FiをONにすると、Wi-Fiテザリングが無効になります。"
 
-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_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi APが見つかりません。"
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "いいえ"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Wi-Fiの使用は、セキュリティポリシーによって制限されています。"
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "モバイルネットワークに接続します。追加料金が発生する可能性があります。"
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Wi-Fiネットワーク%sに接続しました。"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "接続するには、ここをタップしてください。"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fiネットワークにサインインしてください。"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "今後表示しない"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "サポートされていません。"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "サービスを利用できません。後ほどお試しください。"
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "選択したネットワーク（%s）は利用できません。"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "接続できません。"
 
diff --git a/po/ka.po b/po/ka.po
index 798076a..370c0f5 100644..100755
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "დაკავშირებულია"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "გაუქმება"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "უსაფრთხოების პოლიტიკა ზღუდავს Wi-Fi-ის გამოყენებას"
+msgid "IDS_COM_SK_OK"
+msgstr "კი"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "ქსელს ვერ უკავშირდება"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "გაუთვალისწინებელი"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "პაროლი არასწორია."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "მომსახურება არ არის. მოგვიანებით ცადეთ"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "თუ ჩართავთ Wi-Fi-ს, გამოირთვება Wi-Fi მობილური ინტერნეტი კომპიუტერში."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi AP ვერ მოიძებნა."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "არა"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "უსაფრთხოების პოლიტიკა ზღუდავს Wi-Fi-ის გამოყენებას."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "თქვენ დაუკავშირდებით თქვენს მობილურ ქსელს. ამის გამო, შეიძლება დაგერიცხოთ დამატებითი გადასახადი."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "დაუკავშირდა Wi-Fi ქსელს %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "შეეხეთ აქ და დაუკავშირდით."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi ქსელში შესვლა"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "აღარ მკითხო"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "გაუთვალისწინებელი."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "მომსახურება არ არის. მოგვიანებით ცადეთ."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "არჩეული ქსელი (%s) მიუწვდომელია"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "ვერ დაუკავშირდებით."
 
diff --git a/po/kk.po b/po/kk.po
index 2594758..cde8bf2 100644..100755
--- a/po/kk.po
+++ b/po/kk.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Қосылды"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Тоқтату"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Қауіпсіздік саясаты Wi-Fi пайдаланылуын шектейді"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Желіге қосылу мүмкін емес"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Таңбалардың ен көп саны артты."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Ұстамайды"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Бұрыс кілтсөз."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Қызмет Жоқ. Кейінрек Қайталаңыз"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi қосу Wi-Fi байланыстыруды өшіреді."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ешқандай Wi-Fi AP табылмады."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Жоқ"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Қауіпсіздік саясаты Wi-Fi пайдаланылуын шектейді."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Ұялы желіге қосыласыз. Бұл қосымша ақыларға әкелуі мүмкін."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Wi-Fi %s желісіне қосылды."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Қосылу үшін мына жерді түртіңіз."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi желісіне кіру"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Қайтадан сұрамаңыз"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Ұстамайды"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Қызмет Жоқ. Кейінрек Қайталаңыз."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Таңдалған желі (%s) қол жетімді емес"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Қосылу мүмкін емес."
 
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 20d47a0..5fd33bb 100644..100755
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "연결되었습니다"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "취소"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "보안 정책에 따라 Wi-Fi 사용이 제한됩니다"
+msgid "IDS_COM_SK_OK"
+msgstr "확인"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "네트워크에 연결할 수 없습니다"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "최대 글자 수에 도달하였습니다."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "사용할 수 없습니다"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "비밀번호가 바르지 않습니다."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "서비스를 이용할 수 없습니다. 잠시 후 다시 시도하세요."
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi를 실행하면 Wi-Fi 테더링을 연결 해제합니다."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "아니요"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "보안정책에 따라 Wi-Fi를 사용할 수 없습니다."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "모바일 네트워크에 연결합니다. 추가요금이 부과될 수 있습니다."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "%s Wi-Fi 네트워크에 연결하였습니다."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "연결하려면 여기를 누르세요."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi 네트워크 로그인"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "다시 묻지 않기"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "지원되지 않습니다."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "서비스를 이용할 수 없습니다. 나중에 시도하세요."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "선택한 네트워크(%s)를 사용할 수 없습니다"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "연결할 수 없습니다."
 
diff --git a/po/lt.po b/po/lt.po
index e769287..2dfebad 100644..100755
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Prisijungta"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Atšaukti"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Saugos strategija riboja naudojimąsi „Wi-Fi“"
+msgid "IDS_COM_SK_OK"
+msgstr "Gerai"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Neįmanoma prisijungti prie tinklo"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Pasiektas didžiausias simbolių skaičius."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nepalaikoma"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Neteisingas slaptažodis."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Paslauga neteikiama. pamėginkite vėliau"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Įjungus „Wi-Fi“ bus išjungtas „Wi-Fi“ siejimas."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "„Wi-Fi“ AP nerasta."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Būsite prijungti prie mobiliojo tinklo. Dėl to gali būti taikomi papildomi mokesčiai."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Prisijungta prie „Wi-Fi“ tinklo %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Bakstelėkite čia, norėdami prisijungti."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prisijungti prie „Wi-Fi“"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Kitą kartą neklausti"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepalaikoma."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Paslauga neteikiama. pamėginkite vėliau."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Pasirinktas tinklas (%s) nepasiekiamas"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Neįmanoma prijungti."
 
diff --git a/po/lv.po b/po/lv.po
index aac9550..da0a920 100644..100755
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Savienots"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Atcelt"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Drošības politika ierobežo Wi-Fi lietošanu"
+msgid "IDS_COM_SK_OK"
+msgstr "Labi"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Nevar izveidot savienojumu ar tīklu"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Sasniegts maksimālais rakstzīmju skaits."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nav nodrošināts"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Nepareiza parole."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Pakalpojums nav pieejams. mēģiniet vēlāk"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Aktivizējot Wi-Fi, tiks deaktivizēta Wi-Fi piesaiste."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nav atrasts neviens Wi-Fi piekļuves punkts."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Tiks izveidots savienojums ar jūsu mobilo tīklu. Tas var radīt papildu izmaksas."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Izveidots savienojums ar Wi-Fi tīklu %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pieskarieties šeit, lai izveidotu savienojumu."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Pierakstieties Wi-Fi tīk."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Vairs nevaicāt"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nav nodrošināts."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Pakalpojums nav pieejams. mēģiniet vēlāk."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Izvēlētais tīkls (%s) nav pieejams"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Nevar izveidot savienojumu."
 
diff --git a/po/mk.po b/po/mk.po
index fa47d9e..d248955 100644..100755
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Поврзано"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Откажи"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Политиката на безбедност го ограничува користењето Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Не може да се поврзе со мрежата"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Достигнат е максималниот број знаци."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Не е поддржано"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Погрешна лозинка."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Услугата е недостапна. обидете се подоцна"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Вклучувањето Wi-Fi ќе го исклучи поврзувањето Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Нема пристапна точка за Wi-Fi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Не"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Политиката на безбедност го ограничува користењето Wi-Fi."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Ќе се поврзете со мобилна мрежа. Тоа може да се наплаќа дополнително."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Поврзано со мрежа Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Допрете тука за да се поврзете."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Запиши се на Wi-Fi мрежа"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Не прашувај повторно"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Не е поддржано."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Услугата е недостапна. обидете се подоцна."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Избраната мрежа (%s) не е достапна"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Не е можно поврзување."
 
diff --git a/po/nb.po b/po/nb.po
index 67632b1..68fd3a7 100644..100755
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Tilkoblet"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Avbryt"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Sikkerhetspolicy begrenser bruk av Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Kan ikke koble til nettverket"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Nådd maksimalt antall tegn."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Støttes ikke"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Feil passord."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Tjenester er ikke tilgjengelig. forsøk senere"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Hvis du slår på Wi-Fi, vil Wi-Fi-internettdeling deaktiveres."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ingen Wi-Fi-tilgangspunkt funnet."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Du vil bli koblet til mobilnettet. Dette kan medføre ekstrakostnader."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Tilkoblet til Wi-Fi-nettverk %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Trykk her for å koble til."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Logg på Wi-Fi-nettverk"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ikke spør på nytt"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Støttes ikke."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Tjenester er ikke tilgjengelig. forsøk senere."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Valgt nettverk (%s) er ikke tilgjengelig"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Kan ikke opprette forbindelse."
 
diff --git a/po/nl.po b/po/nl.po
new file mode 100755
index 0000000..80368dc
--- /dev/null
+++ b/po/nl.po
@@ -0,0 +1,54 @@
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Annuleren"
+
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
+
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximumaantal tekens bereikt."
+
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Onjuist wachtwoord."
+
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Als u Wi-Fi inschakelt, wordt Wi-Fi-tethering uitgeschakeld."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Geen Wi-Fi AP gevonden."
+
+msgid "IDS_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
+msgstr "Wi-Fi-netwerken beschikbaar"
+
+msgid "IDS_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "U krijgt verbinding via uw mobiele netwerk. Dit kan leiden tot extra kosten."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Verbonden met Wi-Fi-netwerk %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tik hier om te verbinden."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Log in bij Wi-Fi-netwerk"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Niet meer vragen"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Niet ondersteund."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Dienst niet beschikbaar. Probeer het later opnieuw."
+
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Verbinding mislukt."
+
diff --git a/po/nl_NL.po b/po/nl_NL.po
deleted file mode 100644
index 4cd536f..0000000
--- a/po/nl_NL.po
+++ /dev/null
@@ -1,27 +0,0 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Verbonden"
-
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Gebruik van Wi-Fi beperkt door beveiligingsbeleid"
-
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Kan niet verbinden met netwerk"
-
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Niet ondersteund"
-
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-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 25a410e..ecc708d 100644..100755
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Połączono"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Anuluj"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Zasady zabezpieczeń ograniczają użycie sieci Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Nie można nawiązać połączenia z siecią"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Osiągnięto maksymalną liczbę znaków."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nieobsługiwane"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Błędne hasło"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Usługa niedostępna. Spróbuj później"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Włączenie sieci Wi-Fi spowoduje wyłączenie udostępniania przez tę sieć."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nie znaleziono punktu dostępu Wi-Fi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Nastąpi połączenie z siecią komórkową. Może to spowodować naliczenie dodatkowych opłat."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Połączono z siecią Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Dotknij tutaj, aby połączyć."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Zaloguj do sieci Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Nie pytaj ponownie"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nieobsługiwane."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Usługa niedostępna. Spróbuj później."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Wybrana sieć (%s) jest niedostępna"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Nie można połączyć."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9af4811..f13357a 100644..100755
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Conectado"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
 
-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_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Impossível conectar à rede"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Número máximo de caracteres atingido."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Não suportado"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Senha incorreta."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Serviço indisponível. Tente mais tarde"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Ligar o Wi-Fi desativará o compartilhamento Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi não encontrado."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Você será conectado à sua rede móvel. Isto pode resultar em cobranças adicionais."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Conectado à rede Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toque aqui para conectar-se."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Verifique sua rede Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Não perguntar mais"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Não suportado."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Serviço indisponível. Tente mais tarde."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "A rede selecionada (%s) não está disponível"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Impossível conectar."
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b95ba19..d58bf05 100644..100755
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Ligado"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Cancelar"
 
-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_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Impossível ligar à rede"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Número máximo de caracteres atingido."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Não suportado"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Palavra-passe incorrecta."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Serviço indisponível. tente mais tarde"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Ligar o Wi-Fi irá desactivar a ancoragem Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nenhum PA Wi-Fi localizado."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Será ligado à sua rede móvel. Daqui pode resultar a cobrança de taxas adicionais."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Ligado à rede Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Toque aqui para ligar."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Inic. ses. na rede Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Não voltar a perguntar"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Não suportado."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Serviço indisponível. tente mais tarde."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Rede seleccionada (%s) indisponível"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Impossível ligar."
 
diff --git a/po/ro.po b/po/ro.po
index 77645f5..e07c7a3 100644..100755
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Conectat"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Anulare"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Politica de securitate restricţionează utilizarea reţelei Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Imposibil de conectat la reţea"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Adăugare la marcaje"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Neacceptat"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Parolă incorectă"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Serviciu indisponibil, încercaţi mai târziu!"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Activarea Wi-Fi va dezactiva furnizarea accesului la internet prin Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nu a fost găsită o aplicaţie Wi-Fi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nu"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Politica de securitate restricţionează utilizarea reţelei Wi-Fi."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Veţi fi conectat la reţeaua mobilă. Aceasta poate genera costuri suplimentare."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Conectat la reţeaua Wi-Fi %s"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Atingeţi aici pentru a vă conecta."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Conect. la reţeaua Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Nu întreba din nou"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Neacceptat"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Serviciu indisponibil, încercaţi mai târziu!."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Reţeaua selectată (%s) nu este disponibilă"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Conectare imposibilă"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 04e54c3..85f844e 100644..100755
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Подключено"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Отмена"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Политика безопасности ограничивает использование Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Не удается подключиться к сети"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Достигнуто максимальное число символов."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Не поддерживается"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Неправильный пароль"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Услуга недоступна. повторите попытку позже"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "При включении Wi-Fi модем Wi-Fi будет отключен."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Точка доступа Wi-Fi не найдена."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Нет"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Политика безопасности ограничивает использование Wi-Fi."
 
 msgid "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE"
-msgstr "Сети Wi-Fi доступны"
+msgstr "Есть доступные сети Wi-Fi"
+
+msgid "IDS_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Будет выполнено подключение к мобильной сети. За это будет взиматься дополнительная плата."
 
-msgid "IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB"
-msgstr "Открыть параметры Wi-Fi"
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Подключено к сети Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Нажмите здесь для подключения."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Войти в сеть Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Больше не спрашивать"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Не поддерживается."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Услуга недоступна. повторите попытку позже."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Выбранная сеть (%s) недоступна"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Невозможно подключиться."
 
diff --git a/po/sk.po b/po/sk.po
index 5fd2df3..da34343 100644..100755
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Pripojené"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Zrušiť"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Politika zabezpečenia obmedzuje použitie pripojenia Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Nedá sa pripojiť k sieti"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Bol dosiahnutý maximálny počet znakov."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nepodporované"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Nesprávne heslo."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Služba je nedostupná. skúste to znova."
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Zapnutím pripojenia Wi-Fi sa vypne zdieľanie pripojenia cez Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nepodarilo sa nájsť žiadny prístupový bod Wi-Fi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Nie"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Politika zabezpečenia obmedzuje použitie pripojenia Wi-Fi."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Pripojíte sa k mobilnej sieti. To môže mať za následok ďalšie poplatky."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Pripojené k sieti Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Ťuknutím sem vykonáte pripojenie."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prihl. sa k sieti Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Už sa nepýtať"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodporované."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Služba je nedostupná. skúste to znova."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Vybratá sieť (%s) nie je k dispozícii"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Nedá sa spojiť."
 
diff --git a/po/sl.po b/po/sl.po
index e29fb9e..5734793 100644..100755
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Povezano"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Prekliči"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Varnostni pravilnik omejuje uporabo omrežja Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "V redu"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Ni mogoče vzpostaviti povezave z omrežjem"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Doseženo je največje dovoljeno število znakov."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nepodprto"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Napačno geslo."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Storitve ni na voljo. poskusite znova"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Vklop vmesnika Wi-Fi bo onemogočil privezovanje prek Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Ne najdem dostopne točke Wi-Fi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Povezava bo vzpostavljena prek mobilnega omrežja.To lahko povzroči dodatne stroške."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Povezava z omrežjem Wi-Fi %s vzpostavljena."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Pritisnite tukaj za povezavo."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prijava v omrežje Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne vprašaj znova"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodprto."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Storitve ni na voljo. poskusite znova."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Izbrano omrežje (%s) ni na voljo"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Ni mogoče povezati."
 
diff --git a/po/sr.po b/po/sr.po
index e56c7f2..227da59 100644..100755
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Povezan"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Otkaži"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Politika bezbednosti ograničava upotrebu Wi-Fija"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Nemoguće povezati se na mrežu"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Dostignut maksimalan broj karaktera."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Nepodržano"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Pogrešna šifra."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Usluga nedostupna. probaj kasnije"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Uključivanje Wi-Fi veze će onemogućiti Wi-Fi vezivanje."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Nema Wi-Fi pristupne tačke."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Bićeš povezan/a na mreže mobilne telefonije. To može dovesti do dodatnih troškova."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Povezan na Wi-Fi mrežu %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Kucni ovde za povezivanje."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Prijavi se na Wi-Fi mrežu"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Ne pitaj ponovo"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Nepodržano."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Usluga nedostupna. probaj kasnije."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Izabrana mreža (%s) nije dostupna"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Povezivanje nemoguće."
 
diff --git a/po/sv.po b/po/sv.po
index e5d1bb8..cd777f8 100644..100755
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Ansluten"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Avbryt"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Säkerhetspolicy begränsar användningen av Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Det går inte att ansluta till nätverket"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maximalt antal tecken har använts."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Kan ej användas"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Fel lösenord."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Tjänsten är inte tillgänglig. försök senare."
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Om du slår på Wi-Fi inaktiveras Wi-Fi-internetdelning."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Det finns ingen Wi-Fi-åtkomstpunkt."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Du kommer att bli ansluten till ditt mobilnät. Det kan medföra extra kostnader."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Ansluten till Wi-Fi-nätverket %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Tryck här för att ansluta."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Logga in på Wi-Fi-nätv."
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Fråga inte igen"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Kan ej användas."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Tjänsten är inte tillgänglig. försök senare."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Valt nätverk (%s) är inte tillgängligt"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Det gick inte att ansluta."
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 7ab6cd4..17e27fb 100644..100755
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Bağlantı kuruldu"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "İptal"
 
-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_COM_SK_OK"
+msgstr "Tamam"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Ağa bağlanamadı"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Maksimum karakter sayısına ulaşıldı."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Desteklenmiyor"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Yanlış şifre."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Hizmete Erişilemiyor. Daha Sonra Deneyin"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fi'yi açmak Wi-Fi tethering'i devre dışı bırakır."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Hiç Wi-Fi AP bulunamadı."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Hayır"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Mobil ağınıza bağlanacaksınız. Bunun için ek ücretler uygulanabilir."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Wi-Fi ağına %s bağlandı."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Bağlanmak için buraya dokunun."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi ağına oturum açın"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Tekrar sorma"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Desteklenmiyor."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Hizmete Erişilemiyor. Daha Sonra Deneyin."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Seçili ağ (%s) mevcut değil"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Bağlantı başarısız."
 
diff --git a/po/uk.po b/po/uk.po
index c119c33..242db7f 100644..100755
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "З'єднано"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Скасувати"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Використання мережі Wi-Fi обмежено політикою безпеки"
+msgid "IDS_COM_SK_OK"
+msgstr "ОК"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Неможливо підключитися до мережі"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Досягнуто максимальної кількості символів."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Не підтримується"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Хибний пароль."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Послуга недоступна. спробуйте пізніше"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Увімкнення мережі Wi-Fi призведе до вимкнення прив'язки Wi-Fi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Жодної ТД Wi-Fi не знайдено."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "Ні"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "Використання мережі Wi-Fi обмежено політикою безпеки."
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Буде встановлено підключення до мобільної мережі. Це може призвести до додаткових витрат."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "Підключено до мережі Wi-Fi %s."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Натисніть тут, щоб підключитися."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Реєстрація в мережі Wi-Fi"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Більше не запитувати"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Не підтримується."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Послуга недоступна. спробуйте пізніше."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Вибрана мережа (%s) недоступна"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Неможливо з’єднатися."
 
diff --git a/po/uz.po b/po/uz.po
index bf504a7..6277268 100644..100755
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "Ulangan"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "Bekor qilish"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "Xavfsizlik siyosati Wi-Fidan foydalanishni cheklaydi"
+msgid "IDS_COM_SK_OK"
+msgstr "OK"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "Tarmoqqa ulanib bo‘lmaydi"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "Belgilar soni ruxsat etilgan maksimal miqdorga yetdi."
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "Qo‘llab-quvvatlanmaydi"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "Noto‘g‘ri parol."
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "Xizmatdan foydalanib bo‘lmaydi. Keyinroq urinib ko‘ring"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "Wi-Fini yoqish Wi-Fi bog‘lanishni o‘chiradi."
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "Wi-Fi AP topilmadi."
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+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_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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "Siz mobil tarmog‘ingizga qo‘shilasiz. Buning uchun qo‘shimcha to‘lov olinishi mumkin."
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "%s Wi-Fi tarmog‘iga ulangan."
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "Ulanish uchun bu yerga teging."
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "Wi-Fi tarmoqqa kirish"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "Qayta so‘ralmasin"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "Qo‘llab-quvvatlanmaydi."
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "Xizmatdan foydalanib bo‘lmaydi. Keyinroq urinib ko‘ring."
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "Tanlangan tarmoq (%s)dan foydalanib bo‘lmaydi"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "Ulanib bo‘lmaydi."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bd3e465..12f02fe 100644..100755
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "已连接"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "取消"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "安全政策限制使用Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "确定"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "无法连接网络"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "已达到最大字符限制"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "不支持"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "密码错误"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "服务不可用,稍后再试"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "打开 Wi-Fi 将禁用 Wi-Fi 网络共享。"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "未找到Wi-Fi AP。"
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "否"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "安全政策限制使用Wi-Fi。"
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "您将连接至移动网络。这可能产生额外费用。"
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "已连接到Wi-Fi网络%s。"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "轻敲此处以连接"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "登录至 Wi-Fi 网络"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "不要再询问"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "不支持"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "服务不可用。稍后再试。"
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "选定网络（%s）不可用"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "无法连接。"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 53dc3b2..8e05b06 100644..100755
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "已連接"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "取消"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "安全政策限制使用 Wi-Fi"
+msgid "IDS_COM_SK_OK"
+msgstr "確定"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "無法連接網絡"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "字元數目已達上限。"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "不支援"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "密碼錯誤"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "無可用服務。請稍後再試"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "開啟 Wi-Fi 將停用 Wi-Fi 網絡共享。"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "找不到 Wi-Fi AP。"
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "否"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "安全政策限制使用 Wi-Fi。"
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "您將連接至流動網絡。這可能產生額外費用。"
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "已連接到 Wi-Fi 網絡 %s。"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "輕觸此處以連接。"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "登入至 Wi-Fi 網絡"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "不再詢問"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "不支援"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "無可用服務。請稍後再試。"
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "選擇的網絡（%s）不可用"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "無法連接。"
 
diff --git a/po/zh_SG.po b/po/zh_SG.po
deleted file mode 100644
index e85b933..0000000
--- a/po/zh_SG.po
+++ /dev/null
@@ -1,27 +0,0 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "已连接"
-
-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 "无法连接网络"
-
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "不支持"
-
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-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 4448a1a..5ed69f0 100644..100755
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,27 +1,54 @@
-msgid "IDS_WIFI_BODY_CONNECTED"
-msgstr "已連線"
+msgid "IDS_COM_SK_CANCEL"
+msgstr "取消"
 
-msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
-msgstr "由於安全政策，使用Wi-Fi被限制"
+msgid "IDS_COM_SK_OK"
+msgstr "確定"
 
-msgid "IDS_ST_BODY_UNABLE_TO_CONNECT_TO_THE_NETWORK"
-msgstr "無法連接到網路"
+msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
+msgstr "已達字元數上限。"
 
-msgid "IDS_ST_POP_NOT_SUPPORTED"
-msgstr "不支援"
+msgid "IDS_ST_POP_WRONG_PASSWORD"
+msgstr "密碼錯誤"
 
-msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
-msgstr "無法使用服務。請稍後再試"
+msgid "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING"
+msgstr "開啟 Wi-Fi 將停用 Wi-Fi 網路共享。"
+
+msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND"
+msgstr "找不到 Wi-Fi AP。"
 
-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_WIFI_BODY_WI_FI"
+msgstr "Wi-Fi"
+
+msgid "IDS_COM_SK_NO"
+msgstr "否"
+
+msgid "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"
+msgstr "由於安全政策，使用Wi-Fi被限制。"
 
 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_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES"
+msgstr "將連接至您的行動網路。這可能產生額外費用。"
+
+msgid "IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS"
+msgstr "已連接至 Wi-Fi 網路 %s。"
+
+msgid "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT"
+msgstr "輕觸此處以連接。"
+
+msgid "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB"
+msgstr "登入 Wi-Fi 網路"
+
+msgid "IDS_WIFI_BUTTON_DONT_ASK_AGAIN"
+msgstr "不要再詢問"
+
+msgid "IDS_ST_POP_NOT_SUPPORTED"
+msgstr "不支援"
+
+msgid "IDS_IM_POP_SERVICE_NOT_AVAIL"
+msgstr "無法使用服務。請稍後再試。"
 
-msgid "IDS_COM_BODY_SELECTED_NETWORK_HPS_NOT_AVAILABLE"
-msgstr "選取的網路 (%s) 無法使用"
+msgid "IDS_WIFI_POP_UNABLE_TO_CONNECT"
+msgstr "無法連線。"
 
diff --git a/resources/net.netpopup.xml b/resources/net.netpopup.xml
new file mode 100644
index 0000000..1958e6d
--- /dev/null
+++ b/resources/net.netpopup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="net.netpopup" version="2.4" 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="net.netpopup" exec="/usr/bin/net-popup" nodisplay="true" multiple="true" type="capp" taskmanage="false">
+		<label>Network popup</label>
+	</ui-application>
+</manifest>
diff --git a/resources/org.tizen.net-popup.xml b/resources/org.tizen.net-popup.xml
deleted file mode 100644
index 6c58173..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" api-version="2.4" version="0.4.55-3" install-location="internal-only">
-	<label>Network popup</label>
-	<author email="sunil85.kim@samsung.com" href="www.samsung.com">Sunil Kim</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 ce074a6..904d4d6 100644..100755
--- a/src/net-popup.c
+++ b/src/net-popup.c
@@ -1,13 +1,13 @@
 /*
 *  net-popup
 *
-* Copyright 2012-2013  Samsung Electronics Co., Ltd
+* Copyright 2012  Samsung Electronics Co., Ltd
 *
-* Licensed under the Apache License, Version 2.0 (the "License");
+* Licensed under the Flora License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
-* http://www.apache.org/licenses/LICENSE-2.0
+* http://www.tizenopensource.org/license
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,109 +17,327 @@
 *
 */
 
+#include <glib.h>
 #include <stdio.h>
+#if 0
+#include <Ecore_X.h>
+#endif
 #include <syspopup.h>
-#include <glib.h>
-#include <status.h>
 #include <notification.h>
 #include <notification_list.h>
-#include <notification_internal.h>
 #include <notification_text_domain.h>
-#include <appcore-efl.h>
+#include <notification_internal.h>
+#include <app.h>
 #include <appsvc.h>
+#include <app_control_internal.h>
+#include <vconf.h>
+#include <vconf-keys.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
 #include <bundle_internal.h>
+#include <efl_extension.h>
 
 #include "net-popup.h"
 #include "net-popup-strings.h"
 
 #define LOCALEDIR			"/usr/share/locale"
+#define NETPOPUP_EDJ 		"/usr/ug/res/edje/net-popup/netpopup-custom.edj"
+#define QP_PRELOAD_NOTI_ICON_PATH "/usr/apps/org.tizen.quickpanel/shared/res/noti_icons/Wi-Fi"
 
 #define NETCONFIG_NOTIFICATION_WIFI_ICON \
-					"/usr/share/icon/Q02_Notification__wifi_in_range.png"
+					"/usr/share/icons/noti_wifi_in_range.png"
+#define NETCONFIG_NOTIFICATION_WIFI_ICON_LITE \
+					"/usr/share/icons/noti_wifi_in_range_ongoing.png"
+#define NETCONFIG_NOTIFICATION_WIFI_CAPTIVE_ICON \
+					"/usr/share/icons/B03_notify_Wi-fi_range.png"
+#define NETCONFIG_NOTIFICATION_WIFI_IN_RANGE_ICON \
+						"/usr/share/icons/Q02_Notification_wifi_in_range.png"
+#define NETCONFIG_NOTIFICATION_WIFI_IN_RANGE_ICON_LITE \
+						"/usr/share/icons/noti_wifi_in_range.png"
 #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);
+		dgettext(PACKAGE, "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT")
+#define NETCONFIG_NOTIFICATION_WIFI_PORTAL_TITLE \
+			dgettext(PACKAGE, "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB")
+#define NETCONFIG_NOTIFICATION_WIFI_PORTAL_CONTENT "\"%s\""
+
+#define USER_RESP_LEN 30
+#define RESP_REMAIN_CONNECTED "RESP_REMAIN_CONNECTED"
+#define RESP_WIFI_TETHERING_OFF "RESP_TETHERING_TYPE_WIFI_OFF"
+#define RESP_WIFI_AP_TETHERING_OFF "RESP_TETHERING_TYPE_WIFI_AP_OFF"
+#define RESP_TETHERING_ON "RESP_TETHERING_ON"
+#define CAPTIVE_PORTAL_LOGIN "Login required to access Internet"
+#define CAPTIVE_PORTAL_LOGIN_ERROR "Login not completed. Disconnected active Wifi"
+
+static Ecore_Event_Handler *ecore_event_evas_handler;
+static Ecore_Event_Handler *ecore_event_evas_quick_panel_handler;
+
+#define BUF_SIZE 1024
+long sizes[] = {1073741824, 1048576, 1024, 0};
+char *units[] = {"GB", "MB", "KB", "B"};
+
+static app_control_h g_req_handle = NULL;
+static char * resp_popup_mode = NULL;
+
+static DBusGConnection *conn = NULL;
+static DBusGProxy *proxy = NULL;
+
+static int __net_popup_show_notification(app_control_h request, void *data);
+static int __toast_popup_show(app_control_h request, void *data);
+static int __net_popup_show_popup(app_control_h request, void *data);
 static void __net_popup_add_found_ap_noti(void);
 static void __net_popup_del_found_ap_noti(void);
-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 void __net_popup_add_portal_noti(app_control_h request);
+static void __net_popup_del_portal_noti(void);
+static void __net_popup_show_popup_with_user_resp(app_control_h request, void *data);
+static int _net_popup_send_user_resp(char *resp, Eina_Bool state);
+
+
+DBusGProxy *__net_popup_init_dbus(void)
+{
+	GError *err = NULL;
+
+	conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &err);
+	if (err != NULL) {
+		g_error_free(err);
+		return NULL;
+	}
+
+	proxy = dbus_g_proxy_new_for_name(conn, "net.netpopup",
+			"/Netpopup", "net.netpopup");
+	if (proxy == NULL) {
+		dbus_g_connection_unref(conn);
+		conn = NULL;
+	}
+
+	return proxy;
+}
+
+void __net_popup_deinit_dbus(void)
+{
+	if (proxy) {
+		g_object_unref(proxy);
+		proxy = NULL;
+	}
+
+	if (conn) {
+		dbus_g_connection_unref(conn);
+		conn = NULL;
+	}
 
-static int __net_popup_create(void *data)
+	return;
+}
+
+int __net_popup_send_dbus_msg(const char *resp)
+{
+	if (conn == NULL || resp == NULL) {
+		return -1;
+	}
+
+	DBusConnection *gconn = NULL;
+	DBusMessage *msg = NULL;
+	char *module = "wifi";
+
+	gconn = dbus_g_connection_get_connection(conn);
+	if (gconn == NULL) {
+		return -1;
+	}
+
+	msg = dbus_message_new_signal("/Org/Tizen/Quickpanel",
+					  "org.tizen.quickpanel",
+					  "ACTIVITY");
+	if (!msg) {
+		return -1;
+	}
+
+	if (!dbus_message_append_args(msg,
+			DBUS_TYPE_STRING, &module,
+			DBUS_TYPE_STRING, &resp,
+			DBUS_TYPE_INVALID)) {
+		dbus_message_unref(msg);
+		return -1;
+	}
+
+	dbus_connection_send(gconn, msg, NULL);
+	dbus_message_unref(msg);
+
+	return 0;
+}
+
+static bool __net_popup_create(void *data)
 {
 	log_print(NET_POPUP, "__net_popup_create()\n");
 
 	bindtextdomain(PACKAGE, LOCALEDIR);
 
-	return 0;
+	return true;
 }
 
-static int __net_popup_terminate(void *data)
+static void __net_popup_terminate(void *data)
 {
-	return 0;
+	if (ecore_event_evas_handler) {
+		ecore_event_handler_del(ecore_event_evas_handler);
+		ecore_event_evas_handler = NULL;
+	}
+	if (ecore_event_evas_quick_panel_handler) {
+		ecore_event_handler_del(ecore_event_evas_quick_panel_handler);
+		ecore_event_evas_quick_panel_handler = NULL;
+	}
+
+	return;
 }
 
-static int __net_popup_pause(void *data)
+static void __net_popup_pause(void *data)
 {
-	return 0;
+	log_print(NET_POPUP, "__net_popup_pause()");
 }
 
-static int __net_popup_resume(void *data)
+static void __net_popup_resume(void *data)
 {
-	return 0;
+	return;
 }
 
-static int __net_popup_reset(bundle *b, void *data)
+static Eina_Bool __key_release_event_cb(void *data, int type,
+		void *event)
 {
-	log_print(NET_POPUP, "__net_popup_reset()\n");
+	Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *) event;
 
-	const char* type = bundle_get_val(b, "_SYSPOPUP_TYPE_");
+	if (!ev) {
+		return ECORE_CALLBACK_RENEW;
+	}
+
+	if (!ev->keyname) {
+		return ECORE_CALLBACK_RENEW;
+	}
 
-	if (type == NULL) {
+	log_print(NET_POPUP, "key_release : %s", ev->keyname);
+	if (g_strcmp0(ev->keyname, "XF86Phone") == 0 ||
+			g_strcmp0(ev->keyname, "XF86Stop") == 0) {
 		elm_exit();
-		return 0;
+	}
+
+	return ECORE_CALLBACK_DONE;
+}
+
+#if 0
+static Eina_Bool _ecore_event_client_message_cb(void *data, int type,
+						 void *event)
+{
+	Ecore_X_Event_Client_Message *ev = event;
+
+	if (ev->message_type == ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE) {
+		if (ev->data.l[0] == ECORE_X_ATOM_E_ILLUME_QUICKPANEL_OFF) {
+			log_print(NET_POPUP, "ECORE_X_ATOM_E_ILLUME_QUICKPANEL_OFF");
+		} else if (ev->data.l[0] == ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ON) {
+			log_print(NET_POPUP, "ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ON");
+		}
+	}
+	return ECORE_CALLBACK_RENEW;
+}
+#endif
+
+static void __net_popup_service_cb(app_control_h request, void *data)
+{
+	log_print(NET_POPUP, "__net_popup_service_cb()\n");
+
+	int ret = 0;
+	char *type = NULL;
+
+	if (ecore_event_evas_handler == NULL) {
+		ecore_event_evas_handler = ecore_event_handler_add(ECORE_EVENT_KEY_UP,
+				__key_release_event_cb, NULL);
+	}
+
+#if 0
+	if (ecore_event_evas_quick_panel_handler == NULL) {
+		ecore_event_evas_quick_panel_handler = ecore_event_handler_add(
+				ECORE_X_EVENT_CLIENT_MESSAGE, _ecore_event_client_message_cb, NULL);
+	}
+#endif
+
+	ret = app_control_get_extra_data(request, "_SYSPOPUP_TYPE_", &type);
+
+	if (APP_CONTROL_ERROR_NONE != ret) {
+		log_print(NET_POPUP, "Failed to get _SYSPOPUP_TYPE_ ret = %d", ret);
+		g_free(type);
+		elm_exit();
+		return;
 	}
 
 	log_print(NET_POPUP, "type = %s\n", type);
 
 	if (g_str_equal(type, "notification")) {
-		__net_popup_show_tickernoti(b, data);
+		__net_popup_show_notification(request, data);
 		elm_exit();
+	} else if (g_str_equal(type, "toast_popup")) {
+		__toast_popup_show(request, data);
 	} else if (g_str_equal(type, "popup")) {
-		__net_popup_show_popup(b, data);
+		__net_popup_show_popup(request, data);
 	} 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")) {
 		__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();
+	} else if (g_str_equal(type, "add_portal_noti")) {
+		__net_popup_add_portal_noti(request);
 		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();
+	} else if (g_str_equal(type, "del_portal_noti")) {
+		__net_popup_del_portal_noti();
 		elm_exit();
+	} else if (g_str_equal(type, "popup_user_resp")) {
+		app_control_clone(&g_req_handle, request);
+		__net_popup_show_popup_with_user_resp(request, data);
 	} else {
-		__net_popup_show_tickernoti(b, data);
+		__net_popup_show_notification(request, data);
 		elm_exit();
 	}
+	g_free(type);
 
-	return 0;
+	return;
+}
+
+static void __net_popup_set_orientation(Evas_Object *win)
+{
+	int rots[4] = { 0, 90, 180, 270 };
+
+	if (!elm_win_wm_rotation_supported_get(win)) {
+		return;
+	}
+
+	elm_win_wm_rotation_available_rotations_set(win, rots, 4);
+}
+
+static Evas_Object* __net_popup_create_win(void)
+{
+	Evas_Object *win = NULL;
+	Evas *e = NULL;
+	Ecore_Evas *ee = NULL;
+#if 0
+	int w, h;
+#endif
+
+	win = elm_win_add(NULL, PACKAGE, ELM_WIN_NOTIFICATION);
+
+	e = evas_object_evas_get(win);
+	ee = ecore_evas_ecore_evas_get(e);
+	ecore_evas_name_class_set(ee,"APP_POPUP","APP_POPUP");
+	
+	elm_win_alpha_set(win, EINA_TRUE);
+	elm_win_borderless_set(win, EINA_TRUE);
+#if 0
+	ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
+	evas_object_resize(win, w, h);
+	utilx_set_system_notification_level (ecore_x_display_get(),
+				elm_win_xwindow_get(win),
+				UTILX_NOTIFICATION_LEVEL_LOW);
+#endif
+
+	__net_popup_set_orientation(win);
+
+	return win;
 }
 
 static void _ok_button_clicked_cb(void *data, Evas_Object *obj, void *event_info)
@@ -129,68 +347,339 @@ static void _ok_button_clicked_cb(void *data, Evas_Object *obj, void *event_info
 	elm_exit();
 }
 
-static int __net_popup_show_tickernoti(bundle *b, void *data)
+static void _timeout_cb(void *data, Evas_Object *obj, void *event_info)
 {
-	const char* mode = bundle_get_val(b, "_SYSPOPUP_CONTENT_");
-	if (mode == NULL) {
+	evas_object_del(obj);
+
+	elm_exit();
+}
+
+static int __toast_popup_show(app_control_h request, void *data)
+{
+	char buf[ALERT_STR_LEN_MAX] = "";
+	int ret = 0;
+	char *mode = NULL;
+	Evas_Object *twin = NULL;
+	Evas_Object *tpop = NULL;
+
+	ret = app_control_get_extra_data(request, "_SYSPOPUP_CONTENT_", &mode);
+	if (ret != APP_CONTROL_ERROR_NONE) {
+		log_print(NET_POPUP, "Failed to get _SYSPOPUP_CONTENT_ ret = %d", ret);
+		g_free(mode);
+		elm_exit();
+		return 0;
+	}
+
+	log_print(NET_POPUP, "_SYSPOPUP_CONTENT_ = %s\n", mode);
+
+	twin = __net_popup_create_win();
+	tpop = elm_popup_add(twin);
+	elm_object_style_set(tpop, "toast");
+	evas_object_size_hint_weight_set(tpop, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+	elm_popup_timeout_set(tpop, 2.0);
+
+	evas_object_smart_callback_add(tpop, "timeout", _timeout_cb, twin);
+	if (strcmp(mode, "wrong password") == 0) {
+		log_print(NET_POPUP, "alert wrong password\n");
+
+		g_snprintf(buf, ALERT_STR_LEN_MAX, ALERT_STR_ERR_WRONG_PASSWORD);
+	} else if (strcmp(mode, "no ap found") == 0) {
+		log_print(NET_POPUP, "alert no ap found\n");
+
+		g_snprintf(buf, ALERT_STR_LEN_MAX, ALERT_STR_NO_AP_FOUND);
+	} else if (strcmp(mode, "unable to connect") == 0) {
+		log_print(NET_POPUP, "alert no ap found\n");
+
+		g_snprintf(buf, ALERT_STR_LEN_MAX, ALERT_STR_ERR_CONNECT);
+	} else
+		log_print(NET_POPUP, "%s\n", mode);
+
+	elm_object_text_set(tpop, buf);
+	evas_object_show(tpop);
+	evas_object_show(twin);
+	g_free(mode);
+
+	return 0;
+}
+
+static int __net_popup_show_notification(app_control_h request, void *data)
+{
+	int ret = 0;
+	char *mode = NULL;
+	char buf[ALERT_STR_LEN_MAX] = "";
+	char *ap_name = NULL;
+
+	ret = app_control_get_extra_data(request, "_SYSPOPUP_CONTENT_", &mode);
+
+	if (APP_CONTROL_ERROR_NONE != ret) {
+		log_print(NET_POPUP, "Failed to get _SYSPOPUP_CONTENT_");
 		return 0;
 	}
 
-	log_print(NET_POPUP, "content = %s\n", mode);
+	secure_log_print(NET_POPUP, "_SYSPOPUP_CONTENT_ = %s\n", mode);
 
 	if (strcmp(mode, "connected") == 0) {
-		status_message_post(ALERT_STR_MOBILE_NETWORKS_CHARGE);
+		notification_status_message_post(ALERT_STR_MOBILE_NETWORKS_CHARGE);
 		log_print(NET_POPUP, "alert 3g\n");
 	} else if (strcmp(mode, "fail to connect") == 0) {
-		status_message_post(ALERT_STR_ERR_UNAVAILABLE);
+		notification_status_message_post(ALERT_STR_ERR_UNAVAILABLE);
 		log_print(NET_POPUP, "alert err\n");
 	} else if (strcmp(mode, "unable to connect") == 0) {
-		status_message_post(ALERT_STR_ERR_CONNECT);
+		notification_status_message_post(ALERT_STR_ERR_CONNECT);
 		log_print(NET_POPUP, "alert unable to connect\n");
+	} else if (strcmp(mode, "wrong password") == 0) {
+		notification_status_message_post(ALERT_STR_ERR_WRONG_PASSWORD);
+		log_print(NET_POPUP, "alert wrong password\n");
 	} else if (strcmp(mode, "not support") == 0) {
-		status_message_post(ALERT_STR_ERR_NOT_SUPPORT);
+		notification_status_message_post(ALERT_STR_ERR_NOT_SUPPORT);
 		log_print(NET_POPUP, "alert not support\n");
 	} else if (strcmp(mode, "wifi restricted") == 0) {
-		status_message_post(ALERT_STR_RESTRICTED_USE_WIFI);
+		notification_status_message_post(ALERT_STR_RESTRICTED_USE_WIFI);
 		log_print(NET_POPUP, "alert wifi restricted\n");
+	} else if (strcmp(mode, "no ap found") == 0) {
+		notification_status_message_post(ALERT_STR_NO_AP_FOUND);
+		log_print(NET_POPUP, "alert no ap found\n");
+	} else if (strcmp(mode, "Lengthy Password") == 0) {
+		notification_status_message_post(ALERT_STR_LENGHTY_PASSWORD);
+		log_print(NET_POPUP, "Password entered crosses 64 bytes\n");
+	} else if (strcmp(mode, "Portal Login") == 0) {
+		notification_status_message_post(CAPTIVE_PORTAL_LOGIN);
+		log_print(NET_POPUP, "Please login to access Internet\n");
+	} else if (strcmp(mode, "Portal Login Error") == 0) {
+		notification_status_message_post(CAPTIVE_PORTAL_LOGIN_ERROR);
+		log_print(NET_POPUP, "Login not completed. Disconnected Wifi\n");
 	} else if (strcmp(mode, "wifi connected") == 0) {
-		char buf[ALERT_STR_LEN_MAX] = "";
-		char *ap_name = (char *)bundle_get_val(b, "_AP_NAME_");
+		ret = app_control_get_extra_data(request, "_AP_NAME_", &ap_name);
+
+		if (APP_CONTROL_ERROR_NONE != ret) {
+			log_print(NET_POPUP, "Failed to get _AP_NAME_ ret = %d", ret);
+			g_free(mode);
+			return 0;
+		}
 
 		if (ap_name != NULL)
-			snprintf(buf, ALERT_STR_LEN_MAX, "%s  %s", ap_name, ALERT_STR_WIFI_CONNECTED);
+			g_snprintf(buf, ALERT_STR_LEN_MAX, ALERT_STR_WIFI_CONNECTED, ap_name);
 		else
-			snprintf(buf, ALERT_STR_LEN_MAX, "%s", ALERT_STR_WIFI_CONNECTED);
+			g_snprintf(buf, ALERT_STR_LEN_MAX, ALERT_STR_WIFI_CONNECTED, "");
 
-		status_message_post(buf);
+		notification_status_message_post(buf);
 
 		log_print(NET_POPUP, "alert wifi connected\n");
+		g_free(ap_name);
 	} else {
-		status_message_post(mode);
+		notification_status_message_post(mode);
 		log_print(NET_POPUP, "%s\n", mode);
 	}
+	g_free(mode);
 
 	return 0;
 }
 
-static int __net_popup_show_popup(bundle *b, void *data)
+static int _net_popup_send_user_resp(char *resp, Eina_Bool state)
+{
+	int ret = 0;
+	app_control_h reply = NULL;
+	char checkbox_str[USER_RESP_LEN] = { '\0', };
+
+	log_print(NET_POPUP, "Send the user response to the caller");
+	ret = app_control_create(&reply);
+	if (APP_CONTROL_ERROR_NONE != ret) {
+		log_print(NET_POPUP, "Failed to create service ret = %d", ret);
+		app_control_destroy(g_req_handle);
+		g_req_handle = NULL;
+
+		return false;
+	}
+
+	if (TRUE == state)
+		g_strlcpy(checkbox_str, "TRUE", USER_RESP_LEN);
+	else
+		g_strlcpy(checkbox_str, "FALSE", USER_RESP_LEN);
+
+	log_print(NET_POPUP, "Checkbox_str[%s]", checkbox_str);
+
+	ret = app_control_add_extra_data(reply, "_SYSPOPUP_RESP_", resp);
+	if (APP_CONTROL_ERROR_NONE == ret) {
+		ret = app_control_add_extra_data(reply, "_SYSPOPUP_CHECKBOX_RESP_",
+				checkbox_str);
+		if (APP_CONTROL_ERROR_NONE == ret) {
+			ret = app_control_reply_to_launch_request(reply, g_req_handle,
+					APP_CONTROL_RESULT_SUCCEEDED);
+			if (APP_CONTROL_ERROR_NONE == ret) {
+				log_print(NET_POPUP, "Service reply success");
+				ret = TRUE;
+			} else {
+				log_print(NET_POPUP, "Service reply failed ret = %d", ret);
+			}
+		} else {
+			log_print(NET_POPUP, "Service data addition failed ret = %d", ret);
+		}
+	} else {
+		log_print(NET_POPUP, "Service data addition failed ret = %d", ret);
+	}
+
+	app_control_destroy(reply);
+	app_control_destroy(g_req_handle);
+	g_req_handle = NULL;
+
+	return ret;
+}
+
+void _tethering_wifi_btn_yes_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	log_print(NET_POPUP, "_tethering_wifi_btn_yes_cb");
+
+	bool result = FALSE;
+	Evas_Object *popup = (Evas_Object *)data;
+
+	__net_popup_init_dbus();
+	__net_popup_send_dbus_msg("progress_off");
+	__net_popup_deinit_dbus();
+
+	result = _net_popup_send_user_resp(RESP_WIFI_TETHERING_OFF, FALSE);
+	if (true != result)
+		log_print(NET_POPUP, "Failed to send user response ");
+
+	if (popup)
+		evas_object_del(popup);
+
+	elm_exit();
+}
+
+void _tethering_wifi_ap_btn_yes_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	log_print(NET_POPUP, "_tethering_wifi_ap_btn_yes_cb");
+
+	bool result = FALSE;
+	Evas_Object *popup = (Evas_Object *)data;
+
+	__net_popup_init_dbus();
+	__net_popup_send_dbus_msg("progress_off");
+	__net_popup_deinit_dbus();
+
+	result = _net_popup_send_user_resp(RESP_WIFI_AP_TETHERING_OFF, FALSE);
+	if (true != result)
+		log_print(NET_POPUP, "Failed to send user response ");
+
+	if (popup)
+		evas_object_del(popup);
+
+	elm_exit();
+}
+
+void _btn_no_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	log_print(NET_POPUP, "_btn_no_cb");
+
+	bool result = FALSE;
+	Evas_Object *popup = (Evas_Object *)data;
+
+	result = _net_popup_send_user_resp(RESP_TETHERING_ON, FALSE);
+	if (true != result)
+		log_print(NET_POPUP, "Failed to send user response ");
+
+	if (popup)
+		evas_object_del(popup);
+
+	elm_exit();
+}
+
+static void __net_popup_show_popup_with_user_resp(app_control_h request,
+		void *data)
 {
 	Evas_Object *win;
 	Evas_Object *popup;
-	Evas_Object *button;
+	Evas_Object *layout;
+	Evas_Object *label;
+	Evas_Object *btn1;
+	Evas_Object *btn2;
+	int ret = 0;
+
+	ret = app_control_get_extra_data(request, "_SYSPOPUP_CONTENT_", &resp_popup_mode);
+	if (APP_CONTROL_ERROR_NONE != ret)
+		log_print(NET_POPUP, "Failed to get _SYSPOPUP_CONTENT_ ret = %d", ret);
+
+	secure_log_print(NET_POPUP, "_SYSPOPUP_CONTENT_ = %s\n", resp_popup_mode);
+
+	win = __net_popup_create_win();
+	evas_object_show(win);
+
+	popup = elm_popup_add(win);
+	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
+			EVAS_HINT_EXPAND);
+
+	if (g_strcmp0(resp_popup_mode, "TETHERING_TYPE_WIFI") == 0 ||
+			g_strcmp0(resp_popup_mode, "TETHERING_TYPE_WIFI_AP") == 0) {
+		log_print(NET_POPUP, "Drawing Wi-Fi Tethering OFF popup");
+
+		__net_popup_init_dbus();
+		elm_object_part_text_set(popup, "title,text", ALERT_STR_WIFI);
+
+		layout = elm_layout_add(popup);
+		elm_layout_file_set(layout, NETPOPUP_EDJ, "popup");
+		evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
+				EVAS_HINT_EXPAND);
+
+		__net_popup_send_dbus_msg("progress_on");
+		label = elm_label_add(popup);
+		elm_label_line_wrap_set(label, ELM_WRAP_MIXED);
+		elm_object_text_set(label, ALERT_STR_WIFI_MOBILE_AP_ON);
+		evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND,
+				EVAS_HINT_EXPAND);
+		evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+		evas_object_show(label);
+
+		elm_object_part_content_set(layout, "elm.swallow.content", label);
+		evas_object_show(layout);
+		elm_object_style_set(label, "popup/default");
+		eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, _btn_no_cb, popup);
+		elm_object_content_set(popup, label);
+
+		btn1 = elm_button_add(popup);
+		elm_object_style_set(btn1, "popup");
+		elm_object_text_set(btn1, ALERT_STR_CANCEL);
+		elm_object_part_content_set(popup, "button1", btn1);
+		evas_object_smart_callback_add(btn1, "clicked",
+					_btn_no_cb, popup);
+
+		btn2 = elm_button_add(popup);
+		elm_object_style_set(btn2, "popup");
+		elm_object_text_set(btn2, ALERT_STR_OK);
+		elm_object_part_content_set(popup, "button2", btn2);
+
+		if (g_strcmp0(resp_popup_mode, "TETHERING_TYPE_WIFI") == 0)
+			evas_object_smart_callback_add(btn2, "clicked",
+				_tethering_wifi_btn_yes_cb, popup);
+		else if (g_strcmp0(resp_popup_mode, "TETHERING_TYPE_WIFI_AP") == 0)
+			evas_object_smart_callback_add(btn2, "clicked",
+				_tethering_wifi_ap_btn_yes_cb, popup);
+
+		evas_object_show(popup);
+		evas_object_show(win);
+		__net_popup_deinit_dbus();
+	}
+}
 
-	const char* mode = bundle_get_val(b, "_SYSPOPUP_CONTENT_");
+static int __net_popup_show_popup(app_control_h request, void *data)
+{
+	Evas_Object *win;
+	Evas_Object *popup;
+	Evas_Object *button;
+	int ret = 0;
+	char *mode = NULL;
 
-	if (mode == NULL) {
+	ret = app_control_get_extra_data(request, "_SYSPOPUP_CONTENT_", &mode);
+	if (APP_CONTROL_ERROR_NONE != ret) {
+		log_print(NET_POPUP, "Failed to get _SYSPOPUP_CONTENT_ ret = %d", ret);
+		g_free(mode);
 		elm_exit();
 		return 0;
 	}
 
-	log_print(NET_POPUP, "content = %s\n", mode);
+	secure_log_print(NET_POPUP, "_SYSPOPUP_CONTENT_ = %s\n", mode);
 
-	win = elm_win_add(NULL, PACKAGE, ELM_WIN_BASIC);
-	elm_win_alpha_set(win, EINA_TRUE);
-	elm_win_borderless_set(win, EINA_TRUE);
+	win = __net_popup_create_win();
 
 	popup = elm_popup_add(win);
 	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -203,35 +692,46 @@ static int __net_popup_show_popup(bundle *b, void *data)
 	} else if (strcmp(mode, "unable to connect") == 0) {
 		elm_object_text_set(popup, ALERT_STR_ERR_CONNECT);
 		log_print(NET_POPUP, "alert unable to connect\n");
+	} else if (strcmp(mode, "wrong password") == 0) {
+		elm_object_text_set(popup, ALERT_STR_ERR_WRONG_PASSWORD);
+		log_print(NET_POPUP, "alert wrong password\n");
 	} else if (strcmp(mode, "not support") == 0) {
 		elm_object_text_set(popup, ALERT_STR_ERR_NOT_SUPPORT);
 		log_print(NET_POPUP, "alert not support\n");
 	} else if (strcmp(mode, "wifi restricted") == 0) {
 		elm_object_text_set(popup, ALERT_STR_RESTRICTED_USE_WIFI);
 		log_print(NET_POPUP, "alert wifi restricted\n");
+	} else if (strcmp(mode, "no ap found") == 0) {
+		elm_object_text_set(popup, ALERT_STR_NO_AP_FOUND);
+		log_print(NET_POPUP, "alert no ap found\n");
 	} else if (strcmp(mode, "wifi connected") == 0) {
 		char buf[ALERT_STR_LEN_MAX] = "";
-		char *ap_name = (char *)bundle_get_val(b, "_AP_NAME_");
+		char *ap_name = NULL;
+
+		ret = app_control_get_extra_data(request, "_AP_NAME_", &ap_name);
 
 		if (ap_name != NULL)
-			snprintf(buf, ALERT_STR_LEN_MAX, "%s  %s", ap_name, ALERT_STR_WIFI_CONNECTED);
+			g_snprintf(buf, ALERT_STR_LEN_MAX, ALERT_STR_WIFI_CONNECTED, ap_name);
 		else
-			snprintf(buf, ALERT_STR_LEN_MAX, "%s", ALERT_STR_WIFI_CONNECTED);
+			g_snprintf(buf, ALERT_STR_LEN_MAX, ALERT_STR_WIFI_CONNECTED, "");
 
 		elm_object_text_set(popup, buf);
 
 		log_print(NET_POPUP, "alert wifi connected\n");
+		g_free(ap_name);
 	} else {
 		elm_object_text_set(popup, mode);
 		log_print(NET_POPUP, "%s\n", mode);
 	}
 
 	button = elm_button_add(popup);
-	elm_object_text_set(button, "OK");
+	elm_object_style_set(button, "popup");
+	elm_object_text_set(button, ALERT_STR_OK);
 	elm_object_part_content_set(popup, "button1", button);
 	evas_object_smart_callback_add(button, "clicked", _ok_button_clicked_cb, popup);
 	evas_object_show(popup);
 	evas_object_show(win);
+	g_free(mode);
 
 	return 0;
 }
@@ -244,7 +744,7 @@ static void __net_popup_add_found_ap_noti(void)
 	notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
 	bundle *b = NULL;
 
-	notification_get_detail_list("org.tizen.net-popup", NOTIFICATION_GROUP_ID_NONE,
+	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);
@@ -254,33 +754,33 @@ static void __net_popup_add_found_ap_noti(void)
 	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");
+		log_print(NET_POPUP, "Failed to create notification");
 		return;
 	}
 
 	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);
+		log_print(NET_POPUP, "Failed to notification_set_time : %d", noti_err);
 		goto error;
 	}
 
 	noti_err = notification_set_image(noti, NOTIFICATION_IMAGE_TYPE_ICON,
-			NETCONFIG_NOTIFICATION_WIFI_ICON);
+			QP_PRELOAD_NOTI_ICON_PATH"/noti_wifi_in_range.png");
 	if(noti_err != NOTIFICATION_ERROR_NONE) {
-		log_print(NET_POPUP, "fail to notification_set_image : %d", noti_err);
+		log_print(NET_POPUP, "Failed to notification_set_image : %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);
+		log_print(NET_POPUP, "Failed 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);
+		log_print(NET_POPUP, "Failed to notification_set_text_domain : %d", noti_err);
 		goto error;
 	}
 
@@ -289,41 +789,41 @@ static void __net_popup_add_found_ap_noti(void)
 			"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);
+		log_print(NET_POPUP, "Failed to notification_set_title : %d", noti_err);
 		goto error;
 	}
 
 	noti_err = notification_set_text(noti, NOTIFICATION_TEXT_TYPE_CONTENT,
 			NETCONFIG_NOTIFICATION_WIFI_FOUND_CONTENT,
-			"IDS_WIFI_BODY_OPEN_WI_FI_SETTINGS_ABB",
+			"IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT",
 			NOTIFICATION_VARIABLE_TYPE_NONE);
 	if (noti_err != NOTIFICATION_ERROR_NONE) {
-		log_print(NET_POPUP, "fail to notification_set_content : %d", noti_err);
+		log_print(NET_POPUP, "Failed to notification_set_content: %d", noti_err);
 		goto error;
 	}
 
-	noti_flags = NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY;
+	noti_flags = NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY | NOTIFICATION_DISPLAY_APP_INDICATOR;
 	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);
+		log_print(NET_POPUP, "Failed to notification_set_display_applist: %d", noti_err);
 		goto error;
 	}
 
 	b = bundle_create();
-	bundle_add(b, "_INTERNAL_SYSPOPUP_NAME_", "wifi-qs");
+	bundle_add(b, "caller", "notification");
 
 	appsvc_set_pkgname(b, "net.wifi-qs");
 
 	noti_err = notification_set_execute_option(noti,
 			NOTIFICATION_EXECUTE_TYPE_SINGLE_LAUNCH, "Launch", NULL, b);
 	if (noti_err != NOTIFICATION_ERROR_NONE) {
-		log_print(NET_POPUP, "fail to notification_set_execute_option");
+		log_print(NET_POPUP, "Failed to notification_set_execute_option");
 		goto error;
 	}
 
 	noti_err = notification_insert(noti, NULL);
 	if (noti_err != NOTIFICATION_ERROR_NONE) {
-		log_print(NET_POPUP, "fail to notification_insert");
+		log_print(NET_POPUP, "Failed to insert notification");
 		goto error;
 	}
 
@@ -341,7 +841,7 @@ 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",
+	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");
@@ -351,73 +851,78 @@ static void __net_popup_del_found_ap_noti(void)
 	log_print(NET_POPUP, "Successfully deleted notification");
 }
 
-static void __net_popup_add_manual_network_fail_noti(bundle *b)
+static void __net_popup_add_portal_noti(app_control_h request)
 {
+	int ret = 0;
 	int noti_flags = 0;
+	bundle *b = NULL;
+	char *ap_name = NULL;
 	notification_h noti = NULL;
+	app_control_h service_handle = 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;
-	}
+	ret = app_control_get_extra_data(request, "_AP_NAME_", &ap_name);
 
-	type = bundle_get_val(b, "_SYSPOPUP_NETWORK_NAME_");
-	if (!type) {
-		log_print(NET_POPUP, "failed, type=%p", type);
+	if (ap_name == NULL || ret != APP_CONTROL_ERROR_NONE) {
+		log_print(NET_POPUP, "Failed to retrieve connected AP name!!");
+		g_free(ap_name);
 		return;
 	}
 
-	buf = g_strdup_printf(tmp, type);
-	if (!buf) {
-		log_print(NET_POPUP, "failed, buf=%p", buf);
-		return;
-	}
-
-	/* Tickernoti */
-	status_message_post(buf);
+	log_print(NET_POPUP, "Successfully added notification");
 
-	notification_get_detail_list("setting-network-efl",
-			NOTIFICATION_GROUP_ID_NONE,
+	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);
-		__net_popup_del_manual_network_fail_noti();
+		g_free(ap_name);
+		return;
 	}
 
-	noti = notification_new(NOTIFICATION_TYPE_ONGOING,
-			NOTIFICATION_GROUP_ID_NONE,
+	noti = notification_new(NOTIFICATION_TYPE_NOTI, NOTIFICATION_GROUP_ID_NONE,
 			NOTIFICATION_PRIV_ID_NONE);
 	if (noti == NULL) {
 		log_print(NET_POPUP, "fail to create notification");
-		goto error;
+		g_free(ap_name);
+		return;
 	}
 
-	noti_err = notification_set_pkgname(noti, "setting-network-efl");
+	noti_err = notification_set_time(noti, time(NULL));
 	if(noti_err != NOTIFICATION_ERROR_NONE) {
-		log_print(NET_POPUP, "fail to notification_set_pkgname : %d", noti_err);
+		log_print(NET_POPUP, "fail to notification_set_time : %d", noti_err);
 		goto error;
 	}
 
-	noti_err = notification_set_time(noti, time(NULL));
+	noti_err = notification_set_image(noti, NOTIFICATION_IMAGE_TYPE_ICON,
+			NETCONFIG_NOTIFICATION_WIFI_ICON);
 	if(noti_err != NOTIFICATION_ERROR_NONE) {
-		log_print(NET_POPUP, "fail to notification_set_time : %d", noti_err);
+		log_print(NET_POPUP, "fail to notification_set_image : %d", noti_err);
 		goto error;
 	}
 
-	noti_err = notification_set_layout(noti, NOTIFICATION_LY_ONGOING_EVENT);
+	noti_err = notification_set_image(noti, NOTIFICATION_IMAGE_TYPE_ICON,
+			QP_PRELOAD_NOTI_ICON_PATH"/noti_wifi_in_range.png");
 	if(noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_set_image : %d", noti_err);
+		goto error;
+	}
+	noti_err = notification_set_layout(noti, NOTIFICATION_LY_NOTI_EVENT_MULTIPLE);
+	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_MANUAL_NETWORK_FAIL_NO_SERVICE,
-			NULL,
+			NETCONFIG_NOTIFICATION_WIFI_PORTAL_TITLE,
+			"IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB",
 			NOTIFICATION_VARIABLE_TYPE_NONE);
 	if (noti_err != NOTIFICATION_ERROR_NONE) {
 		log_print(NET_POPUP, "fail to notification_set_title : %d", noti_err);
@@ -425,109 +930,43 @@ static void __net_popup_add_manual_network_fail_noti(bundle *b)
 	}
 
 	noti_err = notification_set_text(noti, NOTIFICATION_TEXT_TYPE_CONTENT,
-			buf, NULL,
+			NETCONFIG_NOTIFICATION_WIFI_PORTAL_CONTENT,
+			NETCONFIG_NOTIFICATION_WIFI_PORTAL_CONTENT,
+			NOTIFICATION_VARIABLE_TYPE_STRING, ap_name,
 			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_flags = NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY | NOTIFICATION_DISPLAY_APP_INDICATOR;
 	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;
-	}
-
-	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");
+		log_print(NET_POPUP, "fail to notification_set_display_applist : %d", noti_err);
 		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);
+	ret = app_control_create(&service_handle);
+	log_print(NET_POPUP, "service create ret[%d]", ret);
+	if(ret != APP_CONTROL_ERROR_NONE)
 		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);
+	ret = app_control_set_operation(service_handle, APP_CONTROL_OPERATION_VIEW);
+	if(ret != APP_CONTROL_ERROR_NONE)
 		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;
-	}
+	log_print(NET_POPUP, "service set operation is successful");
 
-	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;
-	}
+	ret = app_control_set_uri(service_handle, "http://www.google.com");
 
-	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);
+	app_control_to_bundle (service_handle, &b);
+	if(ret != APP_CONTROL_ERROR_NONE)
 		goto error;
-	}
 
-	noti_err = notification_set_display_applist(noti,
-			NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY);
+	noti_err = notification_set_execute_option(noti,
+			NOTIFICATION_EXECUTE_TYPE_SINGLE_LAUNCH, "Launch", NULL, b);
 	if (noti_err != NOTIFICATION_ERROR_NONE) {
-		log_print(NET_POPUP, "fail to notification_set_display_applist : %d",
-				noti_err);
+		log_print(NET_POPUP, "fail to notification_set_execute_option");
 		goto error;
 	}
 
@@ -540,66 +979,37 @@ static void __net_popup_add_restricted_state_noti_real (const char *pkgname,
 	log_print(NET_POPUP, "Successfully added notification");
 
 error:
+	g_free(ap_name);
 	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 (
-				"org.tizen.net-popup.restricted_state_cs", text_cs);
-
-	text_ps = bundle_get_val(b, "_SYSPOPUP_NETWORK_NAME2_");
-	if (text_ps)
-		__net_popup_add_restricted_state_noti_real (
-				"org.tizen.net-popup.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);
+	if (service_handle != NULL)
+		app_control_destroy(service_handle);
 }
 
-static void __net_popup_del_restricted_state_noti(void)
+static void __net_popup_del_portal_noti(void)
 {
 	notification_error_e noti_err = NOTIFICATION_ERROR_NONE;
 
-	noti_err = notification_delete_all_by_type("org.tizen.net-popup.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", NOTIFICATION_TYPE_NOTI);
+	if (noti_err != NOTIFICATION_ERROR_NONE) {
+		log_print(NET_POPUP, "fail to notification_delete_all_by_type");
+		return;
+	}
 
-	noti_err = notification_delete_all_by_type("org.tizen.net-popup.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");
+	log_print(NET_POPUP, "Successfully deleted notification");
 }
 
-int main(int argc, char *argv[])
+EXPORT_API int main(int argc, char *argv[])
 {
-	struct appcore_ops ops = {
+	ui_app_lifecycle_callback_s app_callback = {
 		.create = __net_popup_create,
 		.terminate = __net_popup_terminate,
 		.pause = __net_popup_pause,
 		.resume = __net_popup_resume,
-		.reset = __net_popup_reset,
+		.app_control = __net_popup_service_cb,
 	};
 
-	return appcore_efl_main(PACKAGE, &argc, &argv, &ops);
+	return ui_app_main(argc, argv, &app_callback, NULL);
 }