code update

Change-Id: If31b836752f46bd34ab77d31a24cc746bbbb3bb0
author: Junyong Sim <junyong.sim@samsung.com> 2012-12-11 17:59:22 +0900
committer: Junyong Sim <junyong.sim@samsung.com> 2012-12-11 18:04:10 +0900
commit: f106fb815e5b1b45170ccb87b946fd0cb4416d6e (patch)
tree: b9dc377e17b15e11fa741418466933edee164b46
parent: 67ad215228d4bc5d8a713ce0c06d265b638e2c90 (diff)
download: ug-nfc-efl-f106fb815e5b1b45170ccb87b946fd0cb4416d6e.tar.gz
ug-nfc-efl-f106fb815e5b1b45170ccb87b946fd0cb4416d6e.tar.bz2
ug-nfc-efl-f106fb815e5b1b45170ccb87b946fd0cb4416d6e.zip
134 files changed, 4983 insertions, 1654 deletions
diff --git a/packaging/ug-nfc-efl.spec b/packaging/ug-nfc-efl.spec
index 09359a9..fc8aae1 100644
--- a/packaging/ug-nfc-efl.spec
+++ b/packaging/ug-nfc-efl.spec
@@ -4,8 +4,8 @@
 
 Name:       ug-nfc-efl
 Summary:    UI gadget about the nfc
-Version:    0.0.2
-Release:    37
+Version:    0.0.6
+Release:    0
 Group:      TO_BE/FILLED_IN
 License:    Samsung Proprietary License
 Source0:    %{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@ BuildRequires:  pkgconfig(status)
 BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  pkgconfig(capi-network-nfc)
 BuildRequires:  pkgconfig(capi-content-mime-type)
+BuildRequires:  pkgconfig(sqlite3)
 
 BuildRequires:  cmake
 BuildRequires:  edje-tools
@@ -72,10 +73,7 @@ cp -af %{_builddir}/%{name}-%{version}/packaging/ug-share-nfc-efl %{buildroot}/u
 
 %post
 
-
 %post -n ug-share-nfc-efl
-vconftool set -t string db/nfc/predefined_item "None" -u 5000 -f
-vconftool set -t int -f db/private/ug-nfc-efl/last_file_number 0 -u 5000 -f
 
 %postun
 
diff --git a/ug-nfc-setting-efl/CMakeLists.txt b/ug-nfc-setting-efl/CMakeLists.txt
index 00cb069..3eb6521 100644
--- a/ug-nfc-setting-efl/CMakeLists.txt
+++ b/ug-nfc-setting-efl/CMakeLists.txt
@@ -18,7 +18,9 @@ ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"")
 
 SET(SRCS
 src/ug-nfc-setting-main.c
+src/ug-nfc-setting-predefined-item.c
 src/ug-nfc-setting-popup.c
+src/ug-nfc-setting-db.c
 )
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -38,6 +40,7 @@ dlog
 vconf
 capi-appfw-application
 capi-network-nfc
+sqlite3
 )
 
 FOREACH(flag ${pkgs_ug_nfc_setting_CFLAGS})
diff --git a/ug-nfc-setting-efl/data/icons/setting-nfc.png b/ug-nfc-setting-efl/data/icons/setting-nfc.png
index 51145f1..e87389a 100644
--- a/ug-nfc-setting-efl/data/icons/setting-nfc.png
+++ b/ug-nfc-setting-efl/data/icons/setting-nfc.png
diff --git a/ug-nfc-setting-efl/include/ug-nfc-setting-db.h b/ug-nfc-setting-efl/include/ug-nfc-setting-db.h
new file mode 100644
index 0000000..c38b4da
--- /dev/null
+++ b/ug-nfc-setting-efl/include/ug-nfc-setting-db.h
@@ -0,0 +1,44 @@
+/*
+  * Copyright 2012  Samsung Electronics Co., Ltd
+  *
+  * Licensed under the Flora License, Version 1.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+
+  *     http://www.tizenopensource.org/license
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+
+#ifndef __UG_NFC_SETTING_DB_H__
+#define __UG_NFC_SETTING_DB_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <sqlite3.h>
+
+/************************** API **************************/
+int _ug_nfc_setting_db_open(void);
+int _ug_nfc_setting_db_close(void);
+int _ug_nfc_setting_db_open_table(int *table_handle);
+int _ug_nfc_setting_db_get_count(int *count);
+int _ug_nfc_setting_db_get_next_record(int table_handle,
+					char **app_id, char **pkgName,
+					char **iconPath, char **msgDes);
+int _ug_nfc_setting_db_get_pkgName(char *app_id, char **pkgName);
+int _ug_nfc_setting_db_close_table(int table_handle);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__UG_NFC_SETTING_DB_H__*/
+
diff --git a/ug-nfc-setting-efl/include/ug-nfc-setting-main.h b/ug-nfc-setting-efl/include/ug-nfc-setting-main.h
index d96d713..6966f61 100644
--- a/ug-nfc-setting-efl/include/ug-nfc-setting-main.h
+++ b/ug-nfc-setting-efl/include/ug-nfc-setting-main.h
@@ -22,10 +22,15 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#include <stdio.h>
 #include <ui-gadget-module.h>
 #include <Evas.h>
+#include <Ecore.h>
+#include <Ecore_X.h>
 #include <Elementary.h>
+#include <bundle.h>
 #include <dlog.h>
+#include <vconf.h>
 #include <nfc.h>
 
 #define LOCALE_PATH		LOCALEDIR
@@ -47,15 +52,17 @@ extern "C" {
 
 /* Registered string in STMS NFC */
 #define IDS_NFC_NFC					dgettext(PACKAGE, "IDS_NFC_BODY_NFC")
+#define IDS_NFC_DESCRIPTION_MSG			dgettext(PACKAGE, "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS")
 #define IDS_NFC_S_BEAM					dgettext(PACKAGE, "IDS_NFC_OPT_S_BEAM")
-#define IDS_NFC_S_BEAM_DESCRIPTION_MSG_CHN		dgettext(PACKAGE, "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN")
-#define IDS_CLOSE					dgettext("sys_string", "IDS_COM_POP_CLOSE")
-#define IDS_NONE					dgettext("sys_string", "IDS_COM_BODY_NONE")
+#define IDS_NFC_S_BEAM_DESCRIPTION_MSG		dgettext(PACKAGE, "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG")
+#define IDS_PREDEFINED_ITEM				dgettext(PACKAGE, "IDS_NFC_BODY_PREDEFINED_ITEM_ABB")
+#define IDS_PREDEFINED_ITEM_DESCRIPTION_MSG		dgettext(PACKAGE, "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG")
+#define IDS_SECURITY_POLICY_RESTRICTS_USE_OF_PS	dgettext(PACKAGE, "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS")
 
-#define IDS_PREDEFINED_ITEM				_("Predefined item")
-#define IDS_PREDEFINED_ITEM_DESCRIPTION_MSG		_("You can beam selected item to other NFC device by holding the devices close together in homescreenor main menu.")
+#define IDS_NONE					dgettext("sys_string", "IDS_COM_BODY_NONE")
+#define IDS_CLOSE					dgettext("sys_string", "IDS_COM_POP_CLOSE")
 
-#define IDS_SECURITY_POLICY_RESTRICTS_USE_OF_PS	_("Security policy restricts use of %s")
+/* will be deleted */
 #define IDS_NFC_SERVICE_IS_NOT_SUPPORTED		_("NFC service is not supported")
 
 typedef enum _NFCSettingType {
@@ -100,6 +107,14 @@ typedef struct _gl_item_data_t
 	ugdata_t *data;
 }gl_item_data;
 
+
+/************************** API **************************/
+void _change_nfc_predefined_item_setting(void *data);
+bool _ug_nfc_check_predefined_item_available(void);
+Evas_Object *_ug_nfc_create_predefined_item_list(void *data);
+void _ug_nfc_destroy_predefined_item_list(void *data, Evas_Object *obj, void *event_info);
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/ug-nfc-setting-efl/po/CMakeLists.txt b/ug-nfc-setting-efl/po/CMakeLists.txt
index 310db0a..4f23ed9 100755..100644
--- a/ug-nfc-setting-efl/po/CMakeLists.txt
+++ b/ug-nfc-setting-efl/po/CMakeLists.txt
@@ -1,7 +1,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 0.1)
 PROJECT(ug-setting-nfc-efl C)
 
-SET(POFILES en.po nl_NL.po de_DE.po zh_HK.po zh_CN.po ru_RU.po ko_KR.po zh_TW.po ja_JP.po es_ES.po el_GR.po it_IT.po tr_TR.po pt_PT.po fr_FR.po)
+SET(POFILES
+ar.po az.po bg.po ca.po cs.po da.po de_DE.po el_GR.po en.po en_PH.po 
+en_US.po es_ES.po es_MX.po et.po eu.po fi.po fr_CA.po fr_FR.po ga.po gl.po 
+hi.po hr.po hu.po hy.po is.po it_IT.po ja_JP.po ka.po kk.po ko_KR.po 
+lt.po lv.po mk.po nb.po nl_NL.po pl.po pt_BR.po pt_PT.po ro.po ru_RU.po 
+sk.po sl.po sr.po sv.po tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_SG.po zh_TW.po
+)
 
 SET(MSGFMT "/usr/bin/msgfmt")
 
diff --git a/ug-nfc-setting-efl/po/ar.po b/ug-nfc-setting-efl/po/ar.po
index 879c027..5a682e0 100644
--- a/ug-nfc-setting-efl/po/ar.po
+++ b/ug-nfc-setting-efl/po/ar.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "لإلغاء المشاركة، انقر فوق إلغاء"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "الخدمة غير متاحة. تم إيقاف تشغيل NFC‬. هل تريد تشغيل NFC؟"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "مشاركة عبر NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "قم بملامسة الهواتف ببعضها البعض برفق لمشاركتها"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "فشل التحويل"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "تقيد سياسة الأمان استخدام %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "مشترك"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "يتعذر المشاركة"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "العنصر المحدد مسبقا"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "يمكنك نقل العناصر المحددة مسبقا إلى جهاز NFC آخر. ما عليك سوى تقريب الجهازين من بعضهما (عادة من الخلف) أثناء التواجد في الشاشة الرئيسية"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "عند تشغيل NFC، يمكنك إرسال البيانات أو استلامها عند ملامسة الجهاز لأجهزة أخرى مزودة بإمكانية NFC أو علامات NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "عند تشغيل هذه الميزة، يمكنك نقل الملفات إلى أجهزة أخرى مزودة بإمكانية NFC وWi-Fi Direct بتقريب الجهازين من بعضهما. على سبيل المثال، يمكنك نقل ملفات الصور/الفيديو من الاستوديو‬‬ وملفات الموسيقى من ‏‫مشغل الموسيقى‬، وغير ذلك المزيد. فما عليك سوى تقريب الجهازين من بعضهما (عادة من الخلف) ثم النقر فوق الشاشة. يحدد التطبيق ما يتم نقله"
+
diff --git a/ug-nfc-setting-efl/po/az.po b/ug-nfc-setting-efl/po/az.po
new file mode 100644
index 0000000..15b648e
--- /dev/null
+++ b/ug-nfc-setting-efl/po/az.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Paylaşmanı ləğv etmək üçün İmtina vurun"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Xidmət mümkün deyil. NFC söndürülüb. NFC yandırılsın?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC ilə paylaş"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Paylaşmaq üçün telefonlara bir yerdə yavaşca toxunun"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Köçürmə alınmadı"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Təhlükəsizlik siyasəti %s istifadəsini məhdudlaşdırır"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Paylanmış"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Paylaşmaq mümkün deyil"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Təyin edilmiş element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Siz müəyyən elementləri başqa bir NFC cihazına köçürə bilərsiniz. Sadəcə olaraq əsas ekranda olarkən cihazları yaxınlaşdırın (adətən arxa-arxaya)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC aktiv olduqda cihazınız, NFC dəstəklənən digər cihazlara və ya NFC etiketlərinə toxunduqda məlumat göndərə və qəbul edə bilərsiniz"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Bu xüsusiyyət aktiv olduqda, siz cihazları yanaşı tutaraq faylları digər NFC və Wi-Fi Direct cihazlarına göndərə bilərsiniz. Məsələn, siz Qalereyadan təsvir/video fayllarını, Musiqi pleyerindən musiqi fayllarını və s. göndərə bilərsiniz. Sadəcə cihazları yaxınlaşdırın və (adətən arxa arxaya) və sonra ekrana vurun. Proqram göndərilənləri müəyyən edir"
+
diff --git a/ug-nfc-setting-efl/po/bg.po b/ug-nfc-setting-efl/po/bg.po
index 879c027..b9bd77e 100644
--- a/ug-nfc-setting-efl/po/bg.po
+++ b/ug-nfc-setting-efl/po/bg.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "За да отмените споделянето, чукнете Отказ"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Услугата не е достъпна. NFC е изключено. Включване на NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Споделяне през NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Леко докоснете телефоните един в друг, за да споделите"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Прехвърлянето неуспешно"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Правилата за защита ограничават използването на %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Споделен*"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Не може да се сподели"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Предв. зададен елемент"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Можете да изпращате с beam предварително зададени елементи до друго NFC устройство. Просто доближете устройствата (обикновено гърбовете им), докато сте в началния екран"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Когато NFC е включено, можете да изпращате или получавате данни, когато устройството ви докосне други устройства с възможности за NFC или NFC тагове"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Когато тази функция е включена, можете да насочвате файлове към други устройства с NFC и Wi-Fi Direct възможности, като държите устройствата близо едно до друго. Например, можете да насочвате музикални/видео файлове от Галерията, музикални файлове от Музикалния плейър и други. Просто доближете устройствата (обикновено гърбовете им) и чукнете екрана си. Приложението определя какво да се насочи"
+
diff --git a/ug-nfc-setting-efl/po/ca.po b/ug-nfc-setting-efl/po/ca.po
index 879c027..335abcb 100644
--- a/ug-nfc-setting-efl/po/ca.po
+++ b/ug-nfc-setting-efl/po/ca.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Per cancel·lar la compartició, toqui Cancel·lar"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Servei no disponible. NFC desactivat. Activar NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Compartir mitjançant NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Toqui suaument un telèfon amb l'altre per compartir"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Error de transferència"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La política de seguretat restringeix l'ús de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartit"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "No es pot compartir"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Element predefinit"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Pot transmetre elements predefinits a un altre dispositiu NFC. Només cal que ajunti els dispositius (normalment d'esquena) mentre és a la pantalla d'inici"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Quan NFC està activat, pot enviar o rebre dades quan el seu dispositiu toca altres dispositius amb capacitat NFC o etiquetes NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Quan aquesta funció està activada, pot transmetre fitxers a altres dispositius NFC o Wi-Fi Direct sostenint els dispositius prou a prop. Per exemple, pot transferir fitxers d'imatge/vídeo de la Galeria, fitxers de música del Reproductor de música, etc. Només cal que ajunti els dispositius (normalment d'esquena) i toqui la pantalla. L'aplicació determina què es transmet"
+
diff --git a/ug-nfc-setting-efl/po/cs.po b/ug-nfc-setting-efl/po/cs.po
index 879c027..412799a 100644
--- a/ug-nfc-setting-efl/po/cs.po
+++ b/ug-nfc-setting-efl/po/cs.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Chcete-li zrušit sdílení, klepněte na tlačítko Zrušit"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Služba je nedostupná. NFC bylo vypnuto. Zapnout NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Sdílet přes NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Pro sdílení se jemně dotkněte telefony"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Chyba přenosu"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Zásady zabezpečení omezují použití %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Sdíleno"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nelze sdílet"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Předdefinovaná položka"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Můžete přenést předdefinované položky do jiného zařízení podporujícího NFC. Stačí dát zařízení blízko k sobě (obvykle zadními stranami) když je zobrazena domovská obrazovka"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Když je NFC zapnuto, je možné odesílat nebo přijímat data, když se zařízením dotknete jiného zařízení podporujícího NFC nebo značky NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Když je tato funkce zapnutá, můžete přenést soubory do jiných zařízení podporujících NFC a Wi-Fi Direct tím, že podržíte zařízení u sebe. Můžete např. přenést obrázky nebo videosoubory z Galerie, hudební soubory z Hudebního přehrávače a podobně. Stačí dát zařízení k sobě (obvykle zadními stranami) a klepnout na displej. Aplikace určí, co se bude přenášet"
+
diff --git a/ug-nfc-setting-efl/po/da.po b/ug-nfc-setting-efl/po/da.po
index 879c027..eb1566c 100644
--- a/ug-nfc-setting-efl/po/da.po
+++ b/ug-nfc-setting-efl/po/da.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Tryk på Annullér for at annullere deling"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Tjeneste ikke tilgængelig. NFC deaktiveret. Aktivér NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Del via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Lad telefonerne røre hinanden forsigtigt for at dele"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Overførselsfejl"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Sikkerhedspolitik begrænser brug af %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Delt"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Kan ikke dele"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Foruddef. element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Du kan overføre foruddefinerede elementer til en anden NFC-enhed. Bring blot enhederne sæt sammen (typisk ryg mod ryg) i startskærmbilledet"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Når NFC er aktiveret, kan du sende eller modtage data, når din enhed berører andre NFC-kompatible enheder eller NFC-mærker"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Når denne funktion er aktiveret, kan du overføre filer til andre NFC- og Wi-Fi Direct-enheder ved at holde enhederne tættere sammen. F.eks. kan du overføre billed-/videofiler fra Galleri, musikfiler fra Musikafspiller og mere. Hold blot enheder sammen (typisk bagside mod bagside) og tap på din skærm. Programmet bestemmer, hvad der overføres"
+
diff --git a/ug-nfc-setting-efl/po/de_DE.po b/ug-nfc-setting-efl/po/de_DE.po
index 879c027..e04599b 100644
--- a/ug-nfc-setting-efl/po/de_DE.po
+++ b/ug-nfc-setting-efl/po/de_DE.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Tippen Sie auf „Abbrechen“, um die Freigabe abzubrechen"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Dienst nicht verfügbar. NFC deaktiviert. NFC aktivieren?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Über NFC freigeben"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Führen Sie die Telefone leicht zusammen, um freizugeben."
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Übertragungsfehler"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Sicherheitsrichtlinie schränkt die Verwendung von %s ein."
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Freigegeben"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Freigabe nicht möglich"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Vordefiniertes Objekt"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Sie können vordefinierte Objekte an ein anderes NFC-Gerät schicken. Dazu legen Sie beide Geräte nebeneinander (üblicherweise mit den Rückseiten aneinander), während diese den Startbildschirm zeigen."
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Wenn NFC aktiviert ist, können Sie Daten senden oder empfangen, wenn Ihr Gerät andere NFC-fähige Geräte oder NFC-Tags berührt."
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Wenn diese Funktion aktiviert ist, können Sie Dateien an andere NFC-fähige und Wi-Fi Direct-Geräte schicken, indem Sie die Geräte nahe nebeneinander halten. Sie können z. B. Bild- und Video-Dateien aus der Galerie sowie Musikdateien aus dem MP3-Player usw. übertragen, indem Sie die Geräte aneinanderlegen (normalerweise Rücken an Rücken) und dann auf den Bildschirm tippen. Die App bestimmt, was übertragen wird."
+
diff --git a/ug-nfc-setting-efl/po/el_GR.po b/ug-nfc-setting-efl/po/el_GR.po
index 879c027..feb9f99 100644
--- a/ug-nfc-setting-efl/po/el_GR.po
+++ b/ug-nfc-setting-efl/po/el_GR.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Για να ακυρώσετε την κοινή χρήση, πατήστε “Άκυρο”"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Η υπηρεσία δεν είναι διαθέσιμη. Το NFC είναι απενεργοποιημένο. Να ενεργοποιηθεί το NFC;"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Κοινή χρήση μέσω NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Αγγίξτε απαλά τα τηλέφωνα για κοινή χρήση"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Σφάλμα μεταφοράς"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Η πολιτική ασφαλείας περιορίζει τη χρήση %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Κοινόχρηστο"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Δεν είναι δυνατή η κοινή χρήση"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Προκαθορισμένο στοιχείο"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Μπορείτε να μεταδώσετε προκαθορισμένα στοιχεία σε άλλη συσκευή NFC. Απλώς φέρτε κοντά τις συσκευές (συνήθως “πλάτη με πλάτη”) όταν είναι ορατή η αρχική οθόνη"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Όταν το NFC είναι ενεργοποιημένο, μπορείτε να στείλετε ή να λάβετε δεδομένα όταν η συσκευή σας αγγίζει άλλες συσκευές που υποστηρίζουν τη λειτουργία NFC ή ετικέτες NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Όταν αυτή η λειτουργία είναι ενεργοποιημένη, μπορείτε να μεταδώσετε αρχεία σε συσκευές με δυνατότητα NFC και Wi-Fi Direct τοποθετώντας τις συσκευές σε κοντινή απόσταση. Για παράδειγμα, μέσω του beam μπορείτε να μεταδώσετε αρχεία εικόνων/βίντεο από τη Συλλογή, αρχεία μουσικής από το πρόγραμμα αναπαραγωγής μουσικής και ακόμη περισσότερα. Το μόνο που έχετε να κάνετε είναι να τοποθετήσετε τις συσκευές σε κοντινή απόσταση (συνήθως “πλάτη με πλάτη”) και κατόπιν να πατήσετε στην οθόνη σας. Η εφαρμογή καθορίζει τα στοιχεία που μεταδίδονται μέσω beam"
+
diff --git a/ug-nfc-setting-efl/po/en.po b/ug-nfc-setting-efl/po/en.po
index 879c027..bae7d98 100644
--- a/ug-nfc-setting-efl/po/en.po
+++ b/ug-nfc-setting-efl/po/en.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "To cancel sharing, tap Cancel"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Service not available. NFC turned off. Turn on NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Share via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Gently touch phones together to share"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Transfer failed"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Security policy restricts use of %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Shared"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Unable to share"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Predefined item"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "You can beam predefined items to another NFC device. Just bring the devices close together (typically back to back) while in the home screen"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "When NFC is on, you can send or receive data when your device touches other NFC-capable devices or NFC tags"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "When this feature is turned on, you can beam files to other NFC and Wi-Fi Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music Player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed"
+
diff --git a/ug-nfc-setting-efl/po/en_PH.po b/ug-nfc-setting-efl/po/en_PH.po
new file mode 100644
index 0000000..079985b
--- /dev/null
+++ b/ug-nfc-setting-efl/po/en_PH.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "To cancel sharing, tap Cancel"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Service not available. NFC turned off. Turn on NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Share via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Gently touch phones together to share"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Transfer failed"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Security policy restricts use of %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Shared"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Unable to share"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Predefined item"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "You can beam predefined items to another NFC device. Just bring the devices close together (typically back to back) while in the home screen"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "When NFC is on, you can send or receive data when your device touches other NFC-capable devices or NFC tags"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "When this feature is turned on, you can beam files to other NFC and Wi-Fi Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed"
+
diff --git a/ug-nfc-setting-efl/po/en_US.po b/ug-nfc-setting-efl/po/en_US.po
index 879c027..025ee43 100644
--- a/ug-nfc-setting-efl/po/en_US.po
+++ b/ug-nfc-setting-efl/po/en_US.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "To cancel sharing, tap Cancel"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Service not available. NFC turned off. Turn on NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Share via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Gently touch phones together to share"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Transfer failed"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Security policy restricts use of %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Shared"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Unable to share"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Predefined item"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "You can beam predefined items to another NFC device. Just bring the devices close together (typically back to back) while in the home screen"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "When NFC is on, you can send or receive data when your device touches other NFC-capable devices or NFC tags"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "When this feature is turned on, you can beam files to other NFC and Wi-Fi Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed."
+
diff --git a/ug-nfc-setting-efl/po/es_ES.po b/ug-nfc-setting-efl/po/es_ES.po
index 879c027..b7c9be3 100644
--- a/ug-nfc-setting-efl/po/es_ES.po
+++ b/ug-nfc-setting-efl/po/es_ES.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Para detener el uso compartido, pulse Cancelar"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Servicio no disponible. NFC apagado. ¿Encender NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Compartir mediante NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Toque un teléfono con otro con suavidad para compartir"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Error de transferencia"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La política de seguridad restringe el uso de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartido"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "No se puede compartir"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elemento predefinido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Puede transmitir elementos predefinidos a otro dispositivo NFC. Solo tiene que juntar los dispositivos (normalmente de espaldas) mientras esté en la pantalla de inicio"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Cuando NFC está activo, puede enviar o recibir datos cuando su dispositivo toca otros dispositivos con capacidad NFC o etiquetas NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Cuando esta función está activada, puede transmitir archivos a otros dispositivos NFC o Wi-Fi Direct manteniendo los dos dispositivos juntos. Por ejemplo, puede transmitir archivos de imagen/vídeo desde la Galería, archivos de música desde el Reproductor de música, etc. Solo tiene que juntar los dispositivos (normalmente de espaldas) y tocar su pantalla. La aplicación determina qué se transmite"
+
diff --git a/ug-nfc-setting-efl/po/es_MX.po b/ug-nfc-setting-efl/po/es_MX.po
new file mode 100644
index 0000000..90657c8
--- /dev/null
+++ b/ug-nfc-setting-efl/po/es_MX.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Para dejar de compartir, pulse Cancelar"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Servicio no disponible. NFC desactivado. ¿Desea activar NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Compartir mediante NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Toque levemente los teléfonos de manera que estén juntos para compartir"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Error de transferencia"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La política de seguridad restringe el uso de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartido"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "No se puede compartir"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elemento predefinido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Puede juntar elementos predefinidos con otro dispositivo NFC. Simplemente acerque los dispositivos (por lo general, por la parte posterior) mientras está en la página de inicio"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Cuando NFC está activado, puede enviar o recibir datos cuando su dispositivo toca otro dispositivo con NFC activado o con etiquetas NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Cuando esta función está activada, puede transmitir archivos a otro dispositivo NFC y Wi-Fi Directo sosteniendo y uniendo los dispositivos. Por ejemplo, puede transmitir archivos de imagen/video desde la Galería, archivos de música desde el Reproductor de música y más. Solo tiene que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, pulsar la pantalla del dispositivo. Las aplicaciones determinan el contenido que puede compartirse"
+
diff --git a/ug-nfc-setting-efl/po/et.po b/ug-nfc-setting-efl/po/et.po
new file mode 100644
index 0000000..3da73eb
--- /dev/null
+++ b/ug-nfc-setting-efl/po/et.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Jagamise tühistamiseks toksake käsul Tühista"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Teenus ei ole saadaval. NFC on välja lülitatud. Kas lülitada NFC sisse?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Jaga NFC kaudu"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Jagamiseks pange telefonid õrnalt teineteise vastu"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Edastamine nurjus"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Turvalisuse poliis piirab üksuse %s kasutamist"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Jagatud"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Ei saa jagada"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Eelistatud üksus"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Saate saata eelistatud üksusi teise NFC-seadmesse. Lihtsalt asetage avaekraaniga seadmed üksteise lähedale (tavaliselt tagaküljed kohakuti)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kui NFC on sees, saate saata või vastu võtta andmeid, kui teie seade puutub vastu teisi NFC-võimalusega seadmeid või NFC-silte"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kui see funktsioon on sisse lülitatud, saate faile üle kanda teistesse NFC ja Wi-Fi Directi seadmetesse, hoides seadmeid üksteise lähedal. Näiteks saate üle kanda pildi-/videofaile galeriist, muusikafaile MP3-mängijast jms. Lihtsalt asetage seadmed üksteise lähedale (tavaliselt tagaküljed kohakuti) ja seejärel toksake ekraani. Rakendus tuvastab, mida üle kanda"
+
diff --git a/ug-nfc-setting-efl/po/eu.po b/ug-nfc-setting-efl/po/eu.po
new file mode 100644
index 0000000..cf5cadb
--- /dev/null
+++ b/ug-nfc-setting-efl/po/eu.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Partekatzea uzteko, ukitu Utzi"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Zerbitzua ez dago erabilgarri. NFC itzalita. Piztu NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Partekatu NFC bidez"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Partekatzeko, ukitu leun telefonoak elkarrekin"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Akatsa transferitzean"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Segurtasun politikak %s erabiltzea mugatzen du"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partekatua"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Ezin da partekatu"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Aurrez zehaz. elementua"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Aurrez zehaztutako elementuak transferitu daitezke beste NFC gailu batera. Jar itzazu gailuak elkarrengandik hurbil (normalean atzeko aldeak elkartuz) pantaila nagusian zaudela"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC piztuta dagoenean, datuak bidali edo jaso ditzakezu zure gailuak NFC onartzen duen bestelako gailu bat edo NFC etiketak ukitzen dituenean"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Eginbidea piztuta dagoenean, fitxategiak transmititu ditzakezu beste NFC eta Wi-Fi Direct gailutara gailuak elkarrengatik hurbil jarrita. Esaterako, Galeriako irudi/bideo fitxategiak, Musika jogailuko musika fitxategiak eta gauza gehiago transferi ditzakezu. Gailuak bata bestearengandik hurbil jarri (atzealdeak elkar ukitzen direla) eta pantaila ukitu. Aplikazioak zehaztuko du zer eduki transmitituko den"
+
diff --git a/ug-nfc-setting-efl/po/fi.po b/ug-nfc-setting-efl/po/fi.po
index 879c027..5530f98 100644
--- a/ug-nfc-setting-efl/po/fi.po
+++ b/ug-nfc-setting-efl/po/fi.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Lopeta jakaminen napauttamalla Peruuta"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Palvelu ei ole käytettävissä. NFC on poistettu käytöstä. Otetaanko NFC käyttöön?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Jaa NFC:n kautta"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Jaa koskettamalla puhelimet varovasti toisiinsa"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Siirtovirhe"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Suojauskäytäntö estää käytön: %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Jaettu"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Ei voi jakaa"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Esimääritetty kohde"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Voit siirtää valmiiksi määritetyt kohteet toiseen NFC-laitteeseen. Aseta laitteet alkunäytössä lähelle toisiaan (yleensä niiden takaosat vastakkain)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kun NFC on käytössä, voit lähettää tai vastaanottaa tietoja, kun laitteesi koskettaa muita NFC-toimintoa tukevia laitteita tai NFC-tunnisteita"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kun tämä toiminto on käytössä, voit siirtää tiedostoja muihin NFC- ja Wi-Fi Direct -laitteisiin pitämällä laitteita lähellä toisiaan. Voit esimerkiksi lähettää kuva- ja videotiedostoja galleriasta, musiikkitiedostoja musiikkisoittimesta ja paljon muuta. Sinun ei tarvitse tehdä muuta kuin asettaa laitteet lähelle toisiaan (yleensä niiden takaosat vastakkain) ja napauttaa näyttöä. Sovellus määrittää lähetettävän sisällön"
+
diff --git a/ug-nfc-setting-efl/po/fr_CA.po b/ug-nfc-setting-efl/po/fr_CA.po
new file mode 100644
index 0000000..73b14bd
--- /dev/null
+++ b/ug-nfc-setting-efl/po/fr_CA.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Pour annuler le partage, touchez Annuler"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Service non disponible. NFC désactivé. Activer NFC ?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Partager via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Faites entrer doucement en contact les téléphones pour partager"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Erreur de transfert"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La politique de sécurité limite l'utilisation de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partagé"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Partage impossible"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Élément prédéfini"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Vous pouvez transmettre des éléments prédéfinis vers un autre périphérique NFC. Il vous suffit de rapprocher les périphériques (en général dos contre dos) lorsque l'écran d'accueil est ouvert"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Lorsque NFC est activé, vous pouvez envoyer ou recevoir des données quand votre périphérique touche d'autres périphériques compatibles NFC ou des tags NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Lorsque cette fonction est activée, vous pouvez transmettre des fichiers à d'autres périphériques NFC et Wi-Fi Direct en les rapprochant les uns des autres. Par exemple, vous pouvez transmettre des fichiers image/vidéo à partir de la galerie, des fichiers audios à partir du lecteur de musique, etc. Il vous suffit de rapprocher les périphériques (en général dos contre dos) et d'appuyer sur l'écran. L'application détermine ce qui est transmis"
+
diff --git a/ug-nfc-setting-efl/po/fr_FR.po b/ug-nfc-setting-efl/po/fr_FR.po
index 879c027..f6bcb70 100644
--- a/ug-nfc-setting-efl/po/fr_FR.po
+++ b/ug-nfc-setting-efl/po/fr_FR.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Pour annuler le partage, appuyez sur Annuler"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Service non disponible. NFC désactivé. Activer NFC ?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Partager via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Faites entrer doucement en contact les téléphones pour partager"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Échec du transfert"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La politique de sécurité limite l'utilisation de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partagé"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Partage impossible"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elément prédéfini"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Vous pouvez transmettre des éléments prédéfinis vers un autre périphérique NFC. Il vous suffit de rapprocher les périphériques (en général dos contre dos) une fois sur l'écran d'accueil"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Lorsque NFC est activé, vous pouvez envoyer ou recevoir des données quand votre périphérique touche d'autres périphériques compatibles NFC ou des tags NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Lorsque cette fonction est activée, vous pouvez transmettre des fichiers à d'autres périphériques NFC et Wi-Fi Direct en les rapprochant les uns des autres. Par exemple, vous pouvez transmettre des fichiers image/vidéo à partir de la galerie, des fichiers audio à partir du lecteur de musique, etc. Il vous suffit de rapprocher les périphériques (en général dos contre dos) et d'appuyer sur l'écran. L'application détermine ce qui est transmis"
+
diff --git a/ug-nfc-setting-efl/po/ga.po b/ug-nfc-setting-efl/po/ga.po
new file mode 100644
index 0000000..97659e9
--- /dev/null
+++ b/ug-nfc-setting-efl/po/ga.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Le comhroinnt a chur ar ceal, tapáil ar Cuir ar ceal"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Níl seirbhís ar fáil. Tá NFC casta as. Cas NFC air?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Comhroinn le NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Déan na fóin a thadhall le chéile go bog le comhroinnt"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Theip ar aistriú"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Cuireann an polasaí slándála srian ar %s a úsáid"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Comhroinnte"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Ní féidir comhroinnt"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Mír réamhshocraithe"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Is féidir leat míreanna réamhshocraithe a léaschóipeáil chuig gléas eile NFC. Tabhair na gléasanna gar dá chéile (go hiondúil cúl le cúl) agus tú sa scáileán baile"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Agus NFC casta air, is féidir leat sonraí a sheoladh nó a fháil nuair a thadhlaíonn do ghléas gléasanna eile NFC cumasaithe nó clibeanna NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Agus an ghné seo ar siúl, is féidir leat comhaid a léaschóipeáil chuig gléasanna NFC agus Wi-Fi Direct eile trí na gléasanna a chur in aice lena chéile. Mar shampla, is féidir leat comhaid íomhá/físe a léaschóipeáil ón nGailearaí, comhaid cheoil a léaschóipeáil ón Seinnteoir ceoil agus tuilleadh. Níl le déanamh ach na gléasanna a thabhairt le chéile (cúl le cúl go hiondúil) agus ansin do scáileán a thapáil. Cinneann an feidhmchlár a bhfuil le leaschóipeáil"
+
diff --git a/ug-nfc-setting-efl/po/gl.po b/ug-nfc-setting-efl/po/gl.po
new file mode 100644
index 0000000..f32f138
--- /dev/null
+++ b/ug-nfc-setting-efl/po/gl.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Para cancelar o uso compartido, toca Cancelar"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Servizo non dispoñible. NFC desactivada. Desexas activar NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Compartir por NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Fai que os teléfonos se toquen suavemente para compartir"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Erro de transferencia"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "A política de seguridade limita o uso de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartido"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Non se pode compartir"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elemento predefinido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Podes transferir elementos predefinidos a outro dispositivo NFC. Simplemente achega os dispositivos entre si (normalmente xuntando as partes posteriores) mentres te atopas na pantalla de inicio"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Cando NFC está activado, podes enviar ou recibir datos cando o teu dispositivo toca outros dispositivos compatibles con NFC ou etiquetas NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Cando esta función está activada, podes transmitir arquivos a outros dispositivos NFC e Wi-Fi Direct suxeitando os dispositivos un preto do outro. Por exemplo, podes transmitir arquivos de imaxe/vídeo desde a Galería, arquivos de música desde o reprodutor de música, etc. Simplemente achega os dispositivos entre si (normalmente as súas partes posteriores) e, a continuación, toca a pantalla. A aplicación determina o que se transmite"
+
diff --git a/ug-nfc-setting-efl/po/he.po b/ug-nfc-setting-efl/po/he.po
deleted file mode 100644
index 879c027..0000000
--- a/ug-nfc-setting-efl/po/he.po
+++ /dev/null
@@ -1,9 +0,0 @@
-msgid "IDS_NFC_BODY_NFC"
-msgstr "NFC"
-
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
-
-msgid "IDS_NFC_OPT_S_BEAM"
-msgstr "S Beam"
-
diff --git a/ug-nfc-setting-efl/po/hi.po b/ug-nfc-setting-efl/po/hi.po
index 84cafc3..984c323 100644
--- a/ug-nfc-setting-efl/po/hi.po
+++ b/ug-nfc-setting-efl/po/hi.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
-msgstr "एनएफसी"
+msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "साझाकरण रद्द करने के लिए, रद्द करें टेप करें"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "सेवा उपलब्ध नहीं है। NFC बंद किया गया है। NFC चालू करें?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC के द्वारा साझा करें"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "साझा करने के लिए फ़ोन्स को एक साथ हल्के से स्पर्श करें"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "स्‍थानांतरण विफल"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "सुरक्षा नीति %s के उपयोग को सीमित करता है"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "शेयर किए गए"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "साझा करने में अक्षम"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "पूर्वनिर्धारित मद"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "आप अन्य NFC डिवाइस पर पूर्वनिर्धारित मदों को बीम कर सकते हैं। होम स्क्रीन में होने के दौरान सिर्फ डिवाइसों को पास लाएँ (विशेष रूप से आगे-पीछे)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "ड्राइविंग"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "ज‍ब यह सुविधा चालू की जाती है, आप डिवाइसों को साथ में होल्ड कर दूसरे NFC और Wi-Fi डायरेक्ट डिवाइसों पर फ़ाइलें बीम कर सकते है। उदाहरण के लिए, आप गैलरी से वीडियो और छवि फ़ाइलों को, संगीत प्लेयर से संगीत फ़ाइलों को, और अधिक को बीम कर सकते हैं। केवल डिवाइसों को पास लाएँ (विशिष्ट रूप से बैक टू बैक) और फिर अपनी स्‍क्रीन टैप करें। क्या बीम करना है यह ऐप निर्धारित करता है"
+
diff --git a/ug-nfc-setting-efl/po/hr.po b/ug-nfc-setting-efl/po/hr.po
index 879c027..fc2f62a 100644
--- a/ug-nfc-setting-efl/po/hr.po
+++ b/ug-nfc-setting-efl/po/hr.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Za odustajanje od dijeljenja dodirnite Odustani"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Usluga nedostupna. NFC isključen. Uključiti NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Dijeli putem NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Nježno dodirni telefone za dijeljenje"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Greška prijenosa"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Sigurnosna pravila ograničavaju upotrebu %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Dijeljeno"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nemoguće dijeliti"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Postavljena stavka"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Postavljene stavke možete poslati drugom NFC uređaju. Samo prislonite uređaje jedan uz drugi (poželjno stražnje strane uređaja) dok ste na početnom zaslonu"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kada je NFC uključen, možete slati ili primati podatke kad vaš uređaj dotakne druge uređaje koji podržavaju NFC ili NFC oznake"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kada je uključeno, možete slati podatke i datoteke u drugi NFC i Wi-Fi Direct uređaj tako da dodirnete uređaje. Možete slati Slike/Video iz Galerije, glazbene datoteke iz Music Playera i više. Samo prislonite uređaje jedan uz drugi (poželjno stražnje strane uređaja) i zatim dodirnite svoj zaslon. Aplikacija određuje što se šalje"
+
diff --git a/ug-nfc-setting-efl/po/hu.po b/ug-nfc-setting-efl/po/hu.po
index 879c027..19ba105 100644
--- a/ug-nfc-setting-efl/po/hu.po
+++ b/ug-nfc-setting-efl/po/hu.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "A megosztás megszüntetéséhez érintse meg a Mégse gombot"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "A szolgáltatás nem elérhető. Az NFC ki van kapcsolva. Bekapcsolja az NFC-t?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Megosztás NFC-n"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Finoman érintse egymáshoz a telefonokat a megosztáshoz"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Hívásátadás sikertelen"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "A biztonsági irányelv korlátozza a(z) %s használatát"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Megosztott"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nem lehet megosztani"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Előre megadott tétel"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Az előre megadott tételeket másik NFC-eszközre sugározhatja. Elég, ha egymáshoz tartja a két eszközt (jellemzően háttal egymásnak), amikor a kezdőképernyő látható rajtuk"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Az NFC bekapcsolása esetén az eszközt egy másik NFC-kompatibilis eszközhöz vagy NFC-címkéhez érintve adatokat küldhet és fogadhat"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Bekapcsolt funkció mellett fájlokat továbbíthat más NFC vagy Wi-Fi Direct kompatibilis eszközre úgy, hogy egymásnak háttal, közel helyezi egymáshoz a két készüléket. Továbbíthat kép- vagy videofájlokat a Galériából, zene fájlokat a Zenelejátszóból és egyéb fájlokat. A fájlcseréhez tartsa egymásnak háttal a két eszközt és érintse meg a képernyőt. Az alkalmazás megállapítja a fájl típusát."
+
diff --git a/ug-nfc-setting-efl/po/hy.po b/ug-nfc-setting-efl/po/hy.po
new file mode 100644
index 0000000..d02f9b6
--- /dev/null
+++ b/ug-nfc-setting-efl/po/hy.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Համօգտագործումը դադարեցնելու համար թակեք Դադարեցնել"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Ծառայությունը մատչելի չէ: NFC-ն անջատված է. միացնե՞լ NFC-ը:"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Համօգտագործեք NFC-ի միջոցով"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Համօգտագործելու համար նրբորեն իրար հպեք հեռախոսները"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Փոխանցումը չհաջողվեց"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Անվտանգության քաղաքականությունը սահմանափակում է %sի օգտագործումը"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Համատեղ օգտագործմամբ"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Անհնար է համօգտագործել"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Նախասահմանված տարր"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Կարող եք նախասահմանված տարրերն ուղղորդված փոխանցել մեկ այլ NFC սարքի: Պարզապես իրար մոտեցրեք սարքերը (սովորաբար, հետևը հետևին)՝ գտնվելով հիմնական էկրանում"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Երբ NFC-ն միացված է, կարող եք տվյալներ ուղարկել ու ստանալ, երբ Ձեր սարքը հպվում է NFC ապահովող այլ սարքերի կամ NFC հատկորոշիչների"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Երբ այս գործառական հնարավորությունը միացված է, կարող եք ֆայլերն ուղղորդված փոխանցել այլ NFC և Wi-Fi Direct սարքերի՝ սարքերն իրար մոտիկ պահելով: Օրինակ՝ կարող եք պատկերային ֆայլեր և տեսաֆայլեր փոխանցել Պատկերասրահից, երաժշտական ֆայլեր Նվագարկչից և այլն: Պարզապես իրար կցեք սարքերը (սովորաբար, հետևը հետևին), հետո թակեք Ձեր էկրանը: Ծրագիրը որոշում է, թե ինչ է ուղղորդված փոխանցվում"
+
diff --git a/ug-nfc-setting-efl/po/id.po b/ug-nfc-setting-efl/po/id.po
deleted file mode 100644
index 879c027..0000000
--- a/ug-nfc-setting-efl/po/id.po
+++ /dev/null
@@ -1,9 +0,0 @@
-msgid "IDS_NFC_BODY_NFC"
-msgstr "NFC"
-
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
-
-msgid "IDS_NFC_OPT_S_BEAM"
-msgstr "S Beam"
-
diff --git a/ug-nfc-setting-efl/po/is.po b/ug-nfc-setting-efl/po/is.po
new file mode 100644
index 0000000..3e49ed2
--- /dev/null
+++ b/ug-nfc-setting-efl/po/is.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Pikkaðu á Hætta við til að hætta við samnýtingu"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Þjónustan er ekki til staðar. Slökkt er á nándartengingu. Kveikja núna?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Senda með NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Látið síma snerta hvor annan til að deila"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Flutningur tókst ekki"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Öryggisstefna takmarkar notkun %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Samnýtt"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Mistókst að samnýta"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Forskilgreint atriði"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Þú getur sent forskilgreind atriði til annars NFC-tækis. Settu tækin einfaldlega nálægt hvort öðru (yfirleitt bak í bak) á meðan heimaskjárinn er opinn"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Þegar kveikt er á nándartengingu geturðu sent eða tekið við gögnum þegar tækið snertir önnur tæki með nándartengingu eða nándarmerki"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Þegar þessi eiginleiki er virkur geturðu sent skrár í annað tæki með nándartengingu eða Wi-Fi Direct tæki með því að halda tækjunum þétt saman. Þú getur t.d. sent mynd/myndskeið úr galleríinu, tónlistarskrár úr tónlistarspilaranum o.fl. Haltu tækjunum bara saman (yfirleitt með því að láta þau snúa bökum saman) og pikkaðu á skjáinn. Forritið ákvarðar hvað er sent"
+
diff --git a/ug-nfc-setting-efl/po/it_IT.po b/ug-nfc-setting-efl/po/it_IT.po
index 879c027..c1d6fb1 100644
--- a/ug-nfc-setting-efl/po/it_IT.po
+++ b/ug-nfc-setting-efl/po/it_IT.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Per annullare la condivisione, toccate Annulla"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Servizio non disponibile. NFC disattivato. Attivare NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Condividi con NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Per avviare la condivisione, toccate leggermente i telefoni"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Errore trasferimento"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "I criteri di protezione limitano l'utilizzo di %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Condiviso"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Impossibile condividere"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elemento predefinito"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Potete trasferire elementi predefiniti a un altro dispositivo NFC. È sufficiente avvicinare il retro dei due dispositivi mentre la schermata Home è aperta"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Se NFC è attivo, potete inviare o ricevere dati mettendo a contatto il vostro dispositivo con un altro con funzionalità NFC oppure un tag NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Se la funzione è attiva, sarà possibile trasmettere file ad altri dispositivi NFC e Wi-Fi Direct posizionati in prossimità di quello in uso. Per esempio, potete trasmettere file di immagini/video dalla Galleria, file musicali dal Lettore musica e altro ancora. È sufficiente avvicinare il retro dei due dispositivi e toccare lo schermo. L'applicazione determinerà il contenuto trasmesso"
+
diff --git a/ug-nfc-setting-efl/po/ja_JP.po b/ug-nfc-setting-efl/po/ja_JP.po
index 879c027..e28ff78 100644
--- a/ug-nfc-setting-efl/po/ja_JP.po
+++ b/ug-nfc-setting-efl/po/ja_JP.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "共有を解除するには、［キャンセル］をタップしてください。"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "サービスを利用できません。NFCがOFFになっています。NFCをONにしますか？"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFCで共有"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "共有するには、端末同士をゆっくりと近づけてください。"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "転送に失敗しました。"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "セキュリティポリシーが%sの使用を制限します。"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "公開中"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "共有できません。"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "設定済みアイテム"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "設定済みアイテムを他のNFC対応端末に送信できます。ホーム画面を表示中に端末同士(通常は背面同士)を近づけてください。"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFCがONの場合、相手の端末がNFCを利用可能か、NFCタグに触れたときにデータを送受信できます。"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "この機能をONにし、端末同士を近づけると、他のNFC端末やWi-Fi Direct端末にファイルを送信できます。例えば、ギャラリーから画像/動画を送信したり、音楽プレーヤーから音楽を送信できます。端末同士（主に背面同士）を近づけ、画面をタップします。送信するファイルはアプリによって異なります。"
+
diff --git a/ug-nfc-setting-efl/po/ka.po b/ug-nfc-setting-efl/po/ka.po
new file mode 100644
index 0000000..4baaed1
--- /dev/null
+++ b/ug-nfc-setting-efl/po/ka.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "გაზიარების შესაწყვეტად, დააჭირეთ გაუქმების ღილაკს"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "სერვისი მიუწვდომელია. NFC გამორთულია. ჩაირთოს NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC-ით გაზიარება"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "ფრთხილად მიადეთ ერთმანეთს ტელეფონები და გააზიარეთ"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "ვერ გადაიცა"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "უსაფრთხოების პოლიტიკა ზღუდავს, რომ გამოყენებული იქნას %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "გაზიარებული"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "გაზიარება შეუძლებელია"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "წინასწარ განსაზღვრული"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "შეგიძლიათ სხივით გადაიტანოთ წინასწარ განსაზღვრული ელემენტები სხვა NFC აპარატში. უბრალოდ, ჩართეთ საწყისი ეკრანი და მიადეთ ერთმანეთს აპარატები (ჩვეულებრივ, ზურგებით)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "როდესაც NFC ჩართულია, შეგიძლიათ გაგზავნოთ ან მიიღოთ მონაცემები, როდესაც თქვენი აპარატი შეეხება NFC ფუნქციის მქონე სხვა აპარატებს ან NFC იარლიყებს"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "როდესაც ჩართულია ეს ფუნქცია, შეგიძლიათ მიანათოთ ფაილები სხვა NFC და Wi-Fi Direct აპარატებს, აპარატების ერთმანეთზე მიდებით. მაგალითად, შეგიძლიათ მიანათოთ გრაფიკული/ვიდეო ფაილები გალერიიდან, მუსიკის ფაილები პლეერიდან და სხვა. მხოლოდ ერთმანეთს მიადეთ აპარატები (ჩვეულებრივ, ურგებით) და შემდეგ დააკაკუნეთ თქვენს ეკრანზე. პროგრამა განსაზღვრავს რა მიენათოს"
+
diff --git a/ug-nfc-setting-efl/po/kk.po b/ug-nfc-setting-efl/po/kk.po
new file mode 100644
index 0000000..9eb4b1e
--- /dev/null
+++ b/ug-nfc-setting-efl/po/kk.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Бөлісуден бас тарту үшін Бас тарту опциясын түртіңіз"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Қызмет қол жетімді емес. NFC өшірулі. NFC қосу керек пе?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC арқылы бөлісу"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Бөлісу үшін телефондарды ақырын бірге түртіңіз"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Орналастыру үзіліп кетті"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Қауіпсіздік саясаты %s пайдаланылуын шектейді"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Бәріне ортақ"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Бөлісу мүмкін емес"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Алдын ала ан. элемент"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Алдын ала анықталған элементтерді NFC құрылғысына жіберуге болады. Бастапқы экранда болған кезде құрылғыларды бір-біріне жақындатыңыз (әдетте артын-артына)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC қосылғанда, құрылғыңыз басқа NFC қабілетті құрылғыларға немесе NFC тегтеріне тиген кезде деректер жіберуге немесе қабылдауға болады"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Бұл функция өшірілгенде, құрылғыларды бір-біріне жақын ұстап, файлдарды басқа NFC және Wi-Fi Direct құрылғыларына жіберуге болады. Мысалы, сурет/бейне файлдарды галереядан, музыкалық файлдарды музыкалық ойнатқыштан және т.с.с. жіберуге болады. Құрылғыларды (әдетте артын-артына) жақындатып, экраныңызды түртіңіз. Бағдарлама ненің жіберілетінін анықтайды"
+
diff --git a/ug-nfc-setting-efl/po/ko_KR.po b/ug-nfc-setting-efl/po/ko_KR.po
index 31e8402..7561ae0 100644
--- a/ug-nfc-setting-efl/po/ko_KR.po
+++ b/ug-nfc-setting-efl/po/ko_KR.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "이 기능을 켜면 디바이스를 가까이 놓아 다른 NFC 및 WLAN Direct 기기로 파일을 무선 송수신할 수 있습니다. 예를 들어 갤러리의 이미지/동영상 파일, 뮤직 플레이어의 음악 파일 등을 송수신할 수 있습니다. 디바이스를 가까이에 놓은 후(대개 뒷면을 맞댐) 화면을 누르세요. 송수신될 내용은 애플리케이션에 의해 결정됩니다"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "공유를 취소하려면 [취소]를 누르세요"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "NFC가 꺼져 있어 서비스를 이용할 수 없습니다. NFC를 켤까요?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC로 공유"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "공유하려면 휴대폰을 서로 가볍게 부딪히세요"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "연결하지 못하였습니다"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "보안 정책에 따라 %s 사용이 제한됩니다"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "공유됨"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "공유할 수 없습니다"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "미리 설정된 항목"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "다른 NFC 기기로 미리 설정된 항목을 무선 송신할 수 있습니다. 홈 화면 상태에서 기기를 서로 가까이 두세요(대개 뒷면을 맞댐)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC를 켠 상태에서 내 디바이스를 다른 NFC 기기나 NFC 태그에 맞대면 데이터를 주고받을 수 있습니다"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "이 기능을 켜면 디바이스를 가까이 놓아 다른 NFC 및 Wi-Fi Direct 기기로 파일을 무선 송수신할 수 있습니다. 예를 들어 갤러리의 이미지/동영상 파일, 뮤직 플레이어의 음악 파일 등을 송수신할 수 있습니다. 디바이스를 가까이에 놓은 후(대개 뒷면을 맞댐) 화면을 누르세요. 송수신될 내용은 애플리케이션에 의해 결정됩니다"
+
diff --git a/ug-nfc-setting-efl/po/lt.po b/ug-nfc-setting-efl/po/lt.po
index 879c027..de7c903 100644
--- a/ug-nfc-setting-efl/po/lt.po
+++ b/ug-nfc-setting-efl/po/lt.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Jei norite atšaukti bendrinimą, bakstelėkite „Atšaukti“"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Paslauga nepasiekiama. NFC išjungtas. Įjungti NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Bendrinti per NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Jei norite bendrinti, švelniai pridėkite vieną telefoną prie kito"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Persiųsti nepavyko"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Saugos politika draudžia naudoti „%s“"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Bendra"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Neįmanoma bendrinti"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Iš anksto nust.element."
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Galite transliuoti iš anksto nustatytus elementus į kitą NFC įrenginį. Tiesiog suglauskite įrenginius (paprastai nugarėlėmis) būdami pradžios ekrane"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kai NFC įjungta, galite siųsti ar gauti duomenis, kai jūsų įrenginys liečiasi prie kito įrenginio, kuriame veikia NFC, ar NFC žymų"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kai ši funkcija įjungta, galite transliuoti failus į kitus NFC ir „Wi-Fi Direct“ įrenginius laikydami juos greta vienas kito. Tarkime, galite transliuoti vaizdus / vaizdo įrašus iš galerijos, muzikos įrašus iš muzikos grotuvo ir dar daugiau. Tiesiog suglauskite įrenginius (paprastai nugarėlėmis) ir bakstelėkite ekraną. Programa nusprendžia, kas transliuojama"
+
diff --git a/ug-nfc-setting-efl/po/lv.po b/ug-nfc-setting-efl/po/lv.po
index 879c027..f31f2ce 100644
--- a/ug-nfc-setting-efl/po/lv.po
+++ b/ug-nfc-setting-efl/po/lv.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Lai atceltu kopīgošanu, pieskarieties pie Atcelt"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Pakalpojums nav pieejams. NFC ir izslēgts. Vai ieslēgt NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Kopīgot, izmantojot NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Viegli pieskarieties ar vienu tālruni otram, lai kopīgotu"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Pārsūtīšana neizdevās"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Drošības politika ierobežo %s lietošanu"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Koplietots"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nevar koplietot"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Iepriekš defin. objekts"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Varat nosūtīt iepriekš definētus objektus uz citu NFC ierīci. Vienkārši novietojiet ierīces blakus (parasti — saliekot kopā aizmugures), kad ir atvērts sākuma ekrāns"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kad ir ieslēgta NFC funkcija, varat nosūtīt vai saņemt datus, kad ierīce pieskaras citai NFC ierīcei vai NFC atzīmei"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kad šī funkcija ir ieslēgta, varat pārsūtīt failus uz citām NFC un Wi-Fi Direct ierīcēm, turot ierīces tuvu blakus. Piemēram, varat pārsūtīt attēlu/video failus no Galerijas, mūzikas failus no Mūzikas atskaņotāja u.c. Novietojiet ierīces blakus (saliekot kopā aizmugures) un pēc tam pieskarieties ekrānam. Programma pati nosaka, kas tiek pārsūtīts"
+
diff --git a/ug-nfc-setting-efl/po/mk.po b/ug-nfc-setting-efl/po/mk.po
new file mode 100644
index 0000000..83bb1fb
--- /dev/null
+++ b/ug-nfc-setting-efl/po/mk.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "За да се откаже споделувањето, допрете Откажи"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Услугата не е достапна. NFC е исклучено. Да се вклучи NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Подели преку NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Нежно допрете ги телефоните еден до друг за да споделите"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Неуспешно префрлување"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Политиката на безбедност го ограничува користењето %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Споделени"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Не може да се сподели"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Готова ставка"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Може да пренесете готови ставки на друг уред со NFC. Само приближете ги уредите (обично грб со грб) додека се на почетниот екран"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Кога е вклучено NFC, може да праќате или примате податоци кога со уредот ќе допрете други уреди способни за NFC или ознаки NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Кога оваа функција е вклучена, може да пренесувате фајлови на други NFC и Wi-Fi Direct уреди со држење на уредите блиску еден до друг. На пример, може да пренесете слики/видео фајлови од Галеријата, музички фајлови од Музичкиот плеер и повеќе. Само приближете ги уредите (обично грб со грб) и потчукнете го екранот. Апликацијата одредува што ќе се пренесе"
+
diff --git a/ug-nfc-setting-efl/po/ms.po b/ug-nfc-setting-efl/po/ms.po
deleted file mode 100644
index 879c027..0000000
--- a/ug-nfc-setting-efl/po/ms.po
+++ /dev/null
@@ -1,9 +0,0 @@
-msgid "IDS_NFC_BODY_NFC"
-msgstr "NFC"
-
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
-
-msgid "IDS_NFC_OPT_S_BEAM"
-msgstr "S Beam"
-
diff --git a/ug-nfc-setting-efl/po/nb.po b/ug-nfc-setting-efl/po/nb.po
new file mode 100644
index 0000000..6e8cd8e
--- /dev/null
+++ b/ug-nfc-setting-efl/po/nb.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "For å avbryte deling trykker du på Avbryt"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Tjenesten er ikke tilgjengelig. NFC er slått av. Slå på NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Del via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Legg telefonene forsiktig mot hverandre for å dele"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Overføringsfeil"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Sikkerhetspolicy begrenser bruk av %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Delt"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Kan ikke dele"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Forhåndsdef. element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Du kan overføre forhåndsdefinerte elementer til en annen NFC-enhet. Bare før enhetene inntil hverandre (vanligvis bakside mot bakside) i startskjermbildet"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Når NFC er på, kan du sende eller motta data når enheten din berører andre NFC-aktiverte enheter eller NFC-tagger"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Når denne funksjonen er slått på, kan du sende filer til andre NFC- og Wi-Fi Direct-enheter ved å holde enhetene i nærheten av hverandre. For eksempel kan du sende bilde-/videofiler fra galleriet, musikkfiler fra musikkspilleren og mer. Bare før enhetene sammen (helst rygg mot rygg) og trykk deretter på skjermen. Programmet bestemmer hva som sendes"
+
diff --git a/ug-nfc-setting-efl/po/nl_NL.po b/ug-nfc-setting-efl/po/nl_NL.po
index 879c027..dfdc75b 100644
--- a/ug-nfc-setting-efl/po/nl_NL.po
+++ b/ug-nfc-setting-efl/po/nl_NL.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Tik op Annuleren om delen te annuleren"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Service niet beschikbaar. NFC uitgeschakeld. NFC inschakelen?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Delen via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Houd de telefoons voorzichtig tegen elkaar om te delen"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Fout bij doorverbinden"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Gebruik van %s beperkt door beveiligingsbeleid"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Gedeeld"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Kan niet delen"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Vooraf gedefin. item"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "U kunt vooraf gedefinieerde items overbrengen naar een ander NFC-apparaat. Houd de apparaten in het startscherm dichtbij elkaar (gewoonlijk rug tegen rug)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Wanneer NFC is ingeschakeld, kunt u gegevens verzenden of ontvangen wanneer uw apparaat andere NFC-apparaten of NFC-tags aanraakt"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Wanneer deze functie is ingeschakeld, kunt u bestanden naar andere NFC- en WiFi Direct-apparaten overbrengen door de apparaten dicht bij elkaar te houden. U kunt bijvoorbeeld foto-/videobestanden van de MP3-speler, notities van S Note en nog veel meer overbrengen. Houd de apparaten bij elkaar (gewoonlijk de achterkanten) en tik op het scherm. De app bepaalt wat wordt overgedragen"
+
diff --git a/ug-nfc-setting-efl/po/no.po b/ug-nfc-setting-efl/po/no.po
deleted file mode 100644
index 879c027..0000000
--- a/ug-nfc-setting-efl/po/no.po
+++ /dev/null
@@ -1,9 +0,0 @@
-msgid "IDS_NFC_BODY_NFC"
-msgstr "NFC"
-
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
-
-msgid "IDS_NFC_OPT_S_BEAM"
-msgstr "S Beam"
-
diff --git a/ug-nfc-setting-efl/po/pl.po b/ug-nfc-setting-efl/po/pl.po
index 879c027..c28f949 100644
--- a/ug-nfc-setting-efl/po/pl.po
+++ b/ug-nfc-setting-efl/po/pl.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Aby anulować udostępnianie, dotknij opcji Anuluj"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Usługa niedostępna. NFC wyłączony. Włączyć NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Udostępnij przez NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Delikatnie przyłóż telefony do siebie, aby udostępnić"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Błąd transferu"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Zasady zabezpieczeń ograniczają użycie %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Udostępniono"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nie można udostępnić"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Predefiniowany element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Predefiniowane elementy można przesłać do innego urządzenia obsługującego technologię NFC. Wystarczy zbliżyć urządzenia do siebie (zazwyczaj ich tylne strony), mając wyświetlony ekran startowy"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Gdy NFC jest włączone, możesz wysyłać i odbierać dane po dotknięciu urządzeniem innego urządzenia obsługującego NFC lub etykiety NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Po włączeniu tej funkcji można przesyłać pliki do innego trzymanego blisko urządzenia obsługującego technologię NFC lub Wi-Fi Direct. Można przesłać np. pliki obrazów lub filmów z Galerii, pliki muzyczne z odtwarzacza muzyki itd. Wystarczy zbliżyć urządzenia do siebie (zazwyczaj ich tylne strony) i dotknąć ekranu. Aplikacja określa, co jest przesyłane"
+
diff --git a/ug-nfc-setting-efl/po/pt_BR.po b/ug-nfc-setting-efl/po/pt_BR.po
new file mode 100644
index 0000000..74960ed
--- /dev/null
+++ b/ug-nfc-setting-efl/po/pt_BR.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Para cancelar o compartilhamento, toque em Cancelar"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Serviço não disponível. NFC desativado. Ativar NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Compartilhar via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Toque gentilmente um telefone no outro para compartilhar"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Erro ao transferir"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "A política de segurança restringe o uso de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartilhado"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Impossível compartilhar"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Item pré-definido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "É possível emitir itens pré-definidos para outro dispositivo NFC. Basta manter os dispositivos bem próximos (geralmente com as partes traseiras juntas) enquanto está na tela de início"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Quando o NFC está ligado, é possível enviar ou receber dados quando seu dispositivo entra em contato com outro dispositivo compatível com NFC ou identificadores NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Quando este recurso está ligado, você pode direcionar arquivos para outros NFC e dispositivos com Wi-Fi Direct mantendo os dispositivos próximos. Por exemplo, você pode direcionar arquivos de imagem/vídeo a partir da Galeria, arquivos de música do reprodutor de Música e mais. Apenas mantenha os dispositivos juntos (geralmente encostados) e, em seguida, toque na sua tela. O aplicativo determina qual será direcionado"
+
diff --git a/ug-nfc-setting-efl/po/pt_PT.po b/ug-nfc-setting-efl/po/pt_PT.po
index 879c027..a89145d 100644
--- a/ug-nfc-setting-efl/po/pt_PT.po
+++ b/ug-nfc-setting-efl/po/pt_PT.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Para cancelar a partilha, toque em Cancelar"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Serviço indisponível. NFC desligado. Ligar NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Partilhar via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Toque suavemente com o telefone no outro para partilhar"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Erro de transferência"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "A política de segurança restringe a utilização de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partilhado"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Impossível partilhar"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Item predefinido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Pode transmitir itens predefinidos para outro dispositivo NFC. Basta aproximar os dispositivos um do outro (de modo típico, costas com costas), com estes no ecrã principal"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Quando o NFC está ligado, pode enviar ou receber dados quando o seu dispositivo toca noutros dispositivos com capacidade NFC ou com etiquetas NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Quando esta função está activada, pode transmitir ficheiros para outros dispositivos NFC e Wi-Fi Direct segurando os dispositivos próximo um do outro. Por exemplo, pode transmitir ficheiros de imagem/vídeo da Galeria, ficheiros de música do Leitor de música e muito mais. Basta aproximar os dispositivos (de modo típico, costas com costas) e em seguida toque no seu ecrã. A aplicação determina o que é transmitido"
+
diff --git a/ug-nfc-setting-efl/po/ro.po b/ug-nfc-setting-efl/po/ro.po
index 879c027..915d4e4 100644
--- a/ug-nfc-setting-efl/po/ro.po
+++ b/ug-nfc-setting-efl/po/ro.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Pentru anularea partajării, atingeţi Anulare"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Serviciul nu este disponibil. NFC este oprit. Porniţi NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Partajare prin NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Atingeţi uşor telefoanele pentru a partaja"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Transfer nereuşit"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Politica de securitate restricţionează utilizarea %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partajat"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Imposibil de partajat"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Element predefinit"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Puteţi transfera elemente predefinite pe un alt dispozitiv NFC. Doar apropiaţi dispozitivele (de obicei spate în spate) când este deschis ecranul de pornire"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Când NFC este activată, puteţi trimite sau primi date când dispozitivul atinge alte dispozitive compatibile cu NFC sau etichete NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Când această caracteristică este activată, puteţi transmite fişierele către alte dispozitive NFC şi Wi-Fi Direct, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi fişiere de imagini/video din Galerie, fişiere muzicale din playerul muzical şi multe altele. Nu trebuie decât să apropiaţi cele două dispozitive (de obicei, aşezându-le unul în spatele celuilalt) şi să atingeţi ecranul. Aplicaţia determină apoi ce poate fi transmis"
+
diff --git a/ug-nfc-setting-efl/po/ru_RU.po b/ug-nfc-setting-efl/po/ru_RU.po
index 879c027..2f530dd 100644
--- a/ug-nfc-setting-efl/po/ru_RU.po
+++ b/ug-nfc-setting-efl/po/ru_RU.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Чтобы не предоставлять доступ, нажмите Отмена"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Служба недоступна. Связь NFC выключена. Включить NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Отправить через NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Прикоснитесь одним телефоном к другому для отправки"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Сбой передачи"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Политика безопасности ограничивает использование компонента %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Общедоступное"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Невозможно предоставить общий доступ"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Заданный элемент"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Можно передавать предварительно заданные элементы на другое NFC-устройство. Просто откройте на устройствах главный экран и поднесите их друг к другу (обычно задними сторонами)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Если протокол NFC включен, можно отправлять и получать данные, прикоснувшись устройством к другому устройству, поддерживающему NFC, или метке NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Если эта функция включена, можно передавать файлы на другое устройство, поддерживающее NFC и Wi-Fi Direct, поднося устройства близко друг к другу. Например, можно отправлять файлы изображений и видео из галереи, музыкальные файлы из приложения Музыка и т. д. Просто поднесите устройства друг к другу (обычно задними сторонами) и нажмите на экран. Приложение определит, какие данные нужно передать"
+
diff --git a/ug-nfc-setting-efl/po/sk.po b/ug-nfc-setting-efl/po/sk.po
index 879c027..70afed5 100644
--- a/ug-nfc-setting-efl/po/sk.po
+++ b/ug-nfc-setting-efl/po/sk.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Ak chcete zrušiť zdieľanie, ťuknite na tlačidlo Zrušiť"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Služba nie je k dispozícii. Funkcia NFC je vypnutá. Zapnúť funkciu NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Zdieľať cez NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Jemným dotykom telefónov spustíte zdieľanie"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Chyba prenosu"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Politika zabezpečenia obmedzuje použitie %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Zdieľané"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nedá sa zdieľať"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Preddefinovaná položka"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Môžete vysielať preddefinované položky do iného zariadenia NFC. Stačí dať zariadenia blízko k sebe (obvykle tesne vedľa seba) pri aktívnej domovskej obrazovke"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Keď je zapnutá funkcia NFC, môžete odosielať alebo prijímať údaje, keď sa zariadenie dotýka iných zariadení podporujúcich funkciu NFC alebo značiek NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Keď je táto funkcia zapnutá, môžete vysielať súbory do iných zariadení NFC alebo Wi-Fi Direct podržaním zariadení blízko seba. Môžete napríklad vyslať súbory s obrázkami/videami z Galérie, hudobné súbory z Prehrávača hudby a podobne. Stačí dať zariadenia k sebe (obvykle tesne vedľa seba) a potom ťuknúť na obrazovku. Aplikácia určí, čo sa vyšle"
+
diff --git a/ug-nfc-setting-efl/po/sl.po b/ug-nfc-setting-efl/po/sl.po
index 879c027..2025f5d 100644
--- a/ug-nfc-setting-efl/po/sl.po
+++ b/ug-nfc-setting-efl/po/sl.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Če želite preklicati skupno rabo, pritisnite Prekliči"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Storitev ni na voljo. NFC je izklopljen. Želite vklopiti NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Skupna raba prek NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Za skupno rabo se s telefonom rahlo dotaknite drugega telefona"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Prenos ni uspel"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Varnostni pravilnik omejuje uporabo programa %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Dosegljivo drugim"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Souporaba ni mogoča"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Vnaprej določen element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Vnaprej določene elemente lahko prenesete v drugo napravo NFC. Ko ste na domačem zaslonu, samo pomaknite naprave skupaj (običajno s hrbtnima stranema)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Če je NFC vklopljen, lahko pošiljate ali prejemate podatke, ko se vaša naprava dotakne drugih naprav, ki podpirajo NFC ali oznake NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Ko je ta funkcija vklopljena, lahko datoteke prenesete v druge naprave, ki omogočajo NFC in Wi-Fi Direct, tako da naprave držite blizu skupaj. Prenesete lahko na primer slikovne/video datoteke iz Galerije, glasbene datoteke iz predvajalnika glasbe in drugo. Samo pomaknite naprave skupaj (običajno s hrbtnima stranema) in pritisnite na zaslon. Program določi, kaj se bo preneslo"
+
diff --git a/ug-nfc-setting-efl/po/sr.po b/ug-nfc-setting-efl/po/sr.po
index 879c027..0471277 100644
--- a/ug-nfc-setting-efl/po/sr.po
+++ b/ug-nfc-setting-efl/po/sr.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Da bi otkazao deljenje, kucni Otkaži"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Usluga nije dostupna. NFC je isključen. Uključiti NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Podeli putem NFC-a"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Nežno dodirni telefon o telefon za deljenje"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Prenos neuspešan"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Politika bezbednosti ograničava upotrebu %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Deljeno"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nemoguće podeliti"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Već definisana stavka"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Već definisane stavke možeš da primaš na drugom NFC uređaju. Samo približi uređaje (obično leđa uz leđa) dok su na početnom ekranu"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kada je NFC uključen, možeš da šalješ ili primaš podatke tokom kontakta tvog uređaja sa drugim uređajima koji mogu da koriste NFC funkciju ili NFC oznake"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kada je ova funkcija uključena, možeš emitovati fajlove na drugim NFC i Wi-Fi Direct uređajima držeći jedan uređaj blizu drugog. Na primer, možeš emitovati slike/video fajlove iz galerije, muzičke fajlove iz muzičkog plejera i još mnogo toga. Jednostavno približi uređaje (obično leđa u leđa), a zatim kucni na ekran. Aplikacija određuje šta će se emitovati"
+
diff --git a/ug-nfc-setting-efl/po/sv.po b/ug-nfc-setting-efl/po/sv.po
index 879c027..e346cb3 100644
--- a/ug-nfc-setting-efl/po/sv.po
+++ b/ug-nfc-setting-efl/po/sv.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Tryck på Avbryt om du vill avbryta delning"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Tjänsten är inte tillgänglig. NFC är avstängt. Slå på NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Dela via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Sammanför försiktigt telefonerna för att dela"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Överföringsfel"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Säkerhetspolicyn begränsar användningen av %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Delad"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Det går inte att dela"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Fördefinierat objekt"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Du kan överföra fördefinierade objekt till en annan NFC-enhet. Placera enheterna bredvid varandra (normalt med baksidorna mot varandra) när hemskärmen är öppen"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "När NFC är på kan du skicka och ta emot data när din enhet rör andra enheter med NFC-funktioner eller NFC-taggar"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "När den här funktionen är påslagen kan du överföra filer till en annan NFC- och Wi-Fi Direct-kompatibel enhet genom att placera enheterna nära varandra. Du kan till exempel överföra bilder från galleriet eller musikfiler från musikspelaren. Placera enheterna bredvid varandra (normalt med baksidorna mot varandra) och tryck på din skärm. Programmet bestämmer vad som överförs"
+
diff --git a/ug-nfc-setting-efl/po/th.po b/ug-nfc-setting-efl/po/th.po
deleted file mode 100644
index 879c027..0000000
--- a/ug-nfc-setting-efl/po/th.po
+++ /dev/null
@@ -1,9 +0,0 @@
-msgid "IDS_NFC_BODY_NFC"
-msgstr "NFC"
-
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
-
-msgid "IDS_NFC_OPT_S_BEAM"
-msgstr "S Beam"
-
diff --git a/ug-nfc-setting-efl/po/tr_TR.po b/ug-nfc-setting-efl/po/tr_TR.po
index 879c027..07503cc 100644
--- a/ug-nfc-setting-efl/po/tr_TR.po
+++ b/ug-nfc-setting-efl/po/tr_TR.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Paylaşmayı iptal etmek için, İptal'e basın"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Servis kullanılamıyor. NFC kapatıldı. NFC açılsın mı?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC ile paylaş"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Paylaşmak için hafifçe telefonları birbirine dokundurun."
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Transfer başarısız"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Güvenlik ilkesi %s kullanımını kısıtlıyor"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Paylaşılıyor"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Paylaşılamıyor"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Ön tanımlı öğe"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Ön tanımı öğeleri bir başka NFC cihazına yayınlayabilirsiniz. Yalnızca cihazları ana ekrandayken cihazları birbirine yaklaştırın (tipik olarak arka kısımlarını)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC açıkken, cihazınız diğer NFC özellikli cihazlara veya NFC etiketlerine dokunduğunda, veri gönderebilir veya alabilirsiniz"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Bu özellik açıldığında, cihazları birbirine yakın tutarak, dosyaları bir başka NFC ve Wi-Fi Direct cihazlarına yayınlayabilirsiniz. Örneğin; Galeriden resim/video dosyalarını, Müzik Çalar'dan müzik dosyalarını ve dahasını yayınlayabilirsiniz. Yalnızca cihazları yan yana getirip (normalde sırt sırta) ekranınıza dokunmanız yeter. Uygulama yayınlanacak olanları belirler"
+
diff --git a/ug-nfc-setting-efl/po/uk.po b/ug-nfc-setting-efl/po/uk.po
index 879c027..5cd38b3 100644
--- a/ug-nfc-setting-efl/po/uk.po
+++ b/ug-nfc-setting-efl/po/uk.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Щоб скасувати спільний доступ, натисніть Скасувати"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Служба недоступна. NFC вимкнено. Увімкнути NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Спільний доступ через NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Для надання спільного доступу обережно прикладіть телефони один до одного"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Збій передачі"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Використання %s обмежено політикою безпеки"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Загальний доступ"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Неможливо відкрити спільний доступ"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Стандартний об’єкт"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Стандартні об'єкти можна передавати на інший пристрій із підтримкою NFC. Просто покладіть пристрої один поряд з одним (зазвичай має бути суміщено задні панелі) під час перебування на головному екрані"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Якщо NFC ввімкнено, можна надсилати або отримувати дані у разі зв'язку пристрою з іншими пристроями із підтримкою NFC або тегами NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "У разі ввімкнення цієї функції файли можна передавати на інші пристрої з підтримкою NFC та Wi-Fi Direct, утримуючи пристрої один поряд з одним. Наприклад, можна передати файли зображень або відео з галереї, музичні файли з музичного плеєра тощо. Просто прикладіть пристрої один до одного (зазвичай має бути суміщено задні панелі), а потім торкніться екрана. Програма визначить дані для передачі"
+
diff --git a/ug-nfc-setting-efl/po/update-po.sh b/ug-nfc-setting-efl/po/update-po.sh
index f23c1fa..f23c1fa 100755..100644
--- a/ug-nfc-setting-efl/po/update-po.sh
+++ b/ug-nfc-setting-efl/po/update-po.sh
diff --git a/ug-nfc-setting-efl/po/uz.po b/ug-nfc-setting-efl/po/uz.po
new file mode 100644
index 0000000..85bf759
--- /dev/null
+++ b/ug-nfc-setting-efl/po/uz.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Ulashishni bekor qilish uchun, Bekor qilishni cherting"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Xizmatdan foydalanib bo‘lmaydi. NFC o‘chirilgan. NFC yoqilsinmi?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC orqali ulashish"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Ulashish uchun telefonlarni ehtiyotkorlik bilan birgalikda ushlang"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Uzatish bajarilmadi"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Xavfsizlik siyosati %sdan foydalanishni cheklaydi"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Umumiy"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Umumiy foydalanib bo‘lmaydi"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Old/tayinlangan element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Oldindan tayinlangan elementlarni boshqa NFC qurilmasiga uzatishingiz mumkin. Asosiy ekranda bo‘lganingizda, qurilmalarni bir-biriga yaqin keltiring (odatda orqasini-orqasiga qilib)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC yoqilganda, qurilmangiz boshqa NFC-imkoniyatiga ega qurilma yoki NFC teglariga tekkanda, ma’lumotni olishingiz yoki yuborishingiz mumkin"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Ushbu xususiyat yoqilganda, fayllarni boshqa NFC va Wi-Fi Direct qurilmalariga, qurilmalarni birlashtirish orqali, uzatishingiz mumkin. Misol uchun, Siz tasvir/video fayllarni Galereyadan, musiqa fayllarini esa Musiqa pleyeridan uzatishingiz mumkin. Qurilmalarni bir-biriga yaqin keltiring (orqasini orqasiga) va undan so‘ng ekranni cherting. Ilova nimalar uzatilganligini aniqlaydi"
+
diff --git a/ug-nfc-setting-efl/po/vi.po b/ug-nfc-setting-efl/po/vi.po
deleted file mode 100644
index 879c027..0000000
--- a/ug-nfc-setting-efl/po/vi.po
+++ /dev/null
@@ -1,9 +0,0 @@
-msgid "IDS_NFC_BODY_NFC"
-msgstr "NFC"
-
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "When this feature is turned on, you can beam files to other NFC and WLAN Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what is beamed"
-
-msgid "IDS_NFC_OPT_S_BEAM"
-msgstr "S Beam"
-
diff --git a/ug-nfc-setting-efl/po/zh_CN.po b/ug-nfc-setting-efl/po/zh_CN.po
index 3d309b4..c007b8d 100644
--- a/ug-nfc-setting-efl/po/zh_CN.po
+++ b/ug-nfc-setting-efl/po/zh_CN.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "当该功能开启时，您可通过将设备紧靠在一起将文件无线传输至其他 NFC 和 WLAN Direct 设备。例如，您可无线传输来自图库的图片/视频文件、来自音乐播放器的音乐文件，以及更多。只需要将设备放在一起（通常背对背）然后轻敲您的屏幕。应用程序判定无线传输的内容"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "若要取消共享，点击取消"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "服务不可用。NFC 已关闭。是否开启 NFC？"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "通过 NFC 共享"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "轻轻地将手机触碰在一起以共享"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "转换失败"
 
 msgid "IDS_NFC_OPT_S_BEAM"
-msgstr "S 传送"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "安全政策限制 %s 的使用"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "已分享"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "无法共享"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "预定项目"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "您可将预定项目传输至另一 NFC 设备。只需在主屏下将设备靠在一起（通常背对背）"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "当 NFC 开始时，您可在您的设备接触其他支持 NFC 的设备或 NFC 标签时发送或接收数据"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "当该特性开启时，您可通过将设备紧靠在一起将文件无线传输至其他 NFC 和 Wi-Fi直连设备。例如，您可无线传输来自图库的图片/视频文件、来自音乐播放器的音乐文件，以及更多。只需要将设备放在一起（通常背对背）然后轻敲您的屏幕。应用程序判定无线传输的内容"
 
diff --git a/ug-nfc-setting-efl/po/zh_HK.po b/ug-nfc-setting-efl/po/zh_HK.po
index feaeadd..7b69f57 100644
--- a/ug-nfc-setting-efl/po/zh_HK.po
+++ b/ug-nfc-setting-efl/po/zh_HK.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "當此功能開啟時，您可通過將裝置緊靠一起時，可發送檔案至其他 NFC 與 WLAN Direct 裝置。例如，您可從媒體瀏覽器發送圖像／影片檔案、從音樂播放器發送音樂檔案等。只需將裝置靠在一起（一般以背對背）然後輕觸螢幕。應用程式將決定發送的檔案"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "如要取消分享，輕觸取消"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "服務不可用。NFC 已關閉。開啟 NFC 嗎？"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "透過 NFC 分享"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "輕輕地將手機碰觸在一起以分享"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "傳送失敗"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "安全政策限制使用 %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "已共享"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "無法分享"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "預定義項目"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "您可將預定義項目發送至其他 NFC 裝置。只需在處於主螢幕時，將裝置靠在一起（一般以背對背）"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "當 NFC 開啟時，若您的裝置觸碰其他具備 NFC 功能的裝置或 NFC 標籤時，即可發送或接收數據"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "當此功能開啟時，通過將裝置握住靠在一起時，可發送檔案至其他 NFC 和 Wi-Fi Direct 裝置。例如，您可從媒體瀏覽器發送圖像／影片檔案、從音樂播放器發送音樂檔案等。只需將裝置靠在一起（一般以背對背）然後輕觸螢幕。應用程式將決定發送的檔案"
+
diff --git a/ug-nfc-setting-efl/po/zh_SG.po b/ug-nfc-setting-efl/po/zh_SG.po
new file mode 100644
index 0000000..0e18c7d
--- /dev/null
+++ b/ug-nfc-setting-efl/po/zh_SG.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "若要取消共享，轻敲取消"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "服务不可用。NFC 已关闭。是否开启 NFC？"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "通过 NFC 共享"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "轻轻地将手机触碰在一起以共享"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "转接失败"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "安全政策限制 %s 的使用"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "已分享"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "无法共享"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "预定项目"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "您可将预定项目传输至另一 NFC 设备。只需在主屏下将设备靠在一起（通常背对背）"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "当 NFC 开始时，您可在您的设备接触其他支持 NFC 的设备或 NFC 标签时发送或接收数据"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "当该特性开启时，您可通过将设备紧靠在一起将文件无线传输至其他 NFC 和 直接WLAN 设备。例如，您可无线传输来自图库的图片/视频文件、来自音乐播放器的音乐文件，以及更多。只需要将设备放在一起（通常背对背）然后轻敲您的屏幕。应用程序判定无线传输的内容"
+
diff --git a/ug-nfc-setting-efl/po/zh_TW.po b/ug-nfc-setting-efl/po/zh_TW.po
index e8e1eef..98af7da 100644
--- a/ug-nfc-setting-efl/po/zh_TW.po
+++ b/ug-nfc-setting-efl/po/zh_TW.po
@@ -1,9 +1,42 @@
 msgid "IDS_NFC_BODY_NFC"
 msgstr "NFC"
 
-msgid "IDS_NFC_BODY_S_BEAM_DESCRIPTION_MSG_CHN"
-msgstr "開啟此功能時，將裝置握住靠在一起時，可發送檔案至其他 NFC 與 WLAN Direct 裝置。例如，您可自媒體瀏覽器發送影像／影片檔案、自音樂播放器發送音樂檔案等。只需將裝置靠在一起（一般以背對背）然後輕觸螢幕。應用程式將決定發送的檔案"
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "若要取消分享，輕觸取消"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "服務無法使用。NFC 已關閉。開啟 NFC 嗎？"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "透過 NFC 分享"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "將手機輕輕碰觸在一起以共享"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "傳輸失敗"
 
 msgid "IDS_NFC_OPT_S_BEAM"
 msgstr "S Beam"
 
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "安全政策限制使用 %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "共享"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "無法分享"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "預定義項目"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "您可將預定義項目傳送至其他 NFC 裝置。只需在處於主螢幕時，將裝置靠在一起（一般以背對背）"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "開啟 NFC 時，若您的裝置觸碰其他具備 NFC 功能的裝置或 NFC 標籤，即可傳送或接收資料"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "開啟此功能時，將裝置握住靠在一起時，可發送檔案至其他 NFC 與 Wi-Fi Direct 裝置。例如，您可自媒體瀏覽器發送影像／影片檔案、自音樂播放器發送音樂檔案等。只需將裝置靠在一起（一般以背對背）然後輕觸螢幕。應用程式將決定發送的檔案"
+
diff --git a/ug-nfc-setting-efl/src/ug-nfc-setting-db.c b/ug-nfc-setting-efl/src/ug-nfc-setting-db.c
new file mode 100644
index 0000000..2c298fd
--- /dev/null
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-db.c
@@ -0,0 +1,272 @@
+/*
+  * Copyright 2012  Samsung Electronics Co., Ltd
+  *
+  * Licensed under the Flora License, Version 1.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+
+  *     http://www.tizenopensource.org/license
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+
+#include "ug-nfc-setting-main.h"
+#include "ug-nfc-setting-db.h"
+
+
+#define DB_FILE_PATH			"/opt/usr/dbspace/.net-nfcpush.db"
+#define DB_TABLE_NAME			"NfcPushMsgTable"
+
+/* sqlite> .schema 		*/
+/* CREATE TABLE NfcPushMsgTable ( AppId TEXT PRIMARY KEY, PkgName TEXT, IconPath TEXT, MsgDesc TEXT ); */
+
+#define DB_QUERY_LEN			512
+
+static sqlite3 *g_predefined_item_db;
+static sqlite3_stmt *g_predefined_item_pstmt;
+
+
+static void _db_finalize_statement(void)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	int db_ret = SQLITE_OK;
+
+	if (g_predefined_item_pstmt != NULL)
+	{
+		db_ret = sqlite3_finalize(g_predefined_item_pstmt);
+		g_predefined_item_pstmt = NULL;
+
+		if(db_ret != SQLITE_OK)
+		{
+			LOGD("Failed to sqlite3_finalize error[%d]", db_ret);
+		}
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+}
+
+
+int _ug_nfc_setting_db_open(void)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	int db_ret = SQLITE_OK;
+
+	db_ret = sqlite3_open(DB_FILE_PATH, &g_predefined_item_db);
+	if(db_ret != SQLITE_OK)
+	{
+		LOGD("Failed to open database. error[%d]", db_ret);
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+
+	return db_ret;
+}
+
+int _ug_nfc_setting_db_close(void)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	int db_ret = SQLITE_OK;
+
+	if (g_predefined_item_db != NULL)
+	{
+		db_ret = sqlite3_close(g_predefined_item_db);
+		if(db_ret != SQLITE_OK)
+		{
+			LOGD("Failed to close database. error[%d]", db_ret);
+			return db_ret;
+		}
+		g_predefined_item_db = NULL;
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+
+	return db_ret;
+}
+
+int _ug_nfc_setting_db_open_table(int *table_handle)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	int db_ret = SQLITE_OK;
+	int count = 0;
+
+	/* get num_of_index */
+	_ug_nfc_setting_db_get_count(&count);
+
+	if (count > 0)
+	{
+		char query[DB_QUERY_LEN] = { 0, };
+		sqlite3_stmt *stmt = NULL;
+
+		snprintf(query, DB_QUERY_LEN, "select * from %s", DB_TABLE_NAME);
+		LOGD("query [%s]", query);
+
+		db_ret = sqlite3_prepare_v2(g_predefined_item_db, query, strlen(query), &stmt, NULL);
+		if (db_ret != SQLITE_OK)
+		{
+			LOGD("Failed to sqlite3_prepare_v2 error[%d]", db_ret);
+			if (g_predefined_item_pstmt != NULL)
+			{
+				db_ret = sqlite3_finalize(stmt);
+				stmt = NULL;
+				if(db_ret != SQLITE_OK)
+				{
+					LOGD("Failed to sqlite3_finalize error[%d]", db_ret);
+				}
+			}
+			return db_ret;
+		}
+
+		*table_handle = (int)stmt;
+	}
+	else
+	{
+		LOGD("no item");
+		db_ret = SQLITE_ERROR;
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+
+	return db_ret;
+}
+
+int _ug_nfc_setting_db_get_count(int *count)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	int db_ret = SQLITE_OK;
+	char query[DB_QUERY_LEN] = { 0, };
+
+	snprintf(query, DB_QUERY_LEN,
+			"select count(AppId) from %s ",
+			DB_TABLE_NAME);
+	LOGD("query [%s]", query);
+
+	db_ret = sqlite3_prepare_v2(g_predefined_item_db, query, strlen(query), &g_predefined_item_pstmt, NULL);
+	if (db_ret != SQLITE_OK)
+	{
+		LOGD("Failed to sqlite3_prepare_v2 error[%d]", db_ret);
+		_db_finalize_statement();
+		return db_ret;
+	}
+
+	db_ret = sqlite3_step(g_predefined_item_pstmt);
+	if (db_ret != SQLITE_ROW)
+	{
+		LOGD("Failed to sqlite3_step error[%d]", db_ret);
+		_db_finalize_statement();
+		return db_ret;
+	}
+
+	*count = sqlite3_column_int(g_predefined_item_pstmt, 0);
+
+	_db_finalize_statement();
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+
+	return db_ret;
+}
+
+int _ug_nfc_setting_db_get_next_record(int table_handle,
+					char **app_id, char **pkgName,
+					char **iconPath, char **msgDes)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	int db_ret = SQLITE_OK;
+	sqlite3_stmt *stmt = NULL;
+
+	stmt = (sqlite3_stmt *)table_handle;
+	if (stmt == NULL)
+	{
+		return -1;
+	}
+
+	db_ret = sqlite3_step(stmt);
+	if (db_ret != SQLITE_DONE)
+	{
+		LOGD("success to get next record");
+
+		if ((char *)sqlite3_column_text(stmt, 0) != NULL)
+			*app_id = strdup((char *)sqlite3_column_text(stmt, 0));
+		if ((char *)sqlite3_column_text(stmt, 1) != NULL)
+			*pkgName = strdup((char *)sqlite3_column_text(stmt, 1));
+		if ((char *)sqlite3_column_text(stmt, 2) != NULL)
+			*iconPath = strdup((char *)sqlite3_column_text(stmt, 2));
+		if ((char *)sqlite3_column_text(stmt, 3) != NULL)
+			*msgDes = strdup((char *)sqlite3_column_text(stmt, 3));
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+
+	return SQLITE_OK;
+}
+
+int _ug_nfc_setting_db_get_pkgName(char *app_id, char **pkgName)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	int db_ret = SQLITE_OK;
+	char query[DB_QUERY_LEN] = { 0, };
+
+	snprintf(query, DB_QUERY_LEN,
+			"select PkgName from %s where AppId =\"%s\"", DB_TABLE_NAME, app_id);
+	LOGD("query [%s]", query);
+
+	db_ret = sqlite3_prepare_v2(g_predefined_item_db, query, strlen(query), &g_predefined_item_pstmt, NULL);
+	if (db_ret != SQLITE_OK)
+	{
+		LOGD("Failed to sqlite3_prepare_v2 error[%d]", db_ret);
+		_db_finalize_statement();
+		return db_ret;
+	}
+
+	db_ret = sqlite3_step(g_predefined_item_pstmt);
+	if (db_ret != SQLITE_ROW)
+	{
+		LOGD("Failed to sqlite3_step error[%d]", db_ret);
+		_db_finalize_statement();
+		return db_ret;
+	}
+
+	*pkgName = strdup((char *)sqlite3_column_text(g_predefined_item_pstmt, 0));
+
+	_db_finalize_statement();
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+
+	return db_ret;
+}
+
+int _ug_nfc_setting_db_close_table(int table_handle)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	int db_ret = SQLITE_OK;
+	sqlite3_stmt *stmt = NULL;
+
+	stmt = (sqlite3_stmt *)table_handle;
+	if (stmt == NULL)
+		return -1;
+
+	db_ret = sqlite3_finalize(stmt);
+	if(db_ret != SQLITE_OK)
+	{
+		LOGD("Failed to sqlite3_finalize error[%d]", db_ret);
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+
+	return db_ret;
+}
+
+
+
diff --git a/ug-nfc-setting-efl/src/ug-nfc-setting-main.c b/ug-nfc-setting-efl/src/ug-nfc-setting-main.c
index 97732c5..59a9024 100644
--- a/ug-nfc-setting-efl/src/ug-nfc-setting-main.c
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-main.c
@@ -17,51 +17,31 @@
 
 #include "ug-nfc-setting-main.h"
 #include "ug-nfc-setting-popup.h"
+#include "ug-nfc-setting-db.h"
+#ifdef MDM_PHASE_2
+#include <mdm.h>
+#endif
 
-#include <stdio.h>
-#include <Elementary.h>
-#include <Ecore.h>
-#include <bundle.h>
-#include <Ecore_X.h>
-#include <vconf.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#define _EDJ(obj) elm_layout_edje_get(obj)
 #ifndef UG_MODULE_API
 #define UG_MODULE_API __attribute__ ((visibility("default")))
 #endif
 
-#define NFC_MANAGER_ENABLE 1
-#define NFC_MANAGER_DISABLE 0
-
-#ifdef _SBEAM_SUPPORT_
-#define S_BEAM_DESCRIPTION_MSG_WRAP_WIDTH	640
-#endif
-
-#define MAX_PREDEFINED_ITEM_COUNT	100
-
+static Elm_Genlist_Item_Class itc_sep;
+static Elm_Genlist_Item_Class itc_sep_help;
 static Elm_Genlist_Item_Class itc_check;
 static Elm_Genlist_Item_Class itc_helptext;
 static Elm_Genlist_Item_Class itc_2text;
-static Elm_Genlist_Item_Class itc_radio;
 
-static Elm_Object_Item *on_off_item = NULL;
+static Elm_Object_Item *nfc_item = NULL;
 #ifdef _SBEAM_SUPPORT_
 static Elm_Object_Item *sbeam_item = NULL;
-static Elm_Object_Item *sbeam_item_help = NULL;
 #endif
 static Elm_Object_Item *predefined_item = NULL;
-static Elm_Object_Item *predefined_item_help = NULL;
-
-Evas_Object *radio_main = NULL;
-char **predefined_item_list = NULL;
-int predefined_item_count = 0;
-static int state_index = 0; //selected radio index
 
-static bool pending_status = FALSE;
+static bool pending_status = false;
 
 
+#ifdef MDM_PHASE_2
 static void _mdm_restricted_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	ugdata_t *ug_data = (ugdata_t *)data;
@@ -77,18 +57,20 @@ static void _mdm_restricted_popup(void *data)
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
 	char popup_str[POPUP_TEXT_SIZE] = { 0, };
+	char *buf = NULL;
 	ugdata_t *ug_data = (ugdata_t *)data;
 	if (!ug_data)
 		return;
 
-	snprintf(popup_str, POPUP_TEXT_SIZE, IDS_SECURITY_POLICY_RESTRICTS_USE_OF_PS, IDS_NFC_NFC);
+	buf = strdup(IDS_SECURITY_POLICY_RESTRICTS_USE_OF_PS);
+	snprintf(popup_str, POPUP_TEXT_SIZE, buf, IDS_NFC_NFC);
 	ug_nfc_setting_create_popup(ug_data, ug_data->base_layout, popup_str, NULL, 0, NULL, 0, NULL, 0, true, true, _mdm_restricted_popup_response_cb);
 
 	LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
 }
+#endif
 
-
-static void _app_error_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
+static void _show_app_error_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	ugdata_t *ug_data = (ugdata_t *)data;
 	int result = (int)event_info;
@@ -125,208 +107,100 @@ static void _show_app_error_popup(void *data)
 
 	memcpy(popup_str, IDS_NFC_SERVICE_IS_NOT_SUPPORTED, strlen(IDS_NFC_SERVICE_IS_NOT_SUPPORTED));
 
-	ug_nfc_setting_create_popup(ug_data, ug_data->base_layout, popup_str, IDS_CLOSE, UG_NFC_POPUP_RESP_CLOSE, NULL, 0, NULL, 0, false, false, _app_error_popup_response_cb);
+	ug_nfc_setting_create_popup(ug_data, ug_data->base_layout, popup_str, IDS_CLOSE, UG_NFC_POPUP_RESP_CLOSE, NULL, 0, NULL, 0, false, false, _show_app_error_popup_response_cb);
 
 	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
 }
 
-int _get_theme_type()
+static bool _get_pending_status(void)
 {
-	/* TODO : will be added */
-	return 0;
+	return pending_status;
 }
 
-const char *_get_font_name(int font)
+static void _set_pending_status(bool status)
 {
-	const char *name = NULL;
-
-	/* TODO : will be improved */
-	if (_get_theme_type() == 0)
-	{
-		switch (font)
-		{
-		case UG_FONT_LIST :
-			name = "SLP";
-			break;
-
-		case UG_FONT_SBEAM_TITLE :
-			name = "SLP";
-			break;
-
-		case UG_FONT_LIVEBOX :
-			name = "SLP";
-			break;
-
-		case UG_FONT_HELP :
-			name = "SLP";
-			break;
-
-		default :
-			LOGD("[%s(): %d] unknown font type [%d]", __FUNCTION__, __LINE__, font);
-			break;
-		}
-	}
-
-	return name;
+	pending_status = status;
 }
 
-uint32_t _get_font_color(int font)
+static void _back_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-	uint32_t color = 0x00808080;
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-	/* TODO : will be improved */
-	if (_get_theme_type() == 0)
-	{
-		switch (font)
-		{
-		case UG_FONT_LIST :
-			color = 0x00000000;
-			break;
+	_ug_nfc_setting_db_close();
 
-		case UG_FONT_SBEAM_TITLE :
-			color = 0x00000000;
-			break;
+	ug_destroy_me(data);
 
-		case UG_FONT_LIVEBOX :
-			color = 0x00FFFFFF;
-			break;
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+}
 
-		case UG_FONT_HELP :
-			color = 0x007C7C7C;
-			break;
+/* Principle of NFC, S Beam On/Off 				*/
+/*							*/
+/* NFC & S Beam Off -> NFC On 	: NFC: On, S Beam: Off	*/
+/* NFC & S Beam Off -> S Beam On 	: NFC: On, S Beam: On	*/
+/* NFC & S Beam On -> S Beam Off 	: NFC: On, S Beam: Off	*/
+/* NFC & S Beam On -> NFC Off 	: NFC: Off, S Beam: Off 	*/
 
-		default :
-			LOGD("[%s(): %d] unknown font type [%d]", __FUNCTION__, __LINE__, font);
-			break;
-		}
-	}
+static void _change_nfc_onoff_setting(void *data)
+{
+	int status;
+	int result;
 
-	return color;
-}
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-int _get_font_size(int font)
-{
-	int size = 0;
+	ugdata_t *ug_data = (ugdata_t *)data;
+	if (!ug_data)
+		return;
 
-	/* TODO : will be improved */
-	if (_get_theme_type() == 0)
+	/* check MDM */
+#ifdef MDM_PHASE_2
+	result = mdm_get_service();
+	if (result == MDM_RESULT_SUCCESS)
 	{
-		switch (font)
+		result = mdm_get_allow_nfc();
+		if (result == MDM_ALLOWED)
 		{
-		case UG_FONT_LIST :
-			size = 28;
-			break;
-
-		case UG_FONT_SBEAM_TITLE :
-			size = 38;
-			break;
-
-		case UG_FONT_LIVEBOX :
-			size = 30;
-			break;
-
-		case UG_FONT_HELP :
-			size = 32;
-			break;
-
-		default :
-			LOGD("[%s(): %d] unknown font type [%d]", __FUNCTION__, __LINE__, font);
-			break;
+			LOGD( "MDM_ALLOWED!\n");
+			mdm_release_service();
 		}
-	}
-
-	return size;
-}
-
-const char *_get_font_style(int font)
-{
-	const char *style = NULL;
-
-	/* TODO : will be improved */
-	if (_get_theme_type() == 0)
-	{
-		switch (font)
+		else if (result == MDM_RESTRICTED)
 		{
-		case UG_FONT_LIST :
-			style = "bold";
-			break;
-
-		case UG_FONT_SBEAM_TITLE :
-			style = "";
-			break;
-
-		case UG_FONT_LIVEBOX :
-			style = "";
-			break;
-
-		case UG_FONT_HELP :
-			style = "";
-			break;
-
-		default :
-			LOGD("[%s(): %d] unknown font type [%d]", __FUNCTION__, __LINE__, font);
-			break;
+			LOGD( "MDM_RESTRICTED!\n");
+			_mdm_restricted_popup(ug_data);
+			return;
+		}
+		else
+		{
+			LOGD( "exception case!\n");
+			return;
 		}
 	}
-
-	return style;
-}
-
-bool _get_label_text(int font, const char *text, int align, char *output, int len)
-{
-	bool result = false;
-	char *align_begin = NULL;
-	char *align_end = NULL;
-
-	if (text == NULL)
-		return result;
-
-	switch (align)
+	else
 	{
-	case UG_ALIGN_CENTER :
-		align_begin = "<align=center>";
-		align_end = "</align>";
-		break;
-
-	case UG_ALIGN_RIGHT :
-		align_begin = "<align=right>";
-		align_end = "</align>";
-		break;
-
-	case UG_ALIGN_LEFT :
-	default :
-		align_begin = "";
-		align_end = "";
-		break;
+		LOGD( "failed to get mdm service!\n");
+		return;
 	}
+#endif
 
-	/* TODO : will be improved */
-	if (_get_font_style(font) != NULL)
+	if ((result = vconf_get_bool(VCONFKEY_NFC_STATE, &status)) == 0)
 	{
-		snprintf(output, len, "%s<font_size=%d><color=#%06X><b>%s</b></color></font_size>%s", align_begin, _get_font_size(font), _get_font_color(font), text, align_end);
+		LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, status);
+
+		result = nfc_manager_set_activation(!status, NULL, NULL);
+		_set_pending_status(true);
 	}
 	else
 	{
-		snprintf(output, len, "%s<font_size=%d><color=#%06X>%s</color></font_size>%s", align_begin, _get_font_size(font), _get_font_color(font), text, align_end);
+		LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
 	}
 
-	return result;
-}
-
-static bool _get_pending_status(void)
-{
-	return pending_status;
-}
-
-static void _set_pending_status(bool status)
-{
-	pending_status = status;
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
 }
 
-static void _change_nfc_onoff_setting(void *data)
+#ifdef _SBEAM_SUPPORT_
+static void _change_nfc_sbeam_setting(void *data)
 {
-	int status;
-	int result;
+	int status = 0;
+	int result = -1;
 
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
@@ -334,13 +208,81 @@ static void _change_nfc_onoff_setting(void *data)
 	if (!ug_data)
 		return;
 
-	if ((result = vconf_get_bool(VCONFKEY_NFC_STATE, &status)) == 0)
+	/* check MDM */
+#ifdef MDM_PHASE_2
+	result = mdm_get_service();
+	if (result == MDM_RESULT_SUCCESS)
+	{
+		result = mdm_get_allow_nfc();
+		if (result == MDM_ALLOWED)
+		{
+			LOGD( "MDM_ALLOWED!\n");
+			mdm_release_service();
+		}
+		else if (result == MDM_RESTRICTED)
+		{
+			LOGD( "MDM_RESTRICTED!\n");
+			_mdm_restricted_popup(ug_data);
+			return;
+		}
+		else
+		{
+			LOGD( "exception case!\n");
+			return;
+		}
+	}
+	else
+	{
+		LOGD( "failed to get mdm service!\n");
+		return;
+	}
+#endif
+
+	if ((result = vconf_get_bool(VCONFKEY_NFC_SBEAM, &status)) == 0)
 	{
 		LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, status);
 
-		result = nfc_manager_set_activation(!status, NULL, NULL);
+		if (status)
+		{
+			/* sbeam off */
+			result = vconf_set_bool(VCONFKEY_NFC_SBEAM, FALSE);
+			if (!result )
+			{
+				LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+			}
+			else
+			{
+				LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+			}
+		}
+		else
+		{
+			/* sbeam on */
+			result = vconf_set_bool(VCONFKEY_NFC_SBEAM, TRUE);
+			if (!result )
+			{
+				LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+			}
+			else
+			{
+				LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+			}
 
-		_set_pending_status(TRUE);
+			/* nfc on */
+			if ((result = vconf_get_bool(VCONFKEY_NFC_STATE, &status)) == 0)
+			{
+				LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, status);
+				if (!status)
+				{
+					result = nfc_manager_set_activation(true, NULL, NULL);
+					_set_pending_status(true);
+				}
+			}
+			else
+			{
+				LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+			}
+		}
 	}
 	else
 	{
@@ -349,22 +291,57 @@ static void _change_nfc_onoff_setting(void *data)
 
 	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
 }
+#endif
 
-#ifdef _SBEAM_SUPPORT_
-static void _change_nfc_sbeam_setting(void)
+void _change_nfc_predefined_item_setting(void *data)
 {
 	int status = 0;
 	int result = -1;
 
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-	if ((result = vconf_get_bool(VCONFKEY_NFC_SBEAM, &status)) == 0)
+	ugdata_t *ug_data = (ugdata_t *)data;
+	if (!ug_data)
+		return;
+
+	/* check MDM */
+#ifdef MDM_PHASE_2
+	result = mdm_get_service();
+	if (result == MDM_RESULT_SUCCESS)
+	{
+		result = mdm_get_allow_nfc();
+		if (result == MDM_ALLOWED)
+		{
+			LOGD( "MDM_ALLOWED!\n");
+			mdm_release_service();
+		}
+		else if (result == MDM_RESTRICTED)
+		{
+			LOGD( "MDM_RESTRICTED!\n");
+			_mdm_restricted_popup(ug_data);
+			return;
+		}
+		else
+		{
+			LOGD( "exception case!\n");
+			return;
+		}
+	}
+	else
+	{
+		LOGD( "failed to get mdm service!\n");
+		return;
+	}
+#endif
+
+	if ((result = vconf_get_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, &status)) == 0)
 	{
 		LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, status);
 
 		if (status)
 		{
-			result = vconf_set_bool(VCONFKEY_NFC_SBEAM, FALSE);
+			/* predefined item off */
+			result = vconf_set_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, FALSE);
 			if (!result )
 			{
 				LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
@@ -376,7 +353,8 @@ static void _change_nfc_sbeam_setting(void)
 		}
 		else
 		{
-			result = vconf_set_bool(VCONFKEY_NFC_SBEAM, TRUE);
+			/* predefined item on */
+			result = vconf_set_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, TRUE);
 			if (!result )
 			{
 				LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
@@ -394,24 +372,22 @@ static void _change_nfc_sbeam_setting(void)
 
 	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
 }
-#endif
 
 void _nfc_activation_changed_cb(bool activated , void *user_data)
 {
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-#ifdef _SBEAM_SUPPORT_
-	int sbeam_state = 0;
-	static int sbeam_off_by_nfcOnOff = EINA_FALSE;
-#endif
+	ugdata_t *ug_data = (ugdata_t *)user_data;
+	int predefined_item_state = 0;
+	static bool predefined_item_off_by_nfcOnOff = false;
 	int result;
 
 	LOGD("nfc mode %s \n", activated ? "ON" : "OFF");
 
-#ifdef _SBEAM_SUPPORT_
-	if ((result = vconf_get_bool(VCONFKEY_NFC_SBEAM, &sbeam_state)) == 0)
+
+	if ((result = vconf_get_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, &predefined_item_state)) == 0)
 	{
-		LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, sbeam_state);
+		LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, predefined_item_state);
 	}
 	else
 	{
@@ -419,78 +395,95 @@ void _nfc_activation_changed_cb(bool activated , void *user_data)
 		return;
 	}
 
-	LOGD("S BEAM state %d, NFC was off by nfcOnOff %s \n",
-			sbeam_state, sbeam_off_by_nfcOnOff == EINA_TRUE ? "Yes" : "No");
-#endif
+	LOGD("The state of Predefined Item %d, Predefined Item was off by nfcOnOff %s \n",
+			predefined_item_state, predefined_item_off_by_nfcOnOff == true ? "Yes" : "No");
 
 	/* nfc setting ui updated */
-	_set_pending_status(FALSE);
+	_set_pending_status(false);
 
-	if (on_off_item != NULL)
-		elm_genlist_item_update(on_off_item);
+	if (nfc_item != NULL)
+		elm_genlist_item_update(nfc_item);
 
 	if (activated == true)
 	{
 		/* predefined item setting enabled */
 		elm_object_item_disabled_set(predefined_item, EINA_FALSE);
-		elm_object_item_disabled_set(predefined_item_help, EINA_FALSE);
-
-#ifdef _SBEAM_SUPPORT_
-		/* sbeam setting enabled */
-		elm_object_item_disabled_set(sbeam_item, EINA_FALSE);
-		elm_object_item_disabled_set(sbeam_item_help, EINA_FALSE);
 
-		if (sbeam_off_by_nfcOnOff != EINA_TRUE)
+		if (predefined_item_off_by_nfcOnOff != true)
 			return;
 
-		LOGD("Turning S Beam on \n");
+		LOGD("Turning Predefined Item on \n");
 
-		_change_nfc_sbeam_setting();
+		_change_nfc_predefined_item_setting(ug_data);
 
-		if (sbeam_item != NULL)
-			elm_genlist_item_update(sbeam_item);
+		if (predefined_item != NULL)
+			elm_genlist_item_update(predefined_item);
 
 		/* unset internal flag */
-		sbeam_off_by_nfcOnOff = EINA_FALSE;
-#endif
+		predefined_item_off_by_nfcOnOff = false;
 	}
 	else
 	{
+#ifdef _SBEAM_SUPPORT_
+		int sbeam_state = 0;
+#endif
+
 		/* predefined item setting disabled */
 		elm_object_item_disabled_set(predefined_item, EINA_TRUE);
-		elm_object_item_disabled_set(predefined_item_help, EINA_TRUE);
-
-#ifdef _SBEAM_SUPPORT_
-		/* sbeam setting disabled */
-		elm_object_item_disabled_set(sbeam_item, EINA_TRUE);
-		elm_object_item_disabled_set(sbeam_item_help, EINA_TRUE);
 
-		if (sbeam_state == VCONFKEY_NFC_SBEAM_OFF)
+		if (predefined_item_state == VCONFKEY_NFC_PREDEFINED_ITEM_OFF)
 			return;
 
-		LOGD("Turning S Beam off \n");
+		LOGD("Turning Predefined Item off \n");
 
-		_change_nfc_sbeam_setting();
+		_change_nfc_predefined_item_setting(ug_data);
 
-		if (sbeam_item != NULL)
-			elm_genlist_item_update(sbeam_item);
+		if (predefined_item != NULL)
+			elm_genlist_item_update(predefined_item);
 
 		/* set internal flag */
-		sbeam_off_by_nfcOnOff = EINA_TRUE;
+		predefined_item_off_by_nfcOnOff = true;
+
+#ifdef _SBEAM_SUPPORT_
+		/* sbeam off */
+		if ((result = vconf_get_bool(VCONFKEY_NFC_SBEAM, &sbeam_state)) == 0)
+		{
+			LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, sbeam_state);
+
+			if (sbeam_state)
+			{
+				/* sbeam off */
+				result = vconf_set_bool(VCONFKEY_NFC_SBEAM, FALSE);
+				if (!result )
+				{
+					LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+				}
+				else
+				{
+					LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+				}
+			}
+		}
+		else
+		{
+			LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+		}
 #endif
 	}
 
 	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
 }
 
-static Evas_Object *_create_bg(Evas_Object *win)
+static Evas_Object *_create_bg(Evas_Object *parent, char *style)
 {
-	Evas_Object *bg = elm_bg_add(win);
+	Evas_Object *bg = elm_bg_add(parent);
 
 	evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-	elm_win_resize_object_add(win, bg);
+	if (style)
+		elm_object_style_set(bg, style);
+
+	elm_win_resize_object_add(parent, bg);
 
 	evas_object_show(bg);
 
@@ -516,194 +509,6 @@ static Evas_Object *_create_main_layout(Evas_Object *parent)
 	return layout;
 }
 
-static char *_gl_radio_text_get(void *data, Evas_Object *obj, const char *part)
-{
-	int index = (int) data;
-
-	if (!strcmp(part, "elm.text"))
-	{
-		return strdup(predefined_item_list[index]);
-	}
-
-	return NULL;
-}
-
-static Evas_Object *_gl_radio_content_get(void *data, Evas_Object *obj, const char *part)
-{
-	int index = (int) data;
-	Evas_Object *radio = NULL;
-
-	if (!strcmp(part, "elm.icon") || !strcmp(part, "elm.swallow.icon"))
-	{
-		radio = elm_radio_add(obj);
-		elm_radio_state_value_set(radio, index);
-		elm_radio_group_add(radio, radio_main);
-
-		if (index == state_index)
-			elm_radio_value_set(radio, state_index);
-
-		evas_object_size_hint_weight_set(radio, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-		evas_object_size_hint_align_set(radio, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-		return radio;
-	}
-
-	return NULL;
-}
-
-static Eina_Bool _gl_radio_state_get(void *data, Evas_Object *obj, const char *part)
-{
-	return EINA_FALSE;
-}
-
-static void _gl_radio_sel(void *data, Evas_Object *obj, void *event_info)
-{
-	Elm_Object_Item *item = (Elm_Object_Item *) event_info;
-	int result = -1;
-	int index = 0;
-
-	if (item)
-	{
-		index = (int) elm_object_item_data_get(item);
-
-		LOGD("[Genlist] Selected Text : %s\n", predefined_item_list[index]);
-
-		state_index = index;
-		result = vconf_set_str(VCONFKEY_NFC_PREDEFINED_ITEM, predefined_item_list[index]);
-		if (!result )
-		{
-			LOGD("[%s(): %d] vconf_set_str success\n", __FUNCTION__, __LINE__);
-		}
-		else
-		{
-			LOGD("[%s(): %d] vconf_set_str failed\n", __FUNCTION__, __LINE__);
-		}
-
-		elm_genlist_item_update(item);
-	}
-}
-
-static Evas_Object *_ug_nfc_create_predefined_item_layout(void *data)
-{
-	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
-
-	ugdata_t *ug_data = (ugdata_t *)data;
-	Evas_Object *layout = NULL;
-	Evas_Object *genlist = NULL;
-	FILE *fp = NULL;
-	int index = 0;
-	char buf[1024] = { 0 , };
-
-	layout = elm_layout_add(ug_data->base_naviframe);
-	if (layout == NULL)
-	{
-		LOGD("[%s(): %d] layout is null", __FUNCTION__, __LINE__);
-		return NULL;
-	}
-	elm_layout_theme_set(layout, "layout", "application", "noindicator");
-	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_show(layout);
-
-	/* make a list */
-	genlist = elm_genlist_add(layout);
-	if (genlist == NULL)
-	{
-		LOGD("[%s(): %d] genlist is null", __FUNCTION__, __LINE__);
-		return NULL;
-	}
-
-	if (!radio_main)
-	{
-		radio_main = elm_radio_add(genlist);
-		elm_radio_state_value_set(radio_main, 0);
-		elm_radio_value_set(radio_main, 0);
-	}
-
-	itc_radio.item_style = "1text.1icon.2";
-	itc_radio.func.text_get = _gl_radio_text_get;
-	itc_radio.func.content_get = _gl_radio_content_get;
-	itc_radio.func.state_get = _gl_radio_state_get;
-	itc_radio.func.del = NULL;
-
-	/* file open to make a list */
-	if ((fp = fopen(PREDEFINED_ITEM_FILE_PATH, "r")) == NULL)
-	{
-		LOGD("file open error");
-		return NULL;
-	}
-
-	if (fscanf(fp, "%d", &predefined_item_count))
-	{
-		LOGD("count [%d]", predefined_item_count);
-	}
-
-	if ((predefined_item_count < 0) || (predefined_item_count > MAX_PREDEFINED_ITEM_COUNT))
-	{
-		LOGD("The value of item_count is wrong");
-		fclose(fp);
-		return NULL;
-	}
-
-	predefined_item_count++; /* for none menu */
-
-	predefined_item_list = malloc(sizeof(char *) * predefined_item_count);
-
-	for (index = 0; index < predefined_item_count; index++) {
-		if (index == 0)
-		{
-			LOGD("first item");
-
-			predefined_item_list[index] = strdup(IDS_NONE);
-			elm_genlist_item_append(genlist, &itc_radio, (void *)index, NULL, ELM_GENLIST_ITEM_NONE, _gl_radio_sel, NULL);
-		}
-		else
-		{
-			if (fscanf(fp, "%s", buf))
-			{
-				LOGD("buf [%s]", buf);
-				predefined_item_list[index] = strdup(buf);
-
-				elm_genlist_item_append(genlist, &itc_radio, (void *)index, NULL, ELM_GENLIST_ITEM_NONE, _gl_radio_sel, NULL);
-			}
-		}
-	}
-
-	evas_object_show(genlist);
-	elm_object_part_content_set(layout, "elm.swallow.content", genlist);
-
-	fclose(fp);
-
-	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
-
-	return layout;
-}
-
-static void _back_clicked_cb_from_predefined_item(void *data, Evas_Object *obj, void *event_info)
-{
-	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
-
-	ugdata_t *ug_data = data;
-	int index;
-
-	elm_naviframe_item_pop(ug_data->base_naviframe);
-
-	for (index  = 0; index < predefined_item_count; index++)
-	{
-		free(predefined_item_list[index]);
-	}
-	free(predefined_item_list);
-
-	predefined_item_count = 0;
-
-	if (radio_main)
-	{
-		evas_object_del(radio_main);
-		radio_main = NULL;
-	}
-
-	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
-}
-
 // get the state of item
 static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part)
 {
@@ -762,14 +567,21 @@ static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part)
 #endif
 	else if (item_data->type == NFC_PREDEFINED_ITEM)
 	{
-		char *selected_item = NULL;
-
-		selected_item = vconf_get_str(VCONFKEY_NFC_PREDEFINED_ITEM);
-
-		if (strcmp(selected_item, "None"))
+		if (!vconf_get_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, &enable))
+		{
+			if (enable != 0)
+			{
+				LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+				result = EINA_TRUE;
+			}
+			else
+			{
+				LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+			}
+		}
+		else
 		{
-			LOGD("[%s(): %d] vconf_get_str=> is not None", __FUNCTION__, __LINE__);
-			result = EINA_TRUE;
+			LOGD("[%s(): %d] vconf_get_bool error [%d]", __FUNCTION__, __LINE__, result);
 		}
 	}
 	else
@@ -789,7 +601,8 @@ static void _gl_del(void *data, Evas_Object *obj)
 
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-	free(item_data);
+	if (item_data != NULL)
+		free(item_data);
 
 	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
 }
@@ -824,30 +637,30 @@ static void _gl_sel_activation(void *data, Evas_Object *obj, void *event_info)
 #ifdef _SBEAM_SUPPORT_
 	else if (item_data->type == NFC_S_BEAM)
 	{
-		_change_nfc_sbeam_setting();
+		_change_nfc_sbeam_setting(item_data->data);
 
 		elm_genlist_item_update(item);
 	}
 #endif
 	else if (item_data->type == NFC_PREDEFINED_ITEM)
 	{
-		Evas_Object *predefined_item_layout = NULL;
+		Evas_Object *predefined_item_list = NULL;
 		Evas_Object *l_button = NULL;
 		ugdata_t *ug_data = item_data->data;
 
 		LOGD("[%s(): %d] NFC_PREDEFINED_ITEM", __FUNCTION__, __LINE__);
 
 		/* create setting view */
-		predefined_item_layout = _ug_nfc_create_predefined_item_layout(ug_data);
-		if (predefined_item_layout == NULL)
+		predefined_item_list = _ug_nfc_create_predefined_item_list(ug_data);
+		if (predefined_item_list == NULL)
 			return;
 
 		/* Push navifreme */
 		l_button = elm_button_add(ug_data->base_naviframe);
 		elm_object_style_set(l_button, "naviframe/back_btn/default");
-		evas_object_smart_callback_add(l_button, "clicked", _back_clicked_cb_from_predefined_item, ug_data);
+		evas_object_smart_callback_add(l_button, "clicked", _ug_nfc_destroy_predefined_item_list, ug_data);
 
-		ug_data->base_navi_it = elm_naviframe_item_push(ug_data->base_naviframe, IDS_PREDEFINED_ITEM, l_button, NULL, predefined_item_layout, NULL);
+		ug_data->base_navi_it = elm_naviframe_item_push(ug_data->base_naviframe, IDS_PREDEFINED_ITEM, l_button, NULL, predefined_item_list, NULL);
 	}
 	else
 	{
@@ -879,18 +692,25 @@ static void _check_changed_cb(void *data, Evas_Object *obj, void *event_info)
 
 		_change_nfc_onoff_setting(item_data->data);
 
-		if (on_off_item != NULL)
-			elm_genlist_item_update(on_off_item);
+		if (nfc_item != NULL)
+			elm_genlist_item_update(nfc_item);
 	}
 #ifdef _SBEAM_SUPPORT_
 	else if (item_data->type == NFC_S_BEAM)
 	{
-		_change_nfc_sbeam_setting();
+		_change_nfc_sbeam_setting(item_data->data);
 
 		if (sbeam_item != NULL)
 			elm_genlist_item_update(sbeam_item);
 	}
 #endif
+	else if (item_data->type == NFC_PREDEFINED_ITEM)
+	{
+		_change_nfc_predefined_item_setting(item_data->data);
+
+		if (predefined_item != NULL)
+			elm_genlist_item_update(predefined_item);
+	}
 	else
 	{
 		LOGD("[%s(): %d] item_data->type error", __FUNCTION__, __LINE__);
@@ -975,7 +795,22 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
 #endif
 	else if (item_data->type == NFC_PREDEFINED_ITEM)
 	{
-		LOGD("[%s(): %d] NFC_PREDEFINED_ITEM ", __FUNCTION__, __LINE__);
+		content = elm_check_add(obj);
+		evas_object_propagate_events_set(content, EINA_FALSE);
+		evas_object_smart_callback_add(content, "changed", _check_changed_cb, item_data);
+
+		if (((result = vconf_get_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, &on)) == 0) && (on != 0))
+		{
+			LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+			elm_check_state_set(content, EINA_TRUE);
+		}
+		else
+		{
+			LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+			elm_check_state_set(content, EINA_FALSE);
+		}
+
+		elm_object_style_set(content, "on&off");
 	}
 	else
 	{
@@ -1021,8 +856,16 @@ static char *_gl_text_get_onoff(void *data, Evas_Object *obj, const char *part)
 		}
 		else
 		{
-			text = vconf_get_str(VCONFKEY_NFC_PREDEFINED_ITEM);
-			LOGD("[%s]", text);
+			char *app_id = NULL;
+
+			app_id = vconf_get_str(VCONFKEY_NFC_PREDEFINED_ITEM);
+			if (app_id != NULL)
+			{
+				LOGD("app_id=> [%s]", app_id);
+				_ug_nfc_setting_db_get_pkgName(app_id, &text);
+
+				free(app_id);
+			}
 		}
 	}
 	else
@@ -1046,42 +889,36 @@ static char *_gl_text_get_help(void *data, Evas_Object *obj, const char *part)
 
 	if (index == 0)
 	{
-		text = strdup(IDS_NFC_S_BEAM_DESCRIPTION_MSG_CHN);
+		text = strdup(IDS_NFC_DESCRIPTION_MSG);
 
 	}
 	else if (index == 1)
 	{
 		text = strdup(IDS_PREDEFINED_ITEM_DESCRIPTION_MSG);
 	}
+	else if (index == 2)
+	{
+		text = strdup(IDS_NFC_S_BEAM_DESCRIPTION_MSG);
+	}
 
 	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
 
 	return text;
 }
 
-static Evas_Object *_ug_nfc_create_setting_layout(void *data)
+static Evas_Object *_ug_nfc_create_nfc_setting_list(void *data)
 {
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
 	ugdata_t *ug_data = (ugdata_t *)data;
-	Evas_Object *layout = NULL;
 	Evas_Object *genlist = NULL;
+	Elm_Object_Item* seperator = NULL;
 	int result = 0;
 	int on = 0;
 
-	/* Add layout*/
-	layout = elm_layout_add(ug_data->base_naviframe);
-	if (layout == NULL)
-	{
-		LOGD("[%s(): %d] layout is null", __FUNCTION__, __LINE__);
-		return NULL;
-	}
-	elm_layout_theme_set(layout, "layout", "application", "noindicator");
-	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_show(layout);
 
 	/* make genlist */
-	genlist = elm_genlist_add(layout);
+	genlist = elm_genlist_add(ug_data->base_naviframe);
 	if (genlist == NULL)
 	{
 		LOGD("[%s(): %d] genlist is null", __FUNCTION__, __LINE__);
@@ -1089,6 +926,18 @@ static Evas_Object *_ug_nfc_create_setting_layout(void *data)
 	}
 	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
 
+	itc_sep.item_style = "dialogue/separator";
+	itc_sep.func.text_get = NULL;
+	itc_sep.func.content_get = NULL;
+	itc_sep.func.state_get = NULL;
+	itc_sep.func.del = NULL;
+
+	itc_sep_help.item_style = "dialogue/separator.2";
+	itc_sep_help.func.text_get = NULL;
+	itc_sep_help.func.content_get = NULL;
+	itc_sep_help.func.state_get = NULL;
+	itc_sep_help.func.del = NULL;
+
 	itc_check.item_style = "dialogue/1text.1icon";
 	itc_check.func.text_get = _gl_text_get_onoff;
 	itc_check.func.content_get = _gl_content_get;
@@ -1101,70 +950,144 @@ static Evas_Object *_ug_nfc_create_setting_layout(void *data)
 	itc_helptext.func.state_get = NULL;
 	itc_helptext.func.del = NULL;
 
-	itc_2text.item_style = "dialogue/2text.3";
+	itc_2text.item_style = "dialogue/2text.1icon.10";
 	itc_2text.func.text_get = _gl_text_get_onoff;
 	itc_2text.func.content_get = _gl_content_get;
 	itc_2text.func.state_get = _gl_state_get;
 	itc_2text.func.del = _gl_del;
 
 
+	/* SEPARATOR */
+	seperator = elm_genlist_item_append(genlist, &itc_sep, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+	elm_genlist_item_select_mode_set(seperator, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
 	/* 1. NFC setting */
 	gl_item_data *on_off_data = NULL;
 	on_off_data = malloc(sizeof(gl_item_data));
+	if (!on_off_data)
+		return NULL;
 	on_off_data->type = NFC_ON_OFF;
 	on_off_data->data = ug_data;
-	on_off_item = elm_genlist_item_append(genlist, &itc_check, (void *)on_off_data, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, (void *)on_off_data);
+	nfc_item = elm_genlist_item_append(genlist, &itc_check, (void *)on_off_data, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, (void *)on_off_data);
 
-#ifdef _SBEAM_SUPPORT_
-	/* 2. S beam setting */
-	gl_item_data *sbeam_data = NULL;
-	sbeam_data = malloc(sizeof(gl_item_data));
-	sbeam_data->type = NFC_S_BEAM;
-	sbeam_data->data = ug_data;
-	sbeam_item = elm_genlist_item_append(genlist, &itc_check, (void *)sbeam_data, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, (void *)sbeam_data);
+	/* SEPARATOR.2 */
+	seperator = elm_genlist_item_append(genlist, &itc_sep_help, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+	elm_genlist_item_select_mode_set(seperator, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+	/* 1. NFC setting Help Text */
+	elm_genlist_item_append(genlist, &itc_helptext, (void *)0, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, NULL);
 
-	/* 2. S beam setting Help Text */
-	sbeam_item_help = elm_genlist_item_append(genlist, &itc_helptext, (void *)0, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, NULL);
+	/* SEPARATOR */
+	seperator = elm_genlist_item_append(genlist, &itc_sep, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+	elm_genlist_item_select_mode_set(seperator, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-	if (((result = vconf_get_bool(VCONFKEY_NFC_STATE, &on)) == 0) && (on == 0))
+	if (_ug_nfc_check_predefined_item_available())
 	{
-		elm_object_item_disabled_set(sbeam_item, TRUE);
-		elm_object_item_disabled_set(sbeam_item_help, TRUE);
-	}
-#endif
+		LOGD("success to create predefined item");
 
-	/* 3. Predefined item setting */
-	gl_item_data *predefined_item_data = NULL;
-	predefined_item_data = malloc(sizeof(gl_item_data));
-	predefined_item_data->type = NFC_PREDEFINED_ITEM;
-	predefined_item_data->data = ug_data;
-	predefined_item = elm_genlist_item_append(genlist, &itc_2text, (void *)predefined_item_data, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, (void *)predefined_item_data);
+		/* 2. Predefined item setting */
+		gl_item_data *predefined_item_data = NULL;
+		predefined_item_data = malloc(sizeof(gl_item_data));
+		if (!predefined_item_data)
+			return NULL;
+		predefined_item_data->type = NFC_PREDEFINED_ITEM;
+		predefined_item_data->data = ug_data;
+		predefined_item = elm_genlist_item_append(genlist, &itc_2text, (void *)predefined_item_data, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, (void *)predefined_item_data);
 
-	/* 3. Predefined item setting Help Text*/
-	predefined_item_help = elm_genlist_item_append(genlist, &itc_helptext, (void *)1, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, NULL);
+		/* SEPARATOR.2 */
+		seperator = elm_genlist_item_append(genlist, &itc_sep_help, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+		elm_genlist_item_select_mode_set(seperator, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-	if (((result = vconf_get_bool(VCONFKEY_NFC_STATE, &on)) == 0) && (on == 0))
-	{
-		elm_object_item_disabled_set(predefined_item, TRUE);
-		elm_object_item_disabled_set(predefined_item_help, TRUE);
+		/* 2. Predefined item setting Help Text*/
+		elm_genlist_item_append(genlist, &itc_helptext, (void *)1, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, NULL);
+
+		/* SEPARATOR */
+		seperator = elm_genlist_item_append(genlist, &itc_sep, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+		elm_genlist_item_select_mode_set(seperator, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+		if (((result = vconf_get_bool(VCONFKEY_NFC_STATE, &on)) == 0) && (on == 0))
+		{
+			result = vconf_set_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, FALSE);
+			if (!result )
+			{
+				LOGD("[%s(): %d] vconf_set_bool success\n", __FUNCTION__, __LINE__);
+			}
+			else
+			{
+				LOGD("[%s(): %d] vconf_set_bool failed\n", __FUNCTION__, __LINE__);
+			}
+			elm_object_item_disabled_set(predefined_item, EINA_TRUE);
+		}
 	}
 
 	evas_object_show(genlist);
-	elm_object_part_content_set(layout, "elm.swallow.content", genlist);
 
 	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
 
-	return layout;
+	return genlist;
 }
 
-static void _back_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+#ifdef _SBEAM_SUPPORT_
+static Evas_Object *_ug_nfc_create_sbeam_setting_list(void *data)
 {
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-	ug_destroy_me(data);
+	ugdata_t *ug_data = (ugdata_t *)data;
+	Evas_Object *genlist = NULL;
+	Elm_Object_Item* seperator = NULL;
+
+
+	/* make genlist */
+	genlist = elm_genlist_add(ug_data->base_naviframe);
+	if (genlist == NULL)
+	{
+		LOGD("[%s(): %d] genlist is null", __FUNCTION__, __LINE__);
+		return NULL;
+	}
+	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+
+	itc_sep.item_style = "dialogue/separator";
+	itc_sep.func.text_get = NULL;
+	itc_sep.func.content_get = NULL;
+	itc_sep.func.state_get = NULL;
+	itc_sep.func.del = NULL;
+
+	itc_check.item_style = "dialogue/1text.1icon";
+	itc_check.func.text_get = _gl_text_get_onoff;
+	itc_check.func.content_get = _gl_content_get;
+	itc_check.func.state_get = _gl_state_get;
+	itc_check.func.del = _gl_del;
+
+	itc_helptext.item_style = "multiline/1text";
+	itc_helptext.func.text_get = _gl_text_get_help;
+	itc_helptext.func.content_get = NULL;
+	itc_helptext.func.state_get = NULL;
+	itc_helptext.func.del = NULL;
+
+
+	/* seperator */
+	seperator= elm_genlist_item_append(genlist, &itc_sep, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+	elm_genlist_item_select_mode_set(seperator, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+	/* S beam setting */
+	gl_item_data *sbeam_data = NULL;
+	sbeam_data = malloc(sizeof(gl_item_data));
+	if (!sbeam_data)
+		return NULL;
+	sbeam_data->type = NFC_S_BEAM;
+	sbeam_data->data = ug_data;
+	sbeam_item = elm_genlist_item_append(genlist, &itc_check, (void *)sbeam_data, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_activation, (void *)sbeam_data);
+
+	/* S beam setting Help Text */
+	elm_genlist_item_append(genlist, &itc_helptext, (void *)2, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+
+	evas_object_show(genlist);
 
 	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+
+	return genlist;
 }
+#endif
 
 static void *__ug_nfc_setting_create(ui_gadget_h ug, enum ug_mode mode, service_h service, void *priv)
 {
@@ -1172,12 +1095,14 @@ static void *__ug_nfc_setting_create(ui_gadget_h ug, enum ug_mode mode, service_
 
 	ugdata_t *ug_data = (ugdata_t *)priv;
 	Evas_Object *parent = NULL;
-	Evas_Object *nfc_setting_layout = NULL;
+	Evas_Object *nfc_setting_list = NULL;
 	Evas_Object *l_button = NULL;
+	char *type = NULL;
 
 	/* set text domain */
 	bindtextdomain(NFCUG_TEXT_DOMAIN, NFCUG_LOCALEDIR);
 
+	/* create base view */
 	parent = ug_get_parent_layout(ug);
 	if (!parent)
 		return NULL;
@@ -1186,16 +1111,45 @@ static void *__ug_nfc_setting_create(ui_gadget_h ug, enum ug_mode mode, service_
 	ug_data->nfc_setting_ug = ug;
 
 	ug_data->base_layout = _create_main_layout(ug_data->ug_win_main);
-	ug_data->bg = _create_bg(ug_data->base_layout);
+	ug_data->bg = _create_bg(ug_data->ug_win_main, "group_list");
 	elm_object_part_content_set(ug_data->base_layout, "elm.swallow.bg", ug_data->bg);
 
 	ug_data->base_naviframe = elm_naviframe_add(ug_data->base_layout);
 	elm_object_part_content_set(ug_data->base_layout, "elm.swallow.content", ug_data->base_naviframe);
 	evas_object_show(ug_data->base_naviframe);
 
-	/* create setting view */
-	nfc_setting_layout = _ug_nfc_create_setting_layout(ug_data);
-	if (nfc_setting_layout == NULL)
+	/* parse parameter */
+	service_get_extra_data(service, "type", &type);
+
+	if (type == NULL)
+	{
+		LOGD("type is NULL");
+
+		return NULL;
+	}
+	else
+	{
+		LOGD("type => [%s]", type);
+
+		if (strncmp(type, "nfc", strlen("nfc")) == 0)
+		{
+			_ug_nfc_setting_db_open();
+
+			nfc_setting_list = _ug_nfc_create_nfc_setting_list(ug_data);
+		}
+#ifdef _SBEAM_SUPPORT_
+		else if (strncmp(type, "sbeam", strlen("sbeam")) == 0)
+		{
+			nfc_setting_list = _ug_nfc_create_sbeam_setting_list(ug_data);
+		}
+#endif
+		else
+		{
+			return NULL;
+		}
+	}
+
+	if (nfc_setting_list == NULL)
 		return NULL;
 
 	/* Push navifreme */
@@ -1203,11 +1157,31 @@ static void *__ug_nfc_setting_create(ui_gadget_h ug, enum ug_mode mode, service_
 	elm_object_style_set(l_button, "naviframe/back_btn/default");
 	evas_object_smart_callback_add(l_button, "clicked", _back_clicked_cb, ug_data->nfc_setting_ug);
 
-	ug_data->base_navi_it = elm_naviframe_item_push(ug_data->base_naviframe, IDS_NFC_NFC, l_button, NULL, nfc_setting_layout, NULL);
-
+	if (type == NULL)
+	{
+		ug_data->base_navi_it = elm_naviframe_item_push(ug_data->base_naviframe, IDS_NFC_NFC, l_button, NULL, nfc_setting_list, NULL);
+	}
+	else
+	{
+		if (strncmp(type, "sbeam", strlen("sbeam")) == 0)
+		{
+			ug_data->base_navi_it = elm_naviframe_item_push(ug_data->base_naviframe, IDS_NFC_S_BEAM, l_button, NULL, nfc_setting_list, NULL);
+		}
+		else
+		{
+			ug_data->base_navi_it = elm_naviframe_item_push(ug_data->base_naviframe, IDS_NFC_NFC, l_button, NULL, nfc_setting_list, NULL);
+		}
+	}
 	/* Register activation changed callback */
-	nfc_manager_initialize(NULL, NULL);
-	nfc_manager_set_activation_changed_cb(_nfc_activation_changed_cb, ug_data);
+	if (NFC_ERROR_NONE == nfc_manager_initialize(NULL, NULL))
+	{
+		LOGD("nfc_manager_initialize success\n");
+		nfc_manager_set_activation_changed_cb(_nfc_activation_changed_cb, ug_data);
+	}
+	else
+	{
+		LOGD("nfc_manager_initialize FAIL!!!!\n");
+	}
 
 	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
 
@@ -1224,7 +1198,10 @@ static void __ug_nfc_setting_destroy(ui_gadget_h ug, service_h service, void *pr
 
 	nfc_manager_unset_activation_changed_cb();
 
-	nfc_manager_deinitialize();
+	if (nfc_manager_deinitialize() != NFC_ERROR_NONE)
+	{
+		LOGD("nfc_manager_deinitialize failed");
+	}
 
 	evas_object_del(ug_get_layout(ug));
 
diff --git a/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c b/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c
new file mode 100644
index 0000000..11b1431
--- /dev/null
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c
@@ -0,0 +1,455 @@
+/*
+  * Copyright 2012  Samsung Electronics Co., Ltd
+  *
+  * Licensed under the Flora License, Version 1.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+
+  *     http://www.tizenopensource.org/license
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+
+#include <glib.h>
+
+#include "ug-nfc-setting-main.h"
+#include "ug-nfc-setting-db.h"
+
+
+#define MAX_PREDEFINED_ITEM_COUNT	100
+
+typedef struct _predefined_item_data_t
+{
+	char *app_id;
+	char *pkgName;
+	char *iconPath;
+	char *msgDes;
+}predefined_item_data;
+
+
+int dbtable_h = 0;
+int predefined_item_count = 0;
+GArray *predefined_item_list;
+ugdata_t *ud = NULL;
+
+static Elm_Object_Item *on_off_item = NULL;
+
+static Elm_Genlist_Item_Class itc_sep;
+static Elm_Genlist_Item_Class itc_2text;
+static Elm_Genlist_Item_Class itc_radio;
+Evas_Object *radio_main = NULL;
+static int state_index = 0; //selected radio index
+
+
+static void _check_changed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	_change_nfc_predefined_item_setting(ud);
+	if (on_off_item)
+		elm_genlist_item_update(on_off_item);
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+}
+
+static char *_gl_text_get(void *data, Evas_Object *obj, const char *part)
+{
+	int index = (int) data;
+	char *text = NULL;
+
+	LOGD("[Genlist] index : %d\n", index);
+	LOGD("[Genlist] part : %s\n", part);
+
+	if (!strcmp(part, "elm.text") || !strcmp(part, "elm.text.1"))
+	{
+		if (index == -1)
+		{
+			text = strdup(IDS_PREDEFINED_ITEM);
+		}
+		else
+		{
+			predefined_item_data *item = NULL;
+
+			item = g_array_index(predefined_item_list, predefined_item_data *, index);
+			if ((item != NULL) && (item->pkgName != NULL))
+			{
+				text = strdup(item->pkgName);
+				LOGD("pkgName : %s\n", item->pkgName);
+			}
+		}
+	}
+	else if (!strcmp(part, "elm.text.2"))
+	{
+		if (index == -1)
+		{
+			char *app_id = NULL;
+
+			app_id = vconf_get_str(VCONFKEY_NFC_PREDEFINED_ITEM);
+			if (app_id != NULL)
+			{
+				LOGD("app_id [%s]", app_id);
+				_ug_nfc_setting_db_get_pkgName(app_id, &text);
+
+				free(app_id);
+			}
+		}
+	}
+
+	return text;
+}
+
+static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *part)
+{
+	int index = (int) data;
+	Evas_Object *content = NULL;
+
+	LOGD("[Genlist] index : %d\n", index);
+	LOGD("[Genlist] part : %s\n", part);
+
+	if (!strcmp(part, "elm.icon") || !strcmp(part, "elm.icon.1"))
+	{
+		if (index == -1)
+		{
+			int result;
+			int on;
+
+			content = elm_check_add(obj);
+			evas_object_propagate_events_set(content, EINA_FALSE);
+			evas_object_smart_callback_add(content, "changed", _check_changed_cb, NULL);
+
+			if (((result = vconf_get_bool(VCONFKEY_NFC_PREDEFINED_ITEM_STATE, &on)) == 0) && (on != 0))
+			{
+				LOGD("[%s(): %d] vconf_get_bool true", __FUNCTION__, __LINE__);
+				elm_check_state_set(content, EINA_TRUE);
+			}
+			else
+			{
+				LOGD("[%s(): %d] vconf_get_bool false", __FUNCTION__, __LINE__);
+				elm_check_state_set(content, EINA_FALSE);
+			}
+			elm_object_style_set(content, "on&off");
+		}
+		else
+		{
+			predefined_item_data *item = NULL;
+
+			item = g_array_index(predefined_item_list, predefined_item_data *, index);
+
+			content = elm_radio_add(obj);
+			elm_radio_state_value_set(content, index);
+			elm_radio_group_add(content, radio_main);
+
+			if ((item != NULL) && (item->app_id != NULL))
+			{
+				char *app_id = NULL;
+
+				app_id = vconf_get_str(VCONFKEY_NFC_PREDEFINED_ITEM);
+				if (app_id != NULL)
+				{
+					if (!strcmp(app_id, item->app_id))
+					{
+						state_index = index;
+						elm_radio_value_set(content, state_index);
+					}
+					free(app_id);
+				}
+			}
+
+			evas_object_size_hint_weight_set(content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+			evas_object_size_hint_align_set(content, EVAS_HINT_FILL, EVAS_HINT_FILL);
+		}
+	}
+	else
+	{
+		if (index >= 0)
+		{
+			predefined_item_data *item = NULL;
+
+			item = g_array_index(predefined_item_list, predefined_item_data *, index);
+
+			if ((item != NULL) && (item->iconPath != NULL))
+			{
+				LOGD("iconPath [%s]", item->iconPath);
+
+				content = elm_image_add(obj);
+				elm_image_file_set(content, item->iconPath, NULL);
+				elm_image_resizable_set(content, EINA_TRUE, EINA_TRUE);
+			}
+		}
+	}
+
+	return content;
+}
+
+static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part)
+{
+	return EINA_FALSE;
+}
+
+static void _gl_sel(void *data, Evas_Object *obj, void *event_info)
+{
+	Elm_Object_Item *ui_item = (Elm_Object_Item *) event_info;
+	int result = -1;
+	int index = 0;
+
+	elm_genlist_item_selected_set(ui_item, 0);
+
+	if (ui_item)
+	{
+		index = (int) elm_object_item_data_get(ui_item);
+
+		if (index == -1)
+		{
+			_change_nfc_predefined_item_setting(ud);
+			elm_genlist_item_update(ui_item);
+		}
+		else
+		{
+			predefined_item_data *item = NULL;
+
+			item = g_array_index(predefined_item_list, predefined_item_data *, index);
+
+			state_index = index;
+
+			if ((item != NULL) && (item->app_id != NULL))
+			{
+				LOGD("Selected app_id[%s]", item->app_id);
+				result = vconf_set_str(VCONFKEY_NFC_PREDEFINED_ITEM, item->app_id);
+				if (!result )
+				{
+					LOGD("[%s(): %d] vconf_set_str success\n", __FUNCTION__, __LINE__);
+				}
+				else
+				{
+					LOGD("[%s(): %d] vconf_set_str failed\n", __FUNCTION__, __LINE__);
+				}
+			}
+			elm_genlist_item_update(ui_item);
+
+			if (on_off_item)
+				elm_genlist_item_update(on_off_item);
+		}
+	}
+}
+
+#if 0
+static void _gl_realized(void *data, Evas_Object *obj, void *event_info)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	Elm_Object_Item *item = (Elm_Object_Item *) event_info;
+	int index = 0;
+
+	if (item)
+	{
+		index = (int) elm_object_item_data_get(item);
+
+		if (index == -1)
+		{
+			elm_object_item_signal_emit(event_info, "elm,state,top", "");
+		}
+		else if (index == predefined_item_count-1)
+		{
+			elm_object_item_signal_emit(event_info, "elm,state,bottom", "");
+		}
+		else
+		{
+			elm_object_item_signal_emit(event_info, "elm,state,center", "");
+		}
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+}
+#endif
+
+bool _ug_nfc_check_predefined_item_available(void)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	if (!_ug_nfc_setting_db_open_table(&dbtable_h))
+	{
+		_ug_nfc_setting_db_close_table(dbtable_h);
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+}
+
+static void __create_predefined_item_data(void)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	predefined_item_data *item = NULL;
+	int index;
+
+	if (_ug_nfc_setting_db_open_table(&dbtable_h))
+	{
+		LOGD("_ug_nfc_setting_db_open_table is failed!!!!!", __FUNCTION__, __LINE__);
+		return;
+	}
+
+	/* get item count */
+	_ug_nfc_setting_db_get_count(&predefined_item_count);
+	LOGD("predefined_item_count [%d]", predefined_item_count);
+
+	/* create item list */
+	predefined_item_list = g_array_new(FALSE, FALSE, sizeof(predefined_item_data *));
+
+	for (index = 0; index < predefined_item_count; index++)
+	{
+		item = (predefined_item_data *) malloc(sizeof(predefined_item_data));
+		if (!item)
+		{
+			LOGD("failed to allocation");
+			continue;
+		}
+
+		if (!_ug_nfc_setting_db_get_next_record(dbtable_h, &item->app_id, &item->pkgName, &item->iconPath, &item->msgDes))
+		{
+			LOGD("app_id:%s, pkgName:%s, iconPath:%s, msgDes:%s", item->app_id, item->pkgName, item->iconPath, item->msgDes);
+
+			g_array_append_val(predefined_item_list, item);
+		}
+		else
+		{
+			free(item);
+		}
+	}
+
+	_ug_nfc_setting_db_close_table(dbtable_h);
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+}
+
+static void __destroy_predefined_item_data(void)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	if (predefined_item_list != NULL)
+	{
+		predefined_item_data *old_info = NULL;
+		int index;
+
+		for (index = 0; index < predefined_item_count; index++)
+		{
+			old_info = g_array_index(predefined_item_list, predefined_item_data *, index);
+
+			if (old_info != NULL)
+			{
+				free(old_info->app_id);
+				free(old_info->pkgName);
+				free(old_info->iconPath);
+				free(old_info->msgDes);
+
+				free(old_info);
+			}
+		}
+		g_array_free(predefined_item_list, FALSE);
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+}
+
+Evas_Object *_ug_nfc_create_predefined_item_list(void *data)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	ugdata_t *ug_data = (ugdata_t *)data;
+	Evas_Object *genlist = NULL;
+	Elm_Object_Item* seperator = NULL;
+	int index = 0;
+
+
+	/* make a list */
+	genlist = elm_genlist_add(ug_data->base_naviframe);
+	if (genlist == NULL)
+	{
+		LOGD("[%s(): %d] genlist is null", __FUNCTION__, __LINE__);
+		return NULL;
+	}
+#if 0
+	evas_object_smart_callback_add(genlist, "realized", _gl_realized, NULL);
+#endif
+	itc_sep.item_style = "dialogue/separator";
+	itc_sep.func.text_get = NULL;
+	itc_sep.func.content_get = NULL;
+	itc_sep.func.state_get = NULL;
+	itc_sep.func.del = NULL;
+
+	itc_2text.item_style = "dialogue/2text.1icon.10";
+	itc_2text.func.text_get = _gl_text_get;
+	itc_2text.func.content_get = _gl_content_get;
+	itc_2text.func.state_get = _gl_state_get;
+	itc_2text.func.del = NULL;
+
+	itc_radio.item_style = "1text.2icon.2";
+	itc_radio.func.text_get = _gl_text_get;
+	itc_radio.func.content_get = _gl_content_get;
+	itc_radio.func.state_get = _gl_state_get;
+	itc_radio.func.del = NULL;
+
+
+	if (!radio_main)
+	{
+		radio_main = elm_radio_add(genlist);
+		elm_radio_state_value_set(radio_main, 0);
+		elm_radio_value_set(radio_main, 0);
+	}
+
+	/* create item data */
+	__create_predefined_item_data();
+
+	/* seperator */
+	seperator = elm_genlist_item_append(genlist, &itc_sep, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+	elm_genlist_item_select_mode_set(seperator, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+	/* add check button */
+	on_off_item = elm_genlist_item_append(genlist, &itc_2text, (void *)-1, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel, NULL);
+
+	/* add radio list */
+	for (index = 0; index < predefined_item_count; index++)
+	{
+		elm_genlist_item_append(genlist, &itc_radio, (void *)index, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel, NULL);
+	}
+
+	evas_object_show(genlist);
+
+	ud = ug_data;
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+
+	return genlist;
+}
+
+void _ug_nfc_destroy_predefined_item_list(void *data, Evas_Object *obj, void *event_info)
+{
+	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
+
+	ugdata_t *ug_data = data;
+
+	elm_naviframe_item_pop(ug_data->base_naviframe);
+
+	__destroy_predefined_item_data();
+
+	predefined_item_count = 0;
+
+	if (radio_main)
+	{
+		evas_object_del(radio_main);
+		radio_main = NULL;
+	}
+
+	LOGD("[%s(): %d] END <<<<", __FUNCTION__, __LINE__);
+}
+
+
+
diff --git a/ug-nfc-share-efl/data/edc/ug-share-nfc-efl.edc b/ug-nfc-share-efl/data/edc/ug-share-nfc-efl.edc
index 0426aef..bac3999 100644
--- a/ug-nfc-share-efl/data/edc/ug-share-nfc-efl.edc
+++ b/ug-nfc-share-efl/data/edc/ug-share-nfc-efl.edc
@@ -1,261 +1,145 @@
 collections {
 
-
 	group
 	{
 		name: "share_via_nfc";
-
 		parts
 		{
 			part
 			{
-				name: "genlist";
-				type: SWALLOW;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					min: 0 112;
-					fixed: 0 1;
-					rel1{relative: 0 0; }
-					rel2{relative: 1 0;}
-					align: 0 0;
-				}
-			}
-			part
-			{
-				name: "left_pad";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 16 0;
-					fixed: 1 0;
-					rel1 {relative: 0 0;}
-					rel2 {relative: 0 1;}
-					align: 0 0;
-				}
-			}
-			part
-			{
-				name: "right_pad";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 16 0;
-					fixed: 1 0;
-					rel1 {relative: 1 0;}
-					rel2 {relative: 1 1;}
-					align: 1 0;
-				}
-			}
-			part
-			{
-				name: "top_pad";
+				name: "top1_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 0 23;
+					min: 0 190;
 					fixed: 0 1;
-					rel1 {relative: 1 1; to_x: "left_pad"; to_y: "genlist";}
-					rel2 {relative: 0 1; to_x: "right_pad"; to_y: "genlist";}
+					rel1 {relative: 0 0;}
+					rel2 {relative: 1 0;}
 					align: 0 0;
 				}
 			}
 			part
 			{
-				name: "label_name";
-				type: SWALLOW;
-				scale: 1;
+				name: "title";
+				type: TEXT;
+				scale:1;
 				description
 				{
 					state: "default" 0.0;
-					min: 0 38;
+					color: 0 0 0 255;
+					min: 0 42;
 					fixed: 0 1;
-					rel1{relative: 1 1; to_x:"left_pad";to_y: "top_pad";}
-					rel2{relative: 0 1; to_x:"right_pad";to_y: "top_pad";}
+					rel1 {relative: 0 1; to_y : "top1_pad";}
+					rel2 {relative: 1 1; to_y : "top1_pad";}
 					align: 0 0;
+					text{
+						font: "SLP:style=Regular";
+						text_class:"slp_regular";
+						size: 38;
+						min: 1 1 ;
+						align: 0.5 0.5;
+					}
 				}
 			}
 			part
 			{
-				name: "top_pad1";
+				name: "top2_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 0 38;
+					min: 0 60;
 					fixed: 0 1;
-					rel1 {relative: 1 1; to_x: "left_pad"; to_y: "label_name";}
-					rel2 {relative: 0 1; to_x: "right_pad"; to_y: "label_name";}
+					rel1 {relative: 0 1; to_y: "title";}
+					rel2 {relative: 1 1; to_y: "title";}
 					align: 0 0;
 				}
 			}
 			part
 			{
-				name: "label_message";
+				name: "image";
 				type: SWALLOW;
-				scale:1;
-
+				scale: 1;
 				description
 				{
 					state: "default" 0.0;
-					min: 0 76;
-					fixed: 0 1;
-					rel1{relative: 1 1; to_x: "left_pad"; to_y: "top_pad1";}
-					rel2{relative: 0 1; to_x: "right_pad"; to_y: "top_pad1";}
+					min: 720 582;
+					max: 720 582;
+					fixed: 1 1;
+					rel1 {relative: 0 1; to_y: "top2_pad";}
+					rel2 {relative: 1 1; to_y: "top2_pad";}
 					align: 0 0;
 				}
 			}
 			part
 			{
-				name: "top_pad2";
+				name: "top3_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 0 40;
+					min: 0 222;
 					fixed: 0 1;
-					rel1 {relative: 1 1; to_x: "left_pad"; to_y: "label_message";}
-					rel2 {relative: 0 1; to_x: "right_pad"; to_y: "label_message";}
+					rel1 {relative: 0 1; to_y: "image";}
+					rel2 {relative: 1 1; to_y: "image";}
 					align: 0 0;
 				}
 			}
+
 			part
 			{
-				name: "left_pad1";
+				name: "left_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 56 0;
+					min: 72 0;
 					fixed: 1 0;
-					rel1 {relative: 1 1;to_x: "left_pad"; to_y: "top_pad2";}
-					rel2 {relative: 1 1;to_x: "left_pad"; }
+					rel1 {relative: 0 1; to_y: "top3_pad";}
+					rel2 {relative: 0 1; to_y: "top3_pad";}
 					align: 0 0;
 				}
 			}
 			part
 			{
-				name: "right_pad1";
+				name: "right_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 56 0;
+					min: 72 0;
 					fixed: 1 0;
-					rel1 {relative: 0 1; to_x: "right_pad"; to_y:"top_pad2";}
-					rel2 {relative: 0 1; to_x:"right_pad";}
+					rel1 {relative: 1 1; to_y: "top3_pad";}
+					rel2 {relative: 1 1; to_y: "top3_pad";}
 					align: 1 0;
 				}
 			}
+
 			part
 			{
-				name: "touch_image";
-				type: SWALLOW;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					min: 576 560;
-					fixed: 0 0;
-					rel1{relative: 1 1; to_x:"left_pad1"; to_y:"top_pad2";}
-					rel2{relative: 0 0; to_x:"right_pad1"; to_y:"bottom_pad2";}
-					align: 0.5 0.5;
-				}
-			}
-			part
-			{
-				name: "bottom_pad2";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 0 78;
-					fixed: 0 1;
-					align: 0 1;
-					rel1 {relative: 1 0; to_x: "left_pad"; to_y: "label_cancel_message";}
-					rel2 {relative: 0 0; to_x: "right_pad"; to_y: "label_cancel_message";}
-				}
-			}
-			part
-			{
-				name: "label_cancel_message";
-				type: SWALLOW;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					min: 0 38;
-					fixed: 0 1;
-					rel1{relative: 1 0; to_x: "left_pad"; to_y: "bottom_pad1";}
-					rel2{relative: 0 0; to_x: "right_pad"; to_y: "bottom_pad1";}
-					align: 0 1;
-				}
-			}
-			part
-			{
-				name: "bottom_pad1";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 0 22;
-					fixed: 0 1;
-					align: 0 1;
-					rel1 {relative: 1 0; to_x: "left_pad"; to_y: "cancel_button";}
-					rel2 {relative: 0 0; to_x: "right_pad"; to_y: "cancel_button";}
-				}
-			}
-			part
-			{
-				name: "cancel_button";
+				name: "cancel_btn";
 				type: SWALLOW;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
-					min: 0 74;
-					fixed: 0 1;
-					rel1{relative: 1 0; to_x: "left_pad"; to_y: "bottom_pad";}
-					rel2{relative: 0 0; to_x: "right_pad"; to_y: "bottom_pad";}
-					align:0 1;
-				}
-			}
-			part
-			{
-				name: "bottom_pad";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 0 15;
-					fixed: 0 1;
-					align: 0 1;
-					rel1 {relative: 0 1;}
-					rel2 {relative: 1 1;}
+					min: 576 84;
+					max: 576 84;
+					fixed: 1 1;
+					rel1 {relative: 1 1; to_x: "left_pad"; to_y: "top3_pad";}
+					rel2 {relative: 0 1; to_x: "right_pad";to_y: "top3_pad";}
+					align: 0 0;
 				}
 			}
 		}
@@ -264,258 +148,143 @@ collections {
 	group
 	{
 		name: "share_via_nfc_wvga";
-
 		parts
 		{
 			part
 			{
-				name: "genlist";
-				type: SWALLOW;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					min: 0 112;
-					fixed: 0 1;
-					rel1{relative: 0 0; }
-					rel2{relative: 1 0;}
-					align: 0 0;
-				}
-			}
-			part
-			{
-				name: "left_pad";
+				name: "top1_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 16 0;
-					fixed: 1 0;
-					rel1 {relative: 0 0;}
-					rel2 {relative: 0 1;}
-					align: 0 0;
-				}
-			}
-			part
-			{
-				name: "right_pad";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 16 0;
-					fixed: 1 0;
-					rel1 {relative: 1 0;}
-					rel2 {relative: 1 1;}
-					align: 1 0;
-				}
-			}
-			part
-			{
-				name: "top_pad";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 0 23;
+					min: 0 190;
 					fixed: 0 1;
-					rel1 {relative: 1 1; to_x: "left_pad"; to_y: "genlist";}
-					rel2 {relative: 0 1; to_x: "right_pad"; to_y: "genlist";}
+					rel1 {relative: 0 0;}
+					rel2 {relative: 1 0;}
 					align: 0 0;
 				}
 			}
 			part
 			{
-				name: "label_name";
-				type: SWALLOW;
-				scale: 1;
+				name: "title";
+				type: TEXT;
+				scale:1;
 				description
 				{
 					state: "default" 0.0;
-					min: 0 38;
+					color: 0 0 0 255;
+					min: 0 42;
 					fixed: 0 1;
-					rel1{relative: 1 1; to_x:"left_pad";to_y: "top_pad";}
-					rel2{relative: 0 1; to_x:"right_pad";to_y: "top_pad";}
+					rel1 {relative: 0 1; to_y : "top1_pad";}
+					rel2 {relative: 1 1; to_y : "top1_pad";}
 					align: 0 0;
+					text{
+						font: "SLP:style=Regular";
+						text_class:"slp_regular";
+						size: 38;
+						min: 1 1 ;
+						align: 0.5 0.5;
+					}
 				}
 			}
 			part
 			{
-				name: "top_pad1";
+				name: "top2_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 0 38;
+					min: 0 60;
 					fixed: 0 1;
-					rel1 {relative: 1 1; to_x: "left_pad"; to_y: "label_name";}
-					rel2 {relative: 0 1; to_x: "right_pad"; to_y: "label_name";}
+					rel1 {relative: 0 1; to_y: "title";}
+					rel2 {relative: 1 1; to_y: "title";}
 					align: 0 0;
 				}
 			}
 			part
 			{
-				name: "label_message";
+				name: "image";
 				type: SWALLOW;
-				scale:1;
-
+				scale: 1;
 				description
 				{
 					state: "default" 0.0;
-					min: 0 76;
-					fixed: 0 1;
-					rel1{relative: 1 1; to_x: "left_pad"; to_y: "top_pad1";}
-					rel2{relative: 0 1; to_x: "right_pad"; to_y: "top_pad1";}
+					min: 360 300;
+					max: 360 300;
+					fixed: 1 1;
+					rel1 {relative: 0 1; to_y: "top2_pad";}
+					rel2 {relative: 1 1; to_y: "top2_pad";}
 					align: 0 0;
 				}
 			}
 			part
 			{
-				name: "top_pad2";
+				name: "top3_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 0 40;
+					min: 0 222;
 					fixed: 0 1;
-					rel1 {relative: 1 1; to_x: "left_pad"; to_y: "label_message";}
-					rel2 {relative: 0 1; to_x: "right_pad"; to_y: "label_message";}
+					rel1 {relative: 0 1; to_y: "image";}
+					rel2 {relative: 1 1; to_y: "image";}
 					align: 0 0;
 				}
 			}
+
 			part
 			{
-				name: "left_pad1";
+				name: "left_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 56 0;
+					min: 72 0;
 					fixed: 1 0;
-					rel1 {relative: 1 1;to_x: "left_pad"; to_y: "top_pad2";}
-					rel2 {relative: 1 1;to_x: "left_pad"; }
+					rel1 {relative: 0 1; to_y: "top3_pad";}
+					rel2 {relative: 0 1; to_y: "top3_pad";}
 					align: 0 0;
 				}
 			}
 			part
 			{
-				name: "right_pad1";
+				name: "right_pad";
 				type: RECT;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
 					color: 0 0 0 0;
-					min: 56 0;
+					min: 72 0;
 					fixed: 1 0;
-					rel1 {relative: 0 1; to_x: "right_pad"; to_y:"top_pad2";}
-					rel2 {relative: 0 1; to_x:"right_pad";}
+					rel1 {relative: 1 1; to_y: "top3_pad";}
+					rel2 {relative: 1 1; to_y: "top3_pad";}
 					align: 1 0;
 				}
 			}
+
 			part
 			{
-				name: "touch_image";
-				type: SWALLOW;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					min: 360 300;
-					fixed: 0 0;
-					rel1{relative: 1 1; to_x:"left_pad1"; to_y:"top_pad2";}
-					rel2{relative: 0 0; to_x:"right_pad1"; to_y:"bottom_pad2";}
-					align: 0.5 0.5;
-				}
-			}
-			part
-			{
-				name: "bottom_pad2";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 0 78;
-					fixed: 0 1;
-					align: 0 1;
-					rel1 {relative: 1 0; to_x: "left_pad"; to_y: "label_cancel_message";}
-					rel2 {relative: 0 0; to_x: "right_pad"; to_y: "label_cancel_message";}
-				}
-			}
-			part
-			{
-				name: "label_cancel_message";
-				type: SWALLOW;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					min: 0 38;
-					fixed: 0 1;
-					rel1{relative: 1 0; to_x: "left_pad"; to_y: "bottom_pad1";}
-					rel2{relative: 0 0; to_x: "right_pad"; to_y: "bottom_pad1";}
-					align: 0 1;
-				}
-			}
-			part
-			{
-				name: "bottom_pad1";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 0 22;
-					fixed: 0 1;
-					align: 0 1;
-					rel1 {relative: 1 0; to_x: "left_pad"; to_y: "cancel_button";}
-					rel2 {relative: 0 0; to_x: "right_pad"; to_y: "cancel_button";}
-				}
-			}
-			part
-			{
-				name: "cancel_button";
+				name: "cancel_btn";
 				type: SWALLOW;
 				scale: 1;
 				description
 				{
 					state: "default" 0.0;
-					min: 0 74;
-					fixed: 0 1;
-					rel1{relative: 1 0; to_x: "left_pad"; to_y: "bottom_pad";}
-					rel2{relative: 0 0; to_x: "right_pad"; to_y: "bottom_pad";}
-					align:0 1;
-				}
-			}
-			part
-			{
-				name: "bottom_pad";
-				type: RECT;
-				scale: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 0 0 0 0;
-					min: 0 15;
-					fixed: 0 1;
-					align: 0 1;
-					rel1 {relative: 0 1;}
-					rel2 {relative: 1 1;}
+					min: 576 84;
+					max: 576 84;
+					fixed: 1 1;
+					rel1 {relative: 1 1; to_x: "left_pad"; to_y: "top3_pad";}
+					rel2 {relative: 0 1; to_x: "right_pad";to_y: "top3_pad";}
+					align: 0 0;
 				}
 			}
 		}
diff --git a/ug-nfc-share-efl/data/images/white/U05_AfterSelect_Share_help.png b/ug-nfc-share-efl/data/images/white/U05_AfterSelect_Share_help.png
index c322968..83b4cb1 100644
--- a/ug-nfc-share-efl/data/images/white/U05_AfterSelect_Share_help.png
+++ b/ug-nfc-share-efl/data/images/white/U05_AfterSelect_Share_help.png
diff --git a/ug-nfc-share-efl/data/images/white/U05_AfterSelect_Share_help_popup.png b/ug-nfc-share-efl/data/images/white/U05_AfterSelect_Share_help_popup.png
new file mode 100644
index 0000000..cfcc89a
--- /dev/null
+++ b/ug-nfc-share-efl/data/images/white/U05_AfterSelect_Share_help_popup.png
diff --git a/ug-nfc-share-efl/data/images/white/U05_popup_Share_help.png b/ug-nfc-share-efl/data/images/white/U05_popup_Share_help.png
deleted file mode 100644
index bf8fbec..0000000
--- a/ug-nfc-share-efl/data/images/white/U05_popup_Share_help.png
+++ /dev/null
diff --git a/ug-nfc-share-efl/include/ug-nfc-share-main.h b/ug-nfc-share-efl/include/ug-nfc-share-main.h
index bc7a716..033d30a 100644
--- a/ug-nfc-share-efl/include/ug-nfc-share-main.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-main.h
@@ -71,19 +71,19 @@ extern "C" {
 #define NFCUG_LOCALEDIR		LOCALE_PATH
 
 /* Registered string in STMS NFC */
+#define IDS_NFC_NFC								dgettext(PACKAGE, "IDS_NFC_BODY_NFC")
 #define IDS_SHARE_VIA_NFC							dgettext(PACKAGE, "IDS_NFC_HEADER_SHARE_VIA_NFC")
 #define IDS_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE				dgettext(PACKAGE, "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE")
 #define IDS_TO_CANCEL_SHARING_TAP_CANCEL					dgettext(PACKAGE, "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL")
 #define IDS_TRANSFER_FAILED							dgettext(PACKAGE, "IDS_NFC_POP_TRANSFER_FAILED")
 #define IDS_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q		dgettext(PACKAGE, "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q")
-//#define IDS_NFC_NFC								dgettext(PACKAGE, "IDS_NFC_BODY_NFC")
-#define IDS_NFC_NFC								_("NFC")
-#define IDS_SECURITY_POLICY_RESTRICTS_USE_OF_PS				_("Security policy restricts use of %s")
+#define IDS_SECURITY_POLICY_RESTRICTS_USE_OF_PS				dgettext(PACKAGE, "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS")
 
-#define IDS_SHARED								_("Shared")
-#define IDS_UNABLE_TO_SHARE							_("Unable to share")
+#define IDS_SHARED								dgettext(PACKAGE, "IDS_COM_OPT_SHARED")
+#define IDS_UNABLE_TO_SHARE							dgettext(PACKAGE, "IDS_COM_BODY_UNABLE_TO_SHARE")
 
-#define IDS_HANDOVER	_("HANDOVER")
+
+/* will be deleted */
 #define IDS_NFC_SERVICE_IS_NOT_SUPPORTED		_("NFC service is not supported")
 
 /* System string */
@@ -138,8 +138,6 @@ typedef struct _ugdata_t
 
 	nfc_ndef_message_h current_ndef;
 	bundle *bd;
-	Evas_Object* base_naviframe;
-	Elm_Object_Item *base_navi_it;
 }ugdata_t;
 
 
diff --git a/ug-nfc-share-efl/include/ug-nfc-share-tag.h b/ug-nfc-share-efl/include/ug-nfc-share-tag.h
index ba493ce..afd36e1 100755..100644
--- a/ug-nfc-share-efl/include/ug-nfc-share-tag.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-tag.h
@@ -24,11 +24,6 @@ extern "C" {
 
 #include "ug-nfc-share-main.h"
 
-#if 0
-#define UG_NFC_SHARE_LAST_FILE_NUMBER_KEY "db/private/ug-nfc-efl/last_file_number"
-#define UG_NFC_SHARE_FILE_NAME_PREFIX _("nfc_receive_file_")
-#endif
-
 /* get and set function */
 #if 0
 char* ug_nfc_share_get_display_str(void);
diff --git a/ug-nfc-share-efl/po/CMakeLists.txt b/ug-nfc-share-efl/po/CMakeLists.txt
index 85343f9..1d0ba53 100755..100644
--- a/ug-nfc-share-efl/po/CMakeLists.txt
+++ b/ug-nfc-share-efl/po/CMakeLists.txt
@@ -1,7 +1,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 0.1)
 PROJECT(ug-share-nfc-efl C)
 
-SET(POFILES en.po nl_NL.po de_DE.po zh_HK.po zh_CN.po ru_RU.po ko_KR.po zh_TW.po ja_JP.po es_ES.po el_GR.po it_IT.po tr_TR.po pt_PT.po fr_FR.po)
+SET(POFILES
+ar.po az.po bg.po ca.po cs.po da.po de_DE.po el_GR.po en.po en_PH.po 
+en_US.po es_ES.po es_MX.po et.po eu.po fi.po fr_CA.po fr_FR.po ga.po gl.po 
+hi.po hr.po hu.po hy.po is.po it_IT.po ja_JP.po ka.po kk.po ko_KR.po 
+lt.po lv.po mk.po nb.po nl_NL.po pl.po pt_BR.po pt_PT.po ro.po ru_RU.po 
+sk.po sl.po sr.po sv.po tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_SG.po zh_TW.po
+)
 
 SET(MSGFMT "/usr/bin/msgfmt")
 
diff --git a/ug-nfc-share-efl/po/POTFILES.in b/ug-nfc-share-efl/po/POTFILES.in
index 2068f24..2068f24 100755..100644
--- a/ug-nfc-share-efl/po/POTFILES.in
+++ b/ug-nfc-share-efl/po/POTFILES.in
diff --git a/ug-nfc-share-efl/po/ar.po b/ug-nfc-share-efl/po/ar.po
index 6a8011b..5a682e0 100644
--- a/ug-nfc-share-efl/po/ar.po
+++ b/ug-nfc-share-efl/po/ar.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "لإلغاء المشاركة، انقر فوق إلغاء"
 
@@ -7,15 +10,33 @@ msgstr "الخدمة غير متاحة. تم إيقاف تشغيل NFC‬. هل
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "مشاركة عبر NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "فشلت مشاركة العلامة‬"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "قم بملامسة الهواتف ببعضها البعض برفق لمشاركتها"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "فشل التحويل"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "تمت مشاركة العلامة"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "تقيد سياسة الأمان استخدام %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "مشترك"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "يتعذر المشاركة"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "العنصر المحدد مسبقا"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "يمكنك نقل العناصر المحددة مسبقا إلى جهاز NFC آخر. ما عليك سوى تقريب الجهازين من بعضهما (عادة من الخلف) أثناء التواجد في الشاشة الرئيسية"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "عند تشغيل NFC، يمكنك إرسال البيانات أو استلامها عند ملامسة الجهاز لأجهزة أخرى مزودة بإمكانية NFC أو علامات NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "عند تشغيل هذه الميزة، يمكنك نقل الملفات إلى أجهزة أخرى مزودة بإمكانية NFC وWi-Fi Direct بتقريب الجهازين من بعضهما. على سبيل المثال، يمكنك نقل ملفات الصور/الفيديو من الاستوديو‬‬ وملفات الموسيقى من ‏‫مشغل الموسيقى‬، وغير ذلك المزيد. فما عليك سوى تقريب الجهازين من بعضهما (عادة من الخلف) ثم النقر فوق الشاشة. يحدد التطبيق ما يتم نقله"
 
diff --git a/ug-nfc-share-efl/po/az.po b/ug-nfc-share-efl/po/az.po
new file mode 100644
index 0000000..15b648e
--- /dev/null
+++ b/ug-nfc-share-efl/po/az.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Paylaşmanı ləğv etmək üçün İmtina vurun"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Xidmət mümkün deyil. NFC söndürülüb. NFC yandırılsın?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC ilə paylaş"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Paylaşmaq üçün telefonlara bir yerdə yavaşca toxunun"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Köçürmə alınmadı"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Təhlükəsizlik siyasəti %s istifadəsini məhdudlaşdırır"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Paylanmış"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Paylaşmaq mümkün deyil"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Təyin edilmiş element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Siz müəyyən elementləri başqa bir NFC cihazına köçürə bilərsiniz. Sadəcə olaraq əsas ekranda olarkən cihazları yaxınlaşdırın (adətən arxa-arxaya)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC aktiv olduqda cihazınız, NFC dəstəklənən digər cihazlara və ya NFC etiketlərinə toxunduqda məlumat göndərə və qəbul edə bilərsiniz"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Bu xüsusiyyət aktiv olduqda, siz cihazları yanaşı tutaraq faylları digər NFC və Wi-Fi Direct cihazlarına göndərə bilərsiniz. Məsələn, siz Qalereyadan təsvir/video fayllarını, Musiqi pleyerindən musiqi fayllarını və s. göndərə bilərsiniz. Sadəcə cihazları yaxınlaşdırın və (adətən arxa arxaya) və sonra ekrana vurun. Proqram göndərilənləri müəyyən edir"
+
diff --git a/ug-nfc-share-efl/po/bg.po b/ug-nfc-share-efl/po/bg.po
index ce5a168..b9bd77e 100644
--- a/ug-nfc-share-efl/po/bg.po
+++ b/ug-nfc-share-efl/po/bg.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "За да отмените споделянето, чукнете Отказ"
 
@@ -7,15 +10,33 @@ msgstr "Услугата не е достъпна. NFC е изключено. В
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Споделяне през NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Неуспешно споделяне на тага"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Леко докоснете телефоните един в друг, за да споделите"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Прехвърлянето неуспешно"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Отбелязване на споделени"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Правилата за защита ограничават използването на %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Споделен*"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Не може да се сподели"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Предв. зададен елемент"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Можете да изпращате с beam предварително зададени елементи до друго NFC устройство. Просто доближете устройствата (обикновено гърбовете им), докато сте в началния екран"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Когато NFC е включено, можете да изпращате или получавате данни, когато устройството ви докосне други устройства с възможности за NFC или NFC тагове"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Когато тази функция е включена, можете да насочвате файлове към други устройства с NFC и Wi-Fi Direct възможности, като държите устройствата близо едно до друго. Например, можете да насочвате музикални/видео файлове от Галерията, музикални файлове от Музикалния плейър и други. Просто доближете устройствата (обикновено гърбовете им) и чукнете екрана си. Приложението определя какво да се насочи"
 
diff --git a/ug-nfc-share-efl/po/ca.po b/ug-nfc-share-efl/po/ca.po
index 652fe95..335abcb 100644
--- a/ug-nfc-share-efl/po/ca.po
+++ b/ug-nfc-share-efl/po/ca.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Per cancel·lar la compartició, toqui Cancel·lar"
 
@@ -7,15 +10,33 @@ msgstr "Servei no disponible. NFC desactivat. Activar NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Compartir mitjançant NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Error en compartir etiqueta"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Toqui suaument un telèfon amb l'altre per compartir"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Error de transferència"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Etiqueta compartida"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La política de seguretat restringeix l'ús de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartit"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "No es pot compartir"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Element predefinit"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Pot transmetre elements predefinits a un altre dispositiu NFC. Només cal que ajunti els dispositius (normalment d'esquena) mentre és a la pantalla d'inici"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Quan NFC està activat, pot enviar o rebre dades quan el seu dispositiu toca altres dispositius amb capacitat NFC o etiquetes NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Quan aquesta funció està activada, pot transmetre fitxers a altres dispositius NFC o Wi-Fi Direct sostenint els dispositius prou a prop. Per exemple, pot transferir fitxers d'imatge/vídeo de la Galeria, fitxers de música del Reproductor de música, etc. Només cal que ajunti els dispositius (normalment d'esquena) i toqui la pantalla. L'aplicació determina què es transmet"
 
diff --git a/ug-nfc-share-efl/po/cs.po b/ug-nfc-share-efl/po/cs.po
index b1b1219..412799a 100644
--- a/ug-nfc-share-efl/po/cs.po
+++ b/ug-nfc-share-efl/po/cs.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Chcete-li zrušit sdílení, klepněte na tlačítko Zrušit"
 
@@ -7,15 +10,33 @@ msgstr "Služba je nedostupná. NFC bylo vypnuto. Zapnout NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Sdílet přes NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Značku se nepodařilo sdílet"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Pro sdílení se jemně dotkněte telefony"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Chyba přenosu"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Značka je sdílena"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Zásady zabezpečení omezují použití %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Sdíleno"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nelze sdílet"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Předdefinovaná položka"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Můžete přenést předdefinované položky do jiného zařízení podporujícího NFC. Stačí dát zařízení blízko k sobě (obvykle zadními stranami) když je zobrazena domovská obrazovka"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Když je NFC zapnuto, je možné odesílat nebo přijímat data, když se zařízením dotknete jiného zařízení podporujícího NFC nebo značky NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Když je tato funkce zapnutá, můžete přenést soubory do jiných zařízení podporujících NFC a Wi-Fi Direct tím, že podržíte zařízení u sebe. Můžete např. přenést obrázky nebo videosoubory z Galerie, hudební soubory z Hudebního přehrávače a podobně. Stačí dát zařízení k sobě (obvykle zadními stranami) a klepnout na displej. Aplikace určí, co se bude přenášet"
 
diff --git a/ug-nfc-share-efl/po/da.po b/ug-nfc-share-efl/po/da.po
index 3d629fd..eb1566c 100644
--- a/ug-nfc-share-efl/po/da.po
+++ b/ug-nfc-share-efl/po/da.po
@@ -1,5 +1,8 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
-msgstr "Tryk på Annuller for at annullere deling"
+msgstr "Tryk på Annullér for at annullere deling"
 
 msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
 msgstr "Tjeneste ikke tilgængelig. NFC deaktiveret. Aktivér NFC?"
@@ -7,15 +10,33 @@ msgstr "Tjeneste ikke tilgængelig. NFC deaktiveret. Aktivér NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Del via NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Kunne ikke dele tag"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Lad telefonerne røre hinanden forsigtigt for at dele"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Overførselsfejl"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tag delt"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Sikkerhedspolitik begrænser brug af %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Delt"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Kan ikke dele"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Foruddef. element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Du kan overføre foruddefinerede elementer til en anden NFC-enhed. Bring blot enhederne sæt sammen (typisk ryg mod ryg) i startskærmbilledet"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Når NFC er aktiveret, kan du sende eller modtage data, når din enhed berører andre NFC-kompatible enheder eller NFC-mærker"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Når denne funktion er aktiveret, kan du overføre filer til andre NFC- og Wi-Fi Direct-enheder ved at holde enhederne tættere sammen. F.eks. kan du overføre billed-/videofiler fra Galleri, musikfiler fra Musikafspiller og mere. Hold blot enheder sammen (typisk bagside mod bagside) og tap på din skærm. Programmet bestemmer, hvad der overføres"
 
diff --git a/ug-nfc-share-efl/po/de_DE.po b/ug-nfc-share-efl/po/de_DE.po
index d4dd4c1..e04599b 100755..100644
--- a/ug-nfc-share-efl/po/de_DE.po
+++ b/ug-nfc-share-efl/po/de_DE.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Tippen Sie auf „Abbrechen“, um die Freigabe abzubrechen"
 
@@ -7,15 +10,33 @@ msgstr "Dienst nicht verfügbar. NFC deaktiviert. NFC aktivieren?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Über NFC freigeben"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Tag konnte nicht freigegeben werden."
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Führen Sie die Telefone leicht zusammen, um freizugeben."
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Übertragungsfehler"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tag freigegeben"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Sicherheitsrichtlinie schränkt die Verwendung von %s ein."
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Freigegeben"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Freigabe nicht möglich"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Vordefiniertes Objekt"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Sie können vordefinierte Objekte an ein anderes NFC-Gerät schicken. Dazu legen Sie beide Geräte nebeneinander (üblicherweise mit den Rückseiten aneinander), während diese den Startbildschirm zeigen."
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Wenn NFC aktiviert ist, können Sie Daten senden oder empfangen, wenn Ihr Gerät andere NFC-fähige Geräte oder NFC-Tags berührt."
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Wenn diese Funktion aktiviert ist, können Sie Dateien an andere NFC-fähige und Wi-Fi Direct-Geräte schicken, indem Sie die Geräte nahe nebeneinander halten. Sie können z. B. Bild- und Video-Dateien aus der Galerie sowie Musikdateien aus dem MP3-Player usw. übertragen, indem Sie die Geräte aneinanderlegen (normalerweise Rücken an Rücken) und dann auf den Bildschirm tippen. Die App bestimmt, was übertragen wird."
 
diff --git a/ug-nfc-share-efl/po/el_GR.po b/ug-nfc-share-efl/po/el_GR.po
index a6b2d69..feb9f99 100755..100644
--- a/ug-nfc-share-efl/po/el_GR.po
+++ b/ug-nfc-share-efl/po/el_GR.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Για να ακυρώσετε την κοινή χρήση, πατήστε “Άκυρο”"
 
@@ -7,15 +10,33 @@ msgstr "Η υπηρεσία δεν είναι διαθέσιμη. Το NFC εί�
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Κοινή χρήση μέσω NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Αποτυχία κοινής χρήσης ετικέτας"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Αγγίξτε απαλά τα τηλέφωνα για κοινή χρήση"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Σφάλμα μεταφοράς"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Έγινε κοινή χρήση της ετικέτας"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Η πολιτική ασφαλείας περιορίζει τη χρήση %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Κοινόχρηστο"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Δεν είναι δυνατή η κοινή χρήση"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Προκαθορισμένο στοιχείο"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Μπορείτε να μεταδώσετε προκαθορισμένα στοιχεία σε άλλη συσκευή NFC. Απλώς φέρτε κοντά τις συσκευές (συνήθως “πλάτη με πλάτη”) όταν είναι ορατή η αρχική οθόνη"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Όταν το NFC είναι ενεργοποιημένο, μπορείτε να στείλετε ή να λάβετε δεδομένα όταν η συσκευή σας αγγίζει άλλες συσκευές που υποστηρίζουν τη λειτουργία NFC ή ετικέτες NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Όταν αυτή η λειτουργία είναι ενεργοποιημένη, μπορείτε να μεταδώσετε αρχεία σε συσκευές με δυνατότητα NFC και Wi-Fi Direct τοποθετώντας τις συσκευές σε κοντινή απόσταση. Για παράδειγμα, μέσω του beam μπορείτε να μεταδώσετε αρχεία εικόνων/βίντεο από τη Συλλογή, αρχεία μουσικής από το πρόγραμμα αναπαραγωγής μουσικής και ακόμη περισσότερα. Το μόνο που έχετε να κάνετε είναι να τοποθετήσετε τις συσκευές σε κοντινή απόσταση (συνήθως “πλάτη με πλάτη”) και κατόπιν να πατήσετε στην οθόνη σας. Η εφαρμογή καθορίζει τα στοιχεία που μεταδίδονται μέσω beam"
 
diff --git a/ug-nfc-share-efl/po/en.po b/ug-nfc-share-efl/po/en.po
index 2ec339c..bae7d98 100755..100644
--- a/ug-nfc-share-efl/po/en.po
+++ b/ug-nfc-share-efl/po/en.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "To cancel sharing, tap Cancel"
 
@@ -7,15 +10,33 @@ msgstr "Service not available. NFC turned off. Turn on NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Share via NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Failed to share tag"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Gently touch phones together to share"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Transfer failed"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tag shared"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Security policy restricts use of %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Shared"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Unable to share"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Predefined item"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "You can beam predefined items to another NFC device. Just bring the devices close together (typically back to back) while in the home screen"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "When NFC is on, you can send or receive data when your device touches other NFC-capable devices or NFC tags"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "When this feature is turned on, you can beam files to other NFC and Wi-Fi Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music Player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed"
 
diff --git a/ug-nfc-share-efl/po/en_PH.po b/ug-nfc-share-efl/po/en_PH.po
new file mode 100644
index 0000000..079985b
--- /dev/null
+++ b/ug-nfc-share-efl/po/en_PH.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "To cancel sharing, tap Cancel"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Service not available. NFC turned off. Turn on NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Share via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Gently touch phones together to share"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Transfer failed"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Security policy restricts use of %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Shared"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Unable to share"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Predefined item"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "You can beam predefined items to another NFC device. Just bring the devices close together (typically back to back) while in the home screen"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "When NFC is on, you can send or receive data when your device touches other NFC-capable devices or NFC tags"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "When this feature is turned on, you can beam files to other NFC and Wi-Fi Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed"
+
diff --git a/ug-nfc-share-efl/po/en_US.po b/ug-nfc-share-efl/po/en_US.po
index 2ec339c..025ee43 100644
--- a/ug-nfc-share-efl/po/en_US.po
+++ b/ug-nfc-share-efl/po/en_US.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "To cancel sharing, tap Cancel"
 
@@ -7,15 +10,33 @@ msgstr "Service not available. NFC turned off. Turn on NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Share via NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Failed to share tag"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Gently touch phones together to share"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Transfer failed"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tag shared"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Security policy restricts use of %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Shared"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Unable to share"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Predefined item"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "You can beam predefined items to another NFC device. Just bring the devices close together (typically back to back) while in the home screen"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "When NFC is on, you can send or receive data when your device touches other NFC-capable devices or NFC tags"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "When this feature is turned on, you can beam files to other NFC and Wi-Fi Direct devices by holding the devices close together. For example, you can beam image/video files from the Gallery, music files from the Music player, and more. Just bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed."
 
diff --git a/ug-nfc-share-efl/po/es_ES.po b/ug-nfc-share-efl/po/es_ES.po
index 31eb68f..b7c9be3 100755..100644
--- a/ug-nfc-share-efl/po/es_ES.po
+++ b/ug-nfc-share-efl/po/es_ES.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Para detener el uso compartido, pulse Cancelar"
 
@@ -7,15 +10,33 @@ msgstr "Servicio no disponible. NFC apagado. ¿Encender NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Compartir mediante NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Error al compartir etiqueta"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Toque un teléfono con otro con suavidad para compartir"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Error de transferencia"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Etiqueta compartida"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La política de seguridad restringe el uso de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartido"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "No se puede compartir"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elemento predefinido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Puede transmitir elementos predefinidos a otro dispositivo NFC. Solo tiene que juntar los dispositivos (normalmente de espaldas) mientras esté en la pantalla de inicio"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Cuando NFC está activo, puede enviar o recibir datos cuando su dispositivo toca otros dispositivos con capacidad NFC o etiquetas NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Cuando esta función está activada, puede transmitir archivos a otros dispositivos NFC o Wi-Fi Direct manteniendo los dos dispositivos juntos. Por ejemplo, puede transmitir archivos de imagen/vídeo desde la Galería, archivos de música desde el Reproductor de música, etc. Solo tiene que juntar los dispositivos (normalmente de espaldas) y tocar su pantalla. La aplicación determina qué se transmite"
 
diff --git a/ug-nfc-share-efl/po/es_MX.po b/ug-nfc-share-efl/po/es_MX.po
new file mode 100644
index 0000000..90657c8
--- /dev/null
+++ b/ug-nfc-share-efl/po/es_MX.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Para dejar de compartir, pulse Cancelar"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Servicio no disponible. NFC desactivado. ¿Desea activar NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Compartir mediante NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Toque levemente los teléfonos de manera que estén juntos para compartir"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Error de transferencia"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La política de seguridad restringe el uso de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartido"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "No se puede compartir"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elemento predefinido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Puede juntar elementos predefinidos con otro dispositivo NFC. Simplemente acerque los dispositivos (por lo general, por la parte posterior) mientras está en la página de inicio"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Cuando NFC está activado, puede enviar o recibir datos cuando su dispositivo toca otro dispositivo con NFC activado o con etiquetas NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Cuando esta función está activada, puede transmitir archivos a otro dispositivo NFC y Wi-Fi Directo sosteniendo y uniendo los dispositivos. Por ejemplo, puede transmitir archivos de imagen/video desde la Galería, archivos de música desde el Reproductor de música y más. Solo tiene que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, pulsar la pantalla del dispositivo. Las aplicaciones determinan el contenido que puede compartirse"
+
diff --git a/ug-nfc-share-efl/po/et.po b/ug-nfc-share-efl/po/et.po
new file mode 100644
index 0000000..3da73eb
--- /dev/null
+++ b/ug-nfc-share-efl/po/et.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Jagamise tühistamiseks toksake käsul Tühista"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Teenus ei ole saadaval. NFC on välja lülitatud. Kas lülitada NFC sisse?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Jaga NFC kaudu"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Jagamiseks pange telefonid õrnalt teineteise vastu"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Edastamine nurjus"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Turvalisuse poliis piirab üksuse %s kasutamist"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Jagatud"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Ei saa jagada"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Eelistatud üksus"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Saate saata eelistatud üksusi teise NFC-seadmesse. Lihtsalt asetage avaekraaniga seadmed üksteise lähedale (tavaliselt tagaküljed kohakuti)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kui NFC on sees, saate saata või vastu võtta andmeid, kui teie seade puutub vastu teisi NFC-võimalusega seadmeid või NFC-silte"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kui see funktsioon on sisse lülitatud, saate faile üle kanda teistesse NFC ja Wi-Fi Directi seadmetesse, hoides seadmeid üksteise lähedal. Näiteks saate üle kanda pildi-/videofaile galeriist, muusikafaile MP3-mängijast jms. Lihtsalt asetage seadmed üksteise lähedale (tavaliselt tagaküljed kohakuti) ja seejärel toksake ekraani. Rakendus tuvastab, mida üle kanda"
+
diff --git a/ug-nfc-share-efl/po/eu.po b/ug-nfc-share-efl/po/eu.po
new file mode 100644
index 0000000..cf5cadb
--- /dev/null
+++ b/ug-nfc-share-efl/po/eu.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Partekatzea uzteko, ukitu Utzi"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Zerbitzua ez dago erabilgarri. NFC itzalita. Piztu NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Partekatu NFC bidez"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Partekatzeko, ukitu leun telefonoak elkarrekin"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Akatsa transferitzean"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Segurtasun politikak %s erabiltzea mugatzen du"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partekatua"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Ezin da partekatu"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Aurrez zehaz. elementua"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Aurrez zehaztutako elementuak transferitu daitezke beste NFC gailu batera. Jar itzazu gailuak elkarrengandik hurbil (normalean atzeko aldeak elkartuz) pantaila nagusian zaudela"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC piztuta dagoenean, datuak bidali edo jaso ditzakezu zure gailuak NFC onartzen duen bestelako gailu bat edo NFC etiketak ukitzen dituenean"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Eginbidea piztuta dagoenean, fitxategiak transmititu ditzakezu beste NFC eta Wi-Fi Direct gailutara gailuak elkarrengatik hurbil jarrita. Esaterako, Galeriako irudi/bideo fitxategiak, Musika jogailuko musika fitxategiak eta gauza gehiago transferi ditzakezu. Gailuak bata bestearengandik hurbil jarri (atzealdeak elkar ukitzen direla) eta pantaila ukitu. Aplikazioak zehaztuko du zer eduki transmitituko den"
+
diff --git a/ug-nfc-share-efl/po/fi.po b/ug-nfc-share-efl/po/fi.po
index 45d2563..5530f98 100644
--- a/ug-nfc-share-efl/po/fi.po
+++ b/ug-nfc-share-efl/po/fi.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Lopeta jakaminen napauttamalla Peruuta"
 
@@ -7,15 +10,33 @@ msgstr "Palvelu ei ole käytettävissä. NFC on poistettu käytöstä. Otetaanko
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Jaa NFC:n kautta"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Tunnisteen jakaminen epäonnistui"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Jaa koskettamalla puhelimet varovasti toisiinsa"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Siirtovirhe"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tunniste jaettu"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Suojauskäytäntö estää käytön: %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Jaettu"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Ei voi jakaa"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Esimääritetty kohde"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Voit siirtää valmiiksi määritetyt kohteet toiseen NFC-laitteeseen. Aseta laitteet alkunäytössä lähelle toisiaan (yleensä niiden takaosat vastakkain)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kun NFC on käytössä, voit lähettää tai vastaanottaa tietoja, kun laitteesi koskettaa muita NFC-toimintoa tukevia laitteita tai NFC-tunnisteita"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kun tämä toiminto on käytössä, voit siirtää tiedostoja muihin NFC- ja Wi-Fi Direct -laitteisiin pitämällä laitteita lähellä toisiaan. Voit esimerkiksi lähettää kuva- ja videotiedostoja galleriasta, musiikkitiedostoja musiikkisoittimesta ja paljon muuta. Sinun ei tarvitse tehdä muuta kuin asettaa laitteet lähelle toisiaan (yleensä niiden takaosat vastakkain) ja napauttaa näyttöä. Sovellus määrittää lähetettävän sisällön"
 
diff --git a/ug-nfc-share-efl/po/fr_CA.po b/ug-nfc-share-efl/po/fr_CA.po
new file mode 100644
index 0000000..73b14bd
--- /dev/null
+++ b/ug-nfc-share-efl/po/fr_CA.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Pour annuler le partage, touchez Annuler"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Service non disponible. NFC désactivé. Activer NFC ?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Partager via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Faites entrer doucement en contact les téléphones pour partager"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Erreur de transfert"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La politique de sécurité limite l'utilisation de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partagé"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Partage impossible"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Élément prédéfini"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Vous pouvez transmettre des éléments prédéfinis vers un autre périphérique NFC. Il vous suffit de rapprocher les périphériques (en général dos contre dos) lorsque l'écran d'accueil est ouvert"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Lorsque NFC est activé, vous pouvez envoyer ou recevoir des données quand votre périphérique touche d'autres périphériques compatibles NFC ou des tags NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Lorsque cette fonction est activée, vous pouvez transmettre des fichiers à d'autres périphériques NFC et Wi-Fi Direct en les rapprochant les uns des autres. Par exemple, vous pouvez transmettre des fichiers image/vidéo à partir de la galerie, des fichiers audios à partir du lecteur de musique, etc. Il vous suffit de rapprocher les périphériques (en général dos contre dos) et d'appuyer sur l'écran. L'application détermine ce qui est transmis"
+
diff --git a/ug-nfc-share-efl/po/fr_FR.po b/ug-nfc-share-efl/po/fr_FR.po
index 3a5309c..f6bcb70 100755..100644
--- a/ug-nfc-share-efl/po/fr_FR.po
+++ b/ug-nfc-share-efl/po/fr_FR.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Pour annuler le partage, appuyez sur Annuler"
 
@@ -7,15 +10,33 @@ msgstr "Service non disponible. NFC désactivé. Activer NFC ?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Partager via NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Impossible de partager le tag"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Faites entrer doucement en contact les téléphones pour partager"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
-msgstr "Echec du transfert"
+msgstr "Échec du transfert"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "La politique de sécurité limite l'utilisation de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partagé"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Partage impossible"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elément prédéfini"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Vous pouvez transmettre des éléments prédéfinis vers un autre périphérique NFC. Il vous suffit de rapprocher les périphériques (en général dos contre dos) une fois sur l'écran d'accueil"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Lorsque NFC est activé, vous pouvez envoyer ou recevoir des données quand votre périphérique touche d'autres périphériques compatibles NFC ou des tags NFC"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tag partagé"
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Lorsque cette fonction est activée, vous pouvez transmettre des fichiers à d'autres périphériques NFC et Wi-Fi Direct en les rapprochant les uns des autres. Par exemple, vous pouvez transmettre des fichiers image/vidéo à partir de la galerie, des fichiers audio à partir du lecteur de musique, etc. Il vous suffit de rapprocher les périphériques (en général dos contre dos) et d'appuyer sur l'écran. L'application détermine ce qui est transmis"
 
diff --git a/ug-nfc-share-efl/po/ga.po b/ug-nfc-share-efl/po/ga.po
new file mode 100644
index 0000000..97659e9
--- /dev/null
+++ b/ug-nfc-share-efl/po/ga.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Le comhroinnt a chur ar ceal, tapáil ar Cuir ar ceal"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Níl seirbhís ar fáil. Tá NFC casta as. Cas NFC air?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Comhroinn le NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Déan na fóin a thadhall le chéile go bog le comhroinnt"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Theip ar aistriú"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Cuireann an polasaí slándála srian ar %s a úsáid"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Comhroinnte"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Ní féidir comhroinnt"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Mír réamhshocraithe"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Is féidir leat míreanna réamhshocraithe a léaschóipeáil chuig gléas eile NFC. Tabhair na gléasanna gar dá chéile (go hiondúil cúl le cúl) agus tú sa scáileán baile"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Agus NFC casta air, is féidir leat sonraí a sheoladh nó a fháil nuair a thadhlaíonn do ghléas gléasanna eile NFC cumasaithe nó clibeanna NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Agus an ghné seo ar siúl, is féidir leat comhaid a léaschóipeáil chuig gléasanna NFC agus Wi-Fi Direct eile trí na gléasanna a chur in aice lena chéile. Mar shampla, is féidir leat comhaid íomhá/físe a léaschóipeáil ón nGailearaí, comhaid cheoil a léaschóipeáil ón Seinnteoir ceoil agus tuilleadh. Níl le déanamh ach na gléasanna a thabhairt le chéile (cúl le cúl go hiondúil) agus ansin do scáileán a thapáil. Cinneann an feidhmchlár a bhfuil le leaschóipeáil"
+
diff --git a/ug-nfc-share-efl/po/gl.po b/ug-nfc-share-efl/po/gl.po
new file mode 100644
index 0000000..f32f138
--- /dev/null
+++ b/ug-nfc-share-efl/po/gl.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Para cancelar o uso compartido, toca Cancelar"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Servizo non dispoñible. NFC desactivada. Desexas activar NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Compartir por NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Fai que os teléfonos se toquen suavemente para compartir"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Erro de transferencia"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "A política de seguridade limita o uso de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartido"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Non se pode compartir"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elemento predefinido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Podes transferir elementos predefinidos a outro dispositivo NFC. Simplemente achega os dispositivos entre si (normalmente xuntando as partes posteriores) mentres te atopas na pantalla de inicio"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Cando NFC está activado, podes enviar ou recibir datos cando o teu dispositivo toca outros dispositivos compatibles con NFC ou etiquetas NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Cando esta función está activada, podes transmitir arquivos a outros dispositivos NFC e Wi-Fi Direct suxeitando os dispositivos un preto do outro. Por exemplo, podes transmitir arquivos de imaxe/vídeo desde a Galería, arquivos de música desde o reprodutor de música, etc. Simplemente achega os dispositivos entre si (normalmente as súas partes posteriores) e, a continuación, toca a pantalla. A aplicación determina o que se transmite"
+
diff --git a/ug-nfc-share-efl/po/he.po b/ug-nfc-share-efl/po/he.po
deleted file mode 100644
index 1714ff3..0000000
--- a/ug-nfc-share-efl/po/he.po
+++ /dev/null
@@ -1,21 +0,0 @@
-msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
-msgstr "כדי לבטל את השיתוף, הקש על ’אישור’"
-
-msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
-msgstr "השירות אינו זמין. NFC כבוי. להפעיל NFC?"
-
-msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
-msgstr "שתף באמצעות NFC"
-
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "שיתוף התגית נכשל"
-
-msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
-msgstr "גע בטלפון בעדינות באמצעות הטלפון השני כדי לשתף"
-
-msgid "IDS_NFC_POP_TRANSFER_FAILED"
-msgstr "ההעברה נכשלה"
-
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "התגית שותפה"
-
diff --git a/ug-nfc-share-efl/po/hi.po b/ug-nfc-share-efl/po/hi.po
index 3e931d0..984c323 100644
--- a/ug-nfc-share-efl/po/hi.po
+++ b/ug-nfc-share-efl/po/hi.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "साझाकरण रद्द करने के लिए, रद्द करें टेप करें"
 
@@ -7,15 +10,33 @@ msgstr "सेवा उपलब्ध नहीं है। NFC बंद क
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "NFC के द्वारा साझा करें"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "टैग साझा करने में विफल"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "साझा करने के लिए फ़ोन्स को एक साथ हल्के से स्पर्श करें"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "स्‍थानांतरण विफल"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "साझा किए गए टैग करें"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "सुरक्षा नीति %s के उपयोग को सीमित करता है"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "शेयर किए गए"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "साझा करने में अक्षम"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "पूर्वनिर्धारित मद"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "आप अन्य NFC डिवाइस पर पूर्वनिर्धारित मदों को बीम कर सकते हैं। होम स्क्रीन में होने के दौरान सिर्फ डिवाइसों को पास लाएँ (विशेष रूप से आगे-पीछे)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "ड्राइविंग"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "ज‍ब यह सुविधा चालू की जाती है, आप डिवाइसों को साथ में होल्ड कर दूसरे NFC और Wi-Fi डायरेक्ट डिवाइसों पर फ़ाइलें बीम कर सकते है। उदाहरण के लिए, आप गैलरी से वीडियो और छवि फ़ाइलों को, संगीत प्लेयर से संगीत फ़ाइलों को, और अधिक को बीम कर सकते हैं। केवल डिवाइसों को पास लाएँ (विशिष्ट रूप से बैक टू बैक) और फिर अपनी स्‍क्रीन टैप करें। क्या बीम करना है यह ऐप निर्धारित करता है"
 
diff --git a/ug-nfc-share-efl/po/hr.po b/ug-nfc-share-efl/po/hr.po
index f4fa418..fc2f62a 100644
--- a/ug-nfc-share-efl/po/hr.po
+++ b/ug-nfc-share-efl/po/hr.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Za odustajanje od dijeljenja dodirnite Odustani"
 
@@ -7,15 +10,33 @@ msgstr "Usluga nedostupna. NFC isključen. Uključiti NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Dijeli putem NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Greška dijeljenja oznake"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Nježno dodirni telefone za dijeljenje"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Greška prijenosa"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Oznaka dijeljena"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Sigurnosna pravila ograničavaju upotrebu %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Dijeljeno"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nemoguće dijeliti"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Postavljena stavka"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Postavljene stavke možete poslati drugom NFC uređaju. Samo prislonite uređaje jedan uz drugi (poželjno stražnje strane uređaja) dok ste na početnom zaslonu"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kada je NFC uključen, možete slati ili primati podatke kad vaš uređaj dotakne druge uređaje koji podržavaju NFC ili NFC oznake"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kada je uključeno, možete slati podatke i datoteke u drugi NFC i Wi-Fi Direct uređaj tako da dodirnete uređaje. Možete slati Slike/Video iz Galerije, glazbene datoteke iz Music Playera i više. Samo prislonite uređaje jedan uz drugi (poželjno stražnje strane uređaja) i zatim dodirnite svoj zaslon. Aplikacija određuje što se šalje"
 
diff --git a/ug-nfc-share-efl/po/hu.po b/ug-nfc-share-efl/po/hu.po
index a3401a8..19ba105 100644
--- a/ug-nfc-share-efl/po/hu.po
+++ b/ug-nfc-share-efl/po/hu.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "A megosztás megszüntetéséhez érintse meg a Mégse gombot"
 
@@ -7,15 +10,33 @@ msgstr "A szolgáltatás nem elérhető. Az NFC ki van kapcsolva. Bekapcsolja az
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Megosztás NFC-n"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Nem sikerült megosztani a címkét"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Finoman érintse egymáshoz a telefonokat a megosztáshoz"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Hívásátadás sikertelen"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Címke megosztva"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "A biztonsági irányelv korlátozza a(z) %s használatát"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Megosztott"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nem lehet megosztani"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Előre megadott tétel"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Az előre megadott tételeket másik NFC-eszközre sugározhatja. Elég, ha egymáshoz tartja a két eszközt (jellemzően háttal egymásnak), amikor a kezdőképernyő látható rajtuk"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Az NFC bekapcsolása esetén az eszközt egy másik NFC-kompatibilis eszközhöz vagy NFC-címkéhez érintve adatokat küldhet és fogadhat"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Bekapcsolt funkció mellett fájlokat továbbíthat más NFC vagy Wi-Fi Direct kompatibilis eszközre úgy, hogy egymásnak háttal, közel helyezi egymáshoz a két készüléket. Továbbíthat kép- vagy videofájlokat a Galériából, zene fájlokat a Zenelejátszóból és egyéb fájlokat. A fájlcseréhez tartsa egymásnak háttal a két eszközt és érintse meg a képernyőt. Az alkalmazás megállapítja a fájl típusát."
 
diff --git a/ug-nfc-share-efl/po/hy.po b/ug-nfc-share-efl/po/hy.po
new file mode 100644
index 0000000..d02f9b6
--- /dev/null
+++ b/ug-nfc-share-efl/po/hy.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Համօգտագործումը դադարեցնելու համար թակեք Դադարեցնել"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Ծառայությունը մատչելի չէ: NFC-ն անջատված է. միացնե՞լ NFC-ը:"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Համօգտագործեք NFC-ի միջոցով"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Համօգտագործելու համար նրբորեն իրար հպեք հեռախոսները"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Փոխանցումը չհաջողվեց"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Անվտանգության քաղաքականությունը սահմանափակում է %sի օգտագործումը"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Համատեղ օգտագործմամբ"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Անհնար է համօգտագործել"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Նախասահմանված տարր"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Կարող եք նախասահմանված տարրերն ուղղորդված փոխանցել մեկ այլ NFC սարքի: Պարզապես իրար մոտեցրեք սարքերը (սովորաբար, հետևը հետևին)՝ գտնվելով հիմնական էկրանում"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Երբ NFC-ն միացված է, կարող եք տվյալներ ուղարկել ու ստանալ, երբ Ձեր սարքը հպվում է NFC ապահովող այլ սարքերի կամ NFC հատկորոշիչների"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Երբ այս գործառական հնարավորությունը միացված է, կարող եք ֆայլերն ուղղորդված փոխանցել այլ NFC և Wi-Fi Direct սարքերի՝ սարքերն իրար մոտիկ պահելով: Օրինակ՝ կարող եք պատկերային ֆայլեր և տեսաֆայլեր փոխանցել Պատկերասրահից, երաժշտական ֆայլեր Նվագարկչից և այլն: Պարզապես իրար կցեք սարքերը (սովորաբար, հետևը հետևին), հետո թակեք Ձեր էկրանը: Ծրագիրը որոշում է, թե ինչ է ուղղորդված փոխանցվում"
+
diff --git a/ug-nfc-share-efl/po/id.po b/ug-nfc-share-efl/po/id.po
deleted file mode 100644
index f9b5e66..0000000
--- a/ug-nfc-share-efl/po/id.po
+++ /dev/null
@@ -1,21 +0,0 @@
-msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
-msgstr "Untuk membatalkan berbagi, ketuk Batal"
-
-msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
-msgstr "Layanan tidak tersedia. NFC dinonaktifkan. Aktifkan NFC?"
-
-msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
-msgstr "Bagi lewat NFC"
-
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Gagal berbagi tag"
-
-msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
-msgstr "Sentuh telepon dengan lembut secara bersamaan untuk berbagi"
-
-msgid "IDS_NFC_POP_TRANSFER_FAILED"
-msgstr "Pemindahan gagal"
-
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tag dibagi"
-
diff --git a/ug-nfc-share-efl/po/is.po b/ug-nfc-share-efl/po/is.po
new file mode 100644
index 0000000..3e49ed2
--- /dev/null
+++ b/ug-nfc-share-efl/po/is.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Pikkaðu á Hætta við til að hætta við samnýtingu"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Þjónustan er ekki til staðar. Slökkt er á nándartengingu. Kveikja núna?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Senda með NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Látið síma snerta hvor annan til að deila"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Flutningur tókst ekki"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Öryggisstefna takmarkar notkun %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Samnýtt"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Mistókst að samnýta"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Forskilgreint atriði"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Þú getur sent forskilgreind atriði til annars NFC-tækis. Settu tækin einfaldlega nálægt hvort öðru (yfirleitt bak í bak) á meðan heimaskjárinn er opinn"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Þegar kveikt er á nándartengingu geturðu sent eða tekið við gögnum þegar tækið snertir önnur tæki með nándartengingu eða nándarmerki"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Þegar þessi eiginleiki er virkur geturðu sent skrár í annað tæki með nándartengingu eða Wi-Fi Direct tæki með því að halda tækjunum þétt saman. Þú getur t.d. sent mynd/myndskeið úr galleríinu, tónlistarskrár úr tónlistarspilaranum o.fl. Haltu tækjunum bara saman (yfirleitt með því að láta þau snúa bökum saman) og pikkaðu á skjáinn. Forritið ákvarðar hvað er sent"
+
diff --git a/ug-nfc-share-efl/po/it_IT.po b/ug-nfc-share-efl/po/it_IT.po
index a28e84d..c1d6fb1 100755..100644
--- a/ug-nfc-share-efl/po/it_IT.po
+++ b/ug-nfc-share-efl/po/it_IT.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Per annullare la condivisione, toccate Annulla"
 
@@ -7,15 +10,33 @@ msgstr "Servizio non disponibile. NFC disattivato. Attivare NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Condividi con NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Impossibile condividere tag"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Per avviare la condivisione, toccate leggermente i telefoni"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Errore trasferimento"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tag condiviso"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "I criteri di protezione limitano l'utilizzo di %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Condiviso"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Impossibile condividere"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Elemento predefinito"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Potete trasferire elementi predefiniti a un altro dispositivo NFC. È sufficiente avvicinare il retro dei due dispositivi mentre la schermata Home è aperta"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Se NFC è attivo, potete inviare o ricevere dati mettendo a contatto il vostro dispositivo con un altro con funzionalità NFC oppure un tag NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Se la funzione è attiva, sarà possibile trasmettere file ad altri dispositivi NFC e Wi-Fi Direct posizionati in prossimità di quello in uso. Per esempio, potete trasmettere file di immagini/video dalla Galleria, file musicali dal Lettore musica e altro ancora. È sufficiente avvicinare il retro dei due dispositivi e toccare lo schermo. L'applicazione determinerà il contenuto trasmesso"
 
diff --git a/ug-nfc-share-efl/po/ja_JP.po b/ug-nfc-share-efl/po/ja_JP.po
index 47fa877..e28ff78 100755..100644
--- a/ug-nfc-share-efl/po/ja_JP.po
+++ b/ug-nfc-share-efl/po/ja_JP.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "共有を解除するには、［キャンセル］をタップしてください。"
 
@@ -7,15 +10,33 @@ msgstr "サービスを利用できません。NFCがOFFになっています。
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "NFCで共有"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "タグの共有に失敗しました。"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "共有するには、端末同士をゆっくりと近づけてください。"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
-msgstr "転送に失敗しました。"
+msgstr "転送に失敗しました。"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "セキュリティポリシーが%sの使用を制限します。"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "公開中"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "共有できません。"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "設定済みアイテム"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "設定済みアイテムを他のNFC対応端末に送信できます。ホーム画面を表示中に端末同士(通常は背面同士)を近づけてください。"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFCがONの場合、相手の端末がNFCを利用可能か、NFCタグに触れたときにデータを送受信できます。"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "タグが共有されました。"
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "この機能をONにし、端末同士を近づけると、他のNFC端末やWi-Fi Direct端末にファイルを送信できます。例えば、ギャラリーから画像/動画を送信したり、音楽プレーヤーから音楽を送信できます。端末同士（主に背面同士）を近づけ、画面をタップします。送信するファイルはアプリによって異なります。"
 
diff --git a/ug-nfc-share-efl/po/ka.po b/ug-nfc-share-efl/po/ka.po
new file mode 100644
index 0000000..4baaed1
--- /dev/null
+++ b/ug-nfc-share-efl/po/ka.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "გაზიარების შესაწყვეტად, დააჭირეთ გაუქმების ღილაკს"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "სერვისი მიუწვდომელია. NFC გამორთულია. ჩაირთოს NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC-ით გაზიარება"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "ფრთხილად მიადეთ ერთმანეთს ტელეფონები და გააზიარეთ"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "ვერ გადაიცა"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "უსაფრთხოების პოლიტიკა ზღუდავს, რომ გამოყენებული იქნას %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "გაზიარებული"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "გაზიარება შეუძლებელია"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "წინასწარ განსაზღვრული"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "შეგიძლიათ სხივით გადაიტანოთ წინასწარ განსაზღვრული ელემენტები სხვა NFC აპარატში. უბრალოდ, ჩართეთ საწყისი ეკრანი და მიადეთ ერთმანეთს აპარატები (ჩვეულებრივ, ზურგებით)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "როდესაც NFC ჩართულია, შეგიძლიათ გაგზავნოთ ან მიიღოთ მონაცემები, როდესაც თქვენი აპარატი შეეხება NFC ფუნქციის მქონე სხვა აპარატებს ან NFC იარლიყებს"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "როდესაც ჩართულია ეს ფუნქცია, შეგიძლიათ მიანათოთ ფაილები სხვა NFC და Wi-Fi Direct აპარატებს, აპარატების ერთმანეთზე მიდებით. მაგალითად, შეგიძლიათ მიანათოთ გრაფიკული/ვიდეო ფაილები გალერიიდან, მუსიკის ფაილები პლეერიდან და სხვა. მხოლოდ ერთმანეთს მიადეთ აპარატები (ჩვეულებრივ, ურგებით) და შემდეგ დააკაკუნეთ თქვენს ეკრანზე. პროგრამა განსაზღვრავს რა მიენათოს"
+
diff --git a/ug-nfc-share-efl/po/kk.po b/ug-nfc-share-efl/po/kk.po
new file mode 100644
index 0000000..9eb4b1e
--- /dev/null
+++ b/ug-nfc-share-efl/po/kk.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Бөлісуден бас тарту үшін Бас тарту опциясын түртіңіз"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Қызмет қол жетімді емес. NFC өшірулі. NFC қосу керек пе?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC арқылы бөлісу"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Бөлісу үшін телефондарды ақырын бірге түртіңіз"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Орналастыру үзіліп кетті"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Қауіпсіздік саясаты %s пайдаланылуын шектейді"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Бәріне ортақ"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Бөлісу мүмкін емес"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Алдын ала ан. элемент"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Алдын ала анықталған элементтерді NFC құрылғысына жіберуге болады. Бастапқы экранда болған кезде құрылғыларды бір-біріне жақындатыңыз (әдетте артын-артына)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC қосылғанда, құрылғыңыз басқа NFC қабілетті құрылғыларға немесе NFC тегтеріне тиген кезде деректер жіберуге немесе қабылдауға болады"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Бұл функция өшірілгенде, құрылғыларды бір-біріне жақын ұстап, файлдарды басқа NFC және Wi-Fi Direct құрылғыларына жіберуге болады. Мысалы, сурет/бейне файлдарды галереядан, музыкалық файлдарды музыкалық ойнатқыштан және т.с.с. жіберуге болады. Құрылғыларды (әдетте артын-артына) жақындатып, экраныңызды түртіңіз. Бағдарлама ненің жіберілетінін анықтайды"
+
diff --git a/ug-nfc-share-efl/po/ko_KR.po b/ug-nfc-share-efl/po/ko_KR.po
index 3fcd0ca..7561ae0 100755..100644
--- a/ug-nfc-share-efl/po/ko_KR.po
+++ b/ug-nfc-share-efl/po/ko_KR.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "공유를 취소하려면 [취소]를 누르세요"
 
@@ -7,15 +10,33 @@ msgstr "NFC가 꺼져 있어 서비스를 이용할 수 없습니다. NFC를 켤
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "NFC로 공유"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "태그를 공유하지 못하였습니다"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "공유하려면 휴대폰을 서로 가볍게 부딪히세요"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "연결하지 못하였습니다"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "태그가 공유되었습니다"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "보안 정책에 따라 %s 사용이 제한됩니다"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "공유됨"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "공유할 수 없습니다"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "미리 설정된 항목"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "다른 NFC 기기로 미리 설정된 항목을 무선 송신할 수 있습니다. 홈 화면 상태에서 기기를 서로 가까이 두세요(대개 뒷면을 맞댐)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC를 켠 상태에서 내 디바이스를 다른 NFC 기기나 NFC 태그에 맞대면 데이터를 주고받을 수 있습니다"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "이 기능을 켜면 디바이스를 가까이 놓아 다른 NFC 및 Wi-Fi Direct 기기로 파일을 무선 송수신할 수 있습니다. 예를 들어 갤러리의 이미지/동영상 파일, 뮤직 플레이어의 음악 파일 등을 송수신할 수 있습니다. 디바이스를 가까이에 놓은 후(대개 뒷면을 맞댐) 화면을 누르세요. 송수신될 내용은 애플리케이션에 의해 결정됩니다"
 
diff --git a/ug-nfc-share-efl/po/lt.po b/ug-nfc-share-efl/po/lt.po
index c5c1e65..de7c903 100644
--- a/ug-nfc-share-efl/po/lt.po
+++ b/ug-nfc-share-efl/po/lt.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Jei norite atšaukti bendrinimą, bakstelėkite „Atšaukti“"
 
@@ -7,15 +10,33 @@ msgstr "Paslauga nepasiekiama. NFC išjungtas. Įjungti NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Bendrinti per NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Nepavyko bendrinti žymos"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Jei norite bendrinti, švelniai pridėkite vieną telefoną prie kito"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Persiųsti nepavyko"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Žyma bendrinta"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Saugos politika draudžia naudoti „%s“"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Bendra"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Neįmanoma bendrinti"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Iš anksto nust.element."
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Galite transliuoti iš anksto nustatytus elementus į kitą NFC įrenginį. Tiesiog suglauskite įrenginius (paprastai nugarėlėmis) būdami pradžios ekrane"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kai NFC įjungta, galite siųsti ar gauti duomenis, kai jūsų įrenginys liečiasi prie kito įrenginio, kuriame veikia NFC, ar NFC žymų"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kai ši funkcija įjungta, galite transliuoti failus į kitus NFC ir „Wi-Fi Direct“ įrenginius laikydami juos greta vienas kito. Tarkime, galite transliuoti vaizdus / vaizdo įrašus iš galerijos, muzikos įrašus iš muzikos grotuvo ir dar daugiau. Tiesiog suglauskite įrenginius (paprastai nugarėlėmis) ir bakstelėkite ekraną. Programa nusprendžia, kas transliuojama"
 
diff --git a/ug-nfc-share-efl/po/lv.po b/ug-nfc-share-efl/po/lv.po
index a59874f..f31f2ce 100644
--- a/ug-nfc-share-efl/po/lv.po
+++ b/ug-nfc-share-efl/po/lv.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Lai atceltu kopīgošanu, pieskarieties pie Atcelt"
 
@@ -7,15 +10,33 @@ msgstr "Pakalpojums nav pieejams. NFC ir izslēgts. Vai ieslēgt NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Kopīgot, izmantojot NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Neizdevās kopīgot atzīmi"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Viegli pieskarieties ar vienu tālruni otram, lai kopīgotu"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Pārsūtīšana neizdevās"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Atzīme ir kopīgota"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Drošības politika ierobežo %s lietošanu"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Koplietots"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nevar koplietot"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Iepriekš defin. objekts"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Varat nosūtīt iepriekš definētus objektus uz citu NFC ierīci. Vienkārši novietojiet ierīces blakus (parasti — saliekot kopā aizmugures), kad ir atvērts sākuma ekrāns"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kad ir ieslēgta NFC funkcija, varat nosūtīt vai saņemt datus, kad ierīce pieskaras citai NFC ierīcei vai NFC atzīmei"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kad šī funkcija ir ieslēgta, varat pārsūtīt failus uz citām NFC un Wi-Fi Direct ierīcēm, turot ierīces tuvu blakus. Piemēram, varat pārsūtīt attēlu/video failus no Galerijas, mūzikas failus no Mūzikas atskaņotāja u.c. Novietojiet ierīces blakus (saliekot kopā aizmugures) un pēc tam pieskarieties ekrānam. Programma pati nosaka, kas tiek pārsūtīts"
 
diff --git a/ug-nfc-share-efl/po/mk.po b/ug-nfc-share-efl/po/mk.po
new file mode 100644
index 0000000..83bb1fb
--- /dev/null
+++ b/ug-nfc-share-efl/po/mk.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "За да се откаже споделувањето, допрете Откажи"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Услугата не е достапна. NFC е исклучено. Да се вклучи NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Подели преку NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Нежно допрете ги телефоните еден до друг за да споделите"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Неуспешно префрлување"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Политиката на безбедност го ограничува користењето %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Споделени"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Не може да се сподели"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Готова ставка"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Може да пренесете готови ставки на друг уред со NFC. Само приближете ги уредите (обично грб со грб) додека се на почетниот екран"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Кога е вклучено NFC, може да праќате или примате податоци кога со уредот ќе допрете други уреди способни за NFC или ознаки NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Кога оваа функција е вклучена, може да пренесувате фајлови на други NFC и Wi-Fi Direct уреди со држење на уредите блиску еден до друг. На пример, може да пренесете слики/видео фајлови од Галеријата, музички фајлови од Музичкиот плеер и повеќе. Само приближете ги уредите (обично грб со грб) и потчукнете го екранот. Апликацијата одредува што ќе се пренесе"
+
diff --git a/ug-nfc-share-efl/po/ms.po b/ug-nfc-share-efl/po/ms.po
deleted file mode 100644
index 7ff562d..0000000
--- a/ug-nfc-share-efl/po/ms.po
+++ /dev/null
@@ -1,21 +0,0 @@
-msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
-msgstr "Untuk batalkan perkongsian, ketik Batal"
-
-msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
-msgstr "Perkhidmatan tidak tersedia. NFC dimatikan. Hidupkan NFC?"
-
-msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
-msgstr "Kongsi melalui NFC"
-
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Gagal untuk berkongsi tag"
-
-msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
-msgstr "Sentuh telefon bersama dengan lembut untuk berkongsi"
-
-msgid "IDS_NFC_POP_TRANSFER_FAILED"
-msgstr "Pindahan gagal"
-
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tag dikongsi"
-
diff --git a/ug-nfc-share-efl/po/nb.po b/ug-nfc-share-efl/po/nb.po
new file mode 100644
index 0000000..6e8cd8e
--- /dev/null
+++ b/ug-nfc-share-efl/po/nb.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "For å avbryte deling trykker du på Avbryt"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Tjenesten er ikke tilgjengelig. NFC er slått av. Slå på NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Del via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Legg telefonene forsiktig mot hverandre for å dele"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Overføringsfeil"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Sikkerhetspolicy begrenser bruk av %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Delt"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Kan ikke dele"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Forhåndsdef. element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Du kan overføre forhåndsdefinerte elementer til en annen NFC-enhet. Bare før enhetene inntil hverandre (vanligvis bakside mot bakside) i startskjermbildet"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Når NFC er på, kan du sende eller motta data når enheten din berører andre NFC-aktiverte enheter eller NFC-tagger"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Når denne funksjonen er slått på, kan du sende filer til andre NFC- og Wi-Fi Direct-enheter ved å holde enhetene i nærheten av hverandre. For eksempel kan du sende bilde-/videofiler fra galleriet, musikkfiler fra musikkspilleren og mer. Bare før enhetene sammen (helst rygg mot rygg) og trykk deretter på skjermen. Programmet bestemmer hva som sendes"
+
diff --git a/ug-nfc-share-efl/po/nl_NL.po b/ug-nfc-share-efl/po/nl_NL.po
index 20fc2cf..dfdc75b 100755..100644
--- a/ug-nfc-share-efl/po/nl_NL.po
+++ b/ug-nfc-share-efl/po/nl_NL.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Tik op Annuleren om delen te annuleren"
 
@@ -7,15 +10,33 @@ msgstr "Service niet beschikbaar. NFC uitgeschakeld. NFC inschakelen?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Delen via NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Kan tag niet delen"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Houd de telefoons voorzichtig tegen elkaar om te delen"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Fout bij doorverbinden"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Gedeelde tag"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Gebruik van %s beperkt door beveiligingsbeleid"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Gedeeld"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Kan niet delen"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Vooraf gedefin. item"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "U kunt vooraf gedefinieerde items overbrengen naar een ander NFC-apparaat. Houd de apparaten in het startscherm dichtbij elkaar (gewoonlijk rug tegen rug)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Wanneer NFC is ingeschakeld, kunt u gegevens verzenden of ontvangen wanneer uw apparaat andere NFC-apparaten of NFC-tags aanraakt"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Wanneer deze functie is ingeschakeld, kunt u bestanden naar andere NFC- en WiFi Direct-apparaten overbrengen door de apparaten dicht bij elkaar te houden. U kunt bijvoorbeeld foto-/videobestanden van de MP3-speler, notities van S Note en nog veel meer overbrengen. Houd de apparaten bij elkaar (gewoonlijk de achterkanten) en tik op het scherm. De app bepaalt wat wordt overgedragen"
 
diff --git a/ug-nfc-share-efl/po/no.po b/ug-nfc-share-efl/po/no.po
deleted file mode 100644
index 18c87fa..0000000
--- a/ug-nfc-share-efl/po/no.po
+++ /dev/null
@@ -1,21 +0,0 @@
-msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
-msgstr "For å avbryte deling trykker du på Avbryt"
-
-msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
-msgstr "Tjenesten er ikke tilgjengelig. NFC er slått av. Slå på NFC?"
-
-msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
-msgstr "Del via NFC"
-
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Kunne ikke dele tagg"
-
-msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
-msgstr "Legg telefonene forsiktig mot hverandre for å dele"
-
-msgid "IDS_NFC_POP_TRANSFER_FAILED"
-msgstr "Overføringsfeil"
-
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Tagg delt"
-
diff --git a/ug-nfc-share-efl/po/pl.po b/ug-nfc-share-efl/po/pl.po
index dcde8f9..c28f949 100644
--- a/ug-nfc-share-efl/po/pl.po
+++ b/ug-nfc-share-efl/po/pl.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Aby anulować udostępnianie, dotknij opcji Anuluj"
 
@@ -7,15 +10,33 @@ msgstr "Usługa niedostępna. NFC wyłączony. Włączyć NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Udostępnij przez NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Udostępnianie etykiety nie powiodło się"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Delikatnie przyłóż telefony do siebie, aby udostępnić"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Błąd transferu"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Etykieta została udostępniona"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Zasady zabezpieczeń ograniczają użycie %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Udostępniono"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nie można udostępnić"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Predefiniowany element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Predefiniowane elementy można przesłać do innego urządzenia obsługującego technologię NFC. Wystarczy zbliżyć urządzenia do siebie (zazwyczaj ich tylne strony), mając wyświetlony ekran startowy"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Gdy NFC jest włączone, możesz wysyłać i odbierać dane po dotknięciu urządzeniem innego urządzenia obsługującego NFC lub etykiety NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Po włączeniu tej funkcji można przesyłać pliki do innego trzymanego blisko urządzenia obsługującego technologię NFC lub Wi-Fi Direct. Można przesłać np. pliki obrazów lub filmów z Galerii, pliki muzyczne z odtwarzacza muzyki itd. Wystarczy zbliżyć urządzenia do siebie (zazwyczaj ich tylne strony) i dotknąć ekranu. Aplikacja określa, co jest przesyłane"
 
diff --git a/ug-nfc-share-efl/po/pt_BR.po b/ug-nfc-share-efl/po/pt_BR.po
new file mode 100644
index 0000000..74960ed
--- /dev/null
+++ b/ug-nfc-share-efl/po/pt_BR.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Para cancelar o compartilhamento, toque em Cancelar"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Serviço não disponível. NFC desativado. Ativar NFC?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "Compartilhar via NFC"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Toque gentilmente um telefone no outro para compartilhar"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Erro ao transferir"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "A política de segurança restringe o uso de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Compartilhado"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Impossível compartilhar"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Item pré-definido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "É possível emitir itens pré-definidos para outro dispositivo NFC. Basta manter os dispositivos bem próximos (geralmente com as partes traseiras juntas) enquanto está na tela de início"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Quando o NFC está ligado, é possível enviar ou receber dados quando seu dispositivo entra em contato com outro dispositivo compatível com NFC ou identificadores NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Quando este recurso está ligado, você pode direcionar arquivos para outros NFC e dispositivos com Wi-Fi Direct mantendo os dispositivos próximos. Por exemplo, você pode direcionar arquivos de imagem/vídeo a partir da Galeria, arquivos de música do reprodutor de Música e mais. Apenas mantenha os dispositivos juntos (geralmente encostados) e, em seguida, toque na sua tela. O aplicativo determina qual será direcionado"
+
diff --git a/ug-nfc-share-efl/po/pt_PT.po b/ug-nfc-share-efl/po/pt_PT.po
index 9534bee..a89145d 100755..100644
--- a/ug-nfc-share-efl/po/pt_PT.po
+++ b/ug-nfc-share-efl/po/pt_PT.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Para cancelar a partilha, toque em Cancelar"
 
@@ -7,15 +10,33 @@ msgstr "Serviço indisponível. NFC desligado. Ligar NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Partilhar via NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Falha ao partilhar etiqueta"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Toque suavemente com o telefone no outro para partilhar"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Erro de transferência"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Etiqueta partilhada"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "A política de segurança restringe a utilização de %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partilhado"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Impossível partilhar"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Item predefinido"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Pode transmitir itens predefinidos para outro dispositivo NFC. Basta aproximar os dispositivos um do outro (de modo típico, costas com costas), com estes no ecrã principal"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Quando o NFC está ligado, pode enviar ou receber dados quando o seu dispositivo toca noutros dispositivos com capacidade NFC ou com etiquetas NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Quando esta função está activada, pode transmitir ficheiros para outros dispositivos NFC e Wi-Fi Direct segurando os dispositivos próximo um do outro. Por exemplo, pode transmitir ficheiros de imagem/vídeo da Galeria, ficheiros de música do Leitor de música e muito mais. Basta aproximar os dispositivos (de modo típico, costas com costas) e em seguida toque no seu ecrã. A aplicação determina o que é transmitido"
 
diff --git a/ug-nfc-share-efl/po/ro.po b/ug-nfc-share-efl/po/ro.po
index e7336b9..915d4e4 100644
--- a/ug-nfc-share-efl/po/ro.po
+++ b/ug-nfc-share-efl/po/ro.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Pentru anularea partajării, atingeţi Anulare"
 
@@ -7,15 +10,33 @@ msgstr "Serviciul nu este disponibil. NFC este oprit. Porniţi NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Partajare prin NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Partajarea etichetei nu a reuşit"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Atingeţi uşor telefoanele pentru a partaja"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Transfer nereuşit"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Etichetă partajată"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Politica de securitate restricţionează utilizarea %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Partajat"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Imposibil de partajat"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Element predefinit"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Puteţi transfera elemente predefinite pe un alt dispozitiv NFC. Doar apropiaţi dispozitivele (de obicei spate în spate) când este deschis ecranul de pornire"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Când NFC este activată, puteţi trimite sau primi date când dispozitivul atinge alte dispozitive compatibile cu NFC sau etichete NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Când această caracteristică este activată, puteţi transmite fişierele către alte dispozitive NFC şi Wi-Fi Direct, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi fişiere de imagini/video din Galerie, fişiere muzicale din playerul muzical şi multe altele. Nu trebuie decât să apropiaţi cele două dispozitive (de obicei, aşezându-le unul în spatele celuilalt) şi să atingeţi ecranul. Aplicaţia determină apoi ce poate fi transmis"
 
diff --git a/ug-nfc-share-efl/po/ru_RU.po b/ug-nfc-share-efl/po/ru_RU.po
index 04f420d..2f530dd 100755..100644
--- a/ug-nfc-share-efl/po/ru_RU.po
+++ b/ug-nfc-share-efl/po/ru_RU.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Чтобы не предоставлять доступ, нажмите Отмена"
 
@@ -7,15 +10,33 @@ msgstr "Служба недоступна. Связь NFC выключена. В
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Отправить через NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Не удалось отправить метку"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Прикоснитесь одним телефоном к другому для отправки"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Сбой передачи"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Метка отправлена"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Политика безопасности ограничивает использование компонента %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Общедоступное"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Невозможно предоставить общий доступ"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Заданный элемент"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Можно передавать предварительно заданные элементы на другое NFC-устройство. Просто откройте на устройствах главный экран и поднесите их друг к другу (обычно задними сторонами)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Если протокол NFC включен, можно отправлять и получать данные, прикоснувшись устройством к другому устройству, поддерживающему NFC, или метке NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Если эта функция включена, можно передавать файлы на другое устройство, поддерживающее NFC и Wi-Fi Direct, поднося устройства близко друг к другу. Например, можно отправлять файлы изображений и видео из галереи, музыкальные файлы из приложения Музыка и т. д. Просто поднесите устройства друг к другу (обычно задними сторонами) и нажмите на экран. Приложение определит, какие данные нужно передать"
 
diff --git a/ug-nfc-share-efl/po/sk.po b/ug-nfc-share-efl/po/sk.po
index 62b29c1..70afed5 100644
--- a/ug-nfc-share-efl/po/sk.po
+++ b/ug-nfc-share-efl/po/sk.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Ak chcete zrušiť zdieľanie, ťuknite na tlačidlo Zrušiť"
 
@@ -7,15 +10,33 @@ msgstr "Služba nie je k dispozícii. Funkcia NFC je vypnutá. Zapnúť funkciu
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Zdieľať cez NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Nepodarilo sa zdieľať značku"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Jemným dotykom telefónov spustíte zdieľanie"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Chyba prenosu"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Značka sa zdieľa"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Politika zabezpečenia obmedzuje použitie %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Zdieľané"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nedá sa zdieľať"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Preddefinovaná položka"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Môžete vysielať preddefinované položky do iného zariadenia NFC. Stačí dať zariadenia blízko k sebe (obvykle tesne vedľa seba) pri aktívnej domovskej obrazovke"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Keď je zapnutá funkcia NFC, môžete odosielať alebo prijímať údaje, keď sa zariadenie dotýka iných zariadení podporujúcich funkciu NFC alebo značiek NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Keď je táto funkcia zapnutá, môžete vysielať súbory do iných zariadení NFC alebo Wi-Fi Direct podržaním zariadení blízko seba. Môžete napríklad vyslať súbory s obrázkami/videami z Galérie, hudobné súbory z Prehrávača hudby a podobne. Stačí dať zariadenia k sebe (obvykle tesne vedľa seba) a potom ťuknúť na obrazovku. Aplikácia určí, čo sa vyšle"
 
diff --git a/ug-nfc-share-efl/po/sl.po b/ug-nfc-share-efl/po/sl.po
index 67d11f2..2025f5d 100644
--- a/ug-nfc-share-efl/po/sl.po
+++ b/ug-nfc-share-efl/po/sl.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Če želite preklicati skupno rabo, pritisnite Prekliči"
 
@@ -7,15 +10,33 @@ msgstr "Storitev ni na voljo. NFC je izklopljen. Želite vklopiti NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Skupna raba prek NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Skupna raba oznake ni uspela"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Za skupno rabo se s telefonom rahlo dotaknite drugega telefona"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Prenos ni uspel"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Oznaka je v skupni rabi"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Varnostni pravilnik omejuje uporabo programa %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Dosegljivo drugim"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Souporaba ni mogoča"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Vnaprej določen element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Vnaprej določene elemente lahko prenesete v drugo napravo NFC. Ko ste na domačem zaslonu, samo pomaknite naprave skupaj (običajno s hrbtnima stranema)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Če je NFC vklopljen, lahko pošiljate ali prejemate podatke, ko se vaša naprava dotakne drugih naprav, ki podpirajo NFC ali oznake NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Ko je ta funkcija vklopljena, lahko datoteke prenesete v druge naprave, ki omogočajo NFC in Wi-Fi Direct, tako da naprave držite blizu skupaj. Prenesete lahko na primer slikovne/video datoteke iz Galerije, glasbene datoteke iz predvajalnika glasbe in drugo. Samo pomaknite naprave skupaj (običajno s hrbtnima stranema) in pritisnite na zaslon. Program določi, kaj se bo preneslo"
 
diff --git a/ug-nfc-share-efl/po/sr.po b/ug-nfc-share-efl/po/sr.po
index b6a5b11..0471277 100644
--- a/ug-nfc-share-efl/po/sr.po
+++ b/ug-nfc-share-efl/po/sr.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Da bi otkazao deljenje, kucni Otkaži"
 
@@ -7,15 +10,33 @@ msgstr "Usluga nije dostupna. NFC je isključen. Uključiti NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Podeli putem NFC-a"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Deljenje oznake nije uspelo"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Nežno dodirni telefon o telefon za deljenje"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Prenos neuspešan"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Oznaka je podeljena"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Politika bezbednosti ograničava upotrebu %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Deljeno"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Nemoguće podeliti"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Već definisana stavka"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Već definisane stavke možeš da primaš na drugom NFC uređaju. Samo približi uređaje (obično leđa uz leđa) dok su na početnom ekranu"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Kada je NFC uključen, možeš da šalješ ili primaš podatke tokom kontakta tvog uređaja sa drugim uređajima koji mogu da koriste NFC funkciju ili NFC oznake"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Kada je ova funkcija uključena, možeš emitovati fajlove na drugim NFC i Wi-Fi Direct uređajima držeći jedan uređaj blizu drugog. Na primer, možeš emitovati slike/video fajlove iz galerije, muzičke fajlove iz muzičkog plejera i još mnogo toga. Jednostavno približi uređaje (obično leđa u leđa), a zatim kucni na ekran. Aplikacija određuje šta će se emitovati"
 
diff --git a/ug-nfc-share-efl/po/sv.po b/ug-nfc-share-efl/po/sv.po
index 3a6af42..e346cb3 100644
--- a/ug-nfc-share-efl/po/sv.po
+++ b/ug-nfc-share-efl/po/sv.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Tryck på Avbryt om du vill avbryta delning"
 
@@ -7,15 +10,33 @@ msgstr "Tjänsten är inte tillgänglig. NFC är avstängt. Slå på NFC?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Dela via NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Det gick inte att dela tagg"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Sammanför försiktigt telefonerna för att dela"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Överföringsfel"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Taggen har delats"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Säkerhetspolicyn begränsar användningen av %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Delad"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Det går inte att dela"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Fördefinierat objekt"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Du kan överföra fördefinierade objekt till en annan NFC-enhet. Placera enheterna bredvid varandra (normalt med baksidorna mot varandra) när hemskärmen är öppen"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "När NFC är på kan du skicka och ta emot data när din enhet rör andra enheter med NFC-funktioner eller NFC-taggar"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "När den här funktionen är påslagen kan du överföra filer till en annan NFC- och Wi-Fi Direct-kompatibel enhet genom att placera enheterna nära varandra. Du kan till exempel överföra bilder från galleriet eller musikfiler från musikspelaren. Placera enheterna bredvid varandra (normalt med baksidorna mot varandra) och tryck på din skärm. Programmet bestämmer vad som överförs"
 
diff --git a/ug-nfc-share-efl/po/th.po b/ug-nfc-share-efl/po/th.po
deleted file mode 100644
index 52f9e14..0000000
--- a/ug-nfc-share-efl/po/th.po
+++ /dev/null
@@ -1,21 +0,0 @@
-msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
-msgstr "เมื่อต้องการยกเลิกการแชร์ ให้สัมผัส ยกเลิก"
-
-msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
-msgstr "บริการไม่พร้อมใช้งาน NFC ปิด เปิด NFC?"
-
-msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
-msgstr "แชร์ผ่าน NFC"
-
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "แชร์แท็กไม่ได้"
-
-msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
-msgstr "ค่อยๆ สัมผัสโทรศัพท์พร้อมกันเพื่อแชร์"
-
-msgid "IDS_NFC_POP_TRANSFER_FAILED"
-msgstr "โอนสายผิดพลาด"
-
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "แชร์แท็กแล้ว"
-
diff --git a/ug-nfc-share-efl/po/tr_TR.po b/ug-nfc-share-efl/po/tr_TR.po
index 513aa38..07503cc 100755..100644
--- a/ug-nfc-share-efl/po/tr_TR.po
+++ b/ug-nfc-share-efl/po/tr_TR.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "Paylaşmayı iptal etmek için, İptal'e basın"
 
@@ -7,15 +10,33 @@ msgstr "Servis kullanılamıyor. NFC kapatıldı. NFC açılsın mı?"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "NFC ile paylaş"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Etiket paylaşılamadı"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Paylaşmak için hafifçe telefonları birbirine dokundurun."
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Transfer başarısız"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Etiket paylaşıldı"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Güvenlik ilkesi %s kullanımını kısıtlıyor"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Paylaşılıyor"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Paylaşılamıyor"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Ön tanımlı öğe"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Ön tanımı öğeleri bir başka NFC cihazına yayınlayabilirsiniz. Yalnızca cihazları ana ekrandayken cihazları birbirine yaklaştırın (tipik olarak arka kısımlarını)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC açıkken, cihazınız diğer NFC özellikli cihazlara veya NFC etiketlerine dokunduğunda, veri gönderebilir veya alabilirsiniz"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Bu özellik açıldığında, cihazları birbirine yakın tutarak, dosyaları bir başka NFC ve Wi-Fi Direct cihazlarına yayınlayabilirsiniz. Örneğin; Galeriden resim/video dosyalarını, Müzik Çalar'dan müzik dosyalarını ve dahasını yayınlayabilirsiniz. Yalnızca cihazları yan yana getirip (normalde sırt sırta) ekranınıza dokunmanız yeter. Uygulama yayınlanacak olanları belirler"
 
diff --git a/ug-nfc-share-efl/po/uk.po b/ug-nfc-share-efl/po/uk.po
index f4b1a6d..5cd38b3 100644
--- a/ug-nfc-share-efl/po/uk.po
+++ b/ug-nfc-share-efl/po/uk.po
@@ -1,5 +1,8 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
-msgstr "Щоб скасувати спільний доступ, натисніть "Скасувати""
+msgstr "Щоб скасувати спільний доступ, натисніть Скасувати"
 
 msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
 msgstr "Служба недоступна. NFC вимкнено. Увімкнути NFC?"
@@ -7,15 +10,33 @@ msgstr "Служба недоступна. NFC вимкнено. Увімкну�
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "Спільний доступ через NFC"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Не вдалося відкрити спільний доступ до тегу"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "Для надання спільного доступу обережно прикладіть телефони один до одного"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "Збій передачі"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Надано спільний доступ до тегу"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Використання %s обмежено політикою безпеки"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Загальний доступ"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Неможливо відкрити спільний доступ"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Стандартний об’єкт"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Стандартні об'єкти можна передавати на інший пристрій із підтримкою NFC. Просто покладіть пристрої один поряд з одним (зазвичай має бути суміщено задні панелі) під час перебування на головному екрані"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "Якщо NFC ввімкнено, можна надсилати або отримувати дані у разі зв'язку пристрою з іншими пристроями із підтримкою NFC або тегами NFC"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "У разі ввімкнення цієї функції файли можна передавати на інші пристрої з підтримкою NFC та Wi-Fi Direct, утримуючи пристрої один поряд з одним. Наприклад, можна передати файли зображень або відео з галереї, музичні файли з музичного плеєра тощо. Просто прикладіть пристрої один до одного (зазвичай має бути суміщено задні панелі), а потім торкніться екрана. Програма визначить дані для передачі"
 
diff --git a/ug-nfc-share-efl/po/update-po.sh b/ug-nfc-share-efl/po/update-po.sh
index f23c1fa..f23c1fa 100755..100644
--- a/ug-nfc-share-efl/po/update-po.sh
+++ b/ug-nfc-share-efl/po/update-po.sh
diff --git a/ug-nfc-share-efl/po/uz.po b/ug-nfc-share-efl/po/uz.po
new file mode 100644
index 0000000..85bf759
--- /dev/null
+++ b/ug-nfc-share-efl/po/uz.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "Ulashishni bekor qilish uchun, Bekor qilishni cherting"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "Xizmatdan foydalanib bo‘lmaydi. NFC o‘chirilgan. NFC yoqilsinmi?"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "NFC orqali ulashish"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "Ulashish uchun telefonlarni ehtiyotkorlik bilan birgalikda ushlang"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "Uzatish bajarilmadi"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "Xavfsizlik siyosati %sdan foydalanishni cheklaydi"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "Umumiy"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "Umumiy foydalanib bo‘lmaydi"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "Old/tayinlangan element"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "Oldindan tayinlangan elementlarni boshqa NFC qurilmasiga uzatishingiz mumkin. Asosiy ekranda bo‘lganingizda, qurilmalarni bir-biriga yaqin keltiring (odatda orqasini-orqasiga qilib)"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "NFC yoqilganda, qurilmangiz boshqa NFC-imkoniyatiga ega qurilma yoki NFC teglariga tekkanda, ma’lumotni olishingiz yoki yuborishingiz mumkin"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "Ushbu xususiyat yoqilganda, fayllarni boshqa NFC va Wi-Fi Direct qurilmalariga, qurilmalarni birlashtirish orqali, uzatishingiz mumkin. Misol uchun, Siz tasvir/video fayllarni Galereyadan, musiqa fayllarini esa Musiqa pleyeridan uzatishingiz mumkin. Qurilmalarni bir-biriga yaqin keltiring (orqasini orqasiga) va undan so‘ng ekranni cherting. Ilova nimalar uzatilganligini aniqlaydi"
+
diff --git a/ug-nfc-share-efl/po/vi.po b/ug-nfc-share-efl/po/vi.po
deleted file mode 100644
index d4ae503..0000000
--- a/ug-nfc-share-efl/po/vi.po
+++ /dev/null
@@ -1,21 +0,0 @@
-msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
-msgstr "Để hủy chia sẻ, chạm Hủy"
-
-msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
-msgstr "Không có dịch vụ. Đã tắt NFC. Bật NFC?"
-
-msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
-msgstr "Chia sẻ qua NFC"
-
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "Không thể chia sẻ thẻ"
-
-msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
-msgstr "Chạm nhẹ giữa các điện thoại để chia sẻ"
-
-msgid "IDS_NFC_POP_TRANSFER_FAILED"
-msgstr "Không chuyển được"
-
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "Thẻ chia sẻ"
-
diff --git a/ug-nfc-share-efl/po/zh_CN.po b/ug-nfc-share-efl/po/zh_CN.po
index 8429081..c007b8d 100755..100644
--- a/ug-nfc-share-efl/po/zh_CN.po
+++ b/ug-nfc-share-efl/po/zh_CN.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "若要取消共享，点击取消"
 
@@ -7,15 +10,33 @@ msgstr "服务不可用。NFC 已关闭。是否开启 NFC？"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "通过 NFC 共享"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "共享标签失败"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "轻轻地将手机触碰在一起以共享"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "转换失败"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "标签已共享"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "安全政策限制 %s 的使用"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "已分享"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "无法共享"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "预定项目"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "您可将预定项目传输至另一 NFC 设备。只需在主屏下将设备靠在一起（通常背对背）"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "当 NFC 开始时，您可在您的设备接触其他支持 NFC 的设备或 NFC 标签时发送或接收数据"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "当该特性开启时，您可通过将设备紧靠在一起将文件无线传输至其他 NFC 和 Wi-Fi直连设备。例如，您可无线传输来自图库的图片/视频文件、来自音乐播放器的音乐文件，以及更多。只需要将设备放在一起（通常背对背）然后轻敲您的屏幕。应用程序判定无线传输的内容"
 
diff --git a/ug-nfc-share-efl/po/zh_HK.po b/ug-nfc-share-efl/po/zh_HK.po
index aca1fbc..7b69f57 100755..100644
--- a/ug-nfc-share-efl/po/zh_HK.po
+++ b/ug-nfc-share-efl/po/zh_HK.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "如要取消分享，輕觸取消"
 
@@ -7,15 +10,33 @@ msgstr "服務不可用。NFC 已關閉。開啟 NFC 嗎？"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "透過 NFC 分享"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "分享標籤失敗"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "輕輕地將手機碰觸在一起以分享"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "傳送失敗"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "已分享標籤"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "安全政策限制使用 %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "已共享"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "無法分享"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "預定義項目"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "您可將預定義項目發送至其他 NFC 裝置。只需在處於主螢幕時，將裝置靠在一起（一般以背對背）"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "當 NFC 開啟時，若您的裝置觸碰其他具備 NFC 功能的裝置或 NFC 標籤時，即可發送或接收數據"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "當此功能開啟時，通過將裝置握住靠在一起時，可發送檔案至其他 NFC 和 Wi-Fi Direct 裝置。例如，您可從媒體瀏覽器發送圖像／影片檔案、從音樂播放器發送音樂檔案等。只需將裝置靠在一起（一般以背對背）然後輕觸螢幕。應用程式將決定發送的檔案"
 
diff --git a/ug-nfc-share-efl/po/zh_SG.po b/ug-nfc-share-efl/po/zh_SG.po
new file mode 100644
index 0000000..0e18c7d
--- /dev/null
+++ b/ug-nfc-share-efl/po/zh_SG.po
@@ -0,0 +1,42 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
+msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
+msgstr "若要取消共享，轻敲取消"
+
+msgid "IDS_NFC_POP_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q"
+msgstr "服务不可用。NFC 已关闭。是否开启 NFC？"
+
+msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
+msgstr "通过 NFC 共享"
+
+msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
+msgstr "轻轻地将手机触碰在一起以共享"
+
+msgid "IDS_NFC_POP_TRANSFER_FAILED"
+msgstr "转接失败"
+
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "安全政策限制 %s 的使用"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "已分享"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "无法共享"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "预定项目"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "您可将预定项目传输至另一 NFC 设备。只需在主屏下将设备靠在一起（通常背对背）"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "当 NFC 开始时，您可在您的设备接触其他支持 NFC 的设备或 NFC 标签时发送或接收数据"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "当该特性开启时，您可通过将设备紧靠在一起将文件无线传输至其他 NFC 和 直接WLAN 设备。例如，您可无线传输来自图库的图片/视频文件、来自音乐播放器的音乐文件，以及更多。只需要将设备放在一起（通常背对背）然后轻敲您的屏幕。应用程序判定无线传输的内容"
+
diff --git a/ug-nfc-share-efl/po/zh_TW.po b/ug-nfc-share-efl/po/zh_TW.po
index 91a701a..98af7da 100755..100644
--- a/ug-nfc-share-efl/po/zh_TW.po
+++ b/ug-nfc-share-efl/po/zh_TW.po
@@ -1,3 +1,6 @@
+msgid "IDS_NFC_BODY_NFC"
+msgstr "NFC"
+
 msgid "IDS_NFC_BODY_TO_CANCEL_SHARING_TAP_CANCEL"
 msgstr "若要取消分享，輕觸取消"
 
@@ -7,15 +10,33 @@ msgstr "服務無法使用。NFC 已關閉。開啟 NFC 嗎？"
 msgid "IDS_NFC_HEADER_SHARE_VIA_NFC"
 msgstr "透過 NFC 分享"
 
-msgid "IDS_NFC_POP_FAILED_TO_SHARE_TAG"
-msgstr "分享標籤失敗"
-
 msgid "IDS_NFC_BODY_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE"
 msgstr "將手機輕輕碰觸在一起以共享"
 
 msgid "IDS_NFC_POP_TRANSFER_FAILED"
 msgstr "傳輸失敗"
 
-msgid "IDS_NFC_POP_TAG_SHARED"
-msgstr "標籤已分享"
+msgid "IDS_NFC_OPT_S_BEAM"
+msgstr "S Beam"
+
+msgid "IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS"
+msgstr "安全政策限制使用 %s"
+
+msgid "IDS_COM_OPT_SHARED"
+msgstr "共享"
+
+msgid "IDS_COM_BODY_UNABLE_TO_SHARE"
+msgstr "無法分享"
+
+msgid "IDS_NFC_BODY_PREDEFINED_ITEM_ABB"
+msgstr "預定義項目"
+
+msgid "IDS_NFC_BODY_YOU_CAN_BEAM_PREDEFINED_ITEMS_TO_ANOTHER_NFC_DEVICE_JUST_BRING_THE_DEVICES_CLOSE_TOGETHER_MSG"
+msgstr "您可將預定義項目傳送至其他 NFC 裝置。只需在處於主螢幕時，將裝置靠在一起（一般以背對背）"
+
+msgid "IDS_NFC_BODY_WHEN_NFC_IS_ON_YOU_CAN_SEND_OR_RECEIVE_DATA_WHEN_YOUR_DEVICE_TOUCHES_OTHER_NFC_CAPABLE_DEVICES_OR_NFC_TAGS"
+msgstr "開啟 NFC 時，若您的裝置觸碰其他具備 NFC 功能的裝置或 NFC 標籤，即可傳送或接收資料"
+
+msgid "IDS_NFC_BODY_WHEN_THIS_FEATURE_IS_TURNED_ON_YOU_CAN_BEAM_FILES_TO_OTHER_NFC_AND_WI_FI_DIRECT_DEVICES_BY_HOLDING_THE_DEVICES_CLOSE_TOGETHER_HELP_MSG"
+msgstr "開啟此功能時，將裝置握住靠在一起時，可發送檔案至其他 NFC 與 Wi-Fi Direct 裝置。例如，您可自媒體瀏覽器發送影像／影片檔案、自音樂播放器發送音樂檔案等。只需將裝置靠在一起（一般以背對背）然後輕觸螢幕。應用程式將決定發送的檔案"
 
diff --git a/ug-nfc-share-efl/src/ug-nfc-share-main.c b/ug-nfc-share-efl/src/ug-nfc-share-main.c
index 5db072b..22a3744 100644
--- a/ug-nfc-share-efl/src/ug-nfc-share-main.c
+++ b/ug-nfc-share-efl/src/ug-nfc-share-main.c
@@ -37,9 +37,7 @@
 #endif
 
 /* nfc_handover */
-#define NET_NFC_SHARE_SEPERATOR "?"
 #define NET_NFC_SHARE_REQUEST_TYPE_BUFFER "data_buffer"
-#define NET_NFC_SHARE_REQUEST_TYPE_PATH "file_path"
 
 #define DISPLAY_STRING_MAX_SIZE		90
 #define ABBREVIATION_TEXT			"..."
@@ -193,47 +191,6 @@ const char *_get_font_style(int font)
 	return style;
 }
 
-bool _get_label_text(int font, const char *text, int align, char *output, int len)
-{
-	bool result = false;
-	char *align_begin = NULL;
-	char *align_end = NULL;
-
-	if (text == NULL)
-		return result;
-
-	switch (align)
-	{
-	case UG_ALIGN_CENTER :
-		align_begin = "<align=center>";
-		align_end = "</align>";
-		break;
-
-	case UG_ALIGN_RIGHT :
-		align_begin = "<align=right>";
-		align_end = "</align>";
-		break;
-
-	case UG_ALIGN_LEFT :
-		default :
-		align_begin = "";
-		align_end = "";
-		break;
-	}
-
-	/* TODO : will be improved */
-	if (_get_font_style(font) != NULL)
-	{
-		snprintf(output, len, "%s<font_size=%d><color=#%06X><b>%s</b></color></font_size>%s", align_begin, _get_font_size(font), _get_font_color(font), text, align_end);
-	}
-	else
-	{
-		snprintf(output, len, "%s<font_size=%d><color=#%06X>%s</color></font_size>%s", align_begin, _get_font_size(font), _get_font_color(font), text, align_end);
-	}
-
-	return result;
-}
-
 void _get_image_path(const char *image, char *path, int len)
 {
 	const char *prefix = NULL;
@@ -304,88 +261,6 @@ static Evas_Object *_create_image(Evas_Object *parent, const char *file_path, co
 	return image;
 }
 
-#if 0
-static Evas_Object *_create_label(Evas_Object *parent, const char *text, const char *swallow, void *data)
-{
-	Evas_Object *label;
-
-	retv_if(parent == NULL, NULL);
-
-	label = elm_label_add(parent);
-	elm_object_part_content_set(parent, swallow, label);
-	elm_object_text_set(label, text);
-
-	return label;
-}
-
-static Evas_Object *_create_box(Evas_Object *parent, bool is_hori)
-{
-	Evas_Object *box;
-
-	retv_if(parent == NULL, NULL);
-
-	box = elm_box_add(parent);
-	evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	evas_object_show(box);
-
-	return box;
-}
-
-static Evas_Object *_create_scroller(Evas_Object *parent)
-{
-	Evas_Object *scroller;
-
-	retv_if(parent == NULL, NULL);
-
-	scroller = elm_scroller_add(parent);
-
-	elm_scroller_bounce_set(scroller, EINA_FALSE, EINA_FALSE);
-	elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
-	evas_object_show(scroller);
-	elm_object_part_content_set(parent, "elm.swallow.content", scroller);
-
-	return scroller;
-}
-
-static Evas_Object *_create_layout(Evas_Object *parent, const char *clas, const char *group, const char *style, bool signal)
-{
-	Evas_Object *ly;
-
-	retv_if(parent == NULL, NULL);
-
-	ly = elm_layout_add(parent);
-
-	elm_layout_theme_set(ly, clas, group, style);
-	evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, 0.0);
-	evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, 0.0);
-
-	evas_object_show(ly);
-
-	return ly;
-}
-
-static Evas_Object* _create_win_for_popup(Evas_Object * parent)
-{
-	Evas_Object *eo;
-	int w, h;
-
-	eo = elm_win_add(parent, "NFCShareSubWindow", ELM_WIN_BASIC);
-	if (eo)
-	{
-		elm_win_title_set(eo, "NFCShareSubWindow");
-		elm_win_borderless_set(eo, EINA_TRUE);
-		elm_win_alpha_set(eo, EINA_TRUE);
-		evas_object_smart_callback_add(eo, "delete,request", _win_del, NULL);
-		ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
-		evas_object_resize(eo, w, h);
-		elm_win_indicator_mode_set(eo, EINA_TRUE);
-	}
-
-	return eo;
-}
-#endif
-
 static Evas_Object *_create_bg(Evas_Object *win)
 {
 	Evas_Object *bg = elm_bg_add(win);
@@ -417,13 +292,6 @@ static Evas_Object *_create_main_layout(Evas_Object* parent)
 	return layout;
 }
 
-static void _win_del(void *data, Evas_Object *obj, void *event_info)
-{
-	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
-
-	LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
-}
-
 static void _mdm_restricted_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	ugdata_t *ug_data = (ugdata_t *)data;
@@ -440,10 +308,12 @@ static Eina_Bool _mdm_restricted_popup(void *data)
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
 	char popup_str[POPUP_TEXT_SIZE] = { 0, };
+	char *buf = NULL;
 	ugdata_t *ug_data = (ugdata_t *)data;
 	retv_if(ug_data == NULL, ECORE_CALLBACK_CANCEL);
 
-	snprintf(popup_str, POPUP_TEXT_SIZE, IDS_SECURITY_POLICY_RESTRICTS_USE_OF_PS, IDS_NFC_NFC);
+	buf = strdup(IDS_SECURITY_POLICY_RESTRICTS_USE_OF_PS);
+	snprintf(popup_str, POPUP_TEXT_SIZE, buf, IDS_NFC_NFC);
 	ug_nfc_share_create_popup(ug_data, ug_data->base_layout, popup_str, NULL, 0, NULL, 0, NULL, 0, true, true, _mdm_restricted_popup_response_cb);
 
 	LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
@@ -480,8 +350,12 @@ static void _setting_on_YesNo_popup_response_cb(void *data, Evas_Object *obj, vo
 		/* setting is on */
 		LOGD("setting is on >>>>", __FUNCTION__, __LINE__);
 
-		result = nfc_manager_set_activation(TRUE, _activation_completed_cb, ug_data);
-
+		result = nfc_manager_set_activation(true, _activation_completed_cb, ug_data);
+		if (result == NFC_ERROR_SECURITY_RESTRICTED)
+		{
+			LOGD("mdmPopup_timer START ");
+			mdmPopup_timer = ecore_timer_add(0.25, _mdm_restricted_popup, ug_data);
+		}
 		break;
 
 	case UG_NFC_POPUP_RESP_CANCEL :
@@ -571,8 +445,6 @@ static Evas_Object *ug_nfc_share_create_layout(void *data)
 
 	Evas_Object *layout = NULL;
 	Evas_Object *cancel_btn = NULL;
-	nfc_ndef_message_h msg = NULL;
-	ug_nfc_share_tag_type type = UG_NFC_SHARE_TAG_MAX;
 	int width, height;
 
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
@@ -581,9 +453,9 @@ static Evas_Object *ug_nfc_share_create_layout(void *data)
 	LOGD("width[%d] / height[%d]\n", width, height);
 
 	/* create base layout */
-	layout = elm_layout_add(ug_data->base_naviframe);
+	layout = elm_layout_add(ug_data->base_layout);
 	retv_if(layout == NULL, NULL);
-	elm_layout_file_set(layout, EDJ_FILE, "share_via_nfc");
+
 	if (width == 480) // WVGA
 	{
 		elm_layout_file_set(layout, EDJ_FILE, "share_via_nfc_wvga");
@@ -596,43 +468,26 @@ static Evas_Object *ug_nfc_share_create_layout(void *data)
 	evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
 	evas_object_show(layout);
 
-	/* get data */
-	msg = ug_nfc_share_get_current_ndef(ug_data);
-	type = ug_nfc_share_get_tag_type();
-
-	char path[1024] = { 0, };
-	Evas_Object *label = NULL;
-
-	_get_label_text(UG_FONT_HELP, IDS_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE, UG_ALIGN_LEFT, path, sizeof(path));
-	label = elm_label_add(layout);
-	elm_object_part_content_set(layout, "label_name", label);
-	elm_label_line_wrap_set(label, ELM_WRAP_WORD);
-	elm_object_text_set(label, path);
+	/* create message label */
+	edje_object_part_text_set(elm_layout_edje_get(layout), "title", IDS_GENTLY_TOUCH_PHONES_TOGETHER_TO_SHARE);
 
 	/* create image */
 	Evas_Object *image = NULL;
+	char path[1024] = { 0, };
 	if (width == 480) // WVGA
 	{
-		_get_image_path("U05_popup_Share_help.png", path, sizeof(path));
+		_get_image_path("U05_AfterSelect_Share_help_popup.png", path, sizeof(path));
 	}
 	else // HD
 	{
 		_get_image_path("U05_AfterSelect_Share_help.png", path, sizeof(path));
 	}
-	image = _create_image(layout, path, "touch_image", ug_data);
+	image = _create_image(layout, path, "image", ug_data);
 	retv_if(image == NULL, NULL);
 	evas_object_show(image);
 
-#if 0
-	_get_label_text(UG_FONT_HELP, IDS_TO_CANCEL_SHARING_TAP_CANCEL, UG_ALIGN_LEFT, path, sizeof(path));
-	label = elm_label_add(layout);
-	elm_object_part_content_set(layout, "label_cancel_message", label);
-	elm_label_line_wrap_set(label, ELM_WRAP_WORD);
-	elm_object_text_set(label, path);
-#endif
-
 	/* create cancel button */
-	cancel_btn = _create_button(layout, _back_clicked_cb, IDS_CANCEL, "cancel_button", "style1", ug_data->nfc_share_ug);
+	cancel_btn = _create_button(layout, _back_clicked_cb, IDS_CANCEL, "cancel_btn", "style1", ug_data->nfc_share_ug);
 	retv_if(cancel_btn == NULL, NULL);
 	evas_object_show(cancel_btn);
 
@@ -651,29 +506,6 @@ static Evas_Object *ug_nfc_share_create_layout(void *data)
 
 /******************* UI Functions ENDZZZ*************/
 
-static char *_get_file_path_from_uri(char *uri)
-{
-	char *path = NULL;
-
-	if (uri != NULL)
-	{
-		if (strlen(uri) > 8 && strncmp(uri, "file:///", 8) == 0)
-		{
-			path = uri + 7;
-		}
-		else if (strlen(uri) > 6 && strncmp(uri, "file:/", 6) == 0)
-		{
-			path = uri + 5;
-		}
-		else if (uri[0] == '/')
-		{
-			path = uri;
-		}
-	}
-
-	return path;
-}
-
 void ug_nfc_share_create_base_view(void *user_data)
 {
 	ugdata_t* ug_data = (ugdata_t*)user_data;
@@ -696,9 +528,6 @@ void ug_nfc_share_create_nfc_share_view(void *user_data)
 
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-	ug_data->base_naviframe = elm_naviframe_add(ug_data->base_layout);
-	elm_object_part_content_set(ug_data->base_layout, "elm.swallow.content", ug_data->base_naviframe);
-	evas_object_show(ug_data->base_naviframe);
 
 	/* create data */
 	ug_nfc_share_create_data(ug_data);
@@ -712,8 +541,7 @@ void ug_nfc_share_create_nfc_share_view(void *user_data)
 		return;
 	}
 
-	ug_data->base_navi_it = elm_naviframe_item_push(ug_data->base_naviframe, IDS_SHARE_VIA_NFC, NULL, NULL, nfc_share_layout, NULL);
-	elm_object_item_signal_emit(ug_data->base_navi_it, "elm,state,controlbar,close", "");
+	elm_object_part_content_set(ug_data->base_layout, "elm.swallow.content", nfc_share_layout);
 
 	LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
 }
@@ -721,55 +549,32 @@ void ug_nfc_share_create_nfc_share_view(void *user_data)
 bool ug_nfc_share_check_nfc_isAvailable(void *user_data)
 {
 	ugdata_t *ug_data = (ugdata_t *)user_data;
-	int result = EINA_FALSE;
-	int on;
+	int result, on;
 
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-	retv_if(ug_data == NULL, FALSE);
+	retv_if(ug_data == NULL, false);
 
 	/* check if nfc is on */
-	result = vconf_get_bool(VCONFKEY_NFC_STATE, &on);
-	if (!on)
+	if ((result = vconf_get_bool(VCONFKEY_NFC_STATE, &on)) == 0)
 	{
-		/* show nfc on/off popup */
-		_setting_on_YesNo_popup(ug_data);
-		return FALSE;
-	}
-
-	LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
-
-	return TRUE;
-}
-
-/* nfc_handover */
-static int ug_get_share_data_list(char *bundle_txt, char *datalist[], int number_of_files)
-{
-	char *token = NULL;
-	char *param = NULL;
-	int i = 0;
-
-	param = (char *)bundle_txt;
-	while (((token = strstr(param, NET_NFC_SHARE_SEPERATOR)) != NULL) && i < number_of_files)
-	{
-		*token = '\0';
-		datalist[i] = param;
-		LOGD("ug_get_share_data_list [%d] [%s]\n", i, datalist[i]);
-		param = token + 1;
-		i++;
-	}
-	if (i == (number_of_files - 1))
-	{
-		datalist[i] = param;
-		LOGD("data [%d] [%s]\n", i, datalist[i]);
+		LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, on);
+		if (!on)
+		{
+			/* show nfc on/off popup */
+			_setting_on_YesNo_popup(ug_data);
+			return false;
+		}
 	}
 	else
 	{
-		LOGD("Not match : [%d] / [%d]\n", number_of_files, i);
-		return -1;
+		LOGD("[%s(): %d] vconf_get_bool failed\n", __FUNCTION__, __LINE__);
+		return false;
 	}
 
-	return 0;
+	LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+
+	return true;
 }
 
 static void ug_nfc_share_create_data(ugdata_t* ug_data)
@@ -779,86 +584,31 @@ static void ug_nfc_share_create_data(ugdata_t* ug_data)
 
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-	char *key[] = { "count", "request_type", "request_data" };
-
-	char *count = (char *)bundle_get_val(bd, key[0]);
-	char *request_data = (char *)bundle_get_val(bd, key[2]);
-	int number_of_data = 0;
-
 	int result = UG_NFC_SHARE_ERROR;
 	nfc_ndef_message_h msg = NULL;
+	char *request_data = (char *)bundle_get_val(bd, "request_data");
 
-	type = ug_nfc_share_get_tag_type();
-	number_of_data = atoi(count);
-
-	LOGD("count : %s, request_data : %s request_data strlen %d\n", GET_SAFE_STRING(count), GET_SAFE_STRING(request_data), strlen(request_data));
 
-	if (request_data == NULL || strlen(request_data) == 0 || number_of_data < 1)
+	if (request_data == NULL)
 	{
 		LOGD("request_data IS NULL\n");
 		/* exit */
 		return;
 	}
 
-	switch (type)
-	{
-	case UG_NFC_SHARE_TAG_FILE :
-		{
-			char *pathlist[number_of_data];
-			char *request_data_temp = NULL;
-
-			LOGD("file path for NFC P2P : request_data [%s]\n", request_data);
+	LOGD("request_data : %s request_data strlen %d\n", GET_SAFE_STRING(request_data), strlen(request_data));
 
-			UG_NFC_SHARE_MEM_STRDUP(request_data_temp, request_data);
-
-			ug_get_share_data_list(request_data_temp, pathlist, number_of_data);
-
-			/* nfc_handover required to seperator depends on AC later*/
-			result = ug_nfc_share_make_ndef_message_from_multi_file(&msg, (const char **)pathlist, number_of_data);
-			if (result != UG_NFC_SHARE_OK)
-			{
-				LOGD("ug_nfc_share_make_ndef_message_from_file failed (%d)\n", result);
-			}
-
-			UG_NFC_SHARE_MEM_FREE(request_data_temp);
-		}
-		break;
-
-	case UG_NFC_SHARE_TAG_HANDOVER :
-		{
-			nfc_ndef_record_h record = NULL;
-
-			LOGD("file path for AC : [%s]\n", request_data);
-
-			/* create record */
-			result = nfc_ndef_record_create_mime(&record, "file", (uint8_t *)request_data, strlen(request_data));
-			if (result != NFC_ERROR_NONE)
-			{
-				LOGD("nfc_ndef_record_create failed (%d)\n", result);
-				return;
-			}
-
-			/* create ndef msg*/
-			result = nfc_ndef_message_create(&msg);
-			if (result != NFC_ERROR_NONE)
-			{
-				LOGD("nfc_ndef_message_create failed (%d)\n", result);
-				nfc_ndef_record_destroy(record);
-				return;
-			}
+	if (strlen(request_data) == 0)
+	{
+		LOGD("bundle data is wrong \n");
+		/* exit */
+		return;
+	}
 
-			/* append record to ndef msg */
-			result = nfc_ndef_message_append_record(msg, record);
-			if (result != NFC_ERROR_NONE)
-			{
-				LOGD("nfc_ndef_message_create failed (%d)\n", result);
-				nfc_ndef_message_destroy(msg);
-				nfc_ndef_record_destroy(record);
-				return;
-			}
-		}
-		break;
+	type = ug_nfc_share_get_tag_type();
 
+	switch (type)
+	{
 	case UG_NFC_SHARE_TAG_URL :
 		{
 			/* nfc_handover now no user case of multi recored for buffered string*/
@@ -939,83 +689,37 @@ static void ug_nfc_share_create_data(ugdata_t* ug_data)
 	if (result != UG_NFC_SHARE_OK)
 	{
 		LOGD("ug_nfc_share_set_current_ndef failed (%d)\n", result);
+		nfc_ndef_message_destroy(msg);
 	}
 
 	LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
 }
 
-static void ug_nfc_share_set_tag_type_from_bundle(bundle *bd)
+static bool ug_nfc_share_parse_bundle(bundle *bd)
 {
-	int count = 0;
-
-	char *temp_count = (char *)bundle_get_val(bd, "count");
 	char *request_type = (char *)bundle_get_val(bd, "request_type");
 	char *request_data = (char *)bundle_get_val(bd, "request_data");
 
 	LOGD("[%s(): %d] BEGIN >>>>", __FUNCTION__, __LINE__);
 
-	count = atoi(temp_count);
+	if (request_type == NULL || request_data == NULL)
+	{
+		LOGD("request_data or request_data IS NULL\n");
+		/* exit */
+		return false;
+	}
 
-	LOGD("count : %d, request_type : %s, request_data : %s request_data strlen %d\n", count,
-			GET_SAFE_STRING(request_type), GET_SAFE_STRING(request_data), strlen(request_data));
+	LOGD("request_type : %s, request_data : %s request_data strlen %d\n", GET_SAFE_STRING(request_type), GET_SAFE_STRING(request_data), strlen(request_data));
 
-	if (request_data == NULL || strlen(request_data) == 0 || count < 1)
+	if (strlen(request_data) == 0)
 	{
-		LOGD("request_data IS NULL\n");
+		LOGD("bundle data is wrong \n");
 		/* exit */
-		return;
+		return false;
 	}
 
 	/* process data and store specific space for sharing data */
-	if (strncmp(request_type, NET_NFC_SHARE_REQUEST_TYPE_PATH, strlen(NET_NFC_SHARE_REQUEST_TYPE_PATH)) == 0)
-	{
-		struct stat st;
-		size_t sum_filesize = 0;
-		char *temp_data = NULL;
-		char *token = NULL;
-
-		LOGD("data is file(s)\n");
-
-		UG_NFC_SHARE_MEM_STRDUP(temp_data, request_data);
-		if (temp_data != NULL)
-		{
-			/* get files size */
-			token = strtok(temp_data, NET_NFC_SHARE_SEPERATOR);
-			for (; token != NULL; token = strtok(NULL, NET_NFC_SHARE_SEPERATOR))
-			{
-				LOGD("token [%s]\n", token);
-				if (stat(token, &st) == 0)
-				{
-					sum_filesize += st.st_size;
-				}
-				else
-				{
-					LOGE("file not found : %s", token);
-				}
-			}
-
-			/* set share type */
-			if (sum_filesize < UG_NFC_SHARE_HANDOVER_FILE_SIZE)
-			{
-				LOGD("file path for NFC P2P : request_data [%s]\n", request_data);
-
-				ug_nfc_share_set_tag_type(UG_NFC_SHARE_TAG_FILE);
-			}
-			else
-			{
-				LOGD("file path for Handover : [%s]\n", request_data);
-
-				ug_nfc_share_set_tag_type(UG_NFC_SHARE_TAG_HANDOVER);
-			}
-
-			UG_NFC_SHARE_MEM_FREE(temp_data);
-		}
-		else
-		{
-			LOGE("alloc failed");
-		}
-	}
-	else if (strncmp(request_type, NET_NFC_SHARE_REQUEST_TYPE_BUFFER, strlen(NET_NFC_SHARE_REQUEST_TYPE_BUFFER)) == 0)
+	if (strncmp(request_type, NET_NFC_SHARE_REQUEST_TYPE_BUFFER, strlen(NET_NFC_SHARE_REQUEST_TYPE_BUFFER)) == 0)
 	{
 		if ((strncmp(request_data, "http://", strlen("http://")) == 0) || (strncmp(request_data, "https://", strlen("https://")) == 0))
 		{
@@ -1030,8 +734,16 @@ static void ug_nfc_share_set_tag_type_from_bundle(bundle *bd)
 			ug_nfc_share_set_tag_type(UG_NFC_SHARE_TAG_MEMO);
 		}
 	}
+	else
+	{
+		LOGD("request_type is wrong \n");
+
+		return false;
+	}
 
 	LOGD("[%s(): %d] END >>>>", __FUNCTION__, __LINE__);
+
+	return true;
 }
 
 static void *__ug_nfc_share_create(ui_gadget_h ug, enum ug_mode mode, service_h service, void *priv)
@@ -1051,30 +763,25 @@ static void *__ug_nfc_share_create(ui_gadget_h ug, enum ug_mode mode, service_h
 	return NULL;
 #else
 	bundle *bd = NULL;
-	char *temp_count = NULL;
 	char *request_type = NULL;
 	char *request_data = NULL;
-	char *mime_type = NULL;
 
 	bd = bundle_create();
 	if (bd == NULL)
 		return NULL;
 
-	service_get_extra_data(service, "count", &temp_count);
 	service_get_extra_data(service, "request_type", &request_type);
 	service_get_extra_data(service, "request_data", &request_data);
-	service_get_extra_data(service, "mime_type", &mime_type);
 
-	bundle_add(bd, "count", temp_count);
 	bundle_add(bd, "request_type", request_type);
 	bundle_add(bd, "request_data", request_data);
-	bundle_add(bd, "mime_type", mime_type);
 
 	ug_data->bd = bd;
 #endif
 
 	/* parse pameter, and them set request type */
-	ug_nfc_share_set_tag_type_from_bundle(ug_data->bd);
+	if (!ug_nfc_share_parse_bundle(ug_data->bd))
+		return NULL;
 
 	/* create base layout */
 	ug_nfc_share_create_base_view(ug_data);
author	Junyong Sim <junyong.sim@samsung.com>	2012-12-11 17:59:22 +0900
committer	Junyong Sim <junyong.sim@samsung.com>	2012-12-11 18:04:10 +0900
commit	f106fb815e5b1b45170ccb87b946fd0cb4416d6e (patch)
tree	b9dc377e17b15e11fa741418466933edee164b46
parent	67ad215228d4bc5d8a713ce0c06d265b638e2c90 (diff)
download	ug-nfc-efl-f106fb815e5b1b45170ccb87b946fd0cb4416d6e.tar.gz ug-nfc-efl-f106fb815e5b1b45170ccb87b946fd0cb4416d6e.tar.bz2 ug-nfc-efl-f106fb815e5b1b45170ccb87b946fd0cb4416d6e.zip