From 1978d7d51b65b7a9d308aa3614206fb11184a1c5 Mon Sep 17 00:00:00 2001 From: "aman.jeph" Date: Thu, 29 Apr 2021 17:09:12 +0530 Subject: [WGID:460237] and voice wake up changes Change-Id: I15ef95d1f71557e5fde0f5c6b800c853bade1764 Signed-off-by: aman.jeph --- res/po/ar.po | 3 ++ res/po/az.po | 3 ++ res/po/bg.po | 3 ++ res/po/ca.po | 3 ++ res/po/cs.po | 3 ++ res/po/da.po | 3 ++ res/po/de.po | 3 ++ res/po/el_GR.po | 3 ++ res/po/en.po | 3 ++ res/po/en_PH.po | 3 ++ res/po/en_US.po | 3 ++ res/po/es_ES.po | 3 ++ res/po/es_US.po | 3 ++ res/po/et.po | 3 ++ res/po/eu.po | 3 ++ res/po/fi.po | 3 ++ res/po/fr.po | 3 ++ res/po/fr_CA.po | 3 ++ res/po/ga.po | 3 ++ res/po/gl.po | 3 ++ res/po/hr.po | 3 ++ res/po/hu.po | 3 ++ res/po/hy.po | 3 ++ res/po/is.po | 3 ++ res/po/it_IT.po | 3 ++ res/po/ka.po | 3 ++ res/po/kk.po | 3 ++ res/po/ko_KR.po | 3 ++ res/po/lt.po | 3 ++ res/po/lv.po | 3 ++ res/po/mk.po | 3 ++ res/po/nb.po | 3 ++ res/po/nl.po | 3 ++ res/po/pl.po | 3 ++ res/po/pt_BR.po | 3 ++ res/po/pt_PT.po | 3 ++ res/po/ro.po | 3 ++ res/po/ru_RU.po | 3 ++ res/po/sk.po | 3 ++ res/po/sl.po | 3 ++ res/po/sr.po | 3 ++ res/po/sv.po | 3 ++ res/po/tr_TR.po | 3 ++ res/po/uk.po | 3 ++ res/po/uz.po | 3 ++ res/po/zh_CN.po | 3 ++ res/po/zh_HK.po | 3 ++ res/po/zh_TW.po | 3 ++ src/notifications/activenoti.c | 4 ++ src/notifications/noti_section.c | 10 +---- src/settings/modules/voice-control.c | 78 ++++++++++++++---------------------- 51 files changed, 180 insertions(+), 56 deletions(-) diff --git a/res/po/ar.po b/res/po/ar.po index 4f3855e..18f4c5c 100755 --- a/res/po/ar.po +++ b/res/po/ar.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "لا يمكن تنشيط كل من Wi-Fi وMobile AP في الوقت نفسه. هل تريد إلغاء تنشيط Mobile AP؟" diff --git a/res/po/az.po b/res/po/az.po index f9f3dce..7896005 100755 --- a/res/po/az.po +++ b/res/po/az.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi və Mobile AP eyni zamanda aktivləşdirilə bilməz. Mobile AP qeyri-aktiv edilsin?" diff --git a/res/po/bg.po b/res/po/bg.po index 8761121..bcb391b 100755 --- a/res/po/bg.po +++ b/res/po/bg.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi и Mobile AP не могат да бъдат активирани едновременно.. Деактивиране на Mobile AP?" diff --git a/res/po/ca.po b/res/po/ca.po index 0ea14a5..41445ea 100755 --- a/res/po/ca.po +++ b/res/po/ca.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "No es poden activar els punt d'accés Wi-Fi i mòbil al mateix temps. Desactivar al punt d'accés mòbil?" diff --git a/res/po/cs.po b/res/po/cs.po index 5cb8b4a..e525c00 100755 --- a/res/po/cs.po +++ b/res/po/cs.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi a mobilní přístupový bod nelze aktivovat současně. Chcete deaktivovat mobilní přístupový bod?" diff --git a/res/po/da.po b/res/po/da.po index 7aee68e..e41274d 100755 --- a/res/po/da.po +++ b/res/po/da.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Både Wi-Fi og mobilt adgangspunkt kan ikke være aktiveret på samme tid. Deaktiver mobilt adgangspunkt?" diff --git a/res/po/de.po b/res/po/de.po index b7a508e..2db9b73 100755 --- a/res/po/de.po +++ b/res/po/de.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "WLAN und Mobile AP können nicht zur gleichen Zeit aktiviert werden. Mobile AP deaktivieren?" diff --git a/res/po/el_GR.po b/res/po/el_GR.po index e52ebdb..1ef0edd 100755 --- a/res/po/el_GR.po +++ b/res/po/el_GR.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Τόσο το Wi-Fi όσο και το AP για κινητά δεν μπορούν να ενεργοποιηθούν ταυτόχρονα. Απενεργοποίηση AP για κινητά;" diff --git a/res/po/en.po b/res/po/en.po index 7db1ef1..5aa9748 100755 --- a/res/po/en.po +++ b/res/po/en.po @@ -37,6 +37,9 @@ msgstr "Auto\nrotate" msgid "IDS_ST_BUTTON2_VOICE_CONTROL" msgstr "Voice Control" +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_ST_BUTTON2_SOFTKEY_CONTAINER" msgstr "Soft keys" diff --git a/res/po/en_PH.po b/res/po/en_PH.po index bd04c33..6749c09 100755 --- a/res/po/en_PH.po +++ b/res/po/en_PH.po @@ -37,6 +37,9 @@ msgstr "Auto\nrotate" msgid "IDS_ST_BUTTON2_VOICE_CONTROL" msgstr "Voice Control" +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_ST_BUTTON2_SOFTKEY_CONTAINER" msgstr "Soft keys" diff --git a/res/po/en_US.po b/res/po/en_US.po index b5284bc..2355da3 100755 --- a/res/po/en_US.po +++ b/res/po/en_US.po @@ -37,6 +37,9 @@ msgstr "Auto\nrotate" msgid "IDS_ST_BUTTON2_VOICE_CONTROL" msgstr "Voice Control" +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_ST_BUTTON2_SOFTKEY_CONTAINER" msgstr "Soft keys" diff --git a/res/po/es_ES.po b/res/po/es_ES.po index c05817a..ec82b2a 100755 --- a/res/po/es_ES.po +++ b/res/po/es_ES.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Las conexiones Wi-Fi y Mobile AP no se pueden activar al mismo tiempo. ¿Desactivar Mobile AP?" diff --git a/res/po/es_US.po b/res/po/es_US.po index 882f0cc..3c01003 100755 --- a/res/po/es_US.po +++ b/res/po/es_US.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Las conexiones Wi-Fi y Mobile AP no se pueden activar al mismo tiempo. ¿Desactivar Mobile AP?" diff --git a/res/po/et.po b/res/po/et.po index bc37b23..99398e0 100755 --- a/res/po/et.po +++ b/res/po/et.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fit ja Mobile AP-d ei saa aktiveerida samaaegselt. Kas desaktiveerida Mobile AP?" diff --git a/res/po/eu.po b/res/po/eu.po index e7b8fcc..cfbdfd0 100755 --- a/res/po/eu.po +++ b/res/po/eu.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi eta Mobile AP ezin dira aldi berean aktibatu. Desaktibatu Mobile AP?" diff --git a/res/po/fi.po b/res/po/fi.po index 74dfa85..37d5b5e 100755 --- a/res/po/fi.po +++ b/res/po/fi.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fiä ja mobiilitukiasemaa ei voi ottaa käyttöön samaan aikaan. Haluatko poistaa mobiilitukiaseman käytöstä?" diff --git a/res/po/fr.po b/res/po/fr.po index 8aed3d4..57ded6c 100755 --- a/res/po/fr.po +++ b/res/po/fr.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Activation simultanée du Wi-Fi et du point d'accès mobile impossible. Désactiver le point d'accès mobile ?" diff --git a/res/po/fr_CA.po b/res/po/fr_CA.po index 5ba270d..83154f5 100755 --- a/res/po/fr_CA.po +++ b/res/po/fr_CA.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Activation simultanée de wifi et du point d'accès mobile impossible. Désactiver le point d'accès mobile ?" diff --git a/res/po/ga.po b/res/po/ga.po index 06b6072..d33184d 100755 --- a/res/po/ga.po +++ b/res/po/ga.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Ní féidir Wi-Fi agus AP Móibíleach a chur i ngníomh ag an am céanna. Díghníomhachtaigh AP Móibíleach?" diff --git a/res/po/gl.po b/res/po/gl.po index a2dd480..76bada4 100755 --- a/res/po/gl.po +++ b/res/po/gl.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "O Wi-Fi e AP Móbil non poden activarse ao mesmo tempo. Desactivar AP Móbil?" diff --git a/res/po/hr.po b/res/po/hr.po index fd2c6be..6f49ed9 100755 --- a/res/po/hr.po +++ b/res/po/hr.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Istodobno ne možete uključiti Wi-Fi i Mobile AP. Isključiti Mobilnu pristupnu točku?" diff --git a/res/po/hu.po b/res/po/hu.po index 4bdf41a..40531d3 100755 --- a/res/po/hu.po +++ b/res/po/hu.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "A Wi-Fi és a Mobil AP-nem lehet egyszerre aktív. Kikapcsolja a Mobil AP-t?" diff --git a/res/po/hy.po b/res/po/hy.po index 108da8c..fde84b2 100755 --- a/res/po/hy.po +++ b/res/po/hy.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi-ն ու Mobile AP-ն չեն կարող միաժամանակ ակտիվացվել: Ապաակտիվացնե՞լ Mobile AP-ն:" diff --git a/res/po/is.po b/res/po/is.po index 48cadde..188a70c 100755 --- a/res/po/is.po +++ b/res/po/is.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Það er ekki hægt að nota Wi-Fi og farsímaaðgangsstað á sama tíma. Viltu loka farsímaaðgangsstaðnum?" diff --git a/res/po/it_IT.po b/res/po/it_IT.po index 19a38c1..46e540a 100755 --- a/res/po/it_IT.po +++ b/res/po/it_IT.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Impossibile attivare contemporaneamente sia Wi-Fi che Router Wi-Fi. Disattivare Router Wi-Fi?" diff --git a/res/po/ka.po b/res/po/ka.po index d22ad4a..471f344 100755 --- a/res/po/ka.po +++ b/res/po/ka.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi და Mobile AP ვერ გააქტიურდება ერთიდაიმავე დროს. გამოირთოს Mobile AP?" diff --git a/res/po/kk.po b/res/po/kk.po index 80a805c..9cf3d88 100755 --- a/res/po/kk.po +++ b/res/po/kk.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi және Mobile AP екеуін де бір уақытта іске қосу мүмкін емес. Mobile AP мүмкіндігін өшіру керек пе?" diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po index 3ad2ce8..2427cd1 100755 --- a/res/po/ko_KR.po +++ b/res/po/ko_KR.po @@ -40,6 +40,9 @@ msgstr "소프트키" msgid "IDS_ST_BUTTON2_VOICE_CONTROL" msgstr "음성 제어" +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "음성 호출" + msgid "IDS_COM_BODY_NO_SERVICE" msgstr "서비스 지역이 아닙니다" diff --git a/res/po/lt.po b/res/po/lt.po index 4bb5b19..cdc2b47 100755 --- a/res/po/lt.po +++ b/res/po/lt.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Tuo pat metu negalima suaktyvinti ir „Wi-Fi“, ir „Mobile AP“. Išjungti „Mobile AP“?" diff --git a/res/po/lv.po b/res/po/lv.po index 66a85b7..38071d2 100755 --- a/res/po/lv.po +++ b/res/po/lv.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Vienlaikus nevar aktivizēt Wi-Fi un Mobile AP. Vai deaktivizēt Mobile AP?" diff --git a/res/po/mk.po b/res/po/mk.po index 4a4cf04..9e95ce2 100755 --- a/res/po/mk.po +++ b/res/po/mk.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Не може истовремено да се активни и Wi-Fi и мобилна пристапна точка. Да се исклучи мобилната пристапна точка?" diff --git a/res/po/nb.po b/res/po/nb.po index 1f3e95e..cc52509 100755 --- a/res/po/nb.po +++ b/res/po/nb.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Både Wi-Fi og mobilt tilgangspunkt kan ikke aktiveres samtidig. Deaktivere mobilt tilgangspunkt?" diff --git a/res/po/nl.po b/res/po/nl.po index c6eaacc..fd46b7c 100755 --- a/res/po/nl.po +++ b/res/po/nl.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi en mobiel access point kunnen niet tegelijkertijd zijn geactiveerd. Mobiel access point uitschakelen?" diff --git a/res/po/pl.po b/res/po/pl.po index 78396f8..0513a06 100755 --- a/res/po/pl.po +++ b/res/po/pl.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Sieć Wi-Fi i Router Wi-Fi nie mogą być uruchomione jednocześnie. Wyłączyć Router Wi-Fi?" diff --git a/res/po/pt_BR.po b/res/po/pt_BR.po index b5bcba9..ae08095 100755 --- a/res/po/pt_BR.po +++ b/res/po/pt_BR.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Impossível utilizar Wi-Fi ou AllShare com o Roteador Wi-Fi simultaneamente. Desativar o Roteador Wi-Fi?" diff --git a/res/po/pt_PT.po b/res/po/pt_PT.po index 0ecab98..f2e35c7 100755 --- a/res/po/pt_PT.po +++ b/res/po/pt_PT.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Impossível activar Wi-Fi e PA Móvel em simultâneo. Desactivar PA Móvel?" diff --git a/res/po/ro.po b/res/po/ro.po index 01d6cb2..dfb9197 100755 --- a/res/po/ro.po +++ b/res/po/ro.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi și PA mobil nu pot fi activate simultan. Dezactivați PA mobil?" diff --git a/res/po/ru_RU.po b/res/po/ru_RU.po index 3212f00..ec249fc 100755 --- a/res/po/ru_RU.po +++ b/res/po/ru_RU.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Нельзя активировать одновременно Wi-Fi и Mobile AP. Отключить Mobile AP?" diff --git a/res/po/sk.po b/res/po/sk.po index 826b6ee..d7c98b5 100755 --- a/res/po/sk.po +++ b/res/po/sk.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi a mobilný prístupový bod sa nedajú aktivovať súčasne. Deaktivovať mobilný prístupový bod?" diff --git a/res/po/sl.po b/res/po/sl.po index 4244040..efa1740 100755 --- a/res/po/sl.po +++ b/res/po/sl.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi in mobilna DT ne moreta biti vklopljeni hkrati. Izklopim mobilno DT?" diff --git a/res/po/sr.po b/res/po/sr.po index c08d809..7a304e3 100755 --- a/res/po/sr.po +++ b/res/po/sr.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi i mobilna pristupna tačka se ne mogu uključiti istovremeno. Isključi mobilnu pristupnu tačku?" diff --git a/res/po/sv.po b/res/po/sv.po index 9feb0c5..0921d99 100755 --- a/res/po/sv.po +++ b/res/po/sv.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Det går inte att aktivera både Wi-Fi och Mobile AP samtidigt. Avaktivera Mobile AP?" diff --git a/res/po/tr_TR.po b/res/po/tr_TR.po index 879a5b8..62f647b 100755 --- a/res/po/tr_TR.po +++ b/res/po/tr_TR.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Hem Wi-Fi hem de Mobil AP aynı anda etkinleştirilemez. Mobil AP devre dışı bırakılsın mı?" diff --git a/res/po/uk.po b/res/po/uk.po index 73daba1..b673195 100755 --- a/res/po/uk.po +++ b/res/po/uk.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Мережі Wi-Fi та Mobile AP не можна активувати одночасно. Вимкнути Mobile AP?" diff --git a/res/po/uz.po b/res/po/uz.po index 87d98b0..9e7514c 100755 --- a/res/po/uz.po +++ b/res/po/uz.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Bir vaqtning o‘zida Wi-Fi va Mobile APni faollashtirib bo‘lmaydi. Mobile AP o‘chirilsinmi?" diff --git a/res/po/zh_CN.po b/res/po/zh_CN.po index 28e6cdc..793da52 100755 --- a/res/po/zh_CN.po +++ b/res/po/zh_CN.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi和移动接入无法同时启动。取消移动接入？" diff --git a/res/po/zh_HK.po b/res/po/zh_HK.po index c00ffbc..2cfc976 100755 --- a/res/po/zh_HK.po +++ b/res/po/zh_HK.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi-Fi和Mobile AP不可同時啟動。關閉Mobile AP嗎?" diff --git a/res/po/zh_TW.po b/res/po/zh_TW.po index e6f9dd0..521986f 100755 --- a/res/po/zh_TW.po +++ b/res/po/zh_TW.po @@ -1,3 +1,6 @@ +msgid "IDS_ST_BUTTON2_VOICE_WAKE_UP" +msgstr "Voice wake-up" + msgid "IDS_WIFI_POP_BOTH_WI_FI_AND_MOBILE_AP_CANNOT_BE_ACTIVATED_AT_THE_SAME_TIME_DEACTIVATE_MOBILE_AP_Q" msgstr "Wi - Fi和行動AP不能在同一時間被啟動。停用行動AP？" diff --git a/src/notifications/activenoti.c b/src/notifications/activenoti.c index 35900b8..a6ec4fa 100755 --- a/src/notifications/activenoti.c +++ b/src/notifications/activenoti.c @@ -502,6 +502,8 @@ static void _activenoti_remove_list(void) /** * For debugging */ + if(info == NULL) + continue; tmp = _get_text(info->noti, NOTIFICATION_TEXT_TYPE_TITLE); DBG("auto remove %s", tmp); free(tmp); @@ -514,6 +516,8 @@ static void _activenoti_remove_list(void) /** * For debugging */ + if(info == NULL) + continue; tmp = _get_text(info->noti, NOTIFICATION_TEXT_TYPE_TITLE); DBG("nont auto remove %s", tmp); free(tmp); diff --git a/src/notifications/noti_section.c b/src/notifications/noti_section.c index d5ed7e1..d45c026 100755 --- a/src/notifications/noti_section.c +++ b/src/notifications/noti_section.c @@ -216,15 +216,7 @@ HAPI void quickpanel_noti_section_create(Evas_Object *parent) noti_section_data.noti_setting_btn = focus_setting; // Set initial state of voice control icon - bool status = false; - int ret_val = vc_setting_get_enabled(&status); - if(ret_val == VC_ERROR_NONE) { - if(status) { - quickpanel_voice_control_launch_icon_disable_state_set(EINA_FALSE); - } else { - quickpanel_voice_control_launch_icon_disable_state_set(EINA_TRUE); - } - } + quickpanel_voice_control_launch_icon_disable_state_set(EINA_FALSE); } static void _focus_pair_set(Evas_Object *view) diff --git a/src/settings/modules/voice-control.c b/src/settings/modules/voice-control.c index 338e5e0..95ee80f 100755 --- a/src/settings/modules/voice-control.c +++ b/src/settings/modules/voice-control.c @@ -37,11 +37,12 @@ #include "settings_icon_common.h" #include "noti_section.h" -#define BUTTON_LABEL _("IDS_ST_BUTTON2_VOICE_CONTROL") +#define BUTTON_LABEL _("IDS_ST_BUTTON2_VOICE_WAKE_UP") #define BUTTON_ICON_NORMAL "icon_voice_control_off.png" #define BUTTON_ICON_HIGHLIGHT "icon_voice_control_on.png" #define BUTTON_ICON_DIM "icon_voice_control_disabled.png" #define VOICE_CONTROL_PKG "org.tizen.voice-control-panel" +#define VCONF_KEY_VOICE_WAKE_UP "db/multi-assistant/activated" static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source); @@ -104,17 +105,18 @@ static void _status_update(QP_Module_Setting *module, int flag_extra_1, int flag { retif(module == NULL, , "Invalid parameter!"); - bool status = false; - if (VC_ERROR_NONE != vc_setting_get_enabled(&status)) { - ERR("Fail to get voice control enabled status"); + int ret = 0; + int status = 0; + ret = vconf_get_bool(VCONF_KEY_VOICE_WAKE_UP, &status); + if(ret != 0) + { + ERR("Failed to get VCONF_KEY_VOICE_WAKE_UP status..so setting the default value 0"); } - if (status == true) { + if (status == 1) { quickpanel_setting_module_icon_state_set(module, ICON_VIEW_STATE_ON); - quickpanel_voice_control_launch_icon_disable_state_set(EINA_FALSE); } else { quickpanel_setting_module_icon_state_set(module, ICON_VIEW_STATE_OFF); - quickpanel_voice_control_launch_icon_disable_state_set(EINA_TRUE); } quickpanel_setting_module_icon_view_update(module, quickpanel_setting_module_icon_state_get(module), FLAG_VALUE_VOID); } @@ -128,74 +130,56 @@ static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission if(quickpanel_setting_module_icon_state_get(module) == 1) { DBG("***** %d value *****",quickpanel_setting_module_icon_state_get(module)); - if(VC_ERROR_NONE != vc_setting_set_enabled(false)) { - ERR("Fail to set enabled"); + int ret = 0; + ret = vconf_set_bool(VCONF_KEY_VOICE_WAKE_UP, 0); + if(ret != 0) + { + ERR("Failed to set VCONF_KEY_VOICE_WAKE_UP"); return; } - bool disabled = true; - if (VC_ERROR_NONE != vc_setting_get_enabled(&disabled)) { - ERR("Fail to get disabled"); - return ; - } - DBG("_check_voice_control_disabled [%d]", disabled); - quickpanel_setting_module_icon_state_set(module, 0); quickpanel_setting_module_icon_view_update(module ,0,FLAG_VALUE_VOID); - //Disable voice control app launch icon - quickpanel_voice_control_launch_icon_disable_state_set(EINA_TRUE); } else { DBG("***** %d value *****",quickpanel_setting_module_icon_state_get(module)); - if(VC_ERROR_NONE != vc_setting_set_enabled(true)) { - ERR("Fail to set enabled"); - return ; - } - bool enabled = false; - if (VC_ERROR_NONE != vc_setting_get_enabled(&enabled)) { - ERR("Fail to get enabled"); + int ret = 0; + ret = vconf_set_bool(VCONF_KEY_VOICE_WAKE_UP, 1); + if(ret != 0) + { + ERR("Failed to set VCONF_KEY_VOICE_WAKE_UP"); return; } - DBG("_check_voice_control_enabled [%d]", enabled); quickpanel_setting_module_icon_state_set(module, 1); quickpanel_setting_module_icon_view_update(module ,1,FLAG_VALUE_VOID); - //Enable voice control app launch icon - quickpanel_voice_control_launch_icon_disable_state_set(EINA_FALSE); } } -static void _vc_enabled_changed_cb(bool enabled, void* user_data) +static void _voice_wakeup_vconf_changed_cb(keynode_t *node, void *data) { - QP_Module_Setting *module = (QP_Module_Setting *)user_data; - if(enabled) { - quickpanel_setting_module_icon_state_set(module, 1); - quickpanel_setting_module_icon_view_update(module ,1,FLAG_VALUE_VOID); - quickpanel_voice_control_launch_icon_disable_state_set(EINA_FALSE); - } else { - quickpanel_setting_module_icon_state_set(module, 0); - quickpanel_setting_module_icon_view_update(module ,0,FLAG_VALUE_VOID); - quickpanel_voice_control_launch_icon_disable_state_set(EINA_TRUE); - } + _status_update(data, FLAG_VALUE_VOID, FLAG_VALUE_VOID); } static int _register_module_event_handler(void *data) { - if (0 != vc_setting_set_enabled_changed_cb(_vc_enabled_changed_cb, data)) { - ERR("Fail to set enabled cb"); - return QP_FAIL; - } + int ret = 0; + + ret = vconf_notify_key_changed(VCONF_KEY_VOICE_WAKE_UP, _voice_wakeup_vconf_changed_cb, data); + msgif(ret != 0, "failed to vconf_notify_key_changed VCONF_KEY_VOICE_WAKE_UP -[%d]", ret); + return QP_OK; } static int _unregister_module_event_handler(void *data) { - if (0 != vc_setting_unset_enabled_changed_cb()) { - ERR("Fail to unset enabled cb"); - return QP_FAIL; - } + int ret = 0; + + ret = vconf_ignore_key_changed(VCONF_KEY_VOICE_WAKE_UP, _voice_wakeup_vconf_changed_cb); + msgif(ret != 0, "failed to vconf_ignore_key_changed VCONF_KEY_VOICE_WAKE_UP -[%d]", ret); + return QP_OK; } -- cgit v1.2.3