From eb9be77616a3eac74fb6ea46b43fb660719d6ddb Mon Sep 17 00:00:00 2001 From: Jin Yoon Date: Fri, 12 Apr 2013 14:43:19 +0900 Subject: [PATCH] Display app names with '<' and '&' correctly --- data/po/ar.po | 3 +++ data/po/az.po | 3 +++ data/po/bg.po | 3 +++ data/po/ca.po | 3 +++ data/po/cs.po | 3 +++ data/po/da.po | 3 +++ data/po/de_DE.po | 3 +++ data/po/el_GR.po | 3 +++ data/po/en.po | 3 +++ data/po/en_PH.po | 3 +++ data/po/en_US.po | 3 +++ data/po/es_ES.po | 3 +++ data/po/es_MX.po | 3 +++ data/po/et.po | 3 +++ data/po/eu.po | 3 +++ data/po/fi.po | 3 +++ data/po/fr_CA.po | 3 +++ data/po/fr_FR.po | 3 +++ data/po/ga.po | 3 +++ data/po/gl.po | 3 +++ data/po/hi.po | 3 +++ data/po/hr.po | 3 +++ data/po/hu.po | 3 +++ data/po/hy.po | 3 +++ data/po/is.po | 3 +++ data/po/it_IT.po | 3 +++ data/po/ja_JP.po | 3 +++ data/po/ka.po | 3 +++ data/po/kk.po | 3 +++ data/po/ko_KR.po | 3 +++ data/po/lt.po | 3 +++ data/po/lv.po | 3 +++ data/po/mk.po | 3 +++ data/po/nb.po | 3 +++ data/po/nl_NL.po | 3 +++ data/po/pl.po | 3 +++ data/po/pt_BR.po | 3 +++ data/po/pt_PT.po | 3 +++ data/po/ro.po | 3 +++ data/po/ru_RU.po | 3 +++ data/po/sk.po | 3 +++ data/po/sl.po | 3 +++ data/po/sr.po | 3 +++ data/po/sv.po | 3 +++ data/po/tr_TR.po | 3 +++ data/po/uk.po | 3 +++ data/po/uz.po | 3 +++ data/po/zh_CN.po | 3 +++ data/po/zh_HK.po | 3 +++ data/po/zh_SG.po | 3 +++ data/po/zh_TW.po | 3 +++ src/item.c | 67 +++--------------------------------------------- src/popup.c | 16 +++++++++--- 53 files changed, 169 insertions(+), 67 deletions(-) diff --git a/data/po/ar.po b/data/po/ar.po index a64348f..ab58d16 100644 --- a/data/po/ar.po +++ b/data/po/ar.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "تم" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "هل تريد إلغاء تثبيت %s؟" \ No newline at end of file diff --git a/data/po/az.po b/data/po/az.po index d973855..463e83e 100644 --- a/data/po/az.po +++ b/data/po/az.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Tamam" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "%s silinsin?" \ No newline at end of file diff --git a/data/po/bg.po b/data/po/bg.po index 5003ddb..c69d937 100644 --- a/data/po/bg.po +++ b/data/po/bg.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Готово" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Деинсталиране на %s?" \ No newline at end of file diff --git a/data/po/ca.po b/data/po/ca.po index 18ce40e..be404dd 100644 --- a/data/po/ca.po +++ b/data/po/ca.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Realit" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Desinstal·lar %s?" \ No newline at end of file diff --git a/data/po/cs.po b/data/po/cs.po index 9fced05..719a82f 100644 --- a/data/po/cs.po +++ b/data/po/cs.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Hot." + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Odinstalovat %s?" \ No newline at end of file diff --git a/data/po/da.po b/data/po/da.po index 65f5656..0c9f442 100644 --- a/data/po/da.po +++ b/data/po/da.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Udført" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Afinstallér %s?" \ No newline at end of file diff --git a/data/po/de_DE.po b/data/po/de_DE.po index 2c2fbad..1be4d6c 100644 --- a/data/po/de_DE.po +++ b/data/po/de_DE.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Fertig" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "%s deinstallieren?" \ No newline at end of file diff --git a/data/po/el_GR.po b/data/po/el_GR.po index fafae77..97ff2e7 100644 --- a/data/po/el_GR.po +++ b/data/po/el_GR.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Τέλος" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Κατάργηση της εγκατάστασης του %s;" \ No newline at end of file diff --git a/data/po/en.po b/data/po/en.po index 9057a3b..d24f1da 100644 --- a/data/po/en.po +++ b/data/po/en.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Done" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Uninstall %s?" \ No newline at end of file diff --git a/data/po/en_PH.po b/data/po/en_PH.po index 9057a3b..d24f1da 100644 --- a/data/po/en_PH.po +++ b/data/po/en_PH.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Done" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Uninstall %s?" \ No newline at end of file diff --git a/data/po/en_US.po b/data/po/en_US.po index 9057a3b..d24f1da 100644 --- a/data/po/en_US.po +++ b/data/po/en_US.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Done" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Uninstall %s?" \ No newline at end of file diff --git a/data/po/es_ES.po b/data/po/es_ES.po index 0b5ea2b..bc229f6 100644 --- a/data/po/es_ES.po +++ b/data/po/es_ES.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Finalizado" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "¿Desinstalar %s?" \ No newline at end of file diff --git a/data/po/es_MX.po b/data/po/es_MX.po index d3da979..3b24a12 100644 --- a/data/po/es_MX.po +++ b/data/po/es_MX.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Realiz." + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "¿Desinstalar %s?" \ No newline at end of file diff --git a/data/po/et.po b/data/po/et.po index f63e75f..8b1bee8 100644 --- a/data/po/et.po +++ b/data/po/et.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Valmis" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Kas desinstallida %s?" \ No newline at end of file diff --git a/data/po/eu.po b/data/po/eu.po index be64dab..73d79e2 100644 --- a/data/po/eu.po +++ b/data/po/eu.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Egina" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Desinstalatu %s?" \ No newline at end of file diff --git a/data/po/fi.po b/data/po/fi.po index f63e75f..71206fe 100644 --- a/data/po/fi.po +++ b/data/po/fi.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Valmis" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Poistetaanko kohteen %s asennus?" \ No newline at end of file diff --git a/data/po/fr_CA.po b/data/po/fr_CA.po index f2b166e..4bd264c 100644 --- a/data/po/fr_CA.po +++ b/data/po/fr_CA.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "OK" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Désinstaller %s ?" \ No newline at end of file diff --git a/data/po/fr_FR.po b/data/po/fr_FR.po index f2b166e..4bd264c 100644 --- a/data/po/fr_FR.po +++ b/data/po/fr_FR.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "OK" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Désinstaller %s ?" \ No newline at end of file diff --git a/data/po/ga.po b/data/po/ga.po index 97a25d3..be8ff94 100644 --- a/data/po/ga.po +++ b/data/po/ga.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Déanta" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Díshuiteáil %s?" \ No newline at end of file diff --git a/data/po/gl.po b/data/po/gl.po index 7ba85b2..72a8f93 100644 --- a/data/po/gl.po +++ b/data/po/gl.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Feito" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Desexas desinstalar %s?" \ No newline at end of file diff --git a/data/po/hi.po b/data/po/hi.po index e1bfbde..34373c1 100644 --- a/data/po/hi.po +++ b/data/po/hi.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "पूरा हुआ" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "%s की स्थापना रद्द करें?" \ No newline at end of file diff --git a/data/po/hr.po b/data/po/hr.po index 8b7e695..e995ee4 100644 --- a/data/po/hr.po +++ b/data/po/hr.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Kraj" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Deinstalirati %s?" \ No newline at end of file diff --git a/data/po/hu.po b/data/po/hu.po index 9a440b3..87aad3d 100644 --- a/data/po/hu.po +++ b/data/po/hu.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Kész" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Eltávolítja a(z) %s animált emotikont?" \ No newline at end of file diff --git a/data/po/hy.po b/data/po/hy.po index 6f8a8e1..12fa94e 100644 --- a/data/po/hy.po +++ b/data/po/hy.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Արված է" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Ապատեղադրե՞լ %s-ը:" \ No newline at end of file diff --git a/data/po/is.po b/data/po/is.po index 564f948..8b20c15 100644 --- a/data/po/is.po +++ b/data/po/is.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Lokið" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Fjarlægja %s?" \ No newline at end of file diff --git a/data/po/it_IT.po b/data/po/it_IT.po index 6807ed1..26cc693 100644 --- a/data/po/it_IT.po +++ b/data/po/it_IT.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Fatto" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Disinstallare %s?" \ No newline at end of file diff --git a/data/po/ja_JP.po b/data/po/ja_JP.po index cd7a2b3..807018c 100644 --- a/data/po/ja_JP.po +++ b/data/po/ja_JP.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "完了" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "%sをアンインストールしますか？" \ No newline at end of file diff --git a/data/po/ka.po b/data/po/ka.po index 2f66f0e..9da318c 100644 --- a/data/po/ka.po +++ b/data/po/ka.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "შესრულდა" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "ამოინსტალირდეს %s?" \ No newline at end of file diff --git a/data/po/kk.po b/data/po/kk.po index b9627a4..57ce2f5 100644 --- a/data/po/kk.po +++ b/data/po/kk.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Дайын" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "%s жою керек пе?" \ No newline at end of file diff --git a/data/po/ko_KR.po b/data/po/ko_KR.po index 255f0e6..2c0c07c 100644 --- a/data/po/ko_KR.po +++ b/data/po/ko_KR.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "완료" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "%s을(를) 삭제할까요?" \ No newline at end of file diff --git a/data/po/lt.po b/data/po/lt.po index 5e7d60f..d031262 100644 --- a/data/po/lt.po +++ b/data/po/lt.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Atlikta" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Pašalinti „%s“?" \ No newline at end of file diff --git a/data/po/lv.po b/data/po/lv.po index fc2cacd..41227e0 100644 --- a/data/po/lv.po +++ b/data/po/lv.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Gatavs" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Vai atinstalēt %s?" \ No newline at end of file diff --git a/data/po/mk.po b/data/po/mk.po index 5003ddb..521a6f8 100644 --- a/data/po/mk.po +++ b/data/po/mk.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Готово" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Да се деинсталира %s?" \ No newline at end of file diff --git a/data/po/nb.po b/data/po/nb.po index 465c61e..bafa5f2 100644 --- a/data/po/nb.po +++ b/data/po/nb.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Utført" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Avinstallere %s?" \ No newline at end of file diff --git a/data/po/nl_NL.po b/data/po/nl_NL.po index 160ecd5..f4bb3ab 100644 --- a/data/po/nl_NL.po +++ b/data/po/nl_NL.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Gereed" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "%s verwijderen?" \ No newline at end of file diff --git a/data/po/pl.po b/data/po/pl.po index 5cef18d..2df7d65 100644 --- a/data/po/pl.po +++ b/data/po/pl.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Gotowe" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Odinstalować %s?" \ No newline at end of file diff --git a/data/po/pt_BR.po b/data/po/pt_BR.po index 7bd93f3..eb37967 100644 --- a/data/po/pt_BR.po +++ b/data/po/pt_BR.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Concluído" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Desinstalar %s?" \ No newline at end of file diff --git a/data/po/pt_PT.po b/data/po/pt_PT.po index 6c738b3..e0b260f 100644 --- a/data/po/pt_PT.po +++ b/data/po/pt_PT.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Concluir" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Desinstalar %s?" \ No newline at end of file diff --git a/data/po/ro.po b/data/po/ro.po index f2b6c31..9250183 100644 --- a/data/po/ro.po +++ b/data/po/ro.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Efectuat" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Dezinstalaţi %s?" \ No newline at end of file diff --git a/data/po/ru_RU.po b/data/po/ru_RU.po index 5003ddb..d173e72 100644 --- a/data/po/ru_RU.po +++ b/data/po/ru_RU.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Готово" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Удалить %s?" \ No newline at end of file diff --git a/data/po/sk.po b/data/po/sk.po index ad7452e..416552b 100644 --- a/data/po/sk.po +++ b/data/po/sk.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Hotovo" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Odinštalovať program %s?" \ No newline at end of file diff --git a/data/po/sl.po b/data/po/sl.po index 84fdc08..572c35c 100644 --- a/data/po/sl.po +++ b/data/po/sl.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Končano" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Želite odstraniti %s?" \ No newline at end of file diff --git a/data/po/sr.po b/data/po/sr.po index 6829d3e..1f3a38f 100644 --- a/data/po/sr.po +++ b/data/po/sr.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Gotovo" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Deinstalirati %s?" \ No newline at end of file diff --git a/data/po/sv.po b/data/po/sv.po index b841935..5040051 100644 --- a/data/po/sv.po +++ b/data/po/sv.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Klar" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Avinstallera %s?" \ No newline at end of file diff --git a/data/po/tr_TR.po b/data/po/tr_TR.po index d973855..add9719 100644 --- a/data/po/tr_TR.po +++ b/data/po/tr_TR.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Tamam" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "%s kaldırılsın mı?" \ No newline at end of file diff --git a/data/po/uk.po b/data/po/uk.po index 5003ddb..0cf95e1 100644 --- a/data/po/uk.po +++ b/data/po/uk.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Готово" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "Видалити %s?" \ No newline at end of file diff --git a/data/po/uz.po b/data/po/uz.po index b042eda..11beb22 100644 --- a/data/po/uz.po +++ b/data/po/uz.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "Qilindi" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "%s olib tashlansinmi?" \ No newline at end of file diff --git a/data/po/zh_CN.po b/data/po/zh_CN.po index 54cf90d..30bcc37 100644 --- a/data/po/zh_CN.po +++ b/data/po/zh_CN.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "完成" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "是否卸载 %s？" \ No newline at end of file diff --git a/data/po/zh_HK.po b/data/po/zh_HK.po index 54cf90d..8ea78cb 100644 --- a/data/po/zh_HK.po +++ b/data/po/zh_HK.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "完成" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "解除安裝 %s 嗎？" \ No newline at end of file diff --git a/data/po/zh_SG.po b/data/po/zh_SG.po index 54cf90d..30bcc37 100644 --- a/data/po/zh_SG.po +++ b/data/po/zh_SG.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "完成" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "是否卸载 %s？" \ No newline at end of file diff --git a/data/po/zh_TW.po b/data/po/zh_TW.po index 54cf90d..8ea78cb 100644 --- a/data/po/zh_TW.po +++ b/data/po/zh_TW.po @@ -1,2 +1,5 @@ msgid "IDS_HS_BUTTON_DONE" msgstr "完成" + +msgid "IDS_AT_POP_UNINSTALL_PS_Q" +msgstr "解除安裝 %s 嗎？" \ No newline at end of file diff --git a/src/item.c b/src/item.c index f4b2c51..8f7c5a9 100644 --- a/src/item.c +++ b/src/item.c @@ -53,45 +53,6 @@ -#if 0 // Dual line is disabled temporarily. -static char *_space_to_new_line(const char *str) -{ - char *tmp; - int len; - int space_idx = 0; - - retv_if(NULL == str, NULL); - len = strlen(str); - - if (len > LINE_SIZE) { - for (space_idx = LINE_SIZE - 1; str[space_idx] != ' ' && space_idx > 0; space_idx--); - if (!space_idx) { - space_idx = strcspn(str, " "); - space_idx = (space_idx == len ? 0 : space_idx); - } - } - - if (space_idx) { - int i; - retv_if(NULL == (tmp = calloc(1, len + 4)), NULL); - - for (i = 0; i < space_idx; i++) { - tmp[i] = str[i]; - } - strcat(tmp, "
"); - for (i = space_idx + 1; i < len; i++) { - tmp[i + 3] = str[i]; - } - } else { - retv_if(NULL == (tmp = strdup(str)), NULL); - } - - return tmp; -} -#endif - - - HAPI void item_set_icon(Evas_Object *edje, char *icon, int sync) { char *tmp; @@ -130,7 +91,6 @@ HAPI void item_set_name(Evas_Object *edje, char *name, int sync) { char *tmp; int changed; - bool is_dual_line; tmp = evas_object_data_get(edje, STR_ATTRIBUTE_NAME); changed = (tmp && name) ? strcmp(name, tmp) : 1; @@ -143,29 +103,10 @@ HAPI void item_set_name(Evas_Object *edje, char *name, int sync) evas_object_data_del(edje, STR_ATTRIBUTE_NAME); if (name) { tmp = strdup(name); - if (tmp) { - evas_object_data_set(edje, STR_ATTRIBUTE_NAME, tmp); - }else { - _E("No more memory for allocating space \"%s\"", name); - } - - is_dual_line = (bool) evas_object_data_get(edje, "item_text_dual_line"); - if (is_dual_line) { - char *dual_txt; - - # if 0 // Dual line is disabled temporarily. - dual_txt = _space_to_new_line(name); - #else - dual_txt = strdup(name); - #endif - if (edje_object_part_text_set(_EDJ(edje), "txt", dual_txt) == EINA_FALSE){ - //_E("Failed to set text on the part"); - } - free(dual_txt); - } else { - if (edje_object_part_text_set(_EDJ(edje), "txt", name) == EINA_FALSE){ - //_E("Failed to set text on the part"); - } + ret_if(NULL == tmp); + evas_object_data_set(edje, STR_ATTRIBUTE_NAME, tmp); + if (edje_object_part_text_set(_EDJ(edje), "txt", tmp) == EINA_FALSE){ + //_E("Failed to set text on the part"); } } } diff --git a/src/popup.c b/src/popup.c index 13ea790..5d253ed 100644 --- a/src/popup.c +++ b/src/popup.c @@ -113,6 +113,7 @@ static void _uninstall_no_cb(void *data, Evas_Object *obj, void *event_info) +#define IDS_AT_POP_UNINSTALL_PS_Q "IDS_AT_POP_UNINSTALL_PS_Q" HAPI Evas_Object *popup_create_uninstall(Evas_Object *parent, Evas_Object *item) { Evas_Object *popup; @@ -120,8 +121,6 @@ HAPI Evas_Object *popup_create_uninstall(Evas_Object *parent, Evas_Object *item) Evas_Object *btn2; char warning[BUFSZE]; - retv_if(NULL == warning, NULL); - popup = elm_popup_add(parent); retv_if(NULL == popup, NULL); @@ -148,10 +147,19 @@ HAPI Evas_Object *popup_create_uninstall(Evas_Object *parent, Evas_Object *item) evas_object_smart_callback_add(btn2, "clicked", _uninstall_no_cb, popup); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - snprintf(warning, sizeof(warning), _("Uninstall %s?"), item_get_name(item)); - elm_object_text_set(popup, warning); evas_object_show(popup); + char *name= item_get_name(item); + retv_if(NULL == name, popup); + + char *markup_name = elm_entry_utf8_to_markup(name); + retv_if(NULL == markup_name, popup); + + snprintf(warning, sizeof(warning), _(IDS_AT_POP_UNINSTALL_PS_Q), markup_name); + free(markup_name); + + elm_object_text_set(popup, warning); + return popup; } -- 2.34.1