tizen 2.3 release tizen_2.3 submit/tizen_2.3/20150202.053406 tizen_2.3_release
authorjk7744.park <jk7744.park@samsung.com>
Sun, 1 Feb 2015 04:04:19 +0000 (13:04 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Sun, 1 Feb 2015 04:04:19 +0000 (13:04 +0900)
135 files changed:
CMakeLists.txt
LICENSE [new file with mode: 0755]
LICENSE.Flora [deleted file]
NOTICE
com.samsung.my-account_ChangeableColorInfo.xml [new file with mode: 0644]
com.samsung.my-account_ChangeableFontInfo.xml [new file with mode: 0644]
data/edc/CMakeLists.txt
data/edc/inc.Addaccount.edc [deleted file]
data/edc/inc.add-sns-account.edc [deleted file]
data/edc/inc.myaccount_contact_sync.edc [deleted file]
data/edc/inc.myaccount_email_datarange.edc [deleted file]
data/edc/inc.myaccount_peak_time.edc [deleted file]
data/edc/inc.myaccount_sns_sync_interval.edc [deleted file]
data/edc/inc.myaccount_sync_settings_with_seven.edc [deleted file]
data/edc/inc.myaccount_view_priority.edc [deleted file]
data/edc/inc.myaccount_without_seven.edc [deleted file]
data/edc/inc.pre-set.edc [deleted file]
data/edc/inc.preset_email.edc [deleted file]
data/edc/inc.sns-account.edc [deleted file]
data/edc/myaccount.edc
data/edc/myaccount_button.edc [deleted file]
data/edc/myaccount_edc_images.edc
data/edc/myaccount_nocontent.edc [new file with mode: 0755]
data/myaccount_photo/00_list_bar_press_1x80.png [deleted file]
data/myaccount_photo/01_samsungaccount.png [deleted file]
data/myaccount_photo/66_myaccount_icon_facebook_50x50.png [deleted file]
data/myaccount_photo/66_myaccount_icon_google_50x50.png [deleted file]
data/myaccount_photo/66_myaccount_icon_msn_50x50.png [deleted file]
data/myaccount_photo/66_myaccount_icon_push.png [deleted file]
data/myaccount_photo/66_myaccount_icon_push_deactivated.png [deleted file]
data/myaccount_photo/66_myaccount_icon_push_press.png [deleted file]
data/myaccount_photo/66_myaccount_icon_twitter_50x50.png [deleted file]
data/myaccount_photo/66_myaccount_icon_windows_live_50x50.png [deleted file]
data/myaccount_photo/66_myaccount_icon_yahoo_50x50.png [deleted file]
data/myaccount_photo/99_email.png [deleted file]
data/myaccount_photo/A01_2_Icon_default.png
data/myaccount_photo/A01_2_Icon_others.png [deleted file]
data/myaccount_photo/account_icon_syncing.png [new file with mode: 0644]
data/myaccount_photo/cancel_sync.png [deleted file]
data/myaccount_photo/exchange.png [deleted file]
data/myaccount_photo/facebook.png [deleted file]
data/myaccount_photo/flickr.png [deleted file]
data/myaccount_photo/gmail.png [deleted file]
data/myaccount_photo/icq.png [deleted file]
data/myaccount_photo/myaccount_bg.png [deleted file]
data/myaccount_photo/myspace.png [deleted file]
data/myaccount_photo/picasa.png [deleted file]
data/myaccount_photo/refresh.png [deleted file]
data/myaccount_photo/tw3_list_select.png [deleted file]
data/myaccount_photo/twitter.png [deleted file]
data/myaccount_photo/youtube.png [deleted file]
icon_myaccount.png [deleted file]
include/myaccount_ug.h
include/myaccount_ug_account_list.h [changed mode: 0755->0644]
include/myaccount_ug_addaccount.h
include/myaccount_ug_common.h
include/myaccount_ug_main.h
packaging/my-account.spec
po/CMakeLists.txt
po/GT-I7800_Accounts_Strings.csv [deleted file]
po/POTFILES.in [deleted file]
po/ar.po [changed mode: 0755->0644]
po/az.po [changed mode: 0755->0644]
po/bg.po [changed mode: 0755->0644]
po/ca.po [changed mode: 0755->0644]
po/cs.po [changed mode: 0755->0644]
po/csv2po_v2 [deleted file]
po/csv_to_po.py [deleted file]
po/da.po [changed mode: 0755->0644]
po/de.po [new file with mode: 0644]
po/de_DE.po [deleted file]
po/el_GR.po [changed mode: 0755->0644]
po/en.po [changed mode: 0755->0644]
po/en_PH.po [changed mode: 0755->0644]
po/en_US.csv [deleted file]
po/en_US.po [changed mode: 0755->0644]
po/es_ES.po [changed mode: 0755->0644]
po/es_MX.po [deleted file]
po/es_US.po [new file with mode: 0644]
po/et.po [changed mode: 0755->0644]
po/eu.po [changed mode: 0755->0644]
po/fi.po [changed mode: 0755->0644]
po/fr.po [new file with mode: 0644]
po/fr_CA.po [changed mode: 0755->0644]
po/fr_FR.po [deleted file]
po/ga.po [changed mode: 0755->0644]
po/gl.po [changed mode: 0755->0644]
po/he.po [deleted file]
po/hi.po [changed mode: 0755->0644]
po/hr.po [changed mode: 0755->0644]
po/hu.po [changed mode: 0755->0644]
po/hy.po [changed mode: 0755->0644]
po/id.po [deleted file]
po/is.po [changed mode: 0755->0644]
po/it_IT.po [changed mode: 0755->0644]
po/ja_JP.po [changed mode: 0755->0644]
po/ka.po [changed mode: 0755->0644]
po/kk.po [changed mode: 0755->0644]
po/ko_KR.csv [deleted file]
po/ko_KR.po [changed mode: 0755->0644]
po/lt.po [changed mode: 0755->0644]
po/lv.po [changed mode: 0755->0644]
po/mk.po [changed mode: 0755->0644]
po/ms.po [deleted file]
po/myaccount_ui.pot [deleted file]
po/nb.po [changed mode: 0755->0644]
po/nl.po [new file with mode: 0644]
po/nl_NL.po [deleted file]
po/no.po [deleted file]
po/pl.po [changed mode: 0755->0644]
po/po_to_csv.py [deleted file]
po/pt_BR.po [changed mode: 0755->0644]
po/pt_PT.po [changed mode: 0755->0644]
po/ro.po [changed mode: 0755->0644]
po/ru_RU.po [changed mode: 0755->0644]
po/sk.po [changed mode: 0755->0644]
po/sl.po [changed mode: 0755->0644]
po/sr.po [changed mode: 0755->0644]
po/sv.po [changed mode: 0755->0644]
po/th.po [deleted file]
po/tr_TR.po [changed mode: 0755->0644]
po/uk.po [changed mode: 0755->0644]
po/update-po.sh [deleted file]
po/uz.po [changed mode: 0755->0644]
po/vi.po [deleted file]
po/zh_CN.po [changed mode: 0755->0644]
po/zh_HK.po [changed mode: 0755->0644]
po/zh_SG.po [deleted file]
po/zh_TW.po [changed mode: 0755->0644]
setting-myaccount-efl.xml
src/myaccount_ug_account_list.c
src/myaccount_ug_addaccount.c
src/myaccount_ug_common.c
src/myaccount_ug_main.c
ug.setting-myaccount-efl.include [deleted file]

index f8c2d53..4f697a6 100755 (executable)
@@ -1,5 +1,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(ug-setting-myaccount-efl C)
+PROJECT(setting-myaccount-efl C)
+
+SET(APPDIR /usr/apps/setting-myaccount-efl)
+SET(LIBDIR ${APPDIR}/lib/ug)
+SET(BINDIR ${APPDIR}/bin)
+SET(RESDIR ${APPDIR}/res)
+SET(DATADIR ${APPDIR}/shared/trusted)
+
+
 
 SET(ACCOUNT_LIST_UG_SRCS
 src/myaccount_ug_main.c
@@ -17,16 +25,37 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(/usr/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED elementary appcore-efl ui-gadget-1 accounts-svc evas capi-appfw-application capi-appfw-app-manager vconf pkgmgr capi-system-system-settings iniparser)
+pkg_check_modules(pkgs REQUIRED
+       elementary
+       appcore-efl
+       ui-gadget-1
+       accounts-svc
+       evas
+       capi-appfw-application
+       capi-appfw-app-manager
+       vconf
+       pkgmgr
+       capi-system-system-settings
+       iniparser
+       efl-assist
+#      notification
+)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Werror -fpie")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fpie")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
 
+#Build time feature
+IF( _MULTI_WINDOW_ENABLE_ )
+        ADD_DEFINITIONS("-D_MULTI_WINDOW_ENABLE_")
+        SET(EDJE_CC_DEFINES "-D_MULTI_WINDOW_ENABLE_")
+ENDIF()
+
+
 FIND_PROGRAM(UNAME NAMES uname)
 EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
 IF("${ARCH}" STREQUAL "arm")
@@ -37,6 +66,10 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-D_A_PROJECT_")
 
+IF(_FEATURE_SMEMO_ENABLE)
+ADD_DEFINITIONS(-D_FEATURE_SMEMO_ENABLE)
+ENDIF(_FEATURE_SMEMO_ENABLE)
+
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${ACCOUNT_LIST_UG_SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.0.1)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} accounts-svc)
@@ -48,12 +81,7 @@ ADD_CUSTOM_TARGET(myaccount.edj
 )
 ADD_DEPENDENCIES(${PROJECT_NAME} myaccount.edj)
 
-ADD_CUSTOM_TARGET(myaccount_button.edj
-               COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/data/myaccount_photo
-               ${CMAKE_SOURCE_DIR}/data/edc/myaccount_button.edc ${CMAKE_BINARY_DIR}/myaccount_button.edj
-               DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount_button.edc
-)
-ADD_DEPENDENCIES(${PROJECT_NAME} myaccount_button.edj)
+SET(COLORTABLEDIR "${CMAKE_BINARY_DIR}/")
 
 ADD_CUSTOM_TARGET(myaccount_edc_images.edj
                COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/myaccount_photo
@@ -64,19 +92,12 @@ ADD_DEPENDENCIES(${PROJECT_NAME} myaccount_edc_images.edj)
 
 INSTALL(FILES ${CMAKE_BINARY_DIR}/setting-myaccount-efl.xml DESTINATION /usr/share/packages)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount.edj DESTINATION /usr/ug/res/edje/${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount_edc_images.edj DESTINATION /usr/ug/res/edje/${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount_button.edj DESTINATION /usr/ug/res/edje/${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_BINARY_DIR}/ug.setting-myaccount-efl.include DESTINATION /etc/smack/accesses2.d)
-
-#installing images
-
-#INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/myaccount_photo/ DESTINATION /usr/ug/res/images/${PROJECT_NAME} PATTERN
-#"*.png" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE
-#WORLD_EXECUTE)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
+INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount.edj DESTINATION ${RESDIR}/edje/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount_edc_images.edj DESTINATION ${RESDIR}/edje/${PROJECT_NAME})
+INSTALL(FILES
+${CMAKE_SOURCE_DIR}/com.samsung.my-account_ChangeableColorInfo.xml DESTINATION ${RESDIR}/ug-setting-cloud/shared/res/tables)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.my-account_ChangeableFontInfo.xml DESTINATION ${RESDIR}/ug-setting-cloud/setting-cloud/shared/res/tables)
 
 # i18n
 ADD_SUBDIRECTORY(po)
-
-
diff --git a/LICENSE b/LICENSE
new file mode 100755 (executable)
index 0000000..bbe9d02
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,206 @@
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
+\r
+                                 Apache License\r
+                           Version 2.0, January 2004\r
+                        http://www.apache.org/licenses/\r
+\r
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\r
+\r
+   1. Definitions.\r
+\r
+      "License" shall mean the terms and conditions for use, reproduction,\r
+      and distribution as defined by Sections 1 through 9 of this document.\r
+\r
+      "Licensor" shall mean the copyright owner or entity authorized by\r
+      the copyright owner that is granting the License.\r
+\r
+      "Legal Entity" shall mean the union of the acting entity and all\r
+      other entities that control, are controlled by, or are under common\r
+      control with that entity. For the purposes of this definition,\r
+      "control" means (i) the power, direct or indirect, to cause the\r
+      direction or management of such entity, whether by contract or\r
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the\r
+      outstanding shares, or (iii) beneficial ownership of such entity.\r
+\r
+      "You" (or "Your") shall mean an individual or Legal Entity\r
+      exercising permissions granted by this License.\r
+\r
+      "Source" form shall mean the preferred form for making modifications,\r
+      including but not limited to software source code, documentation\r
+      source, and configuration files.\r
+\r
+      "Object" form shall mean any form resulting from mechanical\r
+      transformation or translation of a Source form, including but\r
+      not limited to compiled object code, generated documentation,\r
+      and conversions to other media types.\r
+\r
+      "Work" shall mean the work of authorship, whether in Source or\r
+      Object form, made available under the License, as indicated by a\r
+      copyright notice that is included in or attached to the work\r
+      (an example is provided in the Appendix below).\r
+\r
+      "Derivative Works" shall mean any work, whether in Source or Object\r
+      form, that is based on (or derived from) the Work and for which the\r
+      editorial revisions, annotations, elaborations, or other modifications\r
+      represent, as a whole, an original work of authorship. For the purposes\r
+      of this License, Derivative Works shall not include works that remain\r
+      separable from, or merely link (or bind by name) to the interfaces of,\r
+      the Work and Derivative Works thereof.\r
+\r
+      "Contribution" shall mean any work of authorship, including\r
+      the original version of the Work and any modifications or additions\r
+      to that Work or Derivative Works thereof, that is intentionally\r
+      submitted to Licensor for inclusion in the Work by the copyright owner\r
+      or by an individual or Legal Entity authorized to submit on behalf of\r
+      the copyright owner. For the purposes of this definition, "submitted"\r
+      means any form of electronic, verbal, or written communication sent\r
+      to the Licensor or its representatives, including but not limited to\r
+      communication on electronic mailing lists, source code control systems,\r
+      and issue tracking systems that are managed by, or on behalf of, the\r
+      Licensor for the purpose of discussing and improving the Work, but\r
+      excluding communication that is conspicuously marked or otherwise\r
+      designated in writing by the copyright owner as "Not a Contribution."\r
+\r
+      "Contributor" shall mean Licensor and any individual or Legal Entity\r
+      on behalf of whom a Contribution has been received by Licensor and\r
+      subsequently incorporated within the Work.\r
+\r
+   2. Grant of Copyright License. Subject to the terms and conditions of\r
+      this License, each Contributor hereby grants to You a perpetual,\r
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
+      copyright license to reproduce, prepare Derivative Works of,\r
+      publicly display, publicly perform, sublicense, and distribute the\r
+      Work and such Derivative Works in Source or Object form.\r
+\r
+   3. Grant of Patent License. Subject to the terms and conditions of\r
+      this License, each Contributor hereby grants to You a perpetual,\r
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
+      (except as stated in this section) patent license to make, have made,\r
+      use, offer to sell, sell, import, and otherwise transfer the Work,\r
+      where such license applies only to those patent claims licensable\r
+      by such Contributor that are necessarily infringed by their\r
+      Contribution(s) alone or by combination of their Contribution(s)\r
+      with the Work to which such Contribution(s) was submitted. If You\r
+      institute patent litigation against any entity (including a\r
+      cross-claim or counterclaim in a lawsuit) alleging that the Work\r
+      or a Contribution incorporated within the Work constitutes direct\r
+      or contributory patent infringement, then any patent licenses\r
+      granted to You under this License for that Work shall terminate\r
+      as of the date such litigation is filed.\r
+\r
+   4. Redistribution. You may reproduce and distribute copies of the\r
+      Work or Derivative Works thereof in any medium, with or without\r
+      modifications, and in Source or Object form, provided that You\r
+      meet the following conditions:\r
+\r
+      (a) You must give any other recipients of the Work or\r
+          Derivative Works a copy of this License; and\r
+\r
+      (b) You must cause any modified files to carry prominent notices\r
+          stating that You changed the files; and\r
+\r
+      (c) You must retain, in the Source form of any Derivative Works\r
+          that You distribute, all copyright, patent, trademark, and\r
+          attribution notices from the Source form of the Work,\r
+          excluding those notices that do not pertain to any part of\r
+          the Derivative Works; and\r
+\r
+      (d) If the Work includes a "NOTICE" text file as part of its\r
+          distribution, then any Derivative Works that You distribute must\r
+          include a readable copy of the attribution notices contained\r
+          within such NOTICE file, excluding those notices that do not\r
+          pertain to any part of the Derivative Works, in at least one\r
+          of the following places: within a NOTICE text file distributed\r
+          as part of the Derivative Works; within the Source form or\r
+          documentation, if provided along with the Derivative Works; or,\r
+          within a display generated by the Derivative Works, if and\r
+          wherever such third-party notices normally appear. The contents\r
+          of the NOTICE file are for informational purposes only and\r
+          do not modify the License. You may add Your own attribution\r
+          notices within Derivative Works that You distribute, alongside\r
+          or as an addendum to the NOTICE text from the Work, provided\r
+          that such additional attribution notices cannot be construed\r
+          as modifying the License.\r
+\r
+      You may add Your own copyright statement to Your modifications and\r
+      may provide additional or different license terms and conditions\r
+      for use, reproduction, or distribution of Your modifications, or\r
+      for any such Derivative Works as a whole, provided Your use,\r
+      reproduction, and distribution of the Work otherwise complies with\r
+      the conditions stated in this License.\r
+\r
+   5. Submission of Contributions. Unless You explicitly state otherwise,\r
+      any Contribution intentionally submitted for inclusion in the Work\r
+      by You to the Licensor shall be under the terms and conditions of\r
+      this License, without any additional terms or conditions.\r
+      Notwithstanding the above, nothing herein shall supersede or modify\r
+      the terms of any separate license agreement you may have executed\r
+      with Licensor regarding such Contributions.\r
+\r
+   6. Trademarks. This License does not grant permission to use the trade\r
+      names, trademarks, service marks, or product names of the Licensor,\r
+      except as required for reasonable and customary use in describing the\r
+      origin of the Work and reproducing the content of the NOTICE file.\r
+\r
+   7. Disclaimer of Warranty. Unless required by applicable law or\r
+      agreed to in writing, Licensor provides the Work (and each\r
+      Contributor provides its Contributions) on an "AS IS" BASIS,\r
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+      implied, including, without limitation, any warranties or conditions\r
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\r
+      PARTICULAR PURPOSE. You are solely responsible for determining the\r
+      appropriateness of using or redistributing the Work and assume any\r
+      risks associated with Your exercise of permissions under this License.\r
+\r
+   8. Limitation of Liability. In no event and under no legal theory,\r
+      whether in tort (including negligence), contract, or otherwise,\r
+      unless required by applicable law (such as deliberate and grossly\r
+      negligent acts) or agreed to in writing, shall any Contributor be\r
+      liable to You for damages, including any direct, indirect, special,\r
+      incidental, or consequential damages of any character arising as a\r
+      result of this License or out of the use or inability to use the\r
+      Work (including but not limited to damages for loss of goodwill,\r
+      work stoppage, computer failure or malfunction, or any and all\r
+      other commercial damages or losses), even if such Contributor\r
+      has been advised of the possibility of such damages.\r
+\r
+   9. Accepting Warranty or Additional Liability. While redistributing\r
+      the Work or Derivative Works thereof, You may choose to offer,\r
+      and charge a fee for, acceptance of support, warranty, indemnity,\r
+      or other liability obligations and/or rights consistent with this\r
+      License. However, in accepting such obligations, You may act only\r
+      on Your own behalf and on Your sole responsibility, not on behalf\r
+      of any other Contributor, and only if You agree to indemnify,\r
+      defend, and hold each Contributor harmless for any liability\r
+      incurred by, or claims asserted against, such Contributor by reason\r
+      of your accepting any such warranty or additional liability.\r
+\r
+   END OF TERMS AND CONDITIONS\r
+\r
+   APPENDIX: How to apply the Apache License to your work.\r
+\r
+      To apply the Apache License to your work, attach the following\r
+      boilerplate notice, with the fields enclosed by brackets "[]"\r
+      replaced with your own identifying information. (Don't include\r
+      the brackets!)  The text should be enclosed in the appropriate\r
+      comment syntax for the file format. We also recommend that a\r
+      file or class name and description of purpose be included on the\r
+      same "printed page" as the copyright notice for easier\r
+      identification within third-party archives.\r
+\r
+   Copyright [yyyy] [name of copyright owner]\r
+\r
+   Licensed under the Apache License, Version 2.0 (the "License");\r
+   you may not use this file except in compliance with the License.\r
+   You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+\r
+\r
+\r
diff --git a/LICENSE.Flora b/LICENSE.Flora
deleted file mode 100755 (executable)
index 571fe79..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-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/NOTICE b/NOTICE
index 94d56df..ded3804 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1 @@
-Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.1
-Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
\ No newline at end of file
diff --git a/com.samsung.my-account_ChangeableColorInfo.xml b/com.samsung.my-account_ChangeableColorInfo.xml
new file mode 100644 (file)
index 0000000..6c08f15
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ChangeableColorTable>
+       <Theme style="Dark">
+               <ChangeableColorInfo id="AO001E01" inputColor="" hue="212" saturation="59" value="91" alpha="100" />
+               <ChangeableColorInfo id="AO001E02" inputColor="" hue="0" saturation="0" value="63" alpha="100" />
+               <ChangeableColorInfo id="AO001E03" inputColor="" hue="0" saturation="0" value="96" alpha="100" />
+               <ChangeableColorInfo id="AO001" inputColor="1" hue="0" saturation="0" value="0" alpha="100" />
+       </Theme>
+       <Theme style="Light">
+               <ChangeableColorInfo id="AO001E01" inputColor="" hue="212" saturation="59" value="91" alpha="100" />
+               <ChangeableColorInfo id="AO001E02" inputColor="" hue="0" saturation="0" value="63" alpha="100" />
+               <ChangeableColorInfo id="AO001E03" inputColor="" hue="0" saturation="0" value="96" alpha="100" />
+               <ChangeableColorInfo id="AO001" inputColor="1" hue="0" saturation="0" value="0" alpha="100" />
+       </Theme>
+</ChangeableColorTable>
diff --git a/com.samsung.my-account_ChangeableFontInfo.xml b/com.samsung.my-account_ChangeableFontInfo.xml
new file mode 100644 (file)
index 0000000..8e2e636
--- /dev/null
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FontInfoTable>
+       <FontInfo id="ATO001" style="R" size="32"/>
+</FontInfoTable>
index fd2bc4f..5091783 100755 (executable)
@@ -4,19 +4,19 @@ ADD_CUSTOM_TARGET(myaccount.edj
                DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount.edc\r
 )\r
 \r
-ADD_CUSTOM_TARGET(myaccount_button.edj\r
-               COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/edc\r
-               ${CMAKE_SOURCE_DIR}/data/edc/myaccount_button.edc ${CMAKE_BINARY_DIR}/data/edc/myaccount_button.edj\r
-               DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount_button.edc\r
-)\r
-\r
 ADD_CUSTOM_TARGET(myaccount_edc_images.edj\r
                COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/edc\r
                ${CMAKE_SOURCE_DIR}/data/edc/myaccount_edc_images.edc ${CMAKE_BINARY_DIR}/data/edc/myaccount_edc_images.edj\r
                DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount_edc_images.edc\r
 )\r
 \r
+ADD_CUSTOM_TARGET(myaccount_nocontent.edj\r
+               COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/edc\r
+               ${CMAKE_SOURCE_DIR}/data/edc/myaccount_edc_images.edc ${CMAKE_BINARY_DIR}/data/edc/myaccount_nocontent.edj\r
+               DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount_nocontent.edc\r
+)\r
+\r
 INSTALL(FILES ${CMAKE_BINARY_DIR}/data/edc/myaccount.edj DESTINATION share/edje/myaccount)\r
-INSTALL(FILES ${CMAKE_BINARY_DIR}/data/edc/myaccount_button.edj DESTINATION share/edje/myaccount)\r
 INSTALL(FILES ${CMAKE_BINARY_DIR}/data/edc/myaccount_edc_images.edj DESTINATION share/edje/myaccount)\r
+INSTALL(FILES ${CMAKE_BINARY_DIR}/data/edc/myaccount_nocontent.edj DESTINATION share/edje/myaccount)\r
 \r
diff --git a/data/edc/inc.Addaccount.edc b/data/edc/inc.Addaccount.edc
deleted file mode 100755 (executable)
index da72f81..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-group
-{
-       name: "Addaccount_ui";
-       min: MAIN_W MAIN_H;
-
-       parts {      
-         part { name: "rect";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-         
-               part
-               {
-
-                       name, "titlebar";
-                       type, SWALLOW;
-                       mouse_events, 0;
-                       description
-                       {
-                               state, "default" 0.0;
-                               rel1 { relative, 0.0 0.0; to, "rect";}
-                               //rel2 { relative, 1.0 82/800; to, "rect";}
-                               rel2 { relative, 1.0 92/800; to, "rect";}
-                       }
-               }
-               part {
-                       name: "body";
-                       type: SWALLOW;
-                       mouse_events: 1;
-                       description
-                       {
-                               state: "default" 0.0;
-                               //rel1 { relative: 0.0 82/800; to, "rect"; }
-                               rel1 { relative: 0.0 100/800; to, "rect"; }
-                               rel2 { relative: 1.0 1.0; to, "rect"; }
-                       }
-               }
-
-               part
-               {
-                       name: "softkey";
-                       type: SWALLOW;
-                       mouse_events: 1;
-
-                       description
-                       {
-                               state: "default" 0.0;
-                               color: 0 0 0 128;
-                               rel1 { relative: 0.0 0.9; to: "rect"; }
-                               rel2 { relative: 1.0 1.0; to: "rect"; }
-                       }
-               }
-       }
-}
diff --git a/data/edc/inc.add-sns-account.edc b/data/edc/inc.add-sns-account.edc
deleted file mode 100755 (executable)
index d1274a6..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-group {
-               name: "add-sns-account";
-               min: MAIN_W MAIN_H;
-
-               parts {
-                       part { name: "background";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 0;
-                               }
-                       }
-               
-                       part
-                       {
-                               name: "softkey";
-                                type: SWALLOW;
-                                mouse_events: 1;
-
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.9; to: "background"; }
-                                        rel2 { relative: 1.0 1.0; to: "background"; }
-                                 
-                                }
-                        }   
-                        part
-                        {
-                                name: "titlebar";
-                                type: SWALLOW;
-                                mouse_events: 0;
-
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; to: "background"; }
-                                        rel2 { relative: 1.0 TITLE_BAR_H; to: "background"; }
-
-                                }
-                        }
-               }
-       }
-       
-       
diff --git a/data/edc/inc.myaccount_contact_sync.edc b/data/edc/inc.myaccount_contact_sync.edc
deleted file mode 100755 (executable)
index 899976a..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-//#include ../../include/myaccount_layout.h
-#define COLOR_DEFAULT          0 0 0 0
-#define ENTRY_H         80
-#define RLIST_ITEM_H   80
-#define OVERLAY_OFFSET  11
-#define COLOR_DARK_GRAY                33 33 33
-#define RLIST_ITEM_NUM_T 10
-#define IST_ITEM_NUM_R -5
-#define RLIST_ITEM_NUM_B -5
-#define RLIST_ITEM_OFFSET_T  12  //18
-#define EDIT_AREA_OFFSET_B  0  //-15
-#define SEARCH_ITEM_NUM_B -6
-#define COLOR_WHITE            255 255 255
-
-#define TITLEBAR_H     50
-#define TITLE_SHADOW_H 8
-#define HEADER_H       70
-
-#define TAB_W          480
-#define TAB_H          87
-#define TAB_SHADOW_H   7
-#define TAB_BOX_W      116
-#define TAB_BOX_H      80      
-
-#define SOFTKEY_H      78
-#define INDICATOR_H    48      /* excluding its shadow (height 4) */
-#define BLUR_H         120
-
-#define BTN_TRANSPARENCY_FIFTY 128
-#define BTN_TRANSPARENCY_THIRTY 77
-#define BTN_FONT_2LINE_SIZE 24
-
-#define SEARCH_SHADOW_H        8
-
-group
-{
-       name: "contact_sync";
-       min: MAIN_W MAIN_H;
-
-       parts {      
-         part { name: "rect";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-
-               part {
-                       name: "body";
-                       type: SWALLOW;
-                       mouse_events: 1;
-                       description
-                       {
-                               state: "default" 0.0;
-                               //rel1 { relative: 0.0 88/800; to, "rect"; }
-                               rel1 { relative: 0.0 100/800; to, "rect"; }
-                               rel2 { relative: 1.0 1.0; to, "rect"; }
-                       }
-               }
-       }
-}
-
-
-group {        
-               name: "contact_sync_with_search";
-//             min: MAIN_W MAIN_H;
-               parts {
-                       part {  name: "Background";
-                               type: RECT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                    rel1 { relative: 0.0 0.0; offset: 0 0; }
-                    rel2 { relative: 1.0 1.0; offset: 0 0; }
-                                       //color: COLOR_DEFAULT;
-                                       //color: 255 255 255 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-                  part { name: "rlist_body";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { to: "Background"; relative: 0.0 0.0; offset: 0 -10); }
-                                       rel2 { to: "Background"; relative: 1.0 0.0; offset: 0 (ENTRY_H+10); }
-                               }
-                       }                                               
-                  part { name: "sw_body";
-                         type: SWALLOW;
-                         mouse_events: 1;
-                         description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 0 (ENTRY_H+10); }
-                               rel2 { relative: 1.0 1.0; offset: 0 0; }
-                               }
-                  }    
-          }
-   }
-
-
- group {
-       images {
-               image: "09_search_button_normal_bg.png" COMP;
-               image: "09_search_button_normal_bg_press.png" COMP;
-               image: "09_search_softkey_icon_zoom.png" COMP;
-               image: "09_search_text_input_03.png" COMP;
-               image: "09_search_input_bg.png" COMP;
-       }
-         name: "rlist_item";
-                parts {
-                        part { name: "erect";
-                                          type: RECT;
-                                          description {
-                                                         state: "default" 0.0;
-                                                         rel1 { relative: 0.0 0.0; offset: 0 0;}
-                                                         rel2 { relative: 1.0 0.0; offset: 0 (RLIST_ITEM_H+OVERLAY_OFFSET); }
-                                                         color: 77 77 77 255;
-                                                       }
-                                       }
-                        part { name: "rect_line";
-                                          type: RECT;
-                                          description {
-                                                          state: "default" 0.0;
-                                                          rel1 { to: "erect"; relative: 0.0 1.0; offset: 0 3; }
-                                                          rel2 { to: "erect"; relative: 1.0 1.0; offset: -1 3; }
-                                                          color: COLOR_DARK_GRAY 255;
-                                                       }
-                                       }
-                part { name: "rect_guide";
-                                        type: IMAGE;
-                                        description {
-                                                        visible:1;
-                                                        state: "default" 0.0;
-                                                        rel1 { to: "erect"; relative: 0.0 0.0; offset: 10 (RLIST_ITEM_NUM_T+OVERLAY_OFFSET); }
-                                                        rel2 { to: "erect"; relative: 1.0 1.0; offset: (IST_ITEM_NUM_R-73) (RLIST_ITEM_NUM_B-5); }
-                                                                                                                         
-                                                        image {
-                                                                //normal:  "09_search_text_input_03.png"; //white background
-                                                                normal: "09_search_input_bg.png";
-                                                                border: 10 10 10 10;
-                                                                }   
-                                                       }
-                               }
-                                                  
-                 part { name: "btn_text";
-                                  mouse_events: 1;
-                                  type: SWALLOW; 
-                                  repeat_events: 1; 
-                                  description {
-                                               state: "default" 0.0;
-                                               rel1 { to: "rect_guide"; relative: 0.0 0.0; offset: 10 RLIST_ITEM_OFFSET_T; }
-                                               rel2 { to: "rect_guide"; relative: 1.0 1.0; offset:  -5 EDIT_AREA_OFFSET_B; }
-                                       }
-                                  description {
-                                               state: "down" 0.0;
-                                               inherit: "default" 0.0;
-                                       }
-                        }        
-               part {name: "button";
-                          type: IMAGE;
-                          mouse_events: 1;
-                          description {
-                                        state: "default" 0.0;
-                                        rel1 { to: "erect"; relative: 1.0 0.0; offset: -70 (10+OVERLAY_OFFSET); };
-                                        rel2 { to: "erect"; relative: 1.0 1.0; offset: -10 (SEARCH_ITEM_NUM_B-4); };
-                                        image {
-                                               normal: "09_search_button_normal_bg.png";
-                                               border: 9 9 0 0;
-                                        }
-                          }
-                         description {
-                                       state: "selected" 0.0;
-                                       inherit: "default" 0.0;
-                                       image {
-                                               normal: "09_search_button_normal_bg_press.png";
-                                               border: 9 9 0 0;
-                                       }
-                         }
-                  }      
-          part { name: "button_icon";  
-                          type: IMAGE;         
-                          repeat_events: 1;
-                          description {        
-                                       state: "default" 0.0;   
-                                       rel1 { relative: 0.0 0.0; offset: 8 0; to: "button"; }  
-                                       rel2 { relative: 1.0 1.0; offset: -8 0; to: "button"; }         
-                                       color: COLOR_WHITE 255; //color: 0 0 0 255;     
-                                       image {
-                                          normal: "09_search_softkey_icon_zoom.png";
-                                          border: 9 9 0 0;
-                                       }
-                          }    
-                 }
-        }            
-       programs {
-                  program { name: "bt_clicked"; 
-                                       source: "button"; 
-                                       signal: "mouse,clicked,1"; 
-                                       action: SIGNAL_EMIT "SEARCHIT" "SEARCHITEM";
-                       } 
-       }              
- } // group :   
diff --git a/data/edc/inc.myaccount_email_datarange.edc b/data/edc/inc.myaccount_email_datarange.edc
deleted file mode 100755 (executable)
index 4c83fc4..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-group
-{
-       name: "email_datarange";
-       min: MAIN_W MAIN_H;
-
-       parts {      
-         part { name: "rect";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-
-               part {
-                       name: "body";
-                       type: SWALLOW;
-                       mouse_events: 1;
-                       description
-                       {
-                               state: "default" 0.0;
-                               //rel1 { relative: 0.0 88/800; to, "rect"; }
-                               rel1 { relative: 0.0 100/800; to, "rect"; }
-                               rel2 { relative: 1.0 1.0; to, "rect"; }
-                       }
-               }
-       }
-}
diff --git a/data/edc/inc.myaccount_peak_time.edc b/data/edc/inc.myaccount_peak_time.edc
deleted file mode 100755 (executable)
index cb28084..0000000
+++ /dev/null
@@ -1,721 +0,0 @@
-//#define TITLEBAR_H 100
-//#define TITLE_SHADOW_H       8
-
-//#define ALARM_LIST_H 101
-
-
-#define COLOR_1                 255 255 255 255
-#define COLOR_2                 0 0 0 255
-
-group
-{
-       images {
-               image: "01_hybrid_spinner_bg.png" COMP;
-               image: "08_textinput_panel_bg.png" COMP;
-               image: "01_list_bottom_blur.png" COMP;
-       }
-
-       name: "peak_time";
-       min: MAIN_W MAIN_H;
-
-       parts {      
-               part { name: "ui.rect.bg";
-                       type: RECT;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 0 0; }
-                               rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                               //color: 74 74 74 255;
-                               color: 0 0 0 255;
-                       }
-               }
-
-               part {
-                       name: "indicator";
-                       type: RECT;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 0 INDICATOR_H;
-                               fixed: 0 1;
-                               rel1 { relative: 0.0 0.0; }
-                               rel2 { relative: 1.0 0.0; }
-                               align: 0.5 0.0;
-                               color: 0 0 0 0;
-                       }
-               }
-
-/*
-               part {
-                       name: "titlebar_top_padding";
-                       type: RECT;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 0 10;
-                               fixed: 0 1;
-                               rel1 { relative: 0.0 0.0; }
-                               rel2 { relative: 1.0 0.0; }
-                               align: 0.5 0.0;
-                               color: 255 0 0 255;
-                       }
-               }
-*/
-               part {
-                       name: "title_shadow";
-                       type: RECT;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 0 TITLE_SHADOW_H;
-                               fixed: 0 1;
-                               rel1 { relative: 0.0 1.0; to: "elm.swallow.title"; }
-                               rel2 { relative: 1.0 1.0; to: "elm.swallow.title"; }
-                               align: 0.5 1.0;
-                               color: 0 0 0 0;
-                       }
-               }
-               part {
-                       name: "elm.swallow.content";
-                       type: SWALLOW;
-                       description {
-                               state: "default" 0.0;
-                               //rel1 { relative: 0.0 0.0; to_y: "title_shadow"; }
-                               rel1 { relative: 0.0 0.0; to_y: "elm.swallow.title"; }
-                               rel2 { relative: 1.0 1.0; }
-                       }
-               }
-/*             part {
-                       name: "elm.image.blur";
-                       type: IMAGE;
-                       mouse_events: 0;
-                       description {
-                               state: "default" 0.0;
-                               min: 0 BLUR_H;
-                               fixed: 0 1;
-                               rel1 { relative: 0.0 1.0; }
-                               rel2 { relative: 1.0 1.0; }
-                               align: 0.5 1.0;
-                               image.normal: "01_list_bottom_blur.png";
-                       } 
-               }       */      
-               part {
-                       name: "elm.swallow.title";
-                       type: SWALLOW;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 0 TITLEBAR_H;
-                               fixed: 0 1;
-                               //rel1 { relative: 0.0 1.0; to_y: "titlebar_top_padding"; }
-                               //rel2 { relative: 1.0 1.0; to_y: "titlebar_top_padding"; }
-                               rel1 { relative: 0.0 1.0; to_y: "indicator"; }
-                               rel2 { relative: 1.0 1.0; to_y: "indicator"; }
-                               align: 0.5 0;
-                       } 
-               }
-
-               part {
-                       name: "ui.swl.sk1";
-                       type: SWALLOW;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: SK1_W SK_H;
-                               fixed: 1 1;
-                               rel1.to_x: "ui.rect.bg";
-                               rel1.relative: 0.0 1.0;
-                               rel2.to: "ui.rect.bg";
-                               rel2.relative: 0.0 1.0;
-                               align: 0.0 1.0;
-                       }
-               }
-               part {
-                       name: "ui.swl.sk2";
-                       type: SWALLOW;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 0 SK_H;
-                               fixed: 0 1;
-                               rel1.to_x: "ui.swl.sk1";
-                               rel1.to_y: "ui.rect.bg";
-                               rel1.relative: 1.0 1.0;
-                               rel2.to_x: "ui.swl.sk3";
-                               rel2.to_y: "ui.rect.bg";
-                               rel2.relative: 0.0 1.0;
-                               align: 0.5 1.0;
-                       }
-                       description {
-                               state: "landscape" 0.0;
-                               inherit: "default" 0.0;
-                               rel1.to: "ui.swl.sk3";
-                               rel1.relative: 0.0 0.0;
-                               rel2.to: "ui.swl.sk3";
-                               rel2.relative: 1.0 0.0;
-                       }
-               }
-               part {
-                       name: "ui.swl.sk3";
-                       type: SWALLOW;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: SK3_W SK_H;
-                               fixed: 1 1;
-                               rel1.to_x: "ui.rect.bg";
-                               rel1.relative: 1.0 1.0;
-                               rel2.to: "ui.rect.bg";
-                               rel2.relative: 1.0 1.0;
-                               align: 1.0 1.0;
-                       }
-               }
-       }
-}
-group {
-               name: "peak_time_tofrom";
-               
-               parts {
-                       part { 
-                               name: "bg";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       min: 460 101;
-                                       //max: 460 101;
-                                       //fixed: 1 1;
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; } 
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; }
-                                       color: 0 0 0 255; 
-                               }
-                       }
-                       part {
-                                       name: "img/bg/top";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_top.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/bottom";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0; 
-                                       rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; }
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_bottom.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/middle";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; }
-                                       rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; }
-                                       image.normal: "01_dialog_field_input_middle.png";
-                               }
-                       }
-                       part {
-                               name: "part/img/bg";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { to: "bg"; }
-                                       rel2 { to: "bg"; }
-                                               image.normal: "01_dialog_field_lighting.png";
-                               }
-                               description {
-                                       state: "pressed" 0.0;
-                                       inherit: "default" 0.0;
-                                               image.normal: "tw3_list_select.png";
-                               }
-                       }
-                       part {
-                               name: "part/text/from";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 18 56; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; }
-                                               text { text_class: "tc_from"; align: 0.0 0.5; }
-                                       color: COLOR_1;
-                                       color2: COLOR_2;
-                               }
-                       }
-                       part {
-                               name: "part/text/hour";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 170 55; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; }
-                                               text { text_class: "tc_hour"; align: 0.0 0.5; }
-                                       color: COLOR_1;
-                                       color2: COLOR_2;
-                               }
-                       }
-                       part {
-                               name: "part/text/colon";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 195 55; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; }
-                                               text { text_class: "tc_colon"; align: 0.0 0.5; }
-                                       color: COLOR_1;
-                                       color2: COLOR_2;
-                               }
-                       }
-                       part {
-                               name: "part/text/minute";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 200 55; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; }
-                                               text { text_class: "tc_minute"; align: 0.0 0.5; }
-                                       color: 80 80 80 255;
-                                       color2: COLOR_2;
-                               }
-                       }
-                       part {
-                               name: "part/text/ampm";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 230 55; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; }
-                                               text { text_class: "tc_ampm"; align: 0.0 0.5; }
-                                       color: COLOR_1;
-                                       color2: COLOR_2;
-                               }
-                       }
-               }
-               programs {
-                       program {
-                               name: "prog/down/list";
-                               signal: "mouse,down,*";
-                               source: "bg";
-                               script {
-                                       set_state(PART:"part/img/bg", "pressed", 0.0);
-                               }
-                       }
-                       program {
-                               name: "prog/up/list";
-                               signal: "mouse,up,1";
-                               source: "bg";
-                               script {
-                                       set_state(PART:"part/img/bg", "default", 0.0);
-                               }
-                       }
-               }
-       }                       
-       
-       group {
-               name: "peak_time_timepicker";   
-               parts {
-                       part { 
-                               name: "bg";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       min: 460 250;
-                                       max: 460 250;
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; } 
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; }
-                                       color: 0 0 0 255; 
-                               }
-                       }
-                       part {
-                       name: "part/swallow/timepicker";
-                       type: SWALLOW;
-                       mouse_events: 1;
-                       description
-                               {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; to, "bg"; }
-                               rel2 { relative: 1 1; to, "bg"; }
-                               }
-                       }
-
-               }
-       }
-       
-       group {
-               images {
-                       image: "08_textinput_panel_bg.png" COMP;
-                       image: "08_textinput_btn_bg_1.png" COMP;
-                       image: "08_textinput_btn_bg_2.png" COMP;
-                       image: "08_textinput_btn_clear.png" COMP;
-                       image: "08_textinput_btn_enter.png" COMP;
-               }
-
-               name: "ui/picker/keypad";
-
-               parts {
-                       part {
-                               name: "ui.rect.bg";
-                               type: RECT;
-                               description {
-                                       state: "default" 0.0;
-                                       color: 0 0 0 0;
-                               }
-                       }
-
-#define PART_KEY(key_num, l, r, t, b, img, txt1, txt2, font_color) \
-                       part { \
-                               name: "ui.img.key"key_num; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       rel1.relative: l t; \
-                                       rel1.to: "ui.rect.bg"; \
-                                       rel2.relative: r b; \
-                                       rel2.to: "ui.rect.bg"; \
-                                       image.normal: img; \
-                                       image.border: 3 3 3 3; \
-                                       color: 255 255 255 255; \
-                               } \
-                               description { \
-                                       state: "dim" 0.0; \
-                                       inherit: "default" 0.0; \
-                                       color: 255 255 255 127; \
-                               } \
-                       } \
-                       part { \
-                               name: "ui.txt.key"key_num; \
-                               mouse_events: 0; \
-                               type: TEXT; \
-                               scale: 1; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       fixed: 1 1; \
-                                       rel1.to: "ui.img.key"key_num; \
-                                       rel2.to: "ui.img.key"key_num; \
-                                       color: font_color; \
-                                       color2: 0 0 0 255; \
-                                       visible: 1; \
-                                       text { \
-                                               font: "GP_Latin"; \
-                                               size: 34; \
-                                               min: 1 1; \
-                                               align: 0.5 0.5; \
-                                               text: txt1; \
-                                       } \
-                               } \
-                       } 
-
-
-                       PART_KEY("0", KEY0_REL_L, KEY0_REL_R, KEY0_REL_T, KEY0_REL_B,
-                                       "08_textinput_btn_bg_2.png", "1", "1", 0 0 0 255)
-                       PART_KEY("1", KEY1_REL_L, KEY1_REL_R, KEY1_REL_T, KEY1_REL_B,
-                                       "08_textinput_btn_bg_2.png", "2", "2", 0 0 0 255)
-                       PART_KEY("2", KEY2_REL_L, KEY2_REL_R, KEY2_REL_T, KEY2_REL_B,
-                                       "08_textinput_btn_bg_2.png", "3", "3", 0 0 0 255)
-                       PART_KEY("clr", KEY3_REL_L, KEY3_REL_R, KEY3_REL_T, KEY3_REL_B,
-                                       "08_textinput_btn_clear.png", "", "", 255 255 255 255)
-                                       
-                       PART_KEY("3", KEY4_REL_L, KEY4_REL_R, KEY4_REL_T, KEY4_REL_B,
-                                       "08_textinput_btn_bg_2.png", "4", "4", 0 0 0 255)
-                       PART_KEY("4", KEY5_REL_L, KEY5_REL_R, KEY5_REL_T, KEY5_REL_B,
-                                       "08_textinput_btn_bg_2.png", "5", "5", 0 0 0 255)
-                       PART_KEY("5", KEY6_REL_L, KEY6_REL_R, KEY6_REL_T, KEY6_REL_B,
-                                       "08_textinput_btn_bg_2.png", "6", "6", 0 0 0 255)
-                       PART_KEY("ret", KEY7_REL_L, KEY7_REL_R, KEY7_REL_T, KEY7_REL_B,
-                                       "08_textinput_btn_enter.png", "", "", 255 255 255 255)
-                                       
-                       PART_KEY("6", KEY8_REL_L, KEY8_REL_R, KEY8_REL_T, KEY8_REL_B,
-                                       "08_textinput_btn_bg_2.png", "7", "7", 0 0 0 255)
-                       PART_KEY("7", KEY9_REL_L, KEY9_REL_R, KEY9_REL_T, KEY9_REL_B,
-                                       "08_textinput_btn_bg_2.png", "8", "8", 0 0 0 255)
-                       PART_KEY("8", KEY10_REL_L, KEY10_REL_R, KEY10_REL_T, KEY10_REL_B,
-                                       "08_textinput_btn_bg_2.png", "9", "9", 0 0 0 255)
-                       PART_KEY("abc", KEY11_REL_L, KEY11_REL_R, KEY11_REL_T, KEY11_REL_B,
-                                       "08_textinput_btn_bg_1.png", "abc", "abc", 255 255 255 90)
-                       
-                       PART_KEY("9", KEY12_REL_L, KEY12_REL_R, KEY12_REL_T, KEY12_REL_B,
-                                       "08_textinput_btn_bg_2.png", "*", "10", 0 0 0 255)
-                       PART_KEY("10", KEY13_REL_L, KEY13_REL_R, KEY13_REL_T, KEY13_REL_B,
-                                       "08_textinput_btn_bg_2.png", "0", "11", 0 0 0 255)
-                       PART_KEY("11", KEY14_REL_L, KEY14_REL_R, KEY14_REL_T, KEY14_REL_B,
-                                       "08_textinput_btn_bg_2.png", "#", "12", 0 0 0 255)
-                       PART_KEY("lang", KEY15_REL_L, KEY15_REL_R, KEY15_REL_T, KEY15_REL_B,
-                                       "08_textinput_btn_bg_1.png", "lang", "lang", 255 255 255 90)
-               }
-
-               programs {
-                       program {
-                               name: "numpad";
-                               signal: "numpad";
-                               source: "prog";
-                               action: STATE_SET "default" 0.0;
-                               target: "ui.txt.key0";
-                               target: "ui.txt.key1";
-                               target: "ui.txt.key2";
-                               target: "ui.txt.key3";
-                               target: "ui.txt.key4";
-                               target: "ui.txt.key5";
-                               target: "ui.txt.key6";
-                               target: "ui.txt.key7";
-                               target: "ui.txt.key8";
-                               target: "ui.txt.key9";
-                               target: "ui.txt.key10";
-                               target: "ui.txt.key11";
-                       }
-                       
-#define PRG_KEY_CLICKED(key_num) \
-                       program { \
-                               name: "key"key_num"_down"; \
-                               signal: "mouse,down,1"; \
-                               source: "ui.img.key"key_num; \
-                               action: STATE_SET "dim" 0.0; \
-                               target: "ui.img.key"key_num; \
-                       } \
-                       program { \
-                               name: "key"key_num"_up"; \
-                               signal: "mouse,up,1"; \
-                               source: "ui.img.key"key_num; \
-                               action: STATE_SET "default" 0.0; \
-                               target: "ui.img.key"key_num; \
-                               after: "key"key_num"_clicked"; \
-                       } \
-                       program { \
-                               name: "key"key_num"_clicked"; \
-                               signal: "mouse,clicked,1"; \
-                               source: "ui.img.key"key_num; \
-                               action: SIGNAL_EMIT "clicked" key_num; \
-                       } \
-
-                       PRG_KEY_CLICKED("0");
-                       PRG_KEY_CLICKED("1");
-                       PRG_KEY_CLICKED("2");
-                       PRG_KEY_CLICKED("3");
-                       PRG_KEY_CLICKED("4");
-                       PRG_KEY_CLICKED("5");
-                       PRG_KEY_CLICKED("6");
-                       PRG_KEY_CLICKED("7");
-                       PRG_KEY_CLICKED("8");
-                       PRG_KEY_CLICKED("9");
-                       PRG_KEY_CLICKED("10");
-                       PRG_KEY_CLICKED("11");
-                       PRG_KEY_CLICKED("clr");
-                       PRG_KEY_CLICKED("ret");
-               }
-       }
-       
-       group {
-               name: "peak_time_tofrom_digital";       
-               parts {
-                       part { 
-                               name: "bg";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       min: 460 101;
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; } 
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; }
-                                       color: 0 0 0 255; 
-                               }
-                       }
-                       part {
-                                       name: "img/bg/top";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_top.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/bottom";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0; 
-                                       rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; }
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_bottom.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/middle";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; }
-                                       rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; }
-                                       image.normal: "01_dialog_field_input_middle.png";
-                               }
-                       }
-                       part {
-                               name: "part/img/bg";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { to: "bg"; }
-                                       rel2 { to: "bg"; }
-                                               image.normal: "01_dialog_field_lighting.png";
-                               }
-                       }
-                       part {
-                               name: "part/text/from";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 18 56; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; }
-                                               text { text_class: "tc_from"; align: 0.0 0.5; }
-                                       color: COLOR_1;
-                                       color2: COLOR_2;
-                               }
-                       }
-                       part {
-                               name: "part/button/hour";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 120 10 ; to: "bg"; }
-                                       rel2 { relative: 0.0 0.0; offset: 200 90; to: "bg"; }
-                               }
-                       }
-                       part {
-                               name: "part/text/colon";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 205 55; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; }
-                                               text { text_class: "tc_colon"; align: 0.0 0.5; }
-                                       color: COLOR_1;
-                                       color2: COLOR_2;
-                               }
-                       }
-                       part {
-                               name: "part/button/minute";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       //rel1 { relative: 290/460 10/101; to: "bg"; }
-                                       //rel2 { relative: 370/460 90/101;  to: "bg"; }
-                                       rel1 { relative: 0.0 0.0; offset: 215 10 ; to: "bg"; }
-                                       rel2 { relative: 0.0 0.0; offset: 295 90; to: "bg"; }
-                               }
-                       }
-                       part {
-                               name: "part/button/ampm";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       //rel1 { relative: 390/460 10/101; to: "bg"; }
-                                       //rel2 { relative: 470/460 90/110; to: "bg"; }
-                                       rel1 { relative: 0.0 0.0; offset: 305 10 ; to: "bg"; }
-                                       rel2 { relative: 0.0 0.0; offset: 385 90; to: "bg"; }
-                               }
-                       }
-               }
-       }                       
-
-
-       group {
-               images {
-                       image: "01_dialogue_field_bg.png" COMP;
-                       image: "01_picker_input_bg.png" COMP;
-                       image: "01_hybrid_spinner_bg.png" COMP;
-       //              image: "01_picker_time_colon_bg.png" COMP;
-               }
-               name: "ui/picker/base";
-               parts {
-                       part {
-                               name: "ui.rect.bg";
-                               type: RECT;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 1.0;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "ui.rect.cover";
-                               type: RECT;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.to: "ui.rect.bg";
-                                       rel1.relative: 0.0 COVER_REL_T;
-                                       rel2.to: "ui.rect.bg";
-                                       color: 0 0 0 0;
-                               }
-                       }
-
-                       part {
-                               name: "ui.img.bg.disp";
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       min: 0 DISP_BG_H;
-                                       fixed: 1 1;
-                                       state: "default" 0.0;
-                                       rel1.relative: DISP_BG_REL_L DISP_BG_REL_T;
-                                       rel1.to: "ui.rect.bg";
-                                       rel2.relative: DISP_BG_REL_R DISP_BG_REL_B;
-                                       rel2.to: "ui.rect.bg";
-                                       image.normal: "01_dialogue_field_bg.png";
-                                       image.border: 4 4 4 4;
-                                       align: 0.5 0.0;
-                               }
-                       }
-                       /*part {
-                               name: "ui.img.bg.disp2";
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       min: 0 DISP_BG_H;
-                                       fixed: 1 1;
-                                       state: "default" 0.0;
-                                       rel1.to: "ui.img.bg.disp";
-                                       rel2.to: "ui.img.bg.disp";
-                                       image.normal: "01_dialogue_field_bg.png";
-                                       visible: 0;
-                                       image.border: 4 4 4 4;
-                                       align: 0.5 0.0;
-                               }
-                               description {
-                                       min: 0 DISP_BG_H;
-                                       fixed: 1 1;
-                                       state: "hybrid" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1.to: "ui.img.bg.disp";
-                                       rel1.relative: 0.0 1.0;
-                                       rel2.to: "ui.img.bg.disp";
-                                       rel2.relative: 1.0 1.0;
-                                       visible: 1;
-                               }
-               }*/     
-       }
-}
-       
diff --git a/data/edc/inc.myaccount_sns_sync_interval.edc b/data/edc/inc.myaccount_sns_sync_interval.edc
deleted file mode 100755 (executable)
index 88d79ba..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-group
-{
-       name: "sns_sync_interval";
-       min: MAIN_W MAIN_H;
-
-       parts {      
-         part { name: "rect";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-               part {
-                       name: "body";
-                       type: SWALLOW;
-                       mouse_events: 1;
-                       description
-                       {
-                               state: "default" 0.0;
-                               //rel1 { relative: 0.0 88/800; to, "rect"; }
-                               rel1 { relative: 0.0 100/800; to, "rect"; }
-                               rel2 { relative: 1.0 1.0; to, "rect"; }
-                       }
-               }
-       }
-}
diff --git a/data/edc/inc.myaccount_sync_settings_with_seven.edc b/data/edc/inc.myaccount_sync_settings_with_seven.edc
deleted file mode 100755 (executable)
index 3f056a5..0000000
+++ /dev/null
@@ -1,549 +0,0 @@
-#define POSX_SUN                               (24/480)
-#define POSX_MON                               (88/480)
-#define POSX_TUE                               (152/480)
-#define POSX_WED                               (216/480)
-#define POSX_THU                               (280/480)
-#define POSX_FRI                               (344/480)
-#define POSX_SAT                               (408/480)
-#define POSY_DAY                               (43/99)
-#define ALARM_LIST_H   90
-
-#define COLOR_1                 255 255 255 255
-#define COLOR_2                 0 0 0 255
-
-#define WEEKLY_UP_H                            (90/151)
-#define WEEKLY_DOWN_H                  (61/151)
-
-
-group {
-               name: "sync-settings-with-seven";
-               min: MAIN_W MAIN_H;
-
-               parts {
-                       part { name: "background";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-               
-                       part
-                       {
-                               name: "softkey";
-                                type: SWALLOW;
-                                mouse_events: 1;
-
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.9; to: "background"; }
-                                        rel2 { relative: 1.0 1.0; to: "background"; }
-                                 
-                                }
-                        }   
-                        part
-                        {
-                                name: "titlebar";
-                                type: SWALLOW;
-                                mouse_events: 0;
-
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; to: "background"; }
-                                        rel2 { relative: 1.0 TITLE_BAR_H; to: "background"; }
-
-                                }
-                        }
-               }
-       }
-       
-               group {
-               name: "repeat";
-
-               parts {
-                       part { 
-                               name: "bg";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       min: 0 ALARM_LIST_H;
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; } 
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; }
-                                       color: 0 0 0 0; 
-                               }
-                       }
-                       part {
-                                       name: "img/bg/top";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_top.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/bottom";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0; 
-                                       rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; }
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_bottom.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/middle";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; }
-                                       rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; }
-                                       image.normal: "01_dialog_field_input_middle.png";
-                               }
-                       }
-                       part {
-                               name: "part/img/bg";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { to: "bg"; }
-                                       rel2 { to: "bg"; }
-                                               image.normal: "01_dialog_field_lighting.png";
-                               }
-                               description {
-                                       state: "pressed" 0.0;
-                                       inherit: "default" 0.0;
-                                               image.normal: "tw3_list_select.png";
-                               }
-                       }
-                       part {
-                               name: "part/text/top";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 18 10; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; }
-                                               text { text_class: "tc_top"; align: 0.0 0.5; }
-                                       color: COLOR_1;
-                                       color2: COLOR_2;
-                               }
-                       }       
-#define PART_DAY(title, pass, rel1x, rely, where) \
-                       part { \
-                               name: "part/rect/"title; \
-                               type: RECT; \
-                               mouse_events: pass; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       rel1 { relative: rel1x rely; offset: 0 0; to: where; } \
-                                       rel2 { relative: rel1x rely; offset: 50 50; to: where; } \
-                                       color: 0 0 0 0; \
-                               } \
-                       } \
-                       part { \
-                               name: "part/img/"title; \
-                               type: IMAGE; \
-                               mouse_events: 0; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       rel1 { to: "part/rect/"title; } \
-                                       rel2 { to: "part/rect/"title; } \
-                                       image.normal: "50_repeat_btn.png"; \
-                               } \
-                               description { \
-                                       state: "pressed" 0.0; \
-                                       inherit: "default" 0.0; \
-                                       image.normal: "50_repeat_btn_Press.png"; \
-                               } \
-                       } \
-                       part { \
-                               name: "part/text/"title; \
-                               type: TEXT; \
-                               mouse_events: 0; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       rel1 { to: "part/rect/"title; }; \
-                                       rel2 { to: "part/rect/"title; }; \
-                                       text { text_class: "tc_day"; align: 0.5 0.5; } \
-                                       color: COLOR_1; \
-                               } \
-                               description { \
-                                       state: "pressed" 0.0; \
-                                       inherit: "default" 0.0; \
-                                       color: COLOR_2; \
-                               } \
-                       }
-
-                       PART_DAY("sun", 0, POSX_SUN, POSY_DAY, "bg")
-                       PART_DAY("mon", 0, POSX_MON, POSY_DAY, "bg")
-                       PART_DAY("tue", 0, POSX_TUE, POSY_DAY, "bg")
-                       PART_DAY("wed", 0, POSX_WED, POSY_DAY, "bg")
-                       PART_DAY("thu", 0, POSX_THU, POSY_DAY, "bg")
-                       PART_DAY("fri", 0, POSX_FRI, POSY_DAY, "bg")
-                       PART_DAY("sat", 0, POSX_SAT, POSY_DAY, "bg")
-               }
-               programs {
-                       program {
-                               name: "prog/down/list";
-                               signal: "mouse,down,*";
-                               source: "bg";
-                               script {
-                                       set_state(PART:"part/img/bg", "pressed", 0.0);
-                               }
-                       }
-                       program {
-                               name: "prog/up/list";
-                               signal: "mouse,up,1";
-                               source: "bg";
-                               script {
-                                       set_state(PART:"part/img/bg", "default", 0.0);
-                               }
-                       }
-/*                     program {
-                               name: "prog/move/list";
-                               signal: "mouse,move";
-                               source: "bg";
-                               script {
-                                       set_state(PART:"part/img/bg", "default", 0.0);
-                               }
-                       }
-*/                     program {
-                               name: "prog/clicked/list";
-                               signal: "mouse,clicked,1";
-                               source: "bg";
-                               script {
-                                       emit("clicked", "repeat");
-                               }
-                       }
-                       program
-                       {
-                       name: "peakday_pressed";
-                        signal: "mouse,clicked,1";
-                        source: "bg";
-                        action: SIGNAL_EMIT "peakday_pressed" "repeat" ;
-                      }
-
-#define PROG_DAY(title, sig) \
-                       program { \
-                               name: "prog/down/"title; \
-                               signal: "mouse,down,*"; \
-                               source: "part/rect/"title; \
-                               script { \
-                                       set_state(PART:"part/img/"title, "pressed", 0.0); \
-                                       set_state(PART:"part/text/"title, "pressed", 0.0); \
-                               } \
-                       } \
-                       program { \
-                               name: "prog/up/"title; \
-                               signal: "mouse,up,1"; \
-                               source: "part/rect/"title; \
-                               script { \
-                                       set_state(PART:"part/img/"title, "default", 0.0); \
-                                       set_state(PART:"part/text/"title, "default", 0.0); \
-                               } \
-                       } \
-                       program { \
-                               name: "prog/clicked/"title; \
-                               signal: "mouse,clicked,1"; \
-                               source: "part/rect/"title; \
-                               script { \
-                                       emit("clicked", sig); \
-                               } \
-                       }
-                       PROG_DAY("sun", "0")
-                       PROG_DAY("mon", "1")
-                       PROG_DAY("tue", "2")
-                       PROG_DAY("wed", "3")
-                       PROG_DAY("thu", "4")
-                       PROG_DAY("fri", "5")
-                       PROG_DAY("sat", "6")
-               }
-       }
-               group {
-               name: "page/repeat";
-
-               parts {
-                       part { 
-                               name: "background";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; } 
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       color: 0 0 0 255; 
-                               }
-                       }
-               }
-       }
-
-       
-       group {
-               name: "list/repeat";
-
-               parts {
-                       part { 
-                               name: "bg";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       min: 0 ALARM_LIST_H;
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 10 0; } 
-                                       rel2 { relative: 1.0 1.0; offset: -9 -1; }
-                                       color: 0 0 0 0; 
-                               }
-                       }
-                       part {
-                               name: "img/bg/top";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_top.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/bottom";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0; 
-                                       rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; }
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_bottom.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/middle";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; }
-                                       rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; }
-                                       image.normal: "01_dialog_field_input_middle.png";
-                               }
-                       }
-                       part {
-                               name: "part/img/bg";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { to: "bg"; }
-                                       rel2 { to: "bg"; }
-                                               image.normal: "01_dialog_field_lighting.png";
-                               }
-                               description {
-                                       state: "pressed" 0.0;
-                                       inherit: "default" 0.0;
-                                               image.normal: "tw3_list_select.png";
-                               }
-                       }
-                       part {
-                               name: "part/swl/button";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       color: 0 0 0 0; 
-                                       rel1 { relative: 1.0 0.5; offset: -79 -25; to: "bg"; }
-                                       rel2 { relative: 1.0 0.5; offset: -29 24; to: "bg"; }
-                               }
-                       }
-                       part {
-                               name: "part/text/middle";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 24 0; to: "bg"; }
-                                       rel2 { relative: 0.0 1.0; offset: 0 0 ; to_x: "part/swl/button"; }
-                                       text { text_class: "tc_middle"; align: 0.0  0.5; }
-                                       color: COLOR_1;
-                                       color2: COLOR_2;
-                               }
-                       }
-               }
-       }
-       group {
-               name: "list/repeat/weekly";
-
-               parts {
-                       part { 
-                               name: "bg";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       min: 0 152;
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 10 0; } 
-                                       rel2 { relative: 1.0 1.0; offset: -9 -1; }
-                                       color: 0 0 0 0; 
-                               }
-                       }
-                       part {
-                               name: "img/bg/top";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0; 
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_top.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/bottom";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0; 
-                                       rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; }
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; }
-                                       image.normal: "01_dialog_field_input_bottom.png";
-                               }
-                       }
-                       part {
-                               name: "img/bg/middle";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                               state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; }
-                                       rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; }
-                                       image.normal: "01_dialog_field_input_middle.png";
-                               }
-                       }
-                       part {
-                               name: "part/img/bg";
-                               type: IMAGE;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { to: "bg"; }
-                                       rel2 { to: "bg"; }
-                                               image.normal: "01_dialog_field_lighting.png";
-                               }
-                               description {
-                                       state: "pressed" 0.0;
-                                       inherit: "default" 0.0;
-                                               image.normal: "tw3_list_select.png";
-                               }
-                       }
-                       part {
-                               name: "part/rect/up";
-                               type: RECT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       color: 0 0 0 0;
-                                       rel1 { relative: 0.0 0.0; to: "bg"; }
-                                       rel2 { relative: 1.0 WEEKLY_UP_H; to: "bg"; }
-                               }
-                       }
-                       part {
-                               name: "part/rect/down";
-                               type: RECT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       color: 0 0 0 0;
-                                       rel1 { relative: 0.0 1.0; to: "part/rect/up"; }
-                                       rel2 { relative: 1.0 1.0; to: "bg"; }
-                               }
-                       }
-                       part {
-                               name: "part/swl/button";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       color: 0 0 0 0;
-                                       rel1 { relative: 1.0 0.0; offset: -79 25; to: "part/rect/up"; }
-                                       rel2 { relative: 1.0 0.0; offset: -29 75; to: "part/rect/up"; }
-                               }
-                       }
-                       part {
-                               name: "part/text/middle";
-                               type: TEXT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 24 0; to: "part/rect/up"; }
-                                       rel2 { relative: 0.0 1.0; offset: 0 0 ; to_x: "part/swl/button"; to_y: "part/rect/up"; }
-                                       text { text_class: "tc_middle"; align: 0.0  0.5; }
-                                       color: COLOR_1;
-                                       color2: COLOR_2;
-               }
-       }
-
-                       PART_DAY("sun", 1, POSX_SUN, 0.0, "part/rect/down")
-                       PART_DAY("mon", 1, POSX_MON, 0.0, "part/rect/down")
-                       PART_DAY("tue", 1, POSX_TUE, 0.0, "part/rect/down")
-                       PART_DAY("wed", 1, POSX_WED, 0.0, "part/rect/down")
-                       PART_DAY("thu", 1, POSX_THU, 0.0, "part/rect/down")
-                       PART_DAY("fri", 1, POSX_FRI, 0.0, "part/rect/down")
-                       PART_DAY("sat", 1, POSX_SAT, 0.0, "part/rect/down")
-
-                       part {
-                               name: "part/rect/mask";
-                               type: RECT;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { to: "bg"; }
-                                       rel2 { to: "bg"; }
-                                       color: 0 0 0 0;
-                               }
-                               description {
-                                       state: "on/mask" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 0 0 0 150;
-                               }
-                       }
-               }
-               programs {
-                       PROG_DAY("sun", "0")
-                       PROG_DAY("mon", "1")
-                       PROG_DAY("tue", "2")
-                       PROG_DAY("wed", "3")
-                       PROG_DAY("thu", "4")
-                       PROG_DAY("fri", "5")
-                       PROG_DAY("sat", "6")
-
-                       program {
-                               name: "prog/on/mask";
-                               signal: "on";
-                               source: "part/rect/mask";
-                               script {
-                                       set_state(PART:"part/rect/mask", "on/mask", 0.0);
-                               }
-                       }
-                       program {
-                               name: "prog/off/mask";
-                               signal: "off";
-                               source: "part/rect/mask";
-                               script {
-                                       set_state(PART:"part/rect/mask", "off/mask", 0.0);
-                               }
-                       }
-               }
-       }
-       
\ No newline at end of file
diff --git a/data/edc/inc.myaccount_view_priority.edc b/data/edc/inc.myaccount_view_priority.edc
deleted file mode 100755 (executable)
index dfb2be4..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-group
-{
-       name: "view_priority";
-       min: MAIN_W MAIN_H;
-
-       parts {      
-         part { name: "rect";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-
-               part {
-                       name: "body";
-                       type: SWALLOW;
-                       mouse_events: 1;
-                       description
-                       {
-                               state: "default" 0.0;
-                               //rel1 { relative: 0.0 88/800; to, "rect"; }
-                               rel1 { relative: 0.0 100/800; to, "rect"; }
-                               rel2 { relative: 1.0 1.0; to, "rect"; }
-                       }
-               }
-       }
-}
\ No newline at end of file
diff --git a/data/edc/inc.myaccount_without_seven.edc b/data/edc/inc.myaccount_without_seven.edc
deleted file mode 100755 (executable)
index f23ddc3..0000000
+++ /dev/null
@@ -1,510 +0,0 @@
-       
-       group {
-               name: "addaccount_without_seven_ui";
-               min: MAIN_W MAIN_H;
-
-               parts {
-                       part { name: "background";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-                       
-                       part
-                       {
-                               name: "softkey";
-                               type: SWALLOW;
-                               mouse_events: 1;
-
-                               description
-                               {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.9; to: "background"; }
-                                       rel2 { relative: 1.0 1.0; to: "background"; }
-                                       
-                               }
-                       }       
-                       part
-                       {
-                               name: "titlebar";
-                               type: SWALLOW;
-                               mouse_events: 0;
-
-                               description
-                               {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; to: "background"; }
-                                       rel2 { relative: 1.0 0.1; to: "background"; }
-       
-                               }       
-                       }
-                  
-                  part 
-                       {
-                               name: "body";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description 
-                               {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 85/MAIN_H;  to, "background"; }
-                                       rel2 { relative: 1.0 1.0;  to, "background"; }
-                               }
-                       }   
-               }       
-    }
-
-group {
-       name: "without-seven-account-entries1";
-       min: 470 25+52+27;
-       max: 470 25+52+27;
-       parts {
-               part { 
-                   name: "bg";
-                       type: RECT;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               color: 74 74 74 255;
-                               rel1 { relative: 0.0 0.0; offset: 0 0; }
-                               rel2 { relative: 1.0 1.0; offset: 0 0; }
-                               }
-               }
-       
-        part { 
-                   name: "background-strip";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 0;  to: bg; }
-                               rel2 { relative: 1.0 1.0; offset: -10 0; to: bg; }
-                               image { normal: "myaccount_bg.png";}
-                           }
-                    }                  
-
-               part { 
-                   name: "bada";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       scale: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 25; to: "background-strip"; }
-                               rel2 { relative: 0.0 0.0; offset: 14+52 25+52; to: "background-strip"; }
-                               image { normal: "bada.png";}
-                           }
-               
-                    }          
-                               
-               part { 
-                   name: "name";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14+52+10 0;  to: "background-strip"; }
-                               text { text: "bada"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }
-     }
-   }           
- group {
-       name: "without-seven-account-entries2";
-       min: 470 110;
-       max: 470 110;
-       parts {
-               part { 
-                   name: "bg";
-                       type: RECT;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               color: 74 74 74 255;
-                               rel1 { relative: 0.0 0.0; offset: 0 0; }
-                               rel2 { relative: 1.0 1.0; offset: 0 0; }
-                               }
-               }
-          
-          part { 
-                   name: "Web Accounts";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 0.0;  to: "bg"; }
-                               text { text: "Web Accounts"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }
-               
-          part 
-                       {
-                               name: "Web-Sync-schedule";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description 
-                               { 
-                                   min: 106 50;
-                                   max: 106 50;
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 364 10; to: "bg"; }
-                                       rel2 { relative: 0.0 0.0; offset: 470 60; to: "bg"; }
-                               }
-                       }
-                       
-        part { 
-                   name: "background-strip1";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 70;  to: "bg"; }
-                               rel2 { relative: 1.0 0.0; offset: -10 170; to: "bg"; }
-                               image { normal: "myaccount_bg.png";}
-                           }
-                    }                  
-
-                               
-               part { 
-                   name: "without-seven-user-name1";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 35;  to: "background-strip1"; }
-                               text { text: "Joe"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }
-               
-               part { 
-                   name: "without-seven-email-id1";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 90;  to: "background-strip1"; }
-                               text { text: "Joe@hotmail.com"; font: "GP_Latin"; size: 20; align: 0.0 0.5;}
-                               color: 255 255 0 255;
-                       }
-               }
-               
-               part { 
-                   name: "background-strip2";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 170;  to: "bg"; }
-                               rel2 { relative: 1.0 0.0; offset: -10 270; to: "bg"; }
-                               image { normal: "myaccount_bg.png";}
-                           }
-                    }                  
-               
-                               
-               part { 
-                   name: "user-name2";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 135;  to: "background-strip2"; }
-                               text { text: "Brin"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }
-               
-               part { 
-                   name: "email-id2";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 190;  to: "background-strip2"; }
-                               text { text: "brin@yahoo.com"; font: "GP_Latin"; size: 20; align: 0.0 0.5;}
-                               color: 255 255 0 255;
-                       }
-               }
-                       
-
-               
-        part { 
-                   name: "Exchange ActiveSync";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 268+146+5+38+78;  to: "bg"; }
-                               text { text: "Exchange ActiveSync"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }
-               
-               part 
-                       {
-                               name: "Sync schedule";
-                               //type: TEXT;
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description 
-                               { 
-                                   min: 106 50;
-                                   max: 106 50;
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 354 268+146+5+38+52; to: "bg"; }
-                               }
-                       }
-                       
-               
-           part { 
-                   name: "background-strip4";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 270+50+10+10;  to: "bg"; }
-                               rel2 { relative: 1.0 0.0; offset: -10 370+50+10; to: "bg"; }
-                               image { normal: "myaccount_bg.png";}
-                           }
-                    }                  
-               
-               
-               
-                                               
-               part { 
-                   name: "Exchange ActiveSync-name1";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 300;  to: "background-strip4"; }
-                               text { text: "Joe"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }       
-                       
-               part { 
-                   name: "Exchange ActiveSync-userid1";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 295+55;  to: "background-strip4"; }
-                               text { text: "joe@hotmail.com"; font: "GP_Latin"; size: 20; align: 0.0 0.5;}
-                               color: 255 255 0 255;
-                       }
-               }       
-               
-               
-               
-               part { 
-                   name: "background-strip5";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 370+50+10;  to: "bg"; }
-                               rel2 { relative: 1.0 0.0; offset: -10 370+50+10+100; to: "bg"; }
-                               image { normal: "myaccount_bg.png";}
-                           }
-                    }                  
-               
-               
-                               
-               part { 
-                   name: "Exchange ActiveSync-name2";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 328+100-33;  to: "background-strip5"; }
-                               text { text: "Brin"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }
-               
-       part { 
-                   name: "Exchange ActiveSync-userid2";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 328+100-33+55;  to: "background-strip5"; }
-                               text { text: "brin@yahoo.com"; font: "GP_Latin"; size: 20; align: 0.0 0.5;}
-                               color: 255 255 0 255;
-                       }
-               }
-               
-               
-               
-       part { 
-                   name: "Social Networks";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 268+146+5+38+90+510;  to: "bg"; }
-                               text { text: "Social Networks"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }
-               
-               part 
-                       {
-                               name: "Social-networks-Sync-schedule";
-                               //type: TEXT;
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description 
-                               { 
-                                   min: 106 50;
-                                   max: 106 50;
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 354 268+146+5+38+78+495; to: "bg"; }
-                               }
-                       }
-                       
-               
-           part { 
-                   name: "background-strip6";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 268+146+5+38+144;  to: "bg"; }
-                               rel2 { relative: 1.0 0.0; offset: -10 368+146+5+38+144; to: "bg"; }
-                               image { normal: "myaccount_bg.png";}
-                           }
-                    }                  
-               
-               
-               
-                                               
-       part { 
-                   name: "social-network-img1";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       scale: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 22; to: "background-strip6"; }
-                               rel2 { relative: 0.0 0.0; offset: 14+52 25+52; to: "background-strip6"; }
-                               image { normal: "twitter.png";}
-                           }
-                    }  
-                                               
-               part { 
-                   name: "social-network-name1";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14+52+10 540;  to: "background-strip6"; }
-                               text { text: "Twitter"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }       
-                       
-               part { 
-                   name: "social-network-userid1";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14+52+10 540+65;  to: "background-strip6"; }
-                               text { text: "terry.joo"; font: "GP_Latin"; size: 20; align: 0.0 0.5;}
-                               color: 255 255 0 255;
-                       }
-               }       
-               
-               
-               
-               part { 
-                   name: "background-strip7";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 10 368+146+5+38+134;  to: "bg"; }
-                               rel2 { relative: 1.0 0.0; offset: -10 468+146+5+38+134; to: "bg"; }
-                               image { normal: "myaccount_bg.png";}
-                           }
-                    }                  
-               
-               
-               part { 
-                   name: "bada4";
-                       type: IMAGE;
-                       mouse_events: 1;
-                       scale: 1;
-                       description 
-                           {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14 22; to: "background-strip7"; }
-                               rel2 { relative: 0.0 0.0; offset: 14+52 25+52; to: "background-strip7"; }
-                               image { normal: "facebook.png";}
-                           }
-                    }          
-                               
-               part { 
-                   name: "social-network-name2";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14+52+10 640;  to: "background-strip7"; }
-                               text { text: "Facebook"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                               color: 255 255 255 255;
-                       }
-               }
-               
-       part { 
-                   name: "social-network-userid2";
-                       type: TEXT;
-                       scale: 1;
-                       mouse_events: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; offset: 14+52+10 640+65;  to: "background-strip7"; }
-                               text { text: "rohit.sahay"; font: "GP_Latin"; size: 20; align: 0.0 0.5;}
-                               color: 255 255 0 255;
-                       }
-               }                                                                                                               
-       }
-  }
-       
diff --git a/data/edc/inc.pre-set.edc b/data/edc/inc.pre-set.edc
deleted file mode 100755 (executable)
index e525d56..0000000
+++ /dev/null
@@ -1,455 +0,0 @@
-#define MAIN_W 480
-#define MAIN_H 800
-#define TITLE_BAR_H (100/800)
-
-images
-{
-  image: "bg.png" LOSSY 99;
-  image: "gmail.png" LOSSY 99;
-  image: "01_button_on_lighting.png" LOSSY 99;
-  image: "01_on_off_button_on.png" LOSSY 99;
-  image: "01_on_off_button.png" LOSSY 99;
-}
-
-
-       group {
-               name: "preset-web";
-               min: MAIN_W MAIN_H;
-
-               parts {
-                       part { name: "background";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-                       part { name: "body";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       //rel1 { relative: 0.0 80/MAIN_H; offset: 0 0; }
-                                       rel1 { relative: 0.0 TITLE_BAR_H/MAIN_H; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                               }
-                       }
-                       part
-                       {
-                               name: "softkey";
-                                type: SWALLOW;
-                                mouse_events: 1;
-
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.9; to: "background"; }
-                                        rel2 { relative: 1.0 1.0; to: "background"; }
-                                 
-                                }
-                        }   
-                        part
-                        {
-                                name: "titlebar";
-                                type: SWALLOW;
-                                mouse_events: 0;
-
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; to: "background"; }
-                                        rel2 { relative: 1.0 TITLE_BAR_H; to: "background"; }
-
-                                }
-                        }
-               }
-       }
-
-#if 0
-       
-       group {
-               name: "account-information";
-               min: 480 102;
-               //max: 480 800-88;
-               parts {
-                       part {
-                               name: "bg";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       color: 74 74 74 255;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: 0 0; }
-                                }
-                       }
-
-                       part {
-                               name: "background-account-info1";
-                               type: IMAGE;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 10 0;  to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; offset: -10 102; to: "bg"; }
-                                       image { normal: "myaccount_bg.png";}
-                               }
-                       }
-                       part {
-                               name: "gmail-icon";
-                                       type: IMAGE;
-                               mouse_events: 1;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 14 25; to: "background-account-info1"; }
-                                       rel2 { relative: 0.0 0.0; offset: 14+52 25+52; to: "background-account-info1"; }
-                                       image { normal: "gmail.png";}
-                               }
-
-                       }
-
-                       part {
-                               name: "gmail-name";
-                               type: TEXT;
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 14+52+10 0;  to: "background-account-info1"; }
-                                       text { text: "sean"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                       //text { text: ""; font: "GP_Latin"; size: 24; align: 0.0 0.5;}                                 
-                                       color: 255 255 255 255;
-                               }
-                       }
-                       
-                        part {
-                                name: "gmail-id";
-                                type: TEXT;
-                                scale: 1;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 14+52+10 65;  to: "background-account-info1"; }
-                                        text { text: "sean@gmail.com"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                        color: 255 255 0 255;
-                                }
-                        }
-                       
-                        part {
-                                name: "background-account-info2";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 10 103;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 205; to: "bg"; }
-                                        image { normal: "myaccount_bg.png";}
-                                }
-                        }
-                        part {
-                                name: "gmail-id";
-                                type: TEXT;
-                                scale: 1;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 103;  to: "background-account-info2"; }
-                                        //text { text: "sean@gmail.com"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                        text { text: ""; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                        color: 255 255 255 255;
-                                }
-                        }
-
-                         part {
-                                name: "background-account-info3";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 10 205+8-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 205+8+99-102; to: "bg"; }
-                                        image { normal: "bg.png";}
-                                }
-                       }
-                        part {
-                                name: "email-button-on-lighting";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 365 205+8-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 205+8+99-102; to: "bg"; }
-                                        image { normal: "01_button_on_lighting.png";}
-                                }
-                        }
-                       part {
-                                name: "email-on-off";
-                                type: IMAGE;
-                                mouse_events: 0;
-                                description {
-                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 28 24;  to: "email-button-on-lighting"; }
-                                       rel2 { relative: 0.0 0.0; offset: 78 74; to: "email-button-on-lighting"; }
-                                        image { normal: "01_on_off_button_on.png";}
-                                }
-                                description {
-                                        state: "off" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 28 24;  to: "email-button-on-lighting"; }
-                                        rel2 { relative: 0.0 0.0; offset: 78 74; to: "email-button-on-lighting"; }
-                                        image { normal: "01_on_off_button.png";}
-                                }
-
-                        }
-
-
-                        part {
-                                name: "email";
-                                type: TEXT;
-                                scale: 1;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 213-102;  to: "background-account-info3"; }
-                                        text { text: "Email"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                        color: 255 255 255 255;
-                                }
-                        }
-
-                       part {
-                                name: "background-account-info4";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 10 312+2-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 312+2+99-102; to: "bg"; }
-                                        image { normal: "myaccount_bg.png";}
-                                }
-                        }
-                       part {
-                                name: "im-button-on-lighting";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 365 312+2-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 312+2+99-102; to: "bg"; }
-                                        image { normal: "01_button_on_lighting.png";}
-                                }
-                        }
-                       part {
-                                name: "im-on-off";
-                                type: IMAGE;
-                                mouse_events: 0;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 24;  to: "im-button-on-lighting"; }
-                                        rel2 { relative: 0.0 0.0; offset: 78 74; to: "im-button-on-lighting"; }
-                                        image { normal: "01_on_off_button_on.png";}
-                                }
-                                 description {
-                                        state: "off" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 24;  to: "im-button-on-lighting"; }
-                                        rel2 { relative: 0.0 0.0; offset: 78 74; to: "im-button-on-lighting"; }
-                                        image { normal: "01_on_off_button.png";}
-                                }
-
-                        }
-                        part {
-                                name: "Instant-messenger";
-                                type: TEXT;
-                                scale: 1;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 314-102;  to: "background-account-info4"; }
-                                        text { text: "Instant messenger"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                        color: 255 255 255 255;
-                                }
-                        }
-
-                        part {
-                                name: "background-account-info5";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 10 413+2-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 413+2+99-102; to: "bg"; }
-                                        image { normal: "myaccount_bg.png";}
-                                }
-                        }
-                        part {
-                                name: "contact-sync-button-on-lighting";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 365 413+2-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 413+2+99-102; to: "bg"; }
-                                        image { normal: "01_button_on_lighting.png";}
-                                }
-                        }
-                        part {
-                                name: "contact-sync-on-off";
-                                type: IMAGE;
-                                mouse_events: 0;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 24;  to: "contact-sync-button-on-lighting"; }
-                                        rel2 { relative: 0.0 0.0; offset: 78 74; to: "contact-sync-button-on-lighting"; }
-                                        image { normal: "01_on_off_button.png";}
-                                }
-                                 description {
-                                        state: "on" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 24;  to: "contact-sync-button-on-lighting"; }
-                                        rel2 { relative: 0.0 0.0; offset: 78 74; to: "contact-sync-button-on-lighting"; }
-                                        image { normal: "01_on_off_button_on.png";}
-                                }
-
-                        }
-
-
-                        part {
-                                name: "contact-sync";
-                                type: TEXT;
-                                scale: 1;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 415-102;  to: "background-account-info5"; }
-                                        text { text: "Contact sync"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                        color: 255 255 255 255;
-                                }
-                        }
-
-                        part {
-                                name: "background-account-info6";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 10 514+2-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 514+2+99-102; to: "bg"; }
-                                        image { normal: "myaccount_bg.png";}
-                                }
-                        }
-                        part {
-                                name: "calendar-sync-button-on-lighting";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 365 514+2-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 514+2+99-102; to: "bg"; }
-                                        image { normal: "01_button_on_lighting.png";}
-                                }
-                        }
-                        part {
-                                name: "calendar-sync-on-off";
-                                type: IMAGE;
-                                mouse_events: 0;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 24;  to: "calendar-sync-button-on-lighting"; }
-                                        rel2 { relative: 0.0 0.0; offset: 78 74; to: "calendar-sync-button-on-lighting"; }
-                                        image { normal: "01_on_off_button.png";}
-                                }
-                                 description {
-                                        state: "on" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 24;  to: "calendar-sync-button-on-lighting"; }
-                                        rel2 { relative: 0.0 0.0; offset: 78 74; to: "calendar-sync-button-on-lighting"; }
-                                        image { normal: "01_on_off_button_on.png";}
-                                }
-
-                        }
-                       part {
-                                name: "calendar-sync";
-                                type: TEXT;
-                                scale: 1;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 516-102;  to: "background-account-info6";} 
-                                        text { text: "Calendar sync"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                        color: 255 255 255 255;
-                                }
-                        }
-                       part {
-                                name: "background-account-info7";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 10 623-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 623+104-102; to: "bg"; }
-                                        image { normal: "myaccount_bg.png";}
-                                }
-                        }
-
-                        part {
-                                name: "sync-schedule-button-on-lighting";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 365 623-102;  to: "bg"; }
-                                        rel2 { relative: 1.0 0.0; offset: -10 623+104-102; to: "bg"; }
-                                        image { normal: "01_button_on_lighting.png";}
-                                }
-                        }
-                       part {
-                                name: "sync-schedule-on-off";
-                                type: IMAGE;
-                                mouse_events: 0;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 24;  to: "sync-schedule-button-on-lighting"; }
-                                        rel2 { relative: 0.0 0.0; offset: 78 74; to: "sync-schedule-button-on-lighting"; }
-                                        image { normal: "01_on_off_button_on.png";}
-                                }
-                                 description { 
-                                        state: "off" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 24;  to: "sync-schedule-button-on-lighting"; }
-                                        rel2 { relative: 0.0 0.0; offset: 78 74; to: "sync-schedule-button-on-lighting"; }
-                                        image { normal: "01_on_off_button.png";}
-                                }
-                        }
-                        part {
-                                name: "sync-schedule";
-                                type: TEXT;
-                                scale: 1;
-                                mouse_events: 1;
-                                description {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; offset: 28 623-102;  to: "background-account-info7";}
-                                        text { text: "Sync schedule"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                        color: 255 255 255 255;
-                                }
-                        }
-                        
-               }
-       programs {
-               program {
-                               /* 
-                                name: "on-off-email";
-                                source: "email-button-on-lighting"; 
-                                signal: "mouse,clicked,1"; 
-                                action: SIGNAL_EMIT "email-on-off-clicked" "email-button-on-lighting";
-                               */
-
-                                name: "on-off-email";
-                                source: "email-button-on-lighting"; 
-                                signal: "mouse,clicked,1"; 
-                                action: SIGNAL_EMIT "on-off-email" "";
-               }
-       }
-}
-
-       
-#endif
\ No newline at end of file
diff --git a/data/edc/inc.preset_email.edc b/data/edc/inc.preset_email.edc
deleted file mode 100755 (executable)
index d640d8b..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-
-       group {
-               name: "pre-set-email";
-               min: MAIN_W MAIN_H;
-
-               parts {
-                       part { name: "background";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 0;
-                               }
-                       }
-               
-                       part
-                       {
-                               name: "softkey";
-                                type: SWALLOW;
-                                mouse_events: 1;
-
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.9; to: "background"; }
-                                        rel2 { relative: 1.0 1.0; to: "background"; }
-                                 
-                                }
-                        }   
-                        part
-                        {
-                                name: "titlebar";
-                                type: SWALLOW;
-                                mouse_events: 0;
-
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        rel1 { relative: 0.0 0.0; to: "background"; }
-                                        rel2 { relative: 1.0 TITLE_BAR_H; to: "background"; }
-
-                                }
-                        }
-               }
-       }
-       
-       group {
-               name: "preset_email_setting_entries";
-               
-               parts {
-       
-                       part { name: "bg";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 480 112;
-                                       max: 480 112;
-                                       color:255 255 255 0;
-                                       visible: 0;
-                               }
-                       }
-               
-                       part { name: "img";
-                               type: IMAGE;
-                               mouse_events: 1;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 10 0; to: bg; }
-                                       rel2 { relative: 1.0 1.0; offset: -10 -8; to: bg; }
-                                       image { normal: "myaccount_bg.png";}
-                               }
-                       }
-               
-                       part { name: "name";
-                               type: TEXT;
-                               mouse_events: 1;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 14/480 0.05; offset: 18 0;  to: bg; }
-                                       rel2 { relative: 0.8 0.30; to: bg; }
-                               //      text { text: "Account name"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                       text { font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                       color: 146 146 146 255;
-                               }
-                       }
-               
-                       part { name: "entry";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               scale: 1;
-                               description {
-                                       state: default 0.0;
-                                       rel1 { relative: 14/480 0.35; offset: 18 0; to: bg;  }
-                                       rel2 { relative: 0.9 0.7; to: bg; }
-                               }
-                       }
-               }
-       }
-        
diff --git a/data/edc/inc.sns-account.edc b/data/edc/inc.sns-account.edc
deleted file mode 100755 (executable)
index 4b0a3ef..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-group
-{
-       name: "snsaccount_ui";
-       min: MAIN_W MAIN_H;
-
-       parts {      
-         part { name: "rect";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 0 0; }
-                                       rel2 { relative: 1.0 1.0; offset: -1 -1; }
-                                       //color: 74 74 74 255;
-                                       color: 0 0 0 255;
-                               }
-                       }
-         
-               part
-               {
-
-                       name, "titlebar";
-                       type, SWALLOW;
-                       mouse_events, 0;
-                       description
-                       {
-                               state, "default" 0.0;
-                               rel1 { relative, 0.0 0.0; to, "rect";}
-                               rel2 { relative, 1.0 82/800; to, "rect";}
-                       }
-               }
-               
-               part
-               {
-                       name: "softkey";
-                       type: SWALLOW;
-                       mouse_events: 1;
-
-                       description
-                       {
-                               state: "default" 0.0;
-                               color: 0 0 0 128;
-                               rel1 { relative: 0.0 0.9; to: "rect"; }
-                               rel2 { relative: 1.0 1.0; to: "rect"; }
-                       }
-               }
-       }
-}
-       group {
-               name: "sns_account_entries";
-               parts {
-                       part { name: "bg";
-                               type: RECT;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 480 104;
-                                       max: 480 104;
-                                       color:255 255 255 0;
-                                       visible: 0;
-                               }
-                       }
-               
-                       part { name: "img";
-                               type: IMAGE;
-                               mouse_events: 1;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; offset: 10 0; to: bg; }
-                                       rel2 { relative: 1.0 1.0; offset: -10 0; to: bg; }
-                                       image { normal: "myaccount_bg.png";}
-                               }
-                       }
-               
-                       part { name: "name";
-                               type: TEXT;
-                               mouse_events: 1;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 14/480 0.05;  to: bg; }
-                                       rel2 { relative: 0.8 0.30; to: bg; }
-                               //      text { text: "Account name"; font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                       text { font: "GP_Latin"; size: 24; align: 0.0 0.5;}
-                                       color: 146 146 146 255;
-                               }
-                       }
-               
-                       part { 
-                           name: "entry";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               scale: 1;
-                               description {
-                                       state: default 0.0;
-                                       rel1 { relative: 14/480 0.35; to: bg;  }
-                                       rel2 { relative: 0.9 0.7; to: bg; }
-                               }
-                       }
-                       
-                       /*part { 
-                           name: "button";
-                               type: SWALLOW;
-                               mouse_events: 1;
-                               scale: 1;
-                               description {
-                                       state: default 0.0;
-                                       min: 470 50;
-                                   max: 470 50;
-                                       rel1 { relative: 14/480 0.70; to: bg;  }
-                               }
-                       }*/
-               }
-       }
-
-
index 7604d35..986d8eb 100755 (executable)
@@ -5,8 +5,13 @@ collections {
 #define MAIN_H 800
 #endif
 
+#ifdef TIZEN_REDWOOD
 #define MAIN_W 720
 #define MAIN_H 1280
+#else
+#define MAIN_W 320
+#define MAIN_H 480
+#endif
 
 #define INDICATOR_H    27
 #define NAVI_H         67
diff --git a/data/edc/myaccount_button.edc b/data/edc/myaccount_button.edc
deleted file mode 100755 (executable)
index d0f27cc..0000000
+++ /dev/null
@@ -1,779 +0,0 @@
-collections {
-
-#if 0
-#define MAIN_W 480
-#define MAIN_H 800
-#endif
-#define MAIN_W 720
-#define MAIN_H 1280
-
-#define INDICATOR_H    27
-#define NAVI_H         67
-
-#define ACCOUNT_GENLIST_PART_BG_COLOR_INC 246 245 237 255 
-#define ACCOUNT_GENLIST_PART_BOTTOM_LINE_INC 212 212 212 255
-#define ACCOUNT_GENLIST_PART_TEXT_COLOR_INC 0 0 0 255
-#define ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC 225 225 225 255
-#define ACCOUNT_GENLIST_PART_SUB_TEXT_COLOR_INC 0 0 0 255
-
-   styles {
-      style { name: "textblock_style_variable_height";
-         base: "font=SLP:style=Roman font_size=32 align=left color=#000000 wrap=word";
-         tag:  "br" "\n";
-         tag:  "hilight" "+ font=SLP:style=Bold";
-         tag:  "b" "+ font=SLP:style=Bold";
-         tag:  "tab" "\t";
-      }
-
-      style { name: "subtextblock_style_variable_height";
-         base: "font=SLP:style=Roman font_size=22 align=left color=#696565 wrap=word";
-         tag:  "br" "\n";
-         tag:  "hilight" "+ font=SLP:style=Bold";
-         tag:  "b" "+ font=SLP:style=Bold";
-         tag:  "tab" "\t";
-      }
-   }
-
-#define BEAT_GENLIST_PART_BASE( param_item_height ) \
-         part { name: "base"; \
-            type: RECT; \
-            repeat_events: 1; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: 0 param_item_height; \
-               color: ACCOUNT_GENLIST_PART_BG_COLOR_INC; \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_BG \
-         part { name: "bg"; \
-            type: RECT; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               color: ACCOUNT_GENLIST_PART_BG_COLOR_INC; \
-            } \
-            description { state: "hide" 0.0; \
-               inherit: "default" 0.0; \
-               rel1 { relative: 0.025 0.0; } \
-               rel2 { relative: 1.025 1.0; } \
-            } \
-            description { state: "hide" 0.1; \
-               inherit: "default" 0.0; \
-               rel1 { relative: 0.13 0.0; } \
-               rel2 { relative: 1.13 1.0; } \
-            } \
-            description { state: "hide" 0.2; \
-               inherit: "default" 0.0; \
-               rel1 { relative: 0.5 0.0; } \
-               rel2 { relative: 1.5 1.0; } \
-            } \
-            description { state: "hide" 0.3; \
-               inherit: "default" 0.0; \
-               rel1 { relative: 1.0 0.0; } \
-               rel2 { relative: 2.0 1.0; } \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_BG_IMAGE \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               visible: 0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         }
-#define BEAT_GENLIST_PART_BOTTOM_LINE \
-         part { name: "bottom_line"; \
-            type: RECT; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               min: 0 1; \
-               fixed: 0 1; \
-               visible: 1; \
-               color: ACCOUNT_GENLIST_PART_BOTTOM_LINE_INC; \
-               rel1 { \
-                  relative: 0.0 1.0; \
-                  offset: 0 -1; \
-               } \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_PADDING_TOP( param_padding_size ) \
-       part { name: "elm.padding.top"; \
-            type: RECT; \
-            scale: 1; \
-            description { \
-               state: "default" 0.0; \
-               min: 0 param_padding_size; \
-               fixed: 0 1; \
-               visible: 0; \
-               rel2.relative: 1.0 0.0; \
-               align: 0.0 0.0; \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_PADDING_TEXT_TOP( param_padding_size ) \
-       part { name: "elm.padding.text.top"; \
-            type: RECT; \
-            scale: 1; \
-            description { \
-               state: "default" 0.0; \
-               min: 0 param_padding_size; \
-               fixed: 0 1; \
-               visible: 0; \
-               rel2.relative: 1.0 0.0; \
-               align: 0.0 0.0; \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_PADDING_BOTTOM( param_padding_size ) \
-       part { name: "elm.padding.bottom"; \
-            type: RECT; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: 0 param_padding_size; \
-               fixed: 0 1; \
-               visible: 0; \
-               rel1.relative: 0.0 1.0; \
-               align: 0.0 1.0; \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_PADDING_LEFT( param_padding_size ) \
-         part { name: "elm.padding.left"; \
-            type: RECT; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: param_padding_size 0; \
-               fixed: 1 0; \
-               visible: 0; \
-               rel2.relative: 0.0 1.0; \
-               align: 0.0 0.0; \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_PADDING_RIGHT( param_padding_size ) \
-       part { name: "elm.padding.right"; \
-            type: RECT; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: param_padding_size 0; \
-               fixed: 1 0; \
-               visible: 0; \
-               rel1.relative: 1.0  0.0; \
-               align: 1.0 0.0; \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_SWALLOW_END( param_padding_size ) \
-         part { name: "elm.padding.left.swallow.end"; \
-            clip_to: "disclip"; \
-            type: RECT; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: param_padding_size 0; \
-               fixed: 1 0; \
-               visible: 0; \
-               rel1.to_x: "elm.swallow.end"; \
-               rel2 { \
-                  relative: 0.0  1.0; \
-                  to_x: "elm.swallow.end"; \
-               } \
-               align: 1.0 0.5; \
-            } \
-         } \
-         part { name: "elm.swallow.end"; \
-            clip_to: "disclip"; \
-            type: SWALLOW; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               fixed: 1 0; \
-               align: 1.0 0.5; \
-               rel1.to_x: "elm.padding.right"; \
-               rel2 { \
-                  relative: 0.0  1.0; \
-                  to_x: "elm.padding.right"; \
-               } \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_DISCLIP \
-        part { name: "disclip"; \
-            type: RECT; \
-            description { state: "default" 0.0; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               color: 255 255 255 64; \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_LIST_PICKER_BASE( param_item_height ) \
-         part { name: "base"; \
-            type: RECT; \
-            repeat_events: 1; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: 0 param_item_height; \
-               color: 71 61 53 255; \
-            } \
-         }
-
-#define BEAT_GENLIST_PART_LIST_PICKER_BOTTOM_LINE \
-         part { name: "bottom_line"; \
-            type: RECT; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               min: 0 1; \
-               fixed: 0 1; \
-               visible: 1; \
-               color: 104 97 92 255; \
-               rel1 { \
-                  relative: 0.0 1.0; \
-                  offset: 0 -1; \
-               } \
-            } \
-         }
-
-
-group {
-      name: "elm/genlist/item/msp_more/default";
-      alias: "elm/genlist/tree/msp_more/default";
-      alias: "elm/genlist/item_odd/msp_more/default";
-      alias: "elm/genlist/tree_odd/msp_more/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "contents" "elm.swl.btn.r";
-      data.item: "treesize" "20";
-
-      parts
-      {
-       part { name: "elm.rect.padding.topleft";
-            type: RECT;
-            scale: 1;
-            description { 
-               state: "default" 0.0;
-               min: 10 0;
-               fixed: 1 1;
-                       rel2 { relative: 0.0  0.0; }
-                       color: 0 0 0 0; 
-               align: 0.0 0.0;
-            }
-         }
-                
-         part { name: "elm.rect.padding.bottom";
-            type: RECT;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               min: 0 0;
-               fixed: 0 1;
-               rel1 {
-                  relative: 0.0  1.0;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-               }
-               color: 0 0 0 0;
-               align: 0.0 1.0;
-            }
-         }
-#if 0         
-         part { name: "elm.rect.padding.bottom.line";
-            type: RECT;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               min: 0 1;
-               fixed: 0 1;
-               visible: 1;
-               color: ACCOUNT_GENLIST_PART_BOTTOM_LINE_INC;
-               rel1 {
-                  relative: 0.0  1.0;
-                offset: 0 -1;
-               }
-            }
-         }
-#endif         
-         part { name: "elm.rect.padding.topright";
-            type: RECT;
-            scale: 1;
-            description { 
-               state: "default" 0.0;
-               min: 10 0;
-               fixed: 1 1;
-                       rel1 { relative: 1.0  0.0; }
-                       rel2 { relative: 1.0  0.0; }
-                       color: 0 0 0 0; 
-               align: 1.0 0.0;
-            }
-         }
-
-              part { name: "elm.swl.btn.r";
-            scale: 1;
-            mouse_events: 1;
-            type: SWALLOW;
-            description {
-               state: "default" 0.0;
-               min: 0 74;
-               rel1 {
-                  to: "elm.rect.padding.topleft";
-                  relative: 1.0 1.0;
-               }
-               rel2 {
-                  to: "elm.rect.padding.topright";
-                  to_y: "elm.rect.padding.bottom";
-                  relative: 0.0 0.0;
-               }
-               align: 0.5 0.0;
-            }
-         }
-
-
-               }
-       }
-
-group {
-               name: "elm/genlist/item/help_text/default";
-     alias: "elm/genlist/tree/help_text/default";
-      alias: "elm/genlist/item_odd/help_text/default";
-      alias: "elm/genlist/tree_odd/help_text/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "contents" "elm.swl.help.text";
-      data.item: "treesize" "20";
-
-               parts
-               {
-               
-                       part { name: "elm.rect.padding.topleft";
-                   type: RECT;
-                   scale: 1;
-                   description { 
-                       state: "default" 0.0;
-                       min: 10 8;
-                       fixed: 1 1;
-                       rel2 { relative: 0.0  0.0; }
-                       color: 0 0 0 0; 
-                       align: 0.0 0.0;
-                   }
-                }
-                
-         part { name: "elm.rect.padding.bottom";
-            type: RECT;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               min: 0 20;
-               fixed: 0 1;
-               rel1 {
-                  relative: 0.0  1.0;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-               }
-               color: 0 0 0 0;
-               align: 0.0 1.0;
-            }
-         }
-         
-         part { name: "elm.rect.padding.topright";
-            type: RECT;
-            scale: 1;
-            description { 
-               state: "default" 0.0;
-               min: 10 8;
-               fixed: 1 1;
-                       rel1 { relative: 1.0  0.0; }
-                       rel2 { relative: 1.0  0.0; }
-                       color: 0 0 0 0; 
-               align: 1.0 0.0;
-            }
-         }
-
-              part { name: "elm.swl.help.text";
-            scale: 1;
-            mouse_events: 1;
-            type: SWALLOW;
-            description {
-               state: "default" 0.0;
-               min: 0 46;
-               rel1 {
-                  to: "elm.rect.padding.topleft";
-                  relative: 1.0 1.0;
-               }
-               rel2 {
-                  to: "elm.rect.padding.topright";
-                  to_y: "elm.rect.padding.bottom";
-                  relative: 0.0 0.0;
-               }
-               align: 0.5 0.0;
-            }
-         }
-
-
-               }
-       }
-
-       group {
-       name: "ug_effect_sample";
-       parts {
-               part {
-                       name: "clip";
-                       type: RECT;
-                       description {
-                       state: "default" 0.0;
-                       rel1 { relative: 1 0; }
-                       rel2 { relative: 2 1; }
-                       color: 255 255 255 0;
-               }
-                       description {
-                               state: "show" 0.0;
-                               rel1 { relative: 0 0; }
-                               rel2 { relative: 1 1; }
-                               color: 255 255 255 255;
-                       }
-               }
-               part {
-                       name: "elm.swallow.content";
-                       type: SWALLOW;
-                       clip_to: "clip";
-                       description {
-                               rel1.to: "clip";
-                               rel2.to: "clip";
-                       }
-               }
-               part {
-                       name: "event_blocker";
-                       description {
-                       state: "default" 0.0;
-                       visible: 1;
-                       }
-                       description {
-                               state: "show" 0.0;
-                               inherit: "default" 0.0;
-                       }
-                       description {
-                               state: "disabled" 0.0;
-                               inherit: "default" 0.0;
-                               visible: 0;
-                       }
-               }
-       }
-       programs {
-               program {
-                       name: "show";
-                       signal: "elm,state,show";
-                       action: STATE_SET "show" 0.0;
-                       target: "clip";
-                       target: "event_blocker";
-                       transition: "DECELERATE" 0.5;
-                       after: "show_end";
-               }       
-               program {
-                       name: "hide";
-                       signal: "elm,state,hide";
-                       action: STATE_SET "default" 0.0;
-                       target: "clip";
-                       target: "event_blocker";
-                       transition: "DECELERATE" 0.5;
-                       after: "hide_end";
-               }
-               program {
-                       name: "disable_event_blocker";
-                       signal: "elm,state,blocker,disabled";
-                       action: STATE_SET "disabled" 0.0;
-                       target: "event_blocker";
-               }
-               program {
-                       name: "disable_blocker";
-                       action: SIGNAL_EMIT "elm,state,blocker,disabled" "";
-               }
-               program {
-                       name: "show_end";
-                       action: SIGNAL_EMIT "elm,action,show,finished" "";
-                       after: "disable_blocker";
-               }
-               program {
-                       name: "hide_end";
-                       action: SIGNAL_EMIT "elm,action,hide,finished" "";
-                       after: "disable_blocker"; 
-               }
-       }
-}
-
-group { name: "elm/genlist/item/2line_textonly_color/default";
-      alias: "elm/genlist/item_odd/2line_textonly_color/default";
-
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-//    data.item: "texts" "elm.text elm.text.sub elm.text.push";
-      data.item: "texts" "elm.text elm.text.sub";
-      data.item: "contents" "elm.icon elm.icon.push";
-//    data.item: "contents" "elm.icon";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-
-      parts {
-         BEAT_GENLIST_PART_BASE( 90 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 15 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 15 )
-
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 50 50;
-               max: 50 50;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  offset: 0 0;
-                  to_x: "elm.padding.left";
-               }
-            }
-         }
-         part { name: "elm.padding.icon.right";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 15 0;
-               fixed: 1 0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
-               }
-               rel2.to_x: "elm.icon";
-               align: 0.0 0.0;
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            //changes the type from TEXTBLOCK to TEXT, to fix the H0100115592 issue; 
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 40;
-              max: 350 350;
-               fixed: 0 1;
-               align: 0 0;
-              color: ACCOUNT_GENLIST_PART_TEXT_COLOR_INC;
-              rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-              text {
-                  font: "Roman";
-                  size: 32;
-                  min: 0 1;
-                  align: 0 0.5;
-                   text_class: "list_item";
-                       }            
-               }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC;
-            }
-         }
-         part { name: "elm.text.sub";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 30;
-              // TO  position push icon max set 
-               max: 350 350;
-               fixed: 0 1;
-               color: 219 156 26 255;
-               align: 0.0 0.0;
-              rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.text";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text";
-               }
-               
-                text {
-                 font: "Roman";
-                 size: 22;     
-                  min: 0 1;
-                 align: 0 0.5;
-                       }            
-            }
-               description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC;
-            }
-         }
-// to enable push icon 
-       part { name: "elm.icon.push";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 50 50;
-               max: 50 50;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.text";
-                 to_y: "elm.text";
-               }
-               rel2 {
-                  offset: 0 0;
-                  to_x: "elm.text";
-                 to_y: "elm.text";
-              }
-            }
-         }
-
-//     part { name: "elm.text.push";
-//            clip_to: "disclip";
-//            type: TEXT;
-//            mouse_events: 0;
-//            scale: 1;
-//            description { state: "default" 0.0;
-//               min: 50 50;
-//               max: 50 50;
-//               fixed: 1 1;
-//               // color: ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC;
-//                color: 219 156 26 255;
-//               align: 0.0 0.5;
-//               rel1 {
-//                  relative: 1.0 0.0;
-//                  to_x: "elm.text.sub";
-//                  to_y: "elm.text.sub";
-//               }
-//               rel2 {
-//                  offset: 0 0;
-//                  to_x: "elm.text.sub";
-//                  to_y: "elm.text.sub";
-//               }
-//               text {
-//                  font: "Roman";
-//                  size: 20;
-//                  min: 0 1;
-//                 align: 0 0.5;
-//                  text_class: "list_item";
-//                }
-//
-//            }
-//            description { state: "selected" 0.0;
-//               inherit: "default" 0.0;
-//               color: ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC;
-//            }
-//         }
-       BEAT_GENLIST_PART_DISCLIP
-      }
-      programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            target: "elm.text.sub";
-           //target: "elm.text.push";
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            target: "elm.text.sub";
-           //target: "elm.text.push";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-        program {
-           name: "show";
-           signal: "elm,state,show";
-           action: STATE_SET "show" 0.0;
-           target: "bg_image";
-            target: "elm.text";
-            target: "elm.text.sub";
-           transition: "DECELERATE" 0.5;
-           after: "show_end";
-        }      
-        program {
-           name: "hide";
-           signal: "elm,state,hide";
-           action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            target: "elm.text.sub";
-           transition: "DECELERATE" 0.5;
-           after: "hide_end";
-        }
-        program {
-           name: "disable_event_blocker";
-            signal: "elm,state,blocker,disabled";
-           action: STATE_SET "disabled" 0.0;
-           target: "bg_image";
-        }
-        program {
-           name: "disable_blocker";
-           action: SIGNAL_EMIT "elm,state,blocker,disabled" "";
-        }
-        program {
-           name: "show_end";
-           action: SIGNAL_EMIT "elm,action,show,finished" "";
-           after: "disable_blocker";
-        }
-         program {
-           name: "hide_end";
-           action: SIGNAL_EMIT "elm,action,hide,finished" "";
-           after: "disable_blocker";
-        }
-      }
-   }
-
-}
-
index f84a4c4..660da19 100755 (executable)
@@ -1,29 +1,6 @@
 #include "myaccount_edc_image_macro.edc"
 
 collections {
-RESOURCE_IMAGE("00_list_bar_press_1x80.png");
-RESOURCE_IMAGE("01_samsungaccount.png");
-RESOURCE_IMAGE("66_myaccount_icon_facebook_50x50.png");
-RESOURCE_IMAGE("66_myaccount_icon_google_50x50.png");
-RESOURCE_IMAGE("66_myaccount_icon_msn_50x50.png");
-RESOURCE_IMAGE("66_myaccount_icon_push_deactivated.png");
-RESOURCE_IMAGE("66_myaccount_icon_push.png");
-RESOURCE_IMAGE("66_myaccount_icon_push_press.png");
-RESOURCE_IMAGE("66_myaccount_icon_twitter_50x50.png");
-RESOURCE_IMAGE("66_myaccount_icon_windows_live_50x50.png");
-RESOURCE_IMAGE("66_myaccount_icon_yahoo_50x50.png");
-RESOURCE_IMAGE("99_email.png");
-RESOURCE_IMAGE("cancel_sync.png");
-RESOURCE_IMAGE("exchange.png");
-RESOURCE_IMAGE("facebook.png");
-RESOURCE_IMAGE("flickr.png");
-RESOURCE_IMAGE("gmail.png");
-RESOURCE_IMAGE("icq.png");
-RESOURCE_IMAGE("myspace.png");
-RESOURCE_IMAGE("picasa.png");
-RESOURCE_IMAGE("refresh.png");
-RESOURCE_IMAGE("twitter.png");
-RESOURCE_IMAGE("youtube.png");
 RESOURCE_IMAGE("A01_2_Icon_default.png");
-RESOURCE_IMAGE("A01_2_Icon_others.png");
+RESOURCE_IMAGE("account_icon_syncing.png");
 }
diff --git a/data/edc/myaccount_nocontent.edc b/data/edc/myaccount_nocontent.edc
new file mode 100755 (executable)
index 0000000..971b471
--- /dev/null
@@ -0,0 +1,20 @@
+collections {
+   group { name: "nocontents_layout";
+   parts {
+      part { name: "contents";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+         }
+      }
+      part { name: "access";
+         type: RECT;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            rel1.to: "contents";
+            rel2.to: "contents";
+            color: 0 0 0 0;
+         }
+      }
+   }
+}
+}
diff --git a/data/myaccount_photo/00_list_bar_press_1x80.png b/data/myaccount_photo/00_list_bar_press_1x80.png
deleted file mode 100755 (executable)
index 0e0becb..0000000
Binary files a/data/myaccount_photo/00_list_bar_press_1x80.png and /dev/null differ
diff --git a/data/myaccount_photo/01_samsungaccount.png b/data/myaccount_photo/01_samsungaccount.png
deleted file mode 100755 (executable)
index 15fd926..0000000
Binary files a/data/myaccount_photo/01_samsungaccount.png and /dev/null differ
diff --git a/data/myaccount_photo/66_myaccount_icon_facebook_50x50.png b/data/myaccount_photo/66_myaccount_icon_facebook_50x50.png
deleted file mode 100755 (executable)
index ec022ce..0000000
Binary files a/data/myaccount_photo/66_myaccount_icon_facebook_50x50.png and /dev/null differ
diff --git a/data/myaccount_photo/66_myaccount_icon_google_50x50.png b/data/myaccount_photo/66_myaccount_icon_google_50x50.png
deleted file mode 100755 (executable)
index 151e3f5..0000000
Binary files a/data/myaccount_photo/66_myaccount_icon_google_50x50.png and /dev/null differ
diff --git a/data/myaccount_photo/66_myaccount_icon_msn_50x50.png b/data/myaccount_photo/66_myaccount_icon_msn_50x50.png
deleted file mode 100755 (executable)
index 786bb50..0000000
Binary files a/data/myaccount_photo/66_myaccount_icon_msn_50x50.png and /dev/null differ
diff --git a/data/myaccount_photo/66_myaccount_icon_push.png b/data/myaccount_photo/66_myaccount_icon_push.png
deleted file mode 100755 (executable)
index 66e9e5d..0000000
Binary files a/data/myaccount_photo/66_myaccount_icon_push.png and /dev/null differ
diff --git a/data/myaccount_photo/66_myaccount_icon_push_deactivated.png b/data/myaccount_photo/66_myaccount_icon_push_deactivated.png
deleted file mode 100755 (executable)
index 34d0a95..0000000
Binary files a/data/myaccount_photo/66_myaccount_icon_push_deactivated.png and /dev/null differ
diff --git a/data/myaccount_photo/66_myaccount_icon_push_press.png b/data/myaccount_photo/66_myaccount_icon_push_press.png
deleted file mode 100755 (executable)
index cbad586..0000000
Binary files a/data/myaccount_photo/66_myaccount_icon_push_press.png and /dev/null differ
diff --git a/data/myaccount_photo/66_myaccount_icon_twitter_50x50.png b/data/myaccount_photo/66_myaccount_icon_twitter_50x50.png
deleted file mode 100755 (executable)
index d660ade..0000000
Binary files a/data/myaccount_photo/66_myaccount_icon_twitter_50x50.png and /dev/null differ
diff --git a/data/myaccount_photo/66_myaccount_icon_windows_live_50x50.png b/data/myaccount_photo/66_myaccount_icon_windows_live_50x50.png
deleted file mode 100755 (executable)
index 644a1c3..0000000
Binary files a/data/myaccount_photo/66_myaccount_icon_windows_live_50x50.png and /dev/null differ
diff --git a/data/myaccount_photo/66_myaccount_icon_yahoo_50x50.png b/data/myaccount_photo/66_myaccount_icon_yahoo_50x50.png
deleted file mode 100755 (executable)
index d74444b..0000000
Binary files a/data/myaccount_photo/66_myaccount_icon_yahoo_50x50.png and /dev/null differ
diff --git a/data/myaccount_photo/99_email.png b/data/myaccount_photo/99_email.png
deleted file mode 100755 (executable)
index 5170b34..0000000
Binary files a/data/myaccount_photo/99_email.png and /dev/null differ
index 3b39b6d..d14d39b 100755 (executable)
Binary files a/data/myaccount_photo/A01_2_Icon_default.png and b/data/myaccount_photo/A01_2_Icon_default.png differ
diff --git a/data/myaccount_photo/A01_2_Icon_others.png b/data/myaccount_photo/A01_2_Icon_others.png
deleted file mode 100755 (executable)
index 53c8f2b..0000000
Binary files a/data/myaccount_photo/A01_2_Icon_others.png and /dev/null differ
diff --git a/data/myaccount_photo/account_icon_syncing.png b/data/myaccount_photo/account_icon_syncing.png
new file mode 100644 (file)
index 0000000..62e1adc
Binary files /dev/null and b/data/myaccount_photo/account_icon_syncing.png differ
diff --git a/data/myaccount_photo/cancel_sync.png b/data/myaccount_photo/cancel_sync.png
deleted file mode 100755 (executable)
index 39a6cfc..0000000
Binary files a/data/myaccount_photo/cancel_sync.png and /dev/null differ
diff --git a/data/myaccount_photo/exchange.png b/data/myaccount_photo/exchange.png
deleted file mode 100755 (executable)
index 1947d90..0000000
Binary files a/data/myaccount_photo/exchange.png and /dev/null differ
diff --git a/data/myaccount_photo/facebook.png b/data/myaccount_photo/facebook.png
deleted file mode 100755 (executable)
index 3a45a7e..0000000
Binary files a/data/myaccount_photo/facebook.png and /dev/null differ
diff --git a/data/myaccount_photo/flickr.png b/data/myaccount_photo/flickr.png
deleted file mode 100755 (executable)
index 7c6df1f..0000000
Binary files a/data/myaccount_photo/flickr.png and /dev/null differ
diff --git a/data/myaccount_photo/gmail.png b/data/myaccount_photo/gmail.png
deleted file mode 100755 (executable)
index 0f7420b..0000000
Binary files a/data/myaccount_photo/gmail.png and /dev/null differ
diff --git a/data/myaccount_photo/icq.png b/data/myaccount_photo/icq.png
deleted file mode 100755 (executable)
index ac3372c..0000000
Binary files a/data/myaccount_photo/icq.png and /dev/null differ
diff --git a/data/myaccount_photo/myaccount_bg.png b/data/myaccount_photo/myaccount_bg.png
deleted file mode 100755 (executable)
index 7f21fd9..0000000
Binary files a/data/myaccount_photo/myaccount_bg.png and /dev/null differ
diff --git a/data/myaccount_photo/myspace.png b/data/myaccount_photo/myspace.png
deleted file mode 100755 (executable)
index e7676ed..0000000
Binary files a/data/myaccount_photo/myspace.png and /dev/null differ
diff --git a/data/myaccount_photo/picasa.png b/data/myaccount_photo/picasa.png
deleted file mode 100755 (executable)
index 6a5e39f..0000000
Binary files a/data/myaccount_photo/picasa.png and /dev/null differ
diff --git a/data/myaccount_photo/refresh.png b/data/myaccount_photo/refresh.png
deleted file mode 100755 (executable)
index c4ff7b3..0000000
Binary files a/data/myaccount_photo/refresh.png and /dev/null differ
diff --git a/data/myaccount_photo/tw3_list_select.png b/data/myaccount_photo/tw3_list_select.png
deleted file mode 100755 (executable)
index d283e8a..0000000
Binary files a/data/myaccount_photo/tw3_list_select.png and /dev/null differ
diff --git a/data/myaccount_photo/twitter.png b/data/myaccount_photo/twitter.png
deleted file mode 100755 (executable)
index 2e5c6d8..0000000
Binary files a/data/myaccount_photo/twitter.png and /dev/null differ
diff --git a/data/myaccount_photo/youtube.png b/data/myaccount_photo/youtube.png
deleted file mode 100755 (executable)
index 5b3a776..0000000
Binary files a/data/myaccount_photo/youtube.png and /dev/null differ
diff --git a/icon_myaccount.png b/icon_myaccount.png
deleted file mode 100644 (file)
index 5e2ccbb..0000000
Binary files a/icon_myaccount.png and /dev/null differ
index 3470735..26de5c5 100755 (executable)
-/*\r
- * Copyright 2012  Samsung Electronics Co., Ltd\r
- *\r
- * Licensed under the Flora License, Version 1.1 (the License);\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://floralicense.org/license/\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an AS IS BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#ifndef _MYACCOUNT_H_\r
-#define _MYACCOUNT_H_\r
-\r
-#include <glib.h>\r
-#include <Elementary.h>\r
-#include <stdio.h>\r
-#include <vconf-keys.h>\r
-#include <bundle.h>\r
-#include <ui-gadget-module.h>\r
-#include <package-manager.h>\r
-#include <account-types.h>\r
-#include "Eina.h"\r
-\r
-#ifndef LOG_TAG\r
-#define LOG_TAG "MYACCOUNT"\r
-#endif\r
-\r
-#include <dlog.h>\r
-\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif /* __cplusplus */\r
-\r
-\r
-#ifndef PREFIX\r
-#  define PREFIX "/usr"\r
-#endif\r
-\r
-#define MYACCOUNT_VERBOSE(fmt, arg...) \\r
-               LOGI(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
-#define MYACCOUNT_DBUG(fmt, arg...) \\r
-               LOGD(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
-#define MYACCOUNT_INFO(fmt, arg...) \\r
-               LOGI(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
-#define MYACCOUNT_WARNING(fmt, arg...) \\r
-               LOGW(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
-#define MYACCOUNT_ERROR(fmt, arg...) \\r
-               LOGE(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
-#define MYACCOUNT_FATAL(fmt, arg...) \\r
-               LOGF(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
-\r
-#define _EDJ(obj) elm_layout_edje_get(obj)\r
-/*#define dgettext_noop(s)     (s) */\r
-/*#define N_(s)                        dgettext_noop(s)*/\r
-\r
-#define PACKAGE "myaccount"\r
-#define LOCALEDIR PREFIX"/usr/ug/res/locale"\r
-\r
-#define IMAGE_PATH "/usr/ug/res/images/ug-setting-myaccount-efl"\r
-\r
-/*#define MYACCOUNT_EDJ_PATH PREFIX"/share/edje/"*/\r
-#define MYACCOUNT_EDJ_PATH PREFIX"/usr/ug/res/edje/myaccount"\r
-#define MYACCOUNT_EDJ_NAME MYACCOUNT_EDJ_PATH"/myaccount.edj"\r
-#define MYACCOUNT_GRP_MAIN "main"\r
-\r
-typedef enum {\r
-       eMYACCOUNT_ACCOUNT_LIST,\r
-       eMYACCOUNT_ADD_ACCOUNT,\r
-} myaccount_mode_e;\r
-\r
-\r
-typedef struct appdata {\r
-       Evas_Object *base;\r
-       ui_gadget_h ug;\r
-\r
-       Evas_Object *navi_bar;\r
-       Evas_Object *win_main;\r
-       Elm_Object_Item *navi_it;\r
-       myaccount_mode_e eMode;\r
-\r
-       /* For accounts list*/\r
-       Evas_Object *layout_main;\r
-       Evas_Object *account_genlist;\r
-       Evas_Object *help_label;\r
-       Evas_Object *r_title_sk;\r
-       Evas_Object *l_title_sk;\r
-       Evas_Object *modal_popup;\r
-       Ecore_Timer *progress_timer;\r
-       Evas_Object *auto_sync_check;\r
-       Evas_Object *refresh_btn;\r
-       Evas_Object *refresh_icon;\r
-       Evas_Object *cancel_sync_icon;\r
-\r
-       Evas_Object *bg;\r
-\r
-       /* For addaccount view*/\r
-       Evas_Object *layout_addaccount;\r
-       Evas_Object *ly;\r
-       Evas_Object *add_genlist;\r
-       bool item_selected_state;\r
-       GList* sp_info_list;\r
-       GList* sorted_sp_list;\r
-\r
-       /* to hold info about key lock*/\r
-       int lock_priv_state;\r
-       int lock_curr_state;\r
-       ui_gadget_h ug_called;\r
-       Ecore_X_Window win_id;\r
-\r
-       /*package manager client handle */\r
-       pkgmgr_client *pc;\r
-\r
-       /* extra data from ug caller */\r
-       char *capability_filter;\r
-       char *caller_userdata;\r
-       char *called_from;\r
-       account_subscribe_h account_subscribe;\r
-}myaccount_appdata;\r
-\r
-int myaccount_account_info_update(struct appdata *ad);\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif /* __cplusplus */\r
-\r
-\r
-#endif /* _MYACCOUNT_H_ */\r
-\r
+/*
+ *  my-account
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
+ *
+ * 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.
+ *
+ */
+
+#ifndef _MYACCOUNT_H_
+#define _MYACCOUNT_H_
+
+
+#include <glib.h>
+#include <Elementary.h>
+#include <stdio.h>
+#include <vconf-keys.h>
+#include <bundle.h>
+#include <ui-gadget-module.h>
+#include <package-manager.h>
+#include <account.h>
+#include <efl_assist.h>
+
+#include "Eina.h"
+
+
+#ifndef LOG_TAG
+#define LOG_TAG "MYACCOUNT"
+#endif
+
+#include <dlog.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+#ifndef PREFIX
+#  define PREFIX "/usr"
+#endif
+
+#define MYACCOUNT_VERBOSE(fmt, arg...) \
+               LOGD(": [%s (%d)]" fmt ,  __FUNCTION__, __LINE__, ##arg);
+#define MYACCOUNT_DBUG(fmt, arg...) \
+               LOGD(": [%s (%d)]" fmt ,  __FUNCTION__, __LINE__, ##arg);
+#define MYACCOUNT_WARNING(fmt, arg...) \
+               LOGW(": [%s (%d)]" fmt ,  __FUNCTION__, __LINE__, ##arg);
+#define MYACCOUNT_ERROR(fmt, arg...) \
+               LOGE(": [%s (%d)]" fmt ,  __FUNCTION__, __LINE__, ##arg);
+#define MYACCOUNT_FATAL(fmt, arg...) \
+               LOGF(": [%s (%d)]" fmt ,  __FUNCTION__, __LINE__, ##arg);
+
+#define MYACCOUNT_SLOGD(fmt, arg...) \
+               SECURE_LOGD(": [%s (%d)]" fmt ,  __FUNCTION__, __LINE__, ##arg);
+#define MYACCOUNT_SLOGI(fmt, arg...) \
+               SECURE_LOGD(": [%s (%d)]" fmt ,  __FUNCTION__, __LINE__, ##arg);
+#define MYACCOUNT_SLOGE(fmt, arg...) \
+               SECURE_LOGD(": [%s (%d)]" fmt ,  __FUNCTION__, __LINE__, ##arg);
+
+#define _EDJ(obj) elm_layout_edje_get(obj)
+/*#define dgettext_noop(s)     (s) */
+/*#define N_(s)                        dgettext_noop(s)*/
+
+#define PACKAGE "myaccount"
+//#define LOCALEDIR PREFIX"/usr/ug/res/locale"
+
+//#define IMAGE_PATH "/usr/ug/res/images/ug-setting-myaccount-efl"
+
+#define TIZEN_EMAIL_CSC_FILE_PATH "/opt/system/csc-default/data/csc-default-data-email-account.ini"
+#define TIZEN_EMAIL_CSC_SP_COUNT_KEY "email_account:count"
+#define TIZEN_EMAIL_CSC_SP_NAME_PREFIX "email_account:name_"
+
+/*#define MYACCOUNT_EDJ_PATH PREFIX"/share/edje/"*/
+//#define MYACCOUNT_EDJ_PATH PREFIX"/usr/ug/res/edje/myaccount"
+//#define MYACCOUNT_EDJ_NAME MYACCOUNT_EDJ_PATH"/myaccount.edj"
+#define MYACCOUNT_GRP_MAIN "main"
+#define SAMSUNG_ACCOUNT_APPID "gr47by21a5.SamsungAccount"
+#define TIZEN_ACCOUNT_APPID "t5ek35st3l.TizenAccount"
+#define TIZEN_EMAIL_APPID "email-setting-efl"
+#define EXCHANGE_UI_APPID "activesync-ui"
+#define GOOGLE_ACCOUNT_APPID "com.samsung.google-service-account"
+#define DROPBOX_APPID "com.samsung.dropbox"
+
+typedef enum {
+       eMYACCOUNT_ACCOUNT_LIST,
+       eMYACCOUNT_ADD_ACCOUNT,
+} myaccount_mode_e;
+
+
+typedef struct appdata {
+       Evas_Object *base;
+       ui_gadget_h ug;
+
+       Evas_Object *navi_bar;
+       Evas_Object *win_main;
+       Evas_Object *conformant;
+       Elm_Object_Item *navi_it;
+       myaccount_mode_e eMode;
+       Elm_Win_Indicator_Mode indi_mode;
+       Elm_Win_Indicator_Opacity_Mode indi_o_mode;
+       bool overlap_mode;
+
+       /* For accounts list*/
+       Evas_Object *layout_main;
+       Evas_Object *account_genlist;
+       Evas_Object *help_label;
+       Evas_Object *r_title_sk;
+       Evas_Object *modal_popup;
+       Ecore_Timer *progress_timer;
+       Evas_Object *auto_sync_check;
+       Evas_Object *refresh_btn;
+       Evas_Object *refresh_icon;
+       Evas_Object *cancel_sync_icon;
+       Elm_Object_Item *nf_it;
+       GList* account_info_list;
+       GList* sorted_account_list;
+
+       Evas_Object *bg;
+       Elm_Theme* theme;
+       /* For addaccount view*/
+       Evas_Object *layout_addaccount;
+       Evas_Object *ly;
+       Evas_Object *add_genlist;
+       bool item_selected_state;
+       GList* sorted_sp_list;
+       Elm_Object_Item *add_nf_it;
+       int prev_app_cnt;
+
+       /* to hold info about key lock*/
+       int lock_priv_state;
+       int lock_curr_state;
+       ui_gadget_h ug_called;
+       Ecore_X_Window win_id;
+
+       /* For application launch */
+       Ecore_Timer *relaunch_timer;
+       app_control_h appsvc_handle;
+
+       /* to block fast double-click */
+       Ecore_Timer *clickblock_timer;
+
+       /* languuage state */
+       char* current_language;
+
+       /*package manager client handle */
+       pkgmgr_client *pc;
+
+       /* extra data from ug caller */
+       char *capability_filter;
+       char *caller_userdata;
+       char *called_from;
+       account_subscribe_h account_subscribe;
+
+       Ea_Theme_Color_Table *color_table;
+       Eina_List *font_table;
+       Evas_Object *popup;
+}myaccount_appdata;
+
+int myaccount_account_info_update(struct appdata *ad);
+void myaccount_destroy_data();
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* _MYACCOUNT_H_ */
+
old mode 100755 (executable)
new mode 100644 (file)
index 3a31833..e238a52
@@ -1,37 +1,64 @@
-/*\r
- * Copyright 2012  Samsung Electronics Co., Ltd\r
- *\r
- * Licensed under the Flora License, Version 1.1 (the License);\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://floralicense.org/license/\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an AS IS BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#ifndef _MYACCOUNT_UG_ACCOUNT_LIST_H_\r
-#define _MYACCOUNT_UG_ACCOUNT_LIST_H_\r
-\r
-#include "myaccount_ug.h"\r
-\r
-void myaccount_list_view_create(myaccount_appdata *priv);\r
-\r
-void *myaccount_init_appdata();\r
-\r
-void *myaccount_get_appdata();\r
-\r
-void myaccount_list_refresh_item_list(myaccount_appdata *ad);\r
-\r
-void myaccount_ug_account_list_create(void *data);\r
-\r
-void myaccount_account_list_quit_cb( void *data,\r
-                                               Evas_Object *obj, void *event_info );\r
-\r
-\r
-#endif /* _MYACCOUNT_UG_ACCOUNT_LIST_H_ */\r
-\r
+/*
+ *  my-account
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
+ *
+ * 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.
+ *
+ */
+
+#ifndef _MYACCOUNT_UG_ACCOUNT_LIST_H_
+#define _MYACCOUNT_UG_ACCOUNT_LIST_H_
+
+#include "myaccount_ug.h"
+
+typedef struct __capability_data {
+       char* type;
+       int state;
+}myaccount_capability_data;
+
+typedef struct __account_list_priv {
+       int account_id;
+       char username[256];
+       char display_name[256];
+       char email_address[256];
+       char package_name[256];
+       char domain_name[60];
+       char icon_path[PATH_MAX];
+       char capability[128];
+       int secret;
+       int list_index;
+       int sync_status;
+       GSList *capablity_list;
+       bool b_tizen_email;
+       char service_sname[256];
+}myaccount_list_priv;
+
+void myaccount_list_view_create(myaccount_appdata *priv);
+void myaccount_list_navi_create(myaccount_appdata *priv);
+
+void *myaccount_init_appdata();
+
+void *myaccount_get_appdata();
+
+void myaccount_list_refresh_item_list(myaccount_appdata *ad);
+
+void myaccount_ug_account_list_create(void *data);
+
+Eina_Bool myaccount_account_list_quit_cb(void *data, Elm_Object_Item *it);
+
+
+#endif /* _MYACCOUNT_UG_ACCOUNT_LIST_H_ */
+
index 16a9d8c..9a6b087 100755 (executable)
@@ -1,45 +1,52 @@
-/*\r
- * Copyright 2012  Samsung Electronics Co., Ltd\r
- *\r
- * Licensed under the Flora License, Version 1.1 (the License);\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://floralicense.org/license/ \r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an AS IS BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#ifndef _MYACCOUNT_UG_ADD_ACCOUNT_H_\r
-#define _MYACCOUNT_UG_ADD_ACCOUNT_H_\r
-\r
-#include "myaccount_ug.h"\r
-#include "myaccount_ug_common.h"\r
-\r
-typedef struct __addaccount_list_priv {\r
-       char service_name[256];\r
-       char service_sname[256];\r
-       char package_name[256];\r
-       char icon_path[1024];\r
-       MyAccountProviderType sp_type;\r
-       bool b_tizen_email;\r
-       bool multiple_account_support;\r
-}addaccount_list_priv;\r
-\r
-void *myaccount_addaccount_create(ui_gadget_h ug,\r
-                                               enum ug_mode mode, service_h data, void *priv);\r
-\r
-void myaccount_addaccount_create_view(myaccount_appdata *ad);\r
-\r
-void myaccount_addaccount_free_priv_data(myaccount_appdata *appdata);\r
-\r
-void *myaccount_init_appdata();\r
-\r
-void *myaccount_get_appdata();\r
-\r
-#endif /* _MYACCOUNT_UG_ADD_ACCOUNT_H_ */\r
-\r
+/*
+ *  my-account
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
+ *
+ * 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.
+ *
+ */
+
+#ifndef _MYACCOUNT_UG_ADD_ACCOUNT_H_
+#define _MYACCOUNT_UG_ADD_ACCOUNT_H_
+
+#include "myaccount_ug.h"
+#include "myaccount_ug_common.h"
+
+typedef struct __addaccount_list_priv {
+       char service_name[256];
+       char service_sname[256];
+       char package_name[256];
+       char icon_path[1024];
+       MyAccountProviderType sp_type;
+       bool b_tizen_email;
+       bool multiple_account_support;
+}addaccount_list_priv;
+
+void *myaccount_addaccount_create(ui_gadget_h ug,
+                                               enum ug_mode mode, app_control_h data, void *priv);
+
+void myaccount_addaccount_create_view(myaccount_appdata *ad);
+
+void myaccount_addaccount_refresh_item_list(myaccount_appdata *ad);
+
+void myaccount_addaccount_free_priv_data(myaccount_appdata *appdata);
+
+void *myaccount_init_appdata();
+
+void *myaccount_get_appdata();
+
+#endif /* _MYACCOUNT_UG_ADD_ACCOUNT_H_ */
+
index e33fd1b..7d28f0c 100755 (executable)
-/*\r
- * Copyright 2012  Samsung Electronics Co., Ltd\r
- *\r
- * Licensed under the Flora License, Version 1.1 (the License);\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://floralicense.org/license/\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an AS IS BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#ifndef _MYACCOUNT_UG_COMMON_H_\r
-#define _MYACCOUNT_UG_COMMON_H_\r
-\r
-#include <Ecore_X.h>\r
-#include <Evas.h>\r
-#include <account.h>\r
-#include <app.h>\r
-#include <app_manager.h>\r
-#include <vconf.h>\r
-#include <package-manager.h>\r
-\r
-#define ENABLE_NOTI\r
-\r
-typedef enum {\r
-       MYACCOUNT_TYPE_ANONYMOUS,\r
-       MYACCOUNT_TYPE_CSC,\r
-       MYACCOUNT_TYPE_TIZEN,\r
-       MYACCOUNT_TYPE_OTHER\r
-}MyAccountProviderType;\r
-\r
-typedef enum {\r
-       MYACCOUNT_REQUEST_SIGNIN = 0,\r
-       MYACCOUNT_REQUEST_VIEW\r
-}MyAccountRequestViewType;\r
-\r
-void *myaccount_init_appdata();\r
-\r
-void myaccount_destroy_appdata();\r
-\r
-void *myaccount_get_appdata();\r
-\r
-void myaccount_common_get_icon_by_name(char *account_name,\r
-                                                                                       char *icon_path);\r
-\r
-void myaccount_common_lowercase(char* src, char* dest);\r
-\r
-Evas_Object *myaccount_common_progress_add(Evas_Object *parent);\r
-\r
-Evas_Object *myaccount_common_create_modal_popup(Evas_Object *parent);\r
-\r
-void myaccount_common_delete_modal_popup(Evas_Object *popup);\r
-\r
-Eina_Bool myaccount_common_modal_popup_timer_cb(gpointer data);\r
-\r
-bool myaccount_samsung_callback(char* result_code, char* user_id, void *user_data);\r
-\r
-\r
-int myaccount_common_launch_application(MyAccountRequestViewType\r
-                                                                                                       request_type,\r
-                                                                                                       char *package_name,\r
-                                                                                                       char *username,\r
-                                                                                                       char *email_sp,\r
-                                                                                                       int account_id,\r
-                                                                                                       MyAccountProviderType sp_type,\r
-                                                                                                       void *data );\r
-\r
-int myaccount_common_get_all_account_cnt(int *count);\r
-\r
-void myaccount_common_handle_notification(const char* event_type);\r
-\r
-void myaccount_common_listen_pkgmgr_for_pkg_uninstall();\r
-\r
-#define MA_UG_NAME "ug-setting-myaccount-efl"\r
-\r
-#define MA_IMAGE_EDJ_NAME "/usr/ug/res/edje/ug-setting-myaccount-efl/myaccount_edc_images.edj"\r
-\r
-#define BUFSIZE 1024\r
-\r
-#define MA_SNPRINTF(dest,size,format,arg...)   \\r
-       do { \\r
-                       snprintf(dest,size-1,format,##arg); \\r
-       }while(0)\r
-       /*      If the same pointer is passed to free twice,    known as a double free. To avoid this, set pointers to\r
-NULL after passing     them to free: free(NULL) is safe (it does nothing).\r
-        */\r
-\r
-#define MA_STRNCPY(dest,src,size)      \\r
-               do { \\r
-                       if(src != NULL && dest != NULL && size > 0) \\r
-                       {       \\r
-                               strncpy(dest,src,size-1); \\r
-                       }       \\r
-               }while(0);\r
-\r
-#define MA_MEMFREE(ptr)        \\r
-               if (ptr != NULL) {      \\r
-                       free(ptr);      \\r
-                       ptr = NULL; \\r
-               }       \\r
-\r
-#endif /* _MYACCOUNT_UG_COMMON_H_ */\r
-\r
+/*
+ *  my-account
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
+ *
+ * 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.
+ *
+ */
+
+#ifndef _MYACCOUNT_UG_COMMON_H_
+#define _MYACCOUNT_UG_COMMON_H_
+
+#include <Ecore_X.h>
+#include <Evas.h>
+#include <account.h>
+#include <app.h>
+#include <app_manager.h>
+#include <vconf.h>
+#include <package-manager.h>
+#include <efl_assist.h>
+#include <glib.h>
+
+#define ENABLE_NOTI
+
+typedef enum {
+       MYACCOUNT_TYPE_EXCHANGE = 0,
+       MYACCOUNT_TYPE_GOOGLE,
+//     MYACCOUNT_TYPE_MSN,
+//     MYACCOUNT_TYPE_FACEBOOK,
+       MYACCOUNT_TYPE_PICASA,
+       MYACCOUNT_TYPE_YOUTUBE,
+       MYACCOUNT_TYPE_OTHER,
+       MYACCOUNT_TYPE_SAMSUNG,
+       MYACCOUNT_TYPE_CSC,
+       MYACCOUNT_TYPE_TIZEN,
+       MYACCOUNT_TYPE_UNKNOWN
+}MyAccountProviderType;
+
+typedef enum {
+       MYACCOUNT_REQUEST_SIGNIN = 0,
+       MYACCOUNT_REQUEST_VIEW
+}MyAccountRequestViewType;
+
+void *myaccount_init_appdata();
+
+void myaccount_destroy_appdata();
+
+void *myaccount_get_appdata();
+
+void myaccount_common_set_item_selected_state(bool val);
+
+bool myaccount_common_get_item_selected_state();
+
+void myaccount_common_get_icon_by_name(char *account_name,
+                                                                                       char *icon_path);
+
+MyAccountProviderType myaccount_common_get_provider_type(
+                                                                                               char *package_name);
+
+void myaccount_common_lowercase(char* src, char* dest);
+
+Evas_Object *myaccount_common_progress_add(Evas_Object *parent);
+
+void myaccount_common_delete_modal_popup(Evas_Object *popup);
+
+Eina_Bool myaccount_common_modal_popup_timer_cb(gpointer data);
+
+bool myaccount_samsung_callback(char* result_code, char* user_id, void *user_data);
+
+
+int myaccount_common_launch_application(MyAccountRequestViewType
+                                                                                                       request_type,
+                                                                                                       char *package_name,
+                                                                                                       char *username,
+                                                                                                       char *email_sp,
+                                                                                                       int account_id,
+                                                                                                       MyAccountProviderType sp_type,
+                                                                                                       void *data );
+
+int myaccount_common_get_all_account_cnt(int *count);
+
+int myaccount_common_get_account_cnt_by_capability(const char* capability_type, int *count);
+
+int myaccount_common_get_account_cnt_by_appid(const char* appid, int *count);
+
+void myaccount_common_handle_notification(const char* event_type);
+
+void myaccount_common_listen_pkgmgr_for_pkg_uninstall();
+
+int myaccount_common_get_csc_sp_count(const char* capability_filter);
+
+int myaccount_common_get_account_type_count(const char* capability_filter);
+
+
+#define MA_UG_NAME "setting-myaccount-efl"
+
+#define MA_IMAGE_EDJ_NAME "/usr/apps/setting-myaccount-efl/res/edje/setting-myaccount-efl/myaccount_edc_images.edj"
+
+#define MA_NO_ACCOUNT_EDJ_NAME "/usr/apps/setting-myaccount-efl/res/edje/setting-myaccount-efl/myaccount_nocontent.edj"
+
+#define BUFSIZE 1024
+
+#define MA_SNPRINTF(dest,size,format,arg...)   \
+       do { \
+                       snprintf(dest,size-1,format,##arg); \
+       }while(0)
+       /*      If the same pointer is passed to free twice,    known as a double free. To avoid this, set pointers to
+NULL after passing     them to free: free(NULL) is safe (it does nothing).
+        */
+
+#define MA_STRNCPY(dest,src,size)      \
+               do { \
+                       if(src != NULL && dest != NULL && size > 0) \
+                       {       \
+                               strncpy(dest,src,size-1); \
+                       }       \
+               }while(0);
+
+#define MA_MEMFREE(ptr)        \
+               if (ptr != NULL) {      \
+                       free(ptr);      \
+                       ptr = NULL; \
+               }       \
+
+#endif /* _MYACCOUNT_UG_COMMON_H_ */
+
index 7e43936..269d66d 100755 (executable)
@@ -1,23 +1,28 @@
-/*\r
- * Copyright 2012  Samsung Electronics Co., Ltd\r
- *\r
- * Licensed under the Flora License, Version 1.1 (the License);\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://floralicense.org/license/ \r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an AS IS BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#ifndef _MYACCOUNT_UG_MAIN_H_\r
-#define _MYACCOUNT_UG_MAIN_H_\r
-\r
-#include <Elementary.h>\r
-\r
-#endif /* _MYACCOUNT_UG_MAIN_H_ */\r
-\r
+/*
+ *  my-account
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
+ *
+ * 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.
+ *
+ */
+
+#ifndef _MYACCOUNT_UG_MAIN_H_
+#define _MYACCOUNT_UG_MAIN_H_
+
+#include <Elementary.h>
+
+#endif /* _MYACCOUNT_UG_MAIN_H_ */
+
index 3e7765c..c13a72b 100755 (executable)
@@ -1,12 +1,12 @@
-#sbs-git:slp/apps/m/my-account my-account 1.5.38 c12e7805519b99951f91c33cc96745c7f36166af
 Name:       my-account
 Summary:    My account application
-Version:    1.8.36
+Version:    1.9.101
 Release:    1
 Group:      main/devel
-License:    Flora-1.1
+License:    TO_BE_FILL
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig(elementary)
+BuildRequires:  pkgconfig(efl-assist)
 BuildRequires:  pkgconfig(appcore-efl)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(dlog)
@@ -24,39 +24,39 @@ BuildRequires:  cmake
 BuildRequires:  gettext-devel
 BuildRequires:  edje-bin
 
-
 %description
 My account application.
 
 %prep
 %setup -q
 
+%define APPDIR /usr/apps/setting-myaccount-efl
+%define BINDIR %{APPDIR}/bin
+%define LIBDIR %{APPDIR}/lib/ug
+%define RESDIR %{APPDIR}/res
+%define DATADIR %{APPDIR}/shared/trusted
+
 %build
 export CFLAGS="${CFLAGS} -fPIC -fvisibility=hidden"
 
 %define PREFIX    "/usr"
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX}
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} \
+
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE.Flora %{buildroot}/usr/share/license/%{name}
 
 %files
 %manifest my-account.manifest
 %defattr(-,root,root,-)
-/usr/ug/lib/*
-/usr/ug/res/*
+%{LIBDIR}/*
+%{RESDIR}/*
 /usr/share/packages/*.xml
-/etc/smack/accesses2.d/*
-/usr/share/license/%{name}
+%{RESDIR}/ug-setting-cloud/shared/res/tables/*
 
 %post
 /sbin/ldconfig
-vconftool set -f -t int db/account/auto_sync 1 -g 6514
-vconftool set -t int db/account/sync_all 0 -g 6514
-mkdir -p /usr/ug/bin/
-ln -sf /usr/bin/ug-client /usr/ug/bin/setting-myaccount-efl
-
+vconftool set -f -t int db/account/auto_sync 1 -s system::vconf_inhouse -g 6514
+vconftool set -t int db/account/sync_all 0 -s system::vconf_inhouse -g 6514
index 28aa5b7..3f36237 100755 (executable)
@@ -1,7 +1,57 @@
 # for i18n
 
-SET(POFILES de_DE.po el_GR.po en.po es_ES.po fr_FR.po it_IT.po ja_JP.po ko_KR.po nl_NL.po pt_PT.po ru_RU.po tr_TR.po zh_CN.po zh_HK.po zh_TW.po ar.po bg.po ca.po cs.po da.po en_US.po fi.po he.po hi.po hr.po hu.po id.po lt.po lv.po ms.po no.po pl.po ro.po sk.po sl.po sr.po sv.po th.po uk.po vi.po az.po en_PH.po es_MX.po et.po eu.po fr_CA.po ga.po gl.po hy.po is.po ka.po kk.po mk.po nb.po pt_BR.po uz.po zh_SG.po)
-
+SET(POFILES
+ar.po
+da.po
+es_ES.po
+fr.po
+hy.po
+ko_KR.po
+pl.po
+sl.po
+zh_CN.po
+az.po
+de.po
+es_US.po
+ga.po
+is.po
+lt.po
+pt_BR.po
+sr.po
+zh_HK.po
+bg.po
+el_GR.po
+et.po
+gl.po
+it_IT.po
+lv.po
+pt_PT.po
+sv.po
+zh_TW.po
+ca.po
+en_PH.po
+eu.po
+hi.po
+ja_JP.po
+mk.po
+ro.po
+tr_TR.po
+en.po
+fi.po
+hr.po
+ka.po
+nb.po
+ru_RU.po
+uk.po
+cs.po
+en_US.po
+fr_CA.po
+hu.po
+kk.po
+nl.po
+sk.po
+uz.po
+)
 
 SET(MSGFMT "/usr/bin/msgfmt")
 
@@ -17,7 +67,7 @@ FOREACH(pofile ${POFILES})
                        DEPENDS ${absPofile}
        )
        INSTALL(FILES ${moFile}
-                       DESTINATION /usr/ug/res/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+                       DESTINATION ${RESDIR}/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
        SET(moFiles ${moFiles} ${moFile})
 ENDFOREACH(pofile)
 
diff --git a/po/GT-I7800_Accounts_Strings.csv b/po/GT-I7800_Accounts_Strings.csv
deleted file mode 100644 (file)
index 6690446..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Design ID      English Dutch   German  Chinese Traditional_HongKong    Chinese Simplified      Russian Korean  Chinese Traditional_Taiwan      Japanese        Spanish Greek   Italian Turkish Portuguese      French
-IDS_MA_BODY_FACEBOOK   Facebook        Facebook        Facebook        Facebook        Facebook        Facebook        Facebook        Facebook        Facebook        Facebook        Facebook        Facebook        Facebook        Facebook        Facebook
-IDS_MA_BODY_GOOGLE     Google  Google  Google  Google  Google  Google  Google  Google  Google  Google  Google  Google  Google  Google  Google
-IDS_MA_BODY_MSN        MSN     MSN     MSN     MSN     MSN     MSN     MSN     MSN     MSN     MSN     MSN     MSN     MSN     MSN     MSN
-IDS_MA_BODY_TWITTER    Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter
-IDS_MA_HEADER_ADD_ACCOUNT      Add account     Account toevoegen       Konto hinzufügen       加入帳戶    添加帐户    Добавить уч. запись     계정 추가   加入帳戶    ​アカウント​追加     Añadir cuenta  Προσθήκη λογαριασμού Aggiungi account        Hesap ekle      Adicionar conta Ajouter compte
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100755 (executable)
index fc41798..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# List of source files containing translatable strings.
-src/myaccount_ug_account_list.c
-src/myaccount_ug_addaccount.c
-src/myaccount_ug_common.c
-src/myaccount_ug_main.c
old mode 100755 (executable)
new mode 100644 (file)
index 776871a..9a6e4cf
--- a/po/ar.po
+++ b/po/ar.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "أخرÙ\89"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "استÙ\88دÙ\8aÙ\88"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "مزامنة تلقائية"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "موافق"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "مذكرة S"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "إضافة حساب"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "المهمة"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "تزامن جهات الاتصال"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "اتصال VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "أيام الذروة"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "مخطط S"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "وقت إنتهاء الذروة"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "وقت بدء الذروة"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "الموسيقى"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "كل البيانات"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "الرسائل"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "خادÙ\85 Ø§Ù\84Ù\85زاÙ\85Ù\86Ø©"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "اÙ\84Ø¥Ù\86ترÙ\86ت"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "بريد إلكتروني"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "يمكنك إدارة جهات الاتصال والتقاويم والبريد الإلكتروني وحسابات المراسلة الفورية"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "عرض كلمة المرور"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "مجلدات البريد المطلوب دفعها"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "مزامنة المهمة"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "تقويم"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "اتصال VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "غير معروف"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "تم الوصول إلى الحد المسموح به لحسابات البريد الإلكتروني."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "إضافة"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "مزامنة تلقائية"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "اÙ\84اسÙ\85"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "إضاÙ\81Ø© Ø­Ø³Ø§Ø¨"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "حسابات"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "صورة شخصية"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "غير فعالة"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "موافق"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "يمكنك إدارة جهات الاتصال والتقاويم والبريد الإلكتروني وحسابات المراسلة الفورية."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "ابÙ\82اء Ø§Ù\84اتصاÙ\84 Ø¹Ù\84Ù\89 Ø§Ù\84بطارÙ\8aØ© Ø§Ù\84ضعÙ\8aÙ\81Ø©"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "تÙ\85 ØªØ³Ø¬Ù\8aÙ\84 Ø§Ù\84دخÙ\88Ù\84."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "أبÙ\82 Ø§Ù\84اتصاÙ\84 Ø£Ø«Ù\86اء Ø§Ù\84تجÙ\88اÙ\84"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "اÙ\84أسÙ\85اء"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "إضافة حساب"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "التزامن تلقائيا"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "الفيديو"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "متعقب الهاتف"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "قائمة الحسابات"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "سيتم حذف جميع البيانات المتعلقة بهذا الحساب. متابعة؟"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "اسم مستخدم أو بريد إلكتروني غير صحيح"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "يتعذر الحذف. هل تريد إعادة المحاولة؟"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "إعداد يدوي"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "يمكن حذف الأحداث الحالية أو الإبقاء عليها في حالة إيقاف المزامنة"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "يمكن حذف جهات الاتصال الحالية أو الاحتفاظ بها في حالة إيقاف المزامنة"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "حذفها من الهاتف"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "الاحتفاظ بها في الهاتف"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "خادم المزامنة"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "اÙ\84Ù\81Ù\8aدÙ\8aÙ\88"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "اÙ\84Ù\85Ù\87Ù\85Ø©"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "رسائÙ\84 Ø§Ù\84برÙ\8aد Ø§Ù\84Ø¥Ù\84Ù\83ترÙ\88Ù\86Ù\8a Ø§Ù\84أخرÙ\89"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "استÙ\83Ù\85اÙ\84 Ø§Ù\84Ù\85ادة Ø§Ù\84تعÙ\84Ù\8aÙ\85Ù\8aØ©."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "اÙ\84حسابات Ù\88اÙ\84Ù\85زاÙ\85Ù\86Ø©"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "حدد Ø¥Ø­Ø¯Ù\89 Ø®Ø¯Ù\85ات Ø§Ù\84سحابة Ù\84Ù\85زاÙ\85Ù\86تÙ\87اØ\8c Ø«Ù\85 Ø­Ø¯Ø¯ Ø¥Ø¹Ø¯Ø§Ø¯ Ø­Ø³Ø§Ø¨. Ù\88بÙ\85جرد Ø¥Ø¹Ø¯Ø§Ø¯ Ø­Ø³Ø§Ø¨ Samsung accountØ\8c Ø³ØªØªÙ\85 Ù\85زاÙ\85Ù\86Ø© Ø§Ù\84Ù\85Ø°Ù\83رات ØªÙ\84Ù\82ائÙ\8aا."
 
old mode 100755 (executable)
new mode 100644 (file)
index 6c7e171..433a6a1
--- a/po/az.po
+++ b/po/az.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Digərləri"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Qalereya"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Avto-sinxronlaşma"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Hesab əlavə edin"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tapşırıq"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kontakt sinxronlaşdırması"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP zəngi"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Pik günlər"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Pikin sona çatma vaxtı"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Günün başlanğıcında pik vaxt"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musiqi"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Bütün verilənlər"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Mesajlar"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sinxronlaşdırma serveri"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "İnternet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Elektron poçtlar"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Dərc et"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Siz kontaktlarınızı, təqvimlərinizi, e-poçt və IM hesablarınızı idarə edə bilərsiniz"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Parolu göstərin"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Push üçün poçt qovluqları"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Tapşırıq sinxronlaşdırılması"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Təqvim"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP zəngi"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Naməlum"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "E-poçt hesablarının sayı maksimuma çatmışdır."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Əlv et"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Avto-sinxronlaşma"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Ad"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Hesab əlavə edin"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Hesablar"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Qeyri-aktivdir"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Dərc et"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Siz kontaktlarınızı, təqvimlərinizi, e-poçt və IM hesablarınızı idarə edə bilərsiniz."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Bağlantını zəif batareyada davam etdir"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Daxil olundu."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Bağlantı rouminqdə qalsın"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Adlar"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Hesab əlavə edin"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Avtomatik sinxronizasiya"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Video"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobil izləmə sistemi"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Hesab siyahısı"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Bu hesabla bağlı bütün məlumatlar silinəcək. Davam edilsin?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "İstifadəçi adı və ya e-poçt səhvdir"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Silmək mümkün deyil. Yenidən cəhd edilsin?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Əl ilə qurşdırma"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Sinxronlaşdırılma söndürülübsə, mövcud hadisələr silinə və ya saxlana bilər"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Sinxronlaşdırılma söndürülübsə, mövcud kontaktlar silinə və ya saxlana bilər"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Telefondan sil"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Telefonda saxla"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sinxronlaşdırma serveri"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Video"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tapşırıq"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Digər epoçtlar"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Təlimatlar tamamlandı."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Hesablar və sinxronlaşdırma"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Hesabdan istifadə etmək və onu tənzimləmək üçün bulud xidmətini seçin. Siz bir dəfə Samsung hesabını köklədikdən sonra saxlanmış qeydlər avtomatik sinxronlaşdırılacaq."
 
old mode 100755 (executable)
new mode 100644 (file)
index 7ced6f1..84a104f
--- a/po/bg.po
+++ b/po/bg.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Ð\94Ñ\80Ñ\83ги"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Ð\93алеÑ\80иÑ\8f"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Автоматично синхр."
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Добавяне на акаунт"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Задача"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Синхр. на записи"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP повикване"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Натоварени дни"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Край на натоварените часове"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Ð\9dаÑ\87ало Ð½Ð° Ð½Ð°Ñ\82оваÑ\80ениÑ\82е Ñ\87аÑ\81ове"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Ð\9cÑ\83зика"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Ð\92Ñ\81иÑ\87ки Ð´Ð°Ð½Ð½Ð¸"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "СÑ\8aобÑ\89ениÑ\8f"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "СÑ\8aÑ\80вÑ\8aÑ\80 Ð·Ð° Ñ\81инÑ\85Ñ\80."
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Ð\98нÑ\82еÑ\80неÑ\82"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Email"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Ð\9eбмÑ\8fна"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Ð\9fÑ\83бликÑ\83ване"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Можете да управлявате своите записи, календари, имейл и IM акаунти"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Показване на паролата"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Папки с поща за push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Синхронизиране на задача"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Календар"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP повикване"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Няма информация"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Достигнат е максималният брой акаунти за имейл."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Ð\94обави"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Ð\90вÑ\82омаÑ\82иÑ\87но Ñ\81инÑ\85Ñ\80."
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Ð\97апиÑ\81"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Ð\94обавÑ\8fне Ð½Ð° Ð°ÐºÐ°Ñ\83нÑ\82"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Акаунти"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Снимки"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Неактивна"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Ð\9fÑ\83бликÑ\83ване"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Ð\9cожеÑ\82е Ð´Ð° Ñ\83пÑ\80авлÑ\8fваÑ\82е Ñ\81воиÑ\82е Ð·Ð°Ð¿Ð¸Ñ\81и, ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ\80и, Ð¸Ð¼ÐµÐ¹Ð» Ð¸ IM Ð°ÐºÐ°Ñ\83нÑ\82и."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Ð\97апазвай Ð²Ñ\80Ñ\8aзкаÑ\82а Ð¿Ñ\80и Ñ\81лаба Ð±Ð°Ñ\82еÑ\80иÑ\8f"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Ð\92ие Ð²Ð»Ñ\8fзоÑ\85Ñ\82е."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Ð\97апазвай Ð²Ñ\80Ñ\8aзкаÑ\82а Ð² Ñ\80оÑ\83минг"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "ТелеÑ\84онен Ñ\83казаÑ\82ел"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Добавяне на акаунт"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Ð\90вÑ\82омаÑ\82иÑ\87но Ñ\81инÑ\85Ñ\80онизиÑ\80ане"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Ð\92идеоклипове"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Мобилно проследяване"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Списък\nакаунти"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Ще бъдат изтрити всички данни, свързани с този акаунт. Продължаване?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Неправилно потребителско име или email"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Не може да се изтрие. Нов опит?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Ръчна настройка"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Съществуващите събития може да бъдат изтрити или запазени, ако като се изключи синхронизирането"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Списък с акаунти"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Съществуващите записи може да бъдат изтрити или запазени, ако като се изключи синхронизирането"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Изтриване от телефона"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Запазване в телефона"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Сървър за синхр."
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Ð\92идеоклипове"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Ð\97адаÑ\87а"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Ð\94Ñ\80Ñ\83ги email-и"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "СамоÑ\83Ñ\87иÑ\82елÑ\8fÑ\82 Ð·Ð°Ð²Ñ\8aÑ\80Ñ\88и."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Ð\90каÑ\83нÑ\82и Ð¸ Ñ\81инÑ\85Ñ\80онизиÑ\80ане"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Ð\98збеÑ\80еÑ\82е Ñ\83Ñ\81лÑ\83га Ð·Ð° Ð¾Ð±Ð»Ð°Ðº, ÐºÐ¾Ñ\8fÑ\82о Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ\82е, Ñ\81лед ÐºÐ¾ÐµÑ\82о Ð½Ð°Ñ\81Ñ\82Ñ\80ойÑ\82е Ð°ÐºÐ°Ñ\83нÑ\82. Ð¡Ð»ÐµÐ´ ÐºÐ°Ñ\82о Ð½Ð°Ñ\81Ñ\82Ñ\80оиÑ\82е Samsung Ð°ÐºÐ°Ñ\83нÑ\82, Ð·Ð°Ð¿Ð¸Ñ\81аниÑ\82е Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ Ñ\89е Ð±Ñ\8aдаÑ\82 Ñ\81инÑ\85Ñ\80онизиÑ\80ани Ð°Ð²Ñ\82омаÑ\82иÑ\87но."
 
old mode 100755 (executable)
new mode 100644 (file)
index ca8ad97..4c665fc
--- a/po/ca.po
+++ b/po/ca.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Altres"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galeria"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sincronització auto"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "Acceptar"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Afegir compte"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tasca"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sincronització de contactes"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Trucada VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Dies cim"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "Calendari"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Fi de l'hora cim"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Inici d'hora cim"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Música"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Totes les dades"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Missatges"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Servidor de sincronització"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Correu electrònic"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Publicar"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Pot administrar els contactes, calendaris, correu electrònic i comptes de MI"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Mostrar contrasenya"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Carpetes de correu per push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sincronització de tasques"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Calend"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Trucada VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Desconegut"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "S'ha assolit el nombre màxim de comptes de correu electrònic"
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Afegir"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sincronització auto"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contacte"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Afegir compte"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Comptes"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Desactivada"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "Acceptar"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Publicar"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Pot administrar els contactes, calendaris, correu electrònic i comptes de MI"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Mantenir la connexió amb bateria baixa"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "S'ha iniciat la sessió"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Mantingui la connexió en itinerància"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contactes"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Afegir compte"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sincronitzar automàticament"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Vídeos"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Rastrejador mòbil"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Llista comptes"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "S'esborraran totes les dades relacionades amb aquest compte. Continuar?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nom d'usuari o correu electrònic incorrecte"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "No es pot esborrar. Tornar-ho a intentar?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configuració manual"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Els esdeveniments existents es poden esborrar o mantenir si es desactiva la sincronització"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Llista de comptes"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "els contactes existents es poden esborrar o mantenir si es desactiva la sincronització"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Esborrar del telèfon"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Mantenir al telèfon"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Servidor de sincronització"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Vídeos"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tasca"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Altres correus electrònics"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Programa d'aprenentatge complet"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Comptes i sincronització"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Seleccioni un servei al núvol per utilitzar i, a continuació, configuri un compte. Quan hagi configurat un Samsung account, les notes desades se sincronitzaran automàticament."
 
old mode 100755 (executable)
new mode 100644 (file)
index 23fc48b..7259656
--- a/po/cs.po
+++ b/po/cs.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Jiné"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerie"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Automaticky synch."
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Poznámka"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Přidat účet"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Úkol"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Synchronizace kontaktů"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Hovor VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Dny špičky"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Plánovač"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Konec špičky"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Začátek špičky"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Hudba"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Všechna data"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Zprávy"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Synchronizační server"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-mail"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Vystavit"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Můžete spravovat své kontakty, kalendáře, e-maily a chatové účty"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Zobrazit heslo"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Poštovní složky k nabízení"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Synchronizace úkolů"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalendář"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Hovor VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Neznámé"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Bylo dosaženo maximálního počtu e-mailových účtů."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Přid."
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Automaticky synch."
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Přidat účet"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Účty"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fotografie"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Neaktivní"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Vystavit"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Můžete spravovat své kontakty, kalendáře, e-maily a chatové účty."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Zachovat připojení při vybité baterii"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Jste přihlášeni."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Zachovat připojení během roamingu"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontakty"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Přidat účet"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Synchronizovat automaticky"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videa"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobilní stopař"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Seznam\núčtů"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Všechna data související s tímto účtem budou odstraněna. Chcete pokračovat?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Chybné uživatelské jméno nebo e-mail"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Nelze odstranit. Opakovat akci?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Ruční nastavení"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Po vypnutí synchronizace bude možné stávající události odstranit nebo zachovat"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Seznam účtů"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Po vypnutí synchronizace bude možné stávající kontakty odstranit nebo zachovat"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Odstranit z telefonu"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Zachovat v telefonu"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Synchronizační server"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videa"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Úkol"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Další e-maily"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Kurz byl dokončen."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Účty a synchronizace"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Vyberte službu cloud, kterou chcete použít, a nastavte účet. Jakmile nastavíte Samsung účet, uložené poznámky budou automaticky synchronizovány."
 
diff --git a/po/csv2po_v2 b/po/csv2po_v2
deleted file mode 100755 (executable)
index 85b9c61..0000000
Binary files a/po/csv2po_v2 and /dev/null differ
diff --git a/po/csv_to_po.py b/po/csv_to_po.py
deleted file mode 100755 (executable)
index cd9af13..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import re
-import sys
-import csv
-
-re_strip = re.compile(r'"(.*)"')
-
-def usage():
-       print 'usage: %s input.csv output.po' % sys.argv[0]
-
-def make_dic(input, outputname):
-       code, ext = outputname.split('.')
-       strtbl = {}
-
-       try:
-               for r in input:
-                       idx_msgid = r.index('msgid')
-                       idx_msgstr = r.index(code)
-                       break
-
-               print 'Language code: %s' % code
-
-               for r in input:
-                       strtbl[r[idx_msgid]] = unicode(r[idx_msgstr], 'euc-kr').encode('utf-8')
-
-       except ValueError, e:
-               print 'Error: check the language code'
-
-       return strtbl
-
-def next_newline(lines, i):
-       while lines[i] <> '':
-               i = i + 1
-       return i
-
-def next_item(lines, i):
-       while lines[i][:1] == '"':
-               i = i + 1
-       return i
-
-def find_msgid(strtbl, lines, i, n):
-       msgid = ''
-       mlines = ''
-
-       while i < n:
-               mlines = mlines + lines[i] + '\n'
-               i = i + 1
-#      print 'mlines: ----------\n%s\n==========' % mlines
-
-       res = re_strip.findall(mlines)
-       for i in range(len(res)):
-#              print '[%s]' % res[i]
-               if res[i] <> '':
-                       if msgid <> '':
-                               msgid = msgid + '\n'
-                       msgid = msgid + res[i]
-
-#      print 'msgid: -----------\n%s\n==========' % msgid
-       return msgid
-
-
-def to_msgstr(lines):
-       ret = ''
-       l_line = lines.split('\n')
-       if len(l_line) == 1:
-               ret = 'msgstr "' + l_line[0] + '"\n'
-       else:
-               r_line = 'msgstr ""\n'
-               for i in range(len(l_line)):
-                       r_line = r_line + '"' + l_line[i] + '"\n'
-               ret = r_line
-       return ret
-
-def to_msgid(lines, i, n):
-       ret = ''
-
-       while i<n:
-               ret = ret + lines[i] + '\n'
-               i = i + 1
-
-       return ret
-
-def make_outdata(strtbl, in_data):
-       outdata = ''
-       lines = in_data.split('\n')
-       l = len(lines)
-       i = 0
-       empty_msgid = 0
-       msgstr = ''
-
-       while i < l:
-               line = lines[i]
-               if line[:5] == 'msgid':
-#                      print '%d:I: %s' % (i, line)
-                       n = next_item(lines, i + 1)
-#                      print '%d ~ %d : %s' % (i+1, n+1, line)
-                       msgid = find_msgid(strtbl, lines, i, n)
-                       if msgid == '':
-                               empty_msgid = 1
-                       else:
-                               empty_msgid = 0
-
-                               if strtbl.has_key(msgid):
-                                       msgstr = strtbl[msgid]
-                               else:
-                                       msgstr = ''
-                               valid_msgstr = 1
-#                              print 'msgid: -----------\n%s\n----------\n%s\n==========' % (msgid, msgstr)
-
-                       outdata = outdata + to_msgid(lines, i, n)
-                       i = n
-                       continue
-               elif empty_msgid == 0 and line[:6] == 'msgstr':
-#                      print '%d:S: %s' % (i, line)
-                       if valid_msgstr == 1:
-                               n = next_newline(lines, i + 1)
-#                              print '%d ~ %d : %s' % (i+1, n+1, line)
-                               outdata = outdata + to_msgstr(msgstr)
-                               valid_msgstr = 0
-                               i = n
-                               continue
-               else:
-#                      print '%d:E: %s' % (i, line)
-                       outdata = outdata + line + '\n'
-               i = i + 1
-
-       return outdata
-
-def read_po(filename):
-       inf = open(filename, 'rb')
-       data = inf.read()
-       inf.close()
-       return data
-
-def write_po(filename, data):
-       os.rename(filename, "%s.bak" % filename)
-
-       outf = open(filename, 'wb')
-       outf.write(data)
-       outf.write('\n')
-       outf.close()
-
-def main():
-       if len(sys.argv) < 3:
-               usage()
-               return
-
-       in_name = sys.argv[1]
-       out_name = sys.argv[2]
-
-       print 'Input filename: %s' % in_name
-       print 'Output filename: %s' % out_name
-
-       try:
-               input = csv.reader(open(in_name, 'rb'))
-               strtbl = make_dic(input, out_name)
-#              print 'String table ----------------------------------------------'
-#              print strtbl
-#              print 'String table ----------------------------------------------'
-
-               in_data = read_po(out_name)
-               out_data = make_outdata(strtbl, in_data)
-#              print 'Output ----------------------------------------------'
-#              print out_data
-#              print 'Output ----------------------------------------------'
-               write_po(out_name, out_data)
-
-       except Exception, e:
-               print 'Error -------------'
-               print e
-
-
-if __name__ == "__main__":
-       main()
-
old mode 100755 (executable)
new mode 100644 (file)
index 48b9846..890c46d
--- a/po/da.po
+++ b/po/da.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Andre"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galleri"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Auto-synkronisér"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Tilføj konto"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Opgave"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kontaktsynk."
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP-opkald"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Spidbelastningsdage"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Slut på spidsbelastning"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Start på spidsbelastning"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musik"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Alle data"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Beskeder"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Synkserver"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-mail"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Du kan administrere dine kontakter, kalendere, e-mails og chat-konti"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Vis adgangskode"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Push til mail-mapper"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Opgave-synk."
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalender"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-opkald"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Ukendt"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Det maksimale antal e-mailkonti er nået."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Tilføj"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Auto-synkronisér"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Tilføj konto"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Konti"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Billede"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inaktiv"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Du kan administrere dine kontakter, kalendere, e-mails og chat-konti."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Bevar forbindelse ved lavt batteriniveau"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Logget på."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Bevar forbindelse med roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontakter"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Tilføj konto"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Synk. automatisk"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Video"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Tyverisporing"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Konto-\nliste"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Alle data relateret til denne konto bliver slettet. Fortsæt?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Forkert brugernavn eller e-mail"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Kan ikke slette. Prøv igen?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manuel opsætning"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Kontoliste"
 
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Eksisterende begivenheder kan enten slettes eller beholdes, hvis synkronisering er deaktiveret"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Eksisterende kontakter kan enten slettes eller beholdes, hvis synkronisering er deaktiveret"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Slet fra telefonen"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Behold på telefonen"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Synkserver"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videoklip"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Opgave"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Andre e-mails"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Selvstudium fuldført."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Konti og synkronisering"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Vælg en skytjeneste, du vil bruge, og konfigurer derefter en konto. Når du har konfigureret en Samsung account, synkroniseres gemte notater automatisk."
 
diff --git a/po/de.po b/po/de.po
new file mode 100644 (file)
index 0000000..2edd1e3
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,81 @@
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerie"
+
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
+
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP-Anruf"
+
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
+
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musik"
+
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Nachrichten"
+
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
+
+msgid "IDS_COM_BODY_EMAIL"
+msgstr "E-Mail"
+
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Beitrag"
+
+msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
+msgstr "Microsoft Exchange ActiveSync"
+
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Maximale Anzahl an E-Mail-Konten erreicht."
+
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Automatisch synchr."
+
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Konto hinzufügen"
+
+msgid "IDS_MA_HEADER_ACCOUNTS"
+msgstr "Konten"
+
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
+
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Sie können Ihre Kontakte, Kalender, E-Mails und IM-Konten verwalten."
+
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Angemeldet"
+
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontakte"
+
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Konto hinzufügen"
+
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videos"
+
+msgid "IDS_ST_BODY_MOBILE_TRACKER"
+msgstr "uTrack"
+
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Kontoliste"
+
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sync.-Server"
+
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Aufgabe"
+
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Ende der Anleitung."
+
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Wählen Sie einen Cloud-Service aus und richten Sie ein Konto ein. Nachdem Sie ein Samsung Konto eingerichtet haben, werden gespeicherte Memos automatisch synchronisiert."
+
diff --git a/po/de_DE.po b/po/de_DE.po
deleted file mode 100755 (executable)
index c1746ff..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Sonstiges"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Automatisch synchr."
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Konto hinzufügen"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Aufgabe"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kontakt synchronisieren"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Wochentage"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Ende der Spitzenzeit"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Beginn der Spitzenzeit"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Alle Daten"
-
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sync.-Server"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "E-Mail"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Sie können Ihre Kontakte, Kalender, E-Mails und IM-Konten verwalten."
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Passwort anzeigen"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Zu pushende Mail-Ordner"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Aufgabe synchronisieren"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalender"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-Anruf"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Unbekannt"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Hzfg."
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "Konten"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inaktiv"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Beitrag"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Verbindung bei schwachem Akku aufrechterhalten"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Verbindung beim Roaming aufrechterhalten"
-
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Automatisch synchronisieren"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "uTrack"
-
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Kontoliste"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Alle mit diesem Konto verbundenen Daten werden gelöscht. Fortfahren?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Falscher Benutzername oder falsche E-Mail-Adresse"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Löschen nicht möglich. Erneut versuchen?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manuelles Einrichten"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Vorhandene Ereignisse können gelöscht oder gespeichert werden, wenn die Synchronisierung ausgeschaltet wird."
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Vorhandene Kontakte können gelöscht oder gespeichert werden, wenn die Synchronisierung ausgeschaltet wird."
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Vom Telefon löschen."
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Auf Telefon belassen."
-
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videos"
-
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Andere E-Mails"
-
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Konten und Synchronisierung"
-
old mode 100755 (executable)
new mode 100644 (file)
index d616ac8..ff1e0c6
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Î\86λλα"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "ΣÏ\85λλογή"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Αυτόματος συγχρονισμός"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Προσθήκη λογαριασμού"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Εργασία"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Συγχρονισμός επαφών"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Κλήση VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Ημέρες αιχμής"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Ώρα τέλους αιχμής"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Î\8fÏ\81α Î­Î½Î±Ï\81ξηÏ\82 Î±Î¹Ï\87μήÏ\82"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Î\9cοÏ\85Ï\83ική"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Î\8cλα Ï\84α Î´ÎµÎ´Î¿Î¼Î­Î½α"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Î\9cηνÏ\8dμαÏ\84α"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Διακομιστής συγχρονισμού"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Email"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Μπορείτε να διαχειριστείτε τις επαφές, τα ημερολόγια, τα email και τους λογαριασμούς IM"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Εμφάνιση κωδικού πρόσβασης"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Φάκελοι αλληλογραφίας προς προώθηση"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Συμπληρώθηκε ο μέγιστος αριθμός λογαριασμών email."
 
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Συγχρονισμός εργασίας"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Ημερολ."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Κλήση VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Άγνωστο"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Προσθ."
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Αυτόματος συγχρονισμός"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Î\95Ï\80αÏ\86ή"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "ΠÏ\81οÏ\83θήκη Î»Î¿Î³Î±Ï\81ιαÏ\83μοÏ\8d"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Λογαριασμοί"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Φωτογραφία"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Ανενεργό"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Μπορείτε να διαχειριστείτε τις επαφές, τα ημερολόγια, τα email και τους λογαριασμούς IM."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Î\94ιαÏ\84ήÏ\81ηÏ\83η Ï\83Ï\8dνδεÏ\83ηÏ\82 Ï\8cÏ\84αν Î· Ï\83Ï\84άθμη Ï\84ηÏ\82 Î¼Ï\80αÏ\84αÏ\81ίαÏ\82 ÎµÎ¯Î½Î±Î¹ Ï\87αμηλή"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "ΣÏ\8dνδεÏ\83η ÎµÏ\80ιÏ\84Ï\85Ï\87ήÏ\82."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Î\94ιαÏ\84ήÏ\81ηÏ\83η Ï\83Ï\8dνδεÏ\83ηÏ\82 ÎºÎ±Ï\84ά Ï\84ην Ï\80εÏ\81ιαγÏ\89γή"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Î\95Ï\80αÏ\86έÏ\82"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Προσθήκη λογαριασμού"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Î\91Ï\85Ï\84Ï\8cμαÏ\84οÏ\82 Ï\83Ï\85γÏ\87Ï\81ονιÏ\83μÏ\8cÏ\82"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Î\92ίνÏ\84εο"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Εντοπισμός κινητού"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Λίστα\nλογαρ."
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Θα γίνει διαγραφή όλων των δεδομένων που έχουν σχέση με αυτόν τον λογαριασμό. Συνέχεια;"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Λανθασμένο όνομα χρήστη ή διεύθυνση email"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Δεν είναι δυνατή η διαγραφή. Επανάληψη;"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Μη αυτόματη ρύθμιση"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Εάν ο συγχρονισμός απενεργοποιηθεί τα υπάρχοντα συμβάντα μπορούν να διαγραφούν ή να διατηρηθούν"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Λίστα λογαριασμών"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Εάν ο συγχρονισμός απενεργοποιηθεί οι υπάρχουσες επαφές μπορούν να διαγραφούν ή να διατηρηθούν"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Διαγραφή από το τηλέφωνο"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Διατήρηση στο τηλέφωνο"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Διακομιστής συγχρονισμού"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Î\92ίνÏ\84εο"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Î\95Ï\81γαÏ\83ία"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Î\86λλα email"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Î\9f Î¿Î´Î·Î³Ï\8cÏ\82 ÎµÎºÎ¼Î¬Î¸Î·Ï\83ηÏ\82 Î¿Î»Î¿ÎºÎ»Î·Ï\81Ï\8eθηκε."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Î\9bογαÏ\81ιαÏ\83μοί ÎºÎ±Î¹ Ï\83Ï\85γÏ\87Ï\81ονιÏ\83μÏ\8cÏ\82"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Î\95Ï\80ιλέξÏ\84ε Î¼Î¹Î± Ï\85Ï\80ηÏ\81εÏ\83ία cloud ÎºÎ±Î¹, ÎºÎ±Ï\84Ï\8cÏ\80ιν, Ï\81Ï\85θμίÏ\83Ï\84ε Î­Î½Î± Î»Î¿Î³Î±Ï\81ιαÏ\83μÏ\8c. Î\9cÏ\8cλιÏ\82 Ï\81Ï\85θμίÏ\83εÏ\84ε Ï\84ο Î»Î¿Î³Î±Ï\81ιαÏ\83μÏ\8c Samsung account, Ï\84α Î±Ï\80οθηκεÏ\85μένα Ï\83ημειÏ\8eμαÏ\84α Î¸Î± Ï\83Ï\85γÏ\87Ï\81ονιÏ\83Ï\84οÏ\8dν Î±Ï\85Ï\84Ï\8cμαÏ\84α."
 
old mode 100755 (executable)
new mode 100644 (file)
index c30480e..45d0858
--- a/po/en.po
+++ b/po/en.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Others"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Gallery"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Auto sync"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Add account"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Task"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Contact sync"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP call"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Peak days"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Peak end time"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Peak start time"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Music"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "All data"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Messages"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sync server"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Email"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "You can manage your contacts, calendars, email, and IM accounts"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Show password"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Mail folders to push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Task sync"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "docomo phonebook, Schedule & Memo"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP call"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Unknown"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Maximum number of email accounts reached."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Add"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Auto sync"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contact"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Add account"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Accounts"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Photo"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactive"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "You can manage your contacts, calendars, email, and IM accounts."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Keep connection on low battery"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Signed in."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Keep connection on roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contacts"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Add account"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sync automatically"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videos"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobile tracker"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Account list"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "All data related to this account will be deleted. Continue?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Incorrect username or email"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Unable to delete. Try again?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manual setup"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Existing events can be either deleted or kept if synchronisation is turned off"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Existing contacts can be either deleted or kept if synchronisation is turned off"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Delete from phone"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Keep on phone"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sync server"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videos"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Task"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Other emails"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial complete."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Accounts and sync"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Select a cloud service to use and then set up an account. Once you have set up a Samsung account, saved memos will be synced automatically."
 
old mode 100755 (executable)
new mode 100644 (file)
index 57b0a73..028ff7a
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Others"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Gallery"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Auto sync"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Add account"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Task"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Contact sync"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP call"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Peak days"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Peak end time"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Peak start time"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Music"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "All data"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Messages"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sync server"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Email"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "You can manage your contacts, calendars, Email, and IM accounts"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Show password"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Mail folders to push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Task sync"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Calendar"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP call"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Unknown"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Maximum number of Email accounts reached."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Add"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Auto sync"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contact"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Add account"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Accounts"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Photo"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactive"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "You can manage your contacts, calendars, Email, and IM accounts."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Keep connection on low battery"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Signed in."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Keep connection on roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contacts"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Add account"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sync automatically"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videos"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobile tracker"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Account list"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "All data related to this account will be deleted. Continue?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Incorrect user name or Email"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Unable to delete. Try again?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manual set-up"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Existing events can be either deleted or kept if synchronization is turned off"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Existing contacts can be either deleted or kept if synchronization is turned off"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Delete from phone"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Keep on phone"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sync server"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videos"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Task"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Other emails"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial complete."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Accounts and sync"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Select a cloud service to use and then set up an account. Once you have set up a Samsung account, saved memos will be synced automatically."
 
diff --git a/po/en_US.csv b/po/en_US.csv
deleted file mode 100755 (executable)
index a26d096..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-msgid,en_US\r
-Application template,Application template\r
-Click to exit,Clict to exit\r
-FONT_NAME,FONT_NAME\r
-SS_1_HOUR,1 hour\r
-SS_ADD_SK,Add\r
-SS_BACK,Back\r
-SS_CANCEL_SK,Cancel\r
-SS_DATA_PASSWORD,Password\r
-SS_DELETE,Delete\r
-SS_DONE_SK,Done\r
-SS_EMAIL,Email\r
-SS_MY_ACCOUNT,My account\r
-SS_SAVE_SK,Save\r
-SS_1_DAY,1 day\r
-SS_1_MONTH,1 month\r
-SS_1_WEEK,1 week\r
-SS_12_HOURS,12 hours\r
-SS_15_MINUTES,15 minutes\r
-SS_2_WEEKS,2 weeks\r
-SS_3_DAYS,3 days\r
-SS_3_HOURS,3 hours\r
-SS_3_MONTH,3 month\r
-SS_30_MINUTES,30 minutes\r
-SS_4_HOURS,4 hours\r
-SS_5_MINUTES,5 minutes\r
-SS_6_HOURS,6 hours\r
-SS_6_MONTH,6 month\r
-SS_ACCOUNT_NAME,Account name\r
-SS_ADD_ACCOUNT,Add account\r
-SS_ALL_DATA,All data\r
-SS_AOL_ACCOUNT,AOL account\r
-SS_AUTO_SYNC_NOTIFICATIONS,Auto-sync notifications\r
-SS_CALENDAR_DATE_RANGE,Calendar date range\r
-SS_CALENDAR_SYNC,Calendar sync\r
-SS_CONNECTING,Connecting¡¦\r
-SS_CONTACT_SYNC,Contact sync\r
-SS_EMAIL_ADDRESS,Email address\r
-SS_EMAIL_DATE_RANGE,Email date range\r
-SS_EMAIL_SYNC,Email sync\r
-SS_ENTER_YOUR_ACCOUNT,Enter your account\r
-SS_ENTER_YOUR_NAME,Enter your name\r
-SS_ENTER_YOUR_PASSWORD,Enter your password\r
-SS_EVERYDAY,Everyday\r
-SS_FLIPPER,Flipper\r
-SS_GOOGLE_ACCOUNT,Google account\r
-SS_INSTANCE_MESSENGER,Instance messenger\r
-SS_INSTANCE_MESSENGER_ONLY,Instance messenger only\r
-SS_KEEP_CONNECTION_LOW_BATTERY,Keep connection on low battery\r
-SS_KEEP_CONNECTION_ROAMING,Keep connection on roaming\r
-SS_KEYPAD,Keypad\r
-SS_MSN_ACCOUNT,MSN account\r
-SS_NEXT,Next\r
-SS_NO_ACCOUNT,No account\r
-SS_OFF_PEAK_SCHEDULE,Off-peak schedule\r
-SS_PASSWORD,password\r
-SS_PEAK_DAYS,Peak days\r
-SS_PEAK_SCHEDULE,Peak schedule\r
-SS_PEAK_START_TIME,Peak start time\r
-SS_PEAK_END_TIME,Peak end time\r
-SS_PEAK_TIME,Peak time\r
-SS_PRIORITY,Priority\r
-SS_SELECT_ALL,Select all\r
-SS_SIGN_IN,Sign in\r
-SS_SIGN_UP,Sign up\r
-SS_SNS_ACCOUNT,SNS account\r
-SS_SOCIAL_NETWORKS,Social networks\r
-SS_SYNC_AUTOMATICALLY,Sync automatically\r
-SS_SYNC_NOW,Sync now\r
-SS_SYNC_SCHEDULE,Sync schedule\r
-SS_USER_NAME,User name\r
-SS_USER_NAME_OR_EMAIL,User name or email\r
-SS_VIEW_PRIORITY,View Priority\r
-SS_VIEW_PRIORITY_SK,View priority\r
-SS_WEB_ACCOUNTS,Web accounts\r
-SS_WEEK_DAYS,Week days\r
-SS_WEEKLY,Weekly\r
-SS_YAHOO_ACCOUNT,Yahoo account\r
-SS_INFORMATION,Information\r
-SS_WARNING,Warning\r
-SS_FAIL_GET_ACCOUNT,Fail to get the account\r
-SS_CANT_CONNECT_SERVER,Can't connect to server\r
-SS_SNS_ENGINE_NOT_INIT,SNS engine is not initiated\r
-SS_LOGIN_COMPLETE,Login complete\r
-SS_AUTHENTICATION_FAIL,Authentication Fail\r
-SS_LOGGING,Logging\r
old mode 100755 (executable)
new mode 100644 (file)
index c8ae378..45d0858
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Others"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Gallery"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Auto sync"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Add account"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Task"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Contact sync"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP call"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Peak days"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Peak end time"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Peak start time"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Music"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "All data"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Messages"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sync server"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Email"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "You can manage your contacts, calendars, email, and IM accounts"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Show password"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Mail folders to push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Task sync"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "docomo phonebook, Schedule & Memo"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP call"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Unknown"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Maximum number of email accounts reached."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Add"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Auto sync"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contact"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Add account"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Accounts"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Photo"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactive"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "You can manage your contacts, calendars, email, and IM accounts."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Keep connection on low battery"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Signed in."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Keep connection on roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contacts"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Add account"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sync automatically"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videos"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobile tracker"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Account list"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "All data related to this account will be deleted. Continue?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Incorrect user name or email"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Unable to delete. Try again?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manual setup"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Existing events can be either deleted or kept if synchronization is turned off"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Existing contacts can be either deleted or kept if synchronization is turned off"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Delete from phone"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Keep on phone"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sync server"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videos"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Task"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Other emails"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial complete."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Accounts and sync"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Select a cloud service to use and then set up an account. Once you have set up a Samsung account, saved memos will be synced automatically."
 
old mode 100755 (executable)
new mode 100644 (file)
index 6456f41..51ad834
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Otros"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galería"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sincr auto"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "Aceptar"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Añadir cuenta"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tarea"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sincr. de contactos"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Llamada VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Días punta"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "Calendario"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Finalización de hora punta"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Inicio de hora punta"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Música"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Todos los datos"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Mensajes"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Servidor de sincronización"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Correo electrónico"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Actualización"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Puede gestionar sus contactos, calendarios, correo electrónico y cuentas de MI"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Mostrar contraseña"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Carpetas de correo para difusión"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sincronización de tarea"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Calendar"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Llamada VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Desconocido"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Número máximo de cuentas de correo electrónico alcanzado"
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Añadir"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sincr auto"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contacto"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Añadir cuenta"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Cuentas"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactivo"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "Aceptar"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Actualización"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Puede gestionar sus contactos, calendarios, correo electrónico y cuentas de MI"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Mantener conexión con batería baja"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Sesión iniciada"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Mantener conexión en itinerancia"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contactos"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Añadir cuenta"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sincronizar automáticamente"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Vídeos"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Rastreador móvil"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Lista de cuentas"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Se eliminarán todos los datos relacionados con esta cuenta. ¿Continuar?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nombre de usuario o correo electrónico incorrectos"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "No se puede eliminar. ¿Intentarlo de nuevo?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configuración manual"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Los eventos existentes se pueden eliminar o mantener si se desactiva la sincronización"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Los contactos existentes se pueden eliminar o mantener si se desactiva la sincronización"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Eliminar del teléfono"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Mantener en dispositivo"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Servidor de sincronización"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Vídeos"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tarea"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Otros correos electrónicos"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial finalizado."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Cuentas y sincronización"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Seleccione un servicio en la nube para usarlo y configure una cuenta. Una vez que haya configurado una Samsung account, las notas guardadas se sincronizarán automáticamente."
 
diff --git a/po/es_MX.po b/po/es_MX.po
deleted file mode 100755 (executable)
index d727ffa..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Otros"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sincronización automática"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "Aceptar"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Añadir cuenta"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tareas"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sincronización de contactos"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Días de sincronización"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Hora final"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Hora inicial"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Todo"
-
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Servidor de sincronización"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "Correo"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Puedes administrar tus contactos, calendarios, correos y cuentas IM"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Mostrar contraseña"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Carpetas de correo WAP PUSH"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sincronización de tarea"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Calendar"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Llamada VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Desconocido"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Añadir"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contacto"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "Cuentas"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactivo"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Enviar"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Mantener conexión con batería baja"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Mantener conexión en roaming"
-
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sincronizar automáticamente"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "Rastreador móvil"
-
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Lista de cuentas"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Se eliminarán todos los datos relacionados con esta cuenta. ¿Continuar?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nombre de usuario o correo incorrectos"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "No se puede eliminar. ¿Reintentar?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configuración manual"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Los eventos existentes se pueden eliminar o mantener si se desactiva la sincronización"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Los contactos existentes se pueden eliminar o mantener si se desactiva la sincronización"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Eliminar del teléfono"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Mantener en dispositivo"
-
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videos"
-
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Otros correos"
-
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Cuentas y sincronización"
-
diff --git a/po/es_US.po b/po/es_US.po
new file mode 100644 (file)
index 0000000..13943f3
--- /dev/null
@@ -0,0 +1,81 @@
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galería"
+
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
+
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Llamada VoIP"
+
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
+
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Música"
+
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Mensajes"
+
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
+
+msgid "IDS_COM_BODY_EMAIL"
+msgstr "Correo"
+
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Enviar"
+
+msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
+msgstr "Microsoft Exchange ActiveSync"
+
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Número máximo de cuentas de correo alcanzado."
+
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sincronización automática"
+
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Añadir cuenta"
+
+msgid "IDS_MA_HEADER_ACCOUNTS"
+msgstr "Cuentas"
+
+msgid "IDS_MA_BUTTON_OK"
+msgstr "Aceptar"
+
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Puedes administrar tus contactos, calendarios, correos y cuentas IM."
+
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Sesión iniciada."
+
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contactos"
+
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Añadir cuenta"
+
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videos"
+
+msgid "IDS_ST_BODY_MOBILE_TRACKER"
+msgstr "Rastreador móvil"
+
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Lista de cuentas"
+
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Servidor de sincronización"
+
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tarea"
+
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial completo."
+
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Seleccione un servicio de nube para usar y luego configure una cuenta. Después de configurar una cuenta Samsung, las notas guardadas se sincronizarán automáticamente."
+
old mode 100755 (executable)
new mode 100644 (file)
index 62d49be..582a646
--- a/po/et.po
+++ b/po/et.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Muud"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerii"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Automaatne sünkroonimine"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Lisa konto"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Ülesanne"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kontakti sünkroonimine"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP-kõne"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Tööpäevad"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planeerija"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Tööaja lõpp"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Tööaja algus"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Muusika"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Kõik andmed"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Sõnumid"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sünkrooni server"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-post"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Saate hallata oma kontakte, kalendreid, e-posti ja IM-kontosid"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Kuva parool"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "E-posti kaustad tõukeks"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Ülesande sünkroonimine"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalender"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-kõne"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Tundmatu"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Maksimaalne arv e-posti kontosid on saavutatud."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Lisa"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Automaatne sünkroonimine"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Lisa konto"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Kontod"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Passiivne"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Saate hallata oma kontakte, kalendreid, e-posti ja IM-kontosid."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Säilita ühendus, kui aku on peaaegu tühi"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Sisselogitud."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Säilita ühendus rändluse ajal"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontaktid"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Lisa konto"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sünkrooni automaatselt"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videod"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobiilijälitus"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Konto-loend"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Kõik selle kontoga seotud andmed kustutatakse. Kas jätkata?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Vale kasutajanimi või e-posti aadress"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Ei saa kustutada. Kas proovida uuesti?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Käsitsi seadistamine"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Sünkroonimise väljalülitamisel võidakse olemasolevad sündmused kas kustutada või säilitada"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Kontoloend"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Sünkroonimise väljalülitamisel võidakse olemasolevad kontaktid kas kustutada või säilitada"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Kustuta telefonist"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Säilita telefonis"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sünkrooni server"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videod"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Ülesanne"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Teised e-posti aadressid"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Õpetus on lõpule viidud."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Kontod ja sünkroonimine"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Valige pilveteenus, mida kasutada, ning seejärel seadistage konto. Kui olete Samsungi konto seadistanud, sünkroonitakse salvestatud memod automaatselt."
 
old mode 100755 (executable)
new mode 100644 (file)
index 809a26a..7fac4a9
--- a/po/eu.po
+++ b/po/eu.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Besteak"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galeria"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sinkroniz. automat."
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "Ados"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Kontua gehitu"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Ataza"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kontaktuen sinkronizazioa"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP deia"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Puntako egunak"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "Egutegia"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Puntako orduen amaiera ordua"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Puntako orduen hasiera ordua"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musika"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Datu guztiak"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Mezuak"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sinkronizazio zerbitzaria"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
-msgstr "Posta elektroniko mezuak"
+msgstr "Helbide elektronikoa"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Argitaratu"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Zure kontaktuak, egutegiak, posta elektronikoa eta IM kontuak kudea ditzakezu"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Erakutsi pasahitza"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Gehienezko helbide elektroniko kontu kopurura iritsi zara"
 
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Push zerbitzudun posta karpetak"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sinkronizatu ataza"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Egutegia"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP deia"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Ezezaguna"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Gehitu"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sinkroniz. automat."
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontaktua"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Gehitu kontua"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Kontuak"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Argazkia"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Ez aktibo"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "Ados"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Argitaratu"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Zure kontaktuak, egutegiak, posta elektronikoa eta IM kontuak kudea ditzakezu"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Eutsi konexioari bateria baxuaz"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Saioa hasita"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Eutsi konexioari roamingean"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontaktuak"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Gehitu kontua"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sinkronizatu automatikoki"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Bideoak"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Arakatzaile mugikorra"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Kontu zerrenda"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Kontu honi buruzko datu guztiak ezabatuko dira. Jarraitu?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Erabiltzaile izena edo helbide elektroniko okerra"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Ezin da ezabatu. Saiatu berriz?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Eskuzko konfigurazioa"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Dauden gertaerak ezabatu edo gorde egin daitezke sinkronizazioa itzalitakoan"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Dauden kontaktuak ezabatu edo gorde egin daitezke sinkronizazioa itzalitakoan"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Ezabatu telefonotik"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Gorde telefonoan"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sinkronizazio zerbitzaria"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Bideoak"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Ataza"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Beste helbide elektroniko batzuk"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutoriala osatuta"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Kontuak eta sinkronizazioa"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Hautatu zein hodei zerbitzu erabili eta ondoren konfiguratu kontu bat. Samsung account bat konfiguratu ondoren, gordetako oroigarriak automatikoki sinkronizatuko dira."
 
old mode 100755 (executable)
new mode 100644 (file)
index e9b1623..4be58e7
--- a/po/fi.po
+++ b/po/fi.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Muut"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galleria"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Autom. synkronointi"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Lisää tili"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tehtävä"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Yhteystietojen synkronointi"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP-puhelu"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Ruuhkapäivät"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "Kalenteri"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Ruuhka-ajan loppu"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Ruuhka-ajan alku"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musiikki"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Kaikki tiedot"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Viestit"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Synkronointipalvelin"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Sähköposti"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Lähetä"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Voit hallita yhteystietoja, kalentereita, sähköpostiviestejä ja pikaviestitilejä"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Näytä salasana"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Palveluviestikansiot"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Tehtävien synkronointi"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalent."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-puhelu"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Tuntematon"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Sähköpostitilien enimmäismäärä on saavutettu."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Lisää"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Autom. synkronointi"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Yhteystieto"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Lisää tili"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Tilit"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Valokuva"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Pois"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Lähetä"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Voit hallita yhteystietoja, kalentereita, sähköpostiviestejä ja pikaviestitilejä."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Säilytä yhteys akun ollessa lopussa"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Kirjauduttu sisään."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Säilytä yhteys vieraassa verkossa"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Yhteystiedot"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Lisää tili"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Synkronoi automaattisesti"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videot"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Matkapuhelimen seuranta"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Tili-\nluettelo"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Kaikki tähän tiliin liittyvät tiedot poistetaan. Jatketaanko?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Virheellinen käyttäjänimi tai sähköpostiosoite"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Ei voi poistaa. Yritetäänkö uudelleen?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manuaalinen asennus"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Nykyiset tapahtumat voidaan poistaa tai säilyttää, jos synkronointi poistetaan käytöstä"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Tililuettelo"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Nykyiset yhteystiedot voidaan poistaa tai säilyttää, jos synkronointi poistetaan käytöstä"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Poista puhelimesta"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Säilytä puhelimessa"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Synkronointipalvelin"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videot"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tehtävä"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Muut sähköpostiviestit"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Opetusohjelma suoritettu."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Tilit ja synkronointi"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Valitse käytettävä pilvipalvelu ja luo tili. Kun olet luonut Samsung-tilin, tallennetut muistiot synkronoidaan automaattisesti."
 
diff --git a/po/fr.po b/po/fr.po
new file mode 100644 (file)
index 0000000..c11d321
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,81 @@
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerie"
+
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
+
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Appel voIP"
+
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
+
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musique"
+
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Messages"
+
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
+
+msgid "IDS_COM_BODY_EMAIL"
+msgstr "Email"
+
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
+
+msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
+msgstr "Microsoft Exchange ActiveSync"
+
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Nombre maximum de messageries atteint"
+
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Synchronisation auto."
+
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Ajouter compte"
+
+msgid "IDS_MA_HEADER_ACCOUNTS"
+msgstr "Comptes"
+
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
+
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Vous pouvez gérer vos contacts, calendriers, e-mail et comptes MI."
+
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Connecté"
+
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contacts"
+
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Ajouter compte"
+
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Vidéos"
+
+msgid "IDS_ST_BODY_MOBILE_TRACKER"
+msgstr "Traçage du mobile"
+
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Liste des comptes"
+
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Serveur de synchronisation"
+
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tâche"
+
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Didacticiel terminé."
+
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Sélectionnez un service cloud à utiliser, puis configurez un compte. Une fois le compte Samsung configuré, les mémos enregistrés sont synchronisés automatiquement."
+
old mode 100755 (executable)
new mode 100644 (file)
index a602fe5..d3f8c1d
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Autres"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerie"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Synchro. automatique"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Mémo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Ajouter un compte"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tâche"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Synchronisation des contacts"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Appel voIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Jours de pointe"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Calendrier"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Fin de période de pointe"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Appli Samsung"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Début de période de pointe"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musique"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Toutes les données"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Messagerie"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Serveur de synchro."
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Courriel"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Vous pouvez gérer vos contacts, calendriers, courriels et comptes MI"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Afficher le mot de passe"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Dossiers de messagerie vers Push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Synchronisation des tâches"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Calend."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Appli Samsung"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Appel voIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Inconnu"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Nombre maximum de messageries atteint."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Ajouter"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Synchro. automatique"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contact"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Ajouter un compte"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Comptes"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Photo"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactif"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Vous pouvez gérer vos contacts, calendriers, courriels et comptes MI."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Conserver la connexion lorsque la pile est faible"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Connecté."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Conserver la connexion en itinérance"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contacts"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Ajouter un compte"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sync. automatiquement"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Vidéos"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Traçage du mobile"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Liste comptes"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Toutes les données associées à ce compte seront supprimées. Continuer ?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nom d'utilisateur ou courriel incorrect"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Suppression impossible. Réessayer ?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configuration manuelle"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Lorsque la synchronisation est désactivée, vous pouvez conserver ou supprimer les évènements existants"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Liste des comptes"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Lorsque la synchronisation est désactivée, vous pouvez conserver ou supprimer les contacts existants"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Supprimer du téléphone"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Conserver sur téléphone"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Serveur de synchro."
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Vidéos"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tâche"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Autres courriels"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Didacticiel terminé"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Comptes et synchronisation"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Sélectionnez un service de stockage en nuage à utiliser, puis configurez un compte. Une fois le compte Samsung configuré, les mémos enregistrés sont synchronisés automatiquement."
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
deleted file mode 100755 (executable)
index 62bafb4..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Autres"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Synchronisation auto."
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Ajouter compte"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tâche"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Synchro. des contacts"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Jours de pointe"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Fin de période de pointe"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Début de période de pointe"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Toutes les données"
-
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Serveur de synchro."
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "Email"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Vous pouvez gérer vos contacts, calendriers, e-mail et comptes MI"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Afficher le mot de passe"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Dossiers de messagerie vers Push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Synchronisation des tâches"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Calend."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Appel voIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Inconnu"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Ajouter"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contact"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "Comptes"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Photo"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactif"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Conserver la connexion lorsque la batterie est faible"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Conserver la connexion en itinérance"
-
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sync. automatiquement"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "Traçage du mobile"
-
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Liste comptes"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Toutes les données associées à ce compte seront supprimées. Continuer ?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nom d'utilisateur ou e-mail incorrect"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Suppression impossible. Réessayer ?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configuration manuelle"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Lorsque la synchronisation est désactivée, vous pouvez conserver ou supprimer les événements existants"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Lorsque la synchronisation est désactivée, vous pouvez conserver ou supprimer les contacts existants"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Supprimer du téléphone"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Conserver sur téléphone"
-
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Vidéos"
-
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Autres e-mails"
-
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Comptes et synchro."
-
old mode 100755 (executable)
new mode 100644 (file)
index cbfbdb4..be52b88
--- a/po/ga.po
+++ b/po/ga.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Cinn Eile"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Gailearaí"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Uathshioncronú"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Cuir cuntas leis"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tasc"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sionc. teagmhálaithe"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Glao VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Buaic-laethanta"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Phleanálaí"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Buaic-am deiridh"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Buaic-am tosaigh"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Ceol"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Gach sonra"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Teachtaireachtaí"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Freastalaí sioncronaithe"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "An tIdirlíon"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "R-phost"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Is féidir leat do theagmhálaithe, féilirí, ríomhphost agus cuntais IM a bhainistiú"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Taispeáin pasfhocal"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Fillteáin r-phoist le brú"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Tasc sionc"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Féilire"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Glao VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Anaithnid"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Uaslíon na gcuntas r-phost bainte amach."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Cuir leis"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Uathshioncronú"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Teagmhálaí"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Cuir cuntas leis"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Cuntais"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Grianghraf"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Neamhghníomhach"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Is féidir leat do theagmhálaithe, féilirí, ríomhphost agus cuntais IM a bhainistiú"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Coinnigh an nasc nuair a bhíonn an ceallra lag"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Sínithe isteach."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Coinnigh an nasc le linn fánaíochta"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Teagmhálaithe"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Cuir cuntas leis"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Uathshionc"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Físeáin"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Rianaire taistil"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Liosta cuntas"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Scriosfar gach sonra a bhaineann leis an gcuntas seo. Ar aghaidh?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Ainm úsáideora nó r-phost mícheart"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Ní féidir scriosadh. Triail arís?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Socrú de láimh"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Is féidir imeachtaí atá ann cheana a scriosadh nó a choinneáil má tá sioncronú casta as"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Liosta na gcuntas"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Is féidir teagmhálaithe atá ann cheana féin a scriosadh nó a choinneáil má tá sioncronú casta as"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Scrios ón bhfón"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Coinnigh ar an bhfón"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Freastalaí sioncronaithe"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Físeáin"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tasc"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "R-phoist eile"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Ceacht teagaisc curtha i gcrích."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Cuntais agus sioncronú"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Roghnaigh néalseirbhís le húsáid agus ansin socraigh cuntas. Nuair atá an cuntas Samsung socraithe agat, déanfar meabhráin atá sábháilte a uathshioncronú."
 
old mode 100755 (executable)
new mode 100644 (file)
index 1c4c69e..d5d7571
--- a/po/gl.po
+++ b/po/gl.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Outros"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galería"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sincron. automática"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "Aceptar"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Engadir conta"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tarefa"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sincronizar contactos"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Chamada VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Días activos"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "Calendario"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Fin de horario activo"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Inicio de horario activo"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Música"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Todos os datos"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Mensaxes"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Servidor de sincronización"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Correo electrónico"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Actualización"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Podes xestionar os teus contactos, calendarios, correos electrónicos e contas de MI"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Mostrar contrasinal"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Carpetas de correo a push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Tarefa sincronizada"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Calend."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Chamada VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Descoñecido"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Alcanzouse o número máximo de correos electrónicos"
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Eng."
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sincron. automática"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contacto"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Engadir conta"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Contas"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactivo"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "Aceptar"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Actualización"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Podes xestionar os teus contactos, calendarios, correos electrónicos e contas de MI"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Manter conexión coa batería baixa"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Sesión iniciada"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Manter a conexión en itinerancia"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contactos"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Engadir conta"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sincronizar automaticamente"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Vídeos"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Rastrexador móbil"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Lista de contas"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Eliminaranse todos os datos relacionados con esta conta. Continuar?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "O nome de usuario ou o correo electrónico son incorrectos"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Non se pode eliminar. Intentar e novo?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configuración manual"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Os eventos existentes poden eliminarse ou manterse se se desactiva a sincronización"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Os contactos existentes poden eliminarse ou manterse se se desactiva a sincronización"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Eliminar do teléfono"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Manter no teléfono"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Servidor de sincronización"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Vídeos"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tarefa"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Outros correos electrónicos"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial completado"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Contas e sincronización"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Selecciona un servizo na nube para usar e, a continuación, configura unha conta. Unha vez configurada unha Samsung account, as notas gardadas sincronizaranse automaticamente."
 
diff --git a/po/he.po b/po/he.po
deleted file mode 100755 (executable)
index cf3d888..0000000
--- a/po/he.po
+++ /dev/null
@@ -1,135 +0,0 @@
-msgid "IDS_COM_BODY_TASK"
-msgstr "משימה"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "אחרים"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "סינכרון אוטומטי"
-
-msgid "IDS_MA_BODY_ACCOUNT_LIST"
-msgstr "Account list"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "באפשרותך לנהל את אנשי הקשר, לוח השנה, הדואר האלקטרוני וחשבונות ה-IM שלך"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "לוח שנה"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "שיחת VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "לא ידוע"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "הוספה"
-
-msgid "IDS_FB_BUTTON_VIDEO"
-msgstr "וידאו"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "איש קשר"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "אישור"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "חשבונות"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "הוסף חשבון"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "תמונה"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "לא פעיל"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "סינכרון אנשי קשר"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "שמור על החיבור כאשר הסוללה חלשה"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "שמור על חיבור בעת נדידה"
-
-msgid "IDS_MA_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "ימים עמוסים"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "זמן סיום העומס"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "זמן תחילת העומס"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "סינכרון אוטומטי"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "כל הנתונים"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "עוקב נייד"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "דוא”ל"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "כל הנתונים הקשורים לחשבון זה יימחקו. להמשיך?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "הזן שם משתמש או דואר אלקטרוני"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "לא ניתן למחוק. לנסות שוב?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "הצג סיסמה"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "תיקיות דואר לדחיפה"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "הגדרה ידנית"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "ניתן למחוק או לשמור אירועים קיימים כשהסינכרון כבוי"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "ניתן למחוק או לשמור אנשי קשר קיימים כשהסינכרון כבוי"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "מחק מהטלפון"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "שמור בטלפון"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "סינכרון משימות"
-
old mode 100755 (executable)
new mode 100644 (file)
index 38704fe..e7804c6
--- a/po/hi.po
+++ b/po/hi.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "à¤\85नà¥\8dय"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "à¤\97à¥\88लरà¥\80"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "ऑटो सिंक"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "ओके"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "खाता जोड़ें"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "कार्य"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "कांटेक्ट सिंक"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP कॉल"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "पीक दिन"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "पीक समाप्ति समय"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "पà¥\80à¤\95 à¤ªà¥\8dरारà¤\82भ à¤¸à¤®à¤¯"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "सà¤\82à¤\97à¥\80त"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "सभà¥\80 à¤¡à¤¾à¤\9fा"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "सनà¥\8dदà¥\87श"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "सरà¥\8dवर à¤¸à¤¿à¤\82à¤\95 à¤\95रà¥\87à¤\82"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "à¤\87à¤\82à¤\9fरनà¥\87à¤\9f"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "ईमेल"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "विनिमय à¤\95रà¥\87à¤\82"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "पà¥\8bसà¥\8dà¤\9f"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "माइक्रोसॉफ्ट एक्सचेंज एक्टिवसिंक"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "आप अपने संपर्क, कैलेंडर्स, ईमेल, तथा IM खातें प्रबंध कर सकते हैं"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "पासवर्ड दिखाएँ"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "पुश के लिए मेल फ़ोल्‍डर्स"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "कार्य सिंक"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "विन्डोस लाइव हॉटमेल"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "कैलेंडर"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "सैमसंग एप्स"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP कॉल"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "ईमेल खातों की अधिकतम संख्‍या पहुँची।"
 
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "अज्ञात"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "जोड़ें"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "ऑटो सिंक"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "सà¤\82परà¥\8dà¤\95"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "à¤\96ाता à¤\9cà¥\8bड़à¥\87à¤\82"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "à¤\96ाता"
+msgstr "à¤\96ातà¥\87à¤\82"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "फोटो"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "निष्क्रिय"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "ओके"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "पà¥\8bसà¥\8dà¤\9f"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "à¤\86प à¤\85पनà¥\87 à¤¸à¤\82परà¥\8dà¤\95, à¤\95à¥\88लà¥\87à¤\82डरà¥\8dस, à¤\88मà¥\87ल, à¤¤à¤¥à¤¾ IM à¤\96ातà¥\87 à¤ªà¥\8dरबà¤\82ध à¤\95र à¤¸à¤\95तà¥\87 à¤¹à¥\88à¤\82"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "निमà¥\8dन à¤¬à¥\88à¤\9fरà¥\80 à¤ªà¤° à¤\95नà¥\87à¤\95à¥\8dशन à¤°à¤\96à¥\87à¤\82"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "साà¤\87न à¤\87न à¤\95िया।"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "à¤\95नà¥\87à¤\95à¥\8dâ\80\8dशन à¤°à¥\8bमिà¤\82à¤\97 à¤ªà¤° à¤°à¤\96à¥\87à¤\82"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "सà¤\82परà¥\8dà¤\95"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "खाता जोड़ें"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "सà¥\8dवà¤\9aालित à¤°à¥\82प à¤¸à¥\87 à¤¸à¤¿à¤\82à¤\95à¥\8dरनाà¤\87à¤\9c़"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "वà¥\80डियà¥\8b"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "मोबाइल ट्रेकर"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "खाता सूची"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "इस खाते से संबंधित सभी डेटा हटाया जाएगा। जारी रखें?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "गलत यूज़र नाम या Email"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "हटाने में अक्षम। फिर से प्रयास करें?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "सैमसंग"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "मैन्युअल सेटअप"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "यदि सिंक्रोनाइज़ेशन बंद किया जाएगा तो मौजूदा प्रसंग्स हटाएँ जायेंगे या रख दिए जायेंगे"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "यदि सिंक्रोनाइज़ेशन बंद किया जाएगा तो मौजूदा संपर्क हटाएँ जायेंगे या रख दिए जायेंगे"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "फ़ोन से हटाएँ"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "फ़ोन में रखें"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "सर्वर सिंक करें"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "विडियà¥\8b"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "à¤\95ारà¥\8dय"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "à¤\85नà¥\8dय à¤\88मà¥\87लà¥\8dस"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "शिà¤\95à¥\8dषण à¤ªà¥\82रà¥\8dण।"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "à¤\96ातà¥\87 à¤\94र à¤¸à¤¿à¤\82à¤\95à¥\8dर"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "à¤\95िसà¥\80 à¤\95à¥\8dलाà¤\89ड à¤¸à¥\87वा à¤\95ा à¤\89पयà¥\8bà¤\97 à¤\95रनà¥\87 à¤\95à¥\87 à¤²à¤¿à¤\8f à¤\89सà¤\95ा à¤\9aयन à¤\95रà¥\87à¤\82 à¤\94र à¤«à¤¿à¤° à¤\95à¥\8bà¤\88 à¤\96ाता à¤¸à¥\87à¤\9f à¤\95रà¥\87à¤\82। à¤\8fà¤\95 à¤¬à¤¾à¤° à¤\86पà¤\95à¥\87 à¤¦à¥\8dवारा à¤\95à¥\8bà¤\88 Samsung account à¤¸à¥\87à¤\9f à¤\95र à¤²à¥\87नà¥\87 à¤\95à¥\87 à¤¬à¤¾à¤¦ à¤¸à¥\81रà¤\95à¥\8dषित à¤\95िà¤\8f à¤\97à¤\8f à¤®à¥\87मà¥\8bà¥\9b à¤¸à¥\8dवà¤\9aालित à¤°à¥\82प à¤¸à¥\87 à¤¸à¤¿à¤\82à¤\95à¥\8dरनाà¤\87à¥\9b à¤\95िà¤\8f à¤\9cाà¤\8fà¤\81à¤\97à¥\87।"
 
old mode 100755 (executable)
new mode 100644 (file)
index a542d97..bda7e6c
--- a/po/hr.po
+++ b/po/hr.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Ostalo"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerija"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Auto. sinkronizacija"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Bilješka"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Dodaj račun"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Obaveza"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sinkronizacija kontakata"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP poziv"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Dani česte sinkr."
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planer"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Kraj česte sinkr."
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Početak česte sinkr."
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Glazba"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Svi podaci"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Poruke"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Poslužitelj sinkronizacije"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Email"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Objavi"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Upravljajte kontaktima, kalendarima, email porukama i IM računima"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Prikaži šifru"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Mape za sinkronizaciju"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sinkronizacija obveza"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalendar"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP poziv"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Nepoznato"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Maks. broj email računa."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Dodaj"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Auto. sinkronizacija"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Dodaj račun"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Računi"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fotografija"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Neaktivno"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Objavi"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Upravljajte kontaktima, kalendarima, email porukama i IM računima."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Zadrži vezu kod prazne baterije"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Prijavljen."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Zadrži vezu u roamingu"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Imenik"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Dodaj račun"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Automatski sinkroniziraj"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Video"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobilni lokator"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Popis računa"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Svi podaci vezani za ovaj račun bit će obrisani. Nastavak?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Korisničko ime ili email neispravni"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Nemoguće obrisati. Ponoviti?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Ručno postavljanje"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Postojeći događaji mogu se izbrisati ili zadržati nakon isključivanja sinkronizacije"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Postojeći kontakti mogu se izbrisati ili zadržati nakon isključivanja sinkronizacije"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Obriši s telefona"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Zadrži na telefonu"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Poslužitelj sinkronizacije"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Video"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Obaveza"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Drugi email"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Vodič dovršen."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Računi i sinkronizacija"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Odaberite uslugu oblaka koju ćete koristiti i napravite račun. Nakon što ste postavili Samsung račun, spremljene bilješke bit će automatski sinkronizirane."
 
old mode 100755 (executable)
new mode 100644 (file)
index 4250ba5..32b249d
--- a/po/hu.po
+++ b/po/hu.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Egyéb"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galéria"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Aut. szinkronizálás"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Jegyzet"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Fiók hozzáadása"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Teendők"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Névjegyzék szinkronizálása"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP-hívás"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Csúcsnapok"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Tervező"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Csúcsidőszak vége"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Csúcsidőszak kezdete"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Zenék"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Ã\96sszes adat"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Ã\9czenetek"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Szinkronizációs szerver"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-mail"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Kezelheti névjegyzékét, naptárait, e-mailjeit és IM-fiókjait"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Jelszó megjelenítése"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Levelezési mappák push szolgáltatásba"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Feladatok szinkronizálása"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Naptár"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-hívás"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Ismeretlen"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Elérte az e-mail fiókok maximális számát."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Hozzáad"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Aut. szinkronizálás"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Névjegy"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Fiók hozzáadása"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Fiókok"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fénykép"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Kikapcsolva"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Kezelheti névjegyzékét, naptárait, e-mailjeit és IM-fiókjait."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Kapcsolat fenntartása lemerülő akkumulátor esetén"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Bejelentkezve."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Kapcsolat fenntartása roaming esetén"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Névjegyek"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Fiók hozzáadása"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Auto. szinkronizálás"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videók"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobilkövető"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Fiókok\nlistája"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "A fiókhoz kapcsolódó minden adatot törölni fog. Folytatja?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Érvénytelen felhasználónév vagy e-mail cím"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Nem törölhető. Megpróbálja újra?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Kézi beállítás"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "A szinkronizálás kikapcsolása esetén a meglévő események törölhetők vagy megtarthatók"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Fiókok listája"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "A szinkronizálás kikapcsolása esetén a meglévő névjegyek törölhetők vagy megtarthatók"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Törlés a telefonról"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Megtartás a telefonon"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Szinkronizációs szerver"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videók"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Teendők"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Egyéb e-mailek"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "A tankönyv befejeződött."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Fiókok és szinkronizálás"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Válassza ki a használni kívánt felhőszolgáltatást, és állítson be fiókot. Samsung account beállítása után a mentett jegyzetek automatikusan szinkronizálva lesznek."
 
old mode 100755 (executable)
new mode 100644 (file)
index cb06325..4c49a6c
--- a/po/hy.po
+++ b/po/hy.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Այլ"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Պատկերասրահ"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Ինքնաբար համաժամեցում"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Հաշվի ավելացում"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Առաջադրանք"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Կոնտակտի հմժմցմ"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP կանչ"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Ծանրաբեռնված օրեր"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Ծանրաբեռնված ժամանակահատվածի ավարտի ժամկետը"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Ô¾Õ¡Õ¶Ö\80Õ¡Õ¢Õ¥Õ¼Õ¶Õ¾Õ¡Õ® ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ°Õ¡Õ¿Õ¾Õ¡Õ®Õ« Õ½Õ¯Õ½Õ´Õ¡Õ¶ ÕªÕ¡Õ´Õ¯Õ¥Õ¿Õ¨"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "ÔµÖ\80Õ¡ÕªÕ·Õ¿Õ¸Ö\82Õ©ÕµÕ¸Ö\82Õ¶"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Բոլոր տվյալները"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Հղրդգրթ"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Համաժամացման սերվեր"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Ինտերնետ"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Էլ.փոստ"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Կարող եք կառավարել Ձեր կոնտակտները, օրացույցները, էլփոստը և IM հաշիվները"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Ցույց տալ գաղտնաբառը"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Փոստի թղթապանակներ՝ push-ի համար"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Առաջադրանքի հմժմցմ"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Օրացույց"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP կանչ"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Անհայտ"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Հասել է էլ. փոստի հաշիվների առավելագույն քանակին:"
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Ô±Õ¾Õ¬Õ¶Õ¬"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Ô»Õ¶Ö\84Õ¶Õ¡Õ¢Õ¡Ö\80 Õ°Õ¡Õ´Õ¡ÕªÕ¡Õ´Õ¥Ö\81Õ¸Ö\82Õ´"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Կոնտակտ"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Հաշվի ավելացում"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Հաշիվներ"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Լուսանկար"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Ակտիվ չէ"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Կարող եք կառավարել Ձեր կոնտակտները, օրացույցները, էլփոստը և IM հաշիվները:"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Õ\8aÕ¡Õ°Õ¥Õ¬ Õ¯Õ¡ÕºÕ¨ Õ¶Õ½Õ¿Õ¡Õ® Õ´Õ¡Ö\80Õ¿Õ¯Õ¸Ö\81Õ¸Õ¾"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Õ\84Õ¸Ö\82Õ¿Ö\84 Õ§ Õ£Õ¸Ö\80Õ®Õ¥Õ¬:"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Պահել կապը ռոումինգում"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Կոնտակտներ"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Հաշվի ավելացում"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Õ\80Õ¡Õ´Õ¡ÕªÕ¡Õ´Õ¡Ö\81Õ¶Õ¥Õ¬ Õ«Õ¶Ö\84Õ¶Õ¡Õ¢Õ¥Ö\80Õ¡Õ¢Õ¡ր"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Õ\8fÕ¥Õ½Õ¡Õ°Õ¸Õ¬Õ¸Õ¾Õ¡Õ¯Õ¶Õ¥ր"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "SIM քարտի փոփոխության մասին ծանուցում"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Հաշիվների ցանկ"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Այս հաշվին առնչվող բոլոր տվյալները կվերացվեն. շարունակե՞լ:"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Սխալ օգտվողի անուն կամ էլփոստ"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Անհնար է վերացնել: Փորձե՞լ նորից:"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Ձեռքով նախադրում"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Եթե համաժամացումն անջատվի, գոյություն ունեցող իրադարձությունները կարող են կա՛մ վերացվել, կա՛մ պահվել"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Եթե համաժամացումն անջատվի, գոյություն ունեցող կոնտակտները կարող են կա՛մ վերացվել, կա՛մ պահվել"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Վերացնել հեռախոսից"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Պահել հեռախոսում"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Համաժամացման սերվեր"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Տեսահոլովակներ"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Առաջադրանք"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Այլ էլփոստեր"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Ուսումնական ձեռնարկն ավարտվեց:"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Հաշիվներ և հմժմ"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Ընտրեք ամպային ծառայություն՝ դա օգտագործելու համար, այնուհետև ստեղծեք հաշիվ: Հենց որ Samsung հաշիվ ստեղծեք, պահպանված հուշագրերը կհամաժամացվեն ինքնաբերաբար"
 
diff --git a/po/id.po b/po/id.po
deleted file mode 100755 (executable)
index 1a90700..0000000
--- a/po/id.po
+++ /dev/null
@@ -1,135 +0,0 @@
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tugas"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Lainnya"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sinkr otmatis"
-
-msgid "IDS_MA_BODY_ACCOUNT_LIST"
-msgstr "Account list"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Anda dapat mengelola kontak, kalender, email, dan akun IM Anda"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalender"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Panggilan VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Tidak diketahui"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Tambahkn"
-
-msgid "IDS_FB_BUTTON_VIDEO"
-msgstr "Video"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontak"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "Akun"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Tambah akun"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Photo"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Nonaktif"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sinkr. kontak"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Tetap tersambung saat baterai lemah"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Sambunga tetap jelajah"
-
-msgid "IDS_MA_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Hari-hari sibuk"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Waktu akhir sibuk"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Waktu mulai sibuk"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sinkr. secara otomatis"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Semua data"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "Mobile tracker"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "Email"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Semua data yang terkait dengan akun ini akan dihapus. Lanjutkan?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nama pengguna atau email salah"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Tidak dapat menghapus. Coba lagi?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Tampilkan kata sandi"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Folder surat ke push"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Pengaturan manual"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Peristiwa yang ada dapat dihapus atau disimpan jika sinkronisasi dinonaktifkan"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Kontak yang ada dapat dihapus atau disimpan jika sinkronisasi dinonaktifkan"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Hapus dari telepon"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Simpan pada telepon"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sinkr. tugas"
-
old mode 100755 (executable)
new mode 100644 (file)
index 792d089..784729c
--- a/po/is.po
+++ b/po/is.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Aðrir"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Gallerí"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sjálfvirk samstilling"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "Í lagi"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Bæta við reikningi"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Verkefni"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Samstilling tengiliða"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP-símtal"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Álagsdagar"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S-skipulag"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Lok álagstíma"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Byrjun álagstíma"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Tónlist"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Öll gögn"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Skilaboð"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Netþjónn samstillingar"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internetið"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Tölvupóstur"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Birta"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Þú getur stjórnað tengiliðunum þínum, dagbókum, tölvupósti og spjallreikningum"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Sýna lykilorð"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Póstmöppur til að vakta"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Samstilling verkefna"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Dagbók"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-símtal"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Óþekkt"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Hámarksfjölda pósthólfa hefur verið náð."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Bæta"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sjálfvirk samstilling"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Tengiliður"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Bæta við reikningi"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "Pósthólf"
+msgstr "Reikningar"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Mynd"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Óvirkt"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "Í lagi"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Birta"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Þú getur stjórnað tengiliðunum þínum, dagbókum, tölvupósti og spjallreikningum."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Halda tengingu þegar rafhlaðan er að tæmast"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Þú ert innskráð/ur."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Halda tengingu í reiki"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Tengiliðir"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Bæta við reikningi"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Samstilla sjálfkrafa"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Myndskeið"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Farsímarakning"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Reikningalisti"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Öllum gögnum sem tengjast áskriftinni verður eytt. Viltu halda áfram?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Rangt notandanafn eða netfang"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Mistókst að eyða. Viltu reyna aftur?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Handvirk uppsetning"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Fyrirliggjandi viðburði er annað hvort hægt að eyða eða geyma ef slökkt er á samstillingu"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Fyrirliggjandi tengiliðum er annað hvort hægt að eyða eða geyma ef slökkt er á samstillingu"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Eyða úr síma"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Hafa áfram í síma"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Netþjónn samstillingar"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Myndskeið"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Verkefni"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Annar tölvupóstur"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Kennslu lokið."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Reikningar og samstilling"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Veldu skýjaþjónustu og settu svo upp reikning. Þegar Samsung-reikningur hefur verið settur upp verða vistuð minnisatriði samstillt sjálfkrafa."
 
old mode 100755 (executable)
new mode 100644 (file)
index e7ccf46..5d769ae
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Altro"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galleria"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sincronizzaz. automatica"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Aggiungi account"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Attività"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sincronizza contatti"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Chiamata VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Giorni di punta"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "Calendario"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Fine ora di punta"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Inizio ora di punta"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musica"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Tutti i dati"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Messaggi"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Server sincronizzazione"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-mail"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Invia"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Potete gestire contatti, calendari, e-mail e account IM"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Mostra password"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Cartelle da scaricare automaticamente"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sincronizza attività"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Agenda"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Chiamata VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Sconosciuto"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Raggiunto numero massimo di account email."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Aggiungi"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sincronizzaz. automatica"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contatto"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Aggiungi account"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Account"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Non attivo"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Invia"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Potete gestire contatti, calendari, e-mail e account IM."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Mantieni connessione con batteria scarica"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Accesso eseguito."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Mantieni connessione in roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Rubrica"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Aggiungi account"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sincronizza automaticamente"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Video"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobile Tracker"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Elenco account"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Tutti i dati relativi a questo account verranno eliminati. Continuare?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nome utente o e-mail errati"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Impossibile eliminare. Riprovare?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configurazione manuale"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Se la sincronizzazione è disattivata, gli eventi esistenti possono essere eliminati o conservati"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Se la sincronizzazione è disattivata, i dati esistenti possono essere eliminati o conservati"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Elimina dal telefono"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Conserva sul telefono"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Server sincronizzazione"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Video"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Attività"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Altre e-mail"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial completato."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Account e sincronizzazione"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Selezionate un servizio cloud da utilizzare, quindi configurate un account. Al termine della configurazione dell'account Samsung, i promemoria salvati verranno sincronizzati automaticamente."
 
old mode 100755 (executable)
new mode 100644 (file)
index bd4abd2..19737e7
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "ã\81\9dã\81®ä»\96"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "ã\82®ã\83£ã\83©ã\83ªã\83¼"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "自動同期"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "アカウント追加"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "タスク"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "Sメモ"
 
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "連絡先を同期"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP電話"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "ピーク日"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "Sプランナー"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "ピーク終了時刻"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "ピーク開始時刻"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "音楽"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "全てのデータ"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "メッセージ"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "同期サーバー"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "ブラウザ"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Eメール"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "投稿"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "連絡先、カレンダー、Eメール、およびIMアカウントを管理できます。"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "パスワードを表示"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "最大メールアカウント数に達しました。"
 
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "プッシュするメールフォルダ"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "タスク同期"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "ドコモ電話帳, スケジュール&メモ"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP電話"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "不明"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "追加"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "自動同期"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "連絡先"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "アカウント追加"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "アカウント"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "画像"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "無効"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "投稿"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "連絡先、カレンダー、Eメール、およびIMアカウントを管理できます。"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "低電力で接続維持"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "サインインしました。"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "ローミングで接続維持"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "電話帳"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "アカウント追加"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "自動同期"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "動画"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "モバイルトラッカー"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "アカウント​リスト"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "この​アカウント​に​関する​全て​の​データ​が​削除​され​ます。​続行​しますか?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "ユーザー名またはEメールが正しくありません。"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "削除​でき​ません。​やり直し​ますか?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "手動設定"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "同期がOFFの場合、現在のイベントを削除することも残すこともできます"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "アカウントリスト"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "同期がOFFの場合、現在の連絡先を削除することも残すこともできます"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "端末から削除"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "端末に残す"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "同期サーバー"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "動画"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "タスク"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "ã\81\9dã\81®ä»\96ã\81®Eã\83¡ã\83¼ã\83«"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "ã\83\81ã\83¥ã\83¼ã\83\88ã\83ªã\82¢ã\83«ã\81\8cå®\8cäº\86ã\81\97ã\81¾ã\81\97ã\81\9fã\80\82"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "アカウントと同期"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "使用するクラウドサービスを選択した後、アカウントを設定します。一度Samsungアカウントを設定すると、保存されたメモは自動的に同期されます。"
 
old mode 100755 (executable)
new mode 100644 (file)
index a0f371f..1585541
--- a/po/ka.po
+++ b/po/ka.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "á\83¡á\83®á\83\95á\83\94á\83\91á\83\98"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "á\83\92á\83\90á\83\9aá\83\94á\83 á\83\94á\83\90"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "ავტომატური სინქრონიზაცია"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "ანგარიშის დამატება"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "დავალება"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "კონტაქტების სინქრონიზაცია"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP ზარი"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "შერჩეული დღეები"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "საბოლოო დროის არჩევა"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "á\83¡á\83\90á\83¬á\83§á\83\98á\83¡á\83\98 á\83\93á\83 á\83\9dá\83\98á\83¡ á\83\90á\83 á\83©á\83\94á\83\95ა"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "á\83\9bá\83£á\83¡á\83\98á\83\99ა"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "á\83§á\83\95á\83\94á\83\9aá\83\90 á\83\9bá\83\9dá\83\9cá\83\90á\83ªá\83\94á\83\9bი"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "á\83¨á\83\94á\83¢á\83§á\83\9dá\83\91á\83\98á\83\9cá\83\94á\83\91á\83\94á\83\91ი"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "á\83¡á\83\98á\83\9cá\83¥á\83 á\83\9dá\83\9cá\83\98á\83\96á\83\90á\83ªá\83\98á\83\98á\83¡ á\83¡á\83\94á\83 á\83\95á\83\94á\83 ი"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "á\83\98á\83\9cá\83¢á\83\94á\83 á\83\9cá\83\94á\83¢ი"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "ელ-ფოსტა"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "გაგზავნა"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "შეგიძლიათ დაალაგოთ კონტაქტები, კალენდრები, ელ.ფოსტა და მესინჯერის ანგარიშები"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "გამოჩნდეს პაროლი"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "ფოსტის საქაღალდეებიდან Push-ზე"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "მიღწეულია ელ.ფოსტის ანგარიშების მაქსიმალური რაოდენობა."
 
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "დავალების სინქრონიზაცია"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "კალენდ."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP ზარი"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "უცნობი"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "დამატ."
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "ავტომატური სინქრონიზაცია"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "á\83\99á\83\9dá\83\9cá\83¢á\83\90á\83¥á\83¢á\83\98"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "á\83\90á\83\9cá\83\92á\83\90á\83 á\83\98á\83¨á\83\98á\83¡ á\83\93á\83\90á\83\9bá\83\90á\83¢á\83\94á\83\91á\83\90"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "ანგარიშები"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "ფოტო"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "არააქტიური"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "კი"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "á\83\92á\83\90á\83\92á\83\96á\83\90á\83\95á\83\9cá\83\90"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "á\83¨á\83\94á\83\92á\83\98á\83«á\83\9aá\83\98á\83\90á\83\97 á\83\93á\83\90á\83\90á\83\9aá\83\90á\83\92á\83\9dá\83\97 á\83\99á\83\9dá\83\9cá\83¢á\83\90á\83¥á\83¢á\83\94á\83\91á\83\98, á\83\99á\83\90á\83\9aá\83\94á\83\9cá\83\93á\83 á\83\94á\83\91á\83\98, á\83\94á\83\9a\83¤á\83\9dá\83¡á\83¢á\83\90 á\83\93á\83\90 á\83\9bá\83\94á\83¡á\83\98á\83\9cá\83¯á\83\94á\83 á\83\98á\83¡ á\83\90á\83\9cá\83\92á\83\90á\83 á\83\98á\83¨á\83\94á\83\91á\83\98."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "á\83\99á\83\90á\83\95á\83¨á\83\98á\83 á\83\98 á\83¨á\83\94á\83\9cá\83\90á\83 á\83©á\83£á\83\9cá\83\93á\83\94á\83¡, á\83 á\83\9dá\83ªá\83\90 á\83\99á\83\95á\83\94á\83\91á\83\98á\83¡ á\83\94á\83\9aá\83\94á\83\9bá\83\94á\83\9cá\83¢á\83\98 á\83\98á\83ªá\83\9aá\83\94á\83\91á\83\90"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "á\83¨á\83\94á\83¡á\83\95á\83\9aá\83\90."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "á\83\99á\83\90á\83\95á\83¨á\83\98á\83 á\83\98á\83¡ á\83¨á\83\94á\83\9cá\83\90á\83 á\83©á\83£á\83\9cá\83\94á\83\91á\83\90 á\83 á\83\9dá\83£á\83\9bá\83\98á\83\9cá\83\92á\83\98á\83¡ á\83\93á\83 á\83\9dá\83¡"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "á\83\99á\83\9dá\83\9cá\83¢á\83\90á\83¥á\83¢á\83\94á\83\91á\83\98"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "ანგარიშის დამატება"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "á\83\90á\83\95á\83¢á\83\9dá\83\9bá\83\90á\83¢á\83£á\83 á\83\98 á\83¡á\83\98á\83\9cá\83¥á\83 á\83\9dá\83\9cá\83\98á\83\96á\83\90á\83ªá\83\98á\83\90"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "á\83\95á\83\98á\83\93á\83\94á\83\9dá\83\94á\83\91á\83\98"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "მობილურის მზვერავი"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "ანგარიშების სია"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "ამ ანგარიშთან დაკავშირებული ყველა მონაცემი წაიშლება. განაგრძობთ?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "მომხმარებლის სახელი ან ელ.ფოსტა არასწორია"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "წაშლა შეუძლებელია. ისევ ცდით?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "მექანიკურად მოწყობა"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "არსებული მოვლენები შეგიძლიათ წაშალოთ ან შეინახოთ, თუ სინქრონიზაცია გამორთულია"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "არსებული კონტაქტები შეგიძლიათ წაშალოთ ან შეინახოთ, თუ სინქრონიზაცია გამორთულია"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "წაშლა ტელეფონში"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "შენახვა ტელეფონში"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "სინქრონიზაციის სერვერი"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "á\83\95á\83\98á\83\93á\83\94á\83\9dá\83\94á\83\91á\83\98"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "á\83\93á\83\90á\83\95á\83\90á\83\9aá\83\94á\83\91á\83\90"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "á\83¡á\83®á\83\95á\83\90 á\83\94á\83\9a\83¬á\83\94á\83 á\83\98á\83\9aá\83\94á\83\91á\83\98"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "á\83¡á\83\90á\83®á\83\94á\83\9aá\83\9bá\83«á\83¦á\83\95á\83\90á\83\9cá\83\94á\83\9aá\83\9d á\83\93á\83\90á\83¡á\83 á\83£á\83\9aá\83\93á\83\90."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "á\83\90á\83\9cá\83\92á\83\90á\83 á\83\98á\83¨á\83\94á\83\91á\83\98 á\83\93á\83\90 á\83¡á\83\98á\83\9cá\83¥á\83 á\83\9dá\83\9cá\83\98á\83\96á\83\90á\83ªá\83\98á\83\90"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "á\83\90á\83\98á\83 á\83©á\83\98á\83\94á\83\97 á\83\92á\83\90á\83\9bá\83\9dá\83¡á\83\90á\83§á\83\94á\83\9cá\83\94á\83\91á\83\94á\83\9aá\83\98 á\83\92á\83\9aá\83\9dá\83\91á\83\90á\83\9aá\83£á\83 á\83\98 á\83¥á\83¡á\83\94á\83\9aá\83\98á\83¡ á\83¡á\83\94á\83 á\83\95á\83\98á\83¡á\83\98 á\83\93á\83\90 á\83¨á\83\94á\83\9bá\83\93á\83\94á\83\92 á\83\93á\83\90á\83\90á\83§á\83\94á\83\9cá\83\94á\83\97 á\83\90á\83\9cá\83\92á\83\90á\83 á\83\98á\83¨á\83\98. Samsung á\83\90á\83\9cá\83\92á\83\90á\83 á\83\98á\83¨á\83\98á\83¡ á\83\93á\83\90á\83§á\83\94á\83\9cá\83\94á\83\91á\83\98á\83¡ á\83¨á\83\94á\83\9bá\83\93á\83\94á\83\92, á\83¨á\83\94á\83\9cá\83\90á\83®á\83£á\83\9aá\83\98 á\83¨á\83\94á\83®á\83¡á\83\94á\83\9cá\83\94á\83\91á\83\94á\83\91á\83\98 á\83\90á\83\95á\83¢á\83\9dá\83\9bá\83\90á\83¢á\83£á\83 á\83\90á\83\93 á\83\93á\83\90á\83¡á\83\98á\83\9cá\83¥á\83 á\83\9dá\83\9cá\83\93á\83\94á\83\91á\83\90."
 
old mode 100755 (executable)
new mode 100644 (file)
index a516c2a..a1da13f
--- a/po/kk.po
+++ b/po/kk.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Ð\91аÑ\81Ò\9bалаÑ\80"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Ð\93алеÑ\80еÑ\8f"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Авто синхрондау"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL қызметі"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Тіркелгі қосу"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Тапсырма"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Контактіні синхрондау"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP қоңырауы"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Қарбалас күндер"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Қарбаластың аяқталу уақыты"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Қарбаластың басталу уақыты"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Музыка"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Ð\91аÑ\80лÑ\8bÒ\9b Ð´ÐµÑ\80екÑ\82ер"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "ХабаÑ\80ламалар"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "СинÑ\85Ñ\80ондаÑ\83 Ñ\81еÑ\80веÑ\80Ñ\96"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "ШолÑ\83Ñ\88Ñ\8b"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Эл. пошта"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Айырбастау"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Контактілерді, күнтізбелерді, электрондық поштаны және IM есептік жазбаларын реттеуге болады"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Құпиясөзді көрсету"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Push етілетін пошта қалталары"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Тапсырманы синхрондау"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Күнтізбе"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP қоңырауы"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Белгісіз"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Электрондық поштаның есептік жазбаларының ең көп санына жетті."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Қосу"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Авто синхрондау"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Ð\9aонÑ\82акÑ\82"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "ТÑ\96Ñ\80келгÑ\96 Ò\9bоÑ\81Ñ\83"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Тіркелгі"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Фото"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Қосылмаған"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Контактілерді, күнтізбелерді, электрондық поштаны және IM есептік жазбаларын реттеуге болады."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Ð\91аÑ\82аÑ\80еÑ\8f Ð·Ð°Ñ\80Ñ\8fдÑ\8b Ð°Ð· ÐºÐµÐ·Ð´Ðµ Ð±Ð°Ð¹Ð»Ð°Ð½Ñ\8bÑ\81Ñ\82Ñ\8b Ñ\81аÒ\9bÑ\82аÑ\83"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Ð\9aÑ\96Ñ\80ген."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "РоÑ\83мингÑ\82е Ð±Ð°Ð¹Ð»Ð°Ð½Ñ\8bÑ\81Ñ\82Ñ\8b Ñ\81аÒ\9bÑ\82аÑ\83"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Ð\9aонÑ\82акÑ\82Ñ\96леÑ\80"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Тіркелгі қосу"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Ð\90вÑ\82омаÑ\82Ñ\82Ñ\8b Ñ\82Ò¯Ñ\80де Ñ\81инÑ\85Ñ\80ондаÑ\83"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Ð\91ейнежазбалаÑ\80"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Ұялы  байланысу жүйесі"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Ес. жазба тізімі"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Бұл есептік жазбаға қатысты барлық деректер жойылады. Жалғастыру керек пе?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Пайдаланушы аты немесе электрондық пошта қате"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Жою мүмкін емес. Әрекетті қайталау керек пе?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Қолмен орнату"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Синхрондау өшірулі болса, бар оқиғаларды жоюға не сақтауға болады"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Есептік жазбалар тізімі"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Синхрондау өшірулі болса, бар контактілерді жоюға не сақтауға болады"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Телефоннан жойыңыз"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Телефонға сақтау"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Синхрондау сервері"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Ð\91ейнежазбалаÑ\80"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "ТапÑ\81Ñ\8bÑ\80ма"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Ð\91аÑ\81Ò\9bа Ñ\8dлекÑ\82Ñ\80ондÑ\8bÒ\9b Ð¿Ð¾Ñ\88Ñ\82алаÑ\80"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Ð\9eÒ\9bÑ\83лÑ\8bÒ\9b Ð°Ñ\8fÒ\9bÑ\82алдÑ\8b."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Ð\95Ñ\81епÑ\82Ñ\96к Ð¶Ð°Ð·Ð±Ð°Ð»Ð°Ñ\80 Ð¶Ó\99не Ñ\81инÑ\85Ñ\80ондаÑ\83"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Ð\9fайдаланаÑ\82Ñ\8bн Ð±Ò±Ð»Ñ\82 Ò\9bÑ\8bзмеÑ\82Ñ\96н Ñ\82аңдаңÑ\8bз Ð´Ð°, ÐµÑ\81епÑ\82Ñ\96к Ð¶Ð°Ð·Ð±Ð°Ð½Ñ\8b Ð¾Ñ\80наÑ\82Ñ\8bÒ£Ñ\8bз. Samsung ÐµÑ\81епÑ\82Ñ\96к Ð¶Ð°Ð·Ð±Ð°Ñ\81Ñ\8bн Ð¾Ñ\80наÑ\82Ò\9bаннан ÐºÐµÐ¹Ñ\96н Ñ\81аÒ\9bÑ\82алÒ\93ан Ð¶Ð°Ð·Ð±Ð°Ð»Ð°Ñ\80 Ð°Ð²Ñ\82омаÑ\82Ñ\82Ñ\8b Ñ\82Ò¯Ñ\80де Ñ\81инÑ\85Ñ\80ондаладÑ\8b."
 
diff --git a/po/ko_KR.csv b/po/ko_KR.csv
deleted file mode 100755 (executable)
index aab6223..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-msgid,ko_KR\r
-Application template,Application template\r
-Click to exit,Clict to exit\r
-FONT_NAME,FONT_NAME\r
-SS_1_HOUR,1½Ã°£\r
-SS_ADD_SK,Ãß°¡\r
-SS_BACK,ÀÌÀü\r
-SS_CANCEL_SK,Ãë¼Ò\r
-SS_DATA_PASSWORD,ºñ¹Ð¹øÈ£\r
-SS_DELETE,»èÁ¦\r
-SS_DONE_SK,¿Ï·á\r
-SS_EMAIL,À̸ÞÀÏ\r
-SS_MY_ACCOUNT,³» °èÁ¤\r
-SS_SAVE_SK,ÀúÀå\r
-SS_1_DAY,ÇÏ·ç\r
-SS_1_MONTH,ÇÑ´Þ\r
-SS_1_WEEK,ÀÏÁÖÀÏ\r
-SS_12_HOURS,12½Ã°£\r
-SS_15_MINUTES,15ºÐ\r
-SS_2_WEEKS,2ÁÖ\r
-SS_3_DAYS,3ÀÏ\r
-SS_3_HOURS,3½Ã°£\r
-SS_3_MONTH,3°³¿ù\r
-SS_30_MINUTES,30ºÐ\r
-SS_4_HOURS,4½Ã°£\r
-SS_5_MINUTES,5ºÐ\r
-SS_6_HOURS,6½Ã°£\r
-SS_6_MONTH,6°³¿ù\r
-SS_ACCOUNT_NAME,°èÁ¤ À̸§\r
-SS_ADD_ACCOUNT,°èÁ¤ Ãß°¡\r
-SS_ALL_DATA,¸ðµç µ¥ÀÌÅÍ\r
-SS_AOL_ACCOUNT,AOL °èÁ¤\r
-SS_AUTO_SYNC_NOTIFICATIONS,ÀÚµ¿ µ¿±âÈ­ ¾Ë¸²\r
-SS_CALENDAR_DATE_RANGE,ÀÏÁ¤ µ¿±âÈ­ ±â°£\r
-SS_CALENDAR_SYNC,ÀÏÁ¤ µ¿±âÈ­\r
-SS_CONNECTING,¿¬°áÁß¡¦\r
-SS_CONTACT_SYNC,ÁÖ¼Ò·Ï µ¿±âÈ­\r
-SS_EMAIL_ADDRESS,À̸ÞÀÏ ÁÖ¼Ò\r
-SS_EMAIL_DATE_RANGE,À̸ÞÀÏ µ¿±âÈ­ ±â°£\r
-SS_EMAIL_SYNC,À̸ÞÀÏ µ¿±âÈ­\r
-SS_ENTER_YOUR_ACCOUNT,°èÁ¤ ÀÔ·Â\r
-SS_ENTER_YOUR_NAME,À̸§ ÀÔ·Â\r
-SS_ENTER_YOUR_PASSWORD,ºñ¹Ð¹øÈ£ ÀÔ·Â\r
-SS_EVERYDAY,¸ÅÀÏ\r
-SS_FLIPPER,Çø®ÆÛ\r
-SS_GOOGLE_ACCOUNT,Google °èÁ¤\r
-SS_INSTANCE_MESSENGER,¸Þ½ÅÀú\r
-SS_INSTANCE_MESSENGER_ONLY,¸Þ½ÅÀú only\r
-SS_KEEP_CONNECTION_LOW_BATTERY,¹èÅ͸® ºÎÁ·½Ã ¿¬°á À¯Áö\r
-SS_KEEP_CONNECTION_ROAMING,·Î¹Ö½Ã ¿¬°á À¯Áö\r
-SS_KEYPAD,Å°Æеå\r
-SS_MSN_ACCOUNT,MSN °èÁ¤\r
-SS_NEXT,´ÙÀ½\r
-SS_NO_ACCOUNT,°èÁ¤ ¾øÀ½\r
-SS_OFF_PEAK_SCHEDULE,¼öµ¿ µ¿±âÈ­ ÀÏÁ¤\r
-SS_PASSWORD,ºñ¹Ð¹øÈ£\r
-SS_PEAK_DAYS,µ¿±âÈ­ ½ÇÇàÀÏ\r
-SS_PEAK_SCHEDULE,µ¿±âÈ­ ¼³Á¤\r
-SS_PEAK_START_TIME,µ¿±âÈ­ ½ÃÀÛ ½Ã°£\r
-SS_PEAK_END_TIME,µ¿±âÈ­ Á¾·á ½Ã°£\r
-SS_PEAK_TIME,µ¿±âÈ­ ½Ã°£\r
-SS_PRIORITY,¿ì¼±¼øÀ§\r
-SS_SELECT_ALL,¸ðµÎ ¼±ÅÃ\r
-SS_SIGN_IN,·Î±×ÀÎ\r
-SS_SIGN_UP,°èÁ¤ µî·Ï\r
-SS_SNS_ACCOUNT,SNS °èÁ¤\r
-SS_SOCIAL_NETWORKS,¼Ò¼È ³×Æ®¿öÅ©\r
-SS_SYNC_AUTOMATICALLY,ÀÚµ¿ µ¿±âÈ­\r
-SS_SYNC_NOW,Áö±Ý µ¿±âÈ­\r
-SS_SYNC_SCHEDULE,µ¿±âÈ­ ÀÏÁ¤\r
-SS_USER_NAME,»ç¿ëÀÚ À̸§\r
-SS_USER_NAME_OR_EMAIL,»ç¿ëÀÚ À̸§ ¶Ç´Â À̸ÞÀÏ\r
-SS_VIEW_PRIORITY,¿ì¼±¼øÀ§\r
-SS_VIEW_PRIORITY_SK,¿ì¼±¼øÀ§\r
-SS_WEB_ACCOUNTS,À¥°èÁ¤\r
-SS_WEEK_DAYS,ÁÖÁß\r
-SS_WEEKLY,¸ÅÁÖ\r
-SS_YAHOO_ACCOUNT,Yahoo °èÁ¤\r
-SS_INFORMATION,Á¤º¸\r
-SS_WARNING,°æ°í\r
-SS_FAIL_GET_ACCOUNT,°èÁ¤ Á¤º¸¸¦ ¾ò¾î¿Ã ¼ö ¾ø½À´Ï´Ù. \r
-SS_CANT_CONNECT_SERVER,¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù.\r
-SS_SNS_ENGINE_NOT_INIT,SNS Engine ÃʱâÈ­ ¿ä¸Á\r
-SS_LOGIN_COMPLETE,·Î±×ÀΠ¿Ï·á\r
-SS_AUTHENTICATION_FAIL,ÀÎÁõ ½ÇÆÐ\r
-SS_LOGGING,·Î±×ÀΠÁß\r
old mode 100755 (executable)
new mode 100644 (file)
index e015dcd..c682748
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "기í\83\80"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "ê°¤ë\9f¬ë¦¬"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "자동 동기화"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "확인"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S메모"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "계정 추가"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "할 일"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "인터넷 전화"
 
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "연락처 동기화"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S플래너"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "피크 요일"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "피크 종료 시간"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "음악"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "피크 시작 시간"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "메시지"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "모든 데이터"
-
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "동기화 서버"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "인터넷"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "이메일"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "등록"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "연락처, 달력, 이메일, 메신저 계정을 관리할 수 있습니다"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "비밀번호 표시"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "푸시 메일 폴더"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "작업 동기화"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "일정"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "삼성Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "인터넷전화"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "알 수 없음"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "최대 이메일 계정 수에 도달하였습니다."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "ì\94ê°\80"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "ì\9e\90ë\8f\99 ë\8f\99기í\99\94"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "연락처"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "계정 추가"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "계정"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "사진"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "해제됨"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "확인"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "등록"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "연락처, 캘린더, 이메일, 메신저 계정을 관리할 수 있습니다."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "ë°°í\84°ë¦¬ê°\80 ë¶\80족í\95´ë\8f\84 ì\97°ê²° ì\9c ì§\80"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "ë¡\9cê·¸ì\9d¸í\95\98ì\98\80ì\8aµë\8b\88ë\8b¤."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "로밍 중에도 연결 유지"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "연락처"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "계정 추가"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "자동 동기화"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "동영상"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "모바일 트래커"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "계정 목록"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "이 계정과 관련된 모든 데이터가 삭제됩니다. 계속할까요?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "사용자 이름이나 이메일 주소가 바르지 않습니다"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "삭제할 수 없습니다. 다시 시도할까요?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "수동 설정"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "동기화를 끌 때는 기존 일정을 그대로 남겨두거나 원할 경우 삭제할 수 있습니다"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "동기화를 끌 때는 기존 연락처를 그대로 남겨두거나 원할 경우 삭제할 수 있습니다"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "휴대폰에서 삭제"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "휴대폰에 남겨두기"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "서버 동기화"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "동영상"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "할 일"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "다른 이메일"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "가이드를 완료하였습니다."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "계정 및 동기화"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "이용할 클라우드 서비스를 선택한 후 계정을 설정하세요. 삼성 계정이 설정되면 저장된 메모가 자동 동기화됩니다."
 
old mode 100755 (executable)
new mode 100644 (file)
index c2db804..581325e
--- a/po/lt.po
+++ b/po/lt.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Kiti"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerija"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Automatinis sinchronizav."
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "Gerai"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Pridėti paskyrą"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Užduotis"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Adresatų sinchronizavimas"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "„VoIP“ skambutis"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Piko dienos"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Piko pabaigos laikas"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Piko pradžios laikas"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Muzika"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Visi duomenys"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Žinutės"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sinchr. serveris"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internetas"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "El. paštas"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "„Exchange“"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Skelbti"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Galite tvarkyti adresatus, kalendorius, el. paštą ir IM paskyras"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Rodyti slaptažodį"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Pašto aplankai, kuriuose veikia „Push“"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Užduočių sinchronizavimas"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalend."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "„VoIP“ skambutis"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Nežinomas"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Pasiektas didžiausias el. pašto paskyrų skaičius."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Įtrauk."
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Automatinis sinchronizav."
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Adresatas"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Pridėti paskyrą"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Paskyros"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Nuotrauka"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Neįjungtas"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "Gerai"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Skelbti"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Galite tvarkyti adresatus, kalendorius, el. paštą ir IM paskyras."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Išlaikyti ryšį akumuliatoriui senkant"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Prisiregistruota."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Palikite įjungtą naudojant tarptinklinį ryšį"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Adresatai"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Pridėti paskyrą"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Automatiškai sinchronizuoti"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Vaizdo įrašai"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobiliojo telefono seklys"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Paskyrų sąrašas"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Bus ištrinti visi su šia paskyra susiję duomenys. Tęsti?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Neteisingas naudotojo vardas arba el. paštas"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Neįmanoma ištrinti. Bandyti dar kartą?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Rankinis nustatymas"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Išjungus sinchronizaciją esami įvykiai gali būti ištrinti arba išsaugoti"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Išjungus sinchronizaciją esami adresatai gali būti ištrinti arba išsaugoti"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Trinti iš telefono"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Saugoti telefone"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sinchr. serveris"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Vaizdo įrašai"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Užduotis"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Kiti el. laiškai"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Mokymo programa baigta."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Paskyros ir sinchr."
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Pasirinkite debesų paslaugą, kuria norite naudotis, tada sukurkite paskyrą. Sukūrus „Samsung“ paskyrą išsaugoti įrašai bus sinchronizuojami automatiškai."
 
old mode 100755 (executable)
new mode 100644 (file)
index 3cb5983..826437b
--- a/po/lv.po
+++ b/po/lv.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Citi"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerija"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Automātiska sinhr."
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "Labi"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Konta pievienošana"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Uzdevums"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kontaktu sinhronizācija"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP zvans"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Aktīvās dienas"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Aktivitātes beigu laiks"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Aktivitātes sākuma laiks"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Mūzika"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Visi dati"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Ziņas"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sinhronizēšanas serveris"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internets"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-pasts"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Varat pārvaldīt kontaktus, kalendārus, e-pasta ziņas un tūlītējās ziņapmaiņas kontus"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Rādīt paroli"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Pakalpojumam Push paredzētas pasta mapes"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Uzdevumu sinhronizācija"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalend."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP zvans"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Nezināms"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Sasniegts maksimālais e-pasta kontu skaits."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Pievien."
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Automātiska sinhr."
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakts"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Konta pievienošana"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Konti"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fotoattēls"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Neaktīvs"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "Labi"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Varat pārvaldīt kontaktus, kalendārus, e-pasta ziņas un tūlītējās ziņapmaiņas kontus."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Saglabāt savienojumu, ja akumulators ir gandrīz tukšs"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Pierakstījies."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Saglabāt savienojumu viesabonēšanas laikā"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontakti"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Konta pievienošana"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sinhronizēt automātiski"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Video"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobilais meklētājs"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Kontu saraksts"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Visi ar šo kontu saistītie dati tiks izdzēsti. Vai turpināt?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nepareizs lietotājvārds vai e-pasta adrese"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Nevar izdzēst. Vai mēģināt vēlreiz?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manuāla iestatīšana"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Ja sinhronizēšana ir izslēgta, esošos notikumus var vai nu dzēst, vai saglabāt"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Ja sinhronizēšana ir izslēgta, esošos kontaktus var vai nu dzēst, vai saglabāt"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Dzēst no tālruņa"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Saglabāt tālrunī"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sinhronizēšanas serveris"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Video"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Uzdevums"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Citas e-pasta adreses"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Apmācība pabeigta."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Konti un sinhronizācija"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Izvēlieties mākoņa pakalpojumu, kuru izmantot, un pēc tam iestatiet kontu. Kad būsit iestatījis Samsung kontu, saglabātās atgādnes tiks sinhronizētas automātiski."
 
old mode 100755 (executable)
new mode 100644 (file)
index 41c02e0..0d6c53a
--- a/po/mk.po
+++ b/po/mk.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Ð\94Ñ\80Ñ\83ги"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Ð\93алеÑ\80иÑ\98а"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Автоматска синхронизација"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Додај сметка"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Задача"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Синхронизирање контакти"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Повик VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Ударни денови"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Крај на ударното време"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Ð\9fоÑ\87еÑ\82ок Ð½Ð° Ñ\83даÑ\80но Ð²Ñ\80еме"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Ð\9cÑ\83зика"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "СиÑ\82е Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86и"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Ð\9fоÑ\80аки"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "СеÑ\80веÑ\80 Ð·Ð° Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\98а"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Ð\98нÑ\82еÑ\80неÑ\82"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Е-пошта"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Може да ги уредувате своите контакти, календари, email и сметки за ИП"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Прикажи лозинка"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Папки за пошта во push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Синхронизирање задачи"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Календар"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Повик VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Непознато"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Достигнат е максималниот број сметки за email."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Ð\94одаÑ\98"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Ð\90вÑ\82омаÑ\82Ñ\81ка Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\98а"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Ð\97апиÑ\81"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Ð\94одаÑ\98 Ñ\81меÑ\82ка"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Сметки"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Фотографија"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Неактивно"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Може да ги уредувате своите контакти, календари, email и сметки за ИП."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Ð\9fовÑ\80зÑ\83ваÑ\9aе Ð¸ Ð¿Ñ\80и Ñ\81лаба Ð±Ð°Ñ\82еÑ\80иÑ\98а"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Ð\97апиÑ\88ани Ñ\81Ñ\82е."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Ð\9fовÑ\80зÑ\83ваÑ\9aе Ð¸ Ð¿Ñ\80и Ñ\80оаминг"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Ð\98меник"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Додај сметка"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "СинÑ\85Ñ\80онизиÑ\80аÑ\98 Ð°Ð²Ñ\82омаÑ\82Ñ\81ки"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Ð\92идео-запиÑ\81и"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Мобилен локатор"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Листа сметки"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Ќе се избришат сите податоци поврзани со оваа сметка. Продолжи?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Неточно корисничко име или email"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Не може да се избрише. Повторен обид?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Рачно поставување"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Постојните настани може да се избришат или зачуваат ако е исклучена синхронизацијата"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Постојните контакти може да се избришат или зачуваат ако е исклучена синхронизацијата"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Бриши од телефонот"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Задржи во телефонот"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Сервер за синхронизација"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Ð\92идео-запиÑ\81и"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Ð\97адаÑ\87а"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Ð\94Ñ\80Ñ\83ги email-поÑ\80аки"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "УпаÑ\82Ñ\81Ñ\82воÑ\82о Ðµ Ð·Ð°Ð²Ñ\80Ñ\88ено."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "СмеÑ\82ки Ð¸ Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\98а"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Ð\98збеÑ\80еÑ\82е Ñ\81еÑ\80виÑ\81 Ð²Ð¾ Ð¾Ð±Ð»Ð°ÐºÐ¾Ñ\82 Ñ\88Ñ\82о Ñ\9cе Ð³Ð¾ ÐºÐ¾Ñ\80иÑ\81Ñ\82иÑ\82е Ð¿Ð° Ð¿Ð¾Ñ\81Ñ\82авеÑ\82е Ñ\81меÑ\82ка. Ð¨Ñ\82ом Ñ\9cе Ð¿Ð¾Ñ\81Ñ\82авиÑ\82е Ñ\81меÑ\82ка Samsung, Ð·Ð°Ñ\87Ñ\83ваниÑ\82е Ð±ÐµÐ»ÐµÑ\88ки Ñ\9cе Ñ\81е Ñ\81инÑ\85Ñ\80онизиÑ\80ааÑ\82 Ð°Ð²Ñ\82омаÑ\82Ñ\81ки."
 
diff --git a/po/ms.po b/po/ms.po
deleted file mode 100755 (executable)
index 94d172e..0000000
--- a/po/ms.po
+++ /dev/null
@@ -1,135 +0,0 @@
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tugasan"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Lain"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Auto selaras"
-
-msgid "IDS_MA_BODY_ACCOUNT_LIST"
-msgstr "Account list"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Anda boleh mengurus akaun kenalan, kalendar, e-mel dan IM anda"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalendar"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Panggilan VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Tidak diketahui"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Tambah"
-
-msgid "IDS_FB_BUTTON_VIDEO"
-msgstr "Video"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kenalan"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "Akaun"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Tambah akaun"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Tidak aktif"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Pos"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Penyelarasan kenalan"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Pastikan sambungan pada bateri lemah"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Pastikan sambungan pada perayauan"
-
-msgid "IDS_MA_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Hari puncak"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Waktu tamat puncak"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Waktu mula puncak"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Selaraskan secara automatik"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Semua data"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "Mobile tracker"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "E-mel"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Semua data yang berkaitan dengan akaun ini akan dipadamkan. Teruskan?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nama pengguna atau e-mel salah"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Tdk dpt memadam. Cuba semula?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Tunjukkan kata laluan"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Pelipat mel menolak"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Tetapan manual"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Peristiwa yang wujud boleh dipadam atau disimpan jika penyelarasan dimatikan"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Kenalan yang wujud boleh dipadam atau disimpan jika penyelarasan dimatikan"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Padam dari telefon"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Simpan dalam telefon"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Penyelarasan tugasan"
-
diff --git a/po/myaccount_ui.pot b/po/myaccount_ui.pot
deleted file mode 100644 (file)
index 2c24db1..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-07 19:35+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/myaccount_ug_account_list.c:538
-msgid ""
-"You can manage your accounts<br>of email, contacts, calendar and<br>Instant "
-"messenger."
-msgstr ""
-
-#. elm_button_label_set(l_button, (const char*)_("Settings"));
-#: src/myaccount_ug_account_list.c:553
-msgid "IDS_COM_BODY_SETTINGS"
-msgstr ""
-
-#. elm_button_label_set(r1_button, (const char*)_("Add"));
-#: src/myaccount_ug_account_list.c:558
-msgid "IDS_MA_SK_ADD"
-msgstr ""
-
-#. elm_navigationbar_push(ad->navi_bar, _("Account"), l_button, r1_button, NULL, genlist);
-#: src/myaccount_ug_account_list.c:563
-msgid "Accounts"
-msgstr ""
-
-#: src/myaccount_ug_addaccount.c:400
-msgid "Add account"
-msgstr ""
old mode 100755 (executable)
new mode 100644 (file)
index a0cdef7..ad0684e
--- a/po/nb.po
+++ b/po/nb.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Andre"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galleri"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Autosynkronisering"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Legg til konto"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Oppgave"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kontaktsynkronisering"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP-anrop"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Trafikkdager"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Trafikkperiode slutter"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Trafikkperiode starter"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musikk"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Alle data"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Meldinger"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Synk-server"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internett"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-post"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Publiser"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Du kan administrere kontakter, kalendere, e-post og direktemeldingskontoer"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Vis passord"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "E-postmapper som skal pushes"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Oppgavesynkronisering"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalender"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-anrop"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Maksimalt antall e-postkontoer er nådd."
 
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Ukjent"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Tilføy"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Autosynkronisering"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Legg til konto"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Kontoer"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inaktiv"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Publiser"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Du kan administrere kontakter, kalendere, e-post og direktemeldingskontoer."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Behold tilkoblingen ved lavt batteri"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Pålogget."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Behold tilkobling ved roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontakter"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Legg til konto"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Synkroniser automatisk"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Video"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Tyverisporing"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Konto liste"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Alle data forbundet med denne kontoen slettes. Fortsette?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Feil brukernavn eller e-post"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Kan ikke slette. Prøve på nytt?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Kontoliste"
 
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manuelt oppsett"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Eksisterende hendelser kan slettes eller beholdes dersom synkronisering slås av"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Eksisterende kontakter kan slettes eller beholdes dersom synkroniseringen slås av"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Slett fra telefon"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Behold i telefon"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Synroniser tjener"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videoklipp"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Oppgave"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Annen e-post"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Læreprogram fullført."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Kontoer og synkronisering"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Velg en nettskytjeneste du vil synkronisere med, og konfigurer deretter en konto. Når du har konfigurert en Samsung-konto, vil lagrede notater bli synkronisert automatisk."
 
diff --git a/po/nl.po b/po/nl.po
new file mode 100644 (file)
index 0000000..6e763d2
--- /dev/null
+++ b/po/nl.po
@@ -0,0 +1,81 @@
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerij"
+
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
+
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP-oproep"
+
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
+
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Muziek"
+
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Berichten"
+
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
+
+msgid "IDS_COM_BODY_EMAIL"
+msgstr "E-mail"
+
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Plaatsen"
+
+msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
+msgstr "Microsoft Exchange ActiveSync"
+
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Maximumaantal e-mailaccounts bereikt."
+
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Automatisch synchroniseren"
+
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Account toevoegen"
+
+msgid "IDS_MA_HEADER_ACCOUNTS"
+msgstr "Accounts"
+
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
+
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "U kunt contacten, agenda's, e-mail- en IM-accounts beheren."
+
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Ingelogd."
+
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contacten"
+
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Account toevoegen"
+
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Video's"
+
+msgid "IDS_ST_BODY_MOBILE_TRACKER"
+msgstr "Mobiel opsporen"
+
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Accountlijst"
+
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Synchronisatieserver"
+
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Taak"
+
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Zelfstudie voltooid."
+
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Selecteer de cloudservice die u wilt gebruiken en stel daarna een account in. Nadat u een Samsung account hebt ingesteld, worden opgeslagen memo's automatisch gesynchroniseerd."
+
diff --git a/po/nl_NL.po b/po/nl_NL.po
deleted file mode 100755 (executable)
index 4e59e91..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Overige"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Automatisch synchroniseren"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Account toevoegen"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Taak"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Contacten synchroniseren"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Piekdagen"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Einde piektijd"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Begin piektijd"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Alle gegevens"
-
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Synchronisatieserver"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "E-mail"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "U kunt contacten, agenda´s, e-mail- en IM-accounts beheren"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Wachtwoord tonen"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "E-mailmappen voor push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Taak synchroniseren"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Agenda"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-oproep"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Onbekend"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Voeg toe"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contact"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "Accounts"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Uit"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Plaatsen"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Verbinding behouden bij weinig batterijvoeding"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Verbinding behouden bij roaming"
-
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Automatisch synchroniseren"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "Mobiel opsporen"
-
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Account-lijst"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Alle gegevens die met dit account samenhangen, worden verwijderd. Doorgaan?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Gebruikersnaam of e-mail onjuist"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Kan niet verwijderen. Opnieuw proberen?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Handmatige instelling"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Bestaande agenda-items kunnen worden verwijderd of behouden als synchronisatie wordt uitgeschakeld"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Bestaande contacten kunnen worden verwijderd of behouden als synchronisatie wordt uitgeschakeld"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Verwijderen uit telefoon"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Behouden op telefoon"
-
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Video's"
-
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Overige e-mails"
-
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Account- en synchronisatie-instellingen"
-
diff --git a/po/no.po b/po/no.po
deleted file mode 100755 (executable)
index 7e4f61f..0000000
--- a/po/no.po
+++ /dev/null
@@ -1,135 +0,0 @@
-msgid "IDS_COM_BODY_TASK"
-msgstr "Oppgave"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Andre"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Autosynkronisering"
-
-msgid "IDS_MA_BODY_ACCOUNT_LIST"
-msgstr "Account list"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Du kan administrere kontakter, kalendere, e-post og direktemeldingskontoer"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalender"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-anrop"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Ukjent"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Tilføy"
-
-msgid "IDS_FB_BUTTON_VIDEO"
-msgstr "Videoklipp"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "Kontoer"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Legg til konto"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inaktiv"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Publiser"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kontaktsynkronisering"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Behold tilkoblingen ved lavt batteri"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Behold tilkobling ved roaming"
-
-msgid "IDS_MA_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Trafikkdager"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Trafikkperiode slutter"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Trafikkperiode starter"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Synkroniser automatisk"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Alle data"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "Tyverisporing"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "E-post"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Alle data forbundet med denne kontoen slettes. Fortsette?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Feil brukernavn eller e-post"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Kan ikke slette. Prøve på nytt?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Vis passord"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "E-postmapper som skal pushes"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manuelt oppsett"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Eksisterende hendelser kan slettes eller beholdes dersom synkronisering slås av"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Eksisterende kontakter kan slettes eller beholdes dersom synkroniseringen slås av"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Slett fra telefon"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Behold i telefon"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Oppgavesynkronisering"
-
old mode 100755 (executable)
new mode 100644 (file)
index 866a33c..891a786
--- a/po/pl.po
+++ b/po/pl.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Inne"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galeria"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Autom. synchr."
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Notatka"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Dodaj konto"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Zadanie"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Synchr. kontaktów"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Połączenie VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Dni szczytu"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Terminarz"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Koniec szczytu"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Początek szczytu"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Muzyka"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Wszystkie dane"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Wiadomości"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Serwer synch."
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-mail"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Publikuj"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Możesz zarządzać kontaktami, kalendarzami, e-mailami i kontami komunikatora"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Wyświetl hasło"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Synchronizowane katalogi"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Synchr. zadań"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalend."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Połączenie VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Nieznana"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Osiągnięto maksymalną liczbę kont e-mail."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Dodaj"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Autom. synchr."
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Dodaj konto"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Konta"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Zdjęcie"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Nieaktywne"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Publikuj"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Możesz zarządzać kontaktami, kalendarzami, e-mailami i kontami komunikatora."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Utrzymuj połączenie przy rozładowanej baterii"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Zalogowano."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Utrzymuj połączenie w roamingu"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontakty"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Dodaj konto"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Synchronizuj automatycznie"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Filmy"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobile Tracker"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Lista kont"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Wszystkie dane powiązane z tym kontem zostaną usunięte. Kontynuować?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nieprawidłowa nazwa użytkownika lub adres e-mail"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Nie można usunąć. Spróbować ponownie?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Konfiguracja ręczna"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Po wyłączeniu synchronizacji istniejące wydarzenia mogą zostać usunięte lub zachowane"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Po wyłączeniu synchronizacji istniejące kontakty mogą zostać usunięte lub zachowane"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Usuń z telefonu"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Zachowaj w telefonie"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Serwer synch."
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Filmy"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Zadanie"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Inne adresy e-mail"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Samouczek ukończono."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Konta i synchronizacja"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Wybierz usługę chmurową, której chcesz użyć, a następnie skonfiguruj konto. Po skonfigurowaniu konta Samsung zapisane zapiski będą synchronizowane automatycznie."
 
diff --git a/po/po_to_csv.py b/po/po_to_csv.py
deleted file mode 100755 (executable)
index 4a23e94..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import re
-import sys
-import csv
-
-OUTPUT = ''
-INPUT = ''
-
-def usage():
-       print 'usage: %s input.po output.csv' % sys.argv[0]
-
-def write_header(inputname, out):
-       code, ext = inputname.split('.')
-       out.writerow(['msgid', code])
-
-def to_string(l):
-       str = ''
-       for i in range(len(l)):
-               if str <> '' and l[i] <> '':
-                       str += '\n'
-               str += l[i]
-       return str
-
-def _extract(outf, po):
-       arg_re = r'"[^\\\"]*(?:\\.[^\\\"]*)*"'
-       arg_re = '%s(?:\s+%s)*' % (arg_re, arg_re)
-       re_get = re.compile(r'^msgid\s+(' + arg_re + ')\s*\nmsgstr\s+(' + arg_re + ')\s*\n', re.M)
-
-       re_strip = re.compile(r'"(.*)"')
-
-       res = re_get.findall(po)
-
-       for i in range(len(res)):
-               l_id = re_strip.findall(res[i][0])
-               s_id = to_string(l_id)
-               if s_id == '':
-                       continue
-               l_str = re_strip.findall(res[i][1])
-               s_str = to_string(l_str)
-               outf.writerow([s_id, unicode(s_str, 'utf-8').encode('euc-kr')])
-
-def extract():
-       if len(sys.argv) < 3:
-               usage()
-               return
-
-       INPUT = sys.argv[1]
-       OUTPUT = sys.argv[2]
-
-       print 'Input filename: %s' % INPUT
-       print 'Output filename: %s' % OUTPUT
-
-       try:
-               outf = csv.writer(open(OUTPUT, 'wb'))
-               write_header(INPUT, outf)
-
-               inf = open(INPUT, 'r')
-               po = inf.read()
-
-               _extract(outf, po)
-
-               inf.close()
-
-       except Exception, e:
-               print e
-
-
-if __name__ == "__main__":
-       extract()
-
old mode 100755 (executable)
new mode 100644 (file)
index fabf13e..591a9f7
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Outros"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galeria"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sincronização automática"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Adicionar conta"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tarefas"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sincronização de contatos"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Chamadas VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Dias de pico"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Fim do horário de pico"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Início do horário de pico"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Músicas"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Todos os dados"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Mensagem"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Servidor de sincronização"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-mail"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Publicar"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Você pode gerenciar seus contatos, calendários, e-mails e contas de IM"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Exibir senha"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Pastas de e-mail para receber"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sincronização de tarefa"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Calendário"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Chamadas VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Desconhecido"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Número máximo de contas de e-mails atingido."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Adicionar"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sincronização automática"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contato"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Adicionar conta"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Contas"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inativo"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Publicar"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Você pode gerenciar seus contatos, calendários, e-mails e contas de IM."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Manter a conexão em caso de bateria fraca"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Sessão iniciada."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Manter conexão durante o roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contatos"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Adicionar conta"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sincronizar automaticamente"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Vídeos"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobile Tracker"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Lista de contas"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Todos os dados relacionados a esta conta serão apagados. Continuar?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nome de usuário ou e-mail incorretos"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Impossível apagar. Tentar novamente?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configuração manual"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Os eventos existentes podem ser excluídos ou salvos se a sincronização for desativada"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Lista de conta"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Os contatos existentes podem ser excluídos ou salvos se a sincronização for desativada"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Excluir do telefone"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Salvar no telefone"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Servidor de sincronização"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Vídeos"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tarefas"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Outros e-mails"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial concluído"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Contas e sincronização"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Selecione um serviço em nuvem para usar e configurar uma conta. Após você ter configurado uma Conta Samsung, os lembretes salvos serão sincronizados automaticamente."
 
old mode 100755 (executable)
new mode 100644 (file)
index a12d24b..4c0f69e
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Outros"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galeria"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sincronização automática"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Adicionar conta"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Tarefa"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sincronizar contactos"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Chamada VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Dias de ponta"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Fim de hora de ponta"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Início de hora de ponta"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Música"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Todos os dados"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Mensagem"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Servidor de sincronização"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-mail"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Publicar"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Pode gerir os seus contactos, agendas, e-mail e contas de MI"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Mostrar palavra-passe"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Pastas de correio para difundir"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sincronização de tarefa"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Agenda"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Chamada VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Desconhecido"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Número máximo de contas de e-mails atingido."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Adicion."
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sincronização automática"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contacto"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Adicionar conta"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Contas"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactivo"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Publicar"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Pode gerir os seus contactos, agendas, e-mail e contas de MI."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Manter a ligação no caso de bateria fraca"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Sessão iniciada."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Manter ligação durante o roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contactos"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Adicionar conta"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sincronizar automaticamente"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Vídeos"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobile tracker"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Lista contas"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Todos os dados relacionados com esta conta serão eliminados. Continuar?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nome de utilizador ou e-mail incorrectos"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Impossível eliminar. Tentar novamente?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configuração manual"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Os eventos existentes podem ser eliminados ou guardados se a sincronização for desligada"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Os contactos existentes podem ser eliminados ou guardados se a sincronização for desligada"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Eliminar do telefone"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Guardar no telefone"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Servidor de sincronização"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Vídeos"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Tarefa"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Outros e-mails"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial concluído."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Contas e sincronização"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Seleccione um serviço de nuvem para utilizar e configure uma conta. Depois de ter configurado uma conta Samsung, os memorandos guardados serão sincronizados automaticamente."
 
old mode 100755 (executable)
new mode 100644 (file)
index fa2a10a..0fd1c06
--- a/po/ro.po
+++ b/po/ro.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Altele"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerie"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Sincron. automată"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Adăugare cont"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Activitate"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sincronizare contact"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Apel VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Zile de vârf"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "Planificator S"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Final perioadă de vârf"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Început perioadă de vârf"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Muzică"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Toate datele"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Mesaje"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sincronizare server"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Email"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Postare"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Vă puteţi gestiona contactele, calendarele, e-mailul şi conturile IM"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Afişare parolă"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Directoare de poştă electronică pentru push"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sincronizare activitate"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Calendar"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Apel VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Necunoscut"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "S-a atins numărul maxim de conturi de email."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Adăug."
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Sincron. automată"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Contact"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Adăugare cont"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Conturi"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fotografie"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inactiv"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Postare"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Vă puteţi gestiona contactele, calendarele, e-mailul şi conturile IM."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Conexiune continuă cu bateria descărcată"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Conectarea a reuşit."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Menţinere conexiune în roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Contacte"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Adăugare cont"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sincronizare automată"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videoclipuri"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobile Tracker"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Listă\nde cont."
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Toate datele asociate acestui cont vor fi şterse. Continuaţi?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nume de utilizator sau adresă de e-mail incorecte"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Imposibil de şters. Încercaţi din nou?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Configurare manuală"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Evenimentele existente pot fi şterse sau păstrate dacă sincronizarea este dezactivată"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Listă de conturi"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Contactele existente pot fi şterse sau păstrate dacă sincronizarea este dezactivată"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Ştergere din telefon"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Păstrare în telefon"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sincronizare server"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videoclipuri"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Activitate"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Alte e-mailuri"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Tutorial finalizat."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Conturi şi sincronizare"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Selectaţi un serviciu cloud pe care doriţi să-l utilizaţi, apoi configuraţi un cont. După configurarea unui cont Samsung, notiţele salvate vor fi sincronizate automat."
 
old mode 100755 (executable)
new mode 100644 (file)
index 34aa1a1..ab2a6a9
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Ð\9fÑ\80оÑ\87ее"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Ð\93алеÑ\80еÑ\8f"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Автосинхронизация"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "ОК"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Добавить уч. запись"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Задача"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Синхронизация контактов"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Вызов VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Пиковые дни"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Время окончания пикового периода"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Ð\92Ñ\80емÑ\8f Ð½Ð°Ñ\87ала Ð¿Ð¸ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð¿ÐµÑ\80иода"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Ð\9cÑ\83зÑ\8bка"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Ð\92Ñ\81е Ð´Ð°Ð½Ð½Ñ\8bе"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "СообÑ\89ениÑ\8f"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "СеÑ\80веÑ\80 Ñ\81инÑ\85Ñ\80онизаÑ\86ии"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Ð\98нÑ\82еÑ\80неÑ\82"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-mail"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Опубликовать"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Вы можете управлять своими контактами, календарями, электронной почтой и учетными записями IM"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Показать пароль"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Папки почты для push-синхронизации"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Синхронизация задач"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Календ."
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Вызов VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Неизвестно"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Достигнуто максимальное число учетных записей электронной почты."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Ð\94обав."
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Ð\90вÑ\82оÑ\81инÑ\85Ñ\80онизаÑ\86иÑ\8f"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Ð\9aонÑ\82акÑ\82"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Ð\94обавиÑ\82Ñ\8c Ñ\83Ñ\87еÑ\82нÑ\83Ñ\8e Ð·Ð°Ð¿Ð¸Ñ\81Ñ\8c"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Учетные записи"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Фото"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Неактивно"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "ОК"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Ð\9eпÑ\83бликоваÑ\82Ñ\8c"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Ð\92Ñ\8b Ð¼Ð¾Ð¶ÐµÑ\82е Ñ\83пÑ\80авлÑ\8fÑ\82Ñ\8c Ñ\81воими ÐºÐ¾Ð½Ñ\82акÑ\82ами, ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ\80Ñ\8fми, Ñ\8dлекÑ\82Ñ\80онной Ð¿Ð¾Ñ\87Ñ\82ой Ð¸ Ñ\83Ñ\87еÑ\82нÑ\8bми Ð·Ð°Ð¿Ð¸Ñ\81Ñ\8fми IM."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Ð\9dе Ñ\80азÑ\80Ñ\8bваÑ\82Ñ\8c Ð¿Ð¾Ð´ÐºÐ»Ñ\8eÑ\87ение Ð¿Ñ\80и Ð½Ð¸Ð·ÐºÐ¾Ð¼ Ð·Ð°Ñ\80Ñ\8fде Ð±Ð°Ñ\82аÑ\80еи"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Ð\92Ñ\85од Ð²Ñ\8bполнен."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Ð\9dе Ñ\80азÑ\80Ñ\8bваÑ\82Ñ\8c Ð¿Ð¾Ð´ÐºÐ»Ñ\8eÑ\87ение Ð² Ñ\80оÑ\83минге"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Ð\9aонÑ\82акÑ\82Ñ\8b"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Добавить учетную запись"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "СинÑ\85Ñ\80онизиÑ\80оваÑ\82Ñ\8c Ð°Ð²Ñ\82омаÑ\82иÑ\87еÑ\81ки"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Ð\92идео"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Оповещение о смене SIM-карты"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Учетные записи"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Все данные, относящиеся к этой учетной записи, будут удалены. Продолжить?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Неправильное имя пользователя или адрес электронной почты"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Невозможно удалить. Повторить попытку?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Настройка вручную"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "После отключения синхронизации можно либо удалить, либо сохранить существующие события"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Список учетных записей"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "После отключения синхронизации можно либо удалить, либо сохранить существующие контакты"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Удалить с телефона"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Сохранить на телефоне"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Сервер синхронизации"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Ð\92идео"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Ð\97адаÑ\87а"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Ð\94Ñ\80Ñ\83гие Ñ\81ообÑ\89ениÑ\8f Ñ\8dлекÑ\82Ñ\80онной Ð¿Ð¾Ñ\87Ñ\82Ñ\8b"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Ð\9eбÑ\83Ñ\87ение Ð·Ð°Ð²ÐµÑ\80Ñ\88ено."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "УÑ\87еÑ\82нÑ\8bе Ð·Ð°Ð¿Ð¸Ñ\81и Ð¸ Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\8f"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ð¾Ð±Ð»Ð°Ñ\87нÑ\83Ñ\8e Ñ\81лÑ\83жбÑ\83 Ð´Ð»Ñ\8f Ð¸Ñ\81полÑ\8cзованиÑ\8f Ð¸ Ð½Ð°Ñ\81Ñ\82Ñ\80ойÑ\82е Ñ\83Ñ\87еÑ\82нÑ\83Ñ\8e Ð·Ð°Ð¿Ð¸Ñ\81Ñ\8c. Ð\9fоÑ\81ле Ð½Ð°Ñ\81Ñ\82Ñ\80ойки Ñ\83Ñ\87еÑ\82ной Ð·Ð°Ð¿Ð¸Ñ\81и Samsung Ñ\81оÑ\85Ñ\80аненнÑ\8bе Ð·Ð°Ð¿Ð¸Ñ\81ки Ð±Ñ\83дÑ\83Ñ\82 Ñ\81инÑ\85Ñ\80онизиÑ\80ованÑ\8b Ð°Ð²Ñ\82омаÑ\82иÑ\87еÑ\81ки."
 
old mode 100755 (executable)
new mode 100644 (file)
index 8443fab..751ea5f
--- a/po/sk.po
+++ b/po/sk.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Ostatné"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galéria"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Automat. synchronizácia"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "Poznámka S"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Pridať konto"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Úloha"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Synchronizácia kontaktov"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Hovor VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Dni silnej prevádzky"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "Plánovač S"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Konečný čas silnej prevádzky"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Počiatočný čas silnej prevádzky"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Hudba"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Všetky údaje"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Správy"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Synchronizačný server"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-mail"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Príspevok"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Môžete spravovať kontakty, kalendáre, e-maily a kontá okamžitých správ"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Zobraziť heslo"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Poštové priečinky na automatickú synchronizáciu"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Synchronizácia úloh"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalendár"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Hovor VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Neznáme"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Dosiahol sa maximálny počet e-mailových kont."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Pridať"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Automat. synchronizácia"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Pridať konto"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Kontá"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fotografia"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Neaktívne"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Príspevok"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Môžete spravovať kontakty, kalendáre, e-maily a kontá okamžitých správ."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Zachovať spojenie pri slabej batérii"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Prihlásený."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Zachovať spojenie pri roamingu"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontakty"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Pridať konto"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Synchronizovať automaticky"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videá"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobilný stopár"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Zoznam\nkont"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Všetky údaje týkajúce sa tohto konta sa vymažú. Pokračovať?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Nesprávne meno používateľa alebo e-mail"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Nedá sa vymazať. Skúsiť znova?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manuálne nastavenie"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Existujúce udalosti môžete buď odstrániť, alebo ponechať, ak je synchronizácia vypnutá"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Zoznam kont"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Existujúce kontakty môžete buď odstrániť, alebo ponechať, ak je synchronizácia vypnutá"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Odstrániť z telefónu"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Ponechať v telefóne"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Synchronizačný server"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videá"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Úloha"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Ďalšie e-maily"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Kurz je dokončený."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Kontá a synchronizácia"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Vyberte službu cloud, ktorú chcete použiť, a potom nastavte konto. Po nastavení konta Samsung sa automaticky synchronizujú uložené pripomienky."
 
old mode 100755 (executable)
new mode 100644 (file)
index 14d4fce..f1fdeb5
--- a/po/sl.po
+++ b/po/sl.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Drugo"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerija"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Samodejna sinhronizacija"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "V redu"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Dodaj račun"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Opravila"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sinhronizacija stikov"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Klic VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Zasedeni dnevi"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Konec bolj zasedenega časa"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Začetek bolj zasedenega časa"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Glasba"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Vsi podatki"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Sporočila"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Strežnik za sinhronizacijo"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-pošta"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Objavi"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Upravljate lahko stike, koledarje, e-pošto in račune za NS"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Prikaži geslo"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Poštne mape za potisk"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sinhronizacija opravila"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Koledar"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Klic VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Neznano"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Doseženo je največje dovoljeno število računov za e-pošto."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Dodaj"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Samodejna sinhronizacija"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Stik"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Dodaj račun"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Računi"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fotografija"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Neaktivno"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "V redu"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Objavi"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Upravljate lahko stike, koledarje, e-pošto in račune za NS."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Ohrani povezavo pri skoraj prazni bateriji"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Prijava je uspela."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Ohrani povezavo med gostovanjem"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Imenik"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Dodaj račun"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sinhroniziraj samodejno"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videoposnetki"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobilni sledilnik"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Seznam\nračunov"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Vsi podatki, povezani s tem računom, bodo izbrisani. Nadaljujem?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Napačno uporabniško ime ali e-pošta"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Ni mogoče izbrisati. Poskusim znova?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Ročna nastavitev"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Obstoječe dogodke lahko izbrišete ali ohranite, če je sinhronizacija izključena"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Seznam računov"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Obstoječe stike lahko izbrišete ali ohranite, če je sinhronizacija izključena"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Izbriši iz telefona"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Ohrani v telefonu"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Strežnik za sinhronizacijo"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videoposnetki"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Opravila"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Druge e-pošte"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Vadnica je končana."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Računi in sinhronizacija"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Izberite storitev v oblaku, ki jo želite uporabiti, nato pa nastavite račun. Ko nastavite Samsung račun, se bodo shranjene beležke samodejno sinhronizirale."
 
old mode 100755 (executable)
new mode 100644 (file)
index c82106e..13f6a6c
--- a/po/sr.po
+++ b/po/sr.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Ostalo"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galerija"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Automatska sinhronizacija"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Dodaj nalog"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Zadatak"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Sinhronizacija kontakata"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP poziv"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Udarni dani"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S planer"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Kraj udarnog vremena"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Početak udarnog vremena"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Muzika"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Svi podaci"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Poruke"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Server za sinhronizaciju"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-pošta"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Objavi"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Možeš da upravljaš svojim kontaktima, kalendarom, e-poštom i nalozima za trenutne poruke"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Prikaži šifru"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Folderi za pritisne poruke"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Sinhronizacija zadataka"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalendar"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP poziv"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Nepoznato"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Dostignut maksimalan broj naloga e-pošte."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Dodaj"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Automatska sinhronizacija"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Dodaj nalog"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Nalozi"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fotografija"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Neaktivno"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Objavi"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Možeš da upravljaš svojim kontaktima, kalendarom, e-poštom i nalozima za trenutne poruke."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Održavaj vezu pri slaboj bateriji"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Prijavljen."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Održavaj vezu u romingu"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontakti"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Dodaj nalog"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Sinhronizuj automatski"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Video zapisi"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobile tracker"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Lista\nnaloga"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Biće obrisani svi podaci povezani sa ovim nalogom. Nastavak?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Neispravno korisničko ime ili adresa e-pošte"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Nemoguće obrisati. Ponoviti?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Ručno konfigurisanje"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Ako je sinhronizacija isključena, postojeći događaji se mogu izbrisati ili sačuvati"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Lista naloga"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Ako je sinhronizacija isključena, postojeći kontakti se mogu izbrisati ili sačuvati"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Izbriši iz telefona"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Sačuvaj na telefonu"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Server za sinhronizaciju"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Video zapisi"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Zadatak"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Druge adrese e-pošte"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Vodič dovršen."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Nalozi i sinhronizacija"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Izaberi uslugu na oblaku koju želiš da koristiš, a zatim podesi account. Kada podesiš Samsung account, sačuvane beleške će se automatski sinhronizovati."
 
old mode 100755 (executable)
new mode 100644 (file)
index 70b63ba..6f91ce8
--- a/po/sv.po
+++ b/po/sv.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Annat"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galleri"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Autosynkning"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Lägg till konto"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Uppgift"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Synkronisera kontakter"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP-samtal"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Dagar med hög belastning"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Kalender"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Sluttid för hög belastning"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Starttid för hög belastning"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musik"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Alla data"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Meddelanden"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Synkroniseringsserver"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-post"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Posta"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Du kan hantera kontakter, kalender, e-post och IM-konton"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Visa lösenord"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Mappar som ska pushas"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Synkronisera uppgifter"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalender"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP-samtal"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Okänd"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Högsta antal e-postkonton har uppnåtts."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Lägg till"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Autosynkning"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Lägg till konto"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Konton"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Foto"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Inaktiv"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Posta"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Du kan hantera kontakter, kalender, e-post och IM-konton."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Behåll anslutning vid låg batterinivå"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Inloggad."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Behåll anslutning vid roaming"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontakter"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Lägg till konto"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Synka automatiskt"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videoklipp"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Stöldspårning"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Kontolista"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Alla data som hänför sig till det här kontot raderas. Fortsätta?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Fel användarnamn eller e-post"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Kan inte radera. Försöka igen?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manuell inställning"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Befintliga händelser kan antingen raderas eller behållas om synkroniseringen stängs av"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Befintliga kontakter kan antingen raderas eller behållas om synkroniseringen stängs av"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Ta bort från telefonbok"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Behåll i telefon"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Synkroniseringsserver"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videoklipp"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Uppgift"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Övrig e-post"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Introduktionen är slutförd."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Konton och synkning"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Välj en molntjänst som du vill använda och skapa sedan ett konto. När du har skapat ett Samsung account kommer sparade memon att synkroniseras automatiskt."
 
diff --git a/po/th.po b/po/th.po
deleted file mode 100755 (executable)
index e054006..0000000
--- a/po/th.po
+++ /dev/null
@@ -1,135 +0,0 @@
-msgid "IDS_COM_BODY_TASK"
-msgstr "สิ่งที่ต้องทำ"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "อื่นๆ"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "ซิงค์​อัตโนมัติ"
-
-msgid "IDS_MA_BODY_ACCOUNT_LIST"
-msgstr "Account list"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "คุณ​สามารถ​จัดการ​ราย​ชื่อ, ​ปฏิทิน, ​อี​เมล์ และ​บัญชี​ผู้​ใช้ IM ​ได้"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "ปฏิทิน"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "บริการ VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "ไม่​รู้จัก"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "เพิ่ม"
-
-msgid "IDS_FB_BUTTON_VIDEO"
-msgstr "วี​ดี​โอ"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "ราย​ชื่อ"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "ตกลง"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "แอคเคาท์"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "เพิ่ม​แอคเคาท์"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "รูปถ่าย"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "ไม่​ทำ​งาน"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "ซิงค์​ราย​ชื่อ"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "เชื่อม​ต่อ​ต่อ​ไป​ขณะ​แบตเตอรี่​ต่ำ"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "เชื่อม​ต่อ​ต่อ​ไป​ขณะ​โรม​มิ่ง"
-
-msgid "IDS_MA_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "วัน​ใน​ช่วง​เร่ง​ด่วน"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "เวลา​สิ้น​สุด​ช่วง​เร่ง​ด่วน"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "เวลา​เริ่ม​ต้น​ช่วง​เร่ง​ด่วน"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "ทำ​ข้อมูล​ให้​ตรง​กัน​โดย​อัตโนมัติ"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "ข้อมูล​ทั้ง​หมด"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "โม​บายล์​แทร็กเกอร์"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "อีเมล์"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "ผู้​ใช้ Exchange"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "ข้อมูล​ทั้ง​หมด​ที่​เกี่ยว​ข้อง​\nกับ​แอคเคาท์​นี้​จะ​\nถูกลบ​ออก ดำเนินการ?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "ชื่อ​ผู้​ใช้​หรือ​อี​เมล์​ไม่​ถูก​ต้อง"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "ลบ​ไม่​ได้ ลอง​อีก​ครั้ง?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "แสดง​รหัส​ผ่าน"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "โฟลเดอร์​เมล์​ที่​จะ Push"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "การ​ตั้ง​ค่า​เอง"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "เหตุการณ์​ที่​มี​อยู่​สามารถ​ลบ​หรือ​เก็บ​ไว้​ได้ หาก​ปิด​การ​ซิ​งโค​รไน​ซ์"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "ราย​ชื่อ​ที่​มี​อยู่​สามารถ​ลบ​หรือ​เก็บ​ไว้​ได้ หาก​ปิด​การ​ซิ​งโค​รไน​ซ์"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "ลบ​ออก​จาก​โทรศัพท์"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "เก็บ​ใน​โทรศัพท์"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "ซิงค์​รายการ"
-
old mode 100755 (executable)
new mode 100644 (file)
index 7a7420d..c197abb
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Diğerleri"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galeri"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Oto eşitleme"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "Tamam"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Hesap ekle"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Görevler"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kişi senkr"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP araması"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "En yoğun günler"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planlayıcı"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Yoğun dönem bitiş zamanı"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Yoğun dönem başlangıç zamanı"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Müzik"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Tüm veriler"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Mesajlar"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Senkr. sunucusu"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "İnternet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-posta"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Değişim"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Gönder"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Kişileri, takvimleri, e-postayı ve IM hesaplarını yönetebilirsiniz"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Parolayı göster"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Klasörleri push'a postala"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Görev senkr"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Takvim"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP araması"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Bilinmeyen"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Maksimum e-posta hesabı sayısına ulaşıldı."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Ekle"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Oto eşitleme"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kişi"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Hesap ekle"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Hesaplar"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fotoğraf"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Devre dışı"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "Tamam"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Gönder"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Kişileri, takvimleri, e-postayı ve IM hesaplarını yönetebilirsiniz."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Düşük pilde bağlantınızı koruyun"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Oturum açıldı."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Roaming sırasında bağlantınızı koruyun"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Rehber"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Hesap ekle"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Otomatik olarak senkronize et"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videolar"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobil izleyici"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "Hesap listesi"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Bu hesapla ilgili tüm veriler silinecek. Devam edilsin mi?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Hatalı kullanıcı adı veya e-posta"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Silinemiyor. Yeniden denensin mi?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Manuel kurulum"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Eşitleme kapatılırsa, mevcut etkinlikler silinebilir veya saklanabilir"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Eşitleme kapatılırsa, mevcut kişiler silinebilir veya saklanabilir"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Telefondan sil"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Telefonda sakla"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Senkr. sunucusu"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videolar"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Görevler"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Diğer e-postalar"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Eğitsel bitti."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Hesaplar ve senkr"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Kullanmak için bir bulut servisi seçin ve sonra bir hesap yapılandırın. Bir Samsung hesabı kurduktan sonra, kayıtlı notlar otomatik olarak eşitlenecektir."
 
old mode 100755 (executable)
new mode 100644 (file)
index 00dbc73..0beec9a
--- a/po/uk.po
+++ b/po/uk.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Ð\86нÑ\88Ñ\96"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Ð\93алеÑ\80еÑ\8f"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Автосинхронізація"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Додати облiковий запис"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Завдання"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Синхронізація контактів"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "Виклик VoIP"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Дні максимального навантаження"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Час завершення максимального навантаження"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "ЧаÑ\81 Ð¿Ð¾Ñ\87аÑ\82кÑ\83 Ð¼Ð°ÐºÑ\81ималÑ\8cного Ð½Ð°Ð²Ð°Ð½Ñ\82аженнÑ\8f"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Ð\9cÑ\83зика"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Ð\92Ñ\81Ñ\96 Ð´Ð°Ð½Ñ\96"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Ð\9fовÑ\96домленнÑ\8f"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "СеÑ\80веÑ\80 Ñ\81инÑ\85Ñ\80онÑ\96заÑ\86Ñ\96Ñ\97"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Ð\86нÑ\82еÑ\80неÑ\82"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "Email"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Можна керувати контактами, календарями, повідомленнями Email та обліковими записами служби миттєвих повідомлень"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Показати пароль"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Поштові папки для Push-повідомлень"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Синхронізація завдань"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Календар"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "Досягнуто максимальної кількості облікових записів Email."
 
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Виклик VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Невідомо"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Додати"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Автосинхронізація"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Ð\9aонÑ\82акÑ\82"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Ð\94одаÑ\82и Ð¾Ð±Ð»Ñ\96ковий Ð·Ð°Ð¿Ð¸Ñ\81"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Облікові записи"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Фото"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Неактивно"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Можна керувати контактами, календарями, повідомленнями Email та обліковими записами служби миттєвих повідомлень."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Ð\97беÑ\80егÑ\82и Ð¿Ñ\96дклÑ\8eÑ\87еннÑ\8f Ð·Ð° Ñ\80озÑ\80Ñ\8fдженоÑ\97 Ð±Ð°Ñ\82аÑ\80еÑ\97"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Ð\97аÑ\80еÑ\94Ñ\81Ñ\82Ñ\80овано."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Ð\97беÑ\80егÑ\82и Ð¿Ñ\96дклÑ\8eÑ\87еннÑ\8f Ð² Ñ\80оÑ\83мÑ\96нгÑ\83"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Ð\9aонÑ\82акÑ\82и"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Додати обліковий запис"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "СинÑ\85Ñ\80онÑ\96зÑ\83ваÑ\82и Ð°Ð²Ñ\82омаÑ\82иÑ\87но"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Ð\92Ñ\96део"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Мобільна сигналізація"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "Спис.обл. запис."
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Усі дані, пов'язані з цим обліковим записом, буде видалено. Продовжити?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Хибне ім’я користувача або адреса Email"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Неможливо видалити. Спробувати ще раз?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Настроювання вручну"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Поточні події можуть бути видалені або збережені, якщо синхронізацію вимкнено"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Список облікових записів"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Поточні контакти можуть бути видалені або збережені, якщо синхронізацію вимкнено"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Видалити з телефону"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Залишити на телефоні"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Сервер синхронізації"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Ð\92Ñ\96део"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Ð\97авданнÑ\8f"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Ð\86нÑ\88Ñ\96 Ð°Ð´Ñ\80еÑ\81и Email"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Ð\9fоÑ\81Ñ\96бник Ð·Ð°Ð²ÐµÑ\80Ñ\88ено."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Ð\9eблÑ\96ковÑ\96 Ð·Ð°Ð¿Ð¸Ñ\81и Ñ\82а Ñ\81инÑ\85Ñ\80онÑ\96заÑ\86Ñ\96Ñ\8f"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Ð\92ибеÑ\80Ñ\96Ñ\82Ñ\8c Ð¿Ð¾Ñ\82Ñ\80Ñ\96бнÑ\83 Ñ\85маÑ\80нÑ\83 Ñ\81лÑ\83жбÑ\83, Ð° Ð¿Ð¾Ñ\82Ñ\96м Ð½Ð°Ñ\81Ñ\82Ñ\80ойÑ\82е Ð¾Ð±Ð»Ñ\96ковий Ð·Ð°Ð¿Ð¸Ñ\81. Ð\9fÑ\96Ñ\81лÑ\8f Ð½Ð°Ñ\81Ñ\82Ñ\80оÑ\8eваннÑ\8f Ð¾Ð±Ð»Ñ\96кового Ð·Ð°Ð¿Ð¸Ñ\81Ñ\83 Samsung Ð·Ð±ÐµÑ\80еженÑ\96 Ð½Ð°Ð³Ð°Ð´Ñ\83ваннÑ\8f Ð±Ñ\83де Ð°Ð²Ñ\82омаÑ\82иÑ\87но Ñ\81инÑ\85Ñ\80онÑ\96зовано."
 
diff --git a/po/update-po.sh b/po/update-po.sh
deleted file mode 100755 (executable)
index bb23093..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-PACKAGE=myaccount_ui
-SRCROOT=..
-POTFILES=POTFILES.in
-
-#ALL_LINGUAS= am az be ca cs da de el en_CA en_GB es et fi fr hr hu it ja ko lv mk ml ms nb ne nl pa pl pt pt_BR ru rw sk sl sr sr@Latn sv ta tr uk vi zh_CN zh_TW
-#ALL_LINGUAS="en_US en_GB ja ko_KR zh_CN"
-ALL_LINGUAS="en_US nl de zh_HK zh_CN ru ko zh_TW ja es el it tk pt fr"
-
-XGETTEXT=/usr/bin/xgettext
-MSGMERGE=/usr/bin/msgmerge
-
-echo -n "Make ${PACKAGE}.pot  "
-if [ ! -e $POTFILES ] ; then
-       echo "$POTFILES not found"
-       exit 1
-fi
-
-$XGETTEXT --default-domain=${PACKAGE} --directory=${SRCROOT} \
-               --add-comments --keyword=_ --keyword=N_ --files-from=$POTFILES \
-&& test ! -f ${PACKAGE}.po \
-       || (rm -f ${PACKAGE}.pot && mv ${PACKAGE}.po ${PACKAGE}.pot)
-
-if [ $? -ne 0 ]; then
-       echo "error"
-       exit 1
-else
-       echo "done"
-fi
-
-for LANG in $ALL_LINGUAS; do 
-       echo "$LANG : "
-
-       if [ ! -e $LANG.po ] ; then
-               sed 's/CHARSET/UTF-8/g' ${PACKAGE}.pot > ${LANG}.po
-               echo "${LANG}.po created"
-       else
-               if $MSGMERGE ${LANG}.po ${PACKAGE}.pot -o ${LANG}.new.po ; then
-                       if cmp ${LANG}.po ${LANG}.new.po > /dev/null 2>&1; then
-                               rm -f ${LANG}.new.po
-                       else
-                               if mv -f ${LANG}.new.po ${LANG}.po; then
-                                       echo "" 
-                               else
-                                       echo "msgmerge for $LANG.po failed: cannot move $LANG.new.po to $LANG.po" 1>&2
-                                       rm -f ${LANG}.new.po
-                                       exit 1
-                               fi
-                       fi
-               else
-                       echo "msgmerge for $LANG failed!"
-                       rm -f ${LANG}.new.po
-               fi
-       fi
-       echo ""
-done
-
old mode 100755 (executable)
new mode 100644 (file)
index 70f7db3..16339f0
--- a/po/uz.po
+++ b/po/uz.po
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Boshqalar"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "Galereya"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Avto-sinxronlash"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Hisob qaydnoma qo‘shish"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "Topshiriq"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Kontakt sinxronlanishi"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP qo‘ng‘irog‘i"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Pik kunlar"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Pik tugatish vaqti"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Pik boshlash vaqti"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "Musiqa"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Barcha ma’lumot"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "Xabarlar"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "Sinx. serveri"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "Internet"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "E-pochta"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Xabar yuborish"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Kontaktlar, kalendarlar, e-pochtalar va IM hisob qaydnomalarini boshqarishingiz mumkin"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Parol ko‘rsatilsin"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Push uchun pochta jildlari"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Vazifa sinxronlash"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Kalendar"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP qo‘ng‘irog‘i"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Noma’lum"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "E-pochta hisob qaydnomalari soni ruxsat etilgan maksimal miqdorga yetdi."
 
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Qo‘shish"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "Avto-sinxronlash"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Kontakt"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "Hisob qaydnoma qo‘shish"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "Hisob qaydnomalari"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Fotosurat"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Nofaol"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "OK"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Xabar yuborish"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "Kontaktlar, kalendarlar, e-pochtalar va IM hisob qaydnomalarini boshqarishingiz mumkin."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Ulanishni past batareya zaryadida davom ettiring"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "Kirildi."
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Ulanishni roumingda davom ettiring"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "Kontaktlar"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "Hisob qaydnoma qo‘shish"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Avtomatik ravishda sinxronlashtiring"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "Videolar"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "Mobil telefonni topish xizmati"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "His/qayd. ro‘yx."
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Ushbu hisob qaydnomasiga tegishli barcha ma’lumotlar o'chirib tashlanadi. Davom ettirilsinmi?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Foydalanuvchi nomi yoki e-pochta noto‘g‘ri"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "O'chirib bo‘lmaydi. Qayta urinib ko‘rilsinmi?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Qo‘lda o‘rnatish"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Sinxronlash o‘chirilganda mavjud hodisalar yo‘q qilinishi yoki saqlanishi mumkin"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "Hisob qaydnomalar ro‘yxati"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Sinxronlashtirish o‘chirilgandan so‘ng kontakt ma’lumoti yo‘q qilinishi yoki saqlanishi mumkin"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Telefondan o‘chirish"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Telefonda saqlash"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "Sinx. serveri"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "Videolar"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "Topshiriq"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "Boshqa e-pochtalar"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "Ko‘rsatma yakunlandi."
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "Hisob qaydnomalari va sinxronlash"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "Foydalanish uchun bulut xizmatini tanlang va undan so‘ng hisob qaydnomasini o‘rnating. Samsung accountni o‘rnatganingizdan so‘ng, saqlangan yozuvlar avtomatik ravishda sinxronlanadi."
 
diff --git a/po/vi.po b/po/vi.po
deleted file mode 100755 (executable)
index 5a3bb60..0000000
--- a/po/vi.po
+++ /dev/null
@@ -1,135 +0,0 @@
-msgid "IDS_COM_BODY_TASK"
-msgstr "Nhiệm vụ"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "Khác"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "Tự động đồng bộ"
-
-msgid "IDS_MA_BODY_ACCOUNT_LIST"
-msgstr "Account list"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "Bạn có thể quản lý các danh bạ, lịch, thư điện tử và tài khoản IM của bạn"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "Lịch"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "Cuộg gọi VoIP"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "Không rõ"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "Thêm"
-
-msgid "IDS_FB_BUTTON_VIDEO"
-msgstr "Video"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "Danh bạ"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "OK"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "Tài khoản"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "Thêm tài khoản"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "Ảnh"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "Không kích hoạt"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "Đồng bộ danh bạ"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "Giữ kết nối khi pin yếu"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "Giữ kết nối khi chuyển vùng"
-
-msgid "IDS_MA_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "Ngày cao điểm"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "Giờ cao điểm kết thúc"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "Giờ cao điểm bắt đầu"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "Đồng bộ hoá tự động"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "Tất cả dữ liệu"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "Theo dõi điện thoại"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "Email"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "Mọi dữ liệu liên quan đến tài khoản này sẽ bị xóa. Tiếp tục?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "Tên người dùng hoặc email không đúng"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "Không thể xóa. Thử lại?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "Hiện mật mã"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Thư mục để push mail"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "Cài đặt thủ công"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Các sự kiện hiện tại có thể bị xóa hoặc giữ lại nếu đồng bộ bị tắt"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "Các danh bạ hiện tại có thể bị xóa hoặc giữ lại nếu đồng bộ bị tắt"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "Xóa khỏi điện thoại"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "Giữ trên điện thoại"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "Đồng bộ nhiệm vụ"
-
old mode 100755 (executable)
new mode 100644 (file)
index e6b2158..32cdb6f
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "其它"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "相册"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "自动同步"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "确认"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "添加账户"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S 备忘录"
 
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "任务"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP 电话"
 
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "联系人同步"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S 日历"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "高峰日"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "é«\98å³°ç»\93æ\9d\9fæ\97¶é\97´"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "é\9f³ä¹\90"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "高峰开始时间"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "信息"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "所有数据"
-
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "同步服务器"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "互联网"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "电子邮件"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "更换"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "发贴"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "微软Exchange ActiveSync 账户"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "您可管理您的联系人、日历、电子邮件和 IM 账户"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "显示密码"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "邮件文件夹推送"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "任务同步"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "已达到电子邮件帐户的数量上限。"
 
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "日历"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP 电话"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "未知"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "添加"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "自动同步"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "联系人"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "添加账户"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "账户"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "照片"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "未启动"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "确定"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "发贴"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "您可管理您的联系人、日历、电子邮件和 IM 账户。"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "电池电量低时保持连接"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "已登录"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "漫游时保持连接"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "联系人"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "添加账户"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "è\87ªå\8a¨å\90\8cæ­¥"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "è§\86é¢\91"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "手机追踪"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "帐户列表"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "与此帐户相关的全部数据将被删除。继续?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "用户名或电子邮件不正确"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "无法删除。重试?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "三星"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "手动设置"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "如果同步关闭,可删除或保留现存事件"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "账户列表"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "如果同步关闭,可删除或保留现存联系人"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "从手机删除"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "保留在手机"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "同步服务器"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "视频"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "任务"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "其他电子邮件"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "教程完成"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "账户和同步"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "选择要使用的云服务,然后设置账户。一旦您设置了三星账户,已保存的备忘录将自动同步。"
 
old mode 100755 (executable)
new mode 100644 (file)
index 52cf4db..fc83e84
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "å\85¶ä»\96"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "åª\92é«\94ç\80\8f覽å\99¨"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "自動同步"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "確定"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "加入帳戶"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "工作"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "聯絡人同步"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP 通話"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "繁忙日子"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "繁忙結束時間"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "繁忙開始時間"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "音樂"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "全部數據"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "訊息"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "同步伺服器"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "瀏覽器"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "電子郵件"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "Exchange"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "張貼"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "您可管理您的聯絡人、日曆、電子郵件、以及 IM 帳戶"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "顯示密碼"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "要推送的電子郵件資料夾"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "已達電子郵件帳戶的數量上限。"
 
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "工作同步"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "日曆"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP 通話"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "未知"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "新增"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "自動同步"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "聯絡人"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "加入帳戶"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "帳戶"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "相片"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "無效"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "確定"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "張貼"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "您可管理您的聯絡人、日曆、電子郵件、以及 IM 帳戶。"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "電量不足時保持連接"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "已登入。"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "漫遊時保持連接"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "聯絡人"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "加入帳戶"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "自動同步"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "影片"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "手機追蹤器"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
 msgstr "帳戶清單"
 
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "所有關於此帳戶的數據將被刪除。繼續嗎?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "用戶名稱或電子郵件不正確"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "無法刪除。重試嗎?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "手動設定"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "如果關閉同步,可刪除或保留現有的事件"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "如果關閉同步,可刪除或保留現有的聯絡人"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "從手機刪除"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "保留於手機中"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "同步伺服器"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "å½±ç\89\87"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "å·¥ä½\9c"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "其他電子郵件"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "教學完成。"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "帳戶與同步"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "選擇要使用的雲端服務然後建立帳戶。一旦您建立三星帳戶後,已儲存的備忘錄將自動同步。"
 
diff --git a/po/zh_SG.po b/po/zh_SG.po
deleted file mode 100755 (executable)
index afe2925..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "其它"
-
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "自动同步"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "确认"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "添加帐户"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "任务"
-
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "谷歌"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "联系人同步"
-
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "最高日"
-
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "最高结束时间"
-
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "最高开始时间"
-
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "全部数据"
-
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "同步化服务器"
-
-msgid "IDS_COM_BODY_EMAIL"
-msgstr "电邮"
-
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "更换"
-
-msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
-msgstr "Microsoft Exchange ActiveSync"
-
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "您可管理您的联系人、日历、电子邮件和 IM 账户"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "显示密码"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "邮件文件夹推送"
-
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "任务同步"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "日历"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "三星应用程序"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP 电话"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "未知"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "添加"
-
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "联系人"
-
-msgid "IDS_MA_HEADER_ACCOUNTS"
-msgstr "帐户"
-
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "照片"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "未启动"
-
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "发贴"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "电池电量低时保持连接"
-
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "漫游时保持连接"
-
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
-
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "自动同步"
-
-msgid "IDS_ST_BODY_MOBILE_TRACKER"
-msgstr "手机追踪器"
-
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "帐户列表"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "与此帐户相关的全部数据将被删除。继续?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "用户名或电子邮件不正确"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "无法删除。重试?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "Samsung"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "手动设置"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "如果同步关闭,可删除或保留现存事件"
-
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "如果同步关闭,可删除或保留现存联系人"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "从手机删除"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "保留在手机"
-
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "录像"
-
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "其他电子邮件"
-
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "帐户和同步"
-
old mode 100755 (executable)
new mode 100644 (file)
index 0798f20..b20c60d
-msgid "IDS_MA_BODY_OTHERS"
-msgstr "å\85¶ä»\96"
+msgid "IDS_COM_BODY_GALLERY"
+msgstr "åª\92é«\94ç\80\8f覽å\99¨"
 
-msgid "IDS_MA_MBODY_AUTO_SYNC"
-msgstr "自動同步"
-
-msgid "IDS_MA_BODY_AOL"
-msgstr "AOL"
-
-msgid "IDS_MA_BUTTON_OK"
-msgstr "確認"
-
-msgid "IDS_MA_HEADER_ADD_ACCOUNT"
-msgstr "新增帳號"
-
-msgid "IDS_FB_HEADER_FACEBOOK"
-msgstr "Facebook"
-
-msgid "IDS_COM_BODY_TASK"
-msgstr "工作"
+msgid "IDS_COM_OPT_S_MEMO"
+msgstr "S Memo"
 
-msgid "IDS_MA_BODY_GOOGLE"
-msgstr "Google"
-
-msgid "IDS_MA_BODY_CONTACT_SYNC"
-msgstr "聯絡人同步"
+msgid "IDS_COM_BODY_VOIP_CALL"
+msgstr "VoIP 通話"
 
-msgid "IDS_MA_BODY_PEAK_DAYS"
-msgstr "尖峰天數"
+msgid "IDS_COM_BODY_S_PLANNER"
+msgstr "S Planner"
 
-msgid "IDS_MA_BODY_PEAK_END_TIME"
-msgstr "尖峰結束時間"
+msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
+msgstr "Samsung Apps"
 
-msgid "IDS_MA_BODY_PEAK_START_TIME"
-msgstr "尖峰開始時間"
+msgid "IDS_COM_BODY_MUSIC"
+msgstr "音樂"
 
-msgid "IDS_MA_OPT_ALL_DATA"
-msgstr "所有資料"
+msgid "IDS_COM_BODY_MESSAGES"
+msgstr "訊息"
 
-msgid "IDS_SYNCML_BODY_SYNC_SERVER"
-msgstr "同步伺服器"
+msgid "IDS_COM_BODY_INTERNET"
+msgstr "網際網路"
 
 msgid "IDS_COM_BODY_EMAIL"
 msgstr "電子郵件"
 
-msgid "IDS_MA_BODY_EXCHANGE"
-msgstr "交換"
+msgid "IDS_TW_BODY_POST_TWITTER"
+msgstr "Post"
 
 msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
 msgstr "Microsoft Exchange ActiveSync"
 
-msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
-msgstr "可管理您的聯絡人、日曆、電子郵件、以及 IM 帳號"
-
-msgid "IDS_MA_BODY_SHOW_PASSWORD"
-msgstr "顯示密碼"
-
-msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH"
-msgstr "Push郵件檔案"
+msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"
+msgstr "電子郵件帳號已達道最大數量。"
 
-msgid "IDS_MA_BODY_TASK_SYNC"
-msgstr "任務同步"
-
-msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
-msgstr "Windows Live Hotmail"
-
-msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"
-msgstr "日曆"
-
-msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"
-msgstr "Samsung Apps"
-
-msgid "IDS_COM_BODY_VOIP_CALL"
-msgstr "VoIP 通話"
-
-msgid "IDS_COM_POP_UNKNOWN"
-msgstr "未知"
-
-msgid "IDS_COM_SK_ADD_LITE"
-msgstr "新增"
+msgid "IDS_MA_MBODY_AUTO_SYNC"
+msgstr "自動同步"
 
-msgid "IDS_MA_BODY_CONTACT"
-msgstr "聯絡人"
+msgid "IDS_MA_HEADER_ADD_ACCOUNT"
+msgstr "新增帳號"
 
 msgid "IDS_MA_HEADER_ACCOUNTS"
 msgstr "帳號"
 
-msgid "IDS_PB_BODY_PHOTO"
-msgstr "相片"
-
-msgid "IDS_ST_BODY_INACTIVE"
-msgstr "停用"
+msgid "IDS_MA_BUTTON_OK"
+msgstr "確認"
 
-msgid "IDS_TW_BODY_POST_TWITTER"
-msgstr "Post"
+msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"
+msgstr "可管理您的聯絡人、日曆、電子郵件、以及 IM 帳號。"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY"
-msgstr "保持連線於低電量"
+msgid "IDS_MA_BODY_SIGNED_IN"
+msgstr "已登入。"
 
-msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING"
-msgstr "漫遊時保持連接"
+msgid "IDS_PB_TAB_CONTACTS"
+msgstr "聯絡人"
 
-msgid "IDS_MA_BODY_MSN"
-msgstr "MSN"
+msgid "IDS_PB_BODY_ADD_ACCOUNT"
+msgstr "新增帳號"
 
-msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY"
-msgstr "自動同步"
+msgid "IDS_ST_BODY_VIDEOS"
+msgstr "影片"
 
 msgid "IDS_ST_BODY_MOBILE_TRACKER"
 msgstr "手機追蹤系統"
 
-msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
-msgstr "帳戶列表"
-
-msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
-msgstr "所有此帳戶的相關資料將被刪除。要繼續嗎?"
-
-msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL"
-msgstr "不正確的用戶名或電子郵件"
-
-msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q"
-msgstr "無法刪除。再試一次?"
-
-msgid "IDS_ST_BODY_SAMSUNG"
-msgstr "三星"
-
-msgid "IDS_MA_BODY_MANUAL_SETUP"
-msgstr "手動設定"
-
-msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "如果關閉同步,可刪除或保留現有的活動"
+msgid "IDS_ST_BODY_ACCOUNT_LIST"
+msgstr "帳號清單"
 
-msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF"
-msgstr "如果關閉同步,可刪除或保留現有的聯絡人"
-
-msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE"
-msgstr "從手機刪除"
-
-msgid "IDS_MA_BUTTON_KEEP_ON_PHONE"
-msgstr "保留於手機中"
+msgid "IDS_SYNCML_BODY_SYNC_SERVER"
+msgstr "同步伺服器"
 
-msgid "IDS_ST_BODY_VIDEOS"
-msgstr "å½±ç\89\87"
+msgid "IDS_TASK_BODY_TASK"
+msgstr "å·¥ä½\9c"
 
-msgid "IDS_PB_BODY_OTHER_EMAILS"
-msgstr "其他電子郵件"
+msgid "IDS_HELP_POP_TUTORIAL_COMPLETE"
+msgstr "教學完成。"
 
-msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"
-msgstr "帳號與同步處理"
+msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY"
+msgstr "選擇要使用的雲端服務然後建立帳號。建立三星帳號後,將自動同步儲存的備忘錄。"
 
index 480b949..33af557 100755 (executable)
@@ -1,27 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<manifest xmlns="http://tizen.org/ns/packages" package="setting-myaccount-efl" version="1.8.36" install-location="internal-only">\r
-       <label>my-account</label>\r
-       <author email="wy1115.lee@samsung.com" href="www.samsung.com">Wonyoung Lee</author>\r
-       <description>My Account Application</description>\r
-       <ui-application appid="setting-myaccount-efl" exec="/usr/ug/bin/setting-myaccount-efl" nodisplay="true" multiple="true" type="capp" taskmanage="false">\r
-               <label>my-account</label>\r
-               <label xml:lang="en-us">Account</label>\r
-               <label xml:lang="nl-nl">Account</label>\r
-               <label xml:lang="de-de">Account</label>\r
-               <label xml:lang="zh-hk">Account</label>\r
-               <label xml:lang="zh-cn">Account</label>\r
-               <label xml:lang="ru-ru">Account</label>\r
-               <label xml:lang="zh-tw">Account</label>\r
-               <label xml:lang="ja-jp">Account</label>\r
-               <label xml:lang="es-es">Account</label>\r
-               <label xml:lang="el-gr">Account</label>\r
-               <label xml:lang="it-it">Account</label>\r
-               <label xml:lang="tr-tr">Account</label>\r
-               <label xml:lang="pt-pt">Account</label>\r
-               <label xml:lang="fr-fr">Account</label>\r
-               <label xml:lang="ko-kr">Account</label>\r
-               <application-service>\r
-                       <operation name="http://tizen.org/appcontrol/operation/test"/>\r
-               </application-service>\r
-       </ui-application>\r
-</manifest>\r
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="setting-myaccount-efl" version="1.9.101" install-location="internal-only">
+       <label>Accounts</label>
+       <author email="wy1115.lee@samsung.com" href="www.samsung.com">Wonyoung Lee</author>
+       <description>My Account Application</description>
+       <ui-application appid="setting-myaccount-efl" exec="/usr/apps/setting-myaccount-efl/bin/setting-myaccount-efl" ui-gadget="true" nodisplay="true" multiple="true" type="capp" taskmanage="false" process-pool="true">
+               <icon>/usr/apps/com.samsung.setting/res/icons/settings_account.png</icon>
+               <label>Accounts</label>
+               <label xml:lang="en-us">Accounts</label>
+               <label xml:lang="nl-nl">Accounts</label>
+               <label xml:lang="de-de">Konten</label>
+               <label xml:lang="zh-hk">帳戶</label>
+               <label xml:lang="zh-cn">帐户</label>
+               <label xml:lang="ru-ru">Учетные записи</label>
+               <label xml:lang="zh-tw">帳號</label>
+               <label xml:lang="ja-jp">アカウント</label>
+               <label xml:lang="es-es">Cuentas</label>
+               <label xml:lang="el-gr">Λογαριασμοί</label>
+               <label xml:lang="it-it">Account</label>
+               <label xml:lang="tr-tr">Hesaplar</label>
+               <label xml:lang="pt-pt">Contas</label>
+               <label xml:lang="fr-fr">Comptes</label>
+               <label xml:lang="ko-kr">계정</label>
+       </ui-application>
+</manifest>
index 96349da..c757570 100755 (executable)
@@ -1,17 +1,22 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ *  my-account
  *
- * Licensed under the Flora License, Version 1.1 (the License);
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
+ *
+ * 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://floralicense.org/license/
+ * 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,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
 #include <Ecore_X.h>
 #include "myaccount_ug_addaccount.h"
 #include "myaccount_ug_common.h"
 
-typedef struct __capability_data {
-       char* type;
-       int state;
-}myaccount_capability_data;
-
-typedef struct __account_list_priv {
-       int account_id;
-       char username[256];
-       char display_name[256];
-       char email_address[256];
-       char package_name[256];
-       char domain_name[60];
-       char icon_path[PATH_MAX];
-       char capability[128];
-       int secret;
-       int list_index;
-       int sync_status;
-       GSList *capablity_list;
-}myaccount_list_priv;
+#define SORT_PRIOR_1 "1_"
+#define SORT_PRIOR_2 "2_"
+#define SORT_PRIOR_3 "3_"
 
 static Elm_Genlist_Item_Class account_list_itc;
-static Elm_Genlist_Item_Class account_list_title_itc;
-static Elm_Genlist_Item_Class account_list_itc_sep;
-static Elm_Genlist_Item_Class account_list_itc_sep_end;
-static myaccount_list_priv *account_info;
+
 static int account_index = 0;
 
+#define TOOLBAR_HEIGHT                 0
+
+//static void _myaccount_account_list_free_capdata(gpointer data,      gpointer user_data);
 static void __myaccount_account_list_addaccount_cb( void *data,
                                                                                        Evas_Object *obj, void* event_info );
 static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug,
                                                                                        enum ug_mode mode, void *priv);
 static void _myaccount_ug_account_list_result_cb(ui_gadget_h ug,
-                                                                                       service_h service, void *priv);
+                                                                                       app_control_h app_control, void *priv);
 static void _myaccount_ug_account_list_destroy_cb(ui_gadget_h ug,
                                                                                void *priv);
 static void __myaccount_account_list_append_genlist(myaccount_appdata *ad,
                                                                                int count);
+static void __rotate_more_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info);
 
 static char *__myaccount_account_list_get_capablity_string_value(const char* capability_type)
 {
-       if (!strcmp(capability_type, ACCOUNT_SUPPORTS_CAPABILITY_CONTACT))
-               return dgettext(MA_UG_NAME, "IDS_MA_BODY_CONTACT");
-       else if (!strcmp(capability_type, ACCOUNT_SUPPORTS_CAPABILITY_CALENDAR))
+       if (!strcmp(capability_type, "http://tizen.org/account/capability/contact"))
+               return dgettext(MA_UG_NAME, "IDS_PB_TAB_CONTACTS");
+       else if (!strcmp(capability_type, "http://tizen.org/account/capability/calendar"))
                return dgettext("sys_string", "IDS_COM_BODY_S_PLANNER");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_PHOTO))
-               return dgettext(MA_UG_NAME, "IDS_PB_BODY_PHOTO");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_VIDEO))
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/photo"))
+               return dgettext(MA_UG_NAME, "IDS_COM_BODY_GALLERY");
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/video"))
                return dgettext(MA_UG_NAME, "IDS_ST_BODY_VIDEOS");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_EMAIL))
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/email"))
                return dgettext(MA_UG_NAME, "IDS_COM_BODY_EMAIL");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_POST))
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/post"))
                return dgettext(MA_UG_NAME, "IDS_TW_BODY_POST_TWITTER");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_VOIP))
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/voip"))
                return dgettext(MA_UG_NAME, "IDS_COM_BODY_VOIP_CALL");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_SAMSUNG_APPS))
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/samsungapps"))
                return dgettext(MA_UG_NAME, "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_MOBILE_TRACKER))
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/mobiletracker"))
                return dgettext(MA_UG_NAME, "IDS_ST_BODY_MOBILE_TRACKER");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_TASK))
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/task"))
                return dgettext(MA_UG_NAME, "IDS_COM_BODY_TASK");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_MEMO))
-               return dgettext("sys_string", "IDS_COM_BODY_S_NOTE");
-       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_MUSIC))
+#ifdef _FEATURE_SMEMO_ENABLE
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/memo"))
+               return dgettext(MA_UG_NAME, "IDS_COM_OPT_S_MEMO");
+#else
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/memo"))
+               return NULL;
+#endif
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/synchronise"))
+               return dgettext(MA_UG_NAME, "IDS_SYNCML_BODY_SYNC_SERVER");
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/docomo"))
+               return dgettext(MA_UG_NAME, "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2");
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/music"))
                return dgettext("sys_string", "IDS_COM_BODY_MUSIC");
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/internet"))
+               return dgettext(MA_UG_NAME, "IDS_COM_BODY_INTERNET");
+       else if (!strcmp(capability_type ,"http://tizen.org/account/capability/message"))
+               return dgettext(MA_UG_NAME, "IDS_COM_BODY_MESSAGES");
        else
                return NULL;//return dgettext(MA_UG_NAME, "IDS_COM_POP_UNKNOWN");
 }
 
+/*
+static void _myaccount_account_list_free_capdata(gpointer data, gpointer user_data)
+{
+        if(data == NULL)
+                return;
+        myaccount_capability_data * cap_data= (myaccount_capability_data*)data;
+
+        MA_MEMFREE(cap_data->type);
+        MA_MEMFREE(cap_data);
+}
+*/
+
 bool _myaccount_account_list_get_capablity_text(const char* capability_type,
                                                                                account_capability_state_e capability_state,
                                                                                void *user_data)
@@ -97,9 +112,13 @@ bool _myaccount_account_list_get_capablity_text(const char* capability_type,
        myaccount_list_priv *account_info = (myaccount_list_priv*)user_data;
        char *capability_textbuf = account_info->capability;
 
+       if(!account_info) {
+               return false;
+       }
+
        myaccount_capability_data *cap_data = (myaccount_capability_data*)malloc(sizeof(myaccount_capability_data));
        if (!cap_data) {
-               MYACCOUNT_FATAL("malloc failed\n");
+               MYACCOUNT_ERROR("malloc failed\n");
                return true;
        }
        memset(cap_data, 0, sizeof(myaccount_capability_data));
@@ -113,37 +132,80 @@ bool _myaccount_account_list_get_capablity_text(const char* capability_type,
                capability_string = __myaccount_account_list_get_capablity_string_value(
                                                                                                                        capability_type);
 
-               if (capability_string != NULL) {
-                       MYACCOUNT_VERBOSE("capability_string = %s\n",   capability_string);
-                       if(strlen(capability_textbuf) > 0) {
-                               char *temp2 = strdup(capability_textbuf);
-                               if (!temp2) {
-                                       MYACCOUNT_FATAL("strdup returns NULL\n");
-                                       return false;
+               /* Synchronise capability string exception, wylee */
+               if(!strcmp(account_info->package_name, "setting-synchronise-efl")){
+                       MA_SNPRINTF(capability_textbuf, 127, "%s", dgettext(MA_UG_NAME, "IDS_SYNCML_BODY_SYNC_SERVER"));
+               } else {
+                       if (capability_string != NULL) {
+                               if(strlen(capability_textbuf) > 0) {
+                                       char *temp2 = strdup(capability_textbuf);
+                                       if (!temp2) {
+                                               MYACCOUNT_ERROR("strdup returns NULL\n");
+                                               return false;
+                                       }
+                                       MA_SNPRINTF(capability_textbuf, 127, "%s, %s", temp2, capability_string);
+                                       MA_MEMFREE(temp2);
+                               } else {
+                                       MA_SNPRINTF(capability_textbuf, 127, "%s%s", capability_textbuf,
+                                                                                                                               capability_string);
                                }
-                               MA_SNPRINTF(capability_textbuf, 127, "%s, %s", temp2, capability_string);
-                               MA_MEMFREE(temp2);
-                       } else {
-                               MA_SNPRINTF(capability_textbuf, 127, "%s%s", capability_textbuf,
-                                                                                                                       capability_string);
                        }
                }
        }
 
-       MYACCOUNT_VERBOSE("capability_textbuf = %s \n",         capability_textbuf);
        return true;
 }
 
+void myaccount_account_list_free_priv_data(myaccount_appdata *appdata)
+{
+       GList* it = NULL;
+       myaccount_appdata *ad = (myaccount_appdata *)appdata;
+
+       if(!ad) {
+               MYACCOUNT_ERROR("No appdata!!\n");
+               return;
+       }
+
+       for(it=ad->sorted_account_list;it!=NULL;it=g_list_next(it)) {
+               myaccount_list_priv* tmp = (myaccount_list_priv*)it->data;
+               MA_MEMFREE(tmp);
+       }
+
+       if(ad->account_info_list) {
+               g_list_free(ad->account_info_list);
+               ad->account_info_list = NULL;
+       }
+
+       ad->sorted_account_list = NULL;
+
+}
+
+static myaccount_list_priv*
+_myaccount_account_list_create_priv_item()
+{
+       myaccount_list_priv* account_info = NULL;
+       account_info = (myaccount_list_priv*)calloc(1,sizeof(myaccount_list_priv));
+       if(!account_info) {
+               MYACCOUNT_ERROR("memory allocation fail\n");
+       }
+       return account_info;
+}
+
+
 bool _myaccount_account_list_account_info_cb(account_h account,
                                                                                                                void *user_data)
 {
+       GList **account_info_list = (GList **)user_data;
        int error_code = -1;
-       int j = account_index;
+       myaccount_list_priv* account_info = NULL;
 
        if (!account) {
                MYACCOUNT_ERROR("_myaccount_account_list_account_info_cb:account handle is NULL\n");
                return false;
        } else {
+
+               account_info = _myaccount_account_list_create_priv_item();
+
                char *temptxt = NULL;
                int id = -1;
                account_secrecy_state_e secret;
@@ -152,100 +214,145 @@ bool _myaccount_account_list_account_info_cb(account_h account,
                if (error_code != ACCOUNT_ERROR_NONE) {
                        MYACCOUNT_ERROR("account_get_user_name: Failed \n");
                } else if (temptxt && strlen(temptxt)) {
-                       MA_STRNCPY(account_info[j].username, temptxt,
-                                                                       sizeof(account_info[j].username));
-               } else {
-                       MYACCOUNT_DBUG("account_get_user_name: returned NULL \n");
+                       MA_STRNCPY(account_info->username, temptxt,
+                                                                       sizeof(account_info->username));
                }
                MA_MEMFREE(temptxt);
                error_code = account_get_display_name(account, &temptxt);
                if (error_code != ACCOUNT_ERROR_NONE) {
                        MYACCOUNT_ERROR("account_get_display_name: Failed \n");
                } else if (temptxt && strlen(temptxt)) {
-                       MA_STRNCPY(account_info[j].display_name, temptxt,
-                                                                       sizeof(account_info[j].display_name));
-               } else {
-                       MYACCOUNT_DBUG("account_get_display_name: returned NULL \n");
+                       MA_STRNCPY(account_info->display_name, temptxt,
+                                                                       sizeof(account_info->display_name));
                }
                MA_MEMFREE(temptxt);
                error_code = account_get_email_address(account, &temptxt);
                if (error_code != ACCOUNT_ERROR_NONE) {
                        MYACCOUNT_ERROR("account_get_email_address: Failed \n");
                } else if (temptxt && strlen(temptxt)) {
-                       MA_STRNCPY(account_info[j].email_address, temptxt,
-                                                                       sizeof(account_info[j].email_address));
-               } else {
-                       MYACCOUNT_DBUG("account_get_email_address: returned NULL \n");
+                       MA_STRNCPY(account_info->email_address, temptxt,
+                                                                       sizeof(account_info->email_address));
                }
+
                MA_MEMFREE(temptxt);
                error_code = account_get_package_name(account, &temptxt);
                if (error_code != ACCOUNT_ERROR_NONE) {
                        MYACCOUNT_ERROR("account_get_package_name: Failed \n");
                } else if (temptxt && strlen(temptxt)) {
-                       MA_STRNCPY(account_info[j].package_name, temptxt,
-                                                                       sizeof(account_info[j].package_name));
-               } else {
-                       MYACCOUNT_DBUG("account_get_package_name: returned NULL \n");
-               }
+                       MA_STRNCPY(account_info->package_name, temptxt,
+                                                                       sizeof(account_info->package_name));
+                       if(!strcmp(temptxt, TIZEN_EMAIL_APPID) || !strcmp(temptxt, EXCHANGE_UI_APPID) ||!strcmp(temptxt, GOOGLE_ACCOUNT_APPID)){
+                               account_info->b_tizen_email = TRUE;
+                       } else {
+                               account_info->b_tizen_email = FALSE;
+                       }
+
+               }
                MA_MEMFREE(temptxt);
                error_code = account_get_account_id(account, &id);
                if (error_code != ACCOUNT_ERROR_NONE) {
                        MYACCOUNT_ERROR("account_get_account_id: Failed \n");
                } else if (id > 0) {
-                       account_info[j].account_id = id;
-               } else {
-                       MYACCOUNT_DBUG("account_get_account_id: returned 0 or -ve \n");
+                       account_info->account_id = id;
                }
                error_code = account_get_secret(account, &secret);
                if (error_code != ACCOUNT_ERROR_NONE) {
                        MYACCOUNT_ERROR("account_get_secret: Failed \n");
                } else {
-                       account_info[j].secret = secret;
+                       account_info->secret = secret;
                }
                error_code = account_get_domain_name(account, &temptxt);
                if (error_code != ACCOUNT_ERROR_NONE) {
                        MYACCOUNT_ERROR("account_get_domain_name: Failed \n");
                } else if (temptxt && strlen(temptxt)) {
-                       MA_STRNCPY(account_info[j].domain_name, temptxt,
-                                                                       sizeof(account_info[j].domain_name));
-               } else {
-                       MYACCOUNT_DBUG("account_get_domain_name: returned NULL \n");
+                       MA_STRNCPY(account_info->domain_name, temptxt,
+                                                                       sizeof(account_info->domain_name));
                }
+
                MA_MEMFREE(temptxt);
                error_code = account_get_icon_path(account, &temptxt);
                if (error_code != ACCOUNT_ERROR_NONE) {
                                MYACCOUNT_ERROR("account_get_icon_path: Failed \n");
                } else if (temptxt && strlen(temptxt)) {
-                       MA_STRNCPY(account_info[j].icon_path, temptxt,
-                                                                       sizeof(account_info[j].icon_path));
-               } else {
-                       MYACCOUNT_DBUG("account_get_icon_path: returned NULL \n");
-               }
+                       MA_STRNCPY(account_info->icon_path, temptxt, sizeof(account_info->icon_path));
+               } else {
+
+                       account_type_h account_type = NULL;
+
+                       error_code = account_type_create(&account_type);
+
+                       if(error_code == ACCOUNT_ERROR_NONE){
+
+                               error_code = account_type_query_by_app_id((const char*)account_info->package_name, &account_type);
+
+                               if(error_code == ACCOUNT_ERROR_NONE){
+                                       char* provider_icon = NULL;
+                                       error_code = account_type_get_icon_path(account_type, &provider_icon);
+
+                                       if(error_code != ACCOUNT_ERROR_NONE){
+                                               MYACCOUNT_ERROR("account provider icon get Failed \n");
+                                       } else if (provider_icon && strlen(provider_icon)) {
+                                               MA_STRNCPY(account_info->icon_path, provider_icon, sizeof(account_info->icon_path));
+                                       } else {
+                                               MYACCOUNT_DBUG("account provider icon is not set \n");
+                                       }
+                                       MA_MEMFREE(provider_icon);
+                               }
+
+                               error_code = account_type_destroy(account_type);
+                               if(error_code != ACCOUNT_ERROR_NONE){
+                                       MYACCOUNT_ERROR("type_destroy destroy Failed \n");
+                               }
+                       }
+               }
+
                MA_MEMFREE(temptxt);
-               if(!strlen(account_info[j].icon_path))
-                       myaccount_common_get_icon_by_name(account_info[j].domain_name ,
-                                                                                                       account_info[j].icon_path);
+               if(!strlen(account_info->icon_path))
+                       myaccount_common_get_icon_by_name(account_info->domain_name ,
+                                                                                                       account_info->icon_path);
 
                error_code = account_get_sync_support(account,
-                                               (account_sync_state_e *)&(account_info[j].sync_status));
+                                               (account_sync_state_e *)&(account_info->sync_status));
                if (error_code != ACCOUNT_ERROR_NONE) {
                        MYACCOUNT_ERROR("account_get_sync_support: Failed \n");
                }
 
                error_code = account_get_capability_all(account,
                                                                        _myaccount_account_list_get_capablity_text,
-                                                                       (void *)&account_info[j]);
+                                                                       (void *)account_info);
                if (error_code != ACCOUNT_ERROR_NONE)
                        MYACCOUNT_ERROR("account_get_capability: Failed \n");
 
+               /* for SA(01), TA(02) sorting */
+               MYACCOUNT_DBUG("(%s)\n", strchr(account_info->package_name, '.'));
+               if(!strcmp(account_info->package_name, SAMSUNG_ACCOUNT_APPID)) {
+                       MA_SNPRINTF(account_info->service_sname,
+                                                               sizeof(account_info->service_sname), "%s%s", SORT_PRIOR_1, strchr(account_info->package_name, '.'));
+               } else if(!strcmp(account_info->package_name, TIZEN_ACCOUNT_APPID)){
+                       MA_SNPRINTF(account_info->service_sname,
+                                                               sizeof(account_info->service_sname), "%s%s", SORT_PRIOR_1, strchr(account_info->package_name, '.'));
+               } else {
+                       /* No need to sort, sort as the order user register */
+                       MA_SNPRINTF(account_info->service_sname,
+                                                               sizeof(account_info->service_sname), "%s", SORT_PRIOR_3);
+               }
+
+               *account_info_list = g_list_append(*account_info_list, (void*)account_info);
                account_index++;
        }
        return true;
 }
 
-static int __myaccount_account_list_populate_account_info()
+static int _myaccount_ug_account_list_compare(gconstpointer a, gconstpointer b)
+{
+       myaccount_list_priv* account_info_a = (myaccount_list_priv*)a;
+       myaccount_list_priv* account_info_b = (myaccount_list_priv*)b;
+
+       return g_ascii_strcasecmp(account_info_a->service_sname, account_info_b->service_sname);
+}
+
+static int __myaccount_account_list_populate_account_info(myaccount_appdata *ad)
 {
-       MYACCOUNT_VERBOSE("\n Inside __myaccount_account_list_populate_account_info !! \n");
        int error_code = -1;
        int count=0;
 
@@ -253,49 +360,53 @@ static int __myaccount_account_list_populate_account_info()
        if (error_code != ACCOUNT_ERROR_NONE)
                MYACCOUNT_ERROR("account_connect: Failed \n");
 
-       error_code = account_get_total_count_from_db(&count);
-       if (error_code != ACCOUNT_ERROR_NONE)
-               MYACCOUNT_ERROR("account_get_total_count_from_db: Failed \n");
-
-       MYACCOUNT_DBUG("CURRENT account count is %d\n", count);
-       account_info = calloc(count, sizeof(myaccount_list_priv));
        account_foreach_account_from_db(_myaccount_account_list_account_info_cb,
-                                                                                       NULL);
+                                                                                       &ad->account_info_list);
        error_code = account_disconnect();
        if (error_code != ACCOUNT_ERROR_NONE)
                MYACCOUNT_ERROR("account_disconnect: Failed \n");
 
-       MYACCOUNT_VERBOSE("populate myacconut data END\n");
+       ad->sorted_account_list = g_list_sort(ad->account_info_list, (GCompareFunc)_myaccount_ug_account_list_compare);
+       count = g_list_length(ad->sorted_account_list);
+
        return count;
 }
 
-void myaccount_account_list_quit_cb( void *data,
-                                                                       Evas_Object *obj, void *event_info )
+Eina_Bool myaccount_account_list_quit_cb(void *data, Elm_Object_Item *it)
 {
        int error_code=0;
        myaccount_appdata *priv = (myaccount_appdata*)data;
 
-       MYACCOUNT_VERBOSE("myaccount_account_list_quit_cb START\n");
+       MYACCOUNT_DBUG("account list view quit\n");
 
        if (!priv) {
                MYACCOUNT_ERROR("myaccount_account_list_quit_cb callback user data is null!!!\n");
-               return;
+               return EINA_TRUE;
        }
 
-       if(account_info){
-               if (account_info->capablity_list) {
-                       g_slist_free(account_info->capablity_list);
-                       account_info->capablity_list = NULL;
-               }
+       if(priv->popup != NULL)
+       {
+               evas_object_del(priv->popup);
+               priv->popup = NULL;
        }
-       MA_MEMFREE(account_info);
+
+       myaccount_account_list_free_priv_data(priv);
+
        account_index = 0;
+
        if (priv->ug) {
-               error_code = ug_destroy_me(priv->ug);
-               MYACCOUNT_INFO("myaccount_account_list_quit_cb callback : return = %d!!!\n",
+               ui_gadget_h ug = priv->ug;
+               error_code = ug_destroy_me(ug);
+               MYACCOUNT_SLOGD("myaccount_account_list_quit_cb callback : return = %d!!!\n",
                                                                                                error_code);
+               return EINA_FALSE;
        }
-       MYACCOUNT_VERBOSE("myaccount_account_list_quit_cb END\n");
+       return EINA_TRUE;
+}
+
+void myaccount_account_list_back_key_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       elm_naviframe_item_pop(obj);
 }
 
 static void __myaccount_account_list_addaccount_cb( void *data,
@@ -303,6 +414,11 @@ static void __myaccount_account_list_addaccount_cb( void *data,
 {
        myaccount_appdata *priv = (myaccount_appdata*)data;
        myaccount_addaccount_create_view(priv);
+       if(priv->popup != NULL)
+       {
+               evas_object_del(priv->popup);
+               priv->popup = NULL;
+       }
 }
 
 static char *__myaccount_account_list_gl_label_get(void *data,
@@ -310,15 +426,13 @@ static char *__myaccount_account_list_gl_label_get(void *data,
 {
        myaccount_list_priv *account_info_item = (myaccount_list_priv*)data;
        char domain_name_lower[128] = {0,};
-       MYACCOUNT_VERBOSE("__myaccount_account_list_gl_label_get START data=%p, part=%s\n",
-                                                                                       data, part);
 
        if (!account_info_item) {
                MYACCOUNT_ERROR(" __myaccount_account_list_gl_label_get: Data is NULL\n");
                return NULL;
        }
 
-       if (!strcmp(part, "elm.text") || !strcmp(part, "elm.text.1")) {
+       if (!strcmp(part, "elm.text.main.left.top")) {
                myaccount_common_lowercase(account_info_item->domain_name,
                                                                                                domain_name_lower);
 
@@ -330,89 +444,83 @@ static char *__myaccount_account_list_gl_label_get(void *data,
                        return strdup(account_info_item->username);
                else
                        return strdup("Unknown");
-       } else if (!strcmp(part, "elm.text.sub") || !strcmp(part, "elm.text.2")) {
+       } else if (!strcmp(part, "elm.text.sub.left.bottom")) {
                if (strlen(account_info_item->capability) <=0 )
-                       return strdup("Signed In");
+                       return strdup(dgettext(MA_UG_NAME, "IDS_MA_BODY_SIGNED_IN"));
                else
                        return strdup(account_info_item->capability);
-       } else {
-               MYACCOUNT_DBUG("__myaccount_account_list_gl_label_get : UNKNOWN part name");
-               return strdup(account_info_item->domain_name);
        }
 
-       MYACCOUNT_VERBOSE("END of __myaccount_account_list_gl_label_get \n");
        return NULL;
 }
 
-static char *__myaccount_account_list_title_get(void *data,
-                                                                               Evas_Object *obj, const char *part)
-{
-       if (!strcmp(part, "elm.text"))
-               return (strdup(dgettext(MA_UG_NAME, "IDS_EMAIL_SK3_ACCOUNT_LIST")));
-
-       return NULL;
-}
 
 static Evas_Object *__myaccount_account_list_gl_icon_get(void *data,
                                                                                        Evas_Object *obj, const char *part)
 {
        char tempbuf[PATH_MAX];
        Evas_Object *icon = NULL;
+       int auto_sync_status = -1;
        myaccount_list_priv *account_info_item = (myaccount_list_priv*)data;
-
-       MYACCOUNT_VERBOSE("__myaccount_account_list_gl_icon_get START data=%p, obj = %p, part=%s\n",
-                                                                       data, obj, part);
+       char *color = NULL;
+       Evas_Object *ic = NULL;
 
        if (!account_info_item) {
                 MYACCOUNT_ERROR("__myaccount_account_list_gl_icon_get: Data is NULL\n");
                 return NULL;
        }
        memset(tempbuf, 0, sizeof(char)*PATH_MAX);
+
        if (!strcmp(part, "elm.icon.1")) {
-               MYACCOUNT_VERBOSE("__myaccount_account_list_gl_icon_get : current path %s\n",
-                                                               account_info_item->icon_path);
                if (strlen(account_info_item->icon_path) > 0) {
                        MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", account_info_item->icon_path);
                } else {
-                       MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", "99_email.png");
+                       MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", "A01_2_Icon_default.png");
                }
 
-               icon = elm_icon_add(obj);
+               ic = elm_layout_add(obj);
+               elm_layout_theme_set(ic, "layout", "list/B/type.2", "default");
+
+               icon = elm_image_add(obj);
                if (strstr(tempbuf, "/"))
                        elm_image_file_set(icon, tempbuf, NULL);
                else
                        elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf);
 
-               evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_NONE, 1, 1);
+               elm_layout_content_set(ic, "elm.swallow.content", icon);
        }
+
        if (!strcmp(part, "elm.icon.2")) {
                if (account_info_item->sync_status == ACCOUNT_SYNC_NOT_SUPPORT)
                        return NULL;
-
-               if (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_IDLE
-                       || account_info_item->sync_status == ACCOUNT_SYNC_STATUS_OFF ) {
-                       MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s",
-                               "66_myaccount_icon_push_deactivated.png");
-               } else if  (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_RUNNING){
-                       MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s",
-                               "66_myaccount_icon_push_press.png");
+               if (vconf_get_int(VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT,
+                                               &auto_sync_status) < 0) {
+                       MYACCOUNT_ERROR("Fail to getVCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT\n");
                }
+               MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", "account_icon_syncing.png");
+               color = "AO001";
 
-               MYACCOUNT_DBUG("## icon path (%s)\n", tempbuf);
-
+               MYACCOUNT_DBUG("color:[%s]",color);
                if(strlen(tempbuf) > 0) {
-               icon = elm_icon_add(obj);
-               if (strstr(tempbuf, "/"))
-                       elm_image_file_set(icon, tempbuf, NULL);
-               else
-                       elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf);
+                       ic = elm_layout_add(obj);
+                       elm_layout_theme_set(ic, "layout", "list/C/type.3", "default");
 
-               evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_NONE, 1, 1);
-       }
+                       icon = elm_image_add(obj);
+                       if (strstr(tempbuf, "/"))
+                               elm_image_file_set(icon, tempbuf, NULL);
+                       else
+                               elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf);
+
+                       int ret = 0;
+                       if (color) {
+                               ret = ea_theme_object_color_set(icon, color);
+                               MYACCOUNT_DBUG("ret[%d]", ret);
+                       }
+                       elm_layout_content_set(ic, "elm.swallow.content", icon);
+               }
        }
-       MYACCOUNT_VERBOSE("__myaccount_account_list_gl_icon_get :: END :: icon = %p\n",
-                                                       icon);
-       return icon;
+
+       return ic;
 }
 
 static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug,
@@ -422,13 +530,13 @@ static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug,
        myaccount_appdata *ad;
 
        if (!ug||!priv) {
-               MYACCOUNT_FATAL("layout cb error ug=%p, priv=%p\n", ug, priv);
+               MYACCOUNT_ERROR("layout cb error ug=%p, priv=%p\n", ug, priv);
                return;
        }
        ad = (myaccount_appdata*)priv;
        base = ug_get_layout(ug);
        if (!base)
-               MYACCOUNT_FATAL("layout cb base is null\n");
+               MYACCOUNT_ERROR("layout cb base is null\n");
 
        switch (mode) {
        case UG_MODE_FRAMEVIEW:
@@ -437,7 +545,7 @@ static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug,
        case UG_MODE_FULLVIEW:
                        evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);
-                       elm_win_resize_object_add(ad->win_main, base);
+                       //elm_win_resize_object_add(ad->win_main, base);
                        evas_object_show(base);
                        break;
        default:
@@ -446,165 +554,209 @@ static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug,
 }
 
 static void _myaccount_ug_account_list_result_cb(ui_gadget_h ug,
-                                                                               service_h service, void *priv)
+                                                                               app_control_h app_control, void *priv)
 {
-       MYACCOUNT_VERBOSE("_myaccount_ug_account_list_result_cb\n");
+       //MYACCOUNT_VERBOSE("_myaccount_ug_account_list_result_cb\n");
 }
 
 static void _myaccount_ug_account_list_destroy_cb(ui_gadget_h ug,
                                                                                                        void *priv)
 {
-       MYACCOUNT_VERBOSE("_myaccount_ug_account_list_destroy_cb\n");
        myaccount_appdata *mydata = (myaccount_appdata*)priv;
 
        if (!ug||!mydata) {
                MYACCOUNT_ERROR("destroy cb error ug=%p, priv=%p\n", ug, mydata);
                return;
        }
-       mydata->item_selected_state = false;
+       myaccount_common_set_item_selected_state(false);
 
        ug_destroy(ug);
-       MYACCOUNT_VERBOSE("_myaccount_ug_account_list_destroy_cb : ug callee request kill layout_addaccount=%p\n",
-                                                                                       mydata->layout_addaccount);
+       MYACCOUNT_SLOGD("_myaccount_ug_account_list_destroy_cb");
 #ifndef ENABLE_NOTI
        myaccount_common_handle_notification(NULL);
 #endif
 }
 
-static void __myaccount_ug_launch_signin_view(void *data, myaccount_list_priv *account)
+static void __myaccount_accountlist_set_ug_cbs(struct ug_cbs *cbs,
+                                                                                               myaccount_appdata *priv)
+{
+       if (!cbs || !priv) {
+               MYACCOUNT_ERROR("__myaccount_addaccount_ug_create_email: Invalid param cbs=%p, priv=%p\n",
+                                                               cbs, priv);
+               return;
+       }
+       cbs->layout_cb = _myaccount_ug_account_list_layout_cb;
+       cbs->result_cb = _myaccount_ug_account_list_result_cb;
+       cbs->destroy_cb = _myaccount_ug_account_list_destroy_cb;
+       cbs->priv = (void *)priv;
+}
+
+static void __myaccount_ug_list_call_ug(void *data, myaccount_list_priv *account)
 {
        myaccount_appdata *ad = (myaccount_appdata*)data;
-       service_h service;
-       int ret;
+       MyAccountProviderType sp_type;
+       ui_gadget_h ug = NULL;
+       struct ug_cbs cbs = {0,};
+       app_control_h app_control;
+       __attribute__((__unused__)) int ret = APP_CONTROL_ERROR_NONE;
 
-       if(!account) {
-               MYACCOUNT_ERROR("__myaccount_ug_launch_signin_view : account info NULL\n");
+       if (!account) {
+               MYACCOUNT_ERROR("__myaccount_ug_list_call_ug : account info NULL\n");
                return;
        }
 
-       ret = service_create(&service);
-       MYACCOUNT_INFO("myaccount_ug_launch_signin_view : service_create return = %d!!!\n", ret);
-
-       ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW,
-                                                               strdup(account->package_name),
-                                                               strdup(account->username),
-                                                               "",
-                                                               account->account_id,
-                                                               0,
-                                                               ad);
+       __myaccount_accountlist_set_ug_cbs(&cbs, ad);
+
+       sp_type = myaccount_common_get_provider_type(account->package_name);
+       ret = app_control_create(&app_control);
+
+       switch (sp_type) {
+//     case MYACCOUNT_TYPE_MSN :
+       case MYACCOUNT_TYPE_GOOGLE :
+       case MYACCOUNT_TYPE_OTHER :
+//     case MYACCOUNT_TYPE_FACEBOOK :
+               ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW,
+                                                                       strdup(account->package_name),
+                                                                       strdup(account->username),
+                                                                       "",
+                                                                       account->account_id,
+                                                                       sp_type,
+                                                                       ad);
+               break;
+       case MYACCOUNT_TYPE_EXCHANGE :
+               ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW,
+                                                                       strdup("activesync-ui"),
+                                                                       strdup(account->username),
+                                                                       "",
+                                                                       account->account_id,
+                                                                       sp_type,
+                                                                       ad);
+               break;
+       case MYACCOUNT_TYPE_SAMSUNG :
+               ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW,
+                                                                       strdup("com.samsung.samsung-account-front"),
+                                                                       strdup(account->username),
+                                                                       "",
+                                                                       account->account_id,
+                                                                       sp_type,
+                                                                       ad);
+               break;
+       case MYACCOUNT_TYPE_PICASA :
+       case MYACCOUNT_TYPE_YOUTUBE :
+       default :
+               ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW,
+                                                                       strdup(account->package_name),
+                                                                       strdup(account->username),
+                                                                       "",
+                                                                       account->account_id,
+                                                                       sp_type,
+                                                                       ad);
+               break;
+       }
 
-       MYACCOUNT_INFO("myaccount_ug_launch_signin_view : myaccount_common_launch_signin_view return = %d!!!\n", ret);
+       ad->ug_called = ug;
+       app_control_destroy(app_control);
 
-       service_destroy(service);
 }
 
 static void __myaccount_account_list_gl_sel(void *data,
                                                                                Evas_Object *obj, void *event_info)
 {
        myaccount_appdata *ad = myaccount_get_appdata();
-       if(ad->item_selected_state) {
+       if( myaccount_common_get_item_selected_state() ) {
                elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
                return;
        }
-       ad->item_selected_state = true;
+       myaccount_common_set_item_selected_state(true);
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
 
-       MYACCOUNT_VERBOSE("__myaccount_account_list_gl_sel data=%p, obj=%p, event_info=%p\n",
+       MYACCOUNT_SLOGD("__myaccount_account_list_gl_sel data=%p, obj=%p, event_info=%p\n",
                                                                        data, obj, event_info);
        myaccount_list_priv *account = (myaccount_list_priv*)data;
-       MYACCOUNT_DBUG("__myaccount_account_list_gl_sel : account name : %s\n",
+       MYACCOUNT_SLOGD("__myaccount_account_list_gl_sel : account name : %s\n",
                                                                        account->domain_name);
 
        if (item != NULL)
                elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
-       __myaccount_ug_launch_signin_view((myaccount_appdata*)ad, account);
-
-       MYACCOUNT_VERBOSE("END of __myaccount_account_list_gl_sel\n");
-
+       __myaccount_ug_list_call_ug((myaccount_appdata*)ad, account);
        return;
 }
 
 static void __myaccount_account_list_item_selected(void *data,
                                                                                Evas_Object *obj, void *event_info)
 {
-       MYACCOUNT_VERBOSE("__myaccount_account_list_item_selected \n");
+       //MYACCOUNT_VERBOSE("__myaccount_account_list_item_selected \n");
 }
 
 static void __myaccount_account_list_append_genlist(myaccount_appdata *ad,
                                                                                                                int count)
 {
-       MYACCOUNT_DBUG ("\n count received in __myaccount_account_list_append_genlist = %d \n",
+       MYACCOUNT_SLOGD ("\n count received in __myaccount_account_list_append_genlist = %d \n",
                                                                                count);
-       int index = 0;
-       Elm_Object_Item *it;
        bool supported = false;
 
        if (count > 0) {
-               it = elm_genlist_item_append(ad->account_genlist,
-                                                               &account_list_itc_sep, NULL, NULL,
-                                                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
-               elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-               it = elm_genlist_item_append(ad->account_genlist,
-                                                               &account_list_title_itc, NULL, NULL,
-                                                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
-               elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-               for (index = 0; index < count; index++) {
+               GList* iter;
+               for(iter=ad->sorted_account_list;iter!=NULL;iter=g_list_next(iter)) {
+                       myaccount_list_priv* tmp = (myaccount_list_priv*)iter->data;
                        supported = false;
-                       if (account_info[index].secret == ACCOUNT_SECRECY_VISIBLE) {
+                       if (tmp->secret == ACCOUNT_SECRECY_VISIBLE) {
                                if (ad->capability_filter) {
-                                       GSList* iter;
+                                       GSList* siter;
                                        myaccount_list_priv *acc_info = NULL;
-                                       acc_info = &account_info[index];
-                                       for (iter = acc_info->capablity_list; iter != NULL; iter = g_slist_next(iter)) {
-                                               myaccount_capability_data *cap_data = (myaccount_capability_data*)iter->data;
-                                               if (!strcmp(cap_data->type, ad->capability_filter)) {
+                                       acc_info = tmp;
+
+                                       /* Tizen email exception */
+                                       if(!strcmp("http://tizen.org/account/capability/tizen_email", ad->capability_filter)){
+                                               if(tmp->b_tizen_email) {
                                                        supported = true;
-                                                       break;
+                                               }
+                                       } else {
+                                               for (siter = acc_info->capablity_list; siter != NULL; siter = g_slist_next(siter)) {
+                                                       myaccount_capability_data *cap_data = (myaccount_capability_data*)siter->data;
+
+                                                       if (!strcmp(cap_data->type, ad->capability_filter)) {
+                                                               supported = true;
+                                                               break;
+                                                       }
                                                }
                                        }
+
                                        if (supported) {
-                                               it = elm_genlist_item_append(ad->account_genlist,
+                                               elm_genlist_item_append(ad->account_genlist,
                                                                                &account_list_itc,
-                                                                               (void *)&account_info[index], NULL,
+                                                                               (void *)tmp, NULL,
                                                                                ELM_GENLIST_ITEM_NONE,
                                                                                __myaccount_account_list_gl_sel,
-                                                                               (void *)&account_info[index]);
+                                                                               (void *)tmp);
 
-                                               MYACCOUNT_VERBOSE("genlist item(%p)\n", it);
                                        }
                                } else {
-                                       it = elm_genlist_item_append(ad->account_genlist,
+                                       elm_genlist_item_append(ad->account_genlist,
                                                                        &account_list_itc,
-                                                                       (void *)&account_info[index], NULL,
+                                                                       (void *)tmp, NULL,
                                                                        ELM_GENLIST_ITEM_NONE,
                                                                        __myaccount_account_list_gl_sel,
-                                                                       (void *)&account_info[index]);
-                                       MYACCOUNT_VERBOSE("genlist item(%p)\n", it);
+                                                                       (void *)tmp);
                                }
                        }
                }
 
-               it = elm_genlist_item_append(ad->account_genlist,
-                                                               &account_list_itc_sep_end, NULL, NULL,
-                                                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
-               elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        } else {
                myaccount_addaccount_create_view(ad);
        }
        return;
 }
 
-
 static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void *ei)
 {
        Elm_Object_Item *it = NULL;
        int total_count = 0;
        int index = 0;
-       Evas_Object *ao;
-       char buf[2048]={0,};
-       char bufdomain[2048]={0,};
+//     Evas_Object *ao;
+//     char buf[2048]={0,};
+//     char bufdomain[2048]={0,};
 
        if(!ei) {
                MYACCOUNT_ERROR("Realized event info is NULL!!! \n");
@@ -616,10 +768,10 @@ static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void
        total_count = elm_genlist_items_count(obj);
        index = elm_genlist_item_index_get(it);
 
-       MYACCOUNT_VERBOSE("Total genlist item count(%d)!!! \n", total_count);
        if(index > 2 && index < total_count)
        {
         /*Add account items. index 1 and last are the seperators*/
+               /*
                myaccount_list_priv *account_info_item = (myaccount_list_priv*)elm_object_item_data_get(it);
 
                if(account_info_item){
@@ -642,26 +794,30 @@ static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void
 
                ao = elm_object_item_access_object_get(it);
                elm_access_info_set(ao, ELM_ACCESS_INFO, buf);
+
                }
-       }else {
+               */
+       } else if (index == 2) {
+               //ao = elm_object_item_access_object_get(it);
+               //elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, "Turn Auto Sync on or off");
+    } else if (index == 3) {
+               //ao = elm_object_item_access_object_get(it);
+               //elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, "Below is the list of all logged in accounts");
+       } else {
                /*Remove access for seperators*/
-               elm_object_item_access_unregister(ei);
+               //elm_object_item_access_unregister(ei);
        }
 
        if(total_count <= 4)
        {
-               MYACCOUNT_INFO("DO NOTHING only one account exist, total_count(%d) index(%d) !!! \n", total_count, index);
+               //MYACCOUNT_INFO("DO NOTHING only one account exist, total_count(%d) index(%d) !!! \n", total_count, index);
        } else {
                if (index == 1) {
-                       MYACCOUNT_VERBOSE("DO NOTHING realized (%d) !!! \n", index);
                } else if (index == 2) {
-                       MYACCOUNT_VERBOSE("TOP realized (%d) !!! \n", index);
                        elm_object_item_signal_emit(ei, "elm,state,top", "");
                } else if (index == (total_count-2)) {
-                       MYACCOUNT_VERBOSE("BOTTOM realized (%d) item count (%d) !!! \n", index, total_count);
                        elm_object_item_signal_emit(ei, "elm,state,bottom", "");
                } else  {
-                       MYACCOUNT_VERBOSE("CENTER realized (%d) !!! \n", index);
                        elm_object_item_signal_emit(ei, "elm,state,center", "");
                }
        }
@@ -678,34 +834,14 @@ static Evas_Object *__myaccount_account_list_create_genlist(
        }
 
        int account_count = 0;
-       account_count = __myaccount_account_list_populate_account_info();
+       account_count = __myaccount_account_list_populate_account_info(ad);
 
-       account_list_itc.item_style = "dialogue/2text.2icon.3";
+       account_list_itc.item_style = "2line.top";
        account_list_itc.func.text_get = __myaccount_account_list_gl_label_get;
        account_list_itc.func.content_get = __myaccount_account_list_gl_icon_get;
        account_list_itc.func.state_get = NULL;
        account_list_itc.func.del = NULL;
 
-       account_list_title_itc.item_style = "dialogue/title";
-       account_list_title_itc.func.text_get = __myaccount_account_list_title_get;
-       account_list_title_itc.func.content_get = NULL;
-       account_list_title_itc.func.state_get = NULL;
-       account_list_title_itc.func.del = NULL;
-
-       /*to add 40 pixel separator*/
-       account_list_itc_sep.item_style = "dialogue/separator";
-       account_list_itc_sep.func.text_get = NULL;
-       account_list_itc_sep.func.content_get = NULL;
-       account_list_itc_sep.func.state_get = NULL;
-       account_list_itc_sep.func.del = NULL;
-
-       /*to add 40 pixel list end separator*/
-       account_list_itc_sep_end.item_style = "dialogue/separator/end";
-       account_list_itc_sep_end.func.text_get = NULL;
-       account_list_itc_sep_end.func.content_get = NULL;
-       account_list_itc_sep_end.func.state_get = NULL;
-       account_list_itc_sep_end.func.del = NULL;
-
        ad->account_genlist = genlist = elm_genlist_add(ad->navi_bar);
        evas_object_smart_callback_add(genlist, "realized", _myaccount_ug_account_gl_realized, NULL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -716,22 +852,110 @@ static Evas_Object *__myaccount_account_list_create_genlist(
                                        __myaccount_account_list_item_selected,
                                        (myaccount_appdata*) ad);
 
-       MYACCOUNT_VERBOSE("\n account count = %d\n", account_count);
-
        __myaccount_account_list_append_genlist(ad, account_count);
 
-       MYACCOUNT_VERBOSE("END of __myaccount_account_list_create_genlist\n");
        return genlist;
 }
 
+static void __move_more_ctxpopup(myaccount_appdata *ad)
+{
+       MYACCOUNT_DBUG("__move_more_ctxpopup");
+
+       Evas_Coord w = 0;
+       Evas_Coord h = 0;
+
+       elm_win_screen_size_get(ad->win_main, NULL, NULL, &w, &h);
+       int pos = elm_win_rotation_get(ad->win_main);
+
+       switch (pos) {
+               case 0:
+               case 180:
+                        evas_object_move(ad->popup, (w / 2), h);
+                       break;
+               case 90:
+                       evas_object_move(ad->popup,  (h / 2), w);
+                       break;
+               case 270:
+                       evas_object_move(ad->popup, (h / 2), w);
+                       break;
+       }
+
+
+}
+
+static void __rotate_more_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       MYACCOUNT_DBUG("__rotate_more_ctxpopup_cb");
+       myaccount_appdata *ad = data;
+
+       __move_more_ctxpopup(ad);
+}
+static void _delete_ctxpopup_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       MYACCOUNT_DBUG("_delete_toolbar_ctxpopup_cb");
+       myaccount_appdata *ad = data;
+       if (elm_win_wm_rotation_supported_get(ad->win_main)) {
+               if (ad->popup) {
+                       evas_object_smart_callback_del(elm_object_top_widget_get(ad->popup), "wm,rotation,changed", __rotate_more_ctxpopup_cb);
+               }
+       }
+       if (ad->popup) {
+               ea_object_event_callback_del(ad->popup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb);
+               ea_object_event_callback_del(ad->popup, EA_CALLBACK_MORE, ea_ctxpopup_back_cb);
+               evas_object_event_callback_del(ad->popup, EVAS_CALLBACK_DEL, _delete_ctxpopup_cb);
+       }
+}
+
+static void __create_more_ctxpopup(myaccount_appdata *ad)
+{
+       MYACCOUNT_DBUG("__create_more_ctxpopup");
+
+       Evas_Object *popup = elm_ctxpopup_add(ad->navi_bar);
+       ad->popup = popup;
+
+       elm_object_style_set(popup, "more/default");
+       elm_ctxpopup_auto_hide_disabled_set(popup, EINA_TRUE);
+       if (elm_win_wm_rotation_supported_get(ad->win_main)) {
+               evas_object_smart_callback_add(elm_object_top_widget_get(popup), "wm,rotation,changed", __rotate_more_ctxpopup_cb, ad);
+       }
+       evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _delete_ctxpopup_cb, ad);
+       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb, popup);
+    ea_object_event_callback_add(popup, EA_CALLBACK_MORE, ea_ctxpopup_back_cb, popup);
+
+       elm_ctxpopup_item_append(popup, dgettext(MA_UG_NAME,"IDS_PB_BODY_ADD_ACCOUNT"), NULL, __myaccount_account_list_addaccount_cb, ad);
+
+       elm_ctxpopup_direction_priority_set(popup, ELM_CTXPOPUP_DIRECTION_UP,
+                                               ELM_CTXPOPUP_DIRECTION_LEFT,
+                                               ELM_CTXPOPUP_DIRECTION_RIGHT,
+                                               ELM_CTXPOPUP_DIRECTION_DOWN);
+
+       __move_more_ctxpopup(ad);
+       evas_object_show(popup);
+}
+
+static void __delete_more_cb(void *data)
+{
+       MYACCOUNT_DBUG("__delete_more_cb");
+       myaccount_appdata *ad = data;
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+}
+
+static void __more_cb(void *data, Elm_Object_Item *it, const char *emission, const char *source)
+{
+       MYACCOUNT_DBUG("__more_cb");
+       myaccount_appdata *ad = data;
+       __delete_more_cb(data);
+       __create_more_ctxpopup(ad);
+}
+
 void myaccount_ug_account_list_create(void *data)
 {
-       MYACCOUNT_VERBOSE("\n myaccount_ug_account_list_create called !!\n");
        myaccount_appdata *ad = data;
        Evas_Object *genlist = NULL;
        Evas_Object *layout;
-       Evas_Object *l_button;
-       Evas_Object *btn;
 
        if (ad == NULL) {
                MYACCOUNT_ERROR("myaccount_ug_account_list_create myaccount_appdata is null\n");
@@ -740,52 +964,41 @@ void myaccount_ug_account_list_create(void *data)
 
        layout = elm_layout_add(ad->navi_bar);
        elm_layout_file_set(layout,
-                                       "/usr/ug/res/edje/ug-setting-myaccount-efl/myaccount.edj",
+                                       "/usr/apps/setting-myaccount-efl/res/edje/setting-myaccount-efl/myaccount.edj",
                                        "account_list");
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set( layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
        edje_object_signal_emit(_EDJ(layout), "elm,state,show,content", "elm");
-       //edje_object_signal_emit(_EDJ(layout), "elm,bg,show,group_list", "elm");
        elm_object_style_set(ad->bg, "group_list");
+
        evas_object_show(layout);
 
        genlist = __myaccount_account_list_create_genlist(ad);
 
        elm_object_part_content_set (layout, "accountlist.genlist", genlist);
-       ad->l_title_sk = l_button = elm_button_add(ad->navi_bar);
-       evas_object_smart_callback_add(l_button, "clicked",
-                                       myaccount_account_list_quit_cb,
-                                       ad);
-       elm_object_style_set(l_button , "naviframe/back_btn/default");
-       ad->navi_it = elm_naviframe_item_push(ad->navi_bar,
+
+       ad->nf_it = elm_naviframe_item_push(ad->navi_bar,
                                                        dgettext(MA_UG_NAME,
-                                                       "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"),
-                                                       l_button, NULL, layout, NULL);
-       btn = elm_button_add(ad->navi_bar);
-       if (!btn) {
-               MYACCOUNT_ERROR("myaccount_ug_account_list_create elm_button_add FAIL\n");
-               return;
-       }
-       elm_object_style_set(btn, "naviframe/toolbar/default");
-       elm_object_text_set(btn, dgettext(MA_UG_NAME,
-                                       "IDS_COM_SK_ADD_LITE"));
-       evas_object_smart_callback_add(btn, "clicked",
-                                       __myaccount_account_list_addaccount_cb,
-                                       ad);
+                                                       "IDS_ST_BODY_ACCOUNT_LIST"),
+                                                       NULL, NULL, layout, NULL);
+       elm_naviframe_item_pop_cb_set(ad->nf_it, myaccount_account_list_quit_cb, (void*)ad);
 
-       elm_object_item_part_content_set(ad->navi_it, "toolbar_button1", btn);
+       int count = 0;
+       count = myaccount_common_get_account_type_count(ad->capability_filter);
+
+       MYACCOUNT_DBUG("TOTAL avaiable sp count %d\n", count);
+
+       ea_object_event_callback_add(ad->navi_bar, EA_CALLBACK_MORE, ea_naviframe_more_cb, NULL);
+       elm_object_item_signal_callback_add(ad->nf_it, "elm,action,more_event", "", __more_cb, ad);
 
-       MYACCOUNT_VERBOSE("END of myaccount_ug_account_list_create\n");
 }
 
 static Evas_Object *__myaccount_account_list_create_bg(Evas_Object *parent)
 {
-       MYACCOUNT_VERBOSE("START of __myaccount_account_list_create_bg ");
        Evas_Object *bg = elm_bg_add(parent);
        evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       elm_win_resize_object_add(parent, bg);
+       //elm_win_resize_object_add(parent, bg);
        evas_object_show(bg);
-       MYACCOUNT_VERBOSE("END of __myaccount_account_list_create_bg ");
     return bg;
 }
 
@@ -794,7 +1007,6 @@ static Evas_Object *__myaccount_account_list_create_main_layout(
                                                                                                        Evas_Object *bg)
 {
        Evas_Object *layout;
-       MYACCOUNT_VERBOSE("START of __myaccount_account_list_create_main_layout ");
 
        layout = elm_layout_add(parent);
        elm_layout_theme_set(layout, "layout", "application", "default");
@@ -802,8 +1014,8 @@ static Evas_Object *__myaccount_account_list_create_main_layout(
        edje_object_signal_emit(_EDJ(layout), "elm,state,show,indicator", "elm");
        edje_object_signal_emit(_EDJ(layout), "elm,state,show,content", "elm");
        elm_object_part_content_set ( layout, "elm.swallow.bg", bg);
+
        evas_object_show( layout );
-       MYACCOUNT_VERBOSE("END of __myaccount_account_list_create_main_layout ");
 
        return layout;
 }
@@ -812,27 +1024,30 @@ static Evas_Object *__myaccount_account_list_create_navi_layout(
                                                                                                                        Evas_Object *parent)
 {
        Evas_Object *navi_bar;
-       MYACCOUNT_VERBOSE("START of __myaccount_account_list_create_navi_layout ");
 
        navi_bar = elm_naviframe_add(parent);
        elm_object_part_content_set ( parent, "elm.swallow.content", navi_bar );
        evas_object_show(navi_bar);
-       MYACCOUNT_VERBOSE("END of __myaccount_account_list_create_navi_layout ");
 
        return navi_bar;
 }
 
 static void __myaccount_account_list_init_main_view(myaccount_appdata *ad)
 {
-       elm_win_indicator_mode_set(ad->win_main, ELM_WIN_INDICATOR_SHOW);
+       //elm_win_indicator_mode_set(ad->win_main, ELM_WIN_INDICATOR_SHOW);
        ad->bg = __myaccount_account_list_create_bg(ad->win_main);
-       ad->layout_main = __myaccount_account_list_create_main_layout(ad->win_main,
-                                                                                                                               ad->bg);
+       ad->layout_main = __myaccount_account_list_create_main_layout(ad->win_main, ad->bg);
+//     ea_theme_object_style_set(ad->layout_main, EA_THEME_STYLE_DARK);
+//     ea_theme_object_style_set(ad->layout_main, EA_THEME_STYLE_LIGHT);
+
        ad->base = ad->layout_main;
+}
+
+void myaccount_list_navi_create(myaccount_appdata *ad)
+{
        ad->navi_bar = __myaccount_account_list_create_navi_layout(ad->layout_main);
 
-       MYACCOUNT_VERBOSE("END of __myaccount_account_list_init_main_view : %p\n",
-                                                                                                                               ad->navi_bar);
+       ea_object_event_callback_add(ad->navi_bar, EA_CALLBACK_BACK, myaccount_account_list_back_key_cb, (void*)ad);
 }
 
 void myaccount_list_view_create(myaccount_appdata *priv)
@@ -844,8 +1059,7 @@ void myaccount_list_view_create(myaccount_appdata *priv)
        cbs.destroy_cb = _myaccount_ug_account_list_destroy_cb;
        cbs.priv = (void *)priv;
 
-       MYACCOUNT_VERBOSE("\n !!!!! myaccount_list_view_create !!!!! \n");
-
+       MYACCOUNT_DBUG("Account list start\n");
        __myaccount_account_list_init_main_view(priv);
 }
 
@@ -853,25 +1067,24 @@ void myaccount_list_refresh_item_list(myaccount_appdata *ad)
 {
        int count = 0;
 
-       MYACCOUNT_DBUG("START\n");
-
        if(!ad) {
-               MYACCOUNT_FATAL("no appdata!\n");
+               MYACCOUNT_ERROR("no appdata!\n");
                return;
        }
 
+       if(!ad->account_genlist) {
+               MYACCOUNT_ERROR("no genlist!\n");
+               return;
+       }
+
+       MYACCOUNT_DBUG("Account list start\n");
+
        elm_genlist_clear(ad->account_genlist);
 
-       MYACCOUNT_DBUG("Account list removed completely!\n");
-       if(account_info) {
-               if (account_info->capablity_list) {
-                       g_slist_free(account_info->capablity_list);
-                       account_info->capablity_list = NULL;
-               }
-       }
-       MA_MEMFREE(account_info);
+       myaccount_account_list_free_priv_data(ad);
+
        account_index = 0;
-       count = __myaccount_account_list_populate_account_info();
+       count = __myaccount_account_list_populate_account_info(ad);
 
        __myaccount_account_list_append_genlist(ad, count);
 
index 57b903c..da90765 100755 (executable)
@@ -1,17 +1,22 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ *  my-account
  *
- * Licensed under the Flora License, Version 1.1 (the License);
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
+ *
+ * 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://floralicense.org/license/
+ * 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,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
 #ifndef UG_MODULE_API
@@ -22,7 +27,6 @@
 #include "myaccount_ug_addaccount.h"
 #include "myaccount_ug_account_list.h"
 #include <app.h>
-#include <vconf.h>
 #include <app_manager.h>
 #include <system_settings.h>
 #include <iniparser.h>
 #define SORT_PRIOR_1 "1_"
 #define SORT_PRIOR_2 "2_"
 #define SORT_PRIOR_3 "3_"
-#define TIZEN_EMAIL_APPID "email-setting-efl"
-
-#define TIZEN_EMAIL_CSC_FILE_PATH "/opt/system/csc-default/data/csc-default-data-email-account.ini"
-#define TIZEN_EMAIL_CSC_SP_COUNT_KEY "email_account:count"
-#define TIZEN_EMAIL_CSC_SP_NAME_PREFIX "email_account:name_"
 
 static Elm_Genlist_Item_Class addacc_list_itc;
-#ifndef ENABLE_HELP
-static Elm_Genlist_Item_Class addacc_list_itc_sep;
-#endif
-static Elm_Genlist_Item_Class addacc_list_itc_sep_end;
 
 static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h account_type, void *user_data);
 
-
-#ifdef ENABLE_HELP
-static char *__myaccount_add_account_help_label_get(void *data,
-                                                                                       Evas_Object *obj, const char *part)
-{
-       return NULL;
-}
-
-static Evas_Object *__myaccount_add_account_help_icon_get(void *data,
-                                                                                       Evas_Object *obj, const char *part)
-{
-       Evas_Object *eohelp = NULL;
-       MYACCOUNT_VERBOSE("myaccount_ug_account_list : help_get data=%p, obj=%p, part=%s \n",
-                                       data, obj, part);
-       eohelp = elm_label_add(obj);
-       evas_object_size_hint_weight_set(eohelp, EVAS_HINT_EXPAND, 0.0);
-       evas_object_size_hint_align_set(eohelp, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_label_line_wrap_set(eohelp, ELM_WRAP_WORD);
-       char buf[512];
-       memset(buf, 0, 512);
-       MA_SNPRINTF(buf, 511, "%s%s%s", "<font_size=41><color=#000000FF><align=center>",
-               dgettext(MA_UG_NAME,
-               "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"),
-               "</align></color></font_size>");
-       elm_object_text_set(eohelp, buf);
-       return eohelp;
-}
-
-static Eina_Bool __myaccount_add_account_help_state_get(void *data,
-                                                                                       Evas_Object *obj, const char *part)
-{
-       return EINA_FALSE;
-}
-
-static Elm_Genlist_Item_Class help_itc = { ELM_GENGRID_ITEM_CLASS_VERSION, 0, 0,
-       "1icon", NULL, NULL,
-       { __myaccount_add_account_help_label_get,
-       __myaccount_add_account_help_icon_get,
-       __myaccount_add_account_help_state_get,
-       NULL }
-};
-#endif
-
 static char *__myaccount_addaccount_gl_label_get(void *data,
                                                                                        Evas_Object *obj, const char *part)
 {
        addaccount_list_priv *service = (addaccount_list_priv*)data;
        char buf[2048]={0,};
 
-       if (!strcmp(part, "elm.text") || !strcmp(part, "elm.text.2")) {
-
+       if (!strcmp(part, "elm.text.main.left")) {
                int value = -1;
+               char *tmp_sp_name = NULL;
+
                system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, &value);
 
+               tmp_sp_name = elm_entry_utf8_to_markup(service->service_name);
+
                if(!strcmp(service->service_name, dgettext(MA_UG_NAME, "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"))
                        && value == SYSTEM_SETTINGS_FONT_SIZE_NORMAL) {
 
-                       sprintf(buf, "<font_size=%d>%s</font_size>", 39, service->service_name);
+                       if(tmp_sp_name){
+                               sprintf(buf, "<font_size=%d>%s</font_size>", 37, tmp_sp_name);
+                               MA_MEMFREE(tmp_sp_name);
+                       }
                        return strdup(buf);
-
                } else {
-                       return strdup(service->service_name);
+                       return tmp_sp_name;
                }
        }
 
@@ -115,7 +72,6 @@ static char *__myaccount_addaccount_gl_label_get(void *data,
 bool myaccount_add_account_by_package_name_cb(account_h account,
                                                                                                        void *user_data)
 {
-       MYACCOUNT_VERBOSE("myaccount_add_account_already_exist_account_cb");
        return false;
 }
 
@@ -128,27 +84,58 @@ static void __myaccount_addaccount_gl_sel(void *data,
        char email_sp[64] = {0,};
 
        if(!ad) {
-               MYACCOUNT_FATAL("__myaccount_account_list_gl_sel appdata is NULL\n");
+               MYACCOUNT_ERROR("__myaccount_account_list_gl_sel appdata is NULL\n");
                return;
        }
 
-#if 0
-       if(ad->item_selected_state) {
+       MYACCOUNT_DBUG("ad->item_selected_state=%d\n",  myaccount_common_get_item_selected_state());
+
+       if( myaccount_common_get_item_selected_state() ) {
                elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
                return;
        }
-#endif
-       ad->item_selected_state = true;
 
-       MYACCOUNT_VERBOSE("__myaccount_account_list_gl_sel START\n");
+       myaccount_common_set_item_selected_state(true);
 
        if (item != NULL) {
                elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
-               MYACCOUNT_VERBOSE("service->package_name = %s \n ",
-                                                       service->package_name);
-
                switch(service->sp_type) {
+                       case MYACCOUNT_TYPE_PICASA :
+                       case MYACCOUNT_TYPE_YOUTUBE :
+//                     case MYACCOUNT_TYPE_FACEBOOK :
+                       case MYACCOUNT_TYPE_EXCHANGE :
+                               myaccount_common_launch_application(
+                                               MYACCOUNT_REQUEST_SIGNIN,
+                                               strdup(service->package_name),
+                                               NULL,
+                                               email_sp,
+                                               -1,
+                                               service->sp_type,
+                                               ad);
+                               break;
+                       case MYACCOUNT_TYPE_GOOGLE :
+                               MA_SNPRINTF(email_sp, sizeof(email_sp), "%s", "gmail");
+                               myaccount_common_launch_application(
+                                               MYACCOUNT_REQUEST_SIGNIN,
+                                               strdup(service->package_name),
+                                               NULL,
+                                               email_sp,
+                                               -1,
+                                               service->sp_type,
+                                               ad);
+                               break;
+//                     case MYACCOUNT_TYPE_MSN :
+//                             MA_SNPRINTF(email_sp, sizeof(email_sp), "%s", "msn");
+//                             myaccount_common_launch_application(
+//                                             MYACCOUNT_REQUEST_SIGNIN,
+//                                             strdup(service->package_name),
+//                                             NULL,
+//                                             email_sp,
+//                                             service->sp_type,
+//                                             -1,
+//                                             ad);
+//                             break;
                        case MYACCOUNT_TYPE_OTHER:
                                MA_SNPRINTF(email_sp, sizeof(email_sp), "%s", "others");
                                myaccount_common_launch_application(
@@ -162,7 +149,6 @@ static void __myaccount_addaccount_gl_sel(void *data,
                                break;
                        case MYACCOUNT_TYPE_CSC:
                                MA_SNPRINTF(email_sp, sizeof(email_sp), "%s", service->service_name);
-                               MYACCOUNT_ERROR("CSC sp name (%s)\n", email_sp);
                                myaccount_common_launch_application(
                                                MYACCOUNT_REQUEST_SIGNIN,
                                                strdup(service->package_name),
@@ -180,14 +166,13 @@ static void __myaccount_addaccount_gl_sel(void *data,
                                                        "",
                                                        -1,
                                                        service->sp_type,
-                                                       ad) != SERVICE_ERROR_NONE ) {
+                                                       ad) != APP_CONTROL_ERROR_NONE ) {
                                        MYACCOUNT_ERROR("__myaccount_addaccount_gl_sel : Failed to launch application\n");
-                                       ad->item_selected_state = false;
+                                       myaccount_common_set_item_selected_state(false);
 
                                }
                                break;
                }
-
        }
        return;
 }
@@ -199,26 +184,32 @@ static Evas_Object *__myaccount_addaccount_icon_get( void *data,
        char tempbuf[PATH_MAX];
        Evas_Object *icon = NULL;
        addaccount_list_priv *service_item = (addaccount_list_priv*)data;
+       Evas_Object *ic = NULL;
 
-    if (!service_item) {
+       if (!service_item) {
                MYACCOUNT_ERROR(" __myaccount_addaccount_icon_get: Data is NULL\n");
                return NULL;
        }
        memset(tempbuf, 0, sizeof(char)*PATH_MAX);
-       if (!strcmp(part, "elm.photo") || !strcmp(part, "elm.icon")) {
+
+       if (!strcmp(part, "elm.icon.1")) {
                if (strlen(service_item->icon_path) > 0) {
                        MA_STRNCPY(tempbuf, service_item->icon_path, sizeof(tempbuf));
                } else {
-                       MA_STRNCPY(tempbuf, "99_email.png", sizeof(tempbuf));
+                       MA_STRNCPY(tempbuf, "A01_2_Icon_default.png", sizeof(tempbuf));
                }
+               ic = elm_layout_add(obj);
+               elm_layout_theme_set(ic, "layout", "list/B/type.2", "default");
+
+               icon = elm_image_add(obj);
+               if (strstr(tempbuf, "/"))
+                       elm_image_file_set(icon, tempbuf, NULL);
+               else
+                       elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf);
+
+               elm_layout_content_set(ic, "elm.swallow.content", icon);
        }
-       icon = elm_icon_add(obj);
-       if (strstr(tempbuf, "/"))
-               elm_image_file_set(icon, tempbuf, NULL);
-       else
-               elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf);
-       evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-       return icon;
+       return ic;
 }
 
 void myaccount_addaccount_free_priv_data(myaccount_appdata *appdata)
@@ -226,30 +217,17 @@ void myaccount_addaccount_free_priv_data(myaccount_appdata *appdata)
        GList* it = NULL;
        myaccount_appdata *ad = (myaccount_appdata *)appdata;
 
-       MYACCOUNT_INFO("addaccount priv data free START\n");
-
        if(!ad) {
                MYACCOUNT_ERROR("No appdata!!\n");
                return;
        }
 
-       MYACCOUNT_INFO("ad->sorted_sp_list(%p)\n", ad->sorted_sp_list);
-       MYACCOUNT_INFO("ad->sp_info_list(%p)\n", ad->sp_info_list);
-
        for(it=ad->sorted_sp_list;it!=NULL;it=g_list_next(it)) {
                addaccount_list_priv* tmp = (addaccount_list_priv*)it->data;
                MA_MEMFREE(tmp);
        }
 
-       if(ad->sp_info_list) {
-               g_list_free(ad->sp_info_list);
-               ad->sp_info_list = NULL;
-       }
-
        ad->sorted_sp_list = NULL;
-
-       MYACCOUNT_INFO("addaccount priv data free END\n");
-
 }
 
 static addaccount_list_priv*
@@ -258,41 +236,13 @@ _myaccount_addaccount_create_priv_item()
        addaccount_list_priv* sp_info = NULL;
        sp_info = (addaccount_list_priv*)calloc(1,sizeof(addaccount_list_priv));
        if(!sp_info) {
-               MYACCOUNT_FATAL("memory allocation fail\n");
+               MYACCOUNT_ERROR("memory allocation fail\n");
+               return NULL;
        }
+       memset(sp_info, 0x00, sizeof(addaccount_list_priv));
        return sp_info;
 }
 
-static bool _myaccount_addaccount_get_service_label_cb(char* app_id, char* label, char* locale, void *user_data)
-{
-       addaccount_list_priv** sp_info = (addaccount_list_priv**)user_data;
-
-       if(!app_id) {
-               MYACCOUNT_ERROR(" account type label app_id is null app_id=%p\n", app_id);
-               return FALSE;
-       }
-
-       if(!label) {
-               MYACCOUNT_ERROR(" account type label label is null label=%p\n", label);
-               return FALSE;
-       }
-
-       //TODO. consider system laungage setting considering between slp and osp
-
-       if(*sp_info) {
-               MA_STRNCPY((*sp_info)->service_name, label,
-                                                       sizeof((*sp_info)->service_name));
-               MA_SNPRINTF((*sp_info)->service_sname,
-                                                       sizeof((*sp_info)->service_sname), "%s%s", SORT_PRIOR_3, (*sp_info)->service_name);
-       } else {
-               MYACCOUNT_INFO("(*sp_info) is null (%p)\n", (*sp_info));
-       }
-
-       MYACCOUNT_INFO("account type label:: appid(%s), label(%s), name(%s)\n", app_id, label, (*sp_info)->service_name);
-
-       return TRUE;
-}
-
 static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h account_type, void *user_data)
 {
        GList **service_info_list = (GList **)user_data;
@@ -307,6 +257,11 @@ static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h accoun
 
        sp_info = _myaccount_addaccount_create_priv_item();
 
+       if(sp_info == NULL) {
+               MYACCOUNT_ERROR(" sp_info is NULL \n");
+               return FALSE;
+       }
+
        ret = account_type_get_app_id(account_type, &type_buf);
        if(ret == ACCOUNT_ERROR_NONE ) {
                if(type_buf) {
@@ -320,24 +275,64 @@ static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h accoun
        }
        MA_MEMFREE(type_buf);
 
+       myaccount_appdata* ad = NULL;
+       ad = myaccount_get_appdata();
+
+       if(ad) {
+               if(ad->called_from && !strcmp(ad->called_from, "setup_wizard")){
+                       MYACCOUNT_ERROR("FROM SETUP WIZARD\n");
+                       if(!strcmp(sp_info->package_name, SAMSUNG_ACCOUNT_APPID)) {
+                               MA_MEMFREE(sp_info);
+                               return TRUE;
+                       } else if(!strcmp(sp_info->package_name, TIZEN_ACCOUNT_APPID)) {
+                               MA_MEMFREE(sp_info);
+                               return TRUE;
+                       }
+               }
+       } else {
+               MYACCOUNT_ERROR("app data is null\n");
+       }
+
        if(!strcmp(sp_info->package_name, "email-setting-efl")) {
-               //MYACCOUNT_INFO("Samsung account exception\n");
                MA_MEMFREE(sp_info);
-               /* Other email */
+               /* SLP email */
                sp_info = _myaccount_addaccount_create_priv_item();
                MA_STRNCPY(sp_info->service_name,
-                                       dgettext(MA_UG_NAME, "IDS_PB_BODY_OTHER_EMAILS"),
+                                       dgettext(MA_UG_NAME, "IDS_COM_BODY_EMAIL"),
                                        sizeof(sp_info->service_name));
                MA_SNPRINTF(sp_info->service_sname, sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_3, sp_info->service_name);
                MA_STRNCPY(sp_info->package_name,
                                        "email-setting-efl",
                                        sizeof(sp_info->package_name));
-               myaccount_common_get_icon_by_name("others",
-                                       sp_info->icon_path);
+               //myaccount_common_get_icon_by_name("email",
+               //                      sp_info->icon_path);
+
+               ret = account_type_get_icon_path(account_type, &type_buf);
+               if(ret == ACCOUNT_ERROR_NONE ) {
+                       if(type_buf) {
+                               MA_STRNCPY(sp_info->icon_path, type_buf,
+                                                                       sizeof(sp_info->icon_path));
+                       } else {
+                               MYACCOUNT_ERROR("No icon path available\n");
+                       }
+               } else {
+                       MYACCOUNT_ERROR("account_type_get_app_id return(%x)\n", ret);
+               }
+               MA_MEMFREE(type_buf);
+
                sp_info->sp_type = MYACCOUNT_TYPE_OTHER;
                sp_info->b_tizen_email = TRUE;
                *service_info_list = g_list_append(*service_info_list, (void*)sp_info);
                return TRUE;
+
+       } else if(!strcmp(sp_info->package_name, "activesync-ui")) {
+               sp_info->b_tizen_email = TRUE;
+       } else if(!strcmp(sp_info->package_name, "com.samsung.rcs-im")
+                               || !strcmp(sp_info->package_name, "ims-service")) {
+               MA_MEMFREE(sp_info);
+               return TRUE;
+       } else if(!strcmp(sp_info->package_name, GOOGLE_ACCOUNT_APPID)) {
+               sp_info->b_tizen_email = TRUE;
        }
 
        ret = account_type_get_icon_path(account_type, &type_buf);
@@ -353,15 +348,48 @@ static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h accoun
        }
        MA_MEMFREE(type_buf);
 
-       account_type_get_label(account_type,_myaccount_addaccount_get_service_label_cb, &sp_info);
+       char* provider_name = NULL;
+
+       if(ad && ad->current_language){
+
+               if(!strcmp(ad->current_language, "en_US")){
+                       ret = account_type_get_label_by_locale(account_type, "en_GB", &provider_name);
+               }else{
+                       ret = account_type_get_label_by_locale(account_type, ad->current_language, &provider_name);
+               }
+       }
+
+       if(ret != ACCOUNT_ERROR_NONE){
+               /* fallback scenario */
+               ret = account_type_get_label_by_locale(account_type, "default", &provider_name);
+               if(ret != ACCOUNT_ERROR_NONE){
+                       MYACCOUNT_SLOGE("No service name(%s)\n", sp_info->package_name);
+                       MA_MEMFREE(sp_info);
+                       return TRUE;
+               }
+       }
+
+       MA_STRNCPY(sp_info->service_name, provider_name,
+                                               sizeof(sp_info->service_name));
+
+       MA_MEMFREE(provider_name);
+
+       if(!strcmp(sp_info->package_name, SAMSUNG_ACCOUNT_APPID)) {
+               MA_SNPRINTF(sp_info->service_sname,
+                                                       sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_1, sp_info->service_name);
+       } else if(!strcmp(sp_info->package_name, TIZEN_ACCOUNT_APPID)){
+               MA_SNPRINTF(sp_info->service_sname,
+                                                       sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_1, sp_info->service_name);
+       } else {
+               MA_SNPRINTF(sp_info->service_sname,
+                                                       sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_3, sp_info->service_name);
+       }
 
        account_type_get_multiple_account_support(account_type, &type_int);
        sp_info->multiple_account_support = type_int;
-       MYACCOUNT_INFO(" account type multiple account support (%d) \n", type_int);
 
        if(type_int == FALSE
                && account_query_account_by_package_name(myaccount_add_account_by_package_name_cb, sp_info->package_name, NULL) == ACCOUNT_ERROR_NONE) {
-               MYACCOUNT_ERROR("Multiple account not support (%s)\n", sp_info->package_name);
                MA_MEMFREE(sp_info);
                return TRUE;
        }
@@ -373,77 +401,33 @@ static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h accoun
 
 static void _myaccount_addaccount_get_account_type_info(const char* capability_filter, GList** sp_info_list)
 {
+       int ret = -1;
        if(!sp_info_list) {
                MYACCOUNT_ERROR("sp_info_list is null\n");
                return;
        }
 
-       account_connect();
+       ret = account_connect();
+       if(ret != ACCOUNT_ERROR_NONE){
+               MYACCOUNT_ERROR("account database cannot be connected\n");
+               return;
+       }
+
        if(capability_filter) {
-               MYACCOUNT_DBUG("capability filter requested (%s)\n", capability_filter);
-               if(!strcmp(capability_filter, ACCOUNT_SUPPORTS_CAPABILITY_TIZEN_EMAIL)){
-                       account_type_query_by_provider_feature(_myaccount_addaccount_get_account_type_info_cb, ACCOUNT_SUPPORTS_CAPABILITY_EMAIL, (void*)sp_info_list);
+               if(!strcmp(capability_filter, "http://tizen.org/account/capability/tizen_email")){
+                       account_type_query_by_provider_feature(_myaccount_addaccount_get_account_type_info_cb, "http://tizen.org/account/capability/email", (void*)sp_info_list);
                }else {
-               account_type_query_by_provider_feature(_myaccount_addaccount_get_account_type_info_cb, capability_filter, (void*)sp_info_list);
-       }
+                       account_type_query_by_provider_feature(_myaccount_addaccount_get_account_type_info_cb, capability_filter, (void*)sp_info_list);
+               }
        }
        else {
-               MYACCOUNT_DBUG("get all account type requested \n");
                account_type_foreach_account_type_from_db(_myaccount_addaccount_get_account_type_info_cb, (void*)sp_info_list);
        }
-       account_disconnect();
-}
-
-static bool _myaccount_addaccount_get_csc_sp_list(GList** sp_info_list)
-{
-       addaccount_list_priv* sp_info = NULL;
-       dictionary* dic = NULL;
-       int i = 0;
-       int sp_count = -1;
-       char* sp_name = NULL;
-
-       MYACCOUNT_DBUG("START csc splist\n");
-       // check ini file /opt/system/csc-default/data/csc-default-data-email-account.ini
-       dic = iniparser_load(TIZEN_EMAIL_CSC_FILE_PATH);
-       if(!dic){
-               MYACCOUNT_ERROR("email csc file is not exist\n");
-               return FALSE;
-       }
-
-       sp_count = iniparser_getint(dic, TIZEN_EMAIL_CSC_SP_COUNT_KEY, 0);
-       MYACCOUNT_DBUG("key (%s), sp count (%d)\n", TIZEN_EMAIL_CSC_SP_COUNT_KEY, sp_count);
-
-       if(sp_count <= 0) {
-               iniparser_freedict(dic);
-               MYACCOUNT_ERROR("email sp count 0\n");
-               return FALSE;
-       }
-
-       //email ini key index is started from 1
-       for(i=1;i<=sp_count;i++) {
-               char buf[256] = {0,};
-               sp_info = _myaccount_addaccount_create_priv_item();
-               MA_SNPRINTF(buf,sizeof(buf),"%s%d", TIZEN_EMAIL_CSC_SP_NAME_PREFIX, i);
-               sp_name = iniparser_getstr(dic, buf);
-               MYACCOUNT_DBUG("key (%s), sp_name (%s)\n", buf, sp_name);
-               MA_STRNCPY(sp_info->service_name, sp_name,
-                                                       sizeof(sp_info->service_name));
-               MA_SNPRINTF(sp_info->service_sname, sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_3, sp_info->service_name);
-               MA_STRNCPY(sp_info->package_name, "email-setting-efl",
-                                       sizeof(sp_info->package_name));
-
-               sp_info->sp_type = MYACCOUNT_TYPE_CSC;
-               sp_info->b_tizen_email = TRUE;
-               sp_info->multiple_account_support = TRUE;
-
-               *sp_info_list = g_list_append(*sp_info_list, (void*)sp_info);
+       ret = account_disconnect();
+       if(ret != ACCOUNT_ERROR_NONE){
+               MYACCOUNT_ERROR("account database cannot be connected\n");
+               return;
        }
-
-       iniparser_freedict(dic);
-
-       MYACCOUNT_DBUG("END csc splist\n");
-
-       return TRUE;
 }
 
 static int _myaccount_ug_addaccount_compare(gconstpointer a, gconstpointer b)
@@ -451,8 +435,6 @@ static int _myaccount_ug_addaccount_compare(gconstpointer a, gconstpointer b)
        addaccount_list_priv* sp_info_a = (addaccount_list_priv*)a;
        addaccount_list_priv* sp_info_b = (addaccount_list_priv*)b;
 
-       MYACCOUNT_DBUG("sp_info_a->service_sname a(%s) b(%s)\n", sp_info_a->service_sname, sp_info_b->service_sname);
-
        return g_ascii_strcasecmp(sp_info_a->service_sname, sp_info_b->service_sname);
 }
 
@@ -460,10 +442,10 @@ static int __myaccount_addaccount_populate_service_info(myaccount_appdata *ad)
 {
        int pkg_count = 0;
 
-       _myaccount_addaccount_get_csc_sp_list(&ad->sp_info_list);
-       _myaccount_addaccount_get_account_type_info(ad->capability_filter, &ad->sp_info_list);
+       //_myaccount_addaccount_get_csc_sp_list(ad->capability_filter, &ad->sp_info_list);
+       _myaccount_addaccount_get_account_type_info(ad->capability_filter, &ad->sorted_sp_list);
 
-       ad->sorted_sp_list = g_list_sort(ad->sp_info_list, (GCompareFunc)_myaccount_ug_addaccount_compare);
+       ad->sorted_sp_list = g_list_sort(ad->sorted_sp_list, (GCompareFunc)_myaccount_ug_addaccount_compare);
        pkg_count = g_list_length(ad->sorted_sp_list);
 
        return pkg_count;
@@ -474,8 +456,6 @@ static void _myaccount_ug_addaccount_gl_realized(void *data, Evas_Object *obj, v
        Elm_Object_Item *it = NULL;
        int total_count = 0;
        int index = 0;
-       Evas_Object *ao;
-       char buf[2048]={0,};
 
        if(!ei) {
                MYACCOUNT_ERROR("Realized event info is NULL!!! \n");
@@ -487,99 +467,76 @@ static void _myaccount_ug_addaccount_gl_realized(void *data, Evas_Object *obj, v
        total_count = elm_genlist_items_count(obj);
        index = elm_genlist_item_index_get(it);
 
-       if(index != 1 && index != total_count) {
+       if(index != 0 && index != total_count) {
                /*Add account items. index 1 and last are the seperators*/
-               addaccount_list_priv *service = (addaccount_list_priv*)elm_object_item_data_get(it);
-               if(service) {
-                       memset(buf, 0, 2048);
-                       g_snprintf(buf, 100, "Allows you to add your %s Account", service->service_name);
-                       ao = elm_object_item_access_object_get(it);
-                       elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, buf);
-               }
+               /* but you don't need to do something. winset support accessibility for default item */
        } else {
                /*Remove access for seperators*/
                elm_object_item_access_unregister(ei);
        }
 
-       MYACCOUNT_VERBOSE("Total add account item (%d) !!! \n", total_count);
-
        if(total_count <= 3) {
-                MYACCOUNT_VERBOSE("DO NOTHING only one add account item, total_count(%d) index(%d) !!! \n", total_count, index);
-        } else {
+               //MYACCOUNT_VERBOSE("DO NOTHING only one add account item, total_count(%d) index(%d) !!! \n", total_count, index);
+       } else {
                if (index == 1) {
-                       MYACCOUNT_VERBOSE("TOP realized (%d) !!! \n", index);
                        elm_object_item_signal_emit(ei, "elm,state,top", "");
                } else if (index == (total_count-2)) {
-                       MYACCOUNT_VERBOSE("BOTTOM realized (%d) item count (%d) !!! \n", index, total_count);
                        elm_object_item_signal_emit(ei, "elm,state,bottom", "");
                } else  {
-                       MYACCOUNT_VERBOSE("CENTER realized (%d) !!! \n", index);
                        elm_object_item_signal_emit(ei, "elm,state,center", "");
                }
        }
 }
 
+static void _myaccount_ug_addaccount_gl_deleted(void *data, Evas_Object *obj, void *ei)
+{
+       MYACCOUNT_ERROR("# _myaccount_ug_addaccount_gl_deleted\n");
+       myaccount_appdata *ad = myaccount_get_appdata();
+       myaccount_addaccount_free_priv_data(ad);
+}
 
-static Evas_Object *__myaccount_addaccount_create_genlist(
-                                                                                       myaccount_appdata *ad, int count)
+static Evas_Object * __myaccount_addaccount_create_genlist_layout(
+                                                                                               Evas_Object *navi_bar)
 {
-       MYACCOUNT_VERBOSE("\n __myaccount_addaccount_create_genlist called !!! \n");
        Evas_Object *genlist;
-       Elm_Object_Item *it;
-#ifdef ENABLE_HELP
-       Elm_Object_Item *help;
-#endif
 
-       if (ad == NULL) {
-               MYACCOUNT_FATAL("__myaccount_addaccount_create_genlist returns NULL\n");
-               return NULL;
-       }
-
-       addacc_list_itc.item_style = "dialogue/1text.1icon.2.tb";
+       addacc_list_itc.item_style = "1line";
        addacc_list_itc.func.text_get = __myaccount_addaccount_gl_label_get;
        addacc_list_itc.func.content_get = __myaccount_addaccount_icon_get;
        addacc_list_itc.func.state_get = NULL;
        addacc_list_itc.func.del = NULL;
 
-#ifndef ENABLE_HELP
-       /*to add 40 pixel separator*/
-       addacc_list_itc_sep.item_style = "dialogue/separator";
-       addacc_list_itc_sep.func.text_get = NULL;
-       addacc_list_itc_sep.func.content_get = NULL;
-       addacc_list_itc_sep.func.state_get = NULL;
-       addacc_list_itc_sep.func.del = NULL;
-#endif
-       /*to add 40 pixel list end separator*/
-       addacc_list_itc_sep_end.item_style = "dialogue/separator/end";
-       addacc_list_itc_sep_end.func.text_get = NULL;
-       addacc_list_itc_sep_end.func.content_get = NULL;
-       addacc_list_itc_sep_end.func.state_get = NULL;
-       addacc_list_itc_sep_end.func.del = NULL;
-
-       genlist = elm_genlist_add(ad->navi_bar);
+       genlist = elm_genlist_add(navi_bar);
        evas_object_smart_callback_add(genlist, "realized", _myaccount_ug_addaccount_gl_realized, NULL);
+       evas_object_smart_callback_add(genlist, "delete", _myaccount_ug_addaccount_gl_deleted, NULL);
+       return genlist;
+}
 
-       MYACCOUNT_VERBOSE("############################# ADD SERVICE COUNT = %d\n",
-                                                       count);
-#ifdef ENABLE_HELP
-       help = elm_genlist_item_append(genlist, &help_itc, (void*)ad, NULL,
-                                                                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
-#else
-       it = elm_genlist_item_append(genlist,
-                                                       &addacc_list_itc_sep, NULL, NULL,
-                                                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-#endif
+static Evas_Object *__myaccount_addaccount_append_genlist_item(
+                                                                                       myaccount_appdata *ad, Evas_Object *genlist, int count)
+{
+       if (ad == NULL) {
+               MYACCOUNT_ERROR("__myaccount_addaccount_create_genlist returns NULL\n");
+               return NULL;
+       }
 
        GList* iter;
 
-       MYACCOUNT_INFO("Append genlist START \n");
-
        for(iter=ad->sorted_sp_list;iter!=NULL;iter=g_list_next(iter)) {
                addaccount_list_priv* tmp = (addaccount_list_priv*)iter->data;
 
                if(ad->capability_filter) {
-                       if( !strcmp(ad->capability_filter, ACCOUNT_SUPPORTS_CAPABILITY_TIZEN_EMAIL)) { /* Tizen email exception */
+                       /* Samsung account exception */
+                       if(tmp->sp_type == MYACCOUNT_TYPE_SAMSUNG
+                               && (!strcmp(ad->capability_filter, "http://tizen.org/account/capability/memo")
+                                       || !strcmp(ad->capability_filter, "http://tizen.org/account/capability/contact")
+                                       || !strcmp(ad->capability_filter, "http://tizen.org/account/capability/calendar"))) {
+                               elm_genlist_item_append(genlist, &addacc_list_itc,
+                                               (void *)tmp, NULL,
+                                               ELM_GENLIST_ITEM_NONE,
+                                               __myaccount_addaccount_gl_sel,
+                                               (void *)tmp);
+                       } else if( !strcmp(ad->capability_filter, "http://tizen.org/account/capability/tizen_email")) { /* Tizen email exception */
                                if(tmp->b_tizen_email) {
                                        elm_genlist_item_append(genlist, &addacc_list_itc,
                                                        (void *)tmp, NULL,
@@ -588,12 +545,12 @@ static Evas_Object *__myaccount_addaccount_create_genlist(
                                                        (void *)tmp);
                                }
                        } else {
-                                       elm_genlist_item_append(genlist, &addacc_list_itc,
-                                                       (void *)tmp, NULL,
-                                                       ELM_GENLIST_ITEM_NONE,
-                                                       __myaccount_addaccount_gl_sel,
-                                                       (void *)tmp);
-                               }
+                               elm_genlist_item_append(genlist, &addacc_list_itc,
+                                               (void *)tmp, NULL,
+                                               ELM_GENLIST_ITEM_NONE,
+                                               __myaccount_addaccount_gl_sel,
+                                               (void *)tmp);
+                       }
                } else {
                        elm_genlist_item_append(genlist, &addacc_list_itc,
                                        (void *)tmp, NULL,
@@ -604,88 +561,215 @@ static Evas_Object *__myaccount_addaccount_create_genlist(
 
        }
 
-       MYACCOUNT_INFO("Append genlist COMPLETE \n");
-
-       it = elm_genlist_item_append(genlist,
-                                                       &addacc_list_itc_sep_end, NULL, NULL,
-                                                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
        elm_genlist_block_count_set(genlist, count);
-       MYACCOUNT_VERBOSE("END of __myaccount_addaccount_create_genlist\n");
+
        return genlist;
 }
 
-void __myaccount_addaccount_quit_cb( void *data,
-                                                       Evas_Object *obj, void *event_info )
+static Evas_Object *__myaccount_addaccount_create_genlist(
+                                                                                       myaccount_appdata *ad, int count)
+{
+       Evas_Object *genlist;
+
+       if (ad == NULL) {
+               MYACCOUNT_ERROR("__myaccount_addaccount_create_genlist returns NULL\n");
+               return NULL;
+       }
+
+       genlist = __myaccount_addaccount_create_genlist_layout(ad->navi_bar);
+
+       return __myaccount_addaccount_append_genlist_item(ad, genlist, count);
+}
+
+static Evas_Object *__myaccount_addaccount_no_account(myaccount_appdata *ad, int count)
+{
+       Evas_Object *no_account;
+
+       if (ad == NULL) {
+               MYACCOUNT_ERROR("__myaccount_addaccount_no_account returns NULL\n");
+               return NULL;
+       }
+       no_account = elm_layout_add(ad->navi_bar);
+       elm_layout_file_set(no_account, MA_NO_ACCOUNT_EDJ_NAME, "nocontents_layout");
+
+       elm_layout_theme_set(no_account, "layout", "nocontents", "default");
+       evas_object_size_hint_weight_set(no_account, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(no_account, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       elm_object_part_text_set(no_account, "elm.text", "No Account Providers");
+       /* left below line to future use */
+       //elm_object_part_text_set(no_account, "elm.help.text", "Please install account app to add account");
+       elm_layout_signal_emit(no_account, "text,disabled", "");
+       elm_layout_signal_emit(no_account, "align.center", "elm");
+
+       return no_account;
+}
+
+Eina_Bool __myaccount_addaccount_quit_cb( void *data,
+                                                       Elm_Object_Item *it )
 {
        int error_code = 0;
        myaccount_appdata *priv = (myaccount_appdata*)data;
        int count = -1;
 
-       MYACCOUNT_INFO("myaccount_account_list_quit_cb START\n");
+       MYACCOUNT_DBUG("Add account list quit\n");
 
-       error_code = myaccount_common_get_all_account_cnt(&count);
-       if (error_code != ACCOUNT_ERROR_NONE) {
-               MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n",
-                                                                       error_code);
+       if (!priv) {
+               MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb callback user data is null!!!\n");
+               return EINA_TRUE;
        }
 
-       if (!priv) {
-               MYACCOUNT_ERROR("myaccount_account_list_quit_cb callback user data is null!!!\n");
-               return;
+       if(priv->capability_filter && strlen(priv->capability_filter)){
+
+               if(!strcmp(priv->capability_filter, "http://tizen.org/account/capability/tizen_email")){
+                       int cnt1 = 0;
+                       int cnt2 = 0;
+                       int cnt3 = 0;
+                       error_code = myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID, &cnt1);
+                       error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt2);
+                       error_code = myaccount_common_get_account_cnt_by_appid(GOOGLE_ACCOUNT_APPID, &cnt3);
+                       count = cnt1+cnt2+cnt3;
+               } else {
+                       error_code = myaccount_common_get_account_cnt_by_capability(priv->capability_filter, &count);
+               }
+
+               if (error_code != ACCOUNT_ERROR_NONE) {
+                       MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n",
+                                                                               error_code);
+               }
+       } else {
+               error_code = myaccount_common_get_all_account_cnt(&count);
+               if (error_code != ACCOUNT_ERROR_NONE) {
+                       MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n",
+                                                                               error_code);
+               }
        }
 
+       /*destroy add genlist before pop it*/
+
        if ((count > 0) && (priv->eMode == eMYACCOUNT_ACCOUNT_LIST)) {
+               MYACCOUNT_DBUG("# count > 0, elm_naviframe_item_pop return EINA_TRUE\n");
                if (priv->add_genlist) {
                        evas_object_del(priv->add_genlist);
                        priv->add_genlist = NULL;
                }
-               myaccount_addaccount_free_priv_data(priv);
-               elm_naviframe_item_pop(priv->navi_bar);
-               MYACCOUNT_INFO("eMYACCOUNT_ACCOUNT_LIST mode END\n");
-               return;
+               priv->prev_app_cnt = 0;
+
+               return EINA_TRUE;
        }
 
        if (priv->ug) {
-               error_code = ug_destroy_me(priv->ug);
-               MYACCOUNT_DBUG("myaccount_account_list_quit_cb callback : return = %d!!!\n",
-                                               error_code);
+               ui_gadget_h ug = priv->ug;
+               ug_destroy_me(ug);
+               return EINA_FALSE;
+       }
+
+       if (priv->add_genlist) {
+               evas_object_del(priv->add_genlist);
+               priv->add_genlist = NULL;
        }
+       priv->prev_app_cnt = 0;
+       MYACCOUNT_DBUG("Add account list quit end\n");
 
-       MYACCOUNT_INFO("myaccount_account_list_quit_cb END\n");
+       return EINA_TRUE;
 }
 
 void myaccount_addaccount_genlist_create(void *data)
 {
-       MYACCOUNT_VERBOSE("\n myaccount_addaccount_genlist_create called !!! \n");
        myaccount_appdata *ad = data;
        Evas_Object *genlist;
        Evas_Object *l_button;
        int service_cnt=0;
 
        if (ad == NULL) {
-               MYACCOUNT_FATAL("myaccount_addaccount_genlist_create myaccount_appdata is null\n");
+               MYACCOUNT_ERROR("myaccount_addaccount_genlist_create myaccount_appdata is null\n");
                return;
        }
 
        service_cnt = __myaccount_addaccount_populate_service_info(ad);
-       ad->add_genlist = genlist = __myaccount_addaccount_create_genlist(ad, service_cnt);
+       ad->prev_app_cnt = service_cnt;
+       if(service_cnt > 0){
+               ad->add_genlist = genlist = __myaccount_addaccount_create_genlist(ad, service_cnt);
+       }else{
+               /* If there's no account provider, display no account view */
+               ad->add_genlist = genlist = __myaccount_addaccount_no_account(ad, service_cnt);
+       }
+
        l_button = elm_button_add(ad->navi_bar);
-       evas_object_smart_callback_add(l_button,
-                                       "clicked",
-                                       __myaccount_addaccount_quit_cb,
-                                       ad);
        elm_object_style_set(l_button , "naviframe/back_btn/default");
-       elm_naviframe_item_push(ad->navi_bar,
+
+       ad->add_nf_it = elm_naviframe_item_push(ad->navi_bar,
                                        dgettext(MA_UG_NAME, "IDS_MA_HEADER_ADD_ACCOUNT"),
                                        l_button, NULL, genlist, NULL);
-       MYACCOUNT_VERBOSE("END of myaccount_Addaccount_genlist_create\n");
+       MYACCOUNT_DBUG("#elm_naviframe_item_pushed..");
+       elm_naviframe_item_pop_cb_set(ad->add_nf_it, __myaccount_addaccount_quit_cb, (void*)ad);
 }
 
 void myaccount_addaccount_create_view(myaccount_appdata *ad)
 {
-       MYACCOUNT_VERBOSE("\n myaccount_addaccount_create_view called !!! \n");
+       MYACCOUNT_DBUG("myaccount_addaccount_create_view start\n");
+       if (ad->add_genlist == NULL) {
+               MYACCOUNT_DBUG("Add account list start\n");
+               myaccount_addaccount_free_priv_data(ad);
+               myaccount_addaccount_genlist_create(ad);
+       }
+}
+
+void myaccount_addaccount_refresh_item_list(myaccount_appdata *ad)
+{
+       int count = 0;
+
+       if(!ad) {
+               MYACCOUNT_ERROR("no appdata!\n");
+               return;
+       }
+
+       if(!ad->add_genlist) {
+               MYACCOUNT_ERROR("no genlist!\n");
+               return;
+       }
+
+       /*check if app count changed or not, if not changed, then do not refresh current view*/
+       int curr_cnt = 0;
+       GList *sp_list = NULL;
+       _myaccount_addaccount_get_account_type_info(ad->capability_filter, &sp_list);
+       curr_cnt = g_list_length(sp_list);
+       int valid_cnt = 0;
+       if (ad->prev_app_cnt == curr_cnt) {
+               int i = 0;
+               for (i = 0; i < curr_cnt; i++) {
+                       addaccount_list_priv *info = g_list_nth_data(sp_list, i);
+                       if (!info)
+                               continue;
+                       int j = 0;
+                       for (j = 0; j < curr_cnt; j++) {
+                               addaccount_list_priv *prev_info = g_list_nth_data(ad->sorted_sp_list, j);
+                               if (!prev_info)
+                                       continue;
+                               if (!g_strcmp0(prev_info->service_name, info->service_name)) {
+                                       valid_cnt++;
+                                       //MYACCOUNT_DBUG("info->service_name[%s]", info->service_name);
+                               }
+                       }
+               }
+       }
+       /*free temp data*/
+       GList* it = NULL;
+       for(it=sp_list;it!=NULL;it=g_list_next(it)) {
+               addaccount_list_priv* tmp = (addaccount_list_priv*)it->data;
+               MA_MEMFREE(tmp);
+       }
+       MYACCOUNT_DBUG("ad->prev_app_cnt[%d], valid_cnt[%d]", ad->prev_app_cnt, valid_cnt);
+       if (ad->prev_app_cnt == valid_cnt) {
+               MYACCOUNT_DBUG("no change, no need to refresh genlist items!\n");
+               return;
+       }
+
+       elm_genlist_clear(ad->add_genlist);
        myaccount_addaccount_free_priv_data(ad);
-       myaccount_addaccount_genlist_create(ad);
+       count = __myaccount_addaccount_populate_service_info(ad);
+       ad->prev_app_cnt = count;
+       __myaccount_addaccount_append_genlist_item(ad, ad->add_genlist, count);
+
+       return;
 }
+
index 1a6d85a..6cc8856 100755 (executable)
-/*\r
- * Copyright 2012  Samsung Electronics Co., Ltd\r
- *\r
- * Licensed under the Flora License, Version 1.1 (the License);\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://floralicense.org/license/\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an AS IS BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#include "myaccount_ug.h"\r
-#include "myaccount_ug_common.h"\r
-#include "myaccount_ug_addaccount.h"\r
-#include "myaccount_ug_account_list.h"\r
-\r
-static myaccount_appdata *g_myaccount_appdata = NULL;\r
-\r
-void *myaccount_init_appdata()\r
-{\r
-       if (g_myaccount_appdata == NULL) {\r
-               g_myaccount_appdata = calloc(1, sizeof(myaccount_appdata));\r
-               g_myaccount_appdata->item_selected_state = false;\r
-       }\r
-       return g_myaccount_appdata;\r
-}\r
-\r
-void myaccount_destroy_appdata()\r
-{\r
-       MYACCOUNT_INFO("myaccount_destroy_appdata START \n");\r
-\r
-       if (g_myaccount_appdata == NULL) {\r
-               MYACCOUNT_WARNING("myaccount_destroy_appdata: appdata NULL \n");\r
-               return;\r
-       }\r
-\r
-\r
-/* fix by sungchan,kim.\r
- sudden crash on account list view destroyed.\r
- tempolarily blocked below codes. */\r
-       if (g_myaccount_appdata->base) {\r
-        evas_object_del(g_myaccount_appdata->base);\r
-        g_myaccount_appdata->base = NULL;\r
-       }\r
-       MA_MEMFREE(g_myaccount_appdata->capability_filter)\r
-\r
-       /* For accounts list */\r
-       if (g_myaccount_appdata->ug_called) {\r
-               ug_destroy(g_myaccount_appdata->ug_called);\r
-               g_myaccount_appdata->ug_called = NULL;\r
-       }\r
-       if (g_myaccount_appdata->layout_main) {\r
-               evas_object_del(g_myaccount_appdata->layout_main);\r
-               g_myaccount_appdata->layout_main = NULL;\r
-       }\r
-       if (g_myaccount_appdata->layout_addaccount) {\r
-               evas_object_del(g_myaccount_appdata->layout_addaccount);\r
-               g_myaccount_appdata->layout_addaccount = NULL;\r
-       }\r
-       if (g_myaccount_appdata->navi_bar) {\r
-               evas_object_del(g_myaccount_appdata->navi_bar);\r
-               g_myaccount_appdata->navi_bar = NULL;\r
-       }\r
-       if (g_myaccount_appdata->account_genlist) {\r
-               evas_object_del(g_myaccount_appdata->account_genlist);\r
-               g_myaccount_appdata->account_genlist = NULL;\r
-       }\r
-       if (g_myaccount_appdata->help_label) {\r
-               evas_object_del(g_myaccount_appdata->help_label);\r
-               g_myaccount_appdata->help_label = NULL;\r
-       }\r
-       if (g_myaccount_appdata->refresh_btn) {\r
-               evas_object_del(g_myaccount_appdata->refresh_btn);\r
-               g_myaccount_appdata->refresh_btn = NULL;\r
-       }\r
-       if (g_myaccount_appdata->refresh_icon) {\r
-               evas_object_del(g_myaccount_appdata->refresh_icon);\r
-               g_myaccount_appdata->refresh_icon = NULL;\r
-       }\r
-       if (g_myaccount_appdata->cancel_sync_icon) {\r
-               evas_object_del(g_myaccount_appdata->cancel_sync_icon);\r
-               g_myaccount_appdata->cancel_sync_icon = NULL;\r
-       }\r
-       if (g_myaccount_appdata->auto_sync_check) {\r
-               evas_object_del(g_myaccount_appdata->auto_sync_check);\r
-               g_myaccount_appdata->auto_sync_check = NULL;\r
-       }\r
-       if (g_myaccount_appdata->bg) {\r
-               evas_object_del(g_myaccount_appdata->bg);\r
-               g_myaccount_appdata->bg = NULL;\r
-       }\r
-       if (g_myaccount_appdata->ly) {\r
-               elm_object_part_content_unset(g_myaccount_appdata->ly, "elm.swallow.content");\r
-               evas_object_del(g_myaccount_appdata->ly);\r
-               g_myaccount_appdata->ly = NULL;\r
-       }\r
-       if (g_myaccount_appdata->modal_popup) {\r
-               evas_object_del(g_myaccount_appdata->modal_popup);\r
-               g_myaccount_appdata->modal_popup = NULL;\r
-       }\r
-       if (g_myaccount_appdata->r_title_sk) {\r
-               evas_object_del(g_myaccount_appdata->r_title_sk);\r
-               g_myaccount_appdata->r_title_sk = NULL;\r
-       }\r
-       if (g_myaccount_appdata->l_title_sk) {\r
-               evas_object_del(g_myaccount_appdata->l_title_sk);\r
-               g_myaccount_appdata->l_title_sk = NULL;\r
-       }\r
-       if (g_myaccount_appdata->progress_timer) {\r
-               ecore_timer_del(g_myaccount_appdata->progress_timer);\r
-               g_myaccount_appdata->progress_timer = NULL;\r
-       }\r
-       if (g_myaccount_appdata->add_genlist) {\r
-               evas_object_del(g_myaccount_appdata->add_genlist);\r
-               g_myaccount_appdata->add_genlist = NULL;\r
-       }\r
-       if (g_myaccount_appdata->pc) {\r
-               pkgmgr_client_free(g_myaccount_appdata->pc);\r
-               g_myaccount_appdata->pc = NULL;\r
-       }\r
-\r
-       if(g_myaccount_appdata->sp_info_list) {\r
-               g_list_free(g_myaccount_appdata->sp_info_list);\r
-               g_myaccount_appdata->sp_info_list = NULL;\r
-       }\r
-\r
-       g_myaccount_appdata->sorted_sp_list= NULL;\r
-\r
-       MA_MEMFREE(g_myaccount_appdata->caller_userdata);\r
-       MA_MEMFREE(g_myaccount_appdata->called_from);\r
-       MA_MEMFREE(g_myaccount_appdata);\r
-\r
-       MYACCOUNT_VERBOSE("myaccount_destroy_appdata END \n");\r
-}\r
-\r
-void * myaccount_get_appdata()\r
-{\r
-       return g_myaccount_appdata;\r
-}\r
-\r
-void myaccount_common_get_icon_by_name(char *domain_name,\r
-                                                                                       char *icon_path)\r
-{\r
-       if (!domain_name) {\r
-               MYACCOUNT_ERROR("\n !!! domain_name is NULL \n");\r
-               return;\r
-       }\r
-       char tmp_domain_name[64] = {0,};\r
-       myaccount_common_lowercase(domain_name, tmp_domain_name);\r
-       MYACCOUNT_VERBOSE("\n !!! myaccount_common_get_icon_by_name = %s \n",\r
-                                                               domain_name);\r
-\r
-       if (!icon_path) {\r
-               MYACCOUNT_ERROR("\n !!! icon_path is NULL \n");\r
-               return;\r
-       }\r
-       if (!strcmp(tmp_domain_name, "google") || !strcmp(tmp_domain_name, "gmail")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s",\r
-                                       "66_myaccount_icon_google_50x50.png");\r
-       } else if (!strcmp(tmp_domain_name, "yahoo")\r
-               || !strcmp(tmp_domain_name, "ymail")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s",\r
-                                       "66_myaccount_icon_yahoo_50x50.png");\r
-       } else if (!strcmp(tmp_domain_name, "hotmail")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s",\r
-                                       "66_myaccount_icon_msn_50x50.png");\r
-       } else if (!strcmp(tmp_domain_name, "msn")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s",\r
-                                       "66_myaccount_icon_windows_live_50x50.png");\r
-       } else if (!strcmp(tmp_domain_name, "exchange")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s",\r
-                                       "exchange.png");\r
-       } else if (!strcmp(tmp_domain_name, "icq")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "icq.png");\r
-       } else if (!strcmp(tmp_domain_name, "facebook")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s",\r
-                                       "66_myaccount_icon_facebook_50x50.png");\r
-       } else if (!strcmp(tmp_domain_name, "twitter")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s",\r
-                                       "66_myaccount_icon_twitter_50x50.png");\r
-       } else if (!strcmp(tmp_domain_name, "myspace")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s",\r
-                                       "myspace.png");\r
-       } else if(!strcmp(tmp_domain_name, "picasa")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "picasa.png");\r
-       } else if(!strcmp(tmp_domain_name, "flickr")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "flickr.png");\r
-       } else if (!strcmp(tmp_domain_name, "samsung")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s",\r
-                                       "01_samsungaccount.png");\r
-       } else if (!strcmp(tmp_domain_name, "youtube")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "youtube.png");\r
-       } else if (!strcmp(tmp_domain_name, "others")) {\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_others.png");\r
-       }else {\r
-               MYACCOUNT_VERBOSE("Default icon\n");\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_default.png");\r
-       }\r
-}\r
-\r
-void myaccount_common_lowercase(char *src, char *dest)\r
-{\r
-       int i;\r
-       int src_len=0;\r
-\r
-       if (!src || !dest) {\r
-               MYACCOUNT_ERROR("myaccount_common_lowercase src=%p, dest=%p\n",\r
-                                               src, dest);\r
-               return;\r
-       }\r
-       src_len = strlen(src);\r
-       for(i=0;i<src_len;i++) {\r
-               dest[i] = tolower(src[i]);\r
-       }\r
-       dest[i] = '\0';\r
-}\r
-\r
-void myaccount_common_handle_notification(const char* event_type)\r
-{\r
-       myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();\r
-\r
-       if (!appdata) {\r
-               MYACCOUNT_FATAL("App data NULL!!! \n");\r
-               return;\r
-       }\r
-\r
-       int error_code = -1;\r
-       int count = -1;\r
-       char *noti_name = NULL;\r
-\r
-       appdata->item_selected_state = false;\r
-\r
-       noti_name = vconf_get_str(VCONFKEY_ACCOUNT_MSG_STR);\r
-       if (!noti_name) {\r
-               MYACCOUNT_FATAL("myaccount_common_handle_notification: vconf_get_str() Failed!\n");\r
-               return;\r
-       } else {\r
-               MYACCOUNT_VERBOSE("myaccount_common_handle_notification: noti_name = %s\n",\r
-                                                       noti_name);\r
-       }\r
-       error_code = myaccount_common_get_all_account_cnt(&count);\r
-       if (error_code != ACCOUNT_ERROR_NONE) {\r
-               MYACCOUNT_ERROR("myaccount_common_handle_notification: myaccount_common_get_all_account_cnt fail(%d) \n",\r
-                                                       error_code);\r
-       }\r
-\r
-       MYACCOUNT_VERBOSE("myaccount_common_handle_notification account count =%d\n",\r
-                                                       count);\r
-\r
-       if (appdata->eMode == eMYACCOUNT_ACCOUNT_LIST) {\r
-               if (count > 0) {\r
-                       if (appdata->add_genlist && strcmp(noti_name, ACCOUNT_NOTI_NAME_SYNC_UPDATE)) {\r
-                               evas_object_del(appdata->add_genlist);\r
-                               appdata->add_genlist = NULL;\r
-                               elm_naviframe_item_pop(appdata->navi_bar);\r
-                       }\r
-                       if (appdata->account_genlist) {\r
-                               myaccount_list_refresh_item_list(appdata);\r
-                       } else {\r
-                               myaccount_ug_account_list_create((void*)appdata);\r
-                       }\r
-               } else {\r
-                       if (appdata->add_genlist) {\r
-                               evas_object_show(appdata->add_genlist);\r
-                       } else {\r
-                               myaccount_addaccount_create_view(appdata);\r
-                       }\r
-               }\r
-       } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) {\r
-               if(event_type){\r
-                       if (!strcmp(event_type, ACCOUNT_NOTI_NAME_INSERT) && appdata->ug) {\r
-                               service_h service = NULL;\r
-                               int ret = -1;\r
-\r
-                               ret = service_create(&service);\r
-                               MYACCOUNT_VERBOSE("service_create ret (%x)\n", ret);\r
-                               ret = service_add_extra_data(service, "account_noti", noti_name);\r
-                               MYACCOUNT_VERBOSE("service_add_extra_data ret (%x)\n", ret);\r
-                               error_code = ug_send_result(appdata->ug, service);\r
-                               MYACCOUNT_VERBOSE("ug_send_result ret (%x)\n", error_code);\r
-                               error_code = ug_destroy_me(appdata->ug);\r
-                               MYACCOUNT_VERBOSE("myaccount_common_handle_notification callback : return = %d!!!\n",\r
-                                                                       error_code);\r
-                       }\r
-               }\r
-       } else {\r
-               MYACCOUNT_WARNING("Unknown mode !!!");\r
-       }\r
-}\r
-\r
-bool myaccount_samsung_callback(char* result_code, char* user_id, void *user_data)\r
-{\r
-       MYACCOUNT_VERBOSE("Result Code = %s\n", result_code);\r
-       MYACCOUNT_VERBOSE("User Id = %s\n", user_id);\r
-\r
-       if(user_data) {\r
-               int* test = (int*)user_data;\r
-\r
-               MYACCOUNT_VERBOSE("TEST user data int = %d\n", *test);\r
-               MA_MEMFREE(test);\r
-       }\r
-\r
-       return TRUE;\r
-}\r
-\r
-static void _myaccount_common_popup_cb(void *data, Evas_Object *obj, void *event_info)\r
-{\r
-       MYACCOUNT_VERBOSE("delete popup\n");\r
-\r
-       if(obj)\r
-               evas_object_del(obj);\r
-}\r
-\r
-Evas_Object* _myaccount_common_add_popup(Evas_Object* parent, const char* text, const char* title)\r
-{\r
-       Evas_Object *popup = elm_popup_add(parent);\r
-\r
-       evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);\r
-\r
-       elm_object_text_set(popup, text);\r
-       elm_object_part_text_set(popup, "title,text", title);\r
-       evas_object_smart_callback_add(popup, "block,clicked", _myaccount_common_popup_cb, NULL);\r
-       elm_popup_timeout_set(popup, 3);\r
-       evas_object_smart_callback_add(popup, "timeout", _myaccount_common_popup_cb, NULL);\r
-       evas_object_show(popup);\r
-       return popup;\r
-}\r
-\r
-int  myaccount_common_launch_application(MyAccountRequestViewType\r
-                                                                                                               request_type,\r
-                                                                                                               char *package_name,\r
-                                                                                                               char *username,\r
-                                                                                                               char *email_sp,\r
-                                                                                                               int account_id,\r
-                                                                                                               MyAccountProviderType sp_type,\r
-                                                                                                               void *data )\r
-{\r
-       int ret = SERVICE_ERROR_NONE;\r
-       service_h service;\r
-       myaccount_appdata *ad = (myaccount_appdata *) data;\r
-       char win_id_buf[64]={0,};\r
-       char id_buf[64] = {0,};\r
-\r
-       if (!ad || !package_name) {\r
-               MYACCOUNT_ERROR("myaccount_common_launch_application: App data=%p, package_name=%p\n",\r
-                                                       ad, package_name);\r
-               return 0;\r
-       }\r
-\r
-       MYACCOUNT_DBUG("trying to launch (%s)\n", package_name);\r
-\r
-       ad->win_id = elm_win_xwindow_get(ad->win_main);\r
-       MA_SNPRINTF(win_id_buf, sizeof(win_id_buf)-1, "%d", ad->win_id);\r
-\r
-       ret = service_create(&service);\r
-       ret = service_set_app_id(service, package_name);\r
-       ret = service_set_window(service, ad->win_id);\r
-       if(ad->caller_userdata) {\r
-               MYACCOUNT_DBUG("myaccount_common_launch_application: caller userdata exist!\n");\r
-               ret = service_add_extra_data(service, "myaccount_userdata", ad->caller_userdata);\r
-       }\r
-\r
-       switch (request_type) {\r
-               case MYACCOUNT_REQUEST_SIGNIN :\r
-                       service_set_operation(service, ACCOUNT_OPERATION_SIGNIN);\r
-                       if(email_sp && strlen(email_sp) > 0) {\r
-                               MYACCOUNT_DBUG("Tizen email_sp (%s)\n", email_sp);\r
-                               service_add_extra_data(service, ACCOUNT_DATA_SERVICE_PROVIDER, email_sp);\r
-                       }\r
-                       break;\r
-               case MYACCOUNT_REQUEST_VIEW :\r
-                       if(!username) {\r
-                               MYACCOUNT_ERROR("myaccount_common_launch_application: username=%p !!!\n",\r
-                                                               username);\r
-                               MA_MEMFREE(package_name);\r
-                               service_destroy(service);\r
-                               return 0;\r
-                       }\r
-\r
-                       MA_SNPRINTF(id_buf, sizeof(id_buf), "%d", account_id);\r
-                       ret = service_add_extra_data(service, ACCOUNT_DATA_ID, id_buf);\r
-                       ret = service_set_operation(service, ACCOUNT_OPERATION_VIEW);\r
-                       MYACCOUNT_DBUG("###### USERNAME = %s\n", username);\r
-                       ret = service_add_extra_data(service, ACCOUNT_DATA_USERNAME,username);\r
-                       break;\r
-               default :\r
-                       MYACCOUNT_DBUG("myaccount_common_launch_application: Invalid request type=%d\n",\r
-                                                               request_type);\r
-                       MA_MEMFREE(username);\r
-                       MA_MEMFREE(package_name);\r
-                       service_destroy(service);\r
-                       return 0;\r
-       }\r
-       MYACCOUNT_VERBOSE("myaccount_common_launch_application request type=%d, package name = %s\n",\r
-                                                       request_type, package_name);\r
-\r
-       ret = service_add_extra_data(service, "XWINDOW_ID", win_id_buf);\r
-       ret = service_send_launch_request(service, NULL, NULL);\r
-\r
-       MA_MEMFREE(username);\r
-       MA_MEMFREE(package_name);\r
-       service_destroy(service);\r
-\r
-       if(ret != SERVICE_ERROR_NONE) {\r
-               MYACCOUNT_ERROR("(%s) launch fail. ret(%x)\n", package_name, ret);\r
-               char buf[64]={0,};\r
-               MA_SNPRINTF(buf, sizeof(buf), "Launch fail (%x)", ret);\r
-               _myaccount_common_add_popup(ad->win_main, buf, "Error");\r
-               ad->item_selected_state = FALSE;\r
-       }\r
-\r
-       return ret;\r
-}\r
-\r
-\r
-Evas_Object *myaccount_common_progress_add(Evas_Object *parent)\r
-{\r
-       if (!parent) {\r
-               MYACCOUNT_ERROR("myaccount_common_progress_add: parent is NULL \n");\r
-               return NULL;\r
-       }\r
-       Evas_Object *progressbar = NULL;\r
-       progressbar = elm_progressbar_add(parent);\r
-       elm_object_style_set(progressbar, "list_process");\r
-       evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5);\r
-       evas_object_size_hint_weight_set(progressbar,\r
-                                               EVAS_HINT_EXPAND,\r
-                                               EVAS_HINT_EXPAND);\r
-       evas_object_show(progressbar);\r
-       elm_progressbar_pulse(progressbar, EINA_TRUE);\r
-       return progressbar;\r
-}\r
-\r
-Evas_Object *myaccount_common_create_modal_popup(Evas_Object *parent)\r
-{\r
-       if (!parent) {\r
-               MYACCOUNT_ERROR("myaccount_common_create_modal_popup: parent is NULL \n");\r
-               return NULL;\r
-       }\r
-       Evas_Object *popup = NULL;\r
-       Evas_Object *progressbar = NULL;\r
-       popup = elm_popup_add(parent);\r
-       progressbar = myaccount_common_progress_add(popup);\r
-       elm_object_content_set(popup, progressbar);\r
-       evas_object_show(popup);\r
-       return popup;\r
-}\r
-\r
-void myaccount_common_delete_modal_popup(Evas_Object *popup)\r
-{\r
-       if (!popup){\r
-               MYACCOUNT_ERROR("myaccount_common_delete_modal_popup: popup is NULL \n");\r
-               return;\r
-       }\r
-       evas_object_del(popup);\r
-}\r
-\r
-Eina_Bool myaccount_common_modal_popup_timer_cb(gpointer data)\r
-{\r
-       if (!data) {\r
-               MYACCOUNT_ERROR("myaccount_common_modal_popup_timer_cb: data is NULL \n");\r
-               return false;\r
-       }\r
-       myaccount_appdata *global_data = NULL;\r
-       global_data = (myaccount_appdata*)data;\r
-       if (global_data->modal_popup) {\r
-               myaccount_common_delete_modal_popup(global_data->modal_popup);\r
-               global_data->modal_popup = NULL;\r
-       }\r
-       if (global_data->progress_timer) {\r
-               ecore_timer_del(global_data->progress_timer);\r
-               global_data->progress_timer = NULL;\r
-       }\r
-       return false;\r
-}\r
-\r
-int myaccount_common_get_all_account_cnt(int *count)\r
-{\r
-       int error_code = -1;\r
-       int account_cnt = 0;\r
-       if (!count) {\r
-               MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: count ptr is NULL \n");\r
-               return error_code;\r
-       }\r
-       error_code = account_connect();\r
-       if (error_code != ACCOUNT_ERROR_NONE) {\r
-               MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: fail to connect account DB \n");\r
-               return error_code;\r
-       }\r
-       error_code = account_get_total_count_from_db(&account_cnt);\r
-       if (error_code != ACCOUNT_ERROR_NONE) {\r
-               int ret = ACCOUNT_ERROR_NONE;\r
-               MYACCOUNT_VERBOSE("myaccount_common_get_all_account_cnt: account_svc_get_count fail(%d) \n",\r
-                                                       error_code);\r
-               ret = account_disconnect();\r
-               if (ret != ACCOUNT_ERROR_NONE) {\r
-                       MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_disconnect fail(%d) \n",\r
-                                                               ret);\r
-               }\r
-               return error_code;\r
-       }\r
-       *count = account_cnt;\r
-       error_code = account_disconnect();\r
-       if (error_code != ACCOUNT_ERROR_NONE) {\r
-               MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_get_count fail(%d) \n",\r
-                                               error_code);\r
-               return error_code;\r
-       }\r
-       return ACCOUNT_ERROR_NONE;\r
-}\r
-\r
-static int _myaccount_common_pkmgr_return_cb(int req_id, const char *pkg_type,\r
-                                       const char *pkg_name,\r
-                                       const char *key,\r
-                                       const char *val,\r
-                                       const void *pmsg,\r
-                                       void *data)\r
-{\r
-       MYACCOUNT_VERBOSE(" _myaccount_common_pkmgr_return_cb: pkg_type = %s, pkg_name = %s, key = %s, val = %s\n", pkg_type, pkg_name,key,val);\r
-\r
-       int error_code = -1;\r
-       int count = -1;\r
-       if( strcmp(key, "end") == 0 && strcmp(val, "ok") == 0) {\r
-               myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();\r
-\r
-               if (!appdata) {\r
-                       MYACCOUNT_FATAL("App data NULL!!! \n");\r
-                       return -1;\r
-               }\r
-               error_code = myaccount_common_get_all_account_cnt(&count);\r
-               if (error_code != ACCOUNT_ERROR_NONE) {\r
-                       MYACCOUNT_ERROR("_myaccount_common_pkmgr_return_cb: myaccount_common_get_all_account_cnt fail(%d) \n",\r
-                                                               error_code);\r
-               }\r
-\r
-               MYACCOUNT_VERBOSE("_myaccount_common_pkmgr_return_cb account count =%d\n",\r
-                                                               count);\r
-               if (appdata->eMode == eMYACCOUNT_ACCOUNT_LIST) {\r
-                       if (count > 0) {\r
-                               if (appdata->add_genlist) {\r
-                                       evas_object_del(appdata->add_genlist);\r
-                                       appdata->add_genlist = NULL;\r
-                                       elm_naviframe_item_pop(appdata->navi_bar);\r
-                               }\r
-                               if (appdata->account_genlist) {\r
-                                       myaccount_list_refresh_item_list(appdata);\r
-                               } else {\r
-                                       myaccount_ug_account_list_create((void*)appdata);\r
-                               }\r
-                       } else {\r
-                               if (appdata->add_genlist) {\r
-                                       evas_object_show(appdata->add_genlist);\r
-                               } else {\r
-                                       myaccount_addaccount_create_view(appdata);\r
-                               }\r
-                       }\r
-               } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) {\r
-                       if (appdata->ug) {\r
-                               error_code = ug_destroy_me(appdata->ug);\r
-                               MYACCOUNT_VERBOSE("myaccount_common_handle_notification callback : return = %d!!!\n",\r
-                                                                       error_code);\r
-                       }\r
-               } else {\r
-                       MYACCOUNT_WARNING("Unknown mode !!!");\r
-               }\r
-               return 0;\r
-       }\r
-       return 0;\r
-}\r
-\r
-void myaccount_common_listen_pkgmgr_for_pkg_uninstall()\r
-{\r
-       myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();\r
-\r
-       if (!appdata) {\r
-               MYACCOUNT_FATAL("App data NULL!!! \n");\r
-               return;\r
-       }\r
-\r
-       int result = 0;\r
-       pkgmgr_client *pc = NULL;\r
-       pc = pkgmgr_client_new(PC_LISTENING);\r
-       if(pc == NULL) {\r
-               MYACCOUNT_ERROR("pc is NULL\n");\r
-               return;\r
-       }\r
-       appdata->pc = pc;\r
-       result = pkgmgr_client_listen_status(pc, _myaccount_common_pkmgr_return_cb, pc);\r
-       if(result < 0)\r
-       {\r
-               MYACCOUNT_ERROR("status listen failed!\n");\r
-               return;\r
-       }\r
-}\r
+/*
+ *  my-account
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
+ *
+ * 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.
+ *
+ */
+
+#include "myaccount_ug.h"
+#include "myaccount_ug_common.h"
+#include "myaccount_ug_addaccount.h"
+#include "myaccount_ug_account_list.h"
+#include <iniparser.h>
+
+static myaccount_appdata *g_myaccount_appdata = NULL;
+
+#define MYACCOUNT_MAX_EMAIL_COUNT 10
+#define MYACCOUNT_LAUNCH_TIME_OUT 0.7
+#define MYACCOUNT_RELAUNCH_INTERVAL 0.3
+#define MYACCOUNT_MAX_TOUCH_BLOCK_INTERVAL 2.5
+
+
+void *myaccount_init_appdata()
+{
+       if (g_myaccount_appdata == NULL) {
+               g_myaccount_appdata = calloc(1, sizeof(myaccount_appdata));
+               g_myaccount_appdata->item_selected_state = false;
+       }
+       return g_myaccount_appdata;
+}
+
+void myaccount_destroy_appdata()
+{
+       if (g_myaccount_appdata == NULL) {
+               MYACCOUNT_ERROR("myaccount_destroy_appdata: appdata NULL \n");
+               return;
+       }
+
+       if (g_myaccount_appdata->base) {
+               evas_object_del(g_myaccount_appdata->base);
+               g_myaccount_appdata->base = NULL;
+       }
+
+       MA_MEMFREE(g_myaccount_appdata->capability_filter)
+
+       /* For accounts list */
+       if (g_myaccount_appdata->ug_called) {
+               ug_destroy(g_myaccount_appdata->ug_called);
+               g_myaccount_appdata->ug_called = NULL;
+       }
+       if (g_myaccount_appdata->layout_main) {
+               evas_object_del(g_myaccount_appdata->layout_main);
+               g_myaccount_appdata->layout_main = NULL;
+       }
+       if (g_myaccount_appdata->layout_addaccount) {
+               evas_object_del(g_myaccount_appdata->layout_addaccount);
+               g_myaccount_appdata->layout_addaccount = NULL;
+       }
+       if (g_myaccount_appdata->navi_bar) {
+               evas_object_del(g_myaccount_appdata->navi_bar);
+               g_myaccount_appdata->navi_bar = NULL;
+       }
+       if (g_myaccount_appdata->help_label) {
+               evas_object_del(g_myaccount_appdata->help_label);
+               g_myaccount_appdata->help_label = NULL;
+       }
+       if (g_myaccount_appdata->refresh_btn) {
+               evas_object_del(g_myaccount_appdata->refresh_btn);
+               g_myaccount_appdata->refresh_btn = NULL;
+       }
+       if (g_myaccount_appdata->refresh_icon) {
+               evas_object_del(g_myaccount_appdata->refresh_icon);
+               g_myaccount_appdata->refresh_icon = NULL;
+       }
+       if (g_myaccount_appdata->cancel_sync_icon) {
+               evas_object_del(g_myaccount_appdata->cancel_sync_icon);
+               g_myaccount_appdata->cancel_sync_icon = NULL;
+       }
+       if (g_myaccount_appdata->auto_sync_check) {
+               evas_object_del(g_myaccount_appdata->auto_sync_check);
+               g_myaccount_appdata->auto_sync_check = NULL;
+       }
+       if (g_myaccount_appdata->bg) {
+               evas_object_del(g_myaccount_appdata->bg);
+               g_myaccount_appdata->bg = NULL;
+       }
+       if (g_myaccount_appdata->ly) {
+               elm_object_part_content_unset(g_myaccount_appdata->ly, "elm.swallow.content");
+               evas_object_del(g_myaccount_appdata->ly);
+               g_myaccount_appdata->ly = NULL;
+       }
+       if (g_myaccount_appdata->modal_popup) {
+               evas_object_del(g_myaccount_appdata->modal_popup);
+               g_myaccount_appdata->modal_popup = NULL;
+       }
+       if (g_myaccount_appdata->r_title_sk) {
+               evas_object_del(g_myaccount_appdata->r_title_sk);
+               g_myaccount_appdata->r_title_sk = NULL;
+       }
+
+       if (g_myaccount_appdata->progress_timer) {
+               ecore_timer_del(g_myaccount_appdata->progress_timer);
+               g_myaccount_appdata->progress_timer = NULL;
+       }
+       if (g_myaccount_appdata->relaunch_timer) {
+               ecore_timer_del(g_myaccount_appdata->relaunch_timer);
+               g_myaccount_appdata->relaunch_timer = NULL;
+       }
+       if (g_myaccount_appdata->pc) {
+               pkgmgr_client_free(g_myaccount_appdata->pc);
+               g_myaccount_appdata->pc = NULL;
+       }
+
+       if(g_myaccount_appdata->theme) {
+               elm_theme_free(g_myaccount_appdata->theme);
+               g_myaccount_appdata->theme = NULL;
+       }
+
+       if(g_myaccount_appdata->clickblock_timer){
+               ecore_timer_del(g_myaccount_appdata->clickblock_timer);
+               g_myaccount_appdata->clickblock_timer = NULL;
+       }
+
+       g_myaccount_appdata->sorted_sp_list= NULL;
+       g_myaccount_appdata->sorted_account_list= NULL;
+
+       MA_MEMFREE(g_myaccount_appdata->caller_userdata);
+       MA_MEMFREE(g_myaccount_appdata->called_from);
+       MA_MEMFREE(g_myaccount_appdata);
+
+}
+
+void * myaccount_get_appdata()
+{
+       return g_myaccount_appdata;
+}
+
+static Eina_Bool _myaccount_common_click_block_timer_cb(void *data)
+{
+       myaccount_appdata *ad = (myaccount_appdata *)data;
+
+       if(!ad){
+               return ECORE_CALLBACK_CANCEL;
+       }
+
+       if(ad->clickblock_timer){
+               ecore_timer_del(ad->clickblock_timer);
+               ad->clickblock_timer = NULL;
+       }
+
+       MYACCOUNT_DBUG("_myaccount_common_click_block_timer_cb: ad->item_selected_state=%d\n",  myaccount_common_get_item_selected_state());
+       myaccount_common_set_item_selected_state(FALSE);
+
+       return ECORE_CALLBACK_CANCEL;
+}
+
+
+void myaccount_common_set_item_selected_state(bool val)
+{
+       myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();
+
+       MYACCOUNT_DBUG("myaccount_common_set_item_selected_state[%s]", val ? "true":"false");
+       if (!appdata) {
+               MYACCOUNT_ERROR("appdata is NULL");
+               return;
+       }
+
+       appdata->item_selected_state = val;
+
+       if(appdata->clickblock_timer){
+               ecore_timer_del(appdata->clickblock_timer);
+               appdata->clickblock_timer = NULL;
+       }
+
+       if( val == true ) {
+               appdata->clickblock_timer = ecore_timer_add(MYACCOUNT_MAX_TOUCH_BLOCK_INTERVAL, _myaccount_common_click_block_timer_cb, appdata);
+       }
+}
+
+bool myaccount_common_get_item_selected_state()
+{
+       myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();
+
+       return (appdata->item_selected_state);
+}
+
+void myaccount_common_get_icon_by_name(char *domain_name,
+                                                                                       char *icon_path)
+{
+       if (!domain_name) {
+               MYACCOUNT_ERROR("\n !!! domain_name is NULL \n");
+               return;
+       }
+       char tmp_domain_name[64] = {0,};
+       myaccount_common_lowercase(domain_name, tmp_domain_name);
+
+       if (!icon_path) {
+               MYACCOUNT_ERROR("\n !!! icon_path is NULL \n");
+               return;
+       }
+
+       MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_default.png");
+}
+
+MyAccountProviderType myaccount_common_get_provider_type(
+                                                                                                       char    *package_name)
+{
+       MyAccountProviderType sp_type = MYACCOUNT_TYPE_UNKNOWN;
+
+       if (!package_name) {
+               MYACCOUNT_ERROR("myaccount_common_get_provider_type : package name is NULL\n");
+               return sp_type;
+       }
+
+       if (!strcmp(package_name, "com.samsung.picasa"))
+               sp_type = MYACCOUNT_TYPE_PICASA;
+       else if (!strcmp(package_name, "com.samsung.youtube"))
+               sp_type = MYACCOUNT_TYPE_YOUTUBE;
+       else if (!strcmp(package_name, "email-setting-efl"))
+               sp_type = MYACCOUNT_TYPE_GOOGLE;
+       else if (!strcmp(package_name, "activesync-ui") || !strcmp(package_name, "activesync-efl"))
+               sp_type = MYACCOUNT_TYPE_EXCHANGE;
+//     else if (!strcmp(package_name, "com.samsung.facebook"))
+//             sp_type = MYACCOUNT_TYPE_FACEBOOK;
+       else if (!strcmp(package_name, SAMSUNG_ACCOUNT_APPID))
+               sp_type = MYACCOUNT_TYPE_SAMSUNG;
+       else
+               sp_type = MYACCOUNT_TYPE_UNKNOWN;
+
+       return sp_type;
+}
+
+void myaccount_common_lowercase(char *src, char *dest)
+{
+       int i;
+       int src_len=0;
+
+       if (!src || !dest) {
+               MYACCOUNT_ERROR("myaccount_common_lowercase src=%p, dest=%p\n",
+                                               src, dest);
+               return;
+       }
+       src_len = strlen(src);
+       for(i=0;i<src_len;i++) {
+               dest[i] = tolower(src[i]);
+       }
+       dest[i] = '\0';
+}
+
+void myaccount_common_handle_notification(const char* event_type)
+{
+       myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();
+
+       if (!appdata) {
+               MYACCOUNT_ERROR("App data NULL!!! \n");
+               return;
+       }
+
+       int error_code = -1;
+       int count = -1;
+
+       myaccount_common_set_item_selected_state(false);
+
+       MYACCOUNT_DBUG("called_from[%s],eMode(%d),event_type(%s), capability_filter(%s)\n", appdata->called_from, appdata->eMode,event_type, appdata->capability_filter);
+       if(appdata->capability_filter && strlen(appdata->capability_filter)) {
+               if(!strcmp(appdata->capability_filter, "http://tizen.org/account/capability/tizen_email")){
+                       int cnt1 = 0;
+                       int cnt2 = 0;
+                       int cnt3 = 0;
+                       error_code = myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID, &cnt1);
+                       if (error_code != ACCOUNT_ERROR_NONE) {
+                               MYACCOUNT_DBUG(": myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID) code(%d)cnt1(%d) \n",    error_code, cnt1);
+                       }
+
+                       error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt2);
+                       if (error_code != ACCOUNT_ERROR_NONE) {
+                               MYACCOUNT_DBUG(": myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID) code(%d)cnt2(%d) \n",    error_code, cnt2);
+                       }
+
+                       error_code = myaccount_common_get_account_cnt_by_appid(GOOGLE_ACCOUNT_APPID, &cnt3);
+                       if (error_code != ACCOUNT_ERROR_NONE) {
+                               MYACCOUNT_DBUG(": myaccount_common_get_account_cnt_by_appid(GOOGLE_ACCOUNT_APPID) code(%d)cnt3(%d) \n", error_code, cnt3);
+                       }
+                       count = cnt1+cnt2+cnt3;
+
+               } else {
+                       error_code = myaccount_common_get_account_cnt_by_capability(appdata->capability_filter, &count);
+                       if (error_code != ACCOUNT_ERROR_NONE) {
+                               MYACCOUNT_DBUG(": myaccount_common_get_account_cnt_by_capability code(%d)count(%d) \n", error_code, count);
+                       }
+               }
+
+
+       } else {
+               error_code = myaccount_common_get_all_account_cnt(&count);
+               if (error_code != ACCOUNT_ERROR_NONE) {
+                       MYACCOUNT_ERROR("myaccount_common_handle_notification: myaccount_common_get_all_account_cnt code(%d) \n",
+                                                               error_code);
+               }
+       }
+       MYACCOUNT_DBUG("count[%d],appdata->add_genlist[%p],appdata->account_genlist[%p]", count,appdata->add_genlist,appdata->account_genlist);
+
+       if (appdata->eMode == eMYACCOUNT_ACCOUNT_LIST) {
+               if (count > 0) {
+                       if (appdata->add_genlist) {
+                               if( strcmp(event_type, ACCOUNT_NOTI_NAME_SYNC_UPDATE)){ // not sync update -> insert, update, delete
+                                       MYACCOUNT_DBUG("#  recved noti-event(%s) -> elm_naviframe_item_pop / quit_cb should be called.", (event_type != NULL) ? event_type : "null");
+                                       elm_naviframe_item_pop(appdata->navi_bar);
+                                       appdata->add_genlist = NULL;
+                                       MYACCOUNT_DBUG("elm_naviframe_item_pop func finished.\n");
+                               } else {
+                                       // if sync update received, do nothing.
+                                       MYACCOUNT_DBUG("recved noti-event(%s) -> do nothing.", (event_type != NULL) ? event_type : "null");
+                               }
+                       }
+
+                       if (appdata->account_genlist) {
+                               myaccount_list_refresh_item_list(appdata);
+                       } else {
+                               myaccount_ug_account_list_create((void*)appdata);
+                       }
+               } else {
+                       if (appdata->add_genlist) {
+                               evas_object_show(appdata->add_genlist);
+                       } else {
+                               MYACCOUNT_DBUG("eMYACCOUNT_ACCOUNT_LIST mode, count=0, add_genlist=NULL, event_type must be delete.");
+                               myaccount_addaccount_create_view(appdata);      // event_type=delete, fix duplicate elm_naviframe_item_push happening.
+                       }
+               }
+       } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) {
+               MYACCOUNT_SLOGD("myaccount_common_handle_notification: ADD_ACCOUNT, event_type = %s\n", event_type);
+               if(event_type){
+                       if (appdata->ug && count > 0) {
+                               if (!g_strcmp0(event_type, ACCOUNT_NOTI_NAME_INSERT) || !g_strcmp0(event_type, ACCOUNT_NOTI_NAME_SYNC_UPDATE)) {
+                                       app_control_h app_control = NULL;
+                                       app_control_create(&app_control);
+                                       app_control_add_extra_data(app_control, "account_noti", event_type);
+                                       error_code = ug_send_result(appdata->ug, app_control);
+                                       ui_gadget_h ug = appdata->ug;
+                                       error_code = ug_destroy_me(ug);
+                                       app_control_destroy(app_control);
+                               }
+                       }
+               }
+       }
+}
+
+bool myaccount_samsung_callback(char* result_code, char* user_id, void *user_data)
+{
+       MYACCOUNT_SLOGD("Result Code = %s\n", result_code);
+       MYACCOUNT_SLOGD("User Id = %s\n", user_id);
+
+       if(user_data) {
+               int* test = (int*)user_data;
+
+               MA_MEMFREE(test);
+       }
+
+       return TRUE;
+}
+
+static void _myaccount_common_popup_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       myaccount_appdata *ad = (myaccount_appdata *)data;
+
+       if(ad->modal_popup)
+               evas_object_del(ad->modal_popup);
+       ad->modal_popup = NULL;
+}
+
+Evas_Object* _myaccount_common_add_popup(Evas_Object* parent, const char* text, const char* title)
+{
+       myaccount_appdata *ad = (myaccount_appdata*)myaccount_get_appdata();
+
+        /* multi window >>> */
+#ifdef _MULTI_WINDOW_ENABLE_
+       MYACCOUNT_DBUG("multi window enabled.\n");
+        ad->modal_popup = ea_center_popup_add(parent);
+#else
+       MYACCOUNT_DBUG("multi window not enabled.\n");
+       ad->modal_popup = elm_popup_add(parent);
+#endif
+       evas_object_size_hint_weight_set(ad->modal_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+       elm_object_text_set(ad->modal_popup, text);
+       if(!title)
+               elm_object_part_text_set(ad->modal_popup, "title,text", title);
+       evas_object_smart_callback_add(ad->modal_popup, "block,clicked", _myaccount_common_popup_cb, (void*)ad);
+//     elm_popup_timeout_set(ad->modal_popup, 3);
+//     evas_object_smart_callback_add(ad->modal_popup, "timeout", _myaccount_common_popup_cb, NULL);
+
+    Evas_Object *ok_btn = elm_button_add(ad->modal_popup);
+    elm_object_text_set(ok_btn, dgettext(MA_UG_NAME, "IDS_MA_BUTTON_OK"));
+    elm_object_part_content_set(ad->modal_popup, "button1", ok_btn);
+    evas_object_smart_callback_add(ok_btn, "clicked", _myaccount_common_popup_cb, (void*)ad);
+    elm_object_style_set(ok_btn, "popup_button/default");
+
+       evas_object_show(ad->modal_popup);
+       return ad->modal_popup;
+}
+
+static bool _myaccount_common_synchronise_query_cb(account_h account, void *user_data)
+{
+       int ret = ACCOUNT_ERROR_NONE;
+       char** tmp_count = (char**)user_data;
+
+       if(!account) {
+               MYACCOUNT_ERROR("account handle is NULL\n");
+               return FALSE;
+       }
+
+       ret = account_get_custom(account, "profile_count", tmp_count);
+       if(ret != ACCOUNT_ERROR_NONE) {
+               MYACCOUNT_ERROR("account_get_custom fail(%x)\n", ret);
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+static Eina_Bool _myaccount_common_relaunch_application_timer_cb(void *data)
+{
+       myaccount_appdata *ad = (myaccount_appdata *)data;
+
+       if(!ad){
+               return ECORE_CALLBACK_CANCEL;
+       }
+
+       if(ad->relaunch_timer){
+               ecore_timer_del(ad->relaunch_timer);
+               ad->relaunch_timer = NULL;
+       }
+
+       app_control_send_launch_request(ad->appsvc_handle, NULL, NULL);
+
+       MYACCOUNT_DBUG("ad->item_selected_state=%d\n",  myaccount_common_get_item_selected_state());
+       myaccount_common_set_item_selected_state(FALSE);
+
+       app_control_destroy(ad->appsvc_handle);
+       ad->appsvc_handle = NULL;
+
+       return ECORE_CALLBACK_CANCEL;
+}
+
+static void _myaccount_common_try_relaunch(myaccount_appdata* ad, app_control_h app_control)
+{
+       if(ad->relaunch_timer){
+               ecore_timer_del(ad->relaunch_timer);
+               ad->relaunch_timer = NULL;
+       }
+
+       ad->appsvc_handle = app_control;
+
+       ad->relaunch_timer = ecore_timer_add(MYACCOUNT_RELAUNCH_INTERVAL, _myaccount_common_relaunch_application_timer_cb, ad);
+}
+
+
+static int _myaccount_common_launch_samsung_account(myaccount_appdata *ad)
+{
+       int ret = -1;
+       app_control_h app_control = NULL;
+
+       ret = app_control_create(&app_control);
+
+       ret = app_control_set_app_id(app_control,SAMSUNG_ACCOUNT_APPID);
+       ret = app_control_set_operation(app_control,ACCOUNT_OPERATION_SIGNIN);
+
+       Ecore_X_Window win_id = elm_win_xwindow_get(ad->win_main);
+       ret = app_control_set_window(app_control, win_id);
+
+       ret = app_control_add_extra_data (app_control, "service_category", "from_myaccounts");
+       ret = app_control_add_extra_data (app_control, "client_id", "gr47by21a5");
+       ret = app_control_add_extra_data (app_control, "client_secret", "BD1F21218D46C1C082651EA0B8026721");
+       ret = app_control_send_launch_request(app_control, NULL, NULL);
+
+       if(ret != APP_CONTROL_ERROR_NONE) {
+               MYACCOUNT_SLOGE("(%s) launch fail. ret(%x)\n", SAMSUNG_ACCOUNT_APPID, ret);
+               _myaccount_common_try_relaunch(ad, app_control);
+               return 0;
+       }
+
+       ret = app_control_destroy(app_control);
+
+
+       return ret;
+}
+
+static int _myaccount_common_launch_tizen_account(myaccount_appdata *ad)
+{
+       int ret = -1;
+       app_control_h app_control = NULL;
+
+       ret = app_control_create(&app_control);
+
+       ret = app_control_set_app_id(app_control,TIZEN_ACCOUNT_APPID);
+       ret = app_control_set_operation(app_control,ACCOUNT_OPERATION_SIGNIN);
+
+       Ecore_X_Window win_id = elm_win_xwindow_get(ad->win_main);
+       ret = app_control_set_window(app_control, win_id);
+
+       ret = app_control_add_extra_data (app_control, "client_id", "j5p7llxxxx");
+       ret = app_control_add_extra_data (app_control, "client_secret", "5113D0052DC14XXXXX751F753384E9XX");
+       ret = app_control_add_extra_data (app_control, "service_category", "from_myaccounts");
+       ret = app_control_send_launch_request(app_control, NULL, NULL);
+
+       if(ret != APP_CONTROL_ERROR_NONE) {
+               MYACCOUNT_SLOGE("(%s) launch fail. ret(%x)\n", TIZEN_ACCOUNT_APPID, ret);
+               _myaccount_common_try_relaunch(ad, app_control);
+               return 0;
+       }
+
+       ret = app_control_destroy(app_control);
+
+       return ret;
+}
+
+static Eina_Bool _myaccount_common_launch_application_timer_cb(void *data)
+{
+       myaccount_appdata *ad = (myaccount_appdata *)data;
+
+       if(!ad){
+               return ECORE_CALLBACK_CANCEL;
+       }
+
+       if(ad->progress_timer){
+               ecore_timer_del(ad->progress_timer);
+               ad->progress_timer = NULL;
+       }
+
+       MYACCOUNT_DBUG("ad->item_selected_state=%d\n",  myaccount_common_get_item_selected_state());
+
+       return ECORE_CALLBACK_CANCEL;
+}
+
+static void _myaccount_common_launch_timer_start(myaccount_appdata *ad)
+{
+       if(ad->progress_timer){
+               ecore_timer_del(ad->progress_timer);
+               ad->progress_timer = NULL;
+       }
+
+       ad->progress_timer = ecore_timer_add(MYACCOUNT_LAUNCH_TIME_OUT, _myaccount_common_launch_application_timer_cb, ad);
+}
+
+static bool _myaccount_common_is_email_count_max()
+{
+       int cnt1 = 0, cnt2 = 0, cnt3 = 0, count = 0;
+
+       myaccount_common_get_account_cnt_by_appid("email-setting-efl", &cnt1);
+       myaccount_common_get_account_cnt_by_appid("com.samsung.google-service-account", &cnt2);
+       myaccount_common_get_account_cnt_by_appid("activesync-ui", &cnt3);
+       count = cnt1 + cnt2 + cnt3;
+
+       MYACCOUNT_DBUG("count(%d)cnt1(%d)cnt2(%d)cnt3(%d)", count, cnt1, cnt2, cnt3);
+       if(count >= MYACCOUNT_MAX_EMAIL_COUNT){
+               return TRUE;
+       }
+       return FALSE;
+}
+
+int  myaccount_common_launch_application(MyAccountRequestViewType
+                                                                                                               request_type,
+                                                                                                               char *package_name,
+                                                                                                               char *username,
+                                                                                                               char *email_sp,
+                                                                                                               int account_id,
+                                                                                                               MyAccountProviderType sp_type,
+                                                                                                               void *data )
+{
+       int ret = APP_CONTROL_ERROR_NONE;
+       app_control_h app_control = NULL;
+       myaccount_appdata *ad = (myaccount_appdata *) data;
+       char win_id_buf[64]={0,};
+       char id_buf[64] = {0,};
+
+       if (!ad || !package_name) {
+               MYACCOUNT_SLOGE("myaccount_common_launch_application: App data=%p, package_name=%p\n",
+                                                       ad, package_name);
+               return 0;
+       }
+
+       MYACCOUNT_SLOGD("trying to launch (%s)\n", package_name);
+
+       ad->win_id = elm_win_xwindow_get(ad->win_main);
+       MA_SNPRINTF(win_id_buf, sizeof(win_id_buf)-1, "%d", ad->win_id);
+
+       if(!strcmp(package_name,SAMSUNG_ACCOUNT_APPID)){
+
+               _myaccount_common_launch_samsung_account(ad);
+               _myaccount_common_launch_timer_start(ad);
+
+               MA_MEMFREE(package_name);
+               return ret;
+       } else {
+               ret = app_control_create(&app_control);
+               ret = app_control_set_window(app_control, ad->win_id);
+               ret = app_control_set_app_id(app_control, package_name);
+               if(ad->caller_userdata) {
+                       ret = app_control_add_extra_data(app_control, "myaccount_userdata", ad->caller_userdata);
+               }
+       }
+
+       if (ret != APP_CONTROL_ERROR_NONE)
+               MYACCOUNT_ERROR("myaccount_common_launch_application: service_set_package failed\n");
+
+       switch (request_type) {
+               case MYACCOUNT_REQUEST_SIGNIN :
+                               //Check MAX synchronise count
+                               if(strcmp(package_name,"setting-synchronise-efl") == 0){
+                                       int ret = -1, sync_cnt = 0;
+                                       char* synchronise_count = NULL;
+                                       ret = account_connect();
+                                       if(ret != ACCOUNT_ERROR_NONE) {
+                                               MYACCOUNT_ERROR("Account connect fail (%x)\n", ret);
+                                       }
+                                       ret = account_query_account_by_package_name(_myaccount_common_synchronise_query_cb, "setting-synchronise-efl", (void*)&synchronise_count);
+                                       if(ret != ACCOUNT_ERROR_NONE) {
+                                               MYACCOUNT_ERROR("account_query_account_by_package_name fail (%x)\n", ret);
+                                       }
+
+                                       if(synchronise_count)
+                                               sync_cnt = atoi(synchronise_count);
+
+                                       if(sync_cnt >= 5) {
+                                               // draw popup and return
+                                               char buf[256]={0,};
+
+                                               MA_SNPRINTF(buf, sizeof(buf), "Synchronise profile is full");
+                                               _myaccount_common_add_popup(ad->layout_main, buf, "Error");
+                                               myaccount_common_set_item_selected_state(FALSE);
+                                               MA_MEMFREE(synchronise_count);
+                                               if(app_control)
+                                                       app_control_destroy(app_control);
+                                               return -1;
+                                       }
+                               }else if(!strcmp(package_name,TIZEN_ACCOUNT_APPID)){
+
+                                       _myaccount_common_launch_tizen_account(ad);
+                                       if(app_control)
+                                               app_control_destroy(app_control);
+                                       _myaccount_common_launch_timer_start(ad);
+
+                                       MA_MEMFREE(package_name);
+                                       return ret;
+                               } else if(strcmp(package_name,"email-setting-efl") == 0 ||
+                                               strcmp(package_name,"com.samsung.google-service-account") == 0 ||
+                                               strcmp(package_name,"activesync-ui") == 0){
+                                       char buf[256]={0,};
+
+                                       MYACCOUNT_DBUG("package_name[%s] check max count\n");
+                                       if( _myaccount_common_is_email_count_max(ad) == TRUE ){
+                                               MA_SNPRINTF(buf, sizeof(buf), dgettext(MA_UG_NAME,      "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED"));
+                                               _myaccount_common_add_popup(ad->layout_main, buf, NULL);
+                                               myaccount_common_set_item_selected_state(FALSE);
+                                               if(app_control)
+                                                       app_control_destroy(app_control);
+                                               return -1;
+                                       }
+
+#ifdef _MULTI_WINDOW_ENABLE_
+                                       unsigned int layout = 0;
+                                       if( ecore_x_window_prop_card32_get( elm_win_xwindow_get( (Evas_Object*)ad->win_main ),
+                                                                              ECORE_X_ATOM_E_WINDOW_DESKTOP_LAYOUT, &layout, 1 ) != -1 )
+                                       {
+                                               if( layout == 0 || layout == 1)
+                                               {
+                                                       app_control_add_extra_data( app_control, "window_startup_type", "2");
+                                                       char temp[10] = {0,};
+                                                       snprintf( temp, sizeof(temp), "%d", (int)layout );
+                                                       app_control_add_extra_data( app_control, "window_layout_id", temp);
+                                               }
+                                       }
+                                       MYACCOUNT_SLOGD("### MULTI WINDOW: call with multi win params");
+#endif
+
+
+                               }
+
+                               app_control_set_operation(app_control, ACCOUNT_OPERATION_SIGNIN);
+                               if(email_sp && strlen(email_sp) > 0) {
+                                       app_control_add_extra_data(app_control, "http://tizen.org/account/data/service_provider", email_sp);
+                               }
+
+                               if(sp_type == MYACCOUNT_TYPE_CSC) {
+                                       app_control_add_extra_data(app_control, "http://tizen.org/account/data/csc", email_sp);
+                               }
+
+                       break;
+               case MYACCOUNT_REQUEST_VIEW :
+                       if(!username) {
+                               MYACCOUNT_ERROR("myaccount_common_launch_application: username=%p !!!\n",
+                                                               username);
+                               MA_MEMFREE(package_name);
+                               if(app_control)
+                                       app_control_destroy(app_control);
+                               return 0;
+                       }
+
+                       MA_SNPRINTF(id_buf, sizeof(id_buf), "%d", account_id);
+                       ret = app_control_add_extra_data(app_control, ACCOUNT_DATA_ID, id_buf);
+                       ret = app_control_set_operation(app_control, ACCOUNT_OPERATION_VIEW);
+                       ret = app_control_add_extra_data(app_control, ACCOUNT_DATA_USERNAME,username);
+                       break;
+               default :
+                       MA_MEMFREE(username);
+                       MA_MEMFREE(package_name);
+                       app_control_destroy(app_control);
+                       return 0;
+       }
+       MYACCOUNT_SLOGD("myaccount_common_launch_application request type=%d, package name = %s\n",
+                                                       request_type, package_name);
+
+       ret = app_control_add_extra_data(app_control, "XWINDOW_ID", win_id_buf);
+       ret = app_control_send_launch_request(app_control, NULL, NULL);
+
+       MA_MEMFREE(username);
+       MA_MEMFREE(package_name);
+
+       if(ret != APP_CONTROL_ERROR_NONE) {
+               MYACCOUNT_SLOGE("(%s) launch fail. ret(%x)\n", package_name, ret);
+//             char buf[64]={0,};
+//             MA_SNPRINTF(buf, sizeof(buf), "Launch fail (%x)", ret);
+//             _myaccount_common_add_popup(ad->win_main, buf, "Error");
+//             ad->item_selected_state = FALSE;
+               _myaccount_common_try_relaunch(ad, app_control);
+               return 0;
+       }
+
+       app_control_destroy(app_control);
+       _myaccount_common_launch_timer_start(ad);
+
+       return ret;
+}
+
+
+Evas_Object *myaccount_common_progress_add(Evas_Object *parent)
+{
+       if (!parent) {
+               MYACCOUNT_ERROR("myaccount_common_progress_add: parent is NULL \n");
+               return NULL;
+       }
+       Evas_Object *progressbar = NULL;
+       progressbar = elm_progressbar_add(parent);
+       elm_object_style_set(progressbar, "list_process");
+       evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5);
+       evas_object_size_hint_weight_set(progressbar,
+                                               EVAS_HINT_EXPAND,
+                                               EVAS_HINT_EXPAND);
+       evas_object_show(progressbar);
+       elm_progressbar_pulse(progressbar, EINA_TRUE);
+       return progressbar;
+}
+
+void myaccount_common_delete_modal_popup(Evas_Object *popup)
+{
+       if (!popup){
+               MYACCOUNT_ERROR("myaccount_common_delete_modal_popup: popup is NULL \n");
+               return;
+       }
+       evas_object_del(popup);
+}
+
+Eina_Bool myaccount_common_modal_popup_timer_cb(gpointer data)
+{
+       if (!data) {
+               MYACCOUNT_ERROR("myaccount_common_modal_popup_timer_cb: data is NULL \n");
+               return false;
+       }
+       myaccount_appdata *global_data = NULL;
+       global_data = (myaccount_appdata*)data;
+       if (global_data->modal_popup) {
+               myaccount_common_delete_modal_popup(global_data->modal_popup);
+               global_data->modal_popup = NULL;
+       }
+       if (global_data->progress_timer) {
+               ecore_timer_del(global_data->progress_timer);
+               global_data->progress_timer = NULL;
+       }
+       return false;
+}
+
+int myaccount_common_get_all_account_cnt(int *count)
+{
+       int error_code = -1;
+       int account_cnt = 0;
+       if (!count) {
+               MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: count ptr is NULL \n");
+               return error_code;
+       }
+       error_code = account_connect();
+       if (error_code != ACCOUNT_ERROR_NONE) {
+               MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: fail to connect account DB \n");
+               return error_code;
+       }
+       error_code = account_get_total_count_from_db(&account_cnt);
+       if (error_code != ACCOUNT_ERROR_NONE) {
+               int ret = ACCOUNT_ERROR_NONE;
+               ret = account_disconnect();
+               if (ret != ACCOUNT_ERROR_NONE) {
+                       MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_disconnect fail(%d) \n",
+                                                               ret);
+               }
+               return error_code;
+       }
+       *count = account_cnt;
+       error_code = account_disconnect();
+       if (error_code != ACCOUNT_ERROR_NONE) {
+               MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_get_count fail(%d) \n",
+                                               error_code);
+               return error_code;
+       }
+       return ACCOUNT_ERROR_NONE;
+}
+
+static bool _myaccount_common_query_cb(account_h account, void *user_data)
+{
+       int* tmp_count = (int*)user_data;
+
+       *tmp_count = *tmp_count + 1;
+
+       return TRUE;
+}
+
+int myaccount_common_get_account_cnt_by_capability(const char* capability_type, int *count)
+{
+       int error_code = -1;
+       int account_cnt = 0;
+       if (!count) {
+               MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_capability: count ptr is NULL \n");
+               return error_code;
+       }
+       error_code = account_connect();
+       if (error_code != ACCOUNT_ERROR_NONE) {
+               MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_capability: fail to connect account DB \n");
+               return error_code;
+       }
+
+       error_code = account_query_account_by_capability_type(_myaccount_common_query_cb, capability_type, &account_cnt);
+       if (error_code != ACCOUNT_ERROR_NONE) {
+
+               *count = 0;
+
+               int ret = ACCOUNT_ERROR_NONE;
+               ret = account_disconnect();
+               if (ret != ACCOUNT_ERROR_NONE) {
+                       MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_capability: account_svc_disconnect fail(%d) \n",
+                                                               ret);
+               }
+               return error_code;
+       }
+       *count = account_cnt;
+       error_code = account_disconnect();
+       if (error_code != ACCOUNT_ERROR_NONE) {
+               MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_get_count fail(%d) \n",
+                                               error_code);
+               return error_code;
+       }
+       return ACCOUNT_ERROR_NONE;
+}
+
+int myaccount_common_get_account_cnt_by_appid(const char* appid, int *count)
+{
+       int error_code = -1;
+       int account_cnt = 0;
+       if (!count) {
+               MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_appid: count ptr is NULL \n");
+               return error_code;
+       }
+       error_code = account_connect();
+       if (error_code != ACCOUNT_ERROR_NONE) {
+               MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_appid: fail to connect account DB \n");
+               return error_code;
+       }
+
+       error_code = account_query_account_by_package_name(_myaccount_common_query_cb, appid, &account_cnt);
+
+       if (error_code != ACCOUNT_ERROR_NONE) {
+
+               *count = 0;
+
+               int ret = ACCOUNT_ERROR_NONE;
+               ret = account_disconnect();
+               if (ret != ACCOUNT_ERROR_NONE) {
+                       MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_appid: account_svc_disconnect fail(%d) \n",
+                                                               ret);
+               }
+               return error_code;
+       }
+       *count = account_cnt;
+       error_code = account_disconnect();
+       if (error_code != ACCOUNT_ERROR_NONE) {
+               MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_appid: account_svc_get_count fail(%d) \n",
+                                               error_code);
+               return error_code;
+       }
+       return ACCOUNT_ERROR_NONE;
+}
+
+static int _myaccount_common_pkmgr_return_cb(int req_id, const char *pkg_type,
+                                       const char *pkg_name,
+                                       const char *key,
+                                       const char *val,
+                                       const void *pmsg,
+                                       void *data)
+{
+       MYACCOUNT_SLOGD(" _myaccount_common_pkmgr_return_cb: pkg_type = %s, pkg_name = %s, key = %s, val = %s\n", pkg_type, pkg_name,key,val);
+
+       int error_code = -1;
+       int count = -1;
+       if( strcmp(key, "end") == 0 && strcmp(val, "ok") == 0) {
+
+               myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();
+
+               if (!appdata) {
+                       MYACCOUNT_ERROR("App data NULL!!! \n");
+                       return -1;
+               }
+               if(appdata->capability_filter && strlen(appdata->capability_filter)){
+                       if(!strcmp(appdata->capability_filter, "http://tizen.org/account/capability/tizen_email")){
+                               int cnt1 = 0;
+                               int cnt2 = 0;
+                               int cnt3 = 0;
+                               error_code = myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID, &cnt1);
+                               error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt2);
+                               error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt3);
+                               count = cnt1+cnt2+cnt3;
+                       } else {
+                               error_code = myaccount_common_get_account_cnt_by_capability(appdata->capability_filter, &count);
+                       }
+
+                       if (error_code != ACCOUNT_ERROR_NONE) {
+                               MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n",
+                                                                                       error_code);
+                       }
+               } else {
+                       error_code = myaccount_common_get_all_account_cnt(&count);
+                       if (error_code != ACCOUNT_ERROR_NONE) {
+                               MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n",
+                                                                                       error_code);
+                       }
+               }
+
+               if (appdata->eMode == eMYACCOUNT_ACCOUNT_LIST) {
+                       if (count > 0) {
+                               if (appdata->add_genlist) {
+                                       evas_object_del(appdata->add_genlist);
+                                       appdata->add_genlist = NULL;
+                                       elm_naviframe_item_pop(appdata->navi_bar);
+                               }
+                               if (appdata->account_genlist) {
+                                       myaccount_list_refresh_item_list(appdata);
+                               } else {
+                                       myaccount_ug_account_list_create((void*)appdata);
+                               }
+                       } else {
+                               if (appdata->add_genlist) {
+                                       evas_object_show(appdata->add_genlist);
+                               } else {
+                                       myaccount_addaccount_create_view(appdata);
+                               }
+                       }
+               } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) {
+                       if (appdata->ug) {
+                               ui_gadget_h ug = appdata->ug;
+                               error_code = ug_destroy_me(ug);
+                       }
+               } else {
+                       //MYACCOUNT_WARNING("Unknown mode !!!");
+               }
+               return 0;
+       }
+       return 0;
+}
+
+void myaccount_common_listen_pkgmgr_for_pkg_uninstall()
+{
+       myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();
+
+       if (!appdata) {
+               MYACCOUNT_ERROR("App data NULL!!! \n");
+               return;
+       }
+
+       int result = 0;
+       pkgmgr_client *pc = NULL;
+       pc = pkgmgr_client_new(PC_LISTENING);
+       if(pc == NULL) {
+               MYACCOUNT_ERROR("pc is NULL\n");
+               return;
+       }
+       appdata->pc = pc;
+       result = pkgmgr_client_listen_status(pc, _myaccount_common_pkmgr_return_cb, pc);
+       if(result < 0)
+       {
+               MYACCOUNT_ERROR("status listen failed!\n");
+               return;
+       }
+}
+
+
+int myaccount_common_get_csc_sp_count(const char* capability_filter)
+{
+       dictionary* dic = NULL;
+       int sp_count = -1;
+
+       if(capability_filter) {
+               // tizen email, email, none case, read csc email provider
+               // otherwise ignore csc list
+               if(strcmp(capability_filter, "http://tizen.org/account/capability/tizen_email")
+                       && strcmp(capability_filter, "http://tizen.org/account/capability/email"))
+                       return 0;
+       }
+
+       // check ini file /opt/system/csc-default/data/csc-default-data-email-account.ini
+       dic = iniparser_load(TIZEN_EMAIL_CSC_FILE_PATH);
+       if(!dic){
+               MYACCOUNT_ERROR("email csc file is not exist\n");
+               return FALSE;
+       }
+
+       sp_count = iniparser_getint(dic, TIZEN_EMAIL_CSC_SP_COUNT_KEY, 0);
+
+       if(sp_count <= 0) {
+               iniparser_freedict(dic);
+               MYACCOUNT_ERROR("email sp count 0\n");
+               return 0;
+       }
+
+       iniparser_freedict(dic);
+
+       return sp_count;
+}
+
+bool myaccount_common_account_by_package_name_cb(account_h account,
+                                                                                                       void *user_data)
+{
+       return false;
+}
+
+
+static bool _myaccount_common_get_account_type_count_cb(account_type_h account_type, void *user_data)
+{
+       int *count = (int*)user_data;
+       char* type_buf = NULL;
+       int type_int = -1;
+
+       if(account_type == NULL) {
+               MYACCOUNT_ERROR(" account type handle is NULL \n");
+               return FALSE;
+       }
+
+       account_type_get_app_id(account_type, &type_buf);
+
+       if(!type_buf) return FALSE;
+
+       if(!strcmp(type_buf, "email-setting-efl")) {
+               *count = *count+3; // predefined email count
+               MA_MEMFREE(type_buf);
+               return TRUE;
+       }else if(!strcmp(type_buf, "activesync-ui")) {
+               *count = *count+1;
+               MA_MEMFREE(type_buf);
+               return TRUE;
+       } else if(!strcmp(type_buf, "com.samsung.rcs-im")
+                               || !strcmp(type_buf, "ims-service")) {
+               MA_MEMFREE(type_buf);
+               return TRUE;
+       }
+
+       account_type_get_multiple_account_support(account_type, &type_int);
+
+       if(type_int == FALSE
+               && account_query_account_by_package_name(myaccount_common_account_by_package_name_cb, type_buf, NULL) == ACCOUNT_ERROR_NONE) {
+               MYACCOUNT_SLOGD("Multiple account not support (%s)\n", type_buf);
+               MA_MEMFREE(type_buf);
+               return TRUE;
+       }
+
+       *count = *count+1;
+
+       MA_MEMFREE(type_buf);
+
+       return TRUE;
+}
+
+
+int myaccount_common_get_account_type_count(const char* capability_filter)
+{
+       int ret = -1;
+       int count = 0;
+
+       ret = account_connect();
+       if(ret != ACCOUNT_ERROR_NONE){
+               MYACCOUNT_ERROR("account database cannot be connected\n");
+               return 0;
+       }
+
+       if(capability_filter) {
+               if(!strcmp(capability_filter, "http://tizen.org/account/capability/tizen_email")){
+                       account_type_query_by_provider_feature(_myaccount_common_get_account_type_count_cb, "http://tizen.org/account/capability/email", (void*)&count);
+               }else {
+                       account_type_query_by_provider_feature(_myaccount_common_get_account_type_count_cb, capability_filter, (void*)&count);
+               }
+       }
+       else {
+               account_type_foreach_account_type_from_db(_myaccount_common_get_account_type_count_cb, (void*)&count);
+       }
+
+       MYACCOUNT_DBUG("count %d\n", count);
+
+       ret = account_disconnect();
+       if(ret != ACCOUNT_ERROR_NONE){
+               MYACCOUNT_ERROR("account database cannot be connected\n");
+               return 0;
+       }
+
+       return count;
+}
+
index 079c903..0994543 100755 (executable)
-/*\r
- * Copyright 2012  Samsung Electronics Co., Ltd\r
- *\r
- * Licensed under the Flora License, Version 1.1 (the License);\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://floralicense.org/license/\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an AS IS BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#include "myaccount_ug_account_list.h"\r
-#include "myaccount_ug_addaccount.h"\r
-#include "myaccount_ug_common.h"\r
-#include <vconf.h>\r
-#include <dlfcn.h>\r
-\r
-#ifndef UG_MODULE_API\r
-#define UG_MODULE_API __attribute__ ((visibility("default")))\r
-#endif\r
-\r
-static int g_handle_noti = 0;\r
-\r
-int myaccount_subscribe_to_account_notification_vconfkey();\r
-\r
-static gboolean __myaccount_account_list_parse_param(myaccount_mode_e\r
-                                                                                                               *mode,\r
-                                                                                                               service_h data,\r
-                                                                                                               myaccount_appdata *ad)\r
-{\r
-       if (!data || !ad) {\r
-               MYACCOUNT_DBUG("Service/App data is null!\n");\r
-               return FALSE;\r
-       } else {\r
-               char *extracted = NULL;\r
-               ad->capability_filter = NULL;\r
-               service_get_extra_data(data, "mode", &extracted);\r
-               service_get_extra_data(data, "capability_filter", &ad->capability_filter);\r
-               service_get_extra_data(data, "myaccount_userdata", &ad->caller_userdata);\r
-               service_get_extra_data(data, "from", &ad->called_from);\r
-\r
-               if (ad->capability_filter)\r
-                       MYACCOUNT_DBUG("capability_filter = %s\n", ad->capability_filter);\r
-\r
-               if (extracted) {\r
-                       MYACCOUNT_DBUG("view_account_list = %s\n", extracted);\r
-\r
-                       if (!strcmp(extracted, "account_list"))\r
-                               *mode = eMYACCOUNT_ACCOUNT_LIST;\r
-                       else if (!strcmp(extracted, "add_account"))\r
-                               *mode = eMYACCOUNT_ADD_ACCOUNT;\r
-                       else\r
-                               *mode = eMYACCOUNT_ACCOUNT_LIST;\r
-               } else {\r
-                       *mode = eMYACCOUNT_ACCOUNT_LIST;\r
-                       MYACCOUNT_DBUG("param is not view_account_list!\n");\r
-               }\r
-\r
-               MA_MEMFREE(extracted);\r
-       }\r
-       return TRUE;\r
-}\r
-\r
-void *myaccount_account_list_create(ui_gadget_h ug,\r
-                                                                       enum ug_mode mode,\r
-                                                                       service_h data, void *priv)\r
-{\r
-        MYACCOUNT_DBUG("\n myaccount_account_list_create called !!\n");\r
-        Evas_Object *parent;\r
-        myaccount_appdata *ugd;\r
-        int count = -1;\r
-        int error_code = -1;\r
-\r
-        if (!ug || !priv) {\r
-                MYACCOUNT_DBUG("myaccount_account_list_create: ug or priv is NULL \n");\r
-                return NULL;\r
-        }\r
-\r
-        bindtextdomain("ug-setting-myaccount-efl", "/usr/ug/res/locale");\r
-        ugd = (myaccount_appdata*)priv;\r
-        ugd->ug = ug;\r
-        MYACCOUNT_DBUG("ugd->ug = %p\n", ugd->ug);\r
-        ugd->eMode = 0;\r
-        parent = ug_get_parent_layout(ug);\r
-        if (!parent) {\r
-            MYACCOUNT_DBUG("myaccount_account_list_create: parent is NULL \n");\r
-                return NULL;\r
-        }\r
-        ugd->win_main = parent;\r
-        /*sbscribe to vconf noti key which will recevie notification about account update, delete and insert*/\r
-#ifdef ENABLE_NOTI\r
-        myaccount_subscribe_to_account_notification_vconfkey();\r
-#endif\r
-       /*listen to pkgmgr for uninstall of pkg*/\r
-       myaccount_common_listen_pkgmgr_for_pkg_uninstall();\r
-\r
-        __myaccount_account_list_parse_param(&ugd->eMode, data, ugd);\r
-       error_code = myaccount_common_get_all_account_cnt(&count);\r
-       if (error_code != ACCOUNT_ERROR_NONE) {\r
-               MYACCOUNT_DBUG("myaccount_account_list_create: myaccount_common_get_all_account_cnt fail(%d) \n",\r
-                                                       error_code);\r
-       }\r
-\r
-       MYACCOUNT_DBUG("\nmyaccount_account_list_create  Account count = %d  \n", count);\r
-       if (ugd->eMode == eMYACCOUNT_ACCOUNT_LIST) {\r
-               MYACCOUNT_DBUG("\n eMode is eMYACCOUNT_ACCOUNT_LIST \n");\r
-               if (count > 0) {\r
-                       myaccount_list_view_create(ugd);\r
-                       myaccount_ug_account_list_create((void*)priv);\r
-               } else if (count == 0) {\r
-                       myaccount_list_view_create(ugd);\r
-                       myaccount_addaccount_create_view(ugd);\r
-               } else {\r
-                       MYACCOUNT_DBUG("myaccount_account_list_create : invalid mode %d\n",\r
-                                                               ugd->eMode);\r
-                       myaccount_list_view_create(ugd);\r
-               }\r
-       } else if (ugd->eMode == eMYACCOUNT_ADD_ACCOUNT) {\r
-               MYACCOUNT_DBUG("\n !! eMode is eMYACCOUNT_ADD_ACCOUNT !! \n");\r
-               myaccount_list_view_create(ugd);\r
-               myaccount_addaccount_create_view(ugd);\r
-       } else {\r
-               MYACCOUNT_DBUG("myaccount_account_list_create : invalid mode %d\n",\r
-                                                               ugd->eMode);\r
-       }\r
-\r
-        return ugd->base;\r
- }\r
-\r
-bool myaccount_subscribe_callback(const char* event_type, int account_id, void* user_data)\r
-{\r
-       MYACCOUNT_DBUG("event_type (%s)\n", event_type);\r
-       MYACCOUNT_DBUG("account id (%d)\n", account_id);\r
-\r
-       myaccount_common_handle_notification(event_type);\r
-\r
-       return TRUE;\r
-}\r
-\r
-int myaccount_subscribe_to_account_notification_vconfkey()\r
-{\r
-       MYACCOUNT_DBUG("myaccount_subscribe_to_account_notification_vconfkey\n");\r
-\r
-       myaccount_appdata* ad = (myaccount_appdata*)myaccount_get_appdata();\r
-\r
-       account_subscribe_create(&ad->account_subscribe);\r
-       account_subscribe_notification(ad->account_subscribe, myaccount_subscribe_callback, NULL);\r
-       return 1;\r
-}\r
-\r
- static void myaccount_account_list_start(ui_gadget_h ug,\r
-                                                                                       service_h data, void *priv)\r
- {\r
-        MYACCOUNT_DBUG("ug start\n");\r
- }\r
-\r
- static void myaccount_account_list_pause(ui_gadget_h ug,\r
-                                                                                       service_h data, void *priv)\r
- {\r
-       __attribute__((__unused__)) myaccount_appdata *ugd;\r
-        ugd = (myaccount_appdata*)priv;\r
-\r
-        MYACCOUNT_DBUG("My account ug goes to pause state\n");\r
- }\r
-\r
- static void myaccount_account_list_resume(ui_gadget_h ug,\r
-                                                                                       service_h data, void *priv)\r
- {\r
-        myaccount_appdata *ugd;\r
-        ugd = (myaccount_appdata*)priv;\r
-        MYACCOUNT_DBUG("Myaccount ug resume\n");\r
-        ugd->item_selected_state = false;\r
-#ifndef ENABLE_NOTI\r
-        myaccount_common_handle_notification(NULL);\r
-#endif\r
-}\r
-\r
- static void myaccount_account_list_destroy(ui_gadget_h ug,\r
-                                                                                       service_h data, void *priv)\r
-{\r
-       MYACCOUNT_DBUG("myaccount_ug_destroy START[%s]", __func__);\r
-\r
-       if (!ug || !priv) {\r
-               MYACCOUNT_DBUG("myaccount_account_ug_destroy ### ug=%p, priv=%p\n",\r
-               ug, priv);\r
-               return;\r
-       }\r
-\r
-       myaccount_appdata *ugd;\r
-       ugd = (myaccount_appdata*)priv;\r
-\r
-       account_unsubscribe_notification(ugd->account_subscribe);\r
-\r
-       myaccount_destroy_appdata();\r
-\r
-       if (g_handle_noti > 0) {\r
-               g_source_remove(g_handle_noti);\r
-               g_handle_noti = 0;\r
-       }\r
-\r
-       MYACCOUNT_DBUG("Terminate Myaccount_ug_main[%s]", __func__);\r
-}\r
-\r
- static void myaccount_account_list_message(ui_gadget_h ug,\r
-                                                                                                       service_h msg,\r
-                                                                                                       service_h data,\r
-                                                                                                       void *priv)\r
- {\r
-\r
- }\r
-\r
- static void myaccount_account_list_event(ui_gadget_h ug,\r
-                                                                                                       enum ug_event event,\r
-                                                                                                       service_h data,\r
-                                                                                                       void *priv)\r
- {\r
-       switch (event) {\r
-       case UG_EVENT_LOW_MEMORY:\r
-                       MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LOW_MEMORY \n");\r
-                       break;\r
-       case UG_EVENT_LOW_BATTERY:\r
-                       MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LOW_BATTERY \n");\r
-                       break;\r
-       case UG_EVENT_LANG_CHANGE: /* old : SG_BINDTEXTDOMAIN_NOTIFY*/\r
-                       MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LANG_CHANGE \n");\r
-                       break;\r
-       case UG_EVENT_ROTATE_PORTRAIT:\r
-                       MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_PORTRAIT \n");\r
-                       break;\r
-       case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:\r
-                       MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN \n");\r
-                       break;\r
-       case UG_EVENT_ROTATE_LANDSCAPE:\r
-                       MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_LANDSCAPE \n");\r
-                       break;\r
-       case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:\r
-                       MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN \n");\r
-                       break;\r
-       default:\r
-                       MYACCOUNT_DBUG("myaccount_account_list_event: default !!! \n");\r
-                       break;\r
-        }\r
- }\r
-\r
-static void myaccount_on_key_event(ui_gadget_h ug,\r
-                                                                                                       enum ug_key_event event ,\r
-                                                                                                       service_h data,\r
-                                                                                                       void * priv)\r
-{\r
-       MYACCOUNT_DBUG("myaccount_on_key_event START[%s]", __func__);\r
-       if(!ug) {\r
-               MYACCOUNT_DBUG("myaccount_on_key_event ug is NULL !!!");\r
-               return;\r
-       }\r
-       switch (event) {\r
-               case UG_KEY_EVENT_END:\r
-                       ug_destroy_me(ug);\r
-                       MYACCOUNT_DBUG("myaccount_on_key_event: UG_KEY_EVENT_END \n");\r
-                       break;\r
-               default:\r
-                       MYACCOUNT_DBUG("myaccount_on_key_event: default !!! \n");\r
-                       break;\r
-       }\r
-       MYACCOUNT_DBUG("myaccount_on_key_event END[%s]", __func__);\r
-}\r
-\r
-UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)\r
-{\r
-        MYACCOUNT_DBUG ("\n UG_MODULE_INIT is called !!! \n");\r
-        myaccount_appdata *ugd;\r
-        if (!ops) {\r
-                MYACCOUNT_DBUG("UG_MODULE_INIT ops is NULL !!!");\r
-                return -1;\r
-        }\r
-        MYACCOUNT_DBUG("myaccount UG_MODULE_INIT!\n");\r
-        ugd = (myaccount_appdata*)myaccount_init_appdata();\r
-        if (!ugd) {\r
-                MYACCOUNT_DBUG("myaccount_init_appdata failed!\n");\r
-                return -1;\r
-        }\r
-        ops->create = myaccount_account_list_create;\r
-        ops->start = myaccount_account_list_start;\r
-        ops->pause = myaccount_account_list_pause;\r
-        ops->resume = myaccount_account_list_resume;\r
-        ops->destroy = myaccount_account_list_destroy;\r
-        ops->message = myaccount_account_list_message;\r
-        ops->event = myaccount_account_list_event;\r
-        ops->key_event= myaccount_on_key_event;/*to handle BACK(END)key Event recently added in UG*/\r
-        ops->priv = ugd;\r
-        ops->opt = UG_OPT_INDICATOR_ENABLE;/*UG_OPT_INDICATOR_ENABLE;*/\r
-\r
-        return 0;\r
-}\r
-\r
-UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)\r
-{\r
-       MYACCOUNT_DBUG("myaccount UG_MODULE_EXIT!\n");\r
-}\r
-\r
-typedef enum {\r
-       MYACCOUNT_RESET_FAILED = -1,\r
-       MYACCOUNT_UNDEFINED_LIB_SYMBOL = -2,\r
-       MYACCOUNT_OPERATE_LIB_SUCCESS = 0\r
-}MyAccountResetErrorCode_e;\r
-\r
-static MyAccountResetErrorCode_e\r
-__myaccount_account_exchange_reset(service_h data, void *priv)\r
-{\r
-       int (*reset) (service_h pair, void *ptr);\r
-       MyAccountResetErrorCode_e ret = MYACCOUNT_OPERATE_LIB_SUCCESS;\r
-\r
-       void *handle = dlopen("/usr/ug/lib/libug-activesync-efl.so", RTLD_LAZY);\r
-       if (!handle) {\r
-               MYACCOUNT_DBUG("Exchange library dlopen failed %s", dlerror());\r
-               return MYACCOUNT_RESET_FAILED;\r
-       }\r
-       char *error = NULL;\r
-       reset = dlsym(handle, "setting_plugin_reset");\r
-       if ((error = dlerror()) != NULL){\r
-               MYACCOUNT_DBUG(" >>>>>>>>>>> %s", error);\r
-               dlclose(handle);\r
-               return MYACCOUNT_UNDEFINED_LIB_SYMBOL;\r
-       }\r
-       if (reset)\r
-               ret = (*reset) (data, priv);\r
-\r
-       if (ret < 0) ret = MYACCOUNT_RESET_FAILED;\r
-\r
-       dlclose(handle);\r
-       return ret;\r
-}\r
-\r
-UG_MODULE_API int setting_plugin_reset(service_h data, void *priv)\r
-{\r
-       /*reset exchange account information first*/\r
-       MyAccountResetErrorCode_e ret = MYACCOUNT_OPERATE_LIB_SUCCESS;\r
-\r
-       ret = __myaccount_account_exchange_reset(data, priv);\r
-       if(ret != MYACCOUNT_OPERATE_LIB_SUCCESS) {\r
-               MYACCOUNT_DBUG("__myaccount_account_exchange_reset returns %d\n",\r
-                                                               ret);\r
-               return (int)ret;\r
-       }\r
-       return (int)MYACCOUNT_OPERATE_LIB_SUCCESS;\r
-}\r
+/*
+ *  my-account
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
+ *
+ * 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.
+ *
+ */
+
+#include "myaccount_ug_account_list.h"
+#include "myaccount_ug_addaccount.h"
+#include "myaccount_ug_common.h"
+#include <vconf.h>
+#include <dlfcn.h>
+
+#ifndef UG_MODULE_API
+#define UG_MODULE_API __attribute__ ((visibility("default")))
+#endif
+
+static myaccount_appdata *g_appdata = NULL;
+static int g_handle_noti = 0;
+
+int myaccount_subscribe_to_account_notification_vconfkey();
+static void __reset_indicator(myaccount_appdata *ugd);
+
+static void __change_ui_theme_changed_cb(keynode_t *pNode, void *pUserData)
+{
+       MYACCOUNT_DBUG("__change_ui_theme_changed_cb");
+       if(!pUserData) {
+               MYACCOUNT_ERROR("pUserDate is NULL:__vp_play_view_change_ui_theme_changed_cb.");
+               return;
+       }
+       int value = vconf_keynode_get_int(pNode);
+       MYACCOUNT_DBUG("value[%d]", value);
+
+       myaccount_appdata *ad = (myaccount_appdata*)pUserData;
+
+//     ea_theme_object_style_set(ad->layout_main, EA_THEME_STYLE_DARK);
+//     // Color Table
+//     if (ad->color_table) {
+//             ea_theme_object_colors_set(ad->layout_main, ad->color_table, EA_THEME_STYLE_DARK);
+//     }
+       ea_theme_object_style_set(ad->layout_main, EA_THEME_STYLE_LIGHT);
+       // Color Table
+       if (ad->color_table) {
+               ea_theme_object_colors_set(ad->layout_main, ad->color_table, EA_THEME_STYLE_LIGHT);
+       }
+       // Font Table
+       if (ad->font_table) {
+               ea_theme_object_fonts_set(ad->layout_main, ad->font_table);
+       }
+
+       return;
+}
+
+static void __init_changeable_resource(myaccount_appdata *ugd)
+{
+       if (!ugd) {
+               MYACCOUNT_ERROR("app data is NULL");
+               return;
+       }
+       // Color Table
+       ugd->color_table = ea_theme_color_table_new("/usr/apps/setting-myaccount-efl/res/ug-setting-cloud/shared/res/tables/com.samsung.my-account_ChangeableColorInfo.xml");
+       if (ugd->color_table) {
+//             ea_theme_object_colors_set(ugd->layout_main, ugd->color_table, EA_THEME_STYLE_DARK);
+               ea_theme_object_colors_set(ugd->layout_main, ugd->color_table, EA_THEME_STYLE_LIGHT);
+               MYACCOUNT_DBUG("color table create SUCCESS");
+       } else {
+               MYACCOUNT_ERROR("color table create fail");
+       }
+
+       // Font Table
+       ugd->font_table = ea_theme_font_table_new("/usr/apps/setting-myaccount-efl/res/ug-setting-cloud/shared/res/tables/com.samsung.my-account_ChangeableFontInfo.xml");
+       if (ugd->font_table) {
+               ea_theme_object_fonts_set(ugd->layout_main, ugd->font_table);
+               MYACCOUNT_DBUG("font table create SUCCESS");
+       } else {
+               MYACCOUNT_ERROR("font table create fail");
+       }
+
+       // regist UI theme
+       int err = 0;
+       err = vconf_notify_key_changed(VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, __change_ui_theme_changed_cb, ugd);
+       if (err != 0) {
+               MYACCOUNT_ERROR("vconf_notify_key_changed is fail [0x%x]", err);
+       }
+       MYACCOUNT_DBUG("VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT[%s]", VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT);
+
+}
+
+static void __free_changeable_resource(myaccount_appdata *ad)
+{
+       if (!ad) {
+               MYACCOUNT_ERROR("app data is NULL");
+               return;
+       }
+       vconf_ignore_key_changed( VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, __change_ui_theme_changed_cb );
+       if (ad->color_table != NULL) {
+//             ea_theme_colors_unset(ad->color_table, EA_THEME_STYLE_DARK);
+               ea_theme_colors_unset(ad->color_table, EA_THEME_STYLE_LIGHT);
+               ea_theme_color_table_free(ad->color_table);
+               ad->color_table = NULL;
+       }
+       if (ad->font_table != NULL) {
+               ea_theme_font_table_free(ad->font_table);
+               ad->font_table = NULL;
+       }
+}
+
+static void lang_changed(void * priv)
+{
+       if (!priv) {
+               MYACCOUNT_SLOGE("lang_changed ### priv=%p\n", priv);
+               return ;
+       }
+
+       myaccount_appdata *ugd;
+       ugd = (myaccount_appdata*)priv;
+
+       char* language = NULL;
+       language = vconf_get_str(VCONFKEY_LANGSET);
+
+       if(language) {
+               char tmp_buf[6]={0,};
+               MA_STRNCPY(tmp_buf, language, 6);
+               ugd->current_language = strdup(tmp_buf);
+       }
+
+       elm_object_item_text_set (ugd->nf_it, dgettext(MA_UG_NAME, "IDS_MA_HEADER_ACCOUNTS"));
+       myaccount_list_refresh_item_list(ugd);
+
+       if( ugd->add_genlist ) {
+               // title text update
+               elm_object_item_text_set (ugd->add_nf_it, dgettext(MA_UG_NAME, "IDS_MA_HEADER_ADD_ACCOUNT"));
+               myaccount_addaccount_refresh_item_list(ugd);
+       } else {
+               MYACCOUNT_SLOGE("lang_changed ### ugd->add_genlist is NULL\n");
+       }
+}
+
+
+static gboolean __myaccount_account_list_parse_param(myaccount_mode_e
+                                                                                                               *mode,
+                                                                                                               app_control_h data,
+                                                                                                               myaccount_appdata *ad)
+{
+       if (!data || !ad) {
+               return FALSE;
+       } else {
+               char *extracted = NULL;
+               ad->capability_filter = NULL;
+               app_control_get_extra_data(data, "mode", &extracted);
+               app_control_get_extra_data(data, "capability_filter", &ad->capability_filter);
+               app_control_get_extra_data(data, "myaccount_userdata", &ad->caller_userdata);
+               app_control_get_extra_data(data, "from", &ad->called_from);
+               if (extracted) {
+                       MYACCOUNT_SLOGD("view_account_list = %s\n", extracted);
+
+                       if (!strcmp(extracted, "account_list"))
+                               *mode = eMYACCOUNT_ACCOUNT_LIST;
+                       else if (!strcmp(extracted, "add_account"))
+                               *mode = eMYACCOUNT_ADD_ACCOUNT;
+                       else
+                               *mode = eMYACCOUNT_ACCOUNT_LIST;
+               } else {
+                       *mode = eMYACCOUNT_ACCOUNT_LIST;
+               }
+
+               MA_MEMFREE(extracted);
+       }
+       return TRUE;
+}
+
+static void __save_indicator_state(myaccount_appdata *ugd)
+{
+       /* Save old view's indicator values */
+       ugd->indi_mode = elm_win_indicator_mode_get(ugd->win_main);
+       ugd->indi_o_mode = elm_win_indicator_opacity_get(ugd->win_main);
+       /* Save old view's overlap mode */
+       ugd->overlap_mode = (int)evas_object_data_get(ugd->conformant, "overlap");
+       MYACCOUNT_DBUG("indi_o_mode: %d, indi_mode: %d", ugd->indi_o_mode,      ugd->indi_mode);
+       MYACCOUNT_DBUG("overlap_mode: %d", ugd->overlap_mode);
+}
+
+void *myaccount_account_list_create(ui_gadget_h ug,
+                                                                       enum ug_mode mode,
+                                                                       app_control_h data, void *priv)
+{
+        Evas_Object *parent;
+        myaccount_appdata *ugd;
+        int count = -1;
+        int error_code = -1;
+
+        if (!ug || !priv) {
+                return NULL;
+        }
+
+
+        bindtextdomain("setting-myaccount-efl", "/usr/apps/setting-myaccount-efl/res/locale");
+        ugd = (myaccount_appdata*)priv;
+        ugd->ug = ug;
+        ugd->eMode = 0;
+        parent = (Evas_Object *)ug_get_window();
+        if (!parent) {
+                return NULL;
+        }
+        g_appdata = ugd;
+
+       ugd->win_main = parent;
+       Evas_Object *conformant = (Evas_Object *)ug_get_conformant();
+       __save_indicator_state(ugd);
+
+       Evas_Object *indi_bg = elm_bg_add(conformant);
+       elm_object_style_set(indi_bg, "indicator/headerbg");
+       elm_object_part_content_set(conformant, "elm.swallow.indicator_bg", indi_bg);
+       evas_object_show(indi_bg);
+       ugd->conformant = conformant;
+       __reset_indicator(ugd);
+
+        /*sbscribe to vconf noti key which will recevie notification about account update, delete and insert*/
+#ifdef ENABLE_NOTI
+        myaccount_subscribe_to_account_notification_vconfkey();
+#endif
+       /*listen to pkgmgr for uninstall of pkg*/
+       myaccount_common_listen_pkgmgr_for_pkg_uninstall();
+
+        __myaccount_account_list_parse_param(&ugd->eMode, data, ugd);
+
+       if( ugd->capability_filter
+               && strlen(ugd->capability_filter) > 0 ) {
+
+               if(!strcmp(ugd->capability_filter, "http://tizen.org/account/capability/tizen_email")){
+                       int cnt1 = 0;
+                       int cnt2 = 0;
+                       int cnt3 = 0;
+                       error_code = myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID, &cnt1);
+                       error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt2);
+                       error_code = myaccount_common_get_account_cnt_by_appid(GOOGLE_ACCOUNT_APPID, &cnt3);
+                       count = cnt1+cnt2+cnt3;
+               } else {
+                       error_code = myaccount_common_get_account_cnt_by_capability(ugd->capability_filter, &count);
+               }
+
+               if (error_code != ACCOUNT_ERROR_NONE) {
+                       MYACCOUNT_SLOGE("myaccount_account_list_create: myaccount_common_get_all_account_cnt fail(%d) \n",
+                                                               error_code);
+               }
+
+       } else {
+               error_code = myaccount_common_get_all_account_cnt(&count);
+               if (error_code != ACCOUNT_ERROR_NONE) {
+                       MYACCOUNT_SLOGE("myaccount_account_list_create: myaccount_common_get_all_account_cnt fail(%d) \n",
+                                                               error_code);
+               }
+       }
+
+       char* language = NULL;
+       language = vconf_get_str(VCONFKEY_LANGSET);
+
+       if(language) {
+               char tmp_buf[6]={0,};
+
+               MA_STRNCPY(tmp_buf, language, 6);
+
+               ugd->current_language = strdup(tmp_buf);
+       }
+
+       myaccount_list_view_create(ugd);
+
+       __init_changeable_resource(ugd);
+
+       myaccount_list_navi_create(ugd);
+
+       if (ugd->eMode == eMYACCOUNT_ACCOUNT_LIST) {
+               if (count > 0) {
+                       myaccount_ug_account_list_create((void*)priv);
+               } else if (count == 0) {
+                       myaccount_addaccount_create_view(ugd);
+               } else {
+                       MYACCOUNT_ERROR("add list count(%d)", count);
+               }
+       } else if (ugd->eMode == eMYACCOUNT_ADD_ACCOUNT) {
+               myaccount_addaccount_create_view(ugd);
+       }
+
+        return ugd->base;
+ }
+
+bool myaccount_subscribe_callback(const char* event_type, int account_id, void* user_data)
+{
+       myaccount_common_handle_notification(event_type);
+
+       return TRUE;
+}
+
+int myaccount_subscribe_to_account_notification_vconfkey()
+{
+       myaccount_appdata* ad = (myaccount_appdata*)myaccount_get_appdata();
+       int ret = -1;
+
+       if(!ad) return 0;
+
+       ret = account_subscribe_create(&ad->account_subscribe);
+       if(ret != ACCOUNT_ERROR_NONE){
+               MYACCOUNT_ERROR("account_subscribe_create fail");
+               return 0;
+       }
+       ret = account_subscribe_notification(ad->account_subscribe, myaccount_subscribe_callback, NULL);
+       if(ret != ACCOUNT_ERROR_NONE){
+               MYACCOUNT_ERROR("account_subscribe_notification fail");
+               return 0;
+       }
+
+       return 1;
+}
+
+ static void myaccount_account_list_start(ui_gadget_h ug, app_control_h data, void *priv)
+ {
+        //MYACCOUNT_DBUG("ug start\n");
+ }
+
+ static void myaccount_account_list_pause(ui_gadget_h ug, app_control_h data, void *priv)
+ {
+       __attribute__((__unused__)) myaccount_appdata *ugd;
+        ugd = (myaccount_appdata*)priv;
+
+        MYACCOUNT_DBUG("My account ug goes to pause state\n");
+ }
+
+ static void myaccount_account_list_resume(ui_gadget_h ug, app_control_h data, void *priv)
+ {
+        myaccount_appdata *ugd;
+        ugd = (myaccount_appdata*)priv;
+        MYACCOUNT_DBUG("Myaccount ug resume\n");
+       myaccount_common_set_item_selected_state(false);
+#ifndef ENABLE_NOTI
+        myaccount_common_handle_notification(NULL);
+#endif
+
+       char* language = NULL;
+       language = vconf_get_str(VCONFKEY_LANGSET);
+
+       if(language && (strcmp(language, ugd->current_language) == 0)) {
+               lang_changed(priv);
+       } else {
+               /* refresh item to update font size */
+               myaccount_list_refresh_item_list(ugd);
+               if( ugd->add_genlist ) {
+                       myaccount_addaccount_refresh_item_list(ugd);
+               }
+       }
+}
+
+ static void __reset_indicator(myaccount_appdata *ugd)
+ {
+       if (!ugd) {
+               MYACCOUNT_SLOGE("__reset_indicator ### ugd=%p\n",ugd);
+               return;
+       }
+       MYACCOUNT_DBUG("indi_o_mode: %d, indi_mode: %d", ugd->indi_o_mode,      ugd->indi_mode);
+       MYACCOUNT_DBUG("overlap_mode: %d", ugd->overlap_mode);
+        /* Set old view's indicator */
+        elm_win_indicator_mode_set(ugd->win_main, ugd->indi_mode);
+        elm_win_indicator_opacity_set(ugd->win_main, ugd->indi_o_mode);
+        /* set old view's conformant overlap mode
+                if layout is different with new view and needs starts from (0,60) */
+        if (!ugd->overlap_mode) {
+                elm_object_signal_emit(ugd->conformant,
+                                               "elm,state,indicator,nooverlap", "");
+                evas_object_data_set(ugd->conformant, "overlap", NULL);
+        } else {
+                elm_object_signal_emit(ugd->conformant, "elm,state,indicator,overlap", "");
+                evas_object_data_set(ugd->conformant, "overlap", (void *)EINA_TRUE);
+        }
+        MYACCOUNT_DBUG("__reset_indicator\n");
+ }
+
+void myaccount_destroy_data()
+{
+       if (!g_appdata) {
+               MYACCOUNT_SLOGE("myaccount_account_ug_destroy ###  g_appdata=%p\n", g_appdata);
+               return;
+       }
+
+       myaccount_appdata *ugd = g_appdata;
+       account_unsubscribe_notification(ugd->account_subscribe);
+       ugd->account_subscribe = NULL;
+
+       __free_changeable_resource(ugd);
+       myaccount_destroy_appdata();
+
+       if (g_handle_noti > 0) {
+               g_source_remove(g_handle_noti);
+               g_handle_noti = 0;
+       }
+
+       MYACCOUNT_DBUG("Terminate Myaccount_ug_main[%s]", __func__);
+       g_appdata = NULL;
+}
+
+static void myaccount_account_list_destroy(ui_gadget_h ug, app_control_h data, void *priv)
+{
+       myaccount_destroy_data();
+}
+
+ static void myaccount_account_list_message(ui_gadget_h ug,
+                                                                                                       app_control_h msg,
+                                                                                                       app_control_h data,
+                                                                                                       void *priv)
+ {
+
+ }
+
+ static void myaccount_account_list_event(ui_gadget_h ug,
+                                                                                                       enum ug_event event,
+                                                                                                       app_control_h data,
+                                                                                                       void *priv)
+ {
+       switch (event) {
+       case UG_EVENT_LOW_MEMORY:
+//                     MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LOW_MEMORY \n");
+                       break;
+       case UG_EVENT_LOW_BATTERY:
+//                     MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LOW_BATTERY \n");
+                       break;
+       case UG_EVENT_LANG_CHANGE: /* old : SG_BINDTEXTDOMAIN_NOTIFY*/
+                       lang_changed(priv);
+                       MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LANG_CHANGE \n");
+                       break;
+       case UG_EVENT_ROTATE_PORTRAIT:
+//                     MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_PORTRAIT \n");
+                       break;
+       case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
+//                     MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN \n");
+                       break;
+       case UG_EVENT_ROTATE_LANDSCAPE:
+//                     MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_LANDSCAPE \n");
+                       break;
+       case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
+//                     MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN \n");
+                       break;
+       default:
+//                     MYACCOUNT_DBUG("myaccount_account_list_event: default !!! \n");
+                       break;
+        }
+ }
+
+static void myaccount_on_key_event(ui_gadget_h ug,
+                                                                                                       enum ug_key_event event ,
+                                                                                                       app_control_h data,
+                                                                                                       void * priv)
+{
+       if(!ug) {
+               MYACCOUNT_DBUG("myaccount_on_key_event ug is NULL !!!");
+               return;
+       }
+       switch (event) {
+               case UG_KEY_EVENT_END: {
+                               ui_gadget_h ug = ((myaccount_appdata *)priv)->ug;
+                               ug_destroy_me(ug);
+                       }
+                       break;
+               default:
+                       break;
+       }
+}
+
+UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
+{
+       myaccount_appdata *ugd;
+       if (!ops) {
+               MYACCOUNT_DBUG("UG_MODULE_INIT ops is NULL !!!");
+               return -1;
+       }
+       ugd = (myaccount_appdata*)myaccount_init_appdata();
+       if (!ugd) {
+               MYACCOUNT_DBUG("myaccount_init_appdata failed!\n");
+               return -1;
+       }
+       ops->create = myaccount_account_list_create;
+       ops->start = myaccount_account_list_start;
+       ops->pause = myaccount_account_list_pause;
+       ops->resume = myaccount_account_list_resume;
+       ops->destroy = myaccount_account_list_destroy;
+       ops->message = myaccount_account_list_message;
+       ops->event = myaccount_account_list_event;
+       ops->key_event= myaccount_on_key_event;/*to handle BACK(END)key Event recently added in UG*/
+       ops->priv = ugd;
+       ops->opt = UG_OPT_INDICATOR_ENABLE;/*UG_OPT_INDICATOR_ENABLE;*/
+
+       return 0;
+}
+
+UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
+{
+       MYACCOUNT_DBUG("myaccount UG_MODULE_EXIT!\n");
+}
+
+typedef enum {
+       MYACCOUNT_RESET_FAILED = -1,
+       MYACCOUNT_UNDEFINED_LIB_SYMBOL = -2,
+       MYACCOUNT_OPERATE_LIB_SUCCESS = 0
+}MyAccountResetErrorCode_e;
+
+static MyAccountResetErrorCode_e
+__myaccount_account_exchange_reset(app_control_h data, void *priv)
+{
+       int (*reset) (app_control_h pair, void *ptr);
+       MyAccountResetErrorCode_e ret = MYACCOUNT_OPERATE_LIB_SUCCESS;
+
+       void *handle = dlopen("/usr/ug/lib/libug-activesync-efl.so", RTLD_LAZY);
+       if (!handle) {
+               return MYACCOUNT_RESET_FAILED;
+       }
+
+       reset = dlsym(handle, "setting_plugin_reset");
+       if (dlerror() != NULL){
+               dlclose(handle);
+               return MYACCOUNT_UNDEFINED_LIB_SYMBOL;
+       }
+       if (reset)
+               ret = (*reset) (data, priv);
+
+       if (ret < 0) ret = MYACCOUNT_RESET_FAILED;
+
+       dlclose(handle);
+       return ret;
+}
+
+UG_MODULE_API int setting_plugin_reset(app_control_h data, void *priv)
+{
+       /*reset exchange account information first*/
+#ifdef TIZEN_ENGINEER_MODE
+       int error_code = -1;
+#endif
+       MyAccountResetErrorCode_e ret = MYACCOUNT_OPERATE_LIB_SUCCESS;
+
+       ret = __myaccount_account_exchange_reset(data, priv);
+       if(ret != MYACCOUNT_OPERATE_LIB_SUCCESS) {
+#ifdef TIZEN_ENGINEER_MODE
+               MYACCOUNT_SLOGE("__myaccount_account_exchange_reset returns %d\n",
+                                                               error_code);
+#endif
+               return (int)ret;
+       }
+       return (int)MYACCOUNT_OPERATE_LIB_SUCCESS;
+}
diff --git a/ug.setting-myaccount-efl.include b/ug.setting-myaccount-efl.include
deleted file mode 100755 (executable)
index 2d02762..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$1 system::homedir x
-$1 com.samsung.indicator w
-$1 system::vconf rwx
-$1 device::app_logging w
-$1 device::sys_logging w
-$1 system::use_internet r
-$1 com.samsung.dropbox r
-$1 com.samsung.facebook rx
-$1 pkgmgr::db rw
-$1 libaccounts-svc::db r
-$1 ug.setting-synchronise-efl include
-$1 samsung-account-front rx