From: Oleksander Kostenko Date: Thu, 6 Apr 2017 14:38:40 +0000 (+0300) Subject: TizenRefApp-8338 Implement missing popups in Composer X-Git-Tag: submit/tizen/20170427.124559~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F123705%2F2;p=profile%2Fwearable%2Fapps%2Fnative%2Fmessage.git TizenRefApp-8338 Implement missing popups in Composer Change-Id: I628455a5ed95714d3f5c8e07aecc4de601776634 Signed-off-by: Oleksander Kostenko --- diff --git a/res/po/ar.po b/res/po/ar.po index 9c9e454..93654c7 100644 --- a/res/po/ar.po +++ b/res/po/ar.po @@ -235,3 +235,6 @@ msgstr "انقر هنا لاسترداد الرسالة" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "يتعذر استرداد الرسالة. إن بيانات المحمول متوقفة عن التشغيل." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "حسناً" + diff --git a/res/po/az.po b/res/po/az.po index c11ddc1..e073b0c 100644 --- a/res/po/az.po +++ b/res/po/az.po @@ -235,3 +235,6 @@ msgstr "Msj bərpa etmək üçün bura vur" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Mesajı çıxarmaq olmadı. Mobil data sönülüdür." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/bg.po b/res/po/bg.po index 4962c32..57fb6db 100644 --- a/res/po/bg.po +++ b/res/po/bg.po @@ -235,3 +235,6 @@ msgstr "Докоснете тук, за да извлечете съобщени msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Не може да се извлече съобщението. Моб. данни са изключ." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/ca.po b/res/po/ca.po index 274a607..a397cbf 100644 --- a/res/po/ca.po +++ b/res/po/ca.po @@ -235,3 +235,6 @@ msgstr "Toqui aquí per recuperar el missatge" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "No es pot recuperar el missatge. Dades mòbils apagades." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "ACCEPTAR" + diff --git a/res/po/cs.po b/res/po/cs.po index 8090e06..6dc21ad 100644 --- a/res/po/cs.po +++ b/res/po/cs.po @@ -235,3 +235,6 @@ msgstr "Klepnutím sem načtete zprávu" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Zprávu nelze načíst. Mobilní data jsou vypnutá." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/da.po b/res/po/da.po index 11bb0e8..ab4f750 100644 --- a/res/po/da.po +++ b/res/po/da.po @@ -235,3 +235,6 @@ msgstr "Tryk her for at hente beskeden" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Kan ikke hente besked. Mobile data er deaktiveret." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/de.po b/res/po/de.po index 4036395..1e6e206 100644 --- a/res/po/de.po +++ b/res/po/de.po @@ -235,3 +235,6 @@ msgstr "Hier tippen, um die Nachricht abzurufen." msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Nachricht abrufen nicht möglich. Mobile Daten deaktiviert." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/el_GR.po b/res/po/el_GR.po index 234d676..aadfdbb 100644 --- a/res/po/el_GR.po +++ b/res/po/el_GR.po @@ -235,3 +235,6 @@ msgstr "Πατήστε εδώ για να ανακτήσετε το μήνυμα msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Αδυν. ανάκτησης μηνύμ. Τα δεδ. κιν. τηλ. είναι ανενεργά." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/en.po b/res/po/en.po index e122797..8761325 100644 --- a/res/po/en.po +++ b/res/po/en.po @@ -235,3 +235,6 @@ msgstr "Tap here to retrieve message" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Unable to retrieve message. Mobile data off." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/en_PH.po b/res/po/en_PH.po index 858e1f1..1130d25 100644 --- a/res/po/en_PH.po +++ b/res/po/en_PH.po @@ -235,3 +235,6 @@ msgstr "Tap here to retrieve message" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Unable to retrieve message. Mobile data off." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/en_US.po b/res/po/en_US.po index 55cbfd0..2b4489b 100644 --- a/res/po/en_US.po +++ b/res/po/en_US.po @@ -235,3 +235,6 @@ msgstr "Tap here to retrieve message" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Unable to retrieve message. Mobile data off." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/es_ES.po b/res/po/es_ES.po index d2c0240..27fea2d 100644 --- a/res/po/es_ES.po +++ b/res/po/es_ES.po @@ -235,3 +235,6 @@ msgstr "Pulsar aquí para recuperar el mensaje" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Imposible recuperar mensaje. Datos móviles desactivados." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "ACEPTAR" + diff --git a/res/po/es_US.po b/res/po/es_US.po index a019821..9be00b7 100644 --- a/res/po/es_US.po +++ b/res/po/es_US.po @@ -235,3 +235,6 @@ msgstr "Pulsar aquí para recuperar mensaje" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "No se recuperó el mensaje. Datos móviles desactivados." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "ACEPTAR" + diff --git a/res/po/et.po b/res/po/et.po index 6c16fe3..50e9315 100644 --- a/res/po/et.po +++ b/res/po/et.po @@ -235,3 +235,6 @@ msgstr "Toksake siia, et taastada sõnumit" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Sõn. ei saa laadida. Mob. andmeside on välja lülitatud." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/eu.po b/res/po/eu.po index ef91de9..2e190ea 100644 --- a/res/po/eu.po +++ b/res/po/eu.po @@ -235,3 +235,6 @@ msgstr "Ukitu hau mezua eskuratzeko" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Ezin da mezua eskuratu. Datu mugikorrak desaktibatuta." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "ADOS" + diff --git a/res/po/fi.po b/res/po/fi.po index 262cb79..08daf47 100644 --- a/res/po/fi.po +++ b/res/po/fi.po @@ -235,3 +235,6 @@ msgstr "Palauta viesti napauttamalla tätä" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Viestiä ei voi hakea. Mobiilidata on poistettu käytöstä." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/fr.po b/res/po/fr.po index 7a15d49..91754a9 100644 --- a/res/po/fr.po +++ b/res/po/fr.po @@ -235,3 +235,6 @@ msgstr "Appuyer ici pour récupérer le message" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Impossible récupérer message. Données mobiles désactivées." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/fr_CA.po b/res/po/fr_CA.po index ba928dd..f41a140 100644 --- a/res/po/fr_CA.po +++ b/res/po/fr_CA.po @@ -235,3 +235,6 @@ msgstr "Toucher ici pour récupérer le message" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Impossible récupérer message. Données mobiles désactivées." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/ga.po b/res/po/ga.po index 960ad93..c852b38 100644 --- a/res/po/ga.po +++ b/res/po/ga.po @@ -235,3 +235,6 @@ msgstr "Tapáil anseo leis an teachtaireacht a aisghabháil" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Ní féidir teachtaireacht a aisghabháil. Sonraí móib. as." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/gl.po b/res/po/gl.po index bbb728a..0319606 100644 --- a/res/po/gl.po +++ b/res/po/gl.po @@ -235,3 +235,6 @@ msgstr "Toca aquí para recuperar a mensaxe" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Non se pode recuperar a mensaxe. Datos móbiles desact." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "ACEPTAR" + diff --git a/res/po/hi.po b/res/po/hi.po index faa12d6..08b7205 100644 --- a/res/po/hi.po +++ b/res/po/hi.po @@ -235,3 +235,6 @@ msgstr "सन्देश पुनर्प्राप्त करने क msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "सन्देश पुनर्प्राप्‍त करने में असमर्थ। मोबाइल डाटा बंद है।" +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "ओके" + diff --git a/res/po/hr.po b/res/po/hr.po index 3c0b576..be33d66 100644 --- a/res/po/hr.po +++ b/res/po/hr.po @@ -235,3 +235,6 @@ msgstr "Dodirnite ovdje za preuzimanje poruke" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Nije moguće preuzeti poruku. Mobilni podaci isključeni." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "U REDU" + diff --git a/res/po/hu.po b/res/po/hu.po index 5994705..e7476b4 100644 --- a/res/po/hu.po +++ b/res/po/hu.po @@ -235,3 +235,6 @@ msgstr "Érintse meg az üzenet letöltéséhez" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Kikapcsolt Mobilinternet-kapcsolattal nem lehet letölteni." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/hy.po b/res/po/hy.po index 4c6e2b7..04ea65e 100644 --- a/res/po/hy.po +++ b/res/po/hy.po @@ -235,3 +235,6 @@ msgstr "Թակեք այստեղ՝ հաղորդագրությունն առբեր msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Անհնար է առբերել հղրդգրությունը: Շարժ. տվյալներն անջ. են:" +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/is.po b/res/po/is.po index 41901fb..9ae5cff 100644 --- a/res/po/is.po +++ b/res/po/is.po @@ -235,3 +235,6 @@ msgstr "Pikkaðu hér til að sækja skilaboð" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Ekki er hægt að sækja skilaboð. Slökkt á farsímagögnum." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "Í LAGI" + diff --git a/res/po/it_IT.po b/res/po/it_IT.po index 41f9bcb..5a63c2c 100644 --- a/res/po/it_IT.po +++ b/res/po/it_IT.po @@ -235,3 +235,6 @@ msgstr "Tocca qui per recuperare il messaggio" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Impossibile recuperare il messaggio. Conness. dati spenta." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/ja_JP.po b/res/po/ja_JP.po index ad016b0..43c5d60 100644 --- a/res/po/ja_JP.po +++ b/res/po/ja_JP.po @@ -235,3 +235,6 @@ msgstr "メッセージを取得するには、ここをタップしてくださ msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "メッセージを取得できません。モバイルデータがOFFです。" +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/ka.po b/res/po/ka.po index 1294f2d..2367a81 100644 --- a/res/po/ka.po +++ b/res/po/ka.po @@ -235,3 +235,6 @@ msgstr "შეტყობინების მისაღებად, შე msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "შეტყობინებას ვერ მიიღებთ. მობილური მონაცემები გამორთულია." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/kk.po b/res/po/kk.po index af4c2e5..61dc816 100644 --- a/res/po/kk.po +++ b/res/po/kk.po @@ -235,3 +235,6 @@ msgstr "Хабарды шығару үшін мына жерді түртіңі msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Хабарды қалпына келтіру мүм. емес. Ұялы деректер өшірулі." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po index cfa61be..2d9fa1a 100644 --- a/res/po/ko_KR.po +++ b/res/po/ko_KR.po @@ -235,3 +235,6 @@ msgstr "메시지를 가져오려면 여기를 누르세요" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "모바일 데이터가 해제되어 메시지를 가져올 수 없습니다." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "확인" + diff --git a/res/po/lt.po b/res/po/lt.po index 8e4c3b0..101770c 100644 --- a/res/po/lt.po +++ b/res/po/lt.po @@ -235,3 +235,6 @@ msgstr "Bakstelėkite čia ir atkurkite žinutę" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Neįmanoma gauti žinutės. Mobilieji duomenys išjungti." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "Gerai" + diff --git a/res/po/lv.po b/res/po/lv.po index e95a956..ea14767 100644 --- a/res/po/lv.po +++ b/res/po/lv.po @@ -235,3 +235,6 @@ msgstr "Pieskarieties šeit, lai izgūtu ziņu" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Nevar izgūt ziņu. Mobilie dati ir izslēgti." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "Labi" + diff --git a/res/po/mk.po b/res/po/mk.po index 9c54907..990ab22 100644 --- a/res/po/mk.po +++ b/res/po/mk.po @@ -235,3 +235,6 @@ msgstr "Допрете тука за да ја вратите пораката" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Не може да се преземе пораката. Моб. податоци се исклуч." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/nb.po b/res/po/nb.po index 7cc8f2a..c363cbb 100644 --- a/res/po/nb.po +++ b/res/po/nb.po @@ -235,3 +235,6 @@ msgstr "Trykk her for å hente melding" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Kan ikke hente melding. Mobildata er av." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/nl.po b/res/po/nl.po index 039c941..663fb15 100644 --- a/res/po/nl.po +++ b/res/po/nl.po @@ -235,3 +235,6 @@ msgstr "Tik hier om bericht op te halen" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Kan bericht niet ophalen. Mobiele gegevens uit." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/pl.po b/res/po/pl.po index 10d82b2..5f26749 100644 --- a/res/po/pl.po +++ b/res/po/pl.po @@ -235,3 +235,6 @@ msgstr "Dotknij tutaj, aby pobrać wiadomość" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Nie można pobrać wiadomości. Dane komórkowe wyłączone." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/pt_BR.po b/res/po/pt_BR.po index 6100a01..ccdf970 100644 --- a/res/po/pt_BR.po +++ b/res/po/pt_BR.po @@ -235,3 +235,6 @@ msgstr "Tocar aqui para recuperar mensagem" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Não é possível recuperar msg. Dados móveis desligados." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/pt_PT.po b/res/po/pt_PT.po index fa56aeb..cb8ef07 100644 --- a/res/po/pt_PT.po +++ b/res/po/pt_PT.po @@ -235,3 +235,6 @@ msgstr "Toque aqui para obter mensagem" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Impossível obter mensagem. Dados móveis desligados." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/ro.po b/res/po/ro.po index ccd288d..c343e3f 100644 --- a/res/po/ro.po +++ b/res/po/ro.po @@ -235,3 +235,6 @@ msgstr "Atingeți aici pentru a prelua mesajul" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Mesajul nu se poate prelua. Date mobile oprite." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/ru_RU.po b/res/po/ru_RU.po index 6de6108..bea1044 100644 --- a/res/po/ru_RU.po +++ b/res/po/ru_RU.po @@ -235,3 +235,6 @@ msgstr "Коснитесь здесь, чтобы получить сообще msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Не удалось получить сообщение. Мобильн. данные отключены." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/sk.po b/res/po/sk.po index 149c375..191b40e 100644 --- a/res/po/sk.po +++ b/res/po/sk.po @@ -235,3 +235,6 @@ msgstr "Ťuknutím sem môžete načítať správu" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Správa sa nedá načítať. Mobil. dátové pripoj. je vypnuté." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/sl.po b/res/po/sl.po index 5800207..9333ec0 100644 --- a/res/po/sl.po +++ b/res/po/sl.po @@ -235,3 +235,6 @@ msgstr "Pritisnite tukaj, da pridobite sporočilo" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Sporočila ni mogoče pridobiti. Mob. pod. so izklopljeni." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "V REDU" + diff --git a/res/po/sr.po b/res/po/sr.po index 3fc5ad3..89a27d6 100644 --- a/res/po/sr.po +++ b/res/po/sr.po @@ -235,3 +235,6 @@ msgstr "Kucnite ovde da biste primili poruke" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Nije moguće primiti poruku. Mobilni podaci su isključeni." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/sv.po b/res/po/sv.po index a9cdf57..1a1509a 100644 --- a/res/po/sv.po +++ b/res/po/sv.po @@ -235,3 +235,6 @@ msgstr "Tryck här för att hämta meddelandet" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Det går inte att hämta meddelandet. Mobildata avstängt." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/tr_TR.po b/res/po/tr_TR.po index ed7a034..64c682e 100644 --- a/res/po/tr_TR.po +++ b/res/po/tr_TR.po @@ -235,3 +235,6 @@ msgstr "Mesajı almak için buraya dokunun" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Mesaj alınamıyor. Mobil veri kapalı." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "Tamam" + diff --git a/res/po/uk.po b/res/po/uk.po index f039946..8810098 100644 --- a/res/po/uk.po +++ b/res/po/uk.po @@ -235,3 +235,6 @@ msgstr "Торкніться тут, щоб отримати повідомле msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Не вдалося отримати повідомлення. Мобільні дані вимкнено." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/uz.po b/res/po/uz.po index 691ff26..f86473a 100644 --- a/res/po/uz.po +++ b/res/po/uz.po @@ -235,3 +235,6 @@ msgstr "Xabarni olish uchun bu yerga teging" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "Xabarni qayta olib bo‘lmaydi. Mobil internet o‘chiq." +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "OK" + diff --git a/res/po/zh_CN.po b/res/po/zh_CN.po index e93d40e..76842af 100644 --- a/res/po/zh_CN.po +++ b/res/po/zh_CN.po @@ -235,3 +235,6 @@ msgstr "点击此处可获取信息" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "由于手机流量已关闭，无法获取信息。" +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "确定" + diff --git a/res/po/zh_HK.po b/res/po/zh_HK.po index 7f4220d..8531a39 100644 --- a/res/po/zh_HK.po +++ b/res/po/zh_HK.po @@ -235,3 +235,6 @@ msgstr "輕觸此處以取回訊息" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "無法取回訊息。流動數據已關閉。" +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "確定" + diff --git a/res/po/zh_TW.po b/res/po/zh_TW.po index 218a19a..decef8e 100644 --- a/res/po/zh_TW.po +++ b/res/po/zh_TW.po @@ -235,3 +235,6 @@ msgstr "輕觸此處以擷取訊息" msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB" msgstr "無法擷取訊息。行動數據已關閉。" +msgid "WDS_MSG_ACBUTTON_OK_ABB" +msgstr "確定" + diff --git a/src/Composer/Controller/inc/BodyFrame.h b/src/Composer/Controller/inc/BodyFrame.h new file mode 100644 index 0000000..5fd2bd9 --- /dev/null +++ b/src/Composer/Controller/inc/BodyFrame.h @@ -0,0 +1,69 @@ +/* + * Copyright 2016 Samsung Electronics Co., Ltd + * + * Licensed under the Flora License, Version 1.1 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef BodyFrame_h_ +#define BodyFrame_h_ + +#include "FrameController.h" +#include "DefaultLayout.h" +#include "ComposerLayout.h" +#include "MsgBodyView.h" +#include "Popup.h" + +namespace Msg { + class BodyFrame + : public FrameController { + + public: + BodyFrame(NaviFrameController &parent); + virtual ~BodyFrame(); + + private: + // NaviFrameItem: + void onAttached(ViewItem &item) override; + + // Hw buttons: + void onHwBackButtonPreessed(Evas_Object *obj, void *event); + + private: + void prepareLayouts(); + void prepareBody(); + void updateTextCounter(); + + // Popup: + void showMaxCharactersPopup(); + void showDisableFlightModePopup(); + void showSendingProgressPopup(); + void showSentPopup(); + void showSendingFailedPopup(); + void showUnableToSendMessagePopup(); + void showMmsTextLimitExceededPopup(); + void showUnableToSendMmsPopup(); + + // Popup callback: + void onCancelButtonClicked(Popup &popup); + void onTurnOffFlightModeClicked(Popup &popup); + void onAllowTransmissionTextLClicked(Popup &popup); + void onEnableDataRoamingClicked(Popup &popup); + + private: + DefaultLayout *m_pBaseLayout; + ComposerLayout *m_pLayout; + MsgBodyView *m_pBody; + }; +} + +#endif /* BodyFrame */ diff --git a/src/Composer/Controller/inc/ComposerFrame.h b/src/Composer/Controller/inc/ComposerFrame.h deleted file mode 100644 index 173ec7f..0000000 --- a/src/Composer/Controller/inc/ComposerFrame.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2016 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ComposerFrame_h_ -#define ComposerFrame_h_ - -#include "FrameController.h" -#include "DefaultLayout.h" -#include "ComposerLayout.h" -#include "MsgBodyView.h" - -namespace Msg { - class ComposerFrame - : public FrameController { - - public: - ComposerFrame(NaviFrameController &parent); - virtual ~ComposerFrame(); - - private: - // NaviFrameItem: - void onAttached(ViewItem &item) override; - - // Hw buttons: - void onHwBackButtonPreessed(Evas_Object *obj, void *event); - - private: - void prepareLayouts(); - void prepareBody(); - void updateTextCounter(); - - private: - DefaultLayout *m_pBaseLayout; - ComposerLayout *m_pLayout; - MsgBodyView *m_pBody; - }; -} - -#endif /* ComposerFrame */ diff --git a/src/Composer/Controller/src/BodyFrame.cpp b/src/Composer/Controller/src/BodyFrame.cpp new file mode 100644 index 0000000..0a80ec9 --- /dev/null +++ b/src/Composer/Controller/src/BodyFrame.cpp @@ -0,0 +1,175 @@ +/* + * Copyright 2016 Samsung Electronics Co., Ltd + * + * Licensed under the Flora License, Version 1.1 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "BodyFrame.h" +#include "Callback.h" +#include "StandardPopup.h" +#include "ToastPopup.h" +#include "IconTextPopup.h" + +using namespace Msg; + +BodyFrame::BodyFrame(NaviFrameController &parent) + : FrameController(parent) + , m_pBaseLayout(nullptr) + , m_pLayout(nullptr) + , m_pBody(nullptr) +{ + MSG_LOG(""); + prepareLayouts(); + prepareBody(); +} + +BodyFrame::~BodyFrame() +{ + MSG_LOG(""); +} + +void BodyFrame::prepareLayouts() +{ + if (!m_pBaseLayout) { + m_pBaseLayout = new DefaultLayout(getParent()); + m_pBaseLayout->addHwButtonEvent(EEXT_CALLBACK_BACK, makeCbFirst(&BodyFrame::onHwBackButtonPreessed), this); + } + + if (!m_pLayout) { + m_pLayout = new ComposerLayout(*m_pBaseLayout); + m_pBaseLayout->setContent(*m_pLayout); + } +} + +void BodyFrame::prepareBody() +{ + if (!m_pBody) { + m_pBody = new MsgBodyView(*m_pLayout); + updateTextCounter(); + m_pLayout->setBody(*m_pBody); + } +} + +void BodyFrame::updateTextCounter() +{ + // TODO: implementation + m_pBody->setCounterText(1, 160); + m_pBody->disabledSendButton(false); +} + +void BodyFrame::showMaxCharactersPopup() +{ + ToastPopup::toast(msgt("WDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED")); +} + +void BodyFrame::showDisableFlightModePopup() +{ + auto *popup = new StandardPopup(StandardPopup::buttons2Style); + popup->setText(msgt("WDS_MSG_POP_UNABLE_TO_SEND_MESSAGE_TURN_OFF_FLIGHT_MODE")); + popup->addLeftButton(CANCEL_BUTTON_POPUP, makeCbLast(&BodyFrame::onCancelButtonClicked), this); + popup->addRightButton(OK_BUTTON_POPUP, makeCbLast(&BodyFrame::onTurnOffFlightModeClicked), this); + popup->show(); +} + +void BodyFrame::showSendingProgressPopup() +{ + auto *popup = new IconTextPopup; + popup->setIcon(IconTextPopup::ProgressIcon); + popup->setText(msgt("IDS_MSG_BODY_SENDING_ING_M_STATUS_ABB")); + popup->show(); +} + +void BodyFrame::showSentPopup() +{ + auto *popup = new IconTextPopup; + popup->setIcon(IconTextPopup::CheckIcon); + popup->setText(msgt("WDS_WNOTI_TPOP_SENT_ABB")); + popup->setTimeOut(); + popup->show(); +} + +void BodyFrame::showSendingFailedPopup() +{ + auto *popup = new IconTextPopup; + popup->setIcon(IconTextPopup::FailedIcon); + popup->setText(msgt("WDS_MSG_TPOP_SENDING_FAILED_ABB")); + popup->setTimeOut(); + popup->show(); +} + +void BodyFrame::showUnableToSendMessagePopup() +{ + auto *popup = new StandardPopup(StandardPopup::buttons1Style); + popup->setText(msgt("WDS_MSG_BODY_UNABLE_TO_SEND_MESSAGE_IT_WILL_BE_SENT_WHEN_SERVICE_BECOMES_AVAILABLE")); + popup->addBottomButton(msgt("WDS_MSG_ACBUTTON_OK_ABB")); + popup->show(); +} + +void BodyFrame::showMmsTextLimitExceededPopup() +{ + auto *popup = new StandardPopup(StandardPopup::buttons2Style); + // TODO: remove later + int numberOfCharacters = 2048; + int numberOfMmsMsg = 2; + + std::string popupMessage = msgArgs("WDS_MSG_BODY_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_EXCEEDED", numberOfCharacters); + popupMessage += "
"; + popupMessage += msgArgs("WDS_MSG_BODY_MESSAGE_WILL_BE_SENT_AS_PD_MMS_MESSAGES_AND_1_SMS_MESSAGE", numberOfMmsMsg); + + popup->setText(popupMessage); + popup->addLeftButton(CANCEL_BUTTON_POPUP, makeCbLast(&BodyFrame::onCancelButtonClicked), this); + popup->addRightButton(OK_BUTTON_POPUP, makeCbLast(&BodyFrame::onAllowTransmissionTextLClicked), this); + popup->show(); +} + +void BodyFrame::showUnableToSendMmsPopup() +{ + auto *popup = new StandardPopup(StandardPopup::buttons2Style); + popup->setText(msgt("WDS_MSG_BODY_UNABLE_TO_SEND_MMS_ENABLE_DATA_ROAMING")); + popup->addLeftButton(CANCEL_BUTTON_POPUP, makeCbLast(&BodyFrame::onCancelButtonClicked), this); + popup->addRightButton(OK_BUTTON_POPUP, makeCbLast(&BodyFrame::onEnableDataRoamingClicked), this); + popup->show(); +} + +void BodyFrame::onCancelButtonClicked(Popup &popup) +{ + popup.destroy(); +} + +void BodyFrame::onTurnOffFlightModeClicked(Popup &popup) +{ + MSG_LOG(""); +} + +void BodyFrame::onAllowTransmissionTextLClicked(Popup &popup) +{ + MSG_LOG(""); +} + +void BodyFrame::onEnableDataRoamingClicked(Popup &popup) +{ + MSG_LOG(""); +} + +void BodyFrame::onAttached(ViewItem &item) +{ + MSG_LOG(""); + FrameController::onAttached(item); + setContent(*m_pBaseLayout); +} + +void BodyFrame::onHwBackButtonPreessed(Evas_Object *obj, void *event_info) +{ + MSG_LOG(""); + pop(); +} diff --git a/src/Composer/Controller/src/ComposerFrame.cpp b/src/Composer/Controller/src/ComposerFrame.cpp deleted file mode 100644 index ac7b9bd..0000000 --- a/src/Composer/Controller/src/ComposerFrame.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2016 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "ComposerFrame.h" -#include "Callback.h" - -using namespace Msg; - -ComposerFrame::ComposerFrame(NaviFrameController &parent) - : FrameController(parent) - , m_pBaseLayout(nullptr) - , m_pLayout(nullptr) - , m_pBody(nullptr) -{ - MSG_LOG(""); - prepareLayouts(); - prepareBody(); -} - -ComposerFrame::~ComposerFrame() -{ - MSG_LOG(""); -} - -void ComposerFrame::prepareLayouts() -{ - if (!m_pBaseLayout) { - m_pBaseLayout = new DefaultLayout(getParent()); - m_pBaseLayout->addHwButtonEvent(EEXT_CALLBACK_BACK, makeCbFirst(&ComposerFrame::onHwBackButtonPreessed), this); - } - - if (!m_pLayout) { - m_pLayout = new ComposerLayout(*m_pBaseLayout); - m_pBaseLayout->setContent(*m_pLayout); - } -} - -void ComposerFrame::prepareBody() -{ - if (!m_pBody) { - m_pBody = new MsgBodyView(*m_pLayout); - updateTextCounter(); - m_pLayout->setBody(*m_pBody); - } -} - -void ComposerFrame::updateTextCounter() -{ - // TODO: implementation - m_pBody->setCounterText(1, 160); - m_pBody->disabledSendButton(false); -} - -void ComposerFrame::onAttached(ViewItem &item) -{ - MSG_LOG(""); - FrameController::onAttached(item); - setContent(*m_pBaseLayout); -} - -void ComposerFrame::onHwBackButtonPreessed(Evas_Object *obj, void *event_info) -{ - MSG_LOG(""); - pop(); -} diff --git a/src/Composer/Controller/src/RecipFrame.cpp b/src/Composer/Controller/src/RecipFrame.cpp index d59d0c0..5af868c 100644 --- a/src/Composer/Controller/src/RecipFrame.cpp +++ b/src/Composer/Controller/src/RecipFrame.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "BodyFrame.h" #include "RecipFrame.h" #include "Callback.h" -#include "ComposerFrame.h" #include "RecipInputFrame.h" #include "DefaultLayout.h" #include "BottomButton.h" @@ -121,7 +121,7 @@ void RecipFrame::onNextButtonClicked(Evas_Object *obj, void *event) { MSG_LOG(""); if (m_Recip.isValid()) { - auto *composerFrame = new ComposerFrame(getParent()); + auto *composerFrame = new BodyFrame(getParent()); getParent().push(*composerFrame); } else { ToastPopup::toast("Invalid recipient."); // TODO: localization