Resolutions for Nabi issues reported in 2.2.1RC6
authorGAURAV JAIN <gaurav.j3@samsung.com>
Wed, 28 Aug 2013 14:35:43 +0000 (20:05 +0530)
committerGAURAV JAIN <gaurav.j3@samsung.com>
Wed, 28 Aug 2013 14:35:43 +0000 (20:05 +0530)
Change-Id: I6991bfe0115f8fdf79671f5677a7e86601fa8f72
Signed-off-by: GAURAV JAIN <gaurav.j3@samsung.com>
72 files changed:
inc/MsgContactList.h
inc/MsgConversationForm.h
inc/MsgSpamSettingsForm.h
res/ara-AE.xml
res/aze-AZ.xml
res/bul-BG.xml
res/cat-ES.xml
res/ces-CZ.xml
res/dan-DK.xml
res/deu-DE.xml
res/ell-GR.xml
res/eng-GB.xml
res/eng-PH.xml
res/eng-US.xml
res/est-EE.xml
res/eus-ES.xml
res/fin-FI.xml
res/fra-CA.xml
res/fra-FR.xml
res/gle-IE.xml
res/glg-ES.xml
res/hin-IN.xml
res/hrv-HR.xml
res/hun-HU.xml
res/hye-AM.xml
res/isl-IS.xml
res/ita-IT.xml
res/jpn-JP.xml
res/kat-GE.xml
res/kaz-KZ.xml
res/kor-KR.xml
res/lav-LV.xml
res/lit-LT.xml
res/mkd-MK.xml
res/nld-NL.xml
res/nob-NO.xml
res/pol-PL.xml
res/por-BR.xml
res/por-PT.xml
res/ron-RO.xml
res/rus-RU.xml
res/screen-size-normal/IDL_MSG_COMPOSE_PANEL.xml
res/slk-SK.xml
res/slv-SI.xml
res/spa-ES.xml
res/spa-MX.xml
res/srp-RS.xml
res/swe-SE.xml
res/tur-TR.xml
res/ukr-UA.xml
res/uzb-UZ.xml
res/zho-CN.xml
res/zho-HK.xml
res/zho-SG.xml
res/zho-TW.xml
src/MsgAttachListPopup.cpp
src/MsgAttachementControl.cpp
src/MsgBasePresentationModel.cpp
src/MsgCommonUtil.cpp
src/MsgComposerForm.cpp
src/MsgContactList.cpp
src/MsgConversationForm.cpp
src/MsgMediaTextExpandEditArea.cpp
src/MsgMessageComposePanel.cpp
src/MsgMessageData.cpp
src/MsgMessagesApp.cpp
src/MsgMmsDetailForm.cpp
src/MsgRecipientPanel.cpp
src/MsgSettingsForm.cpp
src/MsgSpamSettingsForm.cpp
src/MsgThreadData.cpp
src/MsgThreadListForm.cpp

index a27dd0b..9a0bd7e 100644 (file)
@@ -48,7 +48,7 @@ public:
 \r
 class ContactList\r
        : public Tizen::Ui::IActionEventListener\r
-       , public Tizen::Ui::IKeyEventListener\r
+       , public Tizen::Ui::IPropagatedKeyEventListener\r
        , public Tizen::Ui::Controls::IListViewItemEventListener\r
        , public Tizen::Ui::Controls::IListViewItemProvider\r
        , public IPopupEventListener\r
@@ -79,10 +79,13 @@ public:
        //From IActionEventListener\r
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);\r
 \r
-       //From IKeyEventListener\r
-       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
-       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);\r
-       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+       //From IPropagatedKeyEventListener\r
+       virtual bool OnKeyPressed(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo &keyEventInfo){return false;}\r
+       virtual bool OnKeyReleased(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo &keyEventInfo);\r
+       virtual bool OnPreviewKeyPressed (Tizen::Ui::Control &source, const Tizen::Ui::KeyEventInfo &keyEventInfo){return false;}\r
+       virtual bool OnPreviewKeyReleased (Tizen::Ui::Control &source, const Tizen::Ui::KeyEventInfo &keyEventInfo){return false;}\r
+       virtual bool TranslateKeyEventInfo (Tizen::Ui::Control &source, Tizen::Ui::KeyEventInfo &keyEventInfo){return false;}\r
+\r
 \r
 private:\r
        /**\r
index 6047351..220f282 100644 (file)
@@ -363,6 +363,7 @@ private:
        bool __isRecipientAddressEmail;\r
        bool __isInvalidRecipientInList;\r
        bool __bMsgStorageChangeType[NO_OF_MSG_STORAGE_CHANGE_OPERATIONS];\r
+       int __currentThreadId;\r
 };\r
 \r
 //}\r
index ce93c06..ca7b9bd 100644 (file)
@@ -144,7 +144,7 @@ private:
        void HandleSpamSettingItemSelection(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status);\r
        void HandleSpamAutoRejectItemSelection(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status);\r
        void HandleSpamBlockWordItemSelection(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status);\r
-       void HandleSpamMatchCriteriaItemSelection(int groupIndex, int itemIndex);\r
+       void HandleSpamMatchCriteriaItemSelection(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);\r
        void HandleBackNavigation(void);\r
        void HandleAddNavigation(void);\r
        void HandleEditNavigation(void);\r
index 3296f0a..0b8244b 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">يدوي</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">رسائل البث</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">أبجدية GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">مستلم غير صالح</text>
     <text id="IDS_MSGF_SK3_UNREAD">غير مقروءة</text>
     <text id="IDS_COM_SK_SEARCH">بحث</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">مستلم مكرر</text>
     <text id="IDS_COM_BODY_FORWARD">تحويل</text>
     <text id="IDS_COM_SK_YES">نعم</text>
     <text id="IDS_MSGF_OPT_AUDIO">الصوت</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">نسخ إلى البطاقة</text>
     <text id="IDS_COM_BODY_SUBJECT">الموضوع</text>
     <text id="IDS_COM_POP_AM_M_ABB">ص</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">نسخ إلى البطاقة</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">مكالمة صوتية</text>
     <text id="IDS_COM_SK_CANCEL">إلغاء</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">تم إرسال الرسالة</text>
index 3a16400..b6b3aba 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Ələ işlət</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Yayım mesajları</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-əlifba</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Qəbuledən səhvdir</text>
     <text id="IDS_MSGF_SK3_UNREAD">Oxunmamış</text>
     <text id="IDS_COM_SK_SEARCH">Axtar</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Duplikat qəbul edən</text>
     <text id="IDS_COM_BODY_FORWARD">Göndərmək</text>
     <text id="IDS_COM_SK_YES">Bəli</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM-ə köçürt</text>
     <text id="IDS_COM_BODY_SUBJECT">Mövzu</text>
     <text id="IDS_COM_POP_AM_M_ABB">Günortadan əvvəl</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM-ə köçürt</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Səsli zəng</text>
     <text id="IDS_COM_SK_CANCEL">Ləğv et</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Mesaj göndərildi</text>
index 4737e4f..c4d5681 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Ръчно</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Излъчени съобщения</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM азбука</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Невалиден получател</text>
     <text id="IDS_MSGF_SK3_UNREAD">Нечетени</text>
     <text id="IDS_COM_SK_SEARCH">Търсене</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Повтарящ се получател</text>
     <text id="IDS_COM_BODY_FORWARD">Препрати</text>
     <text id="IDS_COM_SK_YES">Да</text>
     <text id="IDS_MSGF_OPT_AUDIO">Автоматично</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Копирай в SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Тема</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Копирай в SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Гласово повикване</text>
     <text id="IDS_COM_SK_CANCEL">Отмени</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Съобщението е изпратено</text>
index 212c3ed..8c9a941 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Missatges de difusió</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alfabet GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinatari no vàlid</text>
     <text id="IDS_MSGF_SK3_UNREAD">Sense llegir</text>
     <text id="IDS_COM_SK_SEARCH">Cercar</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinatari duplicat</text>
     <text id="IDS_COM_BODY_FORWARD">Reenviar</text>
     <text id="IDS_COM_SK_YES">Sí</text>
     <text id="IDS_MSGF_OPT_AUDIO">Àudio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar a la SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Assumpte</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar a la SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Trucada de veu</text>
     <text id="IDS_COM_SK_CANCEL">Cancel·lar</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Missatge enviat</text>
index 6759e24..cf807c8 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Ručně</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Vysílané zprávy</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Abeceda GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Neplatný příjemce</text>
     <text id="IDS_MSGF_SK3_UNREAD">Nepřečt.</text>
     <text id="IDS_COM_SK_SEARCH">Hledat</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Duplicitní příjemce</text>
     <text id="IDS_COM_BODY_FORWARD">Předat</text>
     <text id="IDS_COM_SK_YES">Ano</text>
     <text id="IDS_MSGF_OPT_AUDIO">Zvuk</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopírovat na kartu SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Předmět</text>
     <text id="IDS_COM_POP_AM_M_ABB">dop.</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopírovat na kartu SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Hlasový hovor</text>
     <text id="IDS_COM_SK_CANCEL">Zrušit</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Zpráva odeslána</text>
index 5222b7e..7cad7fc 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuelt</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Gruppemeddelelser</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-alfabet</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Ugyldig modtager</text>
     <text id="IDS_MSGF_SK3_UNREAD">Ulæst</text>
     <text id="IDS_COM_SK_SEARCH">Søg</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Kopierede modtagere</text>
     <text id="IDS_COM_BODY_FORWARD">Viderestil</text>
     <text id="IDS_COM_SK_YES">Ja</text>
     <text id="IDS_MSGF_OPT_AUDIO">Lyd</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiér til SIM-kort</text>
     <text id="IDS_COM_BODY_SUBJECT">Emne</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiér til SIM-kort</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Stemmeopkald</text>
     <text id="IDS_COM_SK_CANCEL">Annullér</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Meddelelse er sendt</text>
index c687f25..34a1ea6 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuell</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Infomeldungen</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-Alphabet</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Ungültiger Empfänger</text>
     <text id="IDS_MSGF_SK3_UNREAD">Unge-\nlesen</text>
     <text id="IDS_COM_SK_SEARCH">Suche</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Doppelter Empfänger</text>
     <text id="IDS_COM_BODY_FORWARD">Weiterleiten</text>
     <text id="IDS_COM_SK_YES">Ja</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Auf die SIM-Karte kopieren</text>
     <text id="IDS_COM_BODY_SUBJECT">Betreff</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Auf die SIM-Karte kopieren</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Sprachanruf</text>
     <text id="IDS_COM_SK_CANCEL">Abbrechen</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Nachricht gesendet</text>
index 3ac1c03..ab3c38a 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Χειροκίνητα</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Μηνύματα εκπομπής κυψέλης</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Αλφάβητο GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Μη έγκυρος παραλήπτης</text>
     <text id="IDS_MSGF_SK3_UNREAD">Μη αναγνωσμένο</text>
     <text id="IDS_COM_SK_SEARCH">Αναζήτηση</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Διπλότυπος παραλήπτης</text>
     <text id="IDS_COM_BODY_FORWARD">Προώθηση</text>
     <text id="IDS_COM_SK_YES">Ναι</text>
     <text id="IDS_MSGF_OPT_AUDIO">Ήχος</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Αντιγραφή στη SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Θέμα</text>
     <text id="IDS_COM_POP_AM_M_ABB">ΠΜ</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Αντιγραφή στη SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Φωνητική κλήση</text>
     <text id="IDS_COM_SK_CANCEL">Άκυρο</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Μήνυμα εστάλη</text>
index 02255a8..5c93ac4 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Broadcast messages</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM alphabet</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Invalid recipient</text>
     <text id="IDS_MSGF_SK3_UNREAD">Unread</text>
     <text id="IDS_COM_SK_SEARCH">Search</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Duplicated recipient</text>
     <text id="IDS_COM_BODY_FORWARD">Forward</text>
     <text id="IDS_COM_SK_YES">Yes</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copy to SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Subject</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copy to SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Voice call</text>
     <text id="IDS_COM_SK_CANCEL">Cancel</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Message sent</text>
     <text id="IDS_MSGF_POP_MESSAGES_RECEIVED_FROM_YOUR_CONTACTS_WILL_NOT_BE_BLOCKED_EVEN_IF_THEY_CONTAIN_BLOCKED_WORDS">Messages received from your contacts will not be blocked even if they contain blocked words</text>
     <text id="IDS_COM_SK_DELETE">Delete</text>
     <text id="IDS_COM_BODY_GALLERY">Gallery</text>
-    <text id="IDS_BLOCK_MSG_INFO_STRING">Messages from this number already blocked</text>
 </string_table>
index 6de2dec..1122ce8 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Broadcast messages</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM alphabet</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Invalid recipient</text>
     <text id="IDS_MSGF_SK3_UNREAD">Unread</text>
     <text id="IDS_COM_SK_SEARCH">Search</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Duplicated recipient</text>
     <text id="IDS_COM_BODY_FORWARD">Forward</text>
     <text id="IDS_COM_SK_YES">Yes</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copy to SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Subject</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copy to SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Voice call</text>
     <text id="IDS_COM_SK_CANCEL">Cancel</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Message sent</text>
index d80958a..9dfbff7 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Broadcast messages</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM alphabet</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Invalid recipient</text>
     <text id="IDS_MSGF_SK3_UNREAD">Unread</text>
     <text id="IDS_COM_SK_SEARCH">Search</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Duplicated recipient</text>
     <text id="IDS_COM_BODY_FORWARD">Forward</text>
     <text id="IDS_COM_SK_YES">Yes</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copy to SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Subject</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copy to SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Voice call</text>
     <text id="IDS_COM_SK_CANCEL">Cancel</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Message sent</text>
index 3f4b017..2c915d7 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Käsitsi</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Kärjeteated</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-tähestik</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Vale adressaat</text>
     <text id="IDS_MSGF_SK3_UNREAD">Lugemata</text>
     <text id="IDS_COM_SK_SEARCH">Otsi</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Mitu adressaati</text>
     <text id="IDS_COM_BODY_FORWARD">Edasta</text>
     <text id="IDS_COM_SK_YES">Jah</text>
     <text id="IDS_MSGF_OPT_AUDIO">Heli</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopeeri SIM-kaardile</text>
     <text id="IDS_COM_BODY_SUBJECT">Teema</text>
     <text id="IDS_COM_POP_AM_M_ABB">EL</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopeeri SIM-kaardile</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Häälkõne</text>
     <text id="IDS_COM_SK_CANCEL">Tühista</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Sõnum on saadetud</text>
index e7293c8..5a6b5f8 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Eskuzkoa</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Difusio mezuak</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-alfabetoa</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Hartzaile baliogabea</text>
     <text id="IDS_MSGF_SK3_UNREAD">Irakurri gabea</text>
     <text id="IDS_COM_SK_SEARCH">Bilatu</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Hartzaile bikoiztua</text>
     <text id="IDS_COM_BODY_FORWARD">Birbidali</text>
     <text id="IDS_COM_SK_YES">Bai</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audioa</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIMean kopiatu</text>
     <text id="IDS_COM_BODY_SUBJECT">Gaia</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIMean kopiatu</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Ahots deia</text>
     <text id="IDS_COM_SK_CANCEL">Ezeztatu</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Mezua bidali da</text>
index 0ccf86a..474eb1c 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuaalinen</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Tiedoteviestit</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-merkistö</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Virheellinen vast.ottaja</text>
     <text id="IDS_MSGF_SK3_UNREAD">Lukem.</text>
     <text id="IDS_COM_SK_SEARCH">Etsi</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Vastaanottaja esiintyy kahdesti</text>
     <text id="IDS_COM_BODY_FORWARD">Lähetä edelleen</text>
     <text id="IDS_COM_SK_YES">Kyllä</text>
     <text id="IDS_MSGF_OPT_AUDIO">Ääni</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopioi SIM-kortille</text>
     <text id="IDS_COM_BODY_SUBJECT">Aihe</text>
     <text id="IDS_COM_POP_AM_M_ABB">AP</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopioi SIM-kortille</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Äänipuhelu</text>
     <text id="IDS_COM_SK_CANCEL">Peruuta</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Viesti lähetetty</text>
index a94926d..fcff80f 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuel</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Messages diffusés</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alphabet GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinataire non valide</text>
     <text id="IDS_MSGF_SK3_UNREAD">Non lu</text>
     <text id="IDS_COM_SK_SEARCH">Rechercher</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinataire en double</text>
     <text id="IDS_COM_BODY_FORWARD">Transférer</text>
     <text id="IDS_COM_SK_YES">Oui</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copier dans SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Objet</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copier dans SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Appel vocal</text>
     <text id="IDS_COM_SK_CANCEL">Annuler</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Message envoyé</text>
index 5f272a1..c885068 100644 (file)
     <text id="IDS_COM_SK_DONE">Effectué</text>
     <text id="IDS_MSGF_SK_RESTORE">Restaurer</text>
     <text id="IDS_MSGC_OPT_ATTACHMENTS">Pièce(s) jointe(s)</text>
-    <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuel</text>
+    <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuel(le)</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Messages de diffusion</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alphabet GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinataire non valide</text>
     <text id="IDS_MSGF_SK3_UNREAD">Non lu</text>
     <text id="IDS_COM_SK_SEARCH">Rechercher</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinataire en double</text>
     <text id="IDS_COM_BODY_FORWARD">Transf.</text>
     <text id="IDS_COM_SK_YES">Oui</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copier dans SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Objet</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copier dans SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Appel vocal</text>
     <text id="IDS_COM_SK_CANCEL">Annuler</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Message envoyé</text>
index d8436bb..d22a0d2 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Láimhe</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Teachtaireachtaí craolta</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Aibítir GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Faighteoir neamhbhailí</text>
     <text id="IDS_MSGF_SK3_UNREAD">Neamh-léite</text>
     <text id="IDS_COM_SK_SEARCH">Cuardaigh</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Faighteoir dúbláilte</text>
     <text id="IDS_COM_BODY_FORWARD">Seol ar aghaidh</text>
     <text id="IDS_COM_SK_YES">Déan é</text>
     <text id="IDS_MSGF_OPT_AUDIO">Fuaim</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Cóipeáil chuig SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Ábhar</text>
     <text id="IDS_COM_POP_AM_M_ABB">R.N.</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Cóipeáil chuig SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Glao gutha</text>
     <text id="IDS_COM_SK_CANCEL">Cuir ar ceal</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Teachtaireacht seolta</text>
index 4940533..fcee06a 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Mensaxes de difusión</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alfabeto GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinatario non válido</text>
     <text id="IDS_MSGF_SK3_UNREAD">Non lida</text>
     <text id="IDS_COM_SK_SEARCH">Buscar</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinatario duplicado</text>
     <text id="IDS_COM_BODY_FORWARD">Reenviar</text>
     <text id="IDS_COM_SK_YES">Si</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar á SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Asunto</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar á SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Chamada de voz</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Mensaxe enviada</text>
index d02bc75..8cb4bbe 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">मैनुअल</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">प्रसारण सन्देश</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM वर्णाक्षर</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">अमान्य प्राप्तकर्ता</text>
     <text id="IDS_MSGF_SK3_UNREAD">अपठित</text>
     <text id="IDS_COM_SK_SEARCH">खोजें</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">डुप्लीकेट प्राप्तकर्त्ता</text>
     <text id="IDS_COM_BODY_FORWARD">आगे भेजें</text>
     <text id="IDS_COM_SK_YES">हाँ</text>
     <text id="IDS_MSGF_OPT_AUDIO">ऑडियो</text>
-    <text id="IDS_COM_BODY_SUBJECT">विषय</text>
-    <text id="IDS_COM_POP_AM_M_ABB">ए ऍम</text>
     <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM में कॉपी करें</text>
+    <text id="IDS_COM_BODY_SUBJECT">विषय</text>
+    <text id="IDS_COM_POP_AM_M_ABB">AM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">वॉइस कॉल</text>
     <text id="IDS_COM_SK_CANCEL">रद्द</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">सन्देश भेजा</text>
index bdf5612..9cc05e9 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Ručno</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Info poruke mreže</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM abeceda</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Neispravan primatelj</text>
     <text id="IDS_MSGF_SK3_UNREAD">Nepročitano</text>
     <text id="IDS_COM_SK_SEARCH">Traži</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Primatelji su duplicirani</text>
     <text id="IDS_COM_BODY_FORWARD">Proslijedi</text>
     <text id="IDS_COM_SK_YES">Da</text>
     <text id="IDS_MSGF_OPT_AUDIO">Zvuk</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiraj na SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Naslov</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiraj na SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Poziv</text>
     <text id="IDS_COM_SK_CANCEL">Prekid</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Poruka poslana</text>
index 87f433a..b58f0e2 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Kézi</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Hálózati hírüzenetek</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Ékezet nélkül</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Érvénytelen címzett</text>
     <text id="IDS_MSGF_SK3_UNREAD">Olv.tlan</text>
     <text id="IDS_COM_SK_SEARCH">Keresés</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Kétszer előforduló címzett</text>
     <text id="IDS_COM_BODY_FORWARD">Továbbítás</text>
     <text id="IDS_COM_SK_YES">Igen</text>
     <text id="IDS_MSGF_OPT_AUDIO">Hang</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Másolás SIM-re</text>
     <text id="IDS_COM_BODY_SUBJECT">Tárgy</text>
     <text id="IDS_COM_POP_AM_M_ABB">de.</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Másolás SIM-re</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Hanghívás</text>
     <text id="IDS_COM_SK_CANCEL">Mégse</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Üzenet elküldve</text>
index 6a129b7..a7f6d9b 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Ձեռքով</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Ցանցի հաղորդագրություններ</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-այբուբեն</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Անվավեր հասցեատեր</text>
     <text id="IDS_MSGF_SK3_UNREAD">Չկարդացված</text>
     <text id="IDS_COM_SK_SEARCH">Որոնում</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Կրկնակված հասցեատեր</text>
     <text id="IDS_COM_BODY_FORWARD">Փոխանցել</text>
     <text id="IDS_COM_SK_YES">Այո</text>
     <text id="IDS_MSGF_OPT_AUDIO">Աուդիո</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Պատճենել SIM-ի մեջ</text>
     <text id="IDS_COM_BODY_SUBJECT">Թեմա</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Պատճենել SIM-ի մեջ</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Ձայնային զանգ</text>
     <text id="IDS_COM_SK_CANCEL">Չեղարկել</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Հաղորդագրությունն ուղարկված է</text>
index 1044a9a..76538c9 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Handvirkt</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Skilaboð frá endurvarpa</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM stafróf</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Ógildur viðtakandi</text>
     <text id="IDS_MSGF_SK3_UNREAD">Ólesið</text>
     <text id="IDS_COM_SK_SEARCH">Leit</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Viðtakandi kemur tvisvar fyrir</text>
     <text id="IDS_COM_BODY_FORWARD">Framsending</text>
     <text id="IDS_COM_SK_YES">Já</text>
     <text id="IDS_MSGF_OPT_AUDIO">Hljóð</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Afrita á SIM-kort</text>
     <text id="IDS_COM_BODY_SUBJECT">Efni</text>
     <text id="IDS_COM_POP_AM_M_ABB">f.h.</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Afrita á SIM-kort</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Raddsímtal</text>
     <text id="IDS_COM_SK_CANCEL">Hætta við</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Boð send</text>
index 5731f1a..06ec592 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuale</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Messaggi broadcast</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alfabeto GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinatario non valido</text>
     <text id="IDS_MSGF_SK3_UNREAD">Non letto</text>
     <text id="IDS_COM_SK_SEARCH">Cerca</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinatario duplicato</text>
     <text id="IDS_COM_BODY_FORWARD">Inoltra</text>
     <text id="IDS_COM_SK_YES">Sì</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copia nella SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Oggetto</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copia nella SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Chiamata vocale</text>
     <text id="IDS_COM_SK_CANCEL">Annulla</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Messaggio inviato</text>
index ae8ca8d..9239415 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">手動</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">放送メッセージ</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSMアルファベット</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">無効な宛先です。</text>
     <text id="IDS_MSGF_SK3_UNREAD">未読</text>
     <text id="IDS_COM_SK_SEARCH">検索</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">宛先が重複しています。</text>
     <text id="IDS_COM_BODY_FORWARD">転送</text>
     <text id="IDS_COM_SK_YES">はい</text>
     <text id="IDS_MSGF_OPT_AUDIO">オーディオ</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIMにコピー</text>
     <text id="IDS_COM_BODY_SUBJECT">件名</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIMにコピー</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">音声通話</text>
     <text id="IDS_COM_SK_CANCEL">キャンセル</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">メッセージを送信しました。</text>
index 97c9866..6dd4bdd 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">მექანიკური</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">შეტყობინებების გადაცემა</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM ანბანი</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">მიმღები არასწორია</text>
     <text id="IDS_MSGF_SK3_UNREAD">წაუკითხავი</text>
     <text id="IDS_COM_SK_SEARCH">ძიება</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">გამეორებული მიმღები</text>
     <text id="IDS_COM_BODY_FORWARD">გადამისამართება</text>
     <text id="IDS_COM_SK_YES">კი</text>
     <text id="IDS_MSGF_OPT_AUDIO">აუდიო</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">კოპირება SIM-ზე</text>
     <text id="IDS_COM_BODY_SUBJECT">თემა</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">კოპირება SIM-ზე</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">ხმოვანი ზარი</text>
     <text id="IDS_COM_SK_CANCEL">გაუქმება</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">შეტყობინება გაგზავნილია</text>
index da32c52..8f904f0 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Қолмен</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Желі  хабарламасы</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM алфавиті</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Алушы қате</text>
     <text id="IDS_MSGF_SK3_UNREAD">Оқылмаған</text>
     <text id="IDS_COM_SK_SEARCH">Тізім</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Қайталанатын алушы</text>
     <text id="IDS_COM_BODY_FORWARD">Жіберу</text>
     <text id="IDS_COM_SK_YES">Иә</text>
     <text id="IDS_MSGF_OPT_AUDIO">Аудио</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM-картаға көшіру</text>
     <text id="IDS_COM_BODY_SUBJECT">Нысан</text>
     <text id="IDS_COM_POP_AM_M_ABB">ТД</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM-картаға көшіру</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Дауыс қоңырауы</text>
     <text id="IDS_COM_SK_CANCEL">Тоқтату</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Хабар жіберілді</text>
index 27dd956..c05b7c9 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">수동</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">방송 메시지</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM 알파벳</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">수신인이 바르지 않습니다</text>
     <text id="IDS_MSGF_SK3_UNREAD">읽지 않음</text>
     <text id="IDS_COM_SK_SEARCH">검색</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">수신인이 중복 입력되었습니다</text>
     <text id="IDS_COM_BODY_FORWARD">전달</text>
     <text id="IDS_COM_SK_YES">예</text>
     <text id="IDS_MSGF_OPT_AUDIO">오디오</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM으로 복사</text>
     <text id="IDS_COM_BODY_SUBJECT">제목</text>
     <text id="IDS_COM_POP_AM_M_ABB">오전</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM으로 복사</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">음성통화</text>
     <text id="IDS_COM_SK_CANCEL">취소</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">메시지가 전송되었습니다</text>
index 1d38b3f..e41307e 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuāli</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Apraides ziņas</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM alfabēts</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Nederīgs adresāts</text>
     <text id="IDS_MSGF_SK3_UNREAD">Nelas.</text>
     <text id="IDS_COM_SK_SEARCH">Meklēt</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Adresāta dublikāts</text>
     <text id="IDS_COM_BODY_FORWARD">Pārsūtīt</text>
     <text id="IDS_COM_SK_YES">Jā</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopēt SIM kartē</text>
     <text id="IDS_COM_BODY_SUBJECT">Tēma</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopēt SIM kartē</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Balss zvans</text>
     <text id="IDS_COM_SK_CANCEL">Atcelt</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Ziņa nosūtīta</text>
index 8e505c9..3d4f12b 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Rankinis</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Transliavimo žinutės</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM abėcėlė</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Klaidingas gavėjas</text>
     <text id="IDS_MSGF_SK3_UNREAD">Neskaityta</text>
     <text id="IDS_COM_SK_SEARCH">Ieškoti</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Du tokie pat gavėjai</text>
     <text id="IDS_COM_BODY_FORWARD">Persiųsti</text>
     <text id="IDS_COM_SK_YES">Taip</text>
     <text id="IDS_MSGF_OPT_AUDIO">Garso</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopijuoti į SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Tema</text>
     <text id="IDS_COM_POP_AM_M_ABB">АМ</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopijuoti į SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Balso skambutis</text>
     <text id="IDS_COM_SK_CANCEL">Atšaukti</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Žinutė išsiųsta</text>
index 4013047..5ac6b1c 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Рачно</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Инфо пораки</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-alphabet</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Неважечки примател</text>
     <text id="IDS_MSGF_SK3_UNREAD">Непроч.</text>
     <text id="IDS_COM_SK_SEARCH">Пребарај</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Дуплиран примател</text>
     <text id="IDS_COM_BODY_FORWARD">Препрати</text>
     <text id="IDS_COM_SK_YES">Да</text>
     <text id="IDS_MSGF_OPT_AUDIO">Звук</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Копирај на SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Наслов</text>
     <text id="IDS_COM_POP_AM_M_ABB">АМ</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Копирај на SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Гласовен повик</text>
     <text id="IDS_COM_SK_CANCEL">Откажи</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Пораката е пратена</text>
index 26b1eed..b26f12b 100644 (file)
@@ -19,7 +19,7 @@
     <text id="IDS_COM_BODY_MEMO">Notitie</text>
     <text id="IDS_MSGF_BODY_SERVICECENTRE">SMS-centrale</text>
     <text id="IDS_MSGC_POP_UNABLE_TO_SEND_MESSAGE_WHILE_SENDING">Kan bericht niet verzenden tijdens verzenden</text>
-    <text id="IDS_COM_BODY_WED">WO</text>
+    <text id="IDS_COM_BODY_WED">Woe</text>
     <text id="IDS_MSGF_POP_SIM_NOT_INSERTED">SIM niet geplaatst</text>
     <text id="IDS_COM_BODY_SEP">sep</text>
     <text id="IDS_COM_POP_SERVICE_UNAVAILABLE">Service niet beschikbaar</text>
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Handmatig</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Infoberichten</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-alfabet</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Ongeldige ontvanger</text>
     <text id="IDS_MSGF_SK3_UNREAD">Niet gelezen</text>
     <text id="IDS_COM_SK_SEARCH">Zoeken</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Dubbele ontvanger</text>
     <text id="IDS_MSGF_BODY_SETTINGS_MULTIMEDIAMESSAGE">MMS-berichten</text>
     <text id="IDS_MSGF_POP_UNRECOGNISED">Niet herkend</text>
     <text id="IDS_COM_SK_OK">OK</text>
-    <text id="IDS_COM_BODY_TUE">DI</text>
-    <text id="IDS_COM_BODY_THU">DO</text>
+    <text id="IDS_COM_BODY_TUE">Din</text>
+    <text id="IDS_COM_BODY_THU">Don</text>
     <text id="IDS_MSGF_POP_CREATION_MODE_MSG">Dit bericht wordt mogelijk niet juist weergegeven aan geadresseerden. Doorgaan?</text>
     <text id="IDS_MSGC_POP_INPUTRECIPIENTS_INCORRECT_EMAIL_ADDRESS">Onjuist e-mailadres</text>
-    <text id="IDS_COM_BODY_MON">MA</text>
+    <text id="IDS_COM_BODY_MON">Maa</text>
     <text id="IDS_MSGF_HEADER_SAVE_ALL">Alles opslaan</text>
     <text id="IDS_MSGC_BODY_PICTURE_TOO_LARGE_COMPRESSING_ING">Foto te groot. Comprimeren...</text>
     <text id="IDS_COM_BODY_APR">apr</text>
@@ -93,7 +94,7 @@
     <text id="IDS_COM_BODY_JUL">jul</text>
     <text id="IDS_MSG_MBODY_USE_THE_VOLUME_KEY">Volumetoets gebruiken</text>
     <text id="IDS_MSGF_POP_RESTRICTED_MODE_UNABLE_TO_INSERT_RESTRICTED_CONTENT">Beperkte modus. Kan inhoud met restricties niet invoegen</text>
-    <text id="IDS_COM_BODY_SAT">ZA</text>
+    <text id="IDS_COM_BODY_SAT">Zat</text>
     <text id="IDS_COM_POP_PM">PM</text>
     <text id="IDS_MSGF_HEADER_MESSAGE_DETAILS">Berichtdetails</text>
     <text id="IDS_MSGF_BODY_FROM">Van</text>
     <text id="IDS_COM_BODY_FORWARD">Doorsturen</text>
     <text id="IDS_COM_SK_YES">Ja</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiëren naar SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Onderwerp</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiëren naar SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Spraakoproep</text>
     <text id="IDS_COM_SK_CANCEL">Annuleren</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Bericht verzonden</text>
     <text id="IDS_COM_POP_NEW_MESSAGE">Nieuw bericht</text>
     <text id="IDS_COM_BODY_AM">AM</text>
     <text id="IDS_COM_BODY_MY_FILES">Mijn bestanden</text>
-    <text id="IDS_COM_BODY_FRI">VR</text>
+    <text id="IDS_COM_BODY_FRI">Vri</text>
     <text id="IDS_COM_POP_REJECTED">Geweigerd</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_COM_POP_UNKNOWN_ERROR_OCCURRED">Onbekende netwerkfout opgetreden</text>
     <text id="IDS_MSGC_POP_UNABLE_TO_SEND_MESSAGES_WHILE_IN_FLIGHT_MODE_DISABLE_FLIGHT_MODE_AND_TRY_AGAIN">Kan geen berichten verzenden als de vliegtuigstand is ingeschakeld. Schakel de vliegtuigstand uit en probeer het opnieuw</text>
     <text id="IDS_MSGF_BODY_TEXT_MESSAGES">SMS-berichten</text>
     <text id="IDS_MSGC_HEADER_ATTACHMENT">Bijlage</text>
-    <text id="IDS_COM_BODY_SUN">ZO</text>
+    <text id="IDS_COM_BODY_SUN">Zon</text>
     <text id="IDS_COM_POP_FAILED">Mislukt</text>
     <text id="IDS_MSGF_BODY_READ_REPORT">Leesbevestiging</text>
     <text id="IDS_MSGF_BODY_REQUEST_DELIVERY_REPORT">Ontvangstbevestiging vragen</text>
index cf1f980..57df102 100644 (file)
@@ -19,7 +19,7 @@
     <text id="IDS_COM_BODY_MEMO">Notat</text>
     <text id="IDS_MSGF_BODY_SERVICECENTRE">Tjenestesentral</text>
     <text id="IDS_MSGC_POP_UNABLE_TO_SEND_MESSAGE_WHILE_SENDING">Kan ikke sende melding under sending</text>
-    <text id="IDS_COM_BODY_WED">Ons</text>
+    <text id="IDS_COM_BODY_WED">Ons.</text>
     <text id="IDS_MSGF_POP_SIM_NOT_INSERTED">SIM-kort ikke satt inn</text>
     <text id="IDS_COM_BODY_SEP">sep.</text>
     <text id="IDS_COM_POP_SERVICE_UNAVAILABLE">Tjenesten er ikke tilgjengelig</text>
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuelt</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Kringkastingsmeldinger</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-alfabet</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Ugyldig mottaker</text>
     <text id="IDS_MSGF_SK3_UNREAD">Ulest</text>
     <text id="IDS_COM_SK_SEARCH">Søk</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Duplisert mottaker</text>
     <text id="IDS_MSGF_BODY_SETTINGS_MULTIMEDIAMESSAGE">MMS-meldinger</text>
     <text id="IDS_MSGF_POP_UNRECOGNISED">Ukjent</text>
     <text id="IDS_COM_SK_OK">OK</text>
-    <text id="IDS_COM_BODY_TUE">Tir</text>
-    <text id="IDS_COM_BODY_THU">Tor</text>
+    <text id="IDS_COM_BODY_TUE">Tir.</text>
+    <text id="IDS_COM_BODY_THU">Tor.</text>
     <text id="IDS_MSGF_POP_CREATION_MODE_MSG">Denne meldingen, vises kanskje ikke på riktig måte for mottakerne. Fortsette?</text>
     <text id="IDS_MSGC_POP_INPUTRECIPIENTS_INCORRECT_EMAIL_ADDRESS">Feil e-postadresse</text>
-    <text id="IDS_COM_BODY_MON">Man</text>
+    <text id="IDS_COM_BODY_MON">Man.</text>
     <text id="IDS_MSGF_HEADER_SAVE_ALL">Lagre alle</text>
     <text id="IDS_MSGC_BODY_PICTURE_TOO_LARGE_COMPRESSING_ING">Bildet er for stort. Komprimerer...</text>
     <text id="IDS_COM_BODY_APR">apr.</text>
@@ -93,7 +94,7 @@
     <text id="IDS_COM_BODY_JUL">juli</text>
     <text id="IDS_MSG_MBODY_USE_THE_VOLUME_KEY">Bruk volumtasten</text>
     <text id="IDS_MSGF_POP_RESTRICTED_MODE_UNABLE_TO_INSERT_RESTRICTED_CONTENT">Begrenset modus. Kan ikke sette inn begrenset innhold</text>
-    <text id="IDS_COM_BODY_SAT">Lør</text>
+    <text id="IDS_COM_BODY_SAT">Lør.</text>
     <text id="IDS_COM_POP_PM">PM</text>
     <text id="IDS_MSGF_HEADER_MESSAGE_DETAILS">Meldingsdetaljer</text>
     <text id="IDS_MSGF_BODY_FROM">Fra</text>
     <text id="IDS_COM_BODY_FORWARD">Videresend</text>
     <text id="IDS_COM_SK_YES">Ja</text>
     <text id="IDS_MSGF_OPT_AUDIO">Lyd</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopier til SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Emne</text>
     <text id="IDS_COM_POP_AM_M_ABB">Formiddag</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopier til SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Taleanrop</text>
     <text id="IDS_COM_SK_CANCEL">Avbryt</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Melding sendt</text>
     <text id="IDS_COM_POP_NEW_MESSAGE">Ny melding</text>
     <text id="IDS_COM_BODY_AM">AM</text>
     <text id="IDS_COM_BODY_MY_FILES">Mine Filer</text>
-    <text id="IDS_COM_BODY_FRI">Fre</text>
+    <text id="IDS_COM_BODY_FRI">Fre.</text>
     <text id="IDS_COM_POP_REJECTED">Avvist</text>
     <text id="IDS_ST_BODY_VOLUME">Volum</text>
     <text id="IDS_COM_POP_UNKNOWN_ERROR_OCCURRED">Ukjent feil oppstod</text>
     <text id="IDS_MSGC_POP_UNABLE_TO_SEND_MESSAGES_WHILE_IN_FLIGHT_MODE_DISABLE_FLIGHT_MODE_AND_TRY_AGAIN">Kan ikke sende meldinger mens Flymodus er på. Deaktiver Flymodus og prøv på nytt</text>
     <text id="IDS_MSGF_BODY_TEXT_MESSAGES">Tekstmeldinger</text>
     <text id="IDS_MSGC_HEADER_ATTACHMENT">Vedlegg</text>
-    <text id="IDS_COM_BODY_SUN">Søn</text>
+    <text id="IDS_COM_BODY_SUN">Søn.</text>
     <text id="IDS_COM_POP_FAILED">Det oppstod en feil</text>
     <text id="IDS_MSGF_BODY_READ_REPORT">Leserapport</text>
     <text id="IDS_MSGF_BODY_REQUEST_DELIVERY_REPORT">Be om leveringsrapport</text>
index 905e751..6ca65cc 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Ręcznie</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Wiad. sieciowe</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alfabet GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Nieprawidłowy odbiorca</text>
     <text id="IDS_MSGF_SK3_UNREAD">Nieprz.</text>
     <text id="IDS_COM_SK_SEARCH">Szukaj</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Powtórzony odbiorca</text>
     <text id="IDS_COM_BODY_FORWARD">Prześlij dalej</text>
     <text id="IDS_COM_SK_YES">Tak</text>
     <text id="IDS_MSGF_OPT_AUDIO">Dźwięk</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiuj do pamięci SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Temat</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiuj do pamięci SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Połączenie głosowe</text>
     <text id="IDS_COM_SK_CANCEL">Anuluj</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Wiadomość wysłana</text>
index ef8054e..55abde6 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Broadcast</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alfabeto GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinatário inválido</text>
     <text id="IDS_MSGF_SK3_UNREAD">Não lida</text>
     <text id="IDS_COM_SK_SEARCH">Pesquisar</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinatário duplicado</text>
     <text id="IDS_COM_BODY_FORWARD">Encaminhar</text>
     <text id="IDS_COM_SK_YES">Sim</text>
     <text id="IDS_MSGF_OPT_AUDIO">Áudio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar para SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Assunto</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar para SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Chamada de voz</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Mensagem enviada</text>
index 56c1cf5..41501eb 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Mensagens de difusão</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alfabeto GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinatário inválido</text>
     <text id="IDS_MSGF_SK3_UNREAD">Não lida</text>
     <text id="IDS_COM_SK_SEARCH">Procurar</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinatário duplicado</text>
     <text id="IDS_COM_BODY_FORWARD">Reencaminhar</text>
     <text id="IDS_COM_SK_YES">Sim</text>
     <text id="IDS_MSGF_OPT_AUDIO">Áudio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar para o SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Assunto</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar para o SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Chamada de voz</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Mensagem enviada</text>
index 0f9e74b..4a1c742 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Mesaje informare</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alfabet GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinatar nevalid</text>
     <text id="IDS_MSGF_SK3_UNREAD">Necitit</text>
     <text id="IDS_COM_SK_SEARCH">Căutare</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinatar dublat</text>
     <text id="IDS_COM_BODY_FORWARD">Transfer</text>
     <text id="IDS_COM_SK_YES">Da</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiere pe SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Subiect</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiere pe SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Apel</text>
     <text id="IDS_COM_SK_CANCEL">Anulare</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Mesaj trimis</text>
index 498c819..6dcfb0b 100644 (file)
@@ -6,7 +6,7 @@
     <text id="IDS_MSGF_POP_BOOKMARK_WRITE_ERR_FULL">Невозможно добавить закладку. Достигнуто максимальное число закладок</text>
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Достигнуто максимальное число символов</text>
     <text id="IDS_MSGC_POP_CHANGED_TO_MMS">Изменено на MMS</text>
-    <text id="IDS_MSGC_BODY_TAKE_PICTURE">СделаÑ\82Ñ\8c Ñ\84оÑ\82о</text>
+    <text id="IDS_MSGC_BODY_TAKE_PICTURE">СделаÑ\82Ñ\8c Ñ\81нимок</text>
     <text id="IDS_COM_SK3_COMPOSE">Создать</text>
     <text id="IDS_MSGC_BODY_MAXIMUM_NUMBER_OF_RECIPIENTS_HPD_REACHED">Достигнуто максимальное число получателей (%d)</text>
     <text id="IDS_COM_POP_PM_M_ABB">PM</text>
@@ -33,7 +33,7 @@
     <text id="IDS_MSGC_BUTTON2_DURATION_N_HPD_SECS">Продолжительн.\n(%d с.)</text>
     <text id="IDS_COM_BODY_CONTACTS">Контакты</text>
     <text id="IDS_COM_SK3_PREVIEW">Просмотр</text>
-    <text id="IDS_MSGF_BODY_NO_SUBJECT">Ð\9dеÑ\82 темы</text>
+    <text id="IDS_MSGF_BODY_NO_SUBJECT">Ð\91ез темы</text>
     <text id="IDS_MSGF_BODY_REQUEST_READ_REPORT">Отчет о прочтении</text>
     <text id="IDS_MSGF_POP_NOMEMORY_ONSIM">Недостаточно памяти на SIM-карте</text>
     <text id="IDS_MSGF_OPT_BLOCK">Блокировать</text>
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Вручную</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Сообщения сети</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-алфавит</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Недопустимый получатель</text>
     <text id="IDS_MSGF_SK3_UNREAD">Непрочитанные</text>
     <text id="IDS_COM_SK_SEARCH">Поиск</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Повторяющийся получатель</text>
@@ -91,7 +92,7 @@
     <text id="IDS_COM_BODY_JUN">Июн</text>
     <text id="IDS_MSGF_BODY_MMSCCCREATIONMODEFREE">Свободный</text>
     <text id="IDS_COM_BODY_JUL">Июл</text>
-    <text id="IDS_MSG_MBODY_USE_THE_VOLUME_KEY">Ð\98Ñ\81пол. ÐºÐ»Ð°Ð²Ð¸Ñ\88Ñ\83 громкости</text>
+    <text id="IDS_MSG_MBODY_USE_THE_VOLUME_KEY">Ð\9aлавиÑ\88а громкости</text>
     <text id="IDS_MSGF_POP_RESTRICTED_MODE_UNABLE_TO_INSERT_RESTRICTED_CONTENT">Ограниченный режим. Невозможно вставить ограниченное содержимое</text>
     <text id="IDS_COM_BODY_SAT">Сб</text>
     <text id="IDS_COM_POP_PM">РМ</text>
     <text id="IDS_COM_BODY_FORWARD">Переслать</text>
     <text id="IDS_COM_SK_YES">Да</text>
     <text id="IDS_MSGF_OPT_AUDIO">Звук</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Копировать на SIM-карту</text>
     <text id="IDS_COM_BODY_SUBJECT">Тема</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Копировать на SIM-карту</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Голосовой вызов</text>
     <text id="IDS_COM_SK_CANCEL">Отмена</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Сообщение отправлено</text>
     <text id="IDS_MSGC_POP_DURATION_MUST_BE_AT_LEAST_PD_SECONDS">Минимальная длительность — %d сек.</text>
     <text id="IDS_MSGF_OPT_UNBLOCK">Разблокировать</text>
     <text id="IDS_MSGF_POP_SOME_CHARACTERS_MAY_BE_LOST_CONTINUE_Q">Некоторые символы могут быть потеряны. Продолжить?</text>
-    <text id="IDS_MSGF_BODY_SEND_READ_REPORT">Отправлять отчет о прочтении</text>
+    <text id="IDS_MSGF_BODY_SEND_READ_REPORT">Отчет о прочтении</text>
     <text id="IDS_COM_POP_DELETED">Удалено</text>
     <text id="IDS_MSGF_POP_BLOCK_PS_Q">Блокировать %s?</text>
     <text id="IDS_MSGF_BODY_ENTER_WORD">Введите слово</text>
     <text id="IDS_COM_BODY_TODAY">Сегодня</text>
     <text id="IDS_MSGF_HEADER_MESSAGE_BOXES">Папки сообщений</text>
     <text id="IDS_MSGF_HEADER_EDIT_NUMBER">Изменить номер</text>
-    <text id="IDS_MSGF_BODY_CB_MESSAGES">ШиÑ\80оковеÑ\89аÑ\82елÑ\8cнÑ\8bе Ñ\81ообÑ\89.</text>
+    <text id="IDS_MSGF_BODY_CB_MESSAGES">СообÑ\89ениÑ\8f Ñ\81еÑ\82и</text>
     <text id="IDS_MSG_BODY_DRAFT_MESSAGES">Черновики</text>
     <text id="IDS_MSGC_OPT_ADDMULTIMEDIA_VIDEO">Видео</text>
     <text id="IDS_MSGF_OPT_PROTECTION_ON">Включить защиту</text>
-    <text id="IDS_COM_BODY_SELECT_ALL">Ð\92Ñ\8bбÑ\80ать все</text>
+    <text id="IDS_COM_BODY_SELECT_ALL">Ð\92Ñ\8bделить все</text>
     <text id="IDS_MSGF_POP_UNABLE_TO_ATTACH_MAXIMUM_SIZE_OF_FILES_IS_PD_KB">Невозможно вложить. Максимальный размер файлов: %d КБ</text>
     <text id="IDS_MSGC_OPT_VIEW_CONTACT">Просмотреть</text>
     <text id="IDS_COM_POP_NEW_MESSAGE">Новое сообщение</text>
     <text id="IDS_COM_BODY_SUN">Вс</text>
     <text id="IDS_COM_POP_FAILED">Сбой</text>
     <text id="IDS_MSGF_BODY_READ_REPORT">Отчет о прочтении</text>
-    <text id="IDS_MSGF_BODY_REQUEST_DELIVERY_REPORT">Ð\97апÑ\80оÑ\81иÑ\82Ñ\8c Ð¾тчет о доставке</text>
-    <text id="IDS_MSGF_BODY_MMSCCCREATIONMODEWARNING">Ð\9fÑ\80едÑ\83пÑ\80еждаÑ\8eÑ\89ий</text>
+    <text id="IDS_MSGF_BODY_REQUEST_DELIVERY_REPORT">Ð\9eтчет о доставке</text>
+    <text id="IDS_MSGF_BODY_MMSCCCREATIONMODEWARNING">С Ð¿Ñ\80едÑ\83пÑ\80еждением</text>
     <text id="IDS_COM_BODY_NOV">Ноя</text>
     <text id="IDS_MSGF_HEADER_DRAFT_ABB">Черновик</text>
     <text id="IDS_COM_BODY_DISPLAY">Дисплей</text>
index a257b5c..b751375 100644 (file)
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!--\r
-       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
--->\r
-<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
-<ScenePanel Bversion="3.0.0.201212201745" Dversion="20120315">\r
-    <Panel id="IDL_MSG_COMPOSE_PANEL">\r
-        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout height="114" mode="Portrait" type="NONE" width="720" x="0" y="235"/>\r
-        <layout height="114" mode="Landscape" type="NONE" width="720" x="0" y="235"/>\r
-    </Panel>\r
-    <Button id="IDC_ATTACH_BUTTON" parent="IDL_MSG_COMPOSE_PANEL">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_btn_circle_bg_normal.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_circle_button_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout height="72" mode="Portrait" width="72" x="12" y="21"/>\r
-        <layout height="72" mode="Landscape" width="72" x="12" y="21"/>\r
-    </Button>\r
-    <ScrollPanel id="IDC_SCROLLPANEL" parent="IDL_MSG_COMPOSE_PANEL">\r
-        <property autoResizingEnabled="true" backgroundColor="" backgroundColorOpacity="0" clientAreaHeight="0" clientAreaWidth="0" pageScrollEnabled="false" scrollBarVisible="false" scrollDirection="SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION"/>\r
-        <panelLayout height="172" mode="Portrait" width="482"/>\r
-        <panelLayout height="554" mode="Landscape" width="107"/>\r
-        <layout height="74" mode="Portrait" type="NONE" width="482" x="96" y="20"/>\r
-        <layout height="74" mode="Landscape" type="NONE" width="482" x="96" y="20"/>\r
-    </ScrollPanel>\r
-    <Panel id="IDC_PANEL_SUBJECT" parent="IDC_SCROLLPANEL">\r
-        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout height="47" mode="Portrait" type="NONE" width="482" x="0" y="0"/>\r
-        <layout height="47" mode="Landscape" type="NONE" width="482" x="0" y="0"/>\r
-    </Panel>\r
-    <Panel id="IDC_PANEL_ATTACHEMENT" parent="IDC_SCROLLPANEL">\r
-        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout height="74" mode="Portrait" type="NONE" width="482" x="0" y="47"/>\r
-        <layout height="74" mode="Landscape" type="NONE" width="482" x="0" y="47"/>\r
-    </Panel>\r
-    <Panel id="IDC_PANEL_IMAGE_TEXT" parent="IDC_SCROLLPANEL">\r
-        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout height="51" mode="Portrait" type="NONE" width="482" x="0" y="121"/>\r
-        <layout height="51" mode="Landscape" type="NONE" width="482" x="0" y="121"/>\r
-    </Panel>\r
-    <Button id="IDC_SEND_BUTTON" parent="IDL_MSG_COMPOSE_PANEL">\r
-        <property disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout height="72" mode="Portrait" width="108" x="596" y="19"/>\r
-        <layout height="72" mode="Landscape" width="108" x="596" y="19"/>\r
-    </Button>\r
-    <Label id="IDC_CHARCOUNTER_LABEL" parent="IDL_MSG_COMPOSE_PANEL">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="" textColor="" textSize="26" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
-        <layout height="26" mode="Portrait" width="108" x="596" y="0"/>\r
-        <layout height="26" mode="Landscape" width="108" x="596" y="0"/>\r
-    </Label>\r
-</ScenePanel>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+       This XML file was automatically generated by UiBuilder - do not modify by hand.
+-->
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
+<ScenePanel Bversion="2.0.0.201308142048" Dversion="20120315">
+    <Panel id="IDL_MSG_COMPOSE_PANEL">
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
+        <layout height="114.0" mode="Portrait" type="NONE" width="720.0" x="0.0" y="235.0"/>
+        <layout height="114.0" mode="Landscape" type="NONE" width="720.0" x="0.0" y="235.0"/>
+    </Panel>
+    <Button id="IDC_ATTACH_BUTTON" parent="IDL_MSG_COMPOSE_PANEL">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_btn_circle_bg_normal.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_circle_button_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="72.0" mode="Portrait" width="72.0" x="12.0" y="21.0"/>
+        <layout height="72.0" mode="Landscape" width="72.0" x="12.0" y="21.0"/>
+    </Button>
+    <ScrollPanel id="IDC_SCROLLPANEL" parent="IDL_MSG_COMPOSE_PANEL">
+        <property autoResizingEnabled="true" backgroundColor="" backgroundColorOpacity="0" clientAreaHeight="0" clientAreaWidth="0" pageScrollEnabled="false" scrollBarVisible="true" scrollDirection="SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION"/>
+        <panelLayout height="172.0" mode="Portrait" width="482.0"/>
+        <panelLayout height="554.0" mode="Landscape" width="107.0"/>
+        <layout height="74.0" mode="Portrait" type="NONE" width="482.0" x="96.0" y="20.0"/>
+        <layout height="74.0" mode="Landscape" type="NONE" width="482.0" x="96.0" y="20.0"/>
+    </ScrollPanel>
+    <Panel id="IDC_PANEL_SUBJECT" parent="IDC_SCROLLPANEL">
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
+        <layout height="47.0" mode="Portrait" type="NONE" width="482.0" x="0.0" y="0.0"/>
+        <layout height="47.0" mode="Landscape" type="NONE" width="482.0" x="0.0" y="0.0"/>
+    </Panel>
+    <Panel id="IDC_PANEL_ATTACHEMENT" parent="IDC_SCROLLPANEL">
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
+        <layout height="74.0" mode="Portrait" type="NONE" width="482.0" x="0.0" y="47.0"/>
+        <layout height="74.0" mode="Landscape" type="NONE" width="482.0" x="0.0" y="47.0"/>
+    </Panel>
+    <Panel id="IDC_PANEL_IMAGE_TEXT" parent="IDC_SCROLLPANEL">
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
+        <layout height="51.0" mode="Portrait" type="NONE" width="482.0" x="0.0" y="121.0"/>
+        <layout height="51.0" mode="Landscape" type="NONE" width="482.0" x="0.0" y="121.0"/>
+    </Panel>
+    <Button id="IDC_SEND_BUTTON" parent="IDL_MSG_COMPOSE_PANEL">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="72.0" mode="Portrait" width="108.0" x="596.0" y="19.0"/>
+        <layout height="72.0" mode="Landscape" width="108.0" x="596.0" y="19.0"/>
+    </Button>
+    <Label id="IDC_CHARCOUNTER_LABEL" parent="IDL_MSG_COMPOSE_PANEL">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="" textColor="" textSize="26.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout height="26.0" mode="Portrait" width="108.0" x="596.0" y="0.0"/>
+        <layout height="26.0" mode="Landscape" width="108.0" x="596.0" y="0.0"/>
+    </Label>
+</ScenePanel>
index 3e3c3cf..2b531e7 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Ručne</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Vysielané správy</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Abeceda GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Neplatný príjemca</text>
     <text id="IDS_MSGF_SK3_UNREAD">Nepre-čítané</text>
     <text id="IDS_COM_SK_SEARCH">Hľadať</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Duplicitný príjemca</text>
     <text id="IDS_COM_BODY_FORWARD">Preposlať</text>
     <text id="IDS_COM_SK_YES">Áno</text>
     <text id="IDS_MSGF_OPT_AUDIO">Zvuk</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopírovať na kartu SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Predmet</text>
     <text id="IDS_COM_POP_AM_M_ABB">dop.</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopírovať na kartu SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Hlasový hovor</text>
     <text id="IDS_COM_SK_CANCEL">Zrušiť</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Správa odoslaná</text>
index 5bb8559..2d21d84 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Ročno</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Info sporočila</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Abeceda GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Neveljaven prejemnik</text>
     <text id="IDS_MSGF_SK3_UNREAD">Neprebr.</text>
     <text id="IDS_COM_SK_SEARCH">Iskanje</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Prejemnik je podvojen</text>
     <text id="IDS_COM_BODY_FORWARD">Posreduj</text>
     <text id="IDS_COM_SK_YES">Da</text>
     <text id="IDS_MSGF_OPT_AUDIO">Zvok</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiraj na SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Zadeva</text>
     <text id="IDS_COM_POP_AM_M_ABB">Dop.</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiraj na SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Glasovni klic</text>
     <text id="IDS_COM_SK_CANCEL">Prekliči</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Sporočilo poslano</text>
index 1351ead..6eef79d 100644 (file)
@@ -15,7 +15,7 @@
     <text id="IDS_COM_POP_CLOSE">Cerrar</text>
     <text id="IDS_MSGF_POP_FORWARDED">Reenviado</text>
     <text id="IDS_MSGF_OPT_CREATEMSG_ADD_WORD">Añadir palabra</text>
-    <text id="IDS_COM_BODY_PD_SELECTED">%d seleccionado</text>
+    <text id="IDS_COM_BODY_PD_SELECTED">%d seleccionados</text>
     <text id="IDS_COM_BODY_MEMO">Notas</text>
     <text id="IDS_MSGF_BODY_SERVICECENTRE">Centro de servicios</text>
     <text id="IDS_MSGC_POP_UNABLE_TO_SEND_MESSAGE_WHILE_SENDING">No se puede enviar un mensaje durante el envío</text>
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Mensajes de difusión</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alfabeto GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinatario no válido</text>
     <text id="IDS_MSGF_SK3_UNREAD">No leídos</text>
     <text id="IDS_COM_SK_SEARCH">Buscar</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinatario duplicado</text>
     <text id="IDS_COM_BODY_FORWARD">Reenviar</text>
     <text id="IDS_COM_SK_YES">Sí</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar a SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Asunto</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar a SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Llamada de voz</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Mensaje enviado</text>
index 8aa7670..c50c9fb 100644 (file)
@@ -15,7 +15,7 @@
     <text id="IDS_COM_POP_CLOSE">Cerrar</text>
     <text id="IDS_MSGF_POP_FORWARDED">Desviada</text>
     <text id="IDS_MSGF_OPT_CREATEMSG_ADD_WORD">Añadir palabra</text>
-    <text id="IDS_COM_BODY_PD_SELECTED">%d seleccionados</text>
+    <text id="IDS_COM_BODY_PD_SELECTED">%d seleccionado(s)</text>
     <text id="IDS_COM_BODY_MEMO">Notas</text>
     <text id="IDS_MSGF_BODY_SERVICECENTRE">Centro de servicio</text>
     <text id="IDS_MSGC_POP_UNABLE_TO_SEND_MESSAGE_WHILE_SENDING">No se puede enviar un mensaje durante el envío.</text>
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manual</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Canales de información</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">Alfabeto GSM</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Destinatario no válido</text>
     <text id="IDS_MSGF_SK3_UNREAD">No leídos</text>
     <text id="IDS_COM_SK_SEARCH">Buscar</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Destinatario duplicado</text>
     <text id="IDS_COM_BODY_FORWARD">Reenviar</text>
     <text id="IDS_COM_SK_YES">Sí</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar en tarjeta SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Asunto</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Copiar en tarjeta SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Llamada de voz</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Mensaje enviado</text>
index 29dd1f5..3d74e3a 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Ručno</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Info poruke</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM abeceda</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Neispravan primalac</text>
     <text id="IDS_MSGF_SK3_UNREAD">Neproč.</text>
     <text id="IDS_COM_SK_SEARCH">Pretraga</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Primalac dupliran</text>
     <text id="IDS_COM_BODY_FORWARD">Prosledi</text>
     <text id="IDS_COM_SK_YES">Da</text>
     <text id="IDS_MSGF_OPT_AUDIO">Zvuk</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiraj u SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Naslov</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiraj u SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Govorni poziv</text>
     <text id="IDS_COM_SK_CANCEL">Poništi</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Poruka poslata</text>
index 2751c07..662cfc8 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuellt</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Broadcast-meddelanden</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-alfabet</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Ogiltig mottagare</text>
     <text id="IDS_MSGF_SK3_UNREAD">Olästa</text>
     <text id="IDS_COM_SK_SEARCH">Sök</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Mottagare finns redan</text>
     <text id="IDS_COM_BODY_FORWARD">Vidarebefodra</text>
     <text id="IDS_COM_SK_YES">Ja</text>
     <text id="IDS_MSGF_OPT_AUDIO">Ljud</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiera till SIM</text>
     <text id="IDS_COM_BODY_SUBJECT">Rubrik</text>
     <text id="IDS_COM_POP_AM_M_ABB">FM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Kopiera till SIM</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Röstsamtal</text>
     <text id="IDS_COM_SK_CANCEL">Avbryt</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Meddelandet skickat</text>
index 9cd6156..75f7fbd 100644 (file)
@@ -47,8 +47,9 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Manuel</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Hücre yayını mesajları</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-Alfabesi</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Geçersiz alıcı</text>
     <text id="IDS_MSGF_SK3_UNREAD">Okunmamış</text>
-    <text id="IDS_COM_SK_SEARCH">Buluyor</text>
+    <text id="IDS_COM_SK_SEARCH">Ara</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Çoğaltılan alıcı</text>
     <text id="IDS_MSGF_BODY_UNICODE">Çoklu dil</text>
     <text id="IDS_COM_SK_CALL">Arama</text>
     <text id="IDS_COM_BODY_FORWARD">İlet</text>
     <text id="IDS_COM_SK_YES">Evet</text>
     <text id="IDS_MSGF_OPT_AUDIO">Ses</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM'e kopyala</text>
     <text id="IDS_COM_BODY_SUBJECT">Konu</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM'e kopyala</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Sesli arama</text>
     <text id="IDS_COM_SK_CANCEL">İptal</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Mesaj gönderildi</text>
index 367cd2d..5ce0e16 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Вручну</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">СВ-повідомлення</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM-алфавіт</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Хибний одержувач</text>
     <text id="IDS_MSGF_SK3_UNREAD">Непроч.</text>
     <text id="IDS_COM_SK_SEARCH">Пошук</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Повторення одержувача</text>
     <text id="IDS_COM_BODY_FORWARD">Переслати</text>
     <text id="IDS_COM_SK_YES">Так</text>
     <text id="IDS_MSGF_OPT_AUDIO">Аудіо</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Копіювати на SIM-картку</text>
     <text id="IDS_COM_BODY_SUBJECT">Тема</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">Копіювати на SIM-картку</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Голосовий виклик</text>
     <text id="IDS_COM_SK_CANCEL">Скасувати</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Повідомлення надіслано</text>
index 3fedcb2..c068a34 100644 (file)
@@ -19,7 +19,7 @@
     <text id="IDS_COM_BODY_MEMO">Eslatma</text>
     <text id="IDS_MSGF_BODY_SERVICECENTRE">Xizmat ko‘rsatish markazi</text>
     <text id="IDS_MSGC_POP_UNABLE_TO_SEND_MESSAGE_WHILE_SENDING">Yuborish mobaynida xabar yuborib bo‘lmaydi</text>
-    <text id="IDS_COM_BODY_WED">Cho</text>
+    <text id="IDS_COM_BODY_WED">Chor</text>
     <text id="IDS_MSGF_POP_SIM_NOT_INSERTED">SIM-karta kiritilmadi</text>
     <text id="IDS_COM_BODY_SEP">Sen.</text>
     <text id="IDS_COM_POP_SERVICE_UNAVAILABLE">Xizmatdan foydalanib bo‘lmaydi</text>
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">Qo‘lda</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">Eshittirishli xabarlar</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM alifbo</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">Noto'g'ri qabul qilib oluvchi</text>
     <text id="IDS_MSGF_SK3_UNREAD">O‘qilmagan</text>
     <text id="IDS_COM_SK_SEARCH">Qidirish</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">Takrorlanadigan qabul qiluvchi</text>
     <text id="IDS_MSGF_BODY_SETTINGS_MULTIMEDIAMESSAGE">Multimedia xabarlari</text>
     <text id="IDS_MSGF_POP_UNRECOGNISED">Noma’lum</text>
     <text id="IDS_COM_SK_OK">OK</text>
-    <text id="IDS_COM_BODY_TUE">Sesh</text>
+    <text id="IDS_COM_BODY_TUE">Se</text>
     <text id="IDS_COM_BODY_THU">Pay</text>
     <text id="IDS_MSGF_POP_CREATION_MODE_MSG">Ushbu xabar qabul qiluvchilarga to‘g‘ri ko‘rinmayapti. Davom ettirilsinmi?</text>
     <text id="IDS_MSGC_POP_INPUTRECIPIENTS_INCORRECT_EMAIL_ADDRESS">Noto‘g‘ri e-pochta manzili</text>
-    <text id="IDS_COM_BODY_MON">Du.</text>
+    <text id="IDS_COM_BODY_MON">Du</text>
     <text id="IDS_MSGF_HEADER_SAVE_ALL">Barchasini saqlash</text>
     <text id="IDS_MSGC_BODY_PICTURE_TOO_LARGE_COMPRESSING_ING">Rasm juda katta. Zichlash...</text>
     <text id="IDS_COM_BODY_APR">Apr.</text>
@@ -93,7 +94,7 @@
     <text id="IDS_COM_BODY_JUL">Iyl.</text>
     <text id="IDS_MSG_MBODY_USE_THE_VOLUME_KEY">Balandlik tugmasini ishl.</text>
     <text id="IDS_MSGF_POP_RESTRICTED_MODE_UNABLE_TO_INSERT_RESTRICTED_CONTENT">Cheklangan rejim. Cheklangan tarkibni kiritib bo‘lmaydi</text>
-    <text id="IDS_COM_BODY_SAT">Sha</text>
+    <text id="IDS_COM_BODY_SAT">Shan</text>
     <text id="IDS_COM_POP_PM">PM</text>
     <text id="IDS_MSGF_HEADER_MESSAGE_DETAILS">Xabar tafsilotlari</text>
     <text id="IDS_MSGF_BODY_FROM">Quyidagidan</text>
     <text id="IDS_COM_BODY_FORWARD">Boshqaga yo‘naltirish</text>
     <text id="IDS_COM_SK_YES">Ha</text>
     <text id="IDS_MSGF_OPT_AUDIO">Audio</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM-kartaga nusxa ko‘chirish</text>
     <text id="IDS_COM_BODY_SUBJECT">Mavzu</text>
     <text id="IDS_COM_POP_AM_M_ABB">AM</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">SIM-kartaga nusxa ko‘chirish</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">Ovozli qo‘ng‘iroq</text>
     <text id="IDS_COM_SK_CANCEL">Bekor q.</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">Xabar yuborildi</text>
     <text id="IDS_COM_POP_NEW_MESSAGE">Yangi xabar</text>
     <text id="IDS_COM_BODY_AM">AM</text>
     <text id="IDS_COM_BODY_MY_FILES">Fayllarim</text>
-    <text id="IDS_COM_BODY_FRI">Jum.</text>
+    <text id="IDS_COM_BODY_FRI">Ju</text>
     <text id="IDS_COM_POP_REJECTED">Rad etildi</text>
     <text id="IDS_ST_BODY_VOLUME">Ovoz Balandliigi</text>
     <text id="IDS_COM_POP_UNKNOWN_ERROR_OCCURRED">Noma’lum xato yuz berdi</text>
index 814d911..db28b3c 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">手动</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">广播信息</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM 字母系统</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">无效收件人</text>
     <text id="IDS_MSGF_SK3_UNREAD">未读</text>
     <text id="IDS_COM_SK_SEARCH">搜索</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">重复的收件人</text>
@@ -67,7 +68,7 @@
     <text id="IDS_MSGF_OPT_STATUS">状态</text>
     <text id="IDS_COM_BODY_OCT">10月</text>
     <text id="IDS_MSGF_BODY_MMSNOTIMSGSTATUSSENT">已发送</text>
-    <text id="IDS_COM_POP_ATTACH">附加</text>
+    <text id="IDS_COM_POP_ATTACH">添加附件</text>
     <text id="IDS_MSGF_BODY_BLOCKED_WORDS">已阻止词语</text>
     <text id="IDS_MSGF_POP_SAVED_IN_MY_FILES">已保存在我的文件中</text>
     <text id="IDS_MSGF_BODY_SETTINGS_MULTIMEDIAMESSAGE">彩信</text>
     <text id="IDS_COM_BODY_FORWARD">转发</text>
     <text id="IDS_COM_SK_YES">是</text>
     <text id="IDS_MSGF_OPT_AUDIO">声音</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">复制至 SIM 卡</text>
     <text id="IDS_COM_BODY_SUBJECT">主题</text>
     <text id="IDS_COM_POP_AM_M_ABB">上午</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">复制至 SIM 卡</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">语音通话</text>
     <text id="IDS_COM_SK_CANCEL">取消</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">已发送</text>
index 6c54c8f..99f0815 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">手動</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">廣播訊息</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM 字符表</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">無效收件人</text>
     <text id="IDS_MSGF_SK3_UNREAD">未讀</text>
     <text id="IDS_COM_SK_SEARCH">搜尋</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">重複的收件人</text>
     <text id="IDS_COM_BODY_FORWARD">轉寄</text>
     <text id="IDS_COM_SK_YES">是</text>
     <text id="IDS_MSGF_OPT_AUDIO">音訊</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">複製至 SIM 卡</text>
     <text id="IDS_COM_BODY_SUBJECT">主題</text>
     <text id="IDS_COM_POP_AM_M_ABB">上午</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">複製至 SIM 卡</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">語音通話</text>
     <text id="IDS_COM_SK_CANCEL">取消</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">訊息已發送</text>
index 60ab929..36527fb 100644 (file)
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">手动</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">广播讯息</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM字母系统</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">无效收件人</text>
     <text id="IDS_MSGF_SK3_UNREAD">未读</text>
     <text id="IDS_COM_SK_SEARCH">搜寻</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">重复的收件人</text>
     <text id="IDS_COM_BODY_FORWARD">转发</text>
     <text id="IDS_COM_SK_YES">是</text>
     <text id="IDS_MSGF_OPT_AUDIO">音频</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">复制至SIM卡</text>
     <text id="IDS_COM_BODY_SUBJECT">主题</text>
     <text id="IDS_COM_POP_AM_M_ABB">上午</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">复制至SIM卡</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">语音通话</text>
     <text id="IDS_COM_SK_CANCEL">取消</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">已发送</text>
index 96d842e..d2bf5c7 100644 (file)
@@ -30,7 +30,7 @@
     <text id="IDS_MSG_ITAB4_VOICE_CALL">語音通話</text>
     <text id="IDS_COM_BODY_MESSAGES">訊息</text>
     <text id="IDS_COM_POP_DELETE_Q">要刪除嗎?</text>
-    <text id="IDS_MSGC_BUTTON2_DURATION_N_HPD_SECS">持續時間n(%d 秒)</text>
+    <text id="IDS_MSGC_BUTTON2_DURATION_N_HPD_SECS">持續時間\n(%d 秒)</text>
     <text id="IDS_COM_BODY_CONTACTS">聯絡人</text>
     <text id="IDS_COM_SK3_PREVIEW">預覽</text>
     <text id="IDS_MSGF_BODY_NO_SUBJECT">無主旨</text>
@@ -47,6 +47,7 @@
     <text id="IDS_MSGF_BODY_RECEIVINGOPTIONNETWORK_MANUAL">手動模式</text>
     <text id="IDS_MSGF_BODY_BROADCASTMESSAGES">廣播訊息</text>
     <text id="IDS_MSGF_BODY_GSM_ALPHABET">GSM 字母表</text>
+    <text id="IDS_MSGF_BODY_INVALID_RECIPIENT">無效的收件人</text>
     <text id="IDS_MSGF_SK3_UNREAD">未讀</text>
     <text id="IDS_COM_SK_SEARCH">搜尋</text>
     <text id="IDS_MSGC_BODY_DUPLICATED_RECIPIENT">重複的收件人</text>
     <text id="IDS_COM_BODY_FORWARD">轉寄</text>
     <text id="IDS_COM_SK_YES">是</text>
     <text id="IDS_MSGF_OPT_AUDIO">音訊</text>
+    <text id="IDS_MSGF_BODY_COPY_TO_SIM">複製至 SIM 卡</text>
     <text id="IDS_COM_BODY_SUBJECT">主旨</text>
     <text id="IDS_COM_POP_AM_M_ABB">上午</text>
-    <text id="IDS_MSGF_BODY_COPY_TO_SIM">複製至 SIM 卡</text>
     <text id="IDS_MSGF_OPT_VOICE_CALL">語音通話</text>
     <text id="IDS_COM_SK_CANCEL">取消</text>
     <text id="IDS_MSGC_POP_MESSAGESENT">訊息已傳送</text>
index be028c9..cc87f5d 100644 (file)
@@ -318,9 +318,13 @@ AttachListPopup::OnListViewItemStateChanged(ListView& listView, int index,
                CommonUtil::ShowInfoPopup(L"Memory Low, Delete some data", "Low Memory", MSGBOX_STYLE_NONE, 3000);\r
        }\r
        requestId = REQUEST_DESTROY_ATTACH_POPUP;\r
-       ArrayList* pArgs = new (std::nothrow) ArrayList();\r
-       pArgs->Construct();\r
-       pArgs->Add(new (std::nothrow) Boolean(true)); // This means, an application control is about to be launched\r
+       ArrayList* pArgs = null;\r
+       if (!isItemtoBeRestrictedInLowMemory)\r
+       {\r
+               pArgs = new (std::nothrow) ArrayList();\r
+               pArgs->Construct();\r
+               pArgs->Add(new (std::nothrow) Boolean(true)); // This means, an application control is about to be launched\r
+       }\r
        __parentCntl.SendUserEvent(requestId, pArgs);\r
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
 }\r
index 3a5e09f..ebf47a8 100644 (file)
@@ -109,6 +109,7 @@ const String&
 AttachementControl::GetAttachementFilepath(void) const\r
 {\r
        AppLogDebug("ENTER");\r
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
        return __attachFilePath;\r
 }\r
 \r
index a8f23a5..9948c82 100644 (file)
@@ -196,8 +196,14 @@ BasePresentationModel::GetRecipientDetailsListN(int threadId) const
                                                          MSG_ADDRESS_INFO_DISPLAYNAME_STR, recipientName, MAX_ADDRESS_VAL_LEN);
                        int contactId(-1);
                        msg_get_int_value(pAddressList.msg_struct_info[count],MSG_ADDRESS_INFO_CONTACT_ID_INT, &contactId);
+
+
+                       AppLogDebug("contactId id : %d",contactId);
+
                        RecordId recordId = contactId;
 
+                       AppLogDebug("record id : %d",recordId);
+
                        ContactDetails* pConDetails = new (std::nothrow) ContactDetails();
                        pConDetails->contactAddress = recipientNumber;
                        pConDetails->isEmailAddr = pConDetails->contactAddress.Contains(L"@");
index 4306a9e..e64e16b 100644 (file)
@@ -57,6 +57,8 @@ const wchar_t* IDS_MESSAGE = L"message";
 const wchar_t* IDS_VIDEO = L"video/*";\r
 const wchar_t* IDS_AUDIO = L"audio/*";\r
 const wchar_t* IDS_FILE = L"file://";\r
+const wchar_t* IDS_UNDERSCORE = L"_";\r
+const wchar_t* IDS_DATA_FOLDER = L"data/";\r
 \r
 bool\r
 CommonUtil::IsImageFile(const String& filePath)\r
@@ -889,26 +891,29 @@ String
 CommonUtil::FileBackup(const String& fileName)\r
 {\r
        AppLogDebug("ENTER");\r
-       int i = 0;\r
+       AppLogDebug("File name and path : %S",fileName.GetPointer());\r
+\r
        String newDataPath(App::GetInstance()->GetAppSharedPath());\r
-       String tempDataPath;\r
-       newDataPath.Append(L"data/");\r
+       newDataPath.Append(IDS_DATA_FOLDER);\r
        newDataPath.Append(File::GetFileName(fileName));\r
-       result r = File::Copy(fileName, newDataPath, true);\r
-\r
-       while (r != E_SUCCESS && r == E_FILE_ALREADY_EXIST)\r
-       {\r
-               tempDataPath.Clear();\r
-               tempDataPath.Append(App::GetInstance()->GetAppSharedPath());\r
-               tempDataPath.Append(L"data/");\r
-               tempDataPath.Append(i);\r
-               tempDataPath.Append("Copy_of_"  + File::GetFileName(fileName));\r
-               AppLogDebug("MMS DATA PATH (new file name): %S", tempDataPath.GetPointer());\r
-               r = File::Copy(fileName, tempDataPath, true);\r
-               i++;\r
-       }\r
 \r
-       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
+       File::Copy(fileName, newDataPath, true);\r
+\r
+/*     String duplicateCopy = newDataPath;\r
+       int extensionLength = File::GetFileExtension(duplicateCopy).GetLength();\r
+       duplicateCopy.Insert(IDS_UNDERSCORE,duplicateCopy.GetLength() - (extensionLength + 1));\r
+       duplicateCopy.Insert(i,duplicateCopy.GetLength() - (extensionLength + 1));\r
 \r
+\r
+\r
+       if (r != E_SUCCESS && r == E_FILE_ALREADY_EXIST)\r
+       {\r
+               r = File::Copy(fileName, duplicateCopy, true);\r
+               AppLogDebug("File name and path : %S",duplicateCopy.GetPointer());\r
+               AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
+               return duplicateCopy;\r
+       }*/\r
+       AppLogDebug("File name and path : %S",newDataPath.GetPointer());\r
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
        return newDataPath;\r
 }\r
index e475807..0ffb95c 100644 (file)
@@ -270,6 +270,15 @@ ComposerForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        }
        break;
 
+       case REQUEST_HIDE_CONTEXTMENU:
+       {
+               if (__pMoreContextMenu && __pMoreContextMenu->GetShowState())
+               {
+                       __pMoreContextMenu->SetShowState(false);
+               }
+       }
+       break;
+
        default:
                break;
        }
@@ -347,15 +356,6 @@ ComposerForm::OnSceneActivatedN(const SceneId& previousSceneId,
        {
                AppLogDebug("scene id is not empty");
        }
-
-       //SetFocus();
-       //__pRecipientPanel->SetFocus();
-
-       // Set editor text based on font settings
-//     FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
-//     int size = pFontSettings->GetMessageTextSize(pFontSettings->GetMessageFontType());
-//     __pMsgComposePanel->SetTextSize(size);
-//     __pRecipientPanel->SetTextSize(size);
        if (pArgs)
        {
                Integer* launchType = (Integer*) pArgs->GetAt(0);
@@ -536,7 +536,7 @@ ComposerForm::OnSendButtonClick(void)
 {
        AppLogDebug("ENTER");
        // If entered text not yet converted to token, then check if can it be converted to token.
-       if (!__pRecipientPanel->CheckRecipientForToken(false))
+       if (!__pRecipientPanel->CheckRecipientForToken())
        {
                RequestId rerquestId = REQUEST_ENABLE_DISABLE_SEND_BUTTON;
                SendUserEvent(rerquestId, null);
@@ -600,26 +600,11 @@ ComposerForm::OnSendButtonClick(void)
                        if (msgResponse == MSG_RESPONSE_NO_SIM)
                        {
                                CommonUtil::ShowMessageNotification(L"Message Sending Failed");
-//                             if (__pSendFailedPopup)
-//                             {
-//                                     __pSendFailedPopup->SetShowState(false);
-//                                     delete __pSendFailedPopup;
-//                                     __pSendFailedPopup = null;
-//                             }
-//                             __pSendFailedPopup = new (std::nothrow) Popup();
-//                             __pSendFailedPopup->Construct(L"IDL_MSG_INFO_POPUP");
-//                             __pSendFailedPopup->AddKeyEventListener(*this);
-//                             Button* pOkDelete = static_cast<Button*>(__pSendFailedPopup->GetControl(L"IDC_BUTTON1"));
-//                             Label* pLabel = static_cast<Label*>(__pSendFailedPopup->GetControl(L"IDC_LABEL1"));
-//                             pLabel->SetText(L"Message Sending Failed");
-//                             pOkDelete->SetActionId(IDA_MSG_SEND_FAILED);
-//                             pOkDelete->AddActionEventListener(*this);
-//                             __pSendFailedPopup->Show();
                        }
-                       // If draft message send, remove draft entry
+
                        if (pMsgPrModel && __pDraftMessageEntry)
                        {
-                               pMsgPrModel->Delete(__pDraftMessageEntry->GetEntryId(), REQUEST_DELETE_MESSAGE);
+                               pMsgPrModel->Delete(__pDraftMessageEntry->GetEntryId(), REQUEST_DELETE_MESSAGE); // If draft message send, remove draft entry
                        }
                        MessagesApp* pMsgApp = (MessagesApp*) UiApp::GetInstance();
                        if (pMsgApp->IsAppRunningEmbededMode())
@@ -776,7 +761,7 @@ ComposerForm::OnActionPerformed(const Control& source, int actionId)
                bool IsContentExist(!__pMsgComposePanel->IsComposeFieldEmpty());
                if(__pRecipientPanel->IsTextForTokenExist())
                {
-                       __pRecipientPanel->CheckRecipientForToken();
+                       __pRecipientPanel->CheckRecipientForToken(false);
                }
                bool IsRecipientExist(__pRecipientPanel->GetRecipientCount() > 0);
                if(IsContentExist && IsRecipientExist)  // If both exists, create a draft message
@@ -964,27 +949,6 @@ ComposerForm::OnKeypadOpened(Control& source)
 {
        AppLogDebug("ENTER");
 
-//     MessagesApp* pMessages = static_cast<MessagesApp*> (Application::GetInstance());
-//
-//     bool isHwKeySupported = false;
-//     if (pMessages)
-//     {
-//             isHwKeySupported = pMessages->IsHwKeySupported();
-//             AppLog("IsHWKeySupported = %d", pMessages->IsHwKeySupported());
-//     }
-//
-//     if (!Clipboard::GetInstance()->IsPopupVisible() && !isHwKeySupported)
-//     {
-//             GetHeader()->RemoveButtonAt(BUTTON_POSITION_RIGHT);
-//             ButtonItem btnRight;
-//             btnRight.Construct(BUTTON_ITEM_STYLE_ICON, IDA_BUTTON_DROP_DOWN);
-//             Bitmap* pBitMap = BitmapUtility::GetInstance()->GetIcon(MSG_ICON_SIP_CLOSE);
-//             btnRight.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitMap);
-//             pBitMap = BitmapUtility::GetInstance()->GetIcon(MSG_ICON_SIP_CLOSE_PRESS);
-//             btnRight.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitMap);
-//             GetHeader()->SetButton(BUTTON_POSITION_RIGHT, btnRight);
-//     }
-
        Rectangle clientArea = GetClientAreaBounds();
        AppLogDebug("client area height : %d",clientArea.height);
        if (__pMsgComposePanel != null && __pRecipientPanel)
@@ -1004,27 +968,6 @@ ComposerForm::OnKeypadClosed(Control& source)
 {
        AppLogDebug("ENTER");
 
-//     MessagesApp* pMessages = static_cast<MessagesApp*> (Application::GetInstance());
-//
-//     bool isHwKeySupported = false;
-//     if (pMessages)
-//     {
-//             isHwKeySupported = pMessages->IsHwKeySupported();
-//             AppLog("IsHWKeySupported = %d", pMessages->IsHwKeySupported());
-//     }
-//     if (!isHwKeySupported)
-//     {
-//             //Hide drop-down button in header and display back button:
-//             GetHeader()->RemoveButtonAt(BUTTON_POSITION_RIGHT);
-//             ButtonItem btnRight;
-//             btnRight.Construct(BUTTON_ITEM_STYLE_ICON, IDA_HEADER_BACK);
-//             Bitmap* pBitMap = BitmapUtility::GetInstance()->GetIcon(MSG_ICON_HEADER_BACK);
-//             btnRight.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitMap);
-//             pBitMap = BitmapUtility::GetInstance()->GetIcon(MSG_ICON_HEADER_BACK_PRESSED);
-//             btnRight.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitMap);
-//             GetHeader()->SetButton(BUTTON_POSITION_RIGHT, btnRight);
-//     }
-
        Rectangle clientArea = GetClientAreaBounds();
        AppLogDebug("clientArea : %d", clientArea.height);
        if (__pMsgComposePanel != null)
@@ -1041,8 +984,7 @@ ComposerForm::OnKeypadClosed(Control& source)
                        __pMsgComposePanel->SetBounds(Rectangle(0, clientArea.height - __pMsgComposePanel->GetDisplayHeight(), clientArea.width, __pMsgComposePanel->GetDisplayHeight()));
                }
        }
-       //SetFocus();
-       //Invalidate(true); // added for 44753
+
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return;
 }
@@ -1320,13 +1262,11 @@ void
 ComposerForm::OnFormBackRequested(Form& source)
 {
        AppLogDebug("ENTER");
-
        MessageComposeData* pComposeData = __pMsgComposePanel->GetMessageComposeDataN();
-
        bool IsContentExist(!__pMsgComposePanel->IsComposeFieldEmpty());
        if(__pRecipientPanel->IsTextForTokenExist())
        {
-               __pRecipientPanel->CheckRecipientForToken();
+               __pRecipientPanel->CheckRecipientForToken(false);
        }
        bool IsRecipientExist(__pRecipientPanel->GetRecipientCount() > 0);
 
index 3bd7eb1..f22c2c6 100644 (file)
@@ -373,7 +373,7 @@ ContactList::BlockPopup(void)
 //             strText.Replace(L"%s", __contactNumber);
 //             number.Append(strText);
 //             pLabelNumber->SetText(number);
-               __pBlockConfirmPopup->AddKeyEventListener(*this);
+               __pBlockConfirmPopup->SetPropagatedKeyEventListener(this);
                __pBlockConfirmPopup->Show();
        }
 
@@ -421,12 +421,12 @@ ContactList::OnActionPerformed(const Control& source, int actionId)
        return;
 }
 
-void
-ContactList::OnKeyReleased(const Control& source, KeyCode keyCode)
+bool
+ContactList::OnKeyReleased(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo &keyEventInfo)
 {
        AppLogDebug("ENTER");
 
-       switch (keyCode)
+       switch (keyEventInfo.GetKeyCode())
        {
        case KEY_BACK:
        case KEY_ESC:
@@ -443,7 +443,7 @@ ContactList::OnKeyReleased(const Control& source, KeyCode keyCode)
        }
 
        AppLogDebug("EXIT: r= %s", GetErrorMessage(GetLastResult()));
-       return;
+       return false;
 }
 
 void
index fb214ae..6cf8cfc 100644 (file)
@@ -81,6 +81,7 @@ ConversationForm::ConversationForm(ConversationListFormType convListType)
        , __isContactHelperAppLaunched(false)
        , __isRecipientAddressEmail(false)
        , __isInvalidRecipientInList(false)
+       , __currentThreadId(-1)
 {
        Reset();
 }
@@ -528,25 +529,34 @@ ConversationForm::OnSceneActivatedN(const SceneId& previousSceneId,
                pArgs->RemoveAll();
                delete pArgs;
        }
+
+       if(__pMsgComposePanel && CONVERSATION_LIST_FORM_VIEW == __convFormType)
+       {
+               __pMsgComposePanel->ClearText(false);
+               __pMsgComposePanel->HideAttachListPopup();
+       }
+
        ConversationPresentationModel* pConvPrModel = ConversationPresentationModel::GetInstance();
        if (pConvPrModel)
        {
-               int threadId = __pCurrentThreadEntry->GetEntryId();
+               int threadId = __currentThreadId = __pCurrentThreadEntry->GetEntryId();
                pConvPrModel->GetConversationMessageList(threadId);
                pConvPrModel->AddConversationEventListener(*this, threadId);
-               const MessageData* draftMessage = pConvPrModel->GetDraftMessage();
-               if ((__convFormType == CONVERSATION_LIST_FORM_VIEW) && draftMessage)
+
+               if (CONVERSATION_LIST_FORM_VIEW == __convFormType)
                {
-                       // Load draft to UI
-                       __pMsgComposePanel->LoadMessageData(*draftMessage);
-                       if (draftMessage->IsMms())
+                       const MessageData* draftMessage = pConvPrModel->GetDraftMessage();
+                       if(draftMessage)
                        {
-                               __pMsgComposePanel->SendUserEvent(REQUEST_CHECK_COMPOSE_STATE,null);
+                               __pMsgComposePanel->LoadMessageData(*draftMessage);
+                               if (draftMessage->IsMms())
+                               {
+                                       __pMsgComposePanel->SendUserEvent(REQUEST_CHECK_COMPOSE_STATE,null);
+                               }
                        }
                }
        }
        __pConvMessageList->UpdateTableView();
-       // Scroll to latest message.
        int lastGroupIndex = __pConvMessageList->GetGroupCount() - 1;
        int listItemCount = __pConvMessageList->GetItemCountAt(lastGroupIndex);
        if (lastGroupIndex >= 0 && listItemCount > 0)
@@ -554,7 +564,6 @@ ConversationForm::OnSceneActivatedN(const SceneId& previousSceneId,
                __pConvMessageList->ScrollToItem(lastGroupIndex, listItemCount - 1, TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_BOTTOM);
        }
 
-       // Prepare contact list
        if(!bIsMsgForward)
        {
                if(__pContactDetails)
@@ -566,13 +575,6 @@ ConversationForm::OnSceneActivatedN(const SceneId& previousSceneId,
                PrepareContactList();
                SetHeader();
        }
-//     if (__pMsgComposePanel)
-//     {
-//             // Set text size based on settings
-//             FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
-//             int size = pFontSettings->GetMessageTextSize(pFontSettings->GetMessageFontType());
-//             __pMsgComposePanel->SetTextSize(size);
-//     }
 
        AppLogDebug("EXIT: r= %s", GetErrorMessage(GetLastResult()));
        return;
@@ -716,10 +718,6 @@ ConversationForm::OnActionPerformed(const Control& source, int actionId)
                if (!__isInvalidRecipientInList)
                {
                        CreateDraftMessage();
-                       if(__pMsgComposePanel)
-                       {
-                               __pMsgComposePanel->ClearText(false);
-                       }
                }
                if (pArgList)
                {
@@ -836,14 +834,6 @@ ConversationForm::OnActionPerformed(const Control& source, int actionId)
        {
                if (__pContactDetails && __pContactDetails->GetCount() > 1)
                {
-//                     if (!__pList || !__pList->GetShowState())
-//                     {
-//                             ShowContactList(true);
-//                     }
-//                     else
-//                     {
-//                             ShowContactList(false);
-//                     }
                        SetFocus();
                        if(__pList)
                        {
@@ -883,8 +873,6 @@ ConversationForm::OnActionPerformed(const Control& source, int actionId)
                if (__pBlockPopup)
                {
                        __pBlockPopup->SetShowState(false);
-                       //delete __pBlockPopup;
-                       //__pBlockPopup = null;
                }
 
        }
@@ -895,8 +883,6 @@ ConversationForm::OnActionPerformed(const Control& source, int actionId)
                if (__pBlockPopup)
                {
                        __pBlockPopup->SetShowState(false);
-                       //delete __pBlockPopup;
-                       //__pBlockPopup = null;
                }
        }
        break;
@@ -908,10 +894,10 @@ ConversationForm::OnActionPerformed(const Control& source, int actionId)
        }
        break;
 
-       case IDA_PREVIEW:
+       case IDA_PREVIEW: //Preview MMS
        {
                MessageComposeData* pComposeData = null;
-               // Save to draft
+
                if(__pMsgComposePanel)
                {
                        __pMsgComposePanel->HideKeypad(); // To avoid control overlapping
@@ -919,7 +905,6 @@ ConversationForm::OnActionPerformed(const Control& source, int actionId)
                }
                if (pComposeData)
                {
-                       //Preview MMS
                        ArrayList* pArgList = new (std::nothrow) ArrayList();
                        pArgList->Construct();
                        MessageData* pMessageData = new (std::nothrow) MessageData();
@@ -928,11 +913,7 @@ ConversationForm::OnActionPerformed(const Control& source, int actionId)
                        SceneManager* pSceneManager = SceneManager::GetInstance();
                        if (!__isInvalidRecipientInList)
                        {
-                               CreateDraftMessage();
-                               if(__pMsgComposePanel)
-                               {
-                                       __pMsgComposePanel->ClearText(false);
-                               }
+                               CreateDraftMessage();   // Save to draft
                        }
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MMS_PREVIEW, SCENE_TRANSITION_ANIMATION_TYPE_NONE), pArgList);
                        delete pComposeData;
@@ -1154,54 +1135,24 @@ void
 ConversationForm::OnSettingChanged(Tizen::Base::String& key)
 {
        AppLogDebug("ENTER");
-       AppLogDebug("Initial volume level is %d", __volumeLevel);
-       result r = E_SUCCESS;
-       SettingPresentationModel* pSettingPrModel = SettingPresentationModel::GetInstance();
-       if (pSettingPrModel->IsVolumeKeyOn())
+
+       if(key.Equals(String(IDS_DATE_TIME_FORMAT),true) ||
+                       key.Equals(String(IDS_TIME_FORMAT),true) ||
+                       key.Equals(String(IDS_TIME_FORMAT_24HR),true) ||
+                       key.Equals(String(IDS_TIME_FORMAT_12HR),true))
        {
-               int mediaVolumeLevel = -1;
-               r = SettingInfo::GetValue(IDS_KEY_VOLUME_LEVEL, mediaVolumeLevel);
-               if (r == E_SUCCESS)
-               {
-                       if (mediaVolumeLevel > __volumeLevel)
-                       {
-                               FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
-                               int fontType = (int) pFontSettings->GetMessageFontType();
-                               if (fontType < SETTING_HUGE_FONT)
-                               {
-                                       fontType++;
-                                       pFontSettings->SetMessageFonttype((SettingFontType) fontType);
-                               }
-                               int size = pFontSettings->GetMessageTextSize((SettingFontType) fontType);
-                               if (__convFormType == CONVERSATION_LIST_FORM_VIEW)
-                               {
-                                       __pMsgComposePanel->SetTextSize(size);
-                                       __pMsgComposePanel->Invalidate(true);
-                               }
-                               __pConvMessageList->UpdateTableView();
-                       }
-                       else if (mediaVolumeLevel < __volumeLevel)
+                       if (CONVERSATION_LIST_FORM_VIEW == __convFormType)
                        {
-                               FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
-                               int fontType = (int) pFontSettings->GetMessageFontType();
-                               if (fontType > SETTING_TINY_FONT)
+                               ConversationPresentationModel* pConvPrModel = ConversationPresentationModel::GetInstance();
+                               if (pConvPrModel && __pCurrentThreadEntry)
                                {
-                                       fontType--;
-                                       pFontSettings->SetMessageFonttype((SettingFontType) fontType);
-                               }
-                               int size = pFontSettings->GetMessageTextSize((SettingFontType) fontType);
-                               if (__convFormType == CONVERSATION_LIST_FORM_VIEW)
-                               {
-                                       __pMsgComposePanel->SetTextSize(size);
-                                       __pMsgComposePanel->Invalidate(true);
+                                       int threadId = __pCurrentThreadEntry->GetEntryId();
+                                       pConvPrModel->GetConversationMessageList(threadId);
                                }
                                __pConvMessageList->UpdateTableView();
                        }
-
-                       __volumeLevel = mediaVolumeLevel;
-               }
-               AppLogDebug("Volume level is %d and result is %d", mediaVolumeLevel, r);
        }
+
        AppLogDebug("EXIT: r= %s", GetErrorMessage(GetLastResult()));
        return;
 }
@@ -1517,13 +1468,21 @@ ConversationForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                                }
                        }
                        pConvPrModel->AddConversationEventListener(*this, threadId);
-                       __pConvMessageList->UpdateTableView();
-                       int lastGroupIndex = __pConvMessageList->GetGroupCount() - 1;
-                       int listItemCount = __pConvMessageList->GetItemCountAt(lastGroupIndex);
-                       if (lastGroupIndex >= 0 && listItemCount > 0)
+                       if(__currentThreadId != threadId)
                        {
-                               __pConvMessageList->ScrollToItem(lastGroupIndex, listItemCount - 1, TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_BOTTOM);
-                               __pConvMessageList->Invalidate(true);
+                               __currentThreadId = threadId;
+                               __pConvMessageList->UpdateTableView();
+                               int lastGroupIndex = __pConvMessageList->GetGroupCount() - 1;
+                               int listItemCount = __pConvMessageList->GetItemCountAt(lastGroupIndex);
+                               if (lastGroupIndex >= 0 && listItemCount > 0)
+                               {
+                                       __pConvMessageList->ScrollToItem(lastGroupIndex, listItemCount - 1, TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_BOTTOM);
+                                       __pConvMessageList->Invalidate(true);
+                               }
+                       }
+                       else
+                       {
+                               AppLogDebug("Thread id numbers are same");
                        }
                        PrepareContactList();
                        SetHeader();
@@ -1636,21 +1595,18 @@ ConversationForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        break;
 
        case REQUEST_UPDATE_CONV_LIST:
-               //if (__isConvNeedToUpdate)
+       {
+               for(int index = 0;index < NO_OF_MSG_STORAGE_CHANGE_OPERATIONS;index++)
                {
-                       //__isConvNeedToUpdate = false;
-                       for(int index = 0;index < NO_OF_MSG_STORAGE_CHANGE_OPERATIONS;index++)
+                       if(__bMsgStorageChangeType[index])
                        {
-                               if(__bMsgStorageChangeType[index])
-                               {
-                                       OnConversationListChange((MsgStorageChangeType)(index + 1));
-                               }
+                               OnConversationListChange((MsgStorageChangeType)(index + 1));
                        }
-                       Reset();
-                       Invalidate(true);
                }
-               
-               break;
+               Reset();
+               Invalidate(true);
+       }
+       break;
 
        case REQUEST_SHOW_IMAGE:
        {
@@ -1759,6 +1715,11 @@ ConversationForm::Clear(void)
        }
        //ShowContactList(false);
        CreateDraftMessage();
+       if(__pMsgComposePanel)
+       {
+               __pMsgComposePanel->ClearText(false);
+               __pMsgComposePanel->HideAttachListPopup();
+       }
        ConversationPresentationModel* pConvPrModel = ConversationPresentationModel::GetInstance();
        if (pConvPrModel)
        {
@@ -1788,11 +1749,6 @@ ConversationForm::Clear(void)
                delete __pOptionPopup;
                __pOptionPopup = null;
        }
-       if(__pMsgComposePanel)
-       {
-               __pMsgComposePanel->ClearText(false);
-               __pMsgComposePanel->HideAttachListPopup();
-       }
        AppLogDebug("EXIT: r= %s", GetErrorMessage(GetLastResult()));
 }
 
@@ -1954,7 +1910,10 @@ ConversationForm::PrepareContactList(void)
                                                ContactDetails* contactDetails = new (std::nothrow) ContactDetails();
                                                contactDetails->contactName = recipientDetails->contactName;
                                                contactDetails->contactAddress = recipientDetails->contactAddress;
-                                               __isRecipientAddressEmail = contactDetails->isEmailAddr = recipientDetails->isEmailAddr;
+                                               if(!__isRecipientAddressEmail)
+                                               {
+                                                       __isRecipientAddressEmail = contactDetails->isEmailAddr = recipientDetails->isEmailAddr;
+                                               }
                                                if (!CommonUtil::IsValidPhoneNumber(contactDetails->contactAddress))
                                                {
                                                        if (!CommonUtil::IsValidEmailAddress(contactDetails->contactAddress))
@@ -2920,14 +2879,6 @@ ConversationForm::OnComposeStateChange(ComposeType type)
                }
 
        }
-//     //TODO:
-//     Header* pHeader = GetHeader();
-//     if (pHeader)
-//     {
-//             bool mmsMode(type == COMPOSE_MMS);
-//             pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, mmsMode);
-//             pHeader->Invalidate(true);
-//     }
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
 }
 
@@ -2952,7 +2903,6 @@ ConversationForm::OnSendButtonClick(void)
        int encodeType = pSmsSendSetting->GetEncodeType();
        if (encodeType == MSG_ENCODE_GSM7BIT && !CommonUtil::IsGsmAlphabetTranslationPossible(__pMsgComposePanel->GetSmsText()))
        {
-               //TODO : Show Popup
                int modalResult;
                MessageBox messageBox;
                String str;
@@ -2971,7 +2921,6 @@ ConversationForm::OnSendButtonClick(void)
                        break;
                }
        }
-
        MessageComposeData* pComposeData = __pMsgComposePanel->GetMessageComposeDataN();
        if (pComposeData)
        {
@@ -2985,19 +2934,9 @@ ConversationForm::OnSendButtonClick(void)
 
                if (msgResponse == MSG_RESPONSE_NO_SIM)
                {
-//                     __pSendFailedPopup = new (std::nothrow) Popup();
-//                     __pSendFailedPopup->Construct(L"IDL_MSG_INFO_POPUP");
-//                     Label* pLabel = static_cast<Label*>(__pSendFailedPopup->GetControl(L"IDC_LABEL1"));
-//                     pLabel->SetText(L"Message Sending Failed");
-//                     Button* pOkDelete = static_cast<Button*>(__pSendFailedPopup->GetControl(L"IDC_BUTTON1"));
-//                     pOkDelete->SetActionId(IDA_MSG_SEND_FAILED);
-//                     pOkDelete->AddActionEventListener(*this);
-//                     __pSendFailedPopup->Show();
                        CommonUtil::ShowMessageNotification(L"Message Sending Failed");
                }
        }
-       // TODO: Focus set to last page done from cleartext.
-       //__pMsgComposePanel->SetFocusToLastPage();
        __pMsgComposePanel->ClearText(true);
        __pMsgComposePanel->DisplayMessageSize();
        __pMsgComposePanel->Invalidate(true);
@@ -3008,18 +2947,15 @@ ConversationForm::OnSendButtonClick(void)
                __pMsgComposePanel->SetContactListVisible(false);
        }
 
-       // If draft entry send delete it
        ConversationPresentationModel* pConvPrModel = ConversationPresentationModel::GetInstance();
        if (pConvPrModel)
        {
                const MessageData* pDraftMessage = pConvPrModel->GetDraftMessage();
                if (pDraftMessage)
                {
-
-                       pConvPrModel->Delete(pDraftMessage->GetEntryId(), REQUEST_DELETE_MESSAGE);
+                       pConvPrModel->Delete(pDraftMessage->GetEntryId(), REQUEST_DELETE_MESSAGE);// If draft entry send delete it
                }
        }
-
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return;
 }
index 19bce21..7d7763c 100644 (file)
@@ -216,6 +216,7 @@ MediaTextExpandEditArea::ClearText(void)
        }
        int adjustHeightForcomposePanel = CommonUtil::GetHeightAdjustment(CommonUtil::GetFontSize(COMPOSER_FORM));
        __pExpandEditArea->SetBounds(0, 0, GetWidth(), MIN_COMPOSE_EDITOR_HEIGHT + adjustHeightForcomposePanel);
+       __boundsTracker.__prevEditAreaHeight = __boundsTracker.__prevMediaHeight = MIN_COMPOSE_EDITOR_HEIGHT + adjustHeightForcomposePanel;
        __prevBounds = __pExpandEditArea->GetBounds();
        SetSize(GetWidth(), __pExpandEditArea->GetHeight());
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
index 3e16d69..b5eed6b 100644 (file)
@@ -818,7 +818,7 @@ MessageComposePanel::SetBounds(const Rectangle& rect)
                {
                        if(__pScrollPanel->GetScrollPosition() == __prevScrollPosition)
                        {
-                               SetScrollPosition(__pScrollPanel->GetScrollPosition() - (prevScrollPanelHeight - newScrollPanelHeight));
+                               __pScrollPanel->SetScrollPosition(__pScrollPanel->GetScrollPosition() - (prevScrollPanelHeight - newScrollPanelHeight),false);
                        }
                        __pScrollPanel->SetBounds(Rectangle(__pScrollPanel->GetX(), __pScrollPanel->GetY(),
                                        __pScrollPanel->GetWidth(), GetHeight() - (MARGIN_20PX * 2)));
@@ -827,14 +827,12 @@ MessageComposePanel::SetBounds(const Rectangle& rect)
                {
                        if (__pFocusControl && __pFocusControl->GetControlType() == COMPOSE_CONTROL_SUBJECT)
                        {
-                               //__pScrollPanel->SetScrollPosition(0, false);
                                __pScrollPanel->ScrollToTop();
                        }
                        else
                        {
-                               __pScrollPanel->SetScrollPosition(__pScrollPanel->GetClientAreaBounds().height - __pScrollPanel->GetHeight(), false);
                                __pScrollPanel->SetBounds(Rectangle(__pScrollPanel->GetX(), __pScrollPanel->GetY(),
-                                                                               __pScrollPanel->GetWidth(), GetHeight() - (MARGIN_20PX * 2)));
+                                               __pScrollPanel->GetWidth(), GetHeight() - (MARGIN_20PX * 2)));
                        }
                }
                __prevScrollPosition = __pScrollPanel->GetScrollPosition();
@@ -1042,11 +1040,8 @@ MessageComposePanel::OnActionPerformed(const Control& source, int actionId)
                {
                        GetParent()->SendUserEvent(REQUEST_HIDE_RECIPIENT_LIST, null);
                }
-               if (__needToHideKeypad)
-               {
-                       SetFocusToLastPage();
-                       HideKeypad();
-               }
+               SetFocusToLastPage();
+               HideKeypad();
                if (__pAttachPopup)
                {
                        delete __pAttachPopup;
@@ -1064,7 +1059,7 @@ MessageComposePanel::OnActionPerformed(const Control& source, int actionId)
                Panel* pSubjectPanel = static_cast<Panel*>(__pScrollPanel->GetControl(L"IDC_PANEL_SUBJECT"));
                __pAttachPopup->Construct(pSubjectPanel->GetControlCount() > 0);
                __pDelayTimer->Start(250);
-//             __pAttachPopup->Show();
+               //__pAttachPopup->Show();
        }
        break;
 
@@ -1079,33 +1074,6 @@ MessageComposePanel::OnActionPerformed(const Control& source, int actionId)
                ComposeBaseControl* pComposeCntl = (ComposeBaseControl *)(const_cast<Control *>(&source));
                pArgs->Add(new (std::nothrow) Integer(pComposeCntl->GetControlType()));
 
-/*
-               if (pComposeCntl->GetControlType() == COMPOSE_CONTROL_MEDIA_TEXT)
-               {
-                       int focusPageIndex = GetPageIndex(source);
-                       Panel* pComposePagePanel = static_cast<Panel*>(__pScrollPanel->GetControl(L"IDC_PANEL_IMAGE_TEXT"));
-                       pComposePagePanel->RemoveControl(source);
-                       if (focusPageIndex > 0)
-                       {
-                               focusPageIndex--;
-                       }
-                       MoveFocusToPage(focusPageIndex);
-               }
-               else if (pComposeCntl->GetControlType() == COMPOSE_CONTROL_SUBJECT)
-               {
-               static_cast<Panel*>(__pScrollPanel->GetControl(L"IDC_PANEL_SUBJECT"))->
-                       RemoveControl(source);
-                       // Move focus to 1st page
-                       MoveFocusToPage(0);
-               }
-               else if (pComposeCntl->GetControlType() == COMPOSE_CONTROL_ATTACHEMENT)
-               {
-                       static_cast<Panel*>(__pScrollPanel->GetControl(L"IDC_PANEL_ATTACHEMENT"))->
-                       RemoveControl(source);
-                       // Move focus to 1st page
-                       MoveFocusToPage(0);
-               }
-*/
                RequestId requestId = REQUEST_DELETE_PAGE;
                SendUserEvent(requestId,pArgs);
 
@@ -1187,14 +1155,14 @@ void
 MessageComposePanel::OnFocusLost(const Control& source)
 {
        AppLogDebug("ENTER");
-       ComposeBaseControl* pComposeElement = static_cast<ComposeBaseControl*>(source.GetParent());
-       if (__pFocusControl)
+       ComposeBaseControl* pComposeElement = dynamic_cast<ComposeBaseControl*>(source.GetParent());
+       if (pComposeElement)
        {
-               if (__pFocusControl->GetControlType() == COMPOSE_CONTROL_MEDIA_TEXT)
+               if (pComposeElement->GetControlType() == COMPOSE_CONTROL_MEDIA_TEXT)
                {
                        static_cast<MediaTextExpandEditArea*>(pComposeElement)->SetDeleteShowState(false,false);
                }
-               else if (__pFocusControl->GetControlType() == COMPOSE_CONTROL_SUBJECT)
+               else if (pComposeElement->GetControlType() == COMPOSE_CONTROL_SUBJECT)
                {
                        static_cast<SubjectControl*>(pComposeElement)->SetDeleteShowState(false);
                }
index 89c7275..8666142 100644 (file)
@@ -464,10 +464,25 @@ MessageData::InitMessageBody(msg_struct_t pMessageInfo)
        if (err == MSG_SUCCESS && pMsgText && (int) strlen(pMsgText) > 0)\r
        {\r
                __messageBody.Append(pMsgText);\r
+               __messageBody.Trim();\r
+\r
+               if(__messageBody.IsEmpty())\r
+               {\r
+                       if(strlen(pMsgText) > 0)\r
+                       {\r
+                               __messageBody.Insert(IDS_BLANK_SPACE,0);\r
+                       }\r
+                       else\r
+                       {\r
+                               if (MSG_TYPE_MMS == __messageType)\r
+                               {\r
+                                       Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_NO_SUBJECT", __messageBody);\r
+                               }\r
+                       }\r
+               }\r
        }\r
        else\r
        {\r
-               // To prevent crash\r
                __messageBody.Append(IDS_BLANK_SPACE);\r
        }\r
        AppLogDebug("Fetching message body = [%S] err = [%d]", __messageBody.GetPointer(), (int) err);\r
@@ -642,9 +657,9 @@ MessageData::UpdateGroupName(int day, int date, int month, int year)
                break;\r
 \r
        }\r
-       __groupName.Append(L", ");\r
+       __groupName.Append(L" ");\r
        __groupName.Append(date);\r
-       __groupName.Append(L". ");\r
+       __groupName.Append(L" ");\r
 \r
        switch (month)\r
        {\r
@@ -739,7 +754,7 @@ MessageData::UpdateGroupName(int day, int date, int month, int year)
        String arabicLanguage(L"ara_AE");\r
        if (month != 5 && !displayLanguageValue.Equals(arabicLanguage))\r
        {\r
-               __groupName.Append(L".");\r
+               //__groupName.Append(L".");\r
        }\r
        if (year)\r
        {\r
index b00e778..173ec78 100644 (file)
@@ -360,16 +360,6 @@ MessagesApp::OnActionPerformed(const Control& source, int actionId)
                        delete __pErrorMessagePopup;
                        __pErrorMessagePopup = null;
                }
-               Frame* pAppFrame = UiApp::GetInstance()->GetFrame(IDC_FRAME_NAME);
-               if (pAppFrame)
-               {
-                       Form* pCurrentForm = pAppFrame->GetCurrentForm();
-                       if (pCurrentForm)
-                       {
-                               RequestId requestId = REQUEST_SET_FOCUS_TO_FORM;
-                               pCurrentForm->SendUserEvent(requestId, null);
-                       }
-               }
        }
        break;
 
@@ -819,10 +809,6 @@ MessagesApp::UpdateRecipients(MessageComposeData& composeDta, const String& reci
                }
                else
                {
-//                     if (++duplicateRecipientCount > 1)
-//                     {
-//                             duplicateRecipients.Append(IDS_COMMA_SPACE);
-//                     }
                        duplicateRecipients.Append(recipientAddress);
                }
        }
@@ -834,7 +820,14 @@ MessagesApp::UpdateRecipients(MessageComposeData& composeDta, const String& reci
        if (!invalidNumbers.IsEmpty())
        {
                String messageText;
-               Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_INVALID_RECIPIENTS", messageText);
+               if(invalidNumbers.Contains(IDS_COMMA_SPACE))
+               {
+                       Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_INVALID_RECIPIENTS", messageText);
+               }
+               else
+               {
+                       Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_INVALID_RECIPIENT", messageText);
+               }
                messageText.Append(IDS_COLON);
                messageText.Append(IDS_BLANK_SPACE);
                invalidNumbers.Insert(messageText, 0);
@@ -900,6 +893,17 @@ MessagesApp::ShowMessage(const String& message)
 
                pOkDelete->SetActionId(IDA_CLOSE_MESSAGE_POPUP);
                pOkDelete->AddActionEventListener(*this);
+
+               Frame* pAppFrame = UiApp::GetInstance()->GetFrame(IDC_FRAME_NAME);
+               if (pAppFrame)
+               {
+                       Form* pCurrentForm = pAppFrame->GetCurrentForm();
+                       if (pCurrentForm)
+                       {
+                               pCurrentForm->SetFocus();
+                       }
+               }
+
                __pErrorMessagePopup->Show();
        }
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
index 4ec10f0..c53ae7a 100644 (file)
@@ -382,6 +382,7 @@ MmsDetailForm::OnInitializing(void)
        if (__pScrollPanel)
        {
                __pScrollPanel->AddTouchEventListener(*this);
+               __pScrollPanel->SetPropagatedKeyEventListener(this);
                __pMmsTextBox = static_cast<TextBox*>(__pScrollPanel->GetControl(L"IDC_MMS_TEXT"));
                if (__pMmsTextBox)
                {
@@ -2300,6 +2301,25 @@ MmsDetailForm::OnKeyReleased(Tizen::Ui::Control& source, const Tizen::Ui::KeyEve
        }
        break;
 
+       case KEY_ENTER:
+       {
+               if (__pPlayControlPanel->GetShowState())
+               {
+                       __pPlayControlPanel->SetShowState(false);
+                       __pTimerForControlBar->Cancel();
+               }
+               else
+               {
+                       __pPlayControlPanel->SetShowState(true);
+                       __pTimerForControlBar->Cancel();
+                       if (__isSlideShowInPrgress)
+                       {
+                               __pTimerForControlBar->Start(TIME_INTERVAL * 3);
+                       }
+               }
+       }
+       break;
+
        default:
                break;
        }
index b859dd9..cd9ba5c 100644 (file)
@@ -486,10 +486,6 @@ RecipientPanel::OnActionPerformed(const Control& source, int actionId)
 
                        SetFormEnabled(true);
                        __pExpandEditArea->SetKeypadEnabled(true);
-//                     if(!__pExpandEditArea->HasFocus())
-//                     {
-//                             __pExpandEditArea->SetFocus();
-//                     }
                        if (__pErrorMessagePopup)
                        {
                                __pErrorMessagePopup->SetShowState(false);
@@ -658,8 +654,9 @@ RecipientPanel::OnAppControlCompleteResponseReceived(const AppId& appId, const S
        __isAppControlRunning = false;
        String* pPickResult = null;
        String operation(IDS_APPCONTROL_OPERATION_SOCIAL_PICK);
+
        SetFormEnabled(true);
-//     bool setFocus(true);
+       __pExpandEditArea->SetKeypadEnabled(true);
 
        if (operationId.Equals(operation))
        {
@@ -685,7 +682,7 @@ RecipientPanel::OnAppControlCompleteResponseReceived(const AppId& appId, const S
                                                        ShowErrorMessage(RECIPIENT_ERROR_MAX);
                                                        break;
                                                }
-                                               // Convert String value to int type value
+                                               // Convert String value to integer type value
                                                Integer::Parse(*pPickResult, contactId);
                                                RecordId recordId = contactId;
                                                Contact* pContact = null;
@@ -720,10 +717,8 @@ RecipientPanel::OnAppControlCompleteResponseReceived(const AppId& appId, const S
                                        }
                                }
                                __pExpandEditArea->SetFocus();
-                               __pExpandEditArea->SetKeypadEnabled(true);
                                if (recipientEvaluator.isContactInvalid || recipientEvaluator.isRecipientDuplicate)
                                {
-                                       //setFocus = false;
                                        String message;
                                        if(recipientEvaluator.isRecipientDuplicate)
                                        {
@@ -741,10 +736,18 @@ RecipientPanel::OnAppControlCompleteResponseReceived(const AppId& appId, const S
                                        if(recipientEvaluator.isContactInvalid)
                                        {
                                                String messageText;
-                                               Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_INVALID_RECIPIENTS", messageText);
+                                               if(recipientEvaluator.invalidRecipients.Contains(IDS_COMMA_SPACE))
+                                               {
+                                                       Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_INVALID_RECIPIENTS", messageText);
+                                               }
+                                               else
+                                               {
+                                                       Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_INVALID_RECIPIENT", messageText);
+                                               }
                                                messageText.Append(IDS_COLON);
                                                messageText.Append(IDS_BLANK_SPACE);
                                                messageText.Append(recipientEvaluator.invalidRecipients);
+
                                                message.Append(messageText);
                                        }
                                        ShowErrorMessage(RECIPIENT_ERROR_INVALID_AND_DUPLICATE, message);
@@ -755,10 +758,6 @@ RecipientPanel::OnAppControlCompleteResponseReceived(const AppId& appId, const S
                }
        }
 
-//     if(setFocus)
-//     {
-//
-//     }
        Invalidate(true);
        __singleInstance = true;
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
@@ -1000,12 +999,11 @@ RecipientPanel::OnFocusLost(const Control& source)
 }
 
 bool
-RecipientPanel::CheckRecipientForToken(bool updateToken)
+RecipientPanel::CheckRecipientForToken(bool tokenizeString)
 {
        AppLogDebug("ENTER");
 
-       // Hide search list.
-       if (__pContactSearchList->GetShowState())
+       if (__pContactSearchList->GetShowState()) // Hide search list.
        {
                __pContactSearchList->SetShowState(false);
                __pContactSearchList->SetSize(GetWidth() - MARGIN_15PX * 2, 0);
@@ -1015,14 +1013,16 @@ RecipientPanel::CheckRecipientForToken(bool updateToken)
        int selectIndex = __pExpandEditArea->GetSelectedTokenIndex();
        if (tokenText.GetLength() > 0 && selectIndex < 0)
        {
-               // Need to do this as editor creates and inserts token automatically upon
-               // recipient panel loses focus.
                __pExpandEditArea->Clear();
                RecipientError error = AddRecipient(tokenText);
+
                validRecipient = (error == RECIPIENT_ERROR_NONE);
                if (!validRecipient)
                {
-                       ShowErrorMessage(error, tokenText);
+                       if(tokenizeString == true)
+                       {
+                               ShowErrorMessage(error, tokenText);
+                       }
                }
        }
        RequestId requestId = REQUEST_UPDATE_FOCUS;
@@ -1419,6 +1419,7 @@ RecipientPanel::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        case REQUEST_EDIT_TOKEN:
        {
                SetFormEnabled(true);
+               __pExpandEditArea->SetKeypadEnabled(true);
                if (__pTokenOptionPopup)
                {
                        delete __pTokenOptionPopup;
@@ -1436,6 +1437,7 @@ RecipientPanel::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        case REQUEST_DELETE_TOKEN:
        {
                SetFormEnabled(true);
+               __pExpandEditArea->SetKeypadEnabled(true);
                if (__pTokenOptionPopup)
                {
                        delete __pTokenOptionPopup;
@@ -1483,6 +1485,7 @@ RecipientPanel::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                        delete __pTokenOptionPopup;
                        __pTokenOptionPopup = null;
                }
+               __pExpandEditArea->SetKeypadEnabled(true);
                AddressInfo* pRecipient = (AddressInfo*) __pRecipientAddrList->GetAt(__selectedIndex);
                if(pRecipient)
                {
@@ -1509,6 +1512,7 @@ RecipientPanel::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        case REQUEST_DESTROY_TOKEN_OPTION_POPUP:
        {
                SetFormEnabled(true);
+               __pExpandEditArea->SetKeypadEnabled(true);
                if (__pTokenOptionPopup)
                {
                        delete __pTokenOptionPopup;
@@ -1546,7 +1550,7 @@ RecipientPanel::SetFormEnabled(bool state)
                        if(!state)
                        {
                                pCurrentForm->SetFocus();
-                               __pExpandEditArea->SetKeypadEnabled(false);
+                               //__pExpandEditArea->SetKeypadEnabled(false);
                        }
                        pCurrentForm->SetEnabled(state);
                        pCurrentForm->Invalidate(true);
@@ -1565,6 +1569,7 @@ RecipientPanel::OnTouchReleased(const Control& source, const Point& currentPosit
        __editAreaText = __pExpandEditArea->GetText();
        if (__editAreaText.GetLength() <= 0)
        {
+               __pExpandEditArea->SetKeypadEnabled(false);
                RequestId requestId = REQUEST_SHOW_TOKEN_POPUP;
                SendUserEvent(requestId, null);
        }
@@ -1759,7 +1764,14 @@ RecipientPanel::ShowErrorMessage(RecipientError err, const String& recipientAddr
 
        case RECIPIENT_ERROR_INVALID:
        {
-               Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_INVALID_RECIPIENTS", messageText);
+               if(recipientAddr.Contains(IDS_COMMA_SPACE))
+               {
+                       Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_INVALID_RECIPIENTS", messageText);
+               }
+               else
+               {
+                       Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_INVALID_RECIPIENT", messageText);
+               }
                messageText.Append(IDS_COLON);
                messageText.Append(IDS_BLANK_SPACE);
                messageText.Append(recipientAddr);
index 187ff5e..fbbd3ac 100644 (file)
@@ -709,14 +709,14 @@ SettingsForm::HandleSettingSelection(int groupIndex, int itemIndex, TableViewIte
                        {
                                String msgText;
                                Application::GetInstance()->GetAppResource()->GetString(L"IDS_COM_POP_SERVICE_UNAVAILABLE", msgText);
-                               CommonUtil::ShowInfoPopup(msgText);
+                               CommonUtil::ShowInfoPopup(msgText, IDS_BLANK, MSGBOX_STYLE_NONE, 3000);
                        }
                }
                else
                {
                        String msgText;
                        Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_POP_SIM_NOT_INSERTED", msgText);
-                       CommonUtil::ShowInfoPopup(msgText);
+                       CommonUtil::ShowInfoPopup(msgText, IDS_BLANK, MSGBOX_STYLE_NONE, 3000);
                }
        }
        break;
index 6d06f1c..edeb982 100644 (file)
@@ -709,6 +709,7 @@ SpamSettingsForm::OnActionPerformed(const Control& source, int actionId)
                        MessageBox messageBox;
                        String msgText;
                        Application::GetInstance()->GetAppResource()->GetString(L"IDS_DB_POP_MAXIMUM_NUMBER_OF_CHARACTERS_EXCEEDED_DELETE_SOME_CHARACTERS", msgText);
+
                        messageBox.Construct(IDS_BLANK, msgText, MSGBOX_STYLE_OK, 300000);
                        messageBox.ShowAndWait(modalResult);
                        __pEditField->SetFocus();
@@ -831,12 +832,12 @@ SpamSettingsForm::HandleSpamSettingItemSelection(int groupIndex, int itemIndex,
 }
 
 void
-SpamSettingsForm::HandleSpamMatchCriteriaItemSelection(int groupIndex, int itemIndex)
+SpamSettingsForm::HandleSpamMatchCriteriaItemSelection(int groupIndex, int itemIndex,TableViewItem* pItem)
 {
        AppLogDebug("ENTER");
 
        SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
-       __pGroupedTableView->SetFocus();
+       pItem->SetFocus();
 
        // Set Header & Footer
        Header* header = GetHeader();
@@ -900,6 +901,7 @@ SpamSettingsForm::HandleSpamMatchCriteriaItemSelection(int groupIndex, int itemI
                        __pSettingItemsArray->SetgroupExpandStatus(groupIndex + 1, true);
                }
                __pGroupedTableView->RefreshItem(groupIndex, itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               __pGroupedTableView->ScrollToItem(groupIndex, itemIndex);
        }
        break;
 
@@ -1408,7 +1410,7 @@ SpamSettingsForm::OnGroupedTableViewItemStateChanged(GroupedTableView& tableView
                break;
 
        case SPAM_SETTING_FORM_ADD_REJECT_NUMBER:
-               HandleSpamMatchCriteriaItemSelection(groupIndex, itemIndex);
+               HandleSpamMatchCriteriaItemSelection(groupIndex, itemIndex, pItem);
                break;
 
        case SPAM_SETTING_FORM_ADD_BLOCK_WORD:
@@ -2187,6 +2189,9 @@ SpamSettingsForm::UpdateMatchCriteriaSettingItem(int groupIndex, int itemIndex,
                }
                static_cast<CustomTableViewItem*>(pViewItem)->EnableExpandViewModeStyle(pNormalIcon, pPressIcon,__itemHeight);
        }
+
+       pViewItem->Invalidate(false);
+
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
 }
 
index 283c459..e111a4a 100644 (file)
@@ -303,18 +303,14 @@ ThreadData::InitShortDescription(msg_struct_t pThreadInfo)
 
                if(__shortDes.IsEmpty())
                {
-                       AppLogDebug("empty");
                        if(strlen(pShortDes) > 0)
                        {
-                               AppLogDebug("strlen(pShortDes) > 0");
                                __shortDes.Insert(IDS_BLANK_SPACE,0);
                        }
                        else
                        {
-                               AppLogDebug("strlen(pShortDes) <= 0");
-                               if (__messageType == MSG_TYPE_MMS)
+                               if (MSG_TYPE_MMS == __messageType)
                                {
-                                       AppLogDebug("MMS");
                                        Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_NO_SUBJECT", __shortDes);
                                }
                        }
index 606a0c3..2d0b99f 100644 (file)
@@ -1413,28 +1413,18 @@ ThreadListForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int
                {
                case LIST_ITEM_STATUS_CHECKED:
                {
-                       int selectId(0), totalCount(0);
+                       int selectId(0);
                        selectId = pThreadPrModel->GetDataAt(index)->GetEntryId();
-                       totalCount = pThreadPrModel->GetCount();
                        __pSelectedIds->Add(selectId);
-                       if (__pSelectedIds->GetCount() == totalCount)
-                       {
-                               //TODO: Need to update check box
-                       }
                        ShowSelectionInfo();
                }
                break;
 
                case LIST_ITEM_STATUS_UNCHECKED:
                {
-                       int selectId(0), totalCount(0);
+                       int selectId(0);
                        selectId = pThreadPrModel->GetDataAt(index)->GetEntryId();
-                       totalCount = pThreadPrModel->GetCount();
                        __pSelectedIds->Remove(selectId);
-                       if (__pSelectedIds->GetCount() <= totalCount)
-                       {
-                               //TODO: Need to update check box
-                       }
                        ShowSelectionInfo();
                }
                break;
@@ -1442,10 +1432,6 @@ ThreadListForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int
                case LIST_ITEM_STATUS_SELECTED:
                {
                        ArrayList* pArgList = new (std::nothrow) ArrayList();
-                       if (pArgList == null)
-                       {
-                               return;
-                       }
                        pArgList->Construct();
                        SceneManager* pSceneManager = SceneManager::GetInstance();
                        if (__listType == THREAD_LIST_TYPE_THREAD)