Update wrt-setting_0.0.18

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4df002..ee37029 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,3 +19,5 @@ INCLUDE(FindPkgConfig)
 ADD_DEFINITIONS("-std=c++0x")
 ADD_SUBDIRECTORY(webapp-common)
 ADD_SUBDIRECTORY(webapp-detail)
+ADD_SUBDIRECTORY(po)
+ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALE_DIR}\"")

diff --git a/debian/changelog b/debian/changelog
index 2c4653d..d86020a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+wrt-setting (0.0.18) unstable; urgency=low
+
+   * Change string to STMS
+   * entry selector & popup issue
+   * The lib & rsc pathes has been changed
+   * Icon and String path has been changed
+   * Security header has been changed
+   * Add po file and po file list in CmakeList.txt
+
+   * Git : apps/home/wrt-setting
+   * Tag : wrt-setting_0.0.18
+
+ -- leerang <leerang.song@samsung.com>  Fri, 16 Nov 2012 21:26:25 +0900
+
 wrt-setting (0.0.15) unstable; urgency=low
 
   * Add std DEFINITIONS

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
index 1c49745..b57d7ae 100644 (file)
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -1,5 +1,5 @@
 Name: wrt-setting
-Version: 0.0.15
+Version: 0.0.18
 Release: 1
 Summary: WRT Setting UI Gadgets
 Group:   Development/Libraries
@@ -8,6 +8,8 @@ Source0: %{name}-%{version}.tar.gz
 
 BuildRequires: edje-bin
 BuildRequires: cmake
+BuildRequires: gettext
+BuildRequires: edje-tools
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(ui-gadget-1)
@@ -42,3 +44,5 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_datadir}/license/%{name}
 /opt/ug/*
+#/usr/ug/lib/*
+/usr/ug/res/*

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..9f35f76
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1,30 @@
+# for i18n
+SET(POFILES hy.po az.po eu.po bg.po ca.po zh_CN.po zh_HK.po
+cs.po da.po nl_NL.po en.po en_US.po et.po fi.po fr_FR.po gl.po hr.po
+ka.po de_DE.po el_GR.po hu.po is.po ga.po it_IT.po ja_JP.po kk.po
+ko_KR.po lv.po lt.po mk.po nb.po pl.po pt_PT.po pt_BR.po ro.po
+ru_RU.po sr.po sk.po sl.po es_ES.po es_US.po sv.po tr_TR.po uk.po
+uz.po ar.po zh_SG.po hi.po en_PH.po fr_CA.po zh_TW.po)
+
+SET(PROJECT_NAME "ug-webapp-common-efl")
+SET(LOCALE_DIR "/usr/ug/res/locale/")
+SET(MSGFMT "/usr/bin/msgfmt")
+
+FOREACH(pofile ${POFILES})
+    SET(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${pofile})
+    MESSAGE("PO: ${pofile}")
+    GET_FILENAME_COMPONENT(absPofile ${pofile} ABSOLUTE)
+    GET_FILENAME_COMPONENT(lang ${absPofile} NAME_WE)
+
+    SET(moFile ${CMAKE_CURRENT_BINARY_DIR}/${lang}.mo)
+    ADD_CUSTOM_COMMAND( OUTPUT ${moFile}
+        COMMAND ${MSGFMT} -o ${moFile} ${absPofile}
+        DEPENDS ${absPofile} )
+    INSTALL(FILES ${moFile}
+        DESTINATION ${LOCALE_DIR}/${lang}/LC_MESSAGES
+        RENAME  ${PROJECT_NAME}.mo)
+SET(moFiles ${moFiles} ${moFile})
+ENDFOREACH(pofile)
+
+MESSAGE(".mo files: ${moFiles}")
+ADD_CUSTOM_TARGET(po ALL DEPENDS ${moFiles})

diff --git a/po/ar.po b/po/ar.po
new file mode 100755 (executable)
index 0000000..b123420
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "مشاركة ملفات تعريف الارتباط"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "مشاركة ملفات تعريف الارتباط بين تطبيقات الويب"
+

diff --git a/po/az.po b/po/az.po
new file mode 100755 (executable)
index 0000000..5e36f48
--- /dev/null
+++ b/po/az.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Kuki paylaşması"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Veb-proqramlar arasında kukiləri paylaş"
+

diff --git a/po/bg.po b/po/bg.po
new file mode 100755 (executable)
index 0000000..23c6003
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Споделяне на бисквитка"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Споделяне на бисквитки между уеб приложения"
+

diff --git a/po/ca.po b/po/ca.po
new file mode 100755 (executable)
index 0000000..cf212c5
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Ús compartit de cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Compartir galetes entre aplicacions web"
+

diff --git a/po/cs.po b/po/cs.po
new file mode 100755 (executable)
index 0000000..37ea378
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Sdílení cookies"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Sdílet cookies mezi webovými aplikacemi"
+

diff --git a/po/da.po b/po/da.po
new file mode 100755 (executable)
index 0000000..556a85a
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie-deling"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Del cookies mellem web-programmer"
+

diff --git a/po/de_DE.po b/po/de_DE.po
new file mode 100755 (executable)
index 0000000..f5289bc
--- /dev/null
+++ b/po/de_DE.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie-Freigabe"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Cookies zwischen Web Apps freigeben"
+

diff --git a/po/el_GR.po b/po/el_GR.po
new file mode 100755 (executable)
index 0000000..7f0b414
--- /dev/null
+++ b/po/el_GR.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Κοινή χρήση cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Κοινή χρήση cookies μεταξύ εφαρμογών web"
+

diff --git a/po/en.po b/po/en.po
new file mode 100755 (executable)
index 0000000..f043ace
--- /dev/null
+++ b/po/en.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie sharing"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Share cookies between web apps"
+

diff --git a/po/en_PH.po b/po/en_PH.po
new file mode 100755 (executable)
index 0000000..f043ace
--- /dev/null
+++ b/po/en_PH.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie sharing"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Share cookies between web apps"
+

diff --git a/po/en_US.po b/po/en_US.po
new file mode 100755 (executable)
index 0000000..f043ace
--- /dev/null
+++ b/po/en_US.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie sharing"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Share cookies between web apps"
+

diff --git a/po/es_ES.po b/po/es_ES.po
new file mode 100755 (executable)
index 0000000..a568560
--- /dev/null
+++ b/po/es_ES.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Uso compartido de cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Compartir cookies entre aplicaciones web"
+

diff --git a/po/es_US.po b/po/es_US.po
new file mode 100755 (executable)
index 0000000..d559fd3
--- /dev/null
+++ b/po/es_US.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Compartir cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Compartir cookies entre aplicaciones Web"
+

diff --git a/po/et.po b/po/et.po
new file mode 100755 (executable)
index 0000000..f23b312
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Küpsise jagamine"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Jagage küpsiseid veebirakenduste vahel"
+

diff --git a/po/eu.po b/po/eu.po
new file mode 100755 (executable)
index 0000000..1550278
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie partekatzea"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Partekatu aplikazio web orrien arteko cookieak"
+

diff --git a/po/fi.po b/po/fi.po
new file mode 100755 (executable)
index 0000000..f487002
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Evästeiden jako"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Jaa evästeitä sovellusten välillä"
+

diff --git a/po/fr_CA.po b/po/fr_CA.po
new file mode 100755 (executable)
index 0000000..24b006a
--- /dev/null
+++ b/po/fr_CA.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Partage des témoins"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Partager les cookies entre les applications Web"
+

diff --git a/po/fr_FR.po b/po/fr_FR.po
new file mode 100755 (executable)
index 0000000..3f4ed61
--- /dev/null
+++ b/po/fr_FR.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Partage de cookies"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Partager les cookies entre les applications Web"
+

diff --git a/po/ga.po b/po/ga.po
new file mode 100755 (executable)
index 0000000..4e075e7
--- /dev/null
+++ b/po/ga.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Comhroinnt fianán"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Comhroinn fianáin idir feidhmchláir Ghréasáin"
+

diff --git a/po/gl.po b/po/gl.po
new file mode 100755 (executable)
index 0000000..83d46f2
--- /dev/null
+++ b/po/gl.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Uso compartido de cookies"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Compartir cookies entre aplicacións web"
+

diff --git a/po/hi.po b/po/hi.po
new file mode 100755 (executable)
index 0000000..e97626a
--- /dev/null
+++ b/po/hi.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "कुकीज़ साझाकरण"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "वेब ऐप्स के मध्‍य कुकीज़ साझा करें"
+

diff --git a/po/hr.po b/po/hr.po
new file mode 100755 (executable)
index 0000000..48a4e6a
--- /dev/null
+++ b/po/hr.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Dijeljenje kolačića"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Dijeli kolačiće među web aplikacijama"
+

diff --git a/po/hu.po b/po/hu.po
new file mode 100755 (executable)
index 0000000..3ea7304
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie-megosztás"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Cookie-k megosztása a webalkalmazások között"
+

diff --git a/po/hy.po b/po/hy.po
new file mode 100755 (executable)
index 0000000..09ddc62
--- /dev/null
+++ b/po/hy.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Թխուկների համօգտագործում"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Փոխանակել թխուկներ համացանցային ծրագրերի միջև"
+

diff --git a/po/is.po b/po/is.po
new file mode 100755 (executable)
index 0000000..6a2a2cc
--- /dev/null
+++ b/po/is.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Deiling fótspora"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Deila fótsporum milli vefforrita"
+

diff --git a/po/it_IT.po b/po/it_IT.po
new file mode 100755 (executable)
index 0000000..7a7371f
--- /dev/null
+++ b/po/it_IT.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Condivisione cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Condividi cookie tra le applicazioni Web"
+

diff --git a/po/ja_JP.po b/po/ja_JP.po
new file mode 100755 (executable)
index 0000000..d8c6848
--- /dev/null
+++ b/po/ja_JP.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie​の​共有"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Web​アプリ​間​で​Cookie​を​共有"
+

diff --git a/po/ka.po b/po/ka.po
new file mode 100755 (executable)
index 0000000..ba2409a
--- /dev/null
+++ b/po/ka.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "ქუქი-ფაილების გაზიარება"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "ქუქი-ფაილების გაზიარება ვებ-პროგრამებს შორის"
+

diff --git a/po/kk.po b/po/kk.po
new file mode 100755 (executable)
index 0000000..70b6bee
--- /dev/null
+++ b/po/kk.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie бөлісу"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Веб-бағдарламалар арасында cookies файлдарымен бөлісу"
+

diff --git a/po/ko_KR.po b/po/ko_KR.po
new file mode 100755 (executable)
index 0000000..e3234d5
--- /dev/null
+++ b/po/ko_KR.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "쿠기 공유"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "웹 애플리케이션간에 쿠키 공유"
+

diff --git a/po/lt.po b/po/lt.po
new file mode 100755 (executable)
index 0000000..1994fad
--- /dev/null
+++ b/po/lt.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Slapukų bendrinimas"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Bendrinti slapukus tarp žiniatinklio programų"
+

diff --git a/po/lv.po b/po/lv.po
new file mode 100755 (executable)
index 0000000..c80a1d4
--- /dev/null
+++ b/po/lv.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Sīkfailu kopīgošana"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Kopīgot sīkfailus starp tīmekļa programmām"
+

diff --git a/po/mk.po b/po/mk.po
new file mode 100755 (executable)
index 0000000..b5739c7
--- /dev/null
+++ b/po/mk.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Делење колачиња"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Дели колачиња меѓу веб-апликации"
+

diff --git a/po/nb.po b/po/nb.po
new file mode 100755 (executable)
index 0000000..3ddb25a
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Deling av informasjonskapsel"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Del informasjonskapsler mellom webprogrammer"
+

diff --git a/po/nl_NL.po b/po/nl_NL.po
new file mode 100755 (executable)
index 0000000..495c5bf
--- /dev/null
+++ b/po/nl_NL.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie delen"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Cookies delen tussen webapps"
+

diff --git a/po/pl.po b/po/pl.po
new file mode 100755 (executable)
index 0000000..a7254e6
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Udostępnianie pliku cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Udostępniaj pliki cookie pomiędzy aplikacjami internetowymi"
+

diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100755 (executable)
index 0000000..1cf1d74
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Compartilhamento de cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Compartilhar cookies entre apps da web"
+

diff --git a/po/pt_PT.po b/po/pt_PT.po
new file mode 100755 (executable)
index 0000000..9948642
--- /dev/null
+++ b/po/pt_PT.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Partilha de cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Partilhar cookies entre aplicações web"
+

diff --git a/po/ro.po b/po/ro.po
new file mode 100755 (executable)
index 0000000..c843296
--- /dev/null
+++ b/po/ro.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Partajare cookie-uri"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Se partajează cookie-urile între aplicaţii web"
+

diff --git a/po/ru_RU.po b/po/ru_RU.po
new file mode 100755 (executable)
index 0000000..8e93907
--- /dev/null
+++ b/po/ru_RU.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Обмен cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Обмен cookie между веб-приложениями"
+

diff --git a/po/sk.po b/po/sk.po
new file mode 100755 (executable)
index 0000000..7787ca6
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Zdieľanie súborov cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Zdieľať súbory cookie medzi webovými aplikáciami"
+

diff --git a/po/sl.po b/po/sl.po
new file mode 100755 (executable)
index 0000000..b9406b6
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Skupna raba piškotka"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Skupna raba piškotkov med spletnimi programi"
+

diff --git a/po/sr.po b/po/sr.po
new file mode 100755 (executable)
index 0000000..aba95dc
--- /dev/null
+++ b/po/sr.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Deljenje kolačića"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Deli kolačiće između web aplikacija"
+

diff --git a/po/sv.po b/po/sv.po
new file mode 100755 (executable)
index 0000000..1da9180
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie-delning"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Dela cookies mellan webbprogram"
+

diff --git a/po/tr_TR.po b/po/tr_TR.po
new file mode 100755 (executable)
index 0000000..9f33909
--- /dev/null
+++ b/po/tr_TR.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Çerez paylaşımı"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Çerezleri web uygulamaları arasında paylaş"
+

diff --git a/po/uk.po b/po/uk.po
new file mode 100755 (executable)
index 0000000..25e40c5
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Спільний доступ до cookie"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Спільний доступ до cookies для Інтернет-програм"
+

diff --git a/po/uz.po b/po/uz.po
new file mode 100755 (executable)
index 0000000..1752c97
--- /dev/null
+++ b/po/uz.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie ulashish"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "Veb-ilovalar o‘rtasidagi cookie-fayllarni ulashing"
+

diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100755 (executable)
index 0000000..2c0744b
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie 共享"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "在网络应用程序之间共享 cookies"
+

diff --git a/po/zh_HK.po b/po/zh_HK.po
new file mode 100755 (executable)
index 0000000..d464029
--- /dev/null
+++ b/po/zh_HK.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie 分享"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "在網頁應用程式中分享 cookie"
+

diff --git a/po/zh_SG.po b/po/zh_SG.po
new file mode 100755 (executable)
index 0000000..2c0744b
--- /dev/null
+++ b/po/zh_SG.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie 共享"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "在网络应用程序之间共享 cookies"
+

diff --git a/po/zh_TW.po b/po/zh_TW.po
new file mode 100755 (executable)
index 0000000..d464029
--- /dev/null
+++ b/po/zh_TW.po
@@ -0,0 +1,6 @@
+msgid "IDS_ST_BODY_COOKIE_SHARING"
+msgstr "Cookie 分享"
+
+msgid "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS"
+msgstr "在網頁應用程式中分享 cookie"
+

diff --git a/webapp-common/CMakeLists.txt b/webapp-common/CMakeLists.txt
index 8c00be9..a68f4f2 100755 (executable)
--- a/webapp-common/CMakeLists.txt
+++ b/webapp-common/CMakeLists.txt
@@ -17,7 +17,7 @@
 SET(TARGET_UG_LIB "ug-webapp-common-efl")
 SET(TARGET_UG_EDJ "webapp-common.edj")
 SET(UGDIR "${UG_INSTALL_PREFIX}/ug/lib")
-SET(ICONDIR "${UG_INSTALL_PREFIX}/ug/res/icons/${TARGET_UG_LIB}")
+SET(ICONDIR "${UG_INSTALL_PREFIX}/ug/res/images/${TARGET_UG_LIB}")
 SET(EDJDIR "${UG_INSTALL_PREFIX}/ug/res/edje/${TARGET_UG_LIB}")
 
 PKG_CHECK_MODULES(UG_WEB_APP_COMMON_DEPS

diff --git a/webapp-common/listview.cpp b/webapp-common/listview.cpp
index 225fbcd..da6e799 100755 (executable)
--- a/webapp-common/listview.cpp
+++ b/webapp-common/listview.cpp
@@ -30,6 +30,11 @@
 #include <dlog.h>
 
 namespace WebAppCommonSetting {
+const char * const COOKIE_SHARING = "IDS_ST_BODY_COOKIE_SHARING";
+const char * const SHARE_COOKIES_BETWEEN_WEB_APPS =
+    "IDS_ST_BODY_SHARE_COOKIES_BETWEEN_WEB_APPS";
+const char * const MOFILE_INSTALL_DIR =
+    "/usr/ug/res/locale";
 
 char *ListView::getWacTitle(void */*data*/,
                             Evas_Object */*obj*/,
@@ -970,17 +975,19 @@ bool ListView::loadView(void)
         evas_object_del(conform);
         return false;
     }
+    bindtextdomain("ug-webapp-common-efl",
+        MOFILE_INSTALL_DIR);
     elm_object_style_set(gl, "dialogue");
     elm_object_content_set(conform, gl);
     resetBase(conform);
     addDepth(gl);
     addOnOffItem(gl,
-                 "Cookie sharing",
-                 getCookieSharingVal,
-                 onCookieSharingChanged);
+                dgettext("ug-webapp-common-efl", COOKIE_SHARING),
+                getCookieSharingVal,
+                onCookieSharingChanged);
     addDesc(gl,
-            "Share cookies between web apps");
-
+            dgettext("ug-webapp-common-efl",
+                SHARE_COOKIES_BETWEEN_WEB_APPS));
     pushToNaviFrame();
 
     return true;

diff --git a/webapp-common/listview.h b/webapp-common/listview.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/webapp-detail/CMakeLists.txt b/webapp-detail/CMakeLists.txt
index f7f2fe2..8bf77c8 100755 (executable)
--- a/webapp-detail/CMakeLists.txt
+++ b/webapp-detail/CMakeLists.txt
@@ -15,9 +15,9 @@
 #
 
 SET(TARGET_UG_DETAIL_LIB "ug-webapp-detail-efl")
-SET(TARGET_UG_EDJ "web-app.edj")
+SET(TARGET_UG_EDJ "webapp-detail.edj")
 SET(UGDIR "${UG_INSTALL_PREFIX}/ug/lib")
-SET(EDJDIR "${UG_INSTALL_PREFIX}/ug/res/edje/${TARGET_UG_LIB}")
+SET(EDJDIR "${UG_INSTALL_PREFIX}/ug/res/edje/${TARGET_UG_DETAIL_LIB}")
 
 # Compiler flags
 SET(CMAKE_BUILD_TYPE           "Release")
@@ -35,8 +35,7 @@ PKG_CHECK_MODULES(UG_WEB_APP_DETAIL_DEPS
     dpl-efl
     dpl-wrt-dao-rw
     dpl-utils-efl
-    security
-    security-dao-rw
+    security-settings
     REQUIRED)
 
 SET(UG_DETAIL_SOURCES

diff --git a/webapp-detail/detailview.cpp b/webapp-detail/detailview.cpp
index 0d2c3dd..ac0f080 100755 (executable)
--- a/webapp-detail/detailview.cpp
+++ b/webapp-detail/detailview.cpp
@@ -478,6 +478,8 @@ void DetailView::_mouse_up_license(void *data,
             closeCallback,
             (void *)popup);
     evas_object_show(l_button);
+    elm_object_focus_allow_set(popup, EINA_TRUE);
+    elm_object_focus_set(popup, EINA_TRUE);
 }
 
 void DetailView::_mouse_up_save_login_info(void *data,

diff --git a/webapp-detail/feature.h b/webapp-detail/feature.h
old mode 100644 (file)
new mode 100755 (executable)
index 5255346..4edf0fd
--- a/webapp-detail/feature.h
+++ b/webapp-detail/feature.h
@@ -18,7 +18,7 @@
 #define WEB_SRC_SETTING_WEBAPP_DETAIL_FEATURE_H_
 
 #include <dpl/wrt-dao-rw/widget_dao.h>
-#include <ace/SettingsLogic.h>
+#include <ace-settings/ace_api_settings.h>
 
 namespace WebAppDetailSetting {
 
@@ -26,22 +26,22 @@ class Feature
 {
     std::string m_name;
     std::string m_uri;
-    AceDB::PreferenceTypes m_perm;
+    ace_preference_t m_perm;
 
   public:
     Feature(const char *name = NULL, const char *uri = NULL) :
-        m_perm(AceDB::PreferenceTypes::PREFERENCE_DEFAULT)
+        m_perm(ACE_PREFERENCE_DEFAULT)
     {
         if (name)
             m_name.assign(name);
         if (uri)
             m_uri.assign(uri);
     }
-    void setPerm(AceDB::PreferenceTypes perm) { m_perm = perm; }
+    void setPerm(ace_preference_t perm) { m_perm = perm; }
 
     std::string& getName(void) { return m_name; }
     std::string& getUri(void) { return m_uri; }
-    AceDB::PreferenceTypes getPerm(void) { return m_perm; }
+    ace_preference_t getPerm(void) { return m_perm; }
 };
 
 } /* WebAppDetailSetting */

diff --git a/webapp-detail/permview.cpp b/webapp-detail/permview.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 9c6538a..56f549f
--- a/webapp-detail/permview.cpp
+++ b/webapp-detail/permview.cpp
@@ -17,7 +17,6 @@
 #include <Elementary.h>
 
 #include <dpl/wrt-dao-rw/widget_dao.h>
-#include <ace/SettingsLogic.h>
 #include <dpl/foreach.h>
 #include <dpl/assert.h>
 
@@ -55,14 +54,16 @@ void PermView::onPermClicked(void *data,
     Assert(permData);
     featureData = permData->m_featureData;
     Assert(featureData);
-    SettingsLogic::setWidgetDevCapSetting(
-            featureData->m_feature->getUri(),
+    ace_set_widget_resource_preference(
             featureData->m_appID,
+            const_cast<char *>(featureData->m_feature->getUri().c_str()),
             permData->m_type);
-    featureData->m_feature->setPerm(
-            SettingsLogic::getWidgetDevCapSetting(
-                featureData->m_feature->getUri(),
-                featureData->m_appID));
+    ace_preference_t perm;
+    ace_get_widget_resource_preference(
+        featureData->m_appID,
+        const_cast<char *>(featureData->m_feature->getUri().c_str()),
+        &perm);
+    featureData->m_feature->setPerm(perm);
     elm_genlist_item_selected_set(it, EINA_FALSE);
     elm_genlist_item_update(it);
     parent_it = elm_genlist_item_parent_get(it);
@@ -90,7 +91,7 @@ void PermView::onExpanded(void */*data*/, Evas_Object *obj, void *event_info)
     itc.func.del = delPermData;
 
     try {
-        permData = new PermData(featureData, AceDB::PreferenceTypes::PREFERENCE_DENY);
+        permData = new PermData(featureData, ACE_PREFERENCE_DENY);
         newIt = elm_genlist_item_append(obj,
                                         &itc,
                                         permData,
@@ -101,7 +102,7 @@ void PermView::onExpanded(void */*data*/, Evas_Object *obj, void *event_info)
         if (!newIt)
             delete permData;
 
-        permData = new PermData(featureData, AceDB::PreferenceTypes::PREFERENCE_DEFAULT);
+        permData = new PermData(featureData, ACE_PREFERENCE_DENY);
         newIt = elm_genlist_item_append(obj,
                                         &itc,
                                         permData,
@@ -137,10 +138,10 @@ char *PermView::getPermStr(void *data,
     Assert(data);
     permData = static_cast<PermData *>(data);
     switch (permData->m_type) {
-        case AceDB::PreferenceTypes::PREFERENCE_DENY:
+        case ACE_PREFERENCE_DENY:
             /* FIXME: i18n */
             return strdup("Deny");
-        case AceDB::PreferenceTypes::PREFERENCE_DEFAULT:
+        case ACE_PREFERENCE_DEFAULT:
         default:
             /* FIXME: i18n */
             return strdup("Default");
@@ -234,11 +235,11 @@ char *PermView::getFeatureStrWithPerm(void *data,
     } else if (!strcmp(part, "elm.text.2")) {
 
         switch (featureData->m_feature->getPerm()) {
-        case AceDB::PreferenceTypes::PREFERENCE_DENY:
+        case ACE_PREFERENCE_DENY:
             /* FIXME: i18n */
             str = "Deny";
             break;
-        case AceDB::PreferenceTypes::PREFERENCE_DEFAULT:
+        case ACE_PREFERENCE_DEFAULT:
         default:
             /* FIXME: i18n */
             str = "Default";

diff --git a/webapp-detail/permview.h b/webapp-detail/permview.h
index cc1dafd..a8e547d 100644 (file)
--- a/webapp-detail/permview.h
+++ b/webapp-detail/permview.h
@@ -93,9 +93,9 @@ class PermData
 {
   public:
     FeatureData *m_featureData;
-    AceDB::PreferenceTypes m_type;
+    ace_preference_t m_type;
 
-    PermData(FeatureData *featureData, AceDB::PreferenceTypes type) :
+    PermData(FeatureData *featureData, ace_preference_t type) :
         m_featureData(featureData),
         m_type(type) { };
 };

diff --git a/webapp-detail/ug.cpp b/webapp-detail/ug.cpp
index f092d97..ac4d159 100755 (executable)
--- a/webapp-detail/ug.cpp
+++ b/webapp-detail/ug.cpp
@@ -23,7 +23,6 @@
 
 #undef None
 #include <dpl/wrt-dao-ro/WrtDatabase.h>
-#include <ace-dao-ro/AceDAOReadOnly.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 
 #include "mainview.h"
@@ -85,7 +84,7 @@ EXPORT_SYMBOL int UG_MODULE_INIT(struct ug_module_ops *ops)
         return -1;
 
     WrtDB::WrtDatabase::attachToThreadRW();
-    AceDB::AceDAOReadOnly::attachToThreadRW();
+    //AceDB::AceDAOReadOnly::attachToThreadRW();
 
     memset(ops, 0x00, sizeof(*ops));
     ops->priv = priv;
@@ -106,6 +105,6 @@ EXPORT_SYMBOL void UG_MODULE_EXIT(struct ug_module_ops *ops)
         delete priv->mainView;
     free(priv);
 
-    AceDB::AceDAOReadOnly::detachFromThread();
+    //AceDB::AceDAOReadOnly::detachFromThread();
     WrtDB::WrtDatabase::detachFromThread();
 }

diff --git a/webapp-detail/wac_feature.cpp b/webapp-detail/wac_feature.cpp
old mode 100644 (file)
new mode 100755 (executable)
index ed98601..5efa2dc
--- a/webapp-detail/wac_feature.cpp
+++ b/webapp-detail/wac_feature.cpp
@@ -15,10 +15,9 @@
   */
 
 #include <dpl/foreach.h>
-#include <ace/SettingsLogic.h>
-
 #include "wac_feature.h"
 #include "util.h"
+#include <ace-settings/ace_api_settings.h>
 
 namespace WebAppDetailSetting {
 
@@ -70,10 +69,12 @@ std::map<int, Feature> WacFeature::getFeatureMap(
                         m_feature[i])) {
                 featureMap[i] = Feature(m_featureName[i],
                                m_feature[i]);
-
-                featureMap[i].setPerm(
-                        SettingsLogic::getWidgetDevCapSetting(
-                            m_feature[i], appID));
+                ace_preference_t perm;
+                ace_get_widget_resource_preference(
+                        appID,
+                        const_cast<char *>(m_feature[i]),
+                        &perm);
+                featureMap[i].setPerm(perm);
 
                 break;
             }