summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinkun Jang <jinkun.jang@samsung.com>2013-03-16 01:04:44 +0900
committerJinkun Jang <jinkun.jang@samsung.com>2013-03-16 01:04:44 +0900
commit76ce7104e0449a59d16a97d90e224b438d367be4 (patch)
treed5387770347b18b3e6cb860bbf40a12c7ce3213e
parent36f20f52a1d035d10e0bcfac4125d67cfc6ff03a (diff)
downloadpwlock-76ce7104e0449a59d16a97d90e224b438d367be4.tar.gz
pwlock-76ce7104e0449a59d16a97d90e224b438d367be4.tar.bz2
pwlock-76ce7104e0449a59d16a97d90e224b438d367be4.zip
merge with master
-rw-r--r--org.tizen.pwlock.manifest2
-rw-r--r--po/CMakeLists.txt2
-rwxr-xr-xpo/ar.po129
-rwxr-xr-xpo/hi.po129
-rw-r--r--res/langlist.xml14
-rwxr-xr-xsrc/pwlock.c91
6 files changed, 336 insertions, 31 deletions
diff --git a/org.tizen.pwlock.manifest b/org.tizen.pwlock.manifest
index b0b7126..8ace480 100644
--- a/org.tizen.pwlock.manifest
+++ b/org.tizen.pwlock.manifest
@@ -8,7 +8,7 @@
<smack request="system::use_internet" type="r"/>
<smack request="xorg" type="w"/>
<smack request="isf" type="r"/>
- <smack request="system::app_logging" type="w"/>
+ <smack request="device::app_logging" type="w"/>
<smack request="ail::db" type="rw"/>
<smack request="dbus" type="w"/>
</request>
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index a4757f2..31f140a 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,6 +1,6 @@
# for i18n
-SET(POFILES az.po bg.po ca.po cs.po da.po de_DE.po el_GR.po en_PH.po en.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 hr.po hu.po hy.po is.po it_IT.po ja_JP.po ka.po kk.po ko_KR.po lt.po lv.po mk.po nb.po nl_NL.po pl.po pt_BR.po pt_PT.po ro.po ru_RU.po sk.po sl.po sr.po sv.po tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_SG.po zh_TW.po)
+SET(POFILES ar.po az.po bg.po ca.po cs.po da.po de_DE.po el_GR.po en_PH.po en.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/po/ar.po b/po/ar.po
new file mode 100755
index 0000000..3aa4906
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,129 @@
+msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
+msgstr "أدخل PIN ثانية"
+
+msgid "IDS_IDLE_BODY_PASSWORD_EMPTY"
+msgstr "حقل كلمة المرور فارغ"
+
+msgid "IDS_IDLE_BODY_PD_TO_PD_DIGITS_REQUIRED"
+msgstr "يلزم كتابة الأرقام من %d إلى %d"
+
+msgid "IDS_IDLE_POP_INCORRECT_PIN_1_ATTEMPT_LEFT"
+msgstr "رمز PIN غير صحيح. محاولة واحدة متبقية"
+
+msgid "IDS_IDLE_POP_INCORRECT_PIN_PD_ATTEMPTS_LEFT"
+msgstr "رمز PIN غير صحيح. %d محاولة (محاولات) متبقية"
+
+msgid "IDS_IDLE_BODY_NEW_PIN"
+msgstr "رمز PIN جديد"
+
+msgid "IDS_IDLE_BODY_PIN"
+msgstr "PIN"
+
+msgid "IDS_IDLE_BODY_PUK"
+msgstr "PUK"
+
+msgid "IDS_IDLE_POP_PIN_BLOCKED"
+msgstr "تم قفل PIN"
+
+msgid "IDS_IDLE_POP_PIN_UNBLOCKED"
+msgstr "تم إلغاء قفل PIN"
+
+msgid "IDS_IDLE_HEADER_NETWORK_LOCK"
+msgstr "قفل الشبكة"
+
+msgid "IDS_IDLE_HEADER_PIN_LOCK"
+msgstr "قفل PIN"
+
+msgid "IDS_IDLE_HEADER_PUK_LOCK"
+msgstr "قفل PUK"
+
+msgid "IDS_IDLE_HEADER_SIM_BLOCKED"
+msgstr "تم حجب بطاقة SIM"
+
+msgid "IDS_IDLE_HEADER_SIM_LOCK"
+msgstr "قفل البطاقة"
+
+msgid "IDS_IDLE_BODY_1_ATTEMPT_LEFT"
+msgstr "تتبقى محاولة واحدة"
+
+msgid "IDS_IDLE_BODY_CORPORATE_PERSONALISATION_ON_ENTER_CONTROL_KEY"
+msgstr "تخصيص الشركة قيد التشغيل. أدخل مفتاح التحكم"
+
+msgid "IDS_IDLE_BODY_ENTER_NEW_PIN"
+msgstr "أدخل PIN جديد"
+
+msgid "IDS_IDLE_BODY_ENTER_PIN"
+msgstr "أدخل PIN"
+
+msgid "IDS_IDLE_BODY_ENTER_PUK"
+msgstr "أدخل PUK"
+
+msgid "IDS_IDLE_BODY_INCORRECT_PIN"
+msgstr "خطأ PIN"
+
+msgid "IDS_IDLE_BODY_INCORRECT_PIN_TRY_AGAIN"
+msgstr "رمز PIN غير صحيح.\n يرجى المحاولة ثانية"
+
+msgid "IDS_IDLE_BODY_NETWORK_PERSONALISATION_ON_ENTER_CONTROL_KEY"
+msgstr "تخصيص الشبكة قيد التشغيل. أدخل مفتاح التحكم"
+
+msgid "IDS_IDLE_BODY_NETWORK_SUBSET_PERSONALISATION_ON_ENTER_CONTROL_KEY"
+msgstr "تخصيص الشبكة الفرعية قيد التشغيل. أدخل مفتاح التحكم"
+
+msgid "IDS_IDLE_BODY_PD_ATTEMPTS_LEFT"
+msgstr "%d محاولات متبقية"
+
+msgid "IDS_IDLE_BODY_SERVICE_PROVIDER_PERSONALISATION_ON_ENTER_CONTROL_KEY"
+msgstr "تخصيص مزود الخدمة قيد التشغيل. أدخل مفتاح التحكم"
+
+msgid "IDS_IDLE_BODY_SIM_CARD_NOT_AVAILABLE_CONTACT_YOUR_SERVICE_PROVIDER"
+msgstr "بطاقة SIM غير متاحة. اتصل بمزود الخدمة"
+
+msgid "IDS_IDLE_BODY_WRONG_PASSWORD"
+msgstr "كلمة المرور خاطئة"
+
+msgid "IDS_IDLE_BUTTON_DIALER"
+msgstr "الطالب"
+
+msgid "IDS_IDLE_HEADER_DISPLAY_LANGUAGE"
+msgstr "لغة العرض"
+
+msgid "IDS_IDLE_POP_CHECKING_SIM_CARD_ING"
+msgstr "جاري فحص البطاقة..."
+
+msgid "IDS_SCM_BODY_WELCOME_E"
+msgstr "مرحبا!"
+
+msgid "IDS_STU_BODY_SELECT_LANGUAGE"
+msgstr "اختيار اللغة"
+
+msgid "IDS_ST_SK_EMERGENCY_CALL"
+msgstr "مكالمة طوارئ"
+
+msgid "IDS_ST_BODY_TAP_TO_SET_UP"
+msgstr "انقر للإعداد"
+
+msgid "IDS_ST_BODY_INSTALTAB_FINISH"
+msgstr "إنهاء"
+
+msgid "IDS_STU_BODY_DEVICE_IS_SET_UP_AND_READY_TO_USE"
+msgstr "تم إعداد الجهاز وأصبح جاهزا للاستخدام"
+
+msgid "IDS_STU_POP_SETUP_COMPLETE"
+msgstr "اكتمل الإعداد"
+
+msgid "IDS_STU_BODY_HOW_TO_INSERT_SIM_CARD_HELP_MSG"
+msgstr "أوقف تشغيل الجهاز وقم بإخراج البطارية وإدخال بطاقة SIM بعناية بحيث يكون اتجاه جانب التماس الذهبي لأسفل. يجب أن تكون نهاية الجانب المشطوف بعيدة تماما عن البطارية\nإذا كنت ترغب في التخطي الآن، فتأكد من إدخال بطاقة SIM لاحقا. حتى تقوم بإدخالها، لن يعمل الكثير من ميزات الجهاز"
+
+msgid "IDS_ST_BUTTON_TRY_AGAIN_ABB"
+msgstr "إعادة محاولة"
+
+msgid "IDS_IDLE_BODY_AUTOMATIC"
+msgstr "تلقائي"
+
+msgid "IDS_COM_SK_SKIP"
+msgstr "اجتياز"
+
+msgid "IDS_COM_BODY_NO_SIM_CARD_IN_DEVICE"
+msgstr "لا توجد بطاقة SIM بالجهاز"
+
diff --git a/po/hi.po b/po/hi.po
new file mode 100755
index 0000000..d504d60
--- /dev/null
+++ b/po/hi.po
@@ -0,0 +1,129 @@
+msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
+msgstr "नए PIN की पुष्टि करें"
+
+msgid "IDS_IDLE_BODY_PASSWORD_EMPTY"
+msgstr "पासवर्ड खाली"
+
+msgid "IDS_IDLE_BODY_PD_TO_PD_DIGITS_REQUIRED"
+msgstr "%d से %d अंक आवश्यक"
+
+msgid "IDS_IDLE_POP_INCORRECT_PIN_1_ATTEMPT_LEFT"
+msgstr "गलत PIN। 1 प्रयास बाकी"
+
+msgid "IDS_IDLE_POP_INCORRECT_PIN_PD_ATTEMPTS_LEFT"
+msgstr "गलत PIN। %d प्रयास बाकी"
+
+msgid "IDS_IDLE_BODY_NEW_PIN"
+msgstr "नया PIN"
+
+msgid "IDS_IDLE_BODY_PIN"
+msgstr "PIN"
+
+msgid "IDS_IDLE_BODY_PUK"
+msgstr "पुक"
+
+msgid "IDS_IDLE_POP_PIN_BLOCKED"
+msgstr "PIN अवरुद्ध"
+
+msgid "IDS_IDLE_POP_PIN_UNBLOCKED"
+msgstr "PIN अनब्लॉक है"
+
+msgid "IDS_IDLE_HEADER_NETWORK_LOCK"
+msgstr "नेटवर्क लॉक"
+
+msgid "IDS_IDLE_HEADER_PIN_LOCK"
+msgstr "PIN लॉक"
+
+msgid "IDS_IDLE_HEADER_PUK_LOCK"
+msgstr "पुक लॉक"
+
+msgid "IDS_IDLE_HEADER_SIM_BLOCKED"
+msgstr "SIM ब्‍लॉक कर दी गई"
+
+msgid "IDS_IDLE_HEADER_SIM_LOCK"
+msgstr "सिम लॉक"
+
+msgid "IDS_IDLE_BODY_1_ATTEMPT_LEFT"
+msgstr "1 प्रयास शेष"
+
+msgid "IDS_IDLE_BODY_CORPORATE_PERSONALISATION_ON_ENTER_CONTROL_KEY"
+msgstr "कॉरपोरेट व्यक्तिकरण चालू। कंट्रोल कुंजी दर्ज करें"
+
+msgid "IDS_IDLE_BODY_ENTER_NEW_PIN"
+msgstr "नया PIN प्रविष्ट करें"
+
+msgid "IDS_IDLE_BODY_ENTER_PIN"
+msgstr "PIN प्रविष्ट करें"
+
+msgid "IDS_IDLE_BODY_ENTER_PUK"
+msgstr "पुक प्रविष्ट करें"
+
+msgid "IDS_IDLE_BODY_INCORRECT_PIN"
+msgstr "गलत PIN"
+
+msgid "IDS_IDLE_BODY_INCORRECT_PIN_TRY_AGAIN"
+msgstr "गलत PIN.\nफिर से कोशिश करें"
+
+msgid "IDS_IDLE_BODY_NETWORK_PERSONALISATION_ON_ENTER_CONTROL_KEY"
+msgstr "नेटवर्क व्यक्तिकरण चालू। कंट्रोल कुंजी दर्ज करें"
+
+msgid "IDS_IDLE_BODY_NETWORK_SUBSET_PERSONALISATION_ON_ENTER_CONTROL_KEY"
+msgstr "नेटवर्क सबसेट व्यक्तिकरण चालू। कंट्रोल कुंजी दर्ज करें"
+
+msgid "IDS_IDLE_BODY_PD_ATTEMPTS_LEFT"
+msgstr "%d प्रयास शेष"
+
+msgid "IDS_IDLE_BODY_SERVICE_PROVIDER_PERSONALISATION_ON_ENTER_CONTROL_KEY"
+msgstr "सेवा प्रदाता व्यक्तिकरण चालू। कंट्रोल कुंजी दर्ज करें"
+
+msgid "IDS_IDLE_BODY_SIM_CARD_NOT_AVAILABLE_CONTACT_YOUR_SERVICE_PROVIDER"
+msgstr "सिम कार्ड उपलब्ध नहीं। अपने सेवा प्रदाता से संपर्क करें"
+
+msgid "IDS_IDLE_BODY_WRONG_PASSWORD"
+msgstr "गलत पासवर्ड"
+
+msgid "IDS_IDLE_BUTTON_DIALER"
+msgstr "डायलर"
+
+msgid "IDS_IDLE_HEADER_DISPLAY_LANGUAGE"
+msgstr "भाषा प्रदर्शन"
+
+msgid "IDS_IDLE_POP_CHECKING_SIM_CARD_ING"
+msgstr "SIM कार्ड जाँच रहा है…"
+
+msgid "IDS_SCM_BODY_WELCOME_E"
+msgstr "स्वागत है!"
+
+msgid "IDS_STU_BODY_SELECT_LANGUAGE"
+msgstr "भाषा चुनें"
+
+msgid "IDS_ST_SK_EMERGENCY_CALL"
+msgstr "आपातकाल कॉल"
+
+msgid "IDS_ST_BODY_TAP_TO_SET_UP"
+msgstr "सेटअप करने के लिए टैप करें"
+
+msgid "IDS_ST_BODY_INSTALTAB_FINISH"
+msgstr "समाप्त"
+
+msgid "IDS_STU_BODY_DEVICE_IS_SET_UP_AND_READY_TO_USE"
+msgstr "डिवाइस सेट है और उपयोग के लिए तैयार है"
+
+msgid "IDS_STU_POP_SETUP_COMPLETE"
+msgstr "सेटअप पूर्ण"
+
+msgid "IDS_STU_BODY_HOW_TO_INSERT_SIM_CARD_HELP_MSG"
+msgstr "अपने डिवाइस को बंद करें, बैटरी निकालें, और सावधानी से नीचे की ओर गोल्ड स्पर्श करते हुए अपनी SIM डालें। कट-ऑफ़ कोना बैटरी से दूर समाप्त होना चाहिए\nयदि आप अभी छोड़ने को प्राथमिकता देते है तो SIM को बाद में डालना सुनिश्चित करें। जब तक आप ऐसा नहीं करते आपके डिवाइस की अधिकांश सुविधाएँ कार्य नहीं करेंगी"
+
+msgid "IDS_ST_BUTTON_TRY_AGAIN_ABB"
+msgstr "पुन: प्रयास"
+
+msgid "IDS_IDLE_BODY_AUTOMATIC"
+msgstr "स्वचालित"
+
+msgid "IDS_COM_SK_SKIP"
+msgstr "स्किप"
+
+msgid "IDS_COM_BODY_NO_SIM_CARD_IN_DEVICE"
+msgstr "साधन में SIM कार्ड नहीं"
+
diff --git a/res/langlist.xml b/res/langlist.xml
index fc6fd1d..84500ff 100644
--- a/res/langlist.xml
+++ b/res/langlist.xml
@@ -43,10 +43,12 @@
<language id="uk_UA.utf8" string="Українська" no="41" lang="Ukrainian"/>
<language id="hy_AM.utf8" string="Հայերէն" no="42" lang="Armenian"/>
<language id="ka_GE.utf8" string="ქართული ენა" no="43" lang="Georgian"/>
- <language id="zh_CN.utf8" string="简体中文" no="44" lang="Chinese"/>
- <language id="zh_SG.utf8" string="简体中文 (新加坡)" no="45" lang="Chinese(Singapore)"/>
- <language id="zh_TW.utf8" string="繁體中文 (台灣)" no="46" lang="Chinese(Taiwan)"/>
- <language id="zh_HK.utf8" string="繁體中文 (香港)" no="47" lang="Chinese(HongKong)"/>
- <language id="ja_JP.utf8" string="日本語" no="48" lang="Japanese"/>
- <language id="ko_KR.utf8" string="한국어" no="49" lang="Korean"/>
+ <language id="ar_AE.utf8" string="العربية" no="44" lang="Arabic"/>
+ <language id="hi_IN.utf8" string="हिंदी" no="45" lang="Hindi"/>
+ <language id="zh_CN.utf8" string="简体中文" no="46" lang="Chinese"/>
+ <language id="zh_SG.utf8" string="简体中文 (新加坡)" no="47" lang="Chinese(Singapore)"/>
+ <language id="zh_TW.utf8" string="繁體中文 (台灣)" no="48" lang="Chinese(Taiwan)"/>
+ <language id="zh_HK.utf8" string="繁體中文 (香港)" no="49" lang="Chinese(HongKong)"/>
+ <language id="ja_JP.utf8" string="日本語" no="50" lang="Japanese"/>
+ <language id="ko_KR.utf8" string="한국어" no="51" lang="Korean"/>
</langlist>
diff --git a/src/pwlock.c b/src/pwlock.c
index d6cfc4e..2a50025 100755
--- a/src/pwlock.c
+++ b/src/pwlock.c
@@ -489,7 +489,7 @@ static void register_vconf_call_state_changed(struct appdata *ad)
}
}
-void vconf_tapi_state_changed_cb(keynode_t * node, void *data)
+void vconf_tapi_ready_changed_cb(keynode_t * node, void *data)
{
int api_ret = 0;
int vconf_val = 0;
@@ -512,18 +512,18 @@ void vconf_tapi_state_changed_cb(keynode_t * node, void *data)
_DBG("SUCCESS to stop timer with pTimerId[%x]", (int)ad->pTimerId);
}
}
- _trans(ad, _ST_TAPI_INIT);
+ _trans(ad, _ST_SIM);
do_state(ad);
}
}
return;
}
-void register_vconf_tapi_state_changed(struct appdata *ad)
+void register_vconf_tapi_ready_changed(struct appdata *ad)
{
_DBG("%s", __func__);
if (vconf_notify_key_changed
- (VCONFKEY_TELEPHONY_TAPI_STATE, vconf_tapi_state_changed_cb,
+ (VCONFKEY_TELEPHONY_TAPI_STATE, vconf_tapi_ready_changed_cb,
ad) != 0) {
_DBG("Fail to register");
}
@@ -550,22 +550,68 @@ Eina_Bool vconf_tapi_ready_expire_cb(void *pData)
do_state(ad);
} else {
_DBG("TAPI is ready");
- _trans(ad, _ST_TAPI_INIT);
+ _trans(ad, _ST_SIM);
do_state(ad);
}
}
return ECORE_CALLBACK_CANCEL;
}
+void vconf_tapi_init_ready_changed_cb(keynode_t * node, void *data)
+{
+ int api_ret = 0;
+ int isReady = 0;
+ struct appdata *ad = data;
+
+ _DBG("vconf_tapi_init_ready_changed_cb..!!");
+
+ api_ret = vconf_get_bool(VCONFKEY_TELEPHONY_READY, &isReady);
+ if (api_ret != 0) {
+ _DBG("fail to get vconf key value");
+ } else {
+ if (!isReady) {
+ _DBG("telephony init is not ready");
+ } else {
+ _DBG("telephony init is ready");
+ vconf_ignore_key_changed
+ (VCONFKEY_TELEPHONY_READY, vconf_tapi_init_ready_changed_cb);
+
+ _trans(ad, _ST_TAPI_INIT);
+ do_state(ad);
+ }
+ }
+ return;
+}
+
+void register_vconf_tapi_init_ready_changed(struct appdata *ad)
+{
+ _DBG("%s", __func__);
+ if (vconf_notify_key_changed
+ (VCONFKEY_TELEPHONY_READY, vconf_tapi_init_ready_changed_cb,
+ ad) != 0) {
+ _DBG("Fail to register");
+ }
+}
static int do_ST_TAPI_INIT(struct appdata *ad)
{
int r;
int is_emul;
char *model = NULL;
- int tapi_state = VCONFKEY_TELEPHONY_TAPI_STATE_NONE;
+ int bReady = 0;
_DBG("%s", __func__);
+ vconf_get_bool(VCONFKEY_TELEPHONY_READY, &bReady);
+
+ if (!bReady) {
+ _DBG("telephony is not ready");
+ register_vconf_tapi_init_ready_changed(ad);
+
+ return EINA_FALSE;
+ }
+
+ _DBG("telephony is ready for init");
+
r = system_info_get_value_string(SYSTEM_INFO_KEY_MODEL, &model);
if (r != SYSTEM_INFO_ERROR_NONE) {
_ERR("system_info_get_value_string return error : %d", r);
@@ -580,20 +626,6 @@ static int do_ST_TAPI_INIT(struct appdata *ad)
PWLOCK_MEMFREE(model);
- vconf_get_int(VCONFKEY_TELEPHONY_TAPI_STATE, &tapi_state);
-
- if (tapi_state == VCONFKEY_TELEPHONY_TAPI_STATE_NONE && is_emul == 0) {
- _DBG("TAPI is not ready");
-
- /* SHOULD MANAGE TIMER FROM NOW - START PART */
- ad->pTimerId =
- ecore_timer_add(20, vconf_tapi_ready_expire_cb, ad);
- register_vconf_tapi_state_changed(ad);
- return EINA_FALSE;
- }
-
- _DBG("TAPI is ready");
-
ad->t = pwlock_tapi_init(pwlock_tapi_cb, ad);
if (ad->t == NULL) {
_ERR("TAPI init error");
@@ -605,9 +637,22 @@ static int do_ST_TAPI_INIT(struct appdata *ad)
return EINA_FALSE;
}
- _trans(ad, _ST_SIM);
- do_state(ad);
- return EINA_TRUE;
+ r = pwlock_tapi_ready_check();
+ _DBG("tapi_ready_check : %d", r);
+
+ if (r == 0 && is_emul == 0) {
+ /* SHOULD MANAGE TIMER FROM NOW - START PART */
+ ad->pTimerId =
+ ecore_timer_add(20, vconf_tapi_ready_expire_cb, ad);
+ register_vconf_tapi_ready_changed(ad);
+ r = EINA_FALSE;
+ } else {
+ _trans(ad, _ST_SIM);
+ do_state(ad);
+ r = EINA_TRUE;
+ }
+
+ return r;
}
static int do_ST_SIM(struct appdata *ad)