TSAM-8398 Display wrong Messages size , Missing Subject and display wrong Expired...

Change-Id: I05e76d7b4f084048b57a20f6eff1d4bee582dc8c
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/res/po/ar.po b/res/po/ar.po
index 57c9aeccd0dbd926ad39f232052d9ca2d16b6cd4..71c944237ce08ab2302bee4457fdf90d2fa1e440 100644 (file)
--- a/res/po/ar.po
+++ b/res/po/ar.po
@@ -685,6 +685,9 @@ msgstr "مذكرة"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "فشل الإرسال"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "تاريخ الانتهاء:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "إدخال نص"
 

diff --git a/res/po/az.po b/res/po/az.po
index 4fbd5730aedbdb79558a8f7d1a7f7c5bff8a55b9..1430e97c10b70d6a58c203c12e8a9f9862e491be 100644 (file)
--- a/res/po/az.po
+++ b/res/po/az.po
@@ -685,6 +685,9 @@ msgstr "Yaddaş"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Alınmadı"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Bitmə vaxtı:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Mətni daxil edin"
 

diff --git a/res/po/bg.po b/res/po/bg.po
index d616490ffc052a26e2302bcec0adcda99a4826e8..10d8419d41d9ffd96e4d99818f96f15db69889c3 100644 (file)
--- a/res/po/bg.po
+++ b/res/po/bg.po
@@ -685,6 +685,9 @@ msgstr "Записка"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Неуспешно"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Изтича на:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Въведете текст"
 

diff --git a/res/po/ca.po b/res/po/ca.po
index df2682293d2c0c744c1a6d0cb9a9681ffff09f7e..79373cc759e2a0656374ed229fad0737570088b7 100644 (file)
--- a/res/po/ca.po
+++ b/res/po/ca.po
@@ -685,6 +685,9 @@ msgstr "Memoràndum"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Error"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Caduca el:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Introduir text"
 

diff --git a/res/po/cs.po b/res/po/cs.po
index f99d4086151946a0f6915bd398544d31d6c33888..8cdc16d21469b902809f4f3f869d2afee5652060 100644 (file)
--- a/res/po/cs.po
+++ b/res/po/cs.po
@@ -685,6 +685,9 @@ msgstr "Poznámka"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Chyba"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Platnost do:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Zadejte text"
 

diff --git a/res/po/da.po b/res/po/da.po
index 326e06bf7c09a4e75d5cbda5d6d2bc6befe4911f..992a5bc247303eb2ffc6563a65cf77eb4bf8332e 100644 (file)
--- a/res/po/da.po
+++ b/res/po/da.po
@@ -685,6 +685,9 @@ msgstr "Notat"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Mislyk."
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Udløber den:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Indtast tekst"
 

diff --git a/res/po/de.po b/res/po/de.po
index 884c63b24f9bea58e92378d98f1b8cd69e666039..6a4ac5029007fa54d77235108fee227d40bfe8a3 100644 (file)
--- a/res/po/de.po
+++ b/res/po/de.po
@@ -685,6 +685,9 @@ msgstr "Memo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Fehler"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Läuft ab am:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Text eingeben"
 

diff --git a/res/po/el_GR.po b/res/po/el_GR.po
index b53e4a662ddd2b4b4db6d8c3ba42e2436c84de97..e7305f08acdde22580e72fad94becec351231889 100644 (file)
--- a/res/po/el_GR.po
+++ b/res/po/el_GR.po
@@ -685,6 +685,9 @@ msgstr "Σημείωση"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Απέτυχε"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Ημερομηνία λήξης:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Εισαγωγή κειμένου"
 

diff --git a/res/po/en.po b/res/po/en.po
index 65d1933ab323c303dfe2b5f3188d6380e2b87c29..f4458580f320891e7ec325036f7b8762f663e35a 100644 (file)
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -685,6 +685,9 @@ msgstr "Memo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Failed"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Expires on:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Enter text"
 

diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index 14dcdca028cb5037f98304242573cba0026cbf3c..00a4f93383fef7a6a2c3047a790fa101b43694b9 100644 (file)
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -685,6 +685,9 @@ msgstr "Memo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Failed"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Expires on:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Enter text"
 

diff --git a/res/po/en_US.po b/res/po/en_US.po
index c0ccc601256c3d3da9595744538ba6754ce9fae7..c3cdb98b5d48eef668a9394ee2684758198a4cf6 100644 (file)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -685,6 +685,9 @@ msgstr "Memo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Failed"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Expires on:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Enter text"
 

diff --git a/res/po/es_ES.po b/res/po/es_ES.po
index ac47ca40e3def754bf94e4fd4f687120e3f32d44..4822ee0153e6b4588516bdbe948c4f1d0df799a2 100644 (file)
--- a/res/po/es_ES.po
+++ b/res/po/es_ES.po
@@ -685,6 +685,9 @@ msgstr "Nota"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Error"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Caduca el:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Introducir texto"
 

diff --git a/res/po/es_US.po b/res/po/es_US.po
index 3a2d1f5eb21befabd9ae2ed4c96b1eaba33e2b62..8046f216af4a481b47afbf5bfba3ed34041cdbde 100644 (file)
--- a/res/po/es_US.po
+++ b/res/po/es_US.po
@@ -685,6 +685,9 @@ msgstr "Nota"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Error"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Caduca el:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Introducir texto"
 

diff --git a/res/po/et.po b/res/po/et.po
index 80baa51a2628aaabde9508a8b966fcd3e8d82141..a1118e89bcf0315ae45db0cc011f8bc8f713af08 100644 (file)
--- a/res/po/et.po
+++ b/res/po/et.po
@@ -685,6 +685,9 @@ msgstr "Memo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Nurjus"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Aegumise kuupäev:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Sisestage tekst"
 

diff --git a/res/po/eu.po b/res/po/eu.po
index c42ac4245a31e2d6f8b04f505b6b2f1cb02c40df..1c33175b9fd78e851bc6c9640e749e60f767a67e 100644 (file)
--- a/res/po/eu.po
+++ b/res/po/eu.po
@@ -685,6 +685,9 @@ msgstr "Memoranduma"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Hutsa"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Egun honetan iraungiko da:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Adierazi testua"
 

diff --git a/res/po/fi.po b/res/po/fi.po
index cc441bc0887ece49b07b42a396d439c636630d1c..28e1cf61c16a78b8e151955de92a34e24ff666a7 100644 (file)
--- a/res/po/fi.po
+++ b/res/po/fi.po
@@ -685,6 +685,9 @@ msgstr "Muistio"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Epäonn."
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Vanhentuu:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Anna teksti"
 

diff --git a/res/po/fr.po b/res/po/fr.po
index a0be83352a1fd83839da2a09cc46414b269382dc..65b800d77ed2aa2ae55fc94898f4b90a2e6d94d7 100644 (file)
--- a/res/po/fr.po
+++ b/res/po/fr.po
@@ -685,6 +685,9 @@ msgstr "Mémo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Échec"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Expire le :"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Entrez du texte"
 

diff --git a/res/po/fr_CA.po b/res/po/fr_CA.po
index d7d40773d8967e7286eb6a93d7b388dd2dd722fd..1052f58de9575716bd5cdb04febd37a173b341fd 100644 (file)
--- a/res/po/fr_CA.po
+++ b/res/po/fr_CA.po
@@ -685,6 +685,9 @@ msgstr "Mémo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Échec"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Expire le :"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Entrez du texte"
 

diff --git a/res/po/ga.po b/res/po/ga.po
index 4c2e0c23cf45c2036094e82bfb4d04e9d65dbe1b..dbad12f3da056cd3f404dcf9ecbd013523a30e45 100644 (file)
--- a/res/po/ga.po
+++ b/res/po/ga.po
@@ -685,6 +685,9 @@ msgstr "Meabhrán"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Theip air"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "As feidhm:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Iontráil téacs"
 

diff --git a/res/po/gl.po b/res/po/gl.po
index a531b0cd68dd5502d5acb69e05cfd24c2ffc89c4..19acf53cc999fda4e33bc0178d056dda8d3e6cb7 100644 (file)
--- a/res/po/gl.po
+++ b/res/po/gl.po
@@ -685,6 +685,9 @@ msgstr "Memo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Erro"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Data de caducidade:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Inserir texto"
 

diff --git a/res/po/hr.po b/res/po/hr.po
index a75d26393b508f62b06d89fc861bef03156566e7..2a82a2922deaff13dc4c8d405969deec34b852a1 100644 (file)
--- a/res/po/hr.po
+++ b/res/po/hr.po
@@ -685,6 +685,9 @@ msgstr "Zapis"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Pogreška"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Datum isteka:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Upišite tekst"
 

diff --git a/res/po/hu.po b/res/po/hu.po
index 9443bd0e77ec1170bee60852edf9b257fb48352e..816fa0d68ea57a83107529518b26f9ee03d6a871 100644 (file)
--- a/res/po/hu.po
+++ b/res/po/hu.po
@@ -685,6 +685,9 @@ msgstr "Jegyzet"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Hiba"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Lejárat dátuma:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Szöveg bevitele"
 

diff --git a/res/po/hy.po b/res/po/hy.po
index f1c7a1e5803c23b04b052918d3bb5aed66845c6b..f85d37add316ea8b2ec6487ec422e08089932bc9 100644 (file)
--- a/res/po/hy.po
+++ b/res/po/hy.po
@@ -685,6 +685,9 @@ msgstr "Հուշագիր"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Չհաջողվեց"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Ժամկետի ավարտման թվականը՝"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Մուտքագրել տեքստ"
 

diff --git a/res/po/is.po b/res/po/is.po
index 1748bd5be035c64123e1e0908792c364a5f9f0cc..d11366e70e37a75918ba2269c24427b1034bb65e 100644 (file)
--- a/res/po/is.po
+++ b/res/po/is.po
@@ -685,6 +685,9 @@ msgstr "Minnisatriði"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Mistókst"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Gildir til:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Sláðu inn texta"
 

diff --git a/res/po/it_IT.po b/res/po/it_IT.po
index 8531518f1b96537227c4a01f73c5e5f973680471..fa945fb5834de369be8e904440cb91ebae038431 100644 (file)
--- a/res/po/it_IT.po
+++ b/res/po/it_IT.po
@@ -685,6 +685,9 @@ msgstr "Memo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Errore"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Scade il:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Inserite il testo"
 

diff --git a/res/po/ja_JP.po b/res/po/ja_JP.po
index e45b63bc0351373ce9faab876193c0e52a387205..306fbbffb0139c13b7835162c4edf03c421ae13c 100644 (file)
--- a/res/po/ja_JP.po
+++ b/res/po/ja_JP.po
@@ -685,6 +685,9 @@ msgstr "メモ"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "送信失敗"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "有効期限:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "テキストを入力"
 

diff --git a/res/po/ka.po b/res/po/ka.po
index a56c12007ce1c41ce3d24774319ab52a0c1521f7..695d08dc1d0f46e35d638d4b9704150aff1093ab 100644 (file)
--- a/res/po/ka.po
+++ b/res/po/ka.po
@@ -685,6 +685,9 @@ msgstr "სამახსოვრო"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "ჩაიშალა"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "ძალაშია:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "შეიყვანეთ ტექსტი"
 

diff --git a/res/po/kk.po b/res/po/kk.po
index 7adbb9055078e66ea08d65f7a504e89b643b6913..39f4dd2235b87441d24470f902efa95e573f6347 100644 (file)
--- a/res/po/kk.po
+++ b/res/po/kk.po
@@ -685,6 +685,9 @@ msgstr "Ескерту"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Сәтсіз"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Мерзімі бітетін күн:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Мәтінді енгізу"
 

diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po
index a456a7e330410c772f47c5a5e09ec1772f9498ae..c15effa567eda5c46bd2ec49c7e9b76eed63cb2c 100644 (file)
--- a/res/po/ko_KR.po
+++ b/res/po/ko_KR.po
@@ -104,7 +104,7 @@ msgid "IDS_MSGC_BODY_MAXIMUM_NUMBER_OF_RECIPIENTS_HPD_REACHED"
 msgstr "최대 받는 사람 수 %d명에 도달하였습니다."
 
 msgid "IDS_MSGC_BODY_DUPLICATED_RECIPIENT"
-msgstr "ë°\9bë\8a\94 ì\82¬ë\9e\8cì\9d´ ì¤\91ë³µë\90©니다."
+msgstr "ë°\9bë\8a\94 ì\82¬ë\9e\8cì\97\90 ì\9d´ë¯¸ ì¶\94ê°\80ë\90\9c ì\97°ë\9d½ì²\98ì\9e\85니다."
 
 msgid "IDS_MSGF_SK_FORWARD_LITE"
 msgstr "전달"
@@ -685,6 +685,9 @@ msgstr "메모"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "보내기 안 됨"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "만료일:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "글자 입력"
 

diff --git a/res/po/lt.po b/res/po/lt.po
index 472738dab3fdbaff09c316da419a985939d61341..26fbd55b7b6979b7a2f90fc257aa8691aca8bbba 100644 (file)
--- a/res/po/lt.po
+++ b/res/po/lt.po
@@ -685,6 +685,9 @@ msgstr "Įrašas"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Nepavyko"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Galiojimas baigiasi:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Įvesti tekstą"
 

diff --git a/res/po/lv.po b/res/po/lv.po
index 6ddd010dba8093b604199515d4da03dfcb5065c9..b8a7a4792e04eaed018c9b38d347e60147f6bebb 100644 (file)
--- a/res/po/lv.po
+++ b/res/po/lv.po
@@ -685,6 +685,9 @@ msgstr "Piezīme"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Neizdevās"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Derīguma termiņš beidzas:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Ievadiet tekstu"
 

diff --git a/res/po/mk.po b/res/po/mk.po
index 5e6ed2ac4cfcddcda444d2fdc2d8a16fe0b869f6..c1b12f4b6ac076fc7be837d865522399f3f98d09 100644 (file)
--- a/res/po/mk.po
+++ b/res/po/mk.po
@@ -685,6 +685,9 @@ msgstr "Белешка"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Неуспешно"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Застарува на:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Внесете текст"
 

diff --git a/res/po/nb.po b/res/po/nb.po
index 63c510c292e5804f20c1da8dc2aeefcd39ff8bf5..237695ac76b913437cb9d468b557203e48b6ea0d 100644 (file)
--- a/res/po/nb.po
+++ b/res/po/nb.po
@@ -685,6 +685,9 @@ msgstr "Notat"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Mislykket"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Utløper den:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Skriv inn tekst"
 

diff --git a/res/po/nl.po b/res/po/nl.po
index a794aec7ea32b22d45e2336de423b120566b3e67..154e7f3862921a5cfa7e0cd7593bcb8c2f15841b 100644 (file)
--- a/res/po/nl.po
+++ b/res/po/nl.po
@@ -685,6 +685,9 @@ msgstr "Notitie"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Mislukt"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Verloopt op:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Tekst invoeren"
 

diff --git a/res/po/pl.po b/res/po/pl.po
index 7889fa2f602681f7cdc961ca14057e223b5262fd..bd81d3b8c49fa9a6cfd2ef21a61d686311d249f3 100644 (file)
--- a/res/po/pl.po
+++ b/res/po/pl.po
@@ -685,6 +685,9 @@ msgstr "Notatka"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Błąd"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Data wygaśnięcia:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Wprowadź tekst"
 

diff --git a/res/po/pt_BR.po b/res/po/pt_BR.po
index e863c46a00bbf680b4a6ea4f0568fcdc6a9771c3..7ced8a3e837de2145806045ba765befee6d27785 100644 (file)
--- a/res/po/pt_BR.po
+++ b/res/po/pt_BR.po
@@ -685,6 +685,9 @@ msgstr "Notas"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Falhou"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Expira em:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Inserir texto"
 

diff --git a/res/po/pt_PT.po b/res/po/pt_PT.po
index e3ef6bdc4febc7fd63276b4c78c188f4a0fd15d2..487c5106407f136c43da4afaff14521e10160616 100644 (file)
--- a/res/po/pt_PT.po
+++ b/res/po/pt_PT.po
@@ -685,6 +685,9 @@ msgstr "Memorando"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Falhou"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Expira a:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Introduzir texto"
 

diff --git a/res/po/ro.po b/res/po/ro.po
index c410483f365d9f7fc77447c3bd19222c00bf5b17..dc642380fce7b1813840b663ac805b1dd5caa1b7 100644 (file)
--- a/res/po/ro.po
+++ b/res/po/ro.po
@@ -685,6 +685,9 @@ msgstr "Notă"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Nereușit"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Expiră pe:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Introducere text"
 

diff --git a/res/po/ru_RU.po b/res/po/ru_RU.po
index 5577ac7d8e05f8591bd02ca72f12c121dc046dd5..fbf8c854956feaf65de73c1bf0f8d0effa61719a 100644 (file)
--- a/res/po/ru_RU.po
+++ b/res/po/ru_RU.po
@@ -685,6 +685,9 @@ msgstr "Заметки"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Сбой"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Срок действия:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Введите текст"
 

diff --git a/res/po/sk.po b/res/po/sk.po
index 9be86e46471935f30c94840c13608126fea472aa..bee825c06e7e0d19df0f237b60975c22f583905e 100644 (file)
--- a/res/po/sk.po
+++ b/res/po/sk.po
@@ -685,6 +685,9 @@ msgstr "Poznámka"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Zlyhanie"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Platnosť skončí dňa:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Zadajte text"
 

diff --git a/res/po/sl.po b/res/po/sl.po
index f60a3f8277d33b483d2792537b1af97d6bb8b886..3f91120cdbb4e7e9ce68920c8d5cc812eafae7b2 100644 (file)
--- a/res/po/sl.po
+++ b/res/po/sl.po
@@ -685,6 +685,9 @@ msgstr "Beležka"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Ni uspelo"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Poteče dne:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Vnesite besedilo"
 

diff --git a/res/po/sr.po b/res/po/sr.po
index fb16b5b2205a451f33339073408d677ee4d31308..42e8f8abada6c196d11034719a92588c95bb42d8 100644 (file)
--- a/res/po/sr.po
+++ b/res/po/sr.po
@@ -685,6 +685,9 @@ msgstr "Beleška"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Neuspešno"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Ističe:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Unesi tekst"
 

diff --git a/res/po/sv.po b/res/po/sv.po
index d370d44f871cd0572c924546f904508c0978ee19..cecea8301bae95922ec3cb5e07147f3f7abc072a 100644 (file)
--- a/res/po/sv.po
+++ b/res/po/sv.po
@@ -685,6 +685,9 @@ msgstr "Memo"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Misslyck."
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Upphör den:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Skriv in text"
 

diff --git a/res/po/tr_TR.po b/res/po/tr_TR.po
index c04ae44b0f5fe408b80297ccc92c4d7fc51616f5..6a73d7c55867211eeca231ed1f4189b277cae362 100644 (file)
--- a/res/po/tr_TR.po
+++ b/res/po/tr_TR.po
@@ -685,6 +685,9 @@ msgstr "Not"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Başarısız"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Süre dolum tarihi:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Metin girin"
 

diff --git a/res/po/uk.po b/res/po/uk.po
index aaa4c0a47d3bdaba2a6ce032b8fb0124951454ff..66e1eb3b373117c45316f8d71b1de0877efde7b9 100644 (file)
--- a/res/po/uk.po
+++ b/res/po/uk.po
@@ -685,6 +685,9 @@ msgstr "Нагаду-\nвання"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Збій"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Спливає:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Введіть текст"
 

diff --git a/res/po/uz.po b/res/po/uz.po
index dea8494080ca5808fe5f07cd62dfbf19a10b363e..d8188caeac839f765edf26513281faf806ef3dbf 100644 (file)
--- a/res/po/uz.po
+++ b/res/po/uz.po
@@ -685,6 +685,9 @@ msgstr "Yozuv"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "Xato"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "Amal qilish muddati:"
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "Matn kiriting"
 

diff --git a/res/po/zh_CN.po b/res/po/zh_CN.po
index c83d094895c38f44962bbce7bf6d389ebb56835a..d21ce33a2900f76df7d7c24b503ebfccde436113 100644 (file)
--- a/res/po/zh_CN.po
+++ b/res/po/zh_CN.po
@@ -685,6 +685,9 @@ msgstr "备忘录"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "失败"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "过期日期："
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "输入文本"
 

diff --git a/res/po/zh_HK.po b/res/po/zh_HK.po
index 5ee0a1e8cf57886e87f132b280446f0f49f49ef8..218fd9a36027047ba9dd3837beeea23cba1da85b 100644 (file)
--- a/res/po/zh_HK.po
+++ b/res/po/zh_HK.po
@@ -685,6 +685,9 @@ msgstr "備忘錄"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "失敗"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "到期時間："
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "輸入文字"
 

diff --git a/res/po/zh_TW.po b/res/po/zh_TW.po
index 377a6d0a9b3387dedde86cb3f0d32de5f3429cae..ee5ef83e1ef00977be4d73fb85fcb1865d1ab063 100644 (file)
--- a/res/po/zh_TW.po
+++ b/res/po/zh_TW.po
@@ -685,6 +685,9 @@ msgstr "備忘錄"
 msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2"
 msgstr "失敗"
 
+msgid "IDS_MSG_BODY_EXPIRES_ON_C"
+msgstr "到期日："
+
 msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN"
 msgstr "輸入文字"
 

diff --git a/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp b/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp
index 06fb4674a6ea346a26f2db5c51af4543756e6496..468620ca6338ca1285f24ae469cc26f72fa959d8 100644 (file)
--- a/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp
+++ b/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp
@@ -164,3 +164,10 @@ time_t MessageMmsPrivate::getExpired() const
     msg_get_int_value(m_MmsStruct, MSG_MMS_HEADER_EXPIRY_TIME_INT, &msgExpiry);
     return msgExpiry;
 }
+
+int MessageMmsPrivate::getSize() const
+{
+    int msgSize = 0;
+    msg_get_int_value(m_MmsStruct, MSG_MMS_HEADER_SIZE_INT, &msgSize); // Size in bytes
+    return msgSize;
+}

diff --git a/src/Common/MsgEngine/src/private/MessageMmsPrivate.h b/src/Common/MsgEngine/src/private/MessageMmsPrivate.h
index de354ceca0678e9a64f90df5a7b3da977d19b697..d90babcf305dfd5a24971e3d82b05db92b0fcde7 100644 (file)
--- a/src/Common/MsgEngine/src/private/MessageMmsPrivate.h
+++ b/src/Common/MsgEngine/src/private/MessageMmsPrivate.h
@@ -34,8 +34,8 @@ namespace Msg
 
             virtual void setText(const std::string &text);
             virtual std::string getText() const;
-            int getMediaCount() const;
             virtual Type getType() const;
+            virtual int getSize() const;
 
             virtual const MsgPageListHandlePrivate &getPageList() const;
             virtual MsgPagePrivate &addPage();
@@ -45,6 +45,7 @@ namespace Msg
             virtual time_t getExpired() const;
 
             virtual void commit();
+            int getMediaCount() const;
             void set(msg_struct_t msgStruct);
             msg_struct_t getMmsStruct() const;
 

diff --git a/src/Common/Utils/inc/TimeUtils.h b/src/Common/Utils/inc/TimeUtils.h
index e2b3d44fb8e6328dcb9ab9afc257ab2dadbeac33..07592fa1c22681bdb4916b1fcfd48482d95833a8 100644 (file)
--- a/src/Common/Utils/inc/TimeUtils.h
+++ b/src/Common/Utils/inc/TimeUtils.h
@@ -37,6 +37,7 @@ namespace Msg
             static std::string makeBubbleTimeString(time_t msgTime);
             static std::string makeBubbleDateLineString(time_t msgTime);
             static std::string makeDateTimeString(time_t msgTime);
+            static std::string makeDateString(time_t msgTime);
             static std::string makeSmsReportTimeString(time_t msgTime);
             static std::string makeMmsReportTimeString(time_t msgTime);
             static std::string makeCalEventString(time_t time);

diff --git a/src/Common/Utils/src/TimeUtils.cpp b/src/Common/Utils/src/TimeUtils.cpp
index 1d66bb320635775ad93246219beedae13fead5a5..e044d2af513364d490f1ea5d4a51f035238cc21f 100644 (file)
--- a/src/Common/Utils/src/TimeUtils.cpp
+++ b/src/Common/Utils/src/TimeUtils.cpp
@@ -90,6 +90,12 @@ std::string TimeUtils::makeBubbleDateLineString(time_t msgTime)
     return getFormattedDate(locale, getDateBestPattern(locale, dateYear), msgTime);
 }
 
+std::string TimeUtils::makeDateString(time_t msgTime)
+{
+    const std::string &locale = getDefaultLocale();
+    return getFormattedDate(locale, getDateBestPattern(locale, dateTimeSceleton), msgTime);
+}
+
 std::string TimeUtils::makeDateTimeString(time_t msgTime) //the same for Sim Message List
 {
     const std::string &locale = getDefaultLocale();
@@ -101,6 +107,7 @@ std::string TimeUtils::makeDateTimeString(time_t msgTime) //the same for Sim Mes
 
     return res;
 }
+
 std::string TimeUtils::makeSmsReportTimeString(time_t msgTime)
 {
     const std::string &locale = getDefaultLocale();

diff --git a/src/Conversation/Utils/inc/MessageDetailContent.h b/src/Conversation/Utils/inc/MessageDetailContent.h
index 9f0f21de2dadcf697e22d266aa5833b43f2b017c..ab424efbb015ecff33df23e0de4d0725a0c98c2a 100644 (file)
--- a/src/Conversation/Utils/inc/MessageDetailContent.h
+++ b/src/Conversation/Utils/inc/MessageDetailContent.h
@@ -30,6 +30,7 @@ namespace Msg
             static std::string getMmsNotiConvListItemContent(App &app, MsgId msgId);
 
         private:
+            // TODO: Ineffective use of Msg service (get message property by message Id)
             // Create Content of Popup for View Details
             static std::string createMsgDetailsPopupText(App &app, MsgId msgId);
             static std::string getMessageType(Message::Type msgType);

diff --git a/src/Conversation/Utils/src/MessageDetailContent.cpp b/src/Conversation/Utils/src/MessageDetailContent.cpp
index 3347a3ca0f4edc45ba5774905fa5af1e8099a433..7b8a6535572cfcc81858d4291d30265f468c0295 100644 (file)
--- a/src/Conversation/Utils/src/MessageDetailContent.cpp
+++ b/src/Conversation/Utils/src/MessageDetailContent.cpp
@@ -27,6 +27,8 @@
 
 using namespace Msg;
 
+extern std::string makeKbStr(long long bytes);
+
 std::string MessageDetailContent::getMsgDetailsPopupContent(App &app, MsgId msgId)
 {
     return createMsgDetailsPopupText(app, msgId);
@@ -307,30 +309,20 @@ std::string MessageDetailContent::getMmsMessageSize(App &app, MsgId msgId)
 {
     std::string msgDetails = msg("IDS_MSGF_BODY_MESSAGE_SIZE");
     msgDetails.append(": ");
-
     int msgSize = app.getMsgEngine().getStorage().getMessage(msgId)->getSize();
-    if(msgSize < 1024)/*checking if the MMS size is less than 1 KB. In this case, we need to show it as 1KB.*/
-        msgSize = 1;
-    else if(msgSize%1024 != 0)/*For the case of msgSize > 1024 bytes, else part is called to check if rounding off is required or not.*/
-        msgSize = round(msgSize / 1024);
-
-    msgDetails.append(std::to_string(msgSize));
-    msgDetails.append(msg("IDS_MSGF_BODY_MSGSIZE_KB"));
-
+    msgDetails.append(makeKbStr(msgSize));
     msgDetails.append("<br/>");
     return msgDetails;
 }
 
 std::string MessageDetailContent::getMmsMessageExpired(App &app, MsgId msgId)
 {
-    std::string msgDetails = msg("IDS_MSGF_BODY_EXPIRED");
-    msgDetails.append(": ");
-
+    std::string msgDetails = msg("IDS_MSG_BODY_EXPIRES_ON_C");
     MessageMmsRef mms = std::dynamic_pointer_cast<MessageMms>(app.getMsgEngine().getStorage().getMessage(msgId));
     if(mms)
     {
         time_t msgExpired = mms->getExpired();
-        msgDetails.append(TimeUtils::makeDateTimeString(msgExpired));
+        msgDetails.append(TimeUtils::makeDateString(msgExpired));
         msgDetails.append("<br/>");
     }
     return msgDetails;