email_0.0.16 package upload
authorSungbok Park <parksb@samsung.com>
Thu, 17 Jan 2013 21:43:02 +0000 (06:43 +0900)
committerSungbok Park <parksb@samsung.com>
Thu, 17 Jan 2013 21:43:02 +0000 (06:43 +0900)
Change-Id: I3b16e902431d6f73aac40348cee0570b4e904a8a

121 files changed:
account/CMakeLists.txt
account/include/email-account.h
account/src/email-account-folder.c
account/src/email-account.c
common/include/email-common-types.h
common/src/email-engine.c
composer/include/email-composer-type.h
composer/include/email-composer-util.h
composer/include/email-composer.h
composer/src/email-composer-attachment.c
composer/src/email-composer-callback.c
composer/src/email-composer-contents.c
composer/src/email-composer-predictive-search.c
composer/src/email-composer-util.c
composer/src/email-composer.c
images/M02_email_icon_popup_date.png [deleted file]
images/M02_email_icon_popup_sender.png [deleted file]
images/M02_email_icon_popup_sender_press.png [deleted file]
images/M02_icon_attach.png [moved from images/M02_email_icon_popup_advanced_press.png with 80% similarity]
images/M02_icon_event.png [new file with mode: 0755]
images/M02_icon_favorite_test.png [new file with mode: 0755]
images/M02_icon_favorite_test_off.png [new file with mode: 0755]
images/M02_icon_flag.png [new file with mode: 0755]
images/M02_icon_flag_clear.png [new file with mode: 0755]
images/M02_icon_flag_complete.png [new file with mode: 0755]
images/M02_icon_sms.png [new file with mode: 0755]
images/M02_icon_title_inbox.png [moved from images/M02_email_icon_popup_title_press.png with 89% similarity]
images/M02_icon_title_inbox_1.png [moved from images/M02_email_icon_popup_all_press.png with 83% similarity]
images/M02_icon_voice_mail.png [new file with mode: 0755]
images/M02_list_icon_all_accounts.png [new file with mode: 0755]
images/M02_list_icon_other.png [new file with mode: 0755]
images/M02_popup_icon_add_account.png [new file with mode: 0755]
images/M02_popup_icon_add_to_home.png [new file with mode: 0755]
images/M02_popup_icon_advanced.png [moved from images/M02_email_icon_popup_advanced.png with 82% similarity]
images/M02_popup_icon_all.png [new file with mode: 0755]
images/M02_popup_icon_block.png [new file with mode: 0755]
images/M02_popup_icon_date.png [moved from images/M02_email_icon_popup_date_press.png with 79% similarity]
images/M02_popup_icon_delete_all.png [moved from images/M02_email_icon_popup_all.png with 84% similarity]
images/M02_popup_icon_rename.png [new file with mode: 0755]
images/M02_popup_icon_sort_by.png [new file with mode: 0755]
images/M02_popup_icon_title.png [moved from images/M02_email_icon_popup_title.png with 91% similarity]
mailbox/CMakeLists.txt
mailbox/include/email-mailbox-controlbar.h
mailbox/include/email-mailbox-move.h [new file with mode: 0755]
mailbox/include/email-mailbox.h
mailbox/src/email-mailbox-controlbar.c
mailbox/src/email-mailbox-item.c
mailbox/src/email-mailbox-list.c
mailbox/src/email-mailbox-move.c [new file with mode: 0755]
mailbox/src/email-mailbox-noti-mgr.c
mailbox/src/email-mailbox-search.c
mailbox/src/email-mailbox-sweep.c
mailbox/src/email-mailbox.c
mailbox/theme/email-mailbox-theme-macro.edc
mailbox/theme/email-mailbox-theme.edc
main/email.c
packaging/org.tizen.email.spec
po/ar.po
po/az.po
po/bg.po
po/ca.po
po/cs.po
po/da.po
po/de_DE.po
po/el_GR.po
po/en.po
po/en_PH.po
po/en_US.po
po/es_ES.po
po/es_MX.po
po/et.po
po/eu.po
po/fi.po
po/fr_CA.po
po/fr_FR.po
po/ga.po
po/gl.po
po/hi.po
po/hr.po
po/hu.po
po/hy.po
po/is.po
po/it_IT.po
po/ja_JP.po
po/ka.po
po/kk.po
po/ko_KR.po
po/lt.po
po/lv.po
po/mk.po
po/nb.po
po/nl_NL.po
po/pl.po
po/pt_BR.po
po/pt_PT.po
po/ro.po
po/ru_RU.po
po/sk.po
po/sl.po
po/sr.po
po/sv.po
po/tr_TR.po
po/uk.po
po/uz.po
po/zh_CN.po
po/zh_HK.po
po/zh_SG.po
po/zh_TW.po
setting/include/email-setting-view.h
setting/include/email-setting.h
setting/src/email-setting.c
setting/src/email-view-account-edit.c
setting/src/email-view-account-options.c
setting/src/email-view-account-setup.c
setting/src/email-view-manual-setup.c
setting/src/email-view-setting.c
setting/src/email-view-sync-schedule.c
setting/src/email-view-sync-setup.c
setting/theme/email-setting-theme.edc
viewer/src/email-viewer-webview.c
viewer/src/email-viewer.c

index 7466f16..54d2ea8 100755 (executable)
@@ -55,7 +55,7 @@ ADD_CUSTOM_TARGET(email-effect-layout.edj
 )\r
 ADD_DEPENDENCIES(${PROJECT_NAME} email-effect-layout.edj)\r
 \r
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${UGDIR})\r
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})\r
 INSTALL(FILES ${CMAKE_ACCOUNT_BINARY_DIR}/email-account-theme.edj DESTINATION ${EDJDIR})\r
 INSTALL(FILES ${CMAKE_ACCOUNT_BINARY_DIR}/email-effect-layout.edj DESTINATION ${EDJDIR})\r
 \r
index 6a655c4..e87a430 100755 (executable)
@@ -57,7 +57,7 @@
 #define CONTROLBAR_ICON_DELETE IMGDIR"/M02_controlbar_icon_delete.png"
 
 #define ACCOUNT_ICON_ADDACCOUNT IMGDIR"/M02_email_list_icon_addaccount.png"
-#define ACCOUNT_ICON_ALLACCOUNT IMGDIR"/M02_email_list_icon_allaccount.png"
+#define ACCOUNT_ICON_ALLACCOUNT IMGDIR"/M02_list_icon_all_accounts.png"
 
 #define _EDJ(o) elm_layout_edje_get(o)
 
index d44b488..cebe64b 100755 (executable)
@@ -44,6 +44,7 @@ static void _refresh_account_list(void *data);
 static gboolean _check_duplicated_node(GNode *node, gpointer data);
 static void _make_folder_tree(email_account_list *alist, EmailAccountUGD *ug_data);
 
+static gboolean _folder_item_dim_state_get(email_mailbox_t *mlist, int folder_mode);
 static void _update_all_account_cb(void *data, Evas_Object *obj, void *event_info);
 
 static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part);
@@ -137,7 +138,7 @@ static struct _menu_item folder_menu_its[] = {
        { "IDS_EMAIL_BODY_INBOX", ACC_MAILBOX_TYPE_INBOX, _gl_label_get_for_all_acc_inbox },
        { "IDS_EMAIL_BODY_FAVOURITES", ACC_MAILBOX_TYPE_FLAGGED, _gl_label_get_for_all_acc_favorite },
        { "IDS_EMAIL_BODY_DRAFTS", ACC_MAILBOX_TYPE_DRAFT, _gl_label_get_for_all_acc_draft },
-       { N_("Outbox"), ACC_MAILBOX_TYPE_OUTBOX, _gl_label_get_for_all_acc_outbox },
+       { "IDS_EMAIL_HEADER_OUTBOX", ACC_MAILBOX_TYPE_OUTBOX, _gl_label_get_for_all_acc_outbox },
        { "IDS_EMAIL_BODY_SENTBOX", ACC_MAILBOX_TYPE_SENTBOX, _gl_label_get_for_all_acc_sentbox },
        { "IDS_EMAIL_BODY_SPAMBOX", ACC_MAILBOX_TYPE_SPAMBOX, _gl_label_get_for_all_acc_spambox },
        { "IDS_EMAIL_BODY_TRASH", ACC_MAILBOX_TYPE_TRASH, _gl_label_get_for_all_acc_trash },
@@ -385,13 +386,22 @@ static void _more_toolbar_clicked_cb(void *data, Evas_Object *obj, void *event_i
 {
        debug_log("");
        EmailAccountUGD *ug_data = (EmailAccountUGD *)data;
+       Evas_Object* icon;
 
        ug_data->ctxpopup = elm_ctxpopup_add(ug_data->navi_bar);
        evas_object_smart_callback_add(ug_data->ctxpopup, "dismissed", _dismissed_cb, ug_data);
 
-       elm_ctxpopup_item_append(ug_data->ctxpopup, dgettext("sys_string", "IDS_COM_SK_DELETE"), NULL, _folder_delete_cb, ug_data);
-       elm_ctxpopup_item_append(ug_data->ctxpopup, _("IDS_EMAIL_SK_MOVE"), NULL, _folder_move_cb, ug_data);
-       elm_ctxpopup_item_append(ug_data->ctxpopup, dgettext("sys_string", "IDS_COM_SK_RENAME"), NULL, _folder_rename_cb, ug_data);
+       icon = elm_icon_add(ug_data->ctxpopup);
+       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_delete_all.png", NULL);
+       elm_ctxpopup_item_append(ug_data->ctxpopup, dgettext("sys_string", "IDS_COM_SK_DELETE"), icon, _folder_delete_cb, ug_data);
+
+       icon = elm_icon_add(ug_data->ctxpopup);
+       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_move.png", NULL);
+       elm_ctxpopup_item_append(ug_data->ctxpopup, _("IDS_EMAIL_SK_MOVE"), icon, _folder_move_cb, ug_data);
+
+       icon = elm_icon_add(ug_data->ctxpopup);
+       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_rename.png", NULL);
+       elm_ctxpopup_item_append(ug_data->ctxpopup, dgettext("sys_string", "IDS_COM_SK_RENAME"), icon, _folder_rename_cb, ug_data);
 
        _move_ctxpopup(ug_data->ctxpopup, obj);
        evas_object_show(ug_data->ctxpopup);
@@ -1156,6 +1166,10 @@ static void _gl_exp(void *data, Evas_Object *obj, void *event_info)
                                tree_item_data->child = child;
                                sub_it = tree_item_data->it = elm_genlist_item_append(gl, &itc_subtree, tree_item_data, it,
                                                        ELM_GENLIST_ITEM_TREE, _gl_exp_sel, alist);
+
+                               if(_folder_item_dim_state_get((email_mailbox_t *)(child->data), tree_item_data->ug_data->folder_mode)) {
+                                       elm_object_item_disabled_set(tree_item_data->it, EINA_TRUE);
+                               }
                                //debug_log("alist: %p, tree_item_data:%p, tree_item_data->it : %p, it: %p, child: %p", alist, tree_item_data, tree_item_data->it, it, child);
                        } else {
                                tree_item_data = calloc(1, sizeof(Item_Data));
@@ -1164,6 +1178,9 @@ static void _gl_exp(void *data, Evas_Object *obj, void *event_info)
                                tree_item_data->child = child;
                                tree_item_data->it = elm_genlist_item_append(gl, &itc_subtree2, tree_item_data, it,
                                                        ELM_GENLIST_ITEM_NONE, _gl_sel, alist);
+                               if(_folder_item_dim_state_get((email_mailbox_t *)(child->data), tree_item_data->ug_data->folder_mode)) {
+                                       elm_object_item_disabled_set(tree_item_data->it, EINA_TRUE);
+                               }
                                //debug_log("alist: %p, tree_item_data:%p, tree_item_data->it : %p, it: %p, child: %p", alist, tree_item_data, tree_item_data->it, it, child);
                        }
                }
@@ -1201,6 +1218,9 @@ static void _gl_exp(void *data, Evas_Object *obj, void *event_info)
                                tree_item_data->child = child;
                                sub_it = tree_item_data->it = elm_genlist_item_append(gl, &itc_subtree, tree_item_data, it,
                                                        ELM_GENLIST_ITEM_TREE, _gl_exp_sel, alist);
+                               if(_folder_item_dim_state_get((email_mailbox_t *)(child->data), tree_item_data->ug_data->folder_mode)) {
+                                       elm_object_item_disabled_set(tree_item_data->it, EINA_TRUE);
+                               }
                                //debug_log("alist: %p, tree_item_data:%p, tree_item_data->it : %p, it: %p, child: %p", alist, tree_item_data, tree_item_data->it, it, child);
                        } else {
                                tree_item_data = calloc(1, sizeof(Item_Data));
@@ -1209,6 +1229,9 @@ static void _gl_exp(void *data, Evas_Object *obj, void *event_info)
                                tree_item_data->child = child;
                                tree_item_data->it = elm_genlist_item_append(gl, &itc_subtree2, tree_item_data, it,
                                                        ELM_GENLIST_ITEM_NONE, _gl_sel, alist);
+                               if(_folder_item_dim_state_get((email_mailbox_t *)(child->data), tree_item_data->ug_data->folder_mode)) {
+                                       elm_object_item_disabled_set(tree_item_data->it, EINA_TRUE);
+                               }
                                //debug_log("alist: %p, tree_item_data:%p, tree_item_data->it : %p, it: %p, child: %p", alist, tree_item_data, tree_item_data->it, it, child);
                        }
                }
@@ -1332,7 +1355,7 @@ static void _gl_sel(void *data, Evas_Object *obj, void *event_info)
                service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_TYPE, EMAIL_BUNDLE_VAL_SINGLE_ACCOUNT);
                service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_ID, id);
                service_add_extra_data(service, EMAIL_BUNDLE_KEY_MAILBOX, mailbox_id);
-               service_add_extra_data(service, EMAIL_BUNDLE_KEY_USER_EMAIL, alist->account_info->user_email_address);
+               service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_NAME, alist->account_info->account_name);
                service_add_extra_data(service, EMAIL_BUNDLE_KEY_MAILBOX_ALIAS, mlist->alias);
                ug_send_result(alist->ug_data->ug, service);
 
@@ -1478,7 +1501,7 @@ static void _gl_exp_sel(void *data, Evas_Object *obj, void *event_info)
                service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_TYPE, EMAIL_BUNDLE_VAL_SINGLE_ACCOUNT);
                service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_ID, id);
                service_add_extra_data(service, EMAIL_BUNDLE_KEY_MAILBOX, mailbox_id);
-               service_add_extra_data(service, EMAIL_BUNDLE_KEY_USER_EMAIL, alist->account_info->user_email_address);
+               service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_NAME, alist->account_info->account_name);
                service_add_extra_data(service, EMAIL_BUNDLE_KEY_MAILBOX_ALIAS, mlist->alias);
                ug_send_result(alist->ug_data->ug, service);
 
@@ -1717,7 +1740,7 @@ static char *_gl_label_get_for_all_acc_outbox(void *data, Evas_Object *obj, cons
        char tmp[MAX_STR_LEN] = { 0, };
 
        if (!strcmp(part, "elm.text.1")) {
-               snprintf(tmp, sizeof(tmp), "%s", N_("Outbox"));
+               snprintf(tmp, sizeof(tmp), "%s", _("IDS_EMAIL_HEADER_OUTBOX"));
                return g_strdup(tmp);
        } else if (!strcmp(part, "elm.text.2")) {
                snprintf(tmp, sizeof(tmp), "[%d/%d]", ug_data->all_acc_unread_count[ACC_MAILBOX_TYPE_OUTBOX], ug_data->all_acc_read_count[ACC_MAILBOX_TYPE_OUTBOX]);
@@ -1966,15 +1989,14 @@ static void _folder_edit_cb(void *data, Evas_Object *obj, void *event_info)
                elm_object_item_part_content_unset(ug_data->navibar_item, "controlbar");
                evas_object_hide(ug_data->control_bar);
 
-               /* Set reorder and edit mode */
-               elm_genlist_reorder_mode_set(genlist, EINA_TRUE);
+               /* Set edit mode */
                elm_genlist_decorate_mode_set(genlist, EINA_TRUE);
 
                /* This means even if selected, every click will make the selected callbacks be called. */
                elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_ALWAYS);
                elm_object_item_disabled_set(ug_data->root_item, EINA_TRUE);
 
-               elm_object_part_text_set(ug_data->navi_title_ly, "txt_title", N_("Select folder to edit"));
+               elm_object_part_text_set(ug_data->navi_title_ly, "txt_title", _("IDS_EMAIL_HEADER_SELECT_FOLDER"));
 
                elm_genlist_tree_effect_enabled_set(ug_data->gl, EINA_FALSE);
 
@@ -1995,7 +2017,6 @@ static void _folder_edit_cb(void *data, Evas_Object *obj, void *event_info)
 
                /* Unset edit mode */
                elm_genlist_decorate_mode_set(genlist, EINA_FALSE);
-               elm_genlist_reorder_mode_set(genlist, EINA_FALSE);
 
                elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_DEFAULT);
                elm_object_item_disabled_set(ug_data->root_item, EINA_FALSE);
@@ -2090,9 +2111,8 @@ static void _folder_create_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
        EmailAccountUGD *ug_data = (EmailAccountUGD *)data;
-       Evas_Object *genlist = ug_data->gl;
 
-       if (!elm_genlist_decorate_mode_get(genlist)) {
+       if (!elm_genlist_decorate_mode_get(ug_data->gl)) {
                ug_data->folder_mode = ACC_FOLDER_CREATE;
 
                if(ug_data->emf_handle != EMAIL_HANDLE_INVALID && ug_data->b_foldersync) {
@@ -2100,34 +2120,33 @@ static void _folder_create_cb(void *data, Evas_Object *obj, void *event_info)
                        ug_data->no_refresh = true;
                }
 
+               _refresh_folder_view(data);
                edje_object_signal_emit(_EDJ(ug_data->ly), "elm,bg,show,edit_mode", "elm");
 
                _unset_controlbar_content(ug_data);
 
-               /* Set reorder and edit mode */
-               elm_genlist_reorder_mode_set(genlist, EINA_TRUE);
-               elm_genlist_decorate_mode_set(genlist, EINA_TRUE);
+               /* Set edit mode */
+               elm_genlist_decorate_mode_set(ug_data->gl, EINA_TRUE);
 
                /* This means even if selected, every click will make the selected callbacks be called. */
-               elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_ALWAYS);
+               elm_genlist_select_mode_set(ug_data->gl, ELM_OBJECT_SELECT_MODE_ALWAYS);
                elm_genlist_item_select_mode_set(ug_data->root_item, ELM_OBJECT_SELECT_MODE_ALWAYS);
 
-               //elm_object_part_text_set(ug_data->navi_title_ly, "txt_title", _("IDS_EMAIL_HEADER_SELECT_FOLDER_ABB"));
-               elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_SELECT_FOLDER_ABB"));
+               elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_CREATE_FOLDER_IN"));
 
                elm_genlist_tree_effect_enabled_set(ug_data->gl, EINA_FALSE);
        }
        else {
                ug_data->folder_mode = ACC_FOLDER_NONE;
+               _refresh_folder_view(data);
 
                /* Change layout background color to default background color */
                edje_object_signal_emit(_EDJ(ug_data->ly), "elm,bg,show,default", "elm");
 
                /* Unset edit mode */
-               elm_genlist_decorate_mode_set(genlist, EINA_FALSE);
-               elm_genlist_reorder_mode_set(genlist, EINA_FALSE);
+               elm_genlist_decorate_mode_set(ug_data->gl, EINA_FALSE);
 
-               elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_DEFAULT);
+               elm_genlist_select_mode_set(ug_data->gl, ELM_OBJECT_SELECT_MODE_DEFAULT);
                elm_genlist_item_select_mode_set(ug_data->root_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
                /* Set the navigation bar title */
@@ -2145,7 +2164,6 @@ static void _folder_delete_cb(void *data, Evas_Object *obj, void *event_info)
        debug_log("");
        EmailAccountUGD *ug_data = (EmailAccountUGD *)data;
        //int account_id = ug_data->account_id;
-       Evas_Object *genlist = ug_data->gl;
 
        if (ug_data->ctxpopup) {
                evas_object_del(ug_data->ctxpopup);
@@ -2153,41 +2171,39 @@ static void _folder_delete_cb(void *data, Evas_Object *obj, void *event_info)
        }
 
 
-       if (!elm_genlist_decorate_mode_get(genlist)) {
+       if (!elm_genlist_decorate_mode_get(ug_data->gl)) {
                ug_data->folder_mode = ACC_FOLDER_DELETE;
 
                if(ug_data->emf_handle != EMAIL_HANDLE_INVALID && ug_data->b_foldersync) {
                        _stop_emf_job(ug_data, ug_data->emf_handle);
                        ug_data->no_refresh = true;
                }
-
+               _refresh_folder_view(data);
                edje_object_signal_emit(_EDJ(ug_data->ly), "elm,bg,show,edit_mode", "elm");
                _unset_controlbar_content(ug_data);
 
-               /* Set reorder and edit mode */
-               elm_genlist_reorder_mode_set(genlist, EINA_TRUE);
-               elm_genlist_decorate_mode_set(genlist, EINA_TRUE);
+               /* Set edit mode */
+               elm_genlist_decorate_mode_set(ug_data->gl, EINA_TRUE);
 
                /* This means even if selected, every click will make the selected callbacks be called. */
-               elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_ALWAYS);
+               elm_genlist_select_mode_set(ug_data->gl, ELM_OBJECT_SELECT_MODE_ALWAYS);
                elm_object_item_disabled_set(ug_data->root_item, EINA_TRUE);
 
-               //elm_object_part_text_set(ug_data->navi_title_ly, "txt_title", N_("Select delete folder"));
-               elm_object_item_text_set(ug_data->navibar_item, N_("Select delete folder"));
+               elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_SELECT_FOLDER"));
 
                elm_genlist_tree_effect_enabled_set(ug_data->gl, EINA_FALSE);
        }
        else {
                ug_data->folder_mode = ACC_FOLDER_NONE;
+               _refresh_folder_view(data);
 
                /* Change layout background color to default background color */
                edje_object_signal_emit(_EDJ(ug_data->ly), "elm,bg,show,default", "elm");
 
                /* Unset edit mode */
-               elm_genlist_decorate_mode_set(genlist, EINA_FALSE);
-               elm_genlist_reorder_mode_set(genlist, EINA_FALSE);
+               elm_genlist_decorate_mode_set(ug_data->gl, EINA_FALSE);
 
-               elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_DEFAULT);
+               elm_genlist_select_mode_set(ug_data->gl, ELM_OBJECT_SELECT_MODE_DEFAULT);
                elm_object_item_disabled_set(ug_data->root_item, EINA_FALSE);
 
                /* Set the navigation bar title */
@@ -2206,14 +2222,13 @@ static void _folder_move_cb(void *data, Evas_Object *obj, void *event_info)
        debug_log("");
        EmailAccountUGD *ug_data = (EmailAccountUGD *)data;
        //int account_id = ug_data->account_id;
-       Evas_Object *genlist = ug_data->gl;
 
        if (ug_data->ctxpopup) {
                evas_object_del(ug_data->ctxpopup);
                ug_data->ctxpopup = NULL;
        }
 
-       if (!elm_genlist_decorate_mode_get(genlist)) {
+       if (!elm_genlist_decorate_mode_get(ug_data->gl)) {
                ug_data->folder_mode = ACC_FOLDER_MOVE_FROM;
 
                if(ug_data->emf_handle != EMAIL_HANDLE_INVALID && ug_data->b_foldersync) {
@@ -2225,16 +2240,14 @@ static void _folder_move_cb(void *data, Evas_Object *obj, void *event_info)
 
                _unset_controlbar_content(ug_data);
 
-               /* Set reorder and edit mode */
-               elm_genlist_reorder_mode_set(genlist, EINA_TRUE);
-               elm_genlist_decorate_mode_set(genlist, EINA_TRUE);
+               /* Set edit mode */
+               elm_genlist_decorate_mode_set(ug_data->gl, EINA_TRUE);
 
                /* This means even if selected, every click will make the selected callbacks be called. */
-               elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_ALWAYS);
+               elm_genlist_select_mode_set(ug_data->gl, ELM_OBJECT_SELECT_MODE_ALWAYS);
                elm_object_item_disabled_set(ug_data->root_item, EINA_TRUE);
 
-               //elm_object_part_text_set(ug_data->navi_title_ly, "txt_title", N_("Select move folder"));
-               elm_object_item_text_set(ug_data->navibar_item, N_("Select move folder"));
+               elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_SELECT_FOLDER"));
 
                elm_genlist_tree_effect_enabled_set(ug_data->gl, EINA_FALSE);
        }
@@ -2265,8 +2278,7 @@ static void _folder_move_cb(void *data, Evas_Object *obj, void *event_info)
                                elm_object_item_disabled_set(ug_data->root_item, EINA_FALSE);
                                elm_genlist_item_select_mode_set(ug_data->root_item, ELM_OBJECT_SELECT_MODE_ALWAYS);
 
-                               //elm_object_part_text_set(ug_data->navi_title_ly, "txt_title", N_("Select location folder"));
-                               elm_object_item_text_set(ug_data->navibar_item, N_("Select location folder"));
+                               elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_MOVE_TO"));
                        }
                }
                else
@@ -2277,10 +2289,9 @@ static void _folder_move_cb(void *data, Evas_Object *obj, void *event_info)
                        edje_object_signal_emit(_EDJ(ug_data->ly), "elm,bg,show,default", "elm");
 
                        /* Unset edit mode */
-                       elm_genlist_decorate_mode_set(genlist, EINA_FALSE);
-                       elm_genlist_reorder_mode_set(genlist, EINA_FALSE);
+                       elm_genlist_decorate_mode_set(ug_data->gl, EINA_FALSE);
 
-                       elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_DEFAULT);
+                       elm_genlist_select_mode_set(ug_data->gl, ELM_OBJECT_SELECT_MODE_DEFAULT);
                        elm_object_item_disabled_set(ug_data->root_item, EINA_FALSE);
                        elm_genlist_item_select_mode_set(ug_data->root_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
@@ -2304,14 +2315,13 @@ static void _folder_rename_cb(void *data, Evas_Object *obj, void *event_info)
        debug_log("");
        EmailAccountUGD *ug_data = (EmailAccountUGD *)data;
        //int account_id = ug_data->account_id;
-       Evas_Object *genlist = ug_data->gl;
 
        if (ug_data->ctxpopup) {
                evas_object_del(ug_data->ctxpopup);
                ug_data->ctxpopup = NULL;
        }
 
-       if (!elm_genlist_decorate_mode_get(genlist)) {
+       if (!elm_genlist_decorate_mode_get(ug_data->gl)) {
        debug_log("");
 
                ug_data->folder_mode = ACC_FOLDER_RENAME;
@@ -2322,18 +2332,17 @@ static void _folder_rename_cb(void *data, Evas_Object *obj, void *event_info)
                        _stop_emf_job(ug_data, ug_data->emf_handle);
                        ug_data->no_refresh = true;
                }
-
+               _refresh_folder_view(data);
                edje_object_signal_emit(_EDJ(ug_data->ly), "elm,bg,show,edit_mode", "elm");
-               /* Set reorder and edit mode */
-               elm_genlist_reorder_mode_set(genlist, EINA_TRUE);
-               elm_genlist_decorate_mode_set(genlist, EINA_TRUE);
+
+               /* Set edit mode */
+               elm_genlist_decorate_mode_set(ug_data->gl, EINA_TRUE);
 
                /* This means even if selected, every click will make the selected callbacks be called. */
-               elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_ALWAYS);
+               elm_genlist_select_mode_set(ug_data->gl, ELM_OBJECT_SELECT_MODE_ALWAYS);
                elm_object_item_disabled_set(ug_data->root_item, EINA_TRUE);
 
-               //elm_object_part_text_set(ug_data->navi_title_ly, "txt_title", N_("Select rename folder"));
-               elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_SELECT_FOLDER_ABB"));
+               elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_SELECT_FOLDER"));
 
                elm_genlist_tree_effect_enabled_set(ug_data->gl, EINA_FALSE);
 
@@ -2344,14 +2353,18 @@ static void _folder_rename_cb(void *data, Evas_Object *obj, void *event_info)
                debug_log("");
 
                ug_data->folder_mode = ACC_FOLDER_NONE;
-
+               _refresh_folder_view(data);
                /* Change layout background color to default background color */
                edje_object_signal_emit(_EDJ(ug_data->ly), "elm,bg,show,default", "elm");
+/*
+               elm_object_item_part_content_unset(ug_data->navibar_item, "controlbar");
+               elm_object_item_part_content_set(ug_data->navibar_item, "controlbar", ug_data->control_bar);
+               evas_object_show(ug_data->control_bar);
+*/
                /* Unset edit mode */
-               elm_genlist_decorate_mode_set(genlist, EINA_FALSE);
-               elm_genlist_reorder_mode_set(genlist, EINA_FALSE);
+               elm_genlist_decorate_mode_set(ug_data->gl, EINA_FALSE);
 
-               elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_DEFAULT);
+               elm_genlist_select_mode_set(ug_data->gl, ELM_OBJECT_SELECT_MODE_DEFAULT);
                elm_object_item_disabled_set(ug_data->root_item, EINA_FALSE);
 
                /* Set the navigation bar title */
@@ -2751,7 +2764,6 @@ static void _popup_rename_cb(void *data, Evas_Object *obj, void *event_info)
        evas_object_smart_callback_add(entry, "unfocused", _entry_unfocused_cb, layout);
 
        elm_object_part_content_set(layout, "elm.swallow.content", entry);
-       elm_object_part_text_set(layout, "elm.guidetext", _("IDS_EMAIL_POP_FOLDER_NAME")); // Set guidetext.
        elm_object_signal_callback_add(layout, "elm,eraser,clicked", "elm", _eraser_clicked_cb, entry);
        evas_object_show(entry);
        elm_object_part_content_set(layout, "elm.swallow.content", entry);
@@ -2924,7 +2936,7 @@ static void _popup_movefolder_cb(void *data, Evas_Object *obj, void *event_info)
                        }
                }
        }
-       snprintf(arg1, sizeof(arg1), "Move folder [%s] to [%s]", from_string, to_string);
+       snprintf(arg1, sizeof(arg1), _("IDS_EMAIL_POP_MOVE_P1SS_TO_P2SS_Q"), from_string, to_string);
 
        char *popup_text = elm_entry_utf8_to_markup(arg1);
 
@@ -3043,7 +3055,7 @@ static void _popup_success_cb(void *data, Evas_Object *obj, void *event_info)
        switch(ug_data->folder_mode)
        {
                case ACC_FOLDER_CREATE:
-                       elm_object_text_set(popup, N_("Created"));
+                       elm_object_text_set(popup, _("IDS_EMAIL_POP_CREATED"));
                        break;
                case ACC_FOLDER_DELETE:
                        elm_object_text_set(popup, dgettext("sys_string", "IDS_COM_POP_DELETED"));
@@ -3065,7 +3077,7 @@ static void _popup_success_cb(void *data, Evas_Object *obj, void *event_info)
        switch(ug_data->folder_mode)
        {
                case ACC_FOLDER_CREATE:
-                       ret = status_message_post(N_("Created"));
+                       ret = status_message_post(_("IDS_EMAIL_POP_CREATED"));
                        break;
                case ACC_FOLDER_DELETE:
                        ret = status_message_post(dgettext("sys_string", "IDS_COM_POP_DELETED"));
@@ -3122,10 +3134,10 @@ static void _popup_fail_cb(void *data, Evas_Object *obj, void *event_info)
                        elm_object_text_set(popup, _("IDS_EMAIL_POP_UNABLE_TO_CREATE_FOLDER"));
                        break;
                case ACC_FOLDER_DELETE:
-                       elm_object_text_set(popup, N_("Unable to delete folder"));
+                       elm_object_text_set(popup, _("IDS_EMAIL_POP_UNABLE_TO_DELETE_FOLDER"));
                        break;
                case ACC_FOLDER_MOVE_TO:
-                       elm_object_text_set(popup, N_("Unable to move folder"));
+                       elm_object_text_set(popup, _("IDS_EMAIL_POP_UNABLE_TO_MOVE_FOLDER"));
                        break;
                default:
                        elm_object_text_set(popup, dgettext("sys_string", "IDS_COM_POP_WARNING"));
@@ -3145,13 +3157,13 @@ static void _popup_fail_cb(void *data, Evas_Object *obj, void *event_info)
                        ret = status_message_post(_("IDS_EMAIL_POP_UNABLE_TO_CREATE_FOLDER"));
                        break;
                case ACC_FOLDER_DELETE:
-                       ret = status_message_post(N_("Unable to delete folder"));
+                       ret = status_message_post(_("IDS_EMAIL_POP_UNABLE_TO_DELETE_FOLDER"));
                        break;
                case ACC_FOLDER_MOVE_TO:
-                       ret = status_message_post(N_("Unable to move folder"));
+                       ret = status_message_post(_("IDS_EMAIL_POP_UNABLE_TO_MOVE_FOLDER"));
                        break;
                case ACC_FOLDER_RENAME:
-                       ret = status_message_post(N_("Unable to rename folder"));
+                       ret = status_message_post(_("IDS_EMAIL_POP_UNABLE_TO_RENAME_FOLDER"));
                        break;
                default:
                        debug_log("Warning...");
@@ -3189,16 +3201,16 @@ static void _popup_progress_cb(void *data, Evas_Object *obj, void *event_info)
        switch(ug_data->folder_mode)
        {
                case ACC_FOLDER_CREATE:
-                       elm_object_part_text_set(popup, "title,text", N_("Creating folder..."));
+                       elm_object_part_text_set(popup, "title,text", _("IDS_EMAIL_POP_CREATING_FOLDER_ING"));
                        break;
                case ACC_FOLDER_DELETE:
-                       elm_object_part_text_set(popup, "title,text", N_("Deleting folder..."));
+                       elm_object_part_text_set(popup, "title,text", _("IDS_EMAIL_POP_DELETING_ING"));
                        break;
                case ACC_FOLDER_MOVE_TO:
-                       elm_object_part_text_set(popup, "title,text", N_("Moving folder..."));
+                       elm_object_part_text_set(popup, "title,text", _("IDS_EMAIL_POP_MOVING_ING"));
                        break;
                case ACC_FOLDER_RENAME:
-                       elm_object_part_text_set(popup, "title,text", N_("Renaming folder..."));
+                       elm_object_part_text_set(popup, "title,text", _("IDS_EMAIL_POP_RENAMING_ING"));
                        break;
                default:
                        elm_object_part_text_set(popup, "title,text", dgettext("sys_string", "IDS_COM_POP_WARNING"));
@@ -3301,18 +3313,17 @@ void refresh_account_ug(EmailAccountUGD *ug_data)
                        elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_FOLDERS"));
                        break;
                case ACC_FOLDER_CREATE:
-               case ACC_FOLDER_RENAME:
-                       elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_SELECT_FOLDER_ABB"));
+                       elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_CREATE_FOLDER_IN"));
                        break;
+               case ACC_FOLDER_RENAME:
                case ACC_FOLDER_DELETE:
-                       elm_object_item_text_set(ug_data->navibar_item, N_("Select delete folder"));
+               case ACC_FOLDER_MOVE_FROM:
+                       elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_SELECT_FOLDER"));
                        break;
                case ACC_FOLDER_MOVE_TO:
-                       elm_object_item_text_set(ug_data->navibar_item, N_("Select location folder"));
-                       break;
-               case ACC_FOLDER_MOVE_FROM:
-                       elm_object_item_text_set(ug_data->navibar_item, N_("Select move folder"));
+                       elm_object_item_text_set(ug_data->navibar_item, _("IDS_EMAIL_HEADER_MOVE_TO"));
                        break;
+
                default:
                        break;
                }
@@ -3579,6 +3590,29 @@ static void _edbus_event_account_receive(void *local_data, DBusMessage *message)
                                debug_log("NOTI_RENAME_MAILBOX_CANCEL");
                                break;
 
+                       case NOTI_SYNC_IMAP_MAILBOX_LIST_FINISH :
+                       case NOTI_SYNC_IMAP_MAILBOX_LIST_FAIL :
+                       case NOTI_SYNC_IMAP_MAILBOX_LIST_CANCEL :
+                               debug_log("email imap mailbox list sync is finished");
+                               if(ug_data->b_foldersync == true) {
+                                       ug_data->b_foldersync = false;
+                                       debug_log("ug_data->emf_handle : %d", ug_data->emf_handle);
+                                       ug_data->emf_handle = EMAIL_HANDLE_INVALID;
+                                       Evas_Object * sync_button = elm_object_item_part_content_get(ug_data->navibar_item, "title_right_btn");
+                                       if (sync_button == ug_data->sync_progress)
+                                       {
+                                               debug_log("remove sync progress");
+                                               elm_object_item_part_content_unset(ug_data->navibar_item, "title_right_btn");
+                                               evas_object_hide(ug_data->sync_progress);
+                                               elm_object_item_part_content_set(ug_data->navibar_item, "title_right_btn", ug_data->update_button);
+                                               evas_object_show(ug_data->update_button);
+                                               if(!ug_data->no_refresh) {
+                                                       _refresh_folder_view(ug_data);
+                                               }
+                                       }
+                               }
+                               break;
+
                        default:
                                debug_warning("unknown type");
                                break;
@@ -3664,6 +3698,37 @@ static void _eraser_clicked_cb(void *data, Evas_Object *obj, const char *emissio
        elm_entry_entry_set(data, "");
 }
 
+static gboolean _folder_item_dim_state_get(email_mailbox_t *mlist, int folder_mode)
+{
+       debug_log("");
+       if(mlist) {
+               switch (folder_mode) {
+               case ACC_FOLDER_NONE:
+               case ACC_FOLDER_MOVE_FROM:
+                       if (!g_strcmp0(mlist->alias, "[Gmail]") || mlist->no_select) {
+                               return TRUE;
+                       }
+                       break;
+               case ACC_FOLDER_CREATE:
+                       if (mlist->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX) {
+                               return TRUE;
+                       }
+                       break;
+               case ACC_FOLDER_RENAME:
+               case ACC_FOLDER_DELETE:
+                       if (mlist->no_select || mlist->mailbox_type != EMAIL_MAILBOX_TYPE_USER_DEFINED) {
+                               return TRUE;
+                       }
+                       break;
+
+               default:
+                       break;
+               }
+       }
+
+       return FALSE;
+}
+
 // Codes for removing elm_editfield : START
 /*
 static void _changed_cb(void *data, Evas_Object *obj, void *event_info) // This callback is for showing(hiding) X marked button.
index fe49638..1419c89 100755 (executable)
@@ -38,6 +38,8 @@ static void on_message(ui_gadget_h ug, service_h msg, service_h service, void *p
 static void on_event(ui_gadget_h ug, enum ug_event event, service_h service, void *priv);
 static void on_key_event(ui_gadget_h ug, enum ug_key_event event, service_h service, void *priv);
 
+static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event);
+
 /* view logic */
 static Evas_Object *create_frameview(EmailAccountUGD *ugd);
 
@@ -51,8 +53,6 @@ static void _gl_del(void *data, Evas_Object *obj);
 static char *_gl_label_get_for_4text(void *data, Evas_Object *obj, const char *part);
 static char *_gl_label_get_for_all_emails(void *data, Evas_Object *obj, const char *part);
 static Evas_Object *_gl_icon_get_for_all_emails(void *data, Evas_Object *obj, const char *part);
-static char *_gl_label_get_for_add_account(void *data, Evas_Object *obj, const char *part);
-static Evas_Object *_gl_icon_get_for_add_account(void *data, Evas_Object *obj, const char *part);
 static Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part);
 static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part);
 static void _open_all_emails(void *data, Evas_Object *obj, void *event_info);
@@ -64,8 +64,6 @@ static void _email_account_timezone_change_cb(keynode_t *key, void *data);
 
 static void _stop_emf_job(EmailAccountUGD *ug_data, int handle);
 /* other cb */
-static void _add_account_cb(void *data, Evas_Object *obj, void *event_info);
-
 //static int _emf_account_init(EmailAccountUGD *ug_data);
 //static void _gl_con(void *data, Evas_Object *obj, void *event_info);
 //static void _gl_exp_req(void *data, Evas_Object *obj, void *event_info);
@@ -79,7 +77,6 @@ static void _add_account_cb(void *data, Evas_Object *obj, void *event_info);
 EmailAccountUGD *g_account_ugd;
 
 static Elm_Genlist_Item_Class itc_item;
-static Elm_Genlist_Item_Class itc_item_for_add_accounts;
 static Elm_Genlist_Item_Class itc_item_for_all_emails;
 
 bool g_isRotate = false;
@@ -152,6 +149,8 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi
                ug_data->base = create_frameview(ug_data);
        }
 
+       evas_object_smart_callback_add(ug_data->win, "profile,changed", _win_profile_changed_cb, ug_data);
+
        return ug_data->base;
 }
 
@@ -330,6 +329,7 @@ static Evas_Object *create_frameview(EmailAccountUGD * ug_data)
 
        ug_data->bg = elm_bg_add(ug_data->win);
        evas_object_size_hint_weight_set(ug_data->bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_win_resize_object_add(ug_data->win, ug_data->bg);
        evas_object_show(ug_data->bg);
 
        ug_data->ly = elm_layout_add(ug_data->win);
@@ -350,6 +350,26 @@ static Evas_Object *create_frameview(EmailAccountUGD * ug_data)
        return ug_data->ly;
 }
 
+static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event)
+{
+       debug_log("");
+       if (!data) {
+               debug_log("data is NULL");
+               return;
+       }
+
+       EmailAccountUGD *ug_data = (EmailAccountUGD *)data;
+
+       const char *profile = elm_config_profile_get();
+       if (!g_strcmp0(profile, "desktop"))
+               elm_layout_theme_set(ug_data->ly, "layout", "application", "noindicator");
+       else
+               elm_layout_theme_set(ug_data->ly, "layout", "application", "default");
+
+       evas_object_size_hint_weight_set(ug_data->ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_show(ug_data->ly);
+}
+
 void _create_account_view(EmailAccountUGD *ug_data)
 {
        debug_log("");
@@ -474,16 +494,6 @@ void _create_account_view(EmailAccountUGD *ug_data)
        evas_object_smart_callback_add(gl, "contracted", _gl_con, gl);
 */
 
-       /* If user make 2 more accounts, we will show `Add account` */
-       itc_item_for_add_accounts.item_style = "2text.1icon";
-       itc_item_for_add_accounts.func.text_get = _gl_label_get_for_add_account;
-       itc_item_for_add_accounts.func.content_get = _gl_icon_get_for_add_account;
-       itc_item_for_add_accounts.func.state_get = _gl_state_get;
-       itc_item_for_add_accounts.func.del = _gl_del;
-
-       elm_genlist_item_append(gl, &itc_item_for_add_accounts, ug_data, NULL,
-                       ELM_GENLIST_ITEM_NONE, _add_account_cb, ug_data);
-
        return;
 }
 
@@ -656,49 +666,6 @@ static Evas_Object *_gl_icon_get_for_all_emails(void *data, Evas_Object *obj, co
        return NULL;
 }
 
-static char *_gl_label_get_for_add_account(void *data, Evas_Object *obj, const char *part)
-{
-       debug_log("");
-//     EmailAccountUGD *ug_data = (EmailAccountUGD *) data;
-       char tmp[MAX_STR_LEN] = { 0, };
-
-       if (!strcmp(part, "elm.text.1")) {
-               snprintf(tmp, sizeof(tmp), "%s", _("IDS_EMAIL_POP_ADD_ACCOUNTS"));
-               return g_strdup(tmp);
-       }else if (!strcmp(part, "elm.text.2")) {
-               memset(tmp, 0, sizeof(char) * MAX_STR_LEN);
-               return g_strdup(tmp);
-       } else {
-               debug_log("part is invalid");
-       }
-
-       snprintf(tmp, sizeof(tmp), _("IDS_EMAIL_BODY_NO_TEXT"));
-       return g_strdup(tmp);
-}
-
-static Evas_Object *_gl_icon_get_for_add_account(void *data, Evas_Object *obj, const char *part)
-{
-       debug_log("");
-       if (!data) {
-               debug_log("data is NULL");
-               return NULL;
-       }
-//     EmailAccountUGD *ug_data = (EmailAccountUGD *) data;
-
-       if (!strcmp(part, "elm.icon"))
-       {
-               Evas_Object *icon = elm_icon_add(obj);
-               elm_image_file_set(icon, ACCOUNT_ICON_ADDACCOUNT, NULL);
-               evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-               return icon;
-       }
-       else
-       {
-               debug_log("part is invalid");
-       }
-
-       return NULL;
-}
 
 static Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part)
 {
@@ -820,7 +787,7 @@ void _open_mail_list(void *data, Evas_Object *obj, void *event_info)
 
        service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_TYPE, EMAIL_BUNDLE_VAL_ALL_ACCOUNT);
        service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_ID, id);
-       service_add_extra_data(service, EMAIL_BUNDLE_KEY_USER_EMAIL, alist->account_info->user_email_address);
+       service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_NAME, alist->account_info->account_name);
        ug_send_result(alist->ug_data->ug, service);
 
        alist->ug_data->block_item_click = 1;
@@ -867,36 +834,10 @@ static void _open_all_emails(void *data, Evas_Object *obj, void *event_info)
        service_destroy(service);
 }
 
-static void _add_account_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-       EmailAccountUGD *ug_data = (EmailAccountUGD *)data;
-       Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-       int ret;
-
-       elm_genlist_item_selected_set(item, 0);
-
-       service_h service;
-       if (SERVICE_ERROR_NONE != service_create(&service))
-       {
-               debug_log("creating service handle failed");
-               return;
-       }
-
-       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_TYPE, EMAIL_BUNDLE_VAL_ADD_ACCOUNT);
-       debug_log("service_add_extra_data: %d", ret);
-
-       ret = ug_send_result(ug_data->ug, service);
-       debug_log("ug_send_result: %d", ret);
-
-       ret = service_destroy(service);
-       debug_log("service_destroy: %d", ret);
-}
-
 static void layout_cb(ui_gadget_h ug, enum ug_mode mode, void *priv)
 {
        debug_log("");
-       Evas_Object *base, *win;
+       Evas_Object *base;
 
        if (!ug || !priv)
                return;
@@ -905,7 +846,7 @@ static void layout_cb(ui_gadget_h ug, enum ug_mode mode, void *priv)
        if (!base)
                return;
 
-       win = ug_get_window();
+       ug_get_window();
 
        switch (mode) {
        case UG_MODE_FULLVIEW:
index 2963a30..b43927c 100755 (executable)
 #define EMAIL_BUNDLE_KEY_ACCOUNT_ID            "ACCOUNT_ID"
 #define EMAIL_BUNDLE_KEY_MAILBOX                       "MAILBOX_ID"
 #define EMAIL_BUNDLE_KEY_MAILBOX_ALIAS         "MAILBOX_ALIAS"
-#define EMAIL_BUNDLE_KEY_USER_EMAIL            "USER_EMAIL"
+#define EMAIL_BUNDLE_KEY_ACCOUNT_NAME          "ACCOUNT_NAME"
 #define EMAIL_BUNDLE_KEY_UPDATE                        "UPDATE"
 #define EMAIL_BUNDLE_KEY_CANCEL_ALL                    "CANCEL_ALL"
+#define EMAIL_BUNDLE_KEY_ROTATE_MAILBOX        "ROTATE_MAILBOX"
+#define EMAIL_BUNDLE_KEY_ROTATE                        "ROTATE"
 #define EMAIL_BUNDLE_KEY_VIEW_TYPE                     "VIEW_TYPE"
 #define EMAIL_BUNDLE_KEY_RUN_TYPE                      "RUN_TYPE"
 #define EMAIL_BUNDLE_KEY_MAIL_ID                       "MAIL_ID"
index b66170a..4296798 100755 (executable)
@@ -103,7 +103,7 @@ void email_engine_finalize_force(void)
 
        err = email_service_end();
        if (err != EMAIL_ERROR_NONE) {
-               debug_critical("fail to email_service_begin - err(%d)", err);
+               debug_critical("fail to email_service_end - err(%d)", err);
        }
 }
 
@@ -286,6 +286,7 @@ gboolean email_engine_get_default_account(gint *account_id)
        RETURN_VAL_IF_FAIL(account_id != NULL, FALSE);
 
        email_account_t *_account = NULL;
+       email_account_t *_account_list = NULL;
        int count = 0;
        int err = 0;
 
@@ -302,23 +303,22 @@ gboolean email_engine_get_default_account(gint *account_id)
        }
 
        /* if slp_ret have no value or account id is not valid */
-       err = email_get_account_list(&_account, &count);
+       err = email_get_account_list(&_account_list, &count);
        if (err != EMAIL_ERROR_NONE) {
                debug_critical("fail to get account list - err(%d)", err);
-               email_free_account(&_account, 1);
                return FALSE;
        }
 
        /* no account */
-       if (_account == NULL) {
+       if (_account_list == NULL) {
                debug_log("account info is NULL");
                return FALSE;
        }
 
-       *account_id = _account[0].account_id;
+       *account_id = _account_list[0].account_id;
        debug_log("account id (%d)", *account_id);
 
-       err = email_free_account(&_account, count);
+       err = email_free_account(&_account_list, count);
        if (err != EMAIL_ERROR_NONE) {
                debug_critical("fail to free account - err(%d)", err);
                return FALSE;
@@ -858,7 +858,6 @@ int email_engine_get_max_account_id(void)
        return max_account_id;
 }
 
-
 int email_engine_get_count_account(void)
 {
        debug_enter();
index 81f0829..a9edcc4 100755 (executable)
@@ -54,7 +54,7 @@
 #define MAX_RECIPIENT_ADDRESS_LEN      234
 #define MAX_RECIPIENT_COUNT            100
 #define MAX_RECIPIENT_ADDRESSES_LEN    (MAX_RECIPIENT_ADDRESS_LEN * MAX_RECIPIENT_COUNT)
-#define MAX_SUBJECT_LEN                        1024
+#define MAX_SUBJECT_LEN                        1025
 
 #define MAX_BODY_SIZE                          32763
 #define MAX_ATTACHMENT_ITEM            100
index 246398c..e97d52c 100755 (executable)
@@ -93,6 +93,7 @@ void _composer_update_attachment_info(EmailComposerUGD *ugd, int index);
 void _composer_attachment_cancel_download(EmailComposerUGD *ugd);
 void _composer_cancel_download_attachment(EmailComposerUGD *ugd);
 
+void _composer_create_waiting_popup(EmailComposerUGD *ugd, const char *title_text, const char *style);
 Evas_Object *_composer_create_noti_with_list(EmailComposerUGD *ugd, bool use_win, char *title, char *content,
                                                                                int btn_num, char *btn1_lb, char *btn2_lb,
                                                                                double timeout, void (*response_cb)(void *data, Evas_Object *obj, void *event_info));
index 9015fc7..86913f7 100755 (executable)
@@ -35,8 +35,8 @@
 
 #define COMPOSER_ICON_DIR IMGDIR
 
-#define COMPOSER_NAVI_HEIGHT 98 //108
-#define COMPOSER_INDI_HEIGHT 76
+#define COMPOSER_NAVI_HEIGHT 111
+#define COMPOSER_INDI_HEIGHT 60
 #define COMPOSER_IME_HEIGHT_V 444
 #define COMPOSER_IME_HEIGHT_H 316
 #define COMPOSER_IME_PREDICTION_H 84
@@ -95,7 +95,6 @@ struct ug_data {
        bool bSendBtnDisabled;
        bool cc_added;
        bool bcc_added;
-       bool me_added;
 
        Eina_Bool is_prediction;
        bool is_main_scroller_scrolling;
@@ -107,21 +106,14 @@ struct ug_data {
        Evas_Object *selected_entry;
        Elm_Object_Item *selected_item;
 
-       Evas_Object *dummy_btn;
-       Evas_Object *add_me_btn;
-
        int priority_option;
        Evas_Object *priority_rdg;
        Evas_Object *priority_rd[3];
 
        Eina_Bool tracking_option[2];
 
-       Evas_Object *cc_btn;
-
        Evas_Object *send_btn;
        Evas_Object *cancel_btn;
-       Evas_Object *send_btm_btn;
-       Evas_Object *cancel_btm_btn;
 
        bool is_hided;
 
@@ -152,6 +144,7 @@ struct ug_data {
        bool is_recipient_duplicated;
 
        /* Multibutton Entry */
+       Elm_Object_Item *selected_mbe_item;
        Evas_Object *to_mbe_entry;
        Evas_Object *cc_mbe_entry;
        Evas_Object *bcc_mbe_entry;
@@ -219,7 +212,7 @@ struct ug_data {
        bool b_sending;
 
        Ecore_IMF_Context *imf_context;
-       bool is_ime_hided;
+       bool is_clipboard_opened;
 
        Evas_Object *account_gen_list;
        bool b_launch_finished;
index 23eea8c..699e8a4 100755 (executable)
@@ -208,6 +208,18 @@ void _composer_attachment_reset(EmailComposerUGD *ugd)
                evas_object_del(attachment_obj);
        }
 
+       it = eina_list_iterator_new(ugd->attachment_inline_item_list);
+
+       while (eina_iterator_next(it, (void **)&attachment_data)) {
+
+               if (attachment_data) {
+                       debug_log("attachment_data file name to be removed : %s", attachment_data->attachment_path);
+
+                       email_free_attachment_data(&attachment_data, 1);
+                       attachment_data = NULL;
+               }
+       }
+
        if (ugd->new_mail_info) {
                if (ugd->new_mail_info->mail_data) {
                        ugd->new_mail_info->mail_data->attachment_count = 0;
@@ -228,6 +240,11 @@ void _composer_attachment_reset(EmailComposerUGD *ugd)
                ugd->attachment_item_obj_list = NULL;
        }
 
+       if (ugd->attachment_inline_item_list) {
+               eina_list_free(ugd->attachment_inline_item_list);
+               ugd->attachment_inline_item_list = NULL;
+       }
+
        if (ugd->attachment_contracted_item) {
                elm_box_unpack(ugd->attachment_item_box, ugd->attachment_contracted_item);
                evas_object_del(ugd->attachment_contracted_item);
@@ -377,13 +394,11 @@ void _composer_attachment_create_list(EmailComposerUGD *ugd, Eina_List *attachme
        if (_composer_check_recipient_is_empty(ugd)) {
                if (!ugd->bSendBtnDisabled) {
                        elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
-                       elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                        ugd->bSendBtnDisabled = true;
                }
        } else {
                if (ugd->bSendBtnDisabled) {
                        elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
-                       elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
                        ugd->bSendBtnDisabled = false;
                }
        }
@@ -623,7 +638,44 @@ Evas_Object *_composer_attachment_make_thumbnail(EmailComposerUGD *ugd, char *fi
                        debug_log("file path : %s", filePath);
 
                        if (strncmp(type, ATTACHMENT_MEDIA_IMAGE, 5) == 0) {
-                               strncpy(thumb_path, filePath, MAX_ATTACHMENT_FILE_LEN);
+                               long long file_size = 0;
+
+                               if (ecore_file_exists(filePath)) {
+                                       debug_log("image file exists");
+                                       file_size = ecore_file_size(filePath);
+                               } else {
+                                       debug_log("no exist");
+                                       file_size = 0;
+                               }
+                               debug_log("attachment file_size(%lf byte) : %lf byte", file_size, 3.5 * 1024 * 1024);
+                               if (file_size > 3.5 * 1024 * 1024) {
+                               //Need to solve low performance/speed
+                                       debug_log("make thumbnail image");
+                                       Ethumb *e = ethumb_new();
+                                       const char *target_path;
+                                       const char *key;
+
+                                       if (ethumb_file_set(e, filePath, NULL) != EINA_TRUE) {
+                                               debug_log("Fail to ethumb_file_set()");
+                                               goto FINISH_OFF;
+                                       }
+
+                                       ethumb_thumb_size_set(e, CONV_THUMB_WIDTH, CONV_THUMB_HEIGHT);
+                                       ethumb_thumb_dir_path_set(e, EMAIL_TMP_FOLDER);
+                                       ethumb_thumb_path_get(e, &target_path, &key);
+
+                                       if (ethumb_generate(e, _composer_ethumb_generate_cb, NULL, NULL) != EINA_TRUE) {
+                                               debug_log("Fail to ethumb_generate()");
+                                               goto FINISH_OFF;
+                                       }
+
+                                       strncpy(thumb_path, target_path, MAX_ATTACHMENT_FILE_LEN);
+                                       ethumb_free(e);
+                               } else {
+                               //Need to rotate photo thumbnail with orientation
+                                       debug_log("use image file as thumbnail");
+                                       strncpy(thumb_path, filePath, MAX_ATTACHMENT_FILE_LEN);
+                               }
                        } else if (strncmp(type, ATTACHMENT_MEDIA_VIDEO, 5) == 0) {
                                int err = _composer_attachment_make_ethumb(filePath, thumb_path);
 
@@ -1075,7 +1127,7 @@ static void _composer_attachment_contracted_item_clicked_cb(void *data, Evas_Obj
                if (ugd->selected_entry == ugd->body_ewkview) {
                        debug_log("Webkit unfocused");
                        evas_object_focus_set(ugd->body_ewkview, EINA_FALSE);
-                       if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_UNFOCUS, _composer_script_executed_cb, NULL) == EINA_FALSE)
+                       if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_UNFOCUS, _composer_focus_script_executed_cb, NULL) == EINA_FALSE)
                                debug_log("COMPOSER_JS_SET_UNFOCUS failed.");
                }
 
@@ -1095,7 +1147,7 @@ static void _composer_attachment_contracted_item_clicked_cb(void *data, Evas_Obj
                if (ugd->selected_entry == ugd->body_ewkview) {
                        debug_log("Webkit unfocused");
                        evas_object_focus_set(ugd->body_ewkview, EINA_FALSE);
-                       if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_UNFOCUS, _composer_script_executed_cb, NULL) == EINA_FALSE)
+                       if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_UNFOCUS, _composer_focus_script_executed_cb, NULL) == EINA_FALSE)
                                debug_log("COMPOSER_JS_SET_UNFOCUS failed.");
                }
 
index c29b991..bcf2472 100755 (executable)
@@ -71,18 +71,16 @@ void _composer_edit_field_changed_cb(void *data, Evas_Object *obj, void *event_i
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
        if (obj == ugd->subject_entry) {
-               _composer_check_entry_max(ugd, ugd->subject_entry, MAX_SUBJECT_LEN + 1);
+               _composer_check_entry_max(ugd, ugd->subject_entry, MAX_SUBJECT_LEN);
 
                if (_composer_check_recipient_is_empty(ugd)) {
                        if (!ugd->bSendBtnDisabled) {
                                elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
-                               elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                                ugd->bSendBtnDisabled = true;
                        }
                } else {
                        if (ugd->bSendBtnDisabled) {
                                elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
-                               elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
                                ugd->bSendBtnDisabled = false;
                        }
                }
@@ -90,13 +88,11 @@ void _composer_edit_field_changed_cb(void *data, Evas_Object *obj, void *event_i
                if (_composer_check_recipient_is_empty(ugd)) {
                        if (!ugd->bSendBtnDisabled) {
                                elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
-                               elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                                ugd->bSendBtnDisabled = true;
                        }
                } else {
                        if (ugd->bSendBtnDisabled) {
                                elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
-                               elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
                                ugd->bSendBtnDisabled = false;
                        }
                }
@@ -107,21 +103,17 @@ static void _composer_move_ctxpopup_more(EmailComposerUGD *ugd, Evas_Object *btn
 {
        Evas_Coord x, y, w , h;
        evas_object_geometry_get(btn, &x, &y, &w, &h);
-       debug_log("is_ime_hided:%d, x(%d), y(%d), w(%d), h(%d)", ugd->is_ime_hided, x, y, w, h);
-       if (ugd->is_ime_hided == FALSE)
-               evas_object_move(ugd->context_popup, x + (w / 2), y + h);
-       else
-               evas_object_move(ugd->context_popup, x + (w / 2), y);
+       evas_object_move(ugd->context_popup, x + (w / 2), y + h);
 }
 
 static void _composer_ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void *event_info)
 {
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
-       ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
-
        evas_object_del(ugd->context_popup);
        ugd->context_popup = NULL;
+
+       ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
 }
 
 void _composer_more_toolbar_button_cb(void *data, Evas_Object *obj, void *event_info)
@@ -146,17 +138,17 @@ void _composer_more_toolbar_button_cb(void *data, Evas_Object *obj, void *event_
        evas_object_smart_callback_add(ugd->context_popup, "dismissed", _composer_ctxpopup_dismissed_cb, ugd);
 
        elm_object_focus_set(ugd->context_popup, EINA_TRUE);
-       ugd->focus_status = COMPOSER_FOCUS_STATUS_SELECTED; // more button is clicked!!
+       ugd->focus_status = COMPOSER_FOCUS_STATUS_SELECTED;
 
        icon = elm_icon_add(ugd->context_popup);
        elm_image_file_set(icon, IMGDIR "/M02_icon_popup_send_email.png", NULL);
-       elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_OPT_SEND_EMAIL_TO_MYSELF_ABB"), icon, _composer_cbar_send_myself_clicked, ugd);
+       elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"), icon, _composer_cbar_send_myself_clicked, ugd);
        icon = NULL;
 
        icon = elm_icon_add(ugd->context_popup);
        elm_image_file_set(icon, IMGDIR "/M02_icon_popup_add cc.png", NULL);
        if (ugd->cc_added) {
-               elm_ctxpopup_item_append(ugd->context_popup, N_("Remove Cc/Bcc"), icon, _composer_cbar_cc_clicked, ugd);
+               elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_OPT_REMOVE_CC_BCC"), icon, _composer_cbar_cc_clicked, ugd);
        } else {
                elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_OPT_ADD_CC_BCC"), icon, _composer_cbar_cc_clicked, ugd);
        }
@@ -164,12 +156,12 @@ void _composer_more_toolbar_button_cb(void *data, Evas_Object *obj, void *event_
 
        icon = elm_icon_add(ugd->context_popup);
        elm_image_file_set(icon, IMGDIR "/M02_icon_popup_save.png", NULL);
-       elm_ctxpopup_item_append(ugd->context_popup, dgettext("sys_string", "IDS_COM_POP_SAVE_IN_DRAFTS"), icon, _composer_cbar_save_as_draft_clicked, ugd);
+       elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_OPT_SAVE_IN_DRAFTS"), icon, _composer_cbar_save_as_draft_clicked, ugd);
        icon = NULL;
 
        icon = elm_icon_add(ugd->context_popup);
        elm_image_file_set(icon, IMGDIR "/M02_icon_popup_priority.png", NULL);
-       elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_BODY_PRIORITY"), icon, _composer_cbar_priority_clicked, ugd);
+       elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_OPT_PRIORITY"), icon, _composer_cbar_priority_clicked, ugd);
        icon = NULL;
 
        icon = elm_icon_add(ugd->context_popup);
@@ -188,17 +180,15 @@ void _composer_back_button_cb(void *data, Evas_Object *obj, void *event_info)
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
-       elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
-
        if (EINA_FALSE == ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_LATEST_INFO_CONTENT, _composer_get_latest_info_content_cb, (void *)ugd))
                debug_log("COMPOSER_JS_GET_LATEST_INFO_CONTENT failed.");
 
        if (EINA_FALSE == ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_LATEST_HTML_CONTENT, _composer_get_latest_html_content_cb, (void *)ugd))
                debug_log("COMPOSER_JS_GET_LATEST_HTML_CONTENT failed.");
 
-       ugd->bringin_timer = ecore_timer_add(0.5, _composer_get_html_content_for_draft_cb, ugd);
+       ugd->bringin_timer = ecore_timer_add(1.0, _composer_get_html_content_for_draft_cb, ugd);
 
-       debug_log("Cancel Button Clicked: %p, %p", ugd->cancel_btn, ugd->cancel_btm_btn);
+       debug_log("Cancel Button Clicked: %p", ugd->cancel_btn);
 }
 
 void _composer_mbe_changed_cb(void *data, Evas_Object *obj, void *event_info)
@@ -322,7 +312,7 @@ void _composer_mbe_added_cb(void *data, Evas_Object *obj, void *event_info)
                new_ri->is_from_addr = false;
                new_ri->is_always_bcc = false;
 
-               if ((ugd->me_added == false) && (obj == ugd->to_mbe)) {
+               if (obj == ugd->to_mbe) {
                        debug_log("display_name = %s", ugd->account_info->account->user_display_name);
                        EmailRecpInfo *from_ri = NULL;
                        Elm_Object_Item *from_item = NULL;
@@ -333,16 +323,12 @@ void _composer_mbe_added_cb(void *data, Evas_Object *obj, void *event_info)
                                if (g_strcmp0(new_ri->email_list[0].email_addr, from_ri->email_list[0].email_addr) == 0) {
                                        new_ri->display_name = ugd->account_info->account->user_display_name;
                                        new_ri->is_from_addr = true;
-                                       elm_object_text_set(ugd->add_me_btn, N_("Remove me"));
-                                       ugd->me_added = true;
                                }
                        } else {
                                debug_log("account name = %s", ugd->account_info->account_name);
                                if (g_strcmp0(new_ri->email_list[0].email_addr, ugd->account_info->account_name) == 0) {
                                        new_ri->display_name = ugd->account_info->account->user_display_name;
                                        new_ri->is_from_addr = true;
-                                       elm_object_text_set(ugd->add_me_btn, N_("Remove me"));
-                                       ugd->me_added = true;
                                }
                        }
                }
@@ -360,7 +346,6 @@ void _composer_mbe_added_cb(void *data, Evas_Object *obj, void *event_info)
        if ((obj == ugd->to_mbe) || (obj == ugd->cc_mbe) || (obj == ugd->bcc_mbe)) {
                if (ugd->bSendBtnDisabled && !_composer_check_recipient_is_empty(ugd)) {
                        elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
-                       elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
                        ugd->bSendBtnDisabled = false;
                }
        }
@@ -371,46 +356,20 @@ void _composer_mbe_deleted_cb(void *data, Evas_Object *obj, void *event_info)
        debug_log("");
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-       Elm_Object_Item *item = (Elm_Object_Item *) event_info;
-
-       if (obj == ugd->to_mbe) {
-               debug_log("to_mbe");
-               char *addr = elm_entry_markup_to_utf8((char *)elm_object_item_text_get(item));
-               debug_log("utf8 address : %s", addr);
-
-               EmailRecpInfo *from_ri = NULL;
-               Elm_Object_Item *from_item = NULL;
-               from_item = elm_multibuttonentry_first_item_get(ugd->from_mbe);
+       EmailRecpInfo *ri = (EmailRecpInfo *) elm_object_item_data_get(event_info);
 
-               if (from_item) {
-                       from_ri = elm_object_item_data_get(from_item);
+       if (ri == NULL) {
+               debug_log("ri is NULL");
+               return;
+       }
 
-                       debug_log("from_ri = %s", from_ri->email_list[0].email_addr);
-               }
+       g_free(ri);
 
-               debug_log("ugd->me_added = %d", ugd->me_added);
-               if (ugd->me_added == true) {
-                       debug_log("account name = %s", ugd->account_info->account_name);
-                       if (from_ri) {
-                               if (g_strcmp0(addr, from_ri->email_list[0].email_addr) == 0) {
-                                       ugd->me_added = false;
-                                       elm_object_text_set(ugd->add_me_btn, N_("Add me"));
-                               }
-                       } else {
-                               if (g_strcmp0(addr, ugd->account_info->account_name) == 0) {
-                                       ugd->me_added = false;
-                                       elm_object_text_set(ugd->add_me_btn, N_("Add me"));
-                               }
-                       }
-               }
+       if (obj == ugd->to_mbe) {
+               debug_log("to_mbe");
 
                if (ugd->to_recipients_cnt > 0)
                        ugd->to_recipients_cnt--;
-
-               if (addr) {
-                       g_free(addr);
-                       addr = NULL;
-               }
        } else if (obj == ugd->cc_mbe) {
                debug_log("cc_mbe");
 
@@ -426,7 +385,6 @@ void _composer_mbe_deleted_cb(void *data, Evas_Object *obj, void *event_info)
        if ((obj == ugd->to_mbe) || (obj == ugd->cc_mbe) || (obj == ugd->bcc_mbe)) {
                if (!ugd->bSendBtnDisabled && _composer_check_recipient_is_empty(ugd)) {
                        elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
-                       elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                        ugd->bSendBtnDisabled = true;
                }
        }
@@ -469,9 +427,12 @@ void _composer_mbe_selected_cb(void *data, Evas_Object *obj, void *event_info)
        int index = 0;
        EmailRecpInfo *ri = NULL;
 
-       Elm_Object_Item *item = (Elm_Object_Item *) event_info;
+       ugd->selected_mbe_item = (Elm_Object_Item *) event_info;
 
-       ri = (EmailRecpInfo *) elm_object_item_data_get(item);
+       ri = (EmailRecpInfo *) elm_object_item_data_get(ugd->selected_mbe_item);
+
+       elm_list_item_selected_set(ugd->selected_mbe_item, EINA_FALSE);
+       elm_multibuttonentry_item_selected_set(ugd->selected_mbe_item, EINA_FALSE);
 
        debug_log("is_contact_info = %d", ri->is_contact_info);
        debug_log("is_always_bcc = %d", ri->is_always_bcc);
@@ -525,13 +486,14 @@ void _composer_mbe_selected_cb(void *data, Evas_Object *obj, void *event_info)
                elm_list_item_append(pu_list, dgettext("sys_string", "IDS_COM_SK_EDIT"), NULL, NULL, _composer_mbe_popup_edit_cb, ugd);
 
                if (obj != ugd->to_mbe)
-                       elm_list_item_append(pu_list, _("IDS_EMAIL_BODY_MOVE_TO_TO"), NULL, NULL, _composer_mbe_popup_move_to_to_cb, ugd);
+                       elm_list_item_append(pu_list, _("IDS_EMAIL_OPT_MOVE_TO_TO"), NULL, NULL, _composer_mbe_popup_move_to_to_cb, ugd);
                if (obj != ugd->cc_mbe)
                        elm_list_item_append(pu_list, _("IDS_EMAIL_OPT_MOVE_TO_CC"), NULL, NULL, _composer_mbe_popup_move_to_cc_cb, ugd);
                if (obj != ugd->bcc_mbe)
                        elm_list_item_append(pu_list, _("IDS_EMAIL_OPT_MOVE_TO_BCC"), NULL, NULL, _composer_mbe_popup_move_to_bcc_cb, ugd);
 
                debug_log("email_cnt = %d", ri->email_cnt);
+
                if (ri->is_contact_info == true) {
                        if (ri->email_cnt > 1) {
                                elm_list_item_append(pu_list, _("IDS_EMAIL_OPT_CHANGE_EMAIL_ADDRESS_ABB"), NULL, NULL, _composer_mbe_popup_change_addr_cb, ugd);
@@ -544,6 +506,7 @@ void _composer_mbe_selected_cb(void *data, Evas_Object *obj, void *event_info)
                elm_object_focus_set(popup, EINA_TRUE);
 
                ugd->composer_popup = popup;
+
                debug_log("composer_popup = %x, is_mbe_selected = %d", ugd->composer_popup, ugd->is_mbe_selected);
        }
 }
@@ -599,12 +562,6 @@ void _composer_mbe_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
                        return;
        }
 
-       if (ugd->focus_status == COMPOSER_FOCUS_STATUS_SELECTED) {
-               elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
-               ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
-               return;
-       }
-
        debug_log("obj = %x, to_mbe = %x, cc_mbe = %x, bcc_mbe = %x", obj, ugd->to_mbe, ugd->cc_mbe, ugd->bcc_mbe);
        if (obj == ugd->to_mbe) {
                edje_object_signal_emit(_EDJ(ugd->to_ly), "hide.button", "*");
@@ -751,13 +708,11 @@ void _composer_mbe_popup_delete_cb(void *data, Evas_Object *obj, void *event_inf
                mbe = ugd->bcc_mbe;
        }
 
-       Elm_Object_Item *item = elm_multibuttonentry_selected_item_get(mbe);
-
-       if (item && mbe == ugd->bcc_mbe) {
-               elm_object_item_data_get(item);
+       if (ugd->selected_mbe_item && mbe == ugd->bcc_mbe) {
+               elm_object_item_data_get(ugd->selected_mbe_item);
        }
 
-       elm_object_item_del(item);
+       elm_object_item_del(ugd->selected_mbe_item);
 
        if (ugd->popup_list)
                ugd->popup_list = eina_list_remove(ugd->popup_list, ugd->composer_noti);
@@ -774,7 +729,7 @@ void _composer_mbe_popup_delete_cb(void *data, Evas_Object *obj, void *event_inf
 
 void _composer_mbe_popup_edit_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       debug_log("In");
+       debug_enter();
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
@@ -790,12 +745,14 @@ void _composer_mbe_popup_edit_cb(void *data, Evas_Object *obj, void *event_info)
                mbe = ugd->bcc_mbe;
        }
 
-       Elm_Object_Item *item = elm_multibuttonentry_selected_item_get(mbe);
-       debug_log("item:%p", item);
+       debug_log("item:%p", ugd->selected_mbe_item);
+       if (!ugd->selected_mbe_item) {
+               return;
+       }
 
        int index = 0;
 
-       ri = (EmailRecpInfo *) elm_object_item_data_get(item);
+       ri = (EmailRecpInfo *) elm_object_item_data_get(ugd->selected_mbe_item);
 
        if (ri)
                index = ri->selected_email_idx;
@@ -804,12 +761,12 @@ void _composer_mbe_popup_edit_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
-       elm_object_item_del(item);
-
-       debug_log("email_addr = %s", ri->email_list[index].email_addr);
+       debug_log("index = %d, email_addr = %s", index, ri->email_list[index].email_addr);
        elm_entry_entry_set(ugd->selected_entry, ri->email_list[index].email_addr);
        elm_entry_cursor_end_set(ugd->selected_entry);
 
+       elm_object_item_del(ugd->selected_mbe_item);
+
        edit_mode = true;
        edit_mode_bs = true;
 
@@ -825,7 +782,7 @@ void _composer_mbe_popup_edit_cb(void *data, Evas_Object *obj, void *event_info)
        }
        ugd->is_mbe_selected = false;
 
-       debug_log("Out");
+       debug_leave();
 }
 
 void _composer_mbe_popup_move_to_to_cb(void *data, Evas_Object *obj, void *event_info)
@@ -844,11 +801,11 @@ void _composer_mbe_popup_move_to_to_cb(void *data, Evas_Object *obj, void *event
                mbe = ugd->bcc_mbe;
        }
 
-       Elm_Object_Item *item = elm_multibuttonentry_selected_item_get(mbe);
-       if (item) {
-               ri = (EmailRecpInfo *) elm_object_item_data_get(item);
+       if (ugd->selected_mbe_item) {
+               ri = (EmailRecpInfo *) elm_object_item_data_get(ugd->selected_mbe_item);
                if (ri) {
-                       elm_object_item_del(item);
+                       elm_object_item_del(ugd->selected_mbe_item);
+
                        if (ri->display_name)
                                elm_multibuttonentry_item_append(ugd->to_mbe, ri->display_name, NULL, ri);
                        else
@@ -897,15 +854,14 @@ void _composer_mbe_popup_move_to_cc_cb(void *data, Evas_Object *obj, void *event
                email_composer_create_cc_field(ugd);
                edje_object_signal_emit(_EDJ(ugd->c_layout), "show.bcc", "*");
                email_composer_create_bcc_field(ugd);
-               elm_object_text_set(ugd->cc_btn, N_("Remove Cc/Bcc"));
                ugd->b_cc_bcc = false;
        }
 
-       Elm_Object_Item *item = elm_multibuttonentry_selected_item_get(mbe);
-       if (item) {
-               ri = (EmailRecpInfo *) elm_object_item_data_get(item);
+       if (ugd->selected_mbe_item) {
+               ri = (EmailRecpInfo *) elm_object_item_data_get(ugd->selected_mbe_item);
                if (ri) {
-                       elm_object_item_del(item);
+                       elm_object_item_del(ugd->selected_mbe_item);
+
                        if (ri->display_name)
                                elm_multibuttonentry_item_append(ugd->cc_mbe, ri->display_name, NULL, ri);
                        else
@@ -954,15 +910,14 @@ void _composer_mbe_popup_move_to_bcc_cb(void *data, Evas_Object *obj, void *even
                email_composer_create_bcc_field(ugd);
                edje_object_signal_emit(_EDJ(ugd->c_layout), "show.cc", "*");
                email_composer_create_cc_field(ugd);
-               elm_object_text_set(ugd->cc_btn, N_("Remove Cc/Bcc"));
                ugd->b_cc_bcc = false;
        }
 
-       Elm_Object_Item *item = elm_multibuttonentry_selected_item_get(mbe);
-       if (item) {
-               ri = (EmailRecpInfo *) elm_object_item_data_get(item);
+       if (ugd->selected_mbe_item) {
+               ri = (EmailRecpInfo *) elm_object_item_data_get(ugd->selected_mbe_item);
                if (ri) {
-                       elm_object_item_del(item);
+                       elm_object_item_del(ugd->selected_mbe_item);
+
                        if (ri->display_name)
                                elm_multibuttonentry_item_append(ugd->bcc_mbe, ri->display_name, NULL, ri);
                        else
@@ -1010,10 +965,8 @@ void _composer_mbe_popup_change_addr_cb(void *data, Evas_Object *obj, void *even
                mbe = ugd->bcc_mbe;
        }
 
-       Elm_Object_Item *item = elm_multibuttonentry_selected_item_get(mbe);
-       ugd->selected_item = item;
-       debug_log("@@@ Elm_Object_Item = %p @@@", item);
-       ri = (EmailRecpInfo *) elm_object_item_data_get(item);
+       debug_log("@@@ Elm_Object_Item = %p @@@", ugd->selected_mbe_item);
+       ri = (EmailRecpInfo *) elm_object_item_data_get(ugd->selected_mbe_item);
 
        for (i = 0; i < ri->email_cnt; i++) {
                snprintf(email_list[i].email_addr, MAX_RECIPIENT_ADDRESS_LEN, "%s", ri->email_list[i].email_addr);
@@ -1070,10 +1023,8 @@ static void _composer_mbe_popup_change_addr_selected_cb(void *data, Evas_Object
                        mbe = ugd->bcc_mbe;
                }
 
-               Elm_Object_Item *item = elm_multibuttonentry_selected_item_get(mbe);
-               ugd->selected_item = item;
-               debug_log("@@@ Elm_Object_Item = %p @@@", item);
-               ri = (EmailRecpInfo *) elm_object_item_data_get(item);
+               debug_log("@@@ Elm_Object_Item = %p @@@", ugd->selected_mbe_item);
+               ri = (EmailRecpInfo *) elm_object_item_data_get(ugd->selected_mbe_item);
 
                ri->selected_email_idx = selected_idx;
        }
@@ -1128,7 +1079,7 @@ void _composer_mbe_change_addr_response_cb(void *data, Evas_Object *obj, void *e
                mbe = ugd->bcc_mbe;
        }
 
-       elm_object_item_data_get(ugd->selected_item);
+       elm_object_item_data_get(ugd->selected_mbe_item);
 
        char *pszBtnText = (char *)elm_object_text_get(obj);
        debug_log("selected button text = %s", pszBtnText);
@@ -1163,8 +1114,6 @@ void _composer_cancel_send_mail_cb(void *data, Evas_Object *obj, void *event_inf
        elm_object_tree_focus_allow_set(ugd->c_layout, EINA_TRUE); // block the focus not to open IME.
        elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
        elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
-       elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
-       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
 
        if (err != EMAIL_ERROR_NONE) {
                debug_warning("email_engine_cancel_send_mail failed - err(%d)", err);
@@ -1202,21 +1151,21 @@ Eina_Bool _composer_send_mail_cb(void *data)
                        ecore_imf_context_input_panel_hide(imf_context);
        }
 
-       if (ugd->composer_noti) {
-               evas_object_del(ugd->composer_noti);
-               ugd->composer_noti = NULL;
-       }
+       if (ugd->send_result == COMPOSER_ERROR_NONE) {
+               if (ugd->composer_noti) {
+                       evas_object_del(ugd->composer_noti);
+                       ugd->composer_noti = NULL;
+               }
 
-       ugd->composer_noti = elm_popup_add(ugd->main_layout);
-       debug_log("composer_noti: %p", ugd->composer_noti);
-       if (!ugd->composer_noti) {
-               debug_log("elm_popup_add returns NULL");
-               return EINA_FALSE;
-       }
+               ugd->composer_noti = elm_popup_add(ugd->main_layout);
+               debug_log("composer_noti: %p", ugd->composer_noti);
+               if (!ugd->composer_noti) {
+                       debug_log("elm_popup_add returns NULL");
+                       return EINA_FALSE;
+               }
 
-       evas_object_size_hint_weight_set(ugd->composer_noti, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_weight_set(ugd->composer_noti, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-       if (ugd->send_result == COMPOSER_ERROR_NONE) {
                char temp_text[128];
                snprintf(temp_text, sizeof(temp_text), "%s", dgettext("sys_string", "IDS_COM_POP_SENDING"));
                elm_object_part_text_set(ugd->composer_noti, "title,text", temp_text);
@@ -1244,13 +1193,13 @@ Eina_Bool _composer_send_mail_cb(void *data)
 
                evas_object_show(ugd->composer_noti);
                ugd->send_timer = ecore_timer_add(2.0, _composer_send_popup_finish_cb, ugd);
-       } else if (ugd->send_result == COMPOSER_ERROR_SEND_FAIL) {
+       } else {
                if (ugd->composer_noti) {
                        evas_object_del(ugd->composer_noti);
                        ugd->composer_noti = NULL;
                }
                ugd->composer_noti = _composer_create_noti(ugd, false, dgettext("sys_string", "IDS_COM_POP_WARNING"),
-                       _("IDS_EMAIL_POP_UNABLE_TO_SEND_EMAIL"), 0, NULL, NULL, 1.5, _composer_fail_to_send_popup_cb);
+                       _("IDS_EMAIL_POP_UNABLE_TO_SEND_EMAIL"), 0, NULL, NULL, 2.0, _composer_fail_to_send_popup_cb);
        }
 
        return EINA_TRUE;
@@ -1479,8 +1428,6 @@ void _composer_fail_to_send_popup_cb(void *data, Evas_Object *obj, void *event_i
 
        elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
        elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
-       elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
-       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
 
        ugd->bSendBtnDisabled = false;
 }
@@ -1554,7 +1501,7 @@ void _composer_from_show_popup(EmailComposerUGD *ugd)
                evas_object_del(ugd->composer_noti);
                ugd->composer_noti = NULL;
        }
-       ugd->composer_noti = _composer_create_noti_with_list(ugd, false, _("IDS_EMAIL_BODY_FROM"), NULL, 1, dgettext("sys_string", "IDS_COM_SK_OK"), NULL, 0.0, _composer_from_change_response_cb);
+       ugd->composer_noti = _composer_create_noti_with_list(ugd, false, _("IDS_EMAIL_HEADER_FROM"), NULL, 1, dgettext("sys_string", "IDS_COM_SK_OK"), NULL, 0.0, _composer_from_change_response_cb);
 
        from_itc.item_style = "email.2text.3icon.3";
        from_itc.func.text_get = _composer_from_gl_text_get;
@@ -1809,14 +1756,6 @@ static void _composer_from_close_response_cb(EmailComposerUGD *ugd)
 
        elm_multibuttonentry_item_append(ugd->from_mbe, g_strdup(new_from_ri->display_name), NULL, new_from_ri);
 
-       if (ugd->selected_entry == ugd->to_mbe_entry) {
-               elm_object_focus_set(ugd->to_mbe, EINA_TRUE);
-       } else if (ugd->selected_entry == ugd->cc_mbe_entry) {
-               elm_object_focus_set(ugd->cc_mbe, EINA_TRUE);
-       } else if (ugd->selected_entry == ugd->bcc_mbe_entry) {
-               elm_object_focus_set(ugd->bcc_mbe, EINA_TRUE);
-       }
-
        if (ugd->account_gen_list) {
                elm_genlist_clear(ugd->account_gen_list);
 
@@ -1829,13 +1768,13 @@ static void _composer_from_close_response_cb(EmailComposerUGD *ugd)
                debug_log("composer_noti: %p", ugd->composer_noti);
 
                ugd->popup_list = eina_list_remove(ugd->popup_list, ugd->composer_noti);
-       }
 
-       if (ugd->composer_noti) {
-               debug_log("@@@ ELM_POPUP_RESPONSE_CLOSE @@@");
-               _composer_popup_delete(ugd->composer_noti);
-               ugd->composer_noti = NULL;
+               if (!_composer_check_popup_exist(ugd))
+                       ugd->idler_set_focus = ecore_idler_add(_composer_mbe_set_focus, ugd);
        }
+
+       evas_object_del(ugd->composer_noti);
+       ugd->composer_noti = NULL;
 }
 
 static void _composer_from_radio_cb(void *data, Evas_Object *obj, void *event_info)
@@ -1866,6 +1805,7 @@ void _composer_select_myemail_popup(EmailComposerUGD *ugd)
                ugd->composer_noti = NULL;
        }
        ugd->composer_noti = _composer_create_noti_with_list(ugd, false, _("IDS_EMAIL_HEADER_SELECT_EMAIL_ADDRESS"), NULL, 1, dgettext("sys_string", "IDS_COM_SK_OK"), NULL, 0.0, _composer_myemail_change_response_cb);
+       elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
        elm_object_focus_set(ugd->composer_noti, EINA_TRUE);
 
        myemail_itc.item_style = "email.2text.3icon.3";
@@ -2004,8 +1944,6 @@ static void _composer_myemail_close_response_cb(EmailComposerUGD *ugd)
        debug_log("set_val = %d", set_val);
        debug_log("account_id = %d", ugd->account_info->account_list[set_val].account_id);
 
-       elm_object_tree_focus_allow_set(ugd->c_layout, EINA_TRUE); // block the focus not to open IME.
-
        EmailRecpInfo *new_to_ri = (EmailRecpInfo *) calloc(1, sizeof(EmailRecpInfo));
 
        new_to_ri->selected_email_idx = 0;
@@ -2019,14 +1957,6 @@ static void _composer_myemail_close_response_cb(EmailComposerUGD *ugd)
 
        elm_multibuttonentry_item_append(ugd->to_mbe, g_strdup(new_to_ri->display_name), NULL, new_to_ri);
 
-       if (ugd->selected_entry == ugd->to_mbe_entry) {
-               elm_object_focus_set(ugd->to_mbe, EINA_TRUE);
-       } else if (ugd->selected_entry == ugd->cc_mbe_entry) {
-               elm_object_focus_set(ugd->cc_mbe, EINA_TRUE);
-       } else if (ugd->selected_entry == ugd->bcc_mbe_entry) {
-               elm_object_focus_set(ugd->bcc_mbe, EINA_TRUE);
-       }
-
        if (ugd->account_gen_list) {
                elm_genlist_clear(ugd->account_gen_list);
 
@@ -2039,13 +1969,13 @@ static void _composer_myemail_close_response_cb(EmailComposerUGD *ugd)
                debug_log("composer_noti: %p", ugd->composer_noti);
 
                ugd->popup_list = eina_list_remove(ugd->popup_list, ugd->composer_noti);
-       }
 
-       if (ugd->composer_noti) {
-               debug_log("@@@ ELM_POPUP_RESPONSE_CLOSE @@@");
-               _composer_popup_delete(ugd->composer_noti);
-               ugd->composer_noti = NULL;
+               if (!_composer_check_popup_exist(ugd))
+                       ugd->idler_set_focus = ecore_idler_add(_composer_mbe_set_focus, ugd);
        }
+
+       evas_object_del(ugd->composer_noti);
+       ugd->composer_noti = NULL;
 }
 
 static void _composer_myemail_radio_cb(void *data, Evas_Object *obj, void *event_info)
@@ -2069,6 +1999,8 @@ void _composer_cbar_cc_clicked(void *data, Evas_Object *obj, void *event_info)
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
+       ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
+
        if(ugd->context_popup) {
                evas_object_del(ugd->context_popup);
                ugd->context_popup = NULL;
@@ -2086,7 +2018,6 @@ void _composer_cbar_cc_clicked(void *data, Evas_Object *obj, void *event_info)
                email_composer_delete_cc_field(ugd);
                edje_object_signal_emit(_EDJ(ugd->c_layout), "hide.bcc", "*");
                email_composer_delete_bcc_field(ugd);
-               elm_object_text_set(ugd->cc_btn, _("IDS_EMAIL_OPT_ADD_CC_BCC"));
 
                if (ugd->b_cc_ps_open == true) {
                        edje_object_signal_emit(_EDJ(ugd->c_layout), "show.to", "*");
@@ -2114,7 +2045,6 @@ void _composer_cbar_cc_clicked(void *data, Evas_Object *obj, void *event_info)
                email_composer_create_cc_field(ugd);
                edje_object_signal_emit(_EDJ(ugd->c_layout), "show.bcc", "*");
                email_composer_create_bcc_field(ugd);
-               elm_object_text_set(ugd->cc_btn, N_("Remove Cc/Bcc"));
 
                elm_layout_sizing_eval(ugd->c_layout);
 
@@ -2192,7 +2122,7 @@ static void _composer_cbar_save_as_draft_cb(Evas_Object *o, const char *result,
 
                elm_object_tree_focus_allow_set(ugd->c_layout, EINA_TRUE); // block the focus not to open IME.
                _composer_webkit_set_body_script(ugd);
-               if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_ENABLE_EDITABLE, _composer_script_executed_cb, ugd) == EINA_FALSE)
+               if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_ENABLE_EDITABLE, _composer_focus_script_executed_cb, ugd) == EINA_FALSE)
                        debug_log("COMPOSER_JS_ENABLE_EDITABLE failed.");
                return;
        }
@@ -2215,6 +2145,8 @@ void _composer_cbar_save_as_draft_clicked(void *data, Evas_Object *obj, void *ev
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
+       ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
+
        if(ugd->context_popup) {
                evas_object_del(ugd->context_popup);
                ugd->context_popup = NULL;
@@ -2330,10 +2262,7 @@ static void _composer_priority_gl_sel(void *data, Evas_Object *obj, void *event_
        }
        debug_log("\n _composer_priority_gl_sel : priority_option = %d", g_ugd->priority_option);
 
-       if (g_ugd->composer_noti) {
-               evas_object_del(g_ugd->composer_noti);
-               g_ugd->composer_noti = NULL;
-       }
+       _composer_noti_response_cb((void *)g_ugd, obj, event_info);
 }
 
 void _composer_cbar_priority_clicked(void *data, Evas_Object *obj, void *event_info)
@@ -2357,10 +2286,11 @@ void _composer_cbar_priority_clicked(void *data, Evas_Object *obj, void *event_i
                evas_object_del(ugd->composer_noti);
                ugd->composer_noti = NULL;
        }
-       popup = _composer_create_noti_with_list(ugd, false, _("IDS_EMAIL_BODY_PRIORITY"), NULL, 1,
+       popup = _composer_create_noti_with_list(ugd, false, _("IDS_EMAIL_HEADER_PRIORITY"), NULL, 1,
                dgettext("sys_string", "IDS_COM_POP_CLOSE"), NULL, 0.0, _composer_noti_response_cb);
 
        ugd->composer_noti = popup;
+       elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
        elm_object_focus_set(popup, EINA_TRUE);
 
        if (ugd->clipboard_on) {
@@ -2422,7 +2352,7 @@ static char *_composer_tracking_gl_text_get(void *data, Evas_Object *obj, const
                if (index == 0)
                        return strdup(N_("Read report"));
                else if (index == 1)
-                       return strdup(N_("Delivery report"));
+                       return strdup(_("IDS_EMAIL_OPT_DELIVERY_REPORT"));
        }
        return NULL;
 }
@@ -2447,6 +2377,7 @@ static Evas_Object *_composer_tracking_gl_content_get(void *data, Evas_Object *o
                        elm_check_state_set(check, EINA_FALSE);
                }
 
+               evas_object_propagate_events_set(check, EINA_FALSE);
                evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
@@ -2511,6 +2442,7 @@ void _composer_cbar_tracking_clicked(void *data, Evas_Object *obj, void *event_i
                dgettext("sys_string", "IDS_COM_POP_CLOSE"), NULL, 0.0, _composer_noti_response_cb);
 
        ugd->composer_noti = popup;
+       elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
        elm_object_focus_set(popup, EINA_TRUE);
 
        if (ugd->clipboard_on) {
@@ -2584,7 +2516,6 @@ void _composer_cbar_send_clicked(void *data, Evas_Object *obj, void *event_info)
        }
 
        debug_log("Send Button Clicked");
-       elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
 
        if (ugd->fw_attach_cnt > 0) {
                if (ugd->fw_attach_cnt != g_list_length(ugd->fw_attachment_list)) {
@@ -2615,8 +2546,6 @@ void _composer_cbar_send_clicked(void *data, Evas_Object *obj, void *event_info)
 
        elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
        elm_object_disabled_set(ugd->cancel_btn, EINA_TRUE);
-       elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
-       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_TRUE);
 
        if (!ugd->b_sending)
                ugd->b_sending = true;
@@ -2647,7 +2576,7 @@ static Eina_Bool _composer_cc_mbe_set_focus(void *data)
        return EINA_FALSE;
 }
 
-void _composer_script_executed_cb(Evas_Object *o, const char *result, void *data)
+void _composer_focus_script_executed_cb(Evas_Object *o, const char *result, void *data)
 {
        debug_log("");
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
@@ -2657,7 +2586,7 @@ void _composer_script_executed_cb(Evas_Object *o, const char *result, void *data
        }
 }
 
-void _composer_focus_script_executed_cb(Evas_Object *o, const char *result, void *data)
+void _composer_script_executed_cb(Evas_Object *o, const char *result, void *data)
 {
        debug_log("");
 }
@@ -2669,7 +2598,7 @@ Eina_Bool _composer_get_html_content_for_draft_cb(void *data)
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
        elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE); // It prevents clicking the cancel button several times
-       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
+
        if (EINA_FALSE == ewk_view_plain_text_get(ugd->body_ewkview, _composer_plain_text_get_cb, (void *)ugd)) {
                debug_log("ewk_view_plain_text_get Failed");
        }
@@ -2716,6 +2645,7 @@ Eina_Bool _composer_get_html_content_for_draft_cb(void *data)
        if (ugd->save_drafts) {
                ugd->composer_noti = _composer_create_popup(ugd, false, NULL, dgettext("sys_string", "IDS_COM_POP_SAVE_TO_DRAFTS_Q"), 3,
                        dgettext("sys_string", "IDS_COM_SK_YES"), dgettext("sys_string", "IDS_COM_SK_NO"), dgettext("sys_string", "IDS_COM_SK_CANCEL"), 0.0, _composer_save_popup_response_cb);
+               elm_object_focus_set(ugd->composer_noti, EINA_TRUE);
        } else {
                if (elm_multibuttonentry_first_item_get(ugd->to_mbe))
                        elm_multibuttonentry_clear(ugd->to_mbe);
@@ -2792,6 +2722,17 @@ void _composer_get_image_list_cb(Evas_Object *o, const char *result, void *data)
        EmailComposerUGD *ugd = (EmailComposerUGD *) data;
 
        if (ugd->attachment_inline_item_list) {
+               email_attachment_data_t *attachment_data = NULL;
+               Eina_Iterator *it = eina_list_iterator_new(ugd->attachment_inline_item_list);
+               while (eina_iterator_next(it, (void **)&attachment_data)) {
+
+                       if (attachment_data) {
+                               debug_log("attachment_data file name to be removed : %s", attachment_data->attachment_path);
+
+                               email_free_attachment_data(&attachment_data, 1);
+                               attachment_data = NULL;
+                       }
+               }
                eina_list_free(ugd->attachment_inline_item_list);
                ugd->attachment_inline_item_list = NULL;
        }
@@ -2809,7 +2750,7 @@ void _composer_get_image_list_cb(Evas_Object *o, const char *result, void *data)
                                        debug_log("image = %s", url + 7);
 
                                        if ((return_stat = stat(url + 7, &file_info)) == -1) {
-                                               debug_error("stat Error(%d): %s", return_stat, strerror(return_stat));
+                                               debug_error("stat Error(%d): %s", errno, strerror(errno));
                                                break;
                                        }
 
@@ -2823,7 +2764,7 @@ void _composer_get_image_list_cb(Evas_Object *o, const char *result, void *data)
                                        attachment_data->attachment_size = file_info.st_size;
                                        attachment_data->drm_status = 0;
                                        attachment_data->inline_content_status = 1;
-                                       attachment_data->mailbox_id = NULL;
+                                       attachment_data->mailbox_id = 0;
                                        attachment_data->mail_id = 0;
                                        attachment_data->save_status = 1;
                                        attachment_data->attachment_mime_type = NULL;
index 4f6fe7c..8d5598e 100755 (executable)
@@ -46,6 +46,7 @@ static void _composer_webkit_scroll_down_cb(void *data, Evas_Object *obj, void *
 static void _composer_webkit_get_ime_rect_cb(void *data, Evas_Object *obj, void *event_info);
 static void _composer_webkit_ime_closed_cb(void *data, Evas_Object *obj, void *event_info);
 static void _composer_webkit_ime_opened_cb(void *data, Evas_Object *obj, void *event_info);
+static void _composer_webkit_clipboard_opened_cb(void *data, Evas_Object *obj, void *event_info);
 static void _composer_webview_policy_navigation_decide_cb(void *data, Evas_Object *obj, void *event_info);
 static void _composer_webview_contextmenu_customize_cb(void *data, Evas_Object *webview, void *event_info);
 static void _composer_webview_contextmenu_selected_cb(void *data, Evas_Object *webview, void *event_info);
@@ -98,12 +99,6 @@ static void _unfocused_cb(void *data, Evas_Object *obj, void *event_info) // Unf
        debug_log("");
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
-       if (ugd->focus_status == COMPOSER_FOCUS_STATUS_SELECTED) {
-               elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
-               ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
-               return;
-       }
-
        if (elm_entry_is_empty(obj))
                elm_object_signal_emit(ugd->subject_editfield, "elm,state,guidetext,show", "elm");
        elm_object_signal_emit(ugd->subject_editfield, "elm,state,eraser,hide", "elm");
@@ -270,6 +265,7 @@ Evas_Object *_composer_create_body_webview(Evas_Object *parent, char *title, Ema
        evas_object_smart_callback_add(ugd->body_ewkview, "editorclient,ime,opened", _composer_webkit_ime_opened_cb, ugd);
        evas_object_smart_callback_add(ugd->body_ewkview, "text,style,state", _composer_webkit_get_text_status_cb, ugd);
        evas_object_smart_callback_add(ugd->body_ewkview, "inputmethod,changed", _composer_webkit_get_ime_rect_cb, ugd);
+       evas_object_smart_callback_add(ugd->body_ewkview, "clipboard,opened", _composer_webkit_clipboard_opened_cb, ugd);
 
        evas_object_event_callback_add(ugd->body_ewkview, EVAS_CALLBACK_FOCUS_IN, _composer_webkit_focused_cb, ugd);
        evas_object_event_callback_add(ugd->body_ewkview, EVAS_CALLBACK_FOCUS_OUT, _composer_webkit_unfocused_cb, ugd);
@@ -330,7 +326,6 @@ void _composer_webkit_loadFinished_cb(void *data, Evas_Object *obj, void *event_
        }
 
        elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
-       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
        ugd->b_load_finished = EINA_TRUE;
 
        _composer_attachment_contract_items(ugd);
@@ -376,10 +371,12 @@ static void _composer_webkit_focused_cb(void *data, Evas *e, Evas_Object *obj, v
        evas_object_focus_set(ugd->body_ewkview, EINA_TRUE);
 
        ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
+       ugd->is_clipboard_opened = false;
+
        _composer_attachment_contract_items(ugd);
 
        elm_layout_sizing_eval(ugd->c_layout);
-       if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_FOCUS, _composer_script_executed_cb, NULL) == EINA_FALSE)
+       if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_FOCUS, _composer_focus_script_executed_cb, NULL) == EINA_FALSE)
                debug_log("COMPOSER_JS_SET_FOCUS failed.");
 }
 
@@ -453,7 +450,7 @@ static void _composer_set_original_html_content_cb(Evas_Object *o, const char *r
                debug_log("ugd->original_html_content => \n%s", ugd->original_html_content);
        }
 
-       if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_ENABLE_EDITABLE, _composer_script_executed_cb, NULL) == EINA_FALSE)
+       if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_ENABLE_EDITABLE, _composer_focus_script_executed_cb, NULL) == EINA_FALSE)
                debug_log("COMPOSER_JS_ENABLE_EDITABLE failed.");
 }
 
@@ -488,10 +485,18 @@ static void _composer_webkit_ime_closed_cb(void *data, Evas_Object *obj, void *e
        debug_log("");
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-       _composer_resize_body_webview(ugd, 0);
 
-       elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,hidden", "");
-       ugd->is_ime_hided = true;
+       if (ugd->is_clipboard_opened == true) {
+               if (ugd->isHorizontal == false) {
+                       _composer_resize_body_webview(ugd, COMPOSER_IME_HEIGHT_V);
+               } else {
+                       _composer_resize_body_webview(ugd, COMPOSER_IME_HEIGHT_H);
+               }
+       } else {
+               _composer_resize_body_webview(ugd, 0);
+       }
+
+       elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,shown", "");
 }
 
 static void _composer_webkit_ime_opened_cb(void *data, Evas_Object *obj, void *event_info)
@@ -505,17 +510,26 @@ static void _composer_webkit_ime_opened_cb(void *data, Evas_Object *obj, void *e
        }
 
        elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,shown", "");
-       ugd->is_ime_hided = false;
 }
 
 static void _composer_webkit_get_ime_rect_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-       Eina_Rectangle *rect = (Eina_Rectangle*)event_info;
-       debug_log("inputmethod,changed (x:%d,y:%d,w:%d,h:%d)\n", rect->x, rect->y, rect->w, rect->h);
 
-       _composer_resize_body_webview(ugd, rect->h);
+       if (ugd->is_clipboard_opened == false) {
+               Eina_Rectangle *rect = (Eina_Rectangle*)event_info;
+               debug_log("inputmethod,changed (x:%d,y:%d,w:%d,h:%d)\n", rect->x, rect->y, rect->w, rect->h);
+
+               _composer_resize_body_webview(ugd, rect->h);
+       }
+}
+
+static void _composer_webkit_clipboard_opened_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       EmailComposerUGD *ugd = (EmailComposerUGD *)data;
+       ugd->is_clipboard_opened = true;
 }
 
 static void _composer_webview_policy_navigation_decide_cb(void *data, Evas_Object *obj, void *event_info)
index 72bc24f..dfa3311 100755 (executable)
@@ -171,7 +171,7 @@ static Eina_Bool _composer_ps_start(void *data)
 
 void _composer_ps_stop(EmailComposerUGD *ugd)
 {
-       debug_log("Begin");
+       debug_enter();
 
        _composer_ps_del_timer(ugd);
 
@@ -228,7 +228,7 @@ void _composer_ps_stop(EmailComposerUGD *ugd)
 
        edje_object_signal_emit(_EDJ(ugd->c_layout), "back_content", "*");
 
-       debug_log("End");
+       debug_leave();
 }
 
 void _composer_ps_del_timer(EmailComposerUGD *ugd)
@@ -283,23 +283,23 @@ Eina_List *composer_ps_search_contact(EmailComposerUGD *ugd, const char *search_
        contacts_list_h list = NULL;
 
        ct_ret = email_get_contacts_list(CONTACTS_MATCH_CONTAINS, &list, search_word);
-       debug_log("email_get_contacts_record: list : %d", list);
+       debug_log("email_get_contacts_record:%d, list : %p", ct_ret, list);
 
        if (!list) {
                debug_log("list is NULL");
                contacts_list_destroy(list, true);
-               return contacts_list;
+               return NULL;
        }
 
        contacts_list_item = (EMAIL_CONTACT_LIST_INFO_S *)calloc(1, sizeof(EMAIL_CONTACT_LIST_INFO_S));
 
        if (contacts_list_item == NULL){
                debug_log("contacts_list_item is NULL");
-               return contacts_list;
+               return NULL;
        }
 
        ct_ret = email_get_contacts_list_info(list, contacts_list_item);
-       debug_log("email_get_contacts_list_info: contacts_list_item : %d", contacts_list_item);
+       debug_log("email_get_contacts_list_info:%d, contacts_list_item : %p", ct_ret, contacts_list_item);
 
        if (g_strcmp0(contacts_list_item->display_name, "\n") && contacts_list_item->email_address &&
                (strcasestr(contacts_list_item->display_name, search_word) || strcasestr(contacts_list_item->email_address, search_word))) {
@@ -384,7 +384,7 @@ Evas_Object *composer_ps_icon_get(void *data, Evas_Object *obj, const char *part
 
 void composer_ps_delete_contacts_list(Eina_List *predict_list)
 {
-       debug_log("Begin");
+       debug_enter();
 
        Eina_List *lt = NULL;
        Eina_List *l = predict_list;
@@ -401,7 +401,7 @@ void composer_ps_delete_contacts_list(Eina_List *predict_list)
                        contacts_list_item->image_path = NULL;
                }
        }
-       debug_log("End");
+       debug_leave();
 }
 
 void _composer_ps_create_sublist(void *data)
@@ -425,7 +425,7 @@ void _composer_ps_create_sublist(void *data)
 
        elm_genlist_clear(ugd->ps_list);
 
-       contacts_list_item = eina_list_data_get(ugd->contacts_list_info);
+//     contacts_list_item = eina_list_data_get(ugd->contacts_list_info);
        l = ugd->contacts_list_info;
        EINA_LIST_FOREACH(l, lt, contacts_list_item) {
                if (g_strcmp0(contacts_list_item->display_name, "\n") && strlen(contacts_list_item->display_name)) {
index b7aa0d4..4f00808 100755 (executable)
@@ -36,8 +36,8 @@
 #include "email-engine.h"
 #include "email-utils.h"
 
-#define DIV_TAG_START_ORIGIN_INFO "<div id=\"origin_info\">"
-#define DIV_TAG_START_ORIGIN_CONTENT "<div id=\"origin_content\">"
+#define DIV_TAG_START_ORIGIN_INFO "<div id=\"origin_info\"><p>"
+#define DIV_TAG_START_ORIGIN_CONTENT "<div id=\"origin_content\"><p>"
 #define DIV_TAG_END "</div>"
 
 #define DIVIDE_LEFT_LINE_FOR_HTML "<br><br><b>--------------- "
@@ -375,6 +375,11 @@ Eina_Bool email_composer_save_file(const gchar *path, const gchar *buf, gsize le
        return success_flag;
 }
 
+static void _composer_ug_script_executed(Evas_Object *o, const char *result, void *data)
+{
+       debug_log("");
+}
+
 Eina_List *email_composer_change_str_to_EinaList(EmailComposerUGD *ugd, const char *str, char *token)
 {
        debug_log("");
@@ -414,6 +419,22 @@ Eina_List *email_composer_change_str_to_EinaList(EmailComposerUGD *ugd, const ch
                                        } else
                                                list = eina_list_append(list, p);
                                }
+                       } else {
+                               debug_log("ecore_file_exists failed");
+                               if (g_str_has_prefix(p, "http://")) {
+                                       if (EINA_TRUE == ugd->has_body_html) {
+                                               if (ugd->selected_entry != ugd->body_ewkview) {
+                                                       if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_FOCUS, _composer_ug_script_executed, 0) == EINA_FALSE) {
+                                                               debug_log("COMPOSER_JS_SET_FOCUS is failed!");
+                                                       }
+                                                       debug_log("body_ewkview focussed");
+                                               }
+                                               if (ugd->body_ewkview) {
+                                                       ewk_view_command_execute(ugd->body_ewkview, "InsertText", p);
+                                                       ewk_view_command_execute(ugd->body_ewkview, "InsertText", "\n");
+                                               }
+                                       }
+                               }
                        }
 
                        p = strtok(NULL, token);
@@ -715,7 +736,7 @@ int _composer_make_mail(EmailComposerUGD *ugd, Eina_Bool b_save_to_draft)
                ugd->new_mail_info->mail_data->file_path_plain = COMPOSER_STRDUP(SAVE_URI);
        }
 
-       int nAttachmentObjListCount = eina_list_count(ugd->attachment_item_obj_list);
+       int nAttachmentObjListCount = eina_list_count(ugd->attachment_item_obj_list) + ugd->inline_cnt;
        debug_log("nAttachmentObjListCount : %d", nAttachmentObjListCount);
 
        if ((nAttachmentObjListCount > 0) || (ugd->inline_cnt > 0)) {
@@ -766,8 +787,6 @@ int _composer_make_mail(EmailComposerUGD *ugd, Eina_Bool b_save_to_draft)
 
                it = eina_list_iterator_new(ugd->attachment_inline_item_list);
 
-               ugd->new_mail_info->mail_data->attachment_count += ugd->inline_cnt;
-
                while (eina_iterator_next(it, (void **)&attachment_data)) {
                        if (attachment_data) {
                                if (attachment_data->save_status == 1) {
@@ -933,7 +952,7 @@ int _composer_send_mail(EmailComposerUGD *ugd)
 
                        if (ret < COMPOSER_ERROR_NONE) {
                                debug_log("error in _composer_add_mailbox_folder(%d)", ret);
-                               return COMPOSER_ERROR_SEND_FAIL;
+                               return ret;
                        }
 
                        int sync = EMAIL_DELETE_LOCAL_AND_SERVER;
@@ -961,7 +980,7 @@ int _composer_send_mail(EmailComposerUGD *ugd)
 
                if (ret < COMPOSER_ERROR_NONE) {
                        debug_log("error in _composer_add_mailbox_folder(%d)", ret);
-                       return COMPOSER_ERROR_SEND_FAIL;
+                       return ret;
                }
        }
 
@@ -1068,17 +1087,27 @@ void _composer_save_draft_mail(EmailComposerUGD * ugd)
                debug_log("Succeed in saving in Drafts");
                debug_log("Account id [%d] mailbox id [%d] mail id [%d]", ugd->account_info->account->account_id, ugd->mailbox_info->mailbox_id, ugd->nExistingMailID);
 
-               if (ugd->popup_list) {
-                       debug_log("popup count = %d", eina_list_count(ugd->popup_list));
-                       debug_log("composer_noti: %p", ugd->composer_noti);
+               if (ugd->save_drafts == 0) {
+                       if (ugd->popup_list) {
+                               debug_log("popup count = %d", eina_list_count(ugd->popup_list));
+                               debug_log("composer_noti: %p", ugd->composer_noti);
 
-                       ugd->popup_list = eina_list_remove(ugd->popup_list, ugd->composer_noti/*obj*/);
-               }
+                               ugd->popup_list = eina_list_remove(ugd->popup_list, ugd->composer_noti/*obj*/);
+                       }
 
-               evas_object_del(ugd->composer_noti);
-               ugd->composer_noti = NULL;
+                       evas_object_del(ugd->composer_noti);
+                       ugd->composer_noti = NULL;
+
+                       ugd->idler_save_draft = ecore_idler_add(_composer_show_success_to_save, ugd);
+               } else {
+                       char str[128] = { 0, };
+                       snprintf(str, sizeof(str), "%s", _("IDS_EMAIL_POP_SAVED_IN_DRAFTS"));
+                       ret = status_message_post(str);
+                       if (ret)
+                               debug_log("status_message_post failed: %d", ret);
 
-               ugd->idler_save_draft = ecore_idler_add(_composer_show_success_to_save, ugd);
+                       ug_destroy_me(ugd->ug_main);
+               }
        }
 }
 
@@ -1114,7 +1143,7 @@ void _composer_save_popup_response_cb(void *data, Evas_Object *obj, void *event_
        } else if (pszBtnText && strcmp(pszBtnText, dgettext("sys_string", "IDS_COM_SK_NO")) == 0) {
                ugd->idler_save_draft = ecore_idler_add(_composer_idler_destroy, ugd);
        } else if (pszBtnText && strcmp(pszBtnText, dgettext("sys_string", "IDS_COM_SK_CANCEL")) == 0) {
-               if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_ENABLE_EDITABLE, _composer_script_executed_cb, NULL) == EINA_FALSE)
+               if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_ENABLE_EDITABLE, _composer_focus_script_executed_cb, NULL) == EINA_FALSE)
                        debug_log("COMPOSER_JS_ENABLE_EDITABLE failed.");
                _composer_noti_response_cb(data, obj, event_info);
        }
@@ -1221,8 +1250,6 @@ void _composer_popup_end(EmailComposerUGD *ugd, int close_sg)
        } else {
                elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
                elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
-               elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
-               elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
 
                ugd->bSendBtnDisabled = false;
        }
@@ -1541,6 +1568,7 @@ Eina_Bool _composer_show_progress_popup(void *data)
                dgettext("sys_string", "IDS_COM_SK_CANCEL"), NULL, 0.0, _composer_dn_prog_popup_response_cb);
 
        ugd->dn_prog_popup = popup;
+       elm_object_focus_set(popup, EINA_TRUE);
 
        Evas_Object *label = elm_label_add(popup);
        elm_object_text_set(label, buf);
@@ -1595,8 +1623,6 @@ static void _composer_dn_prog_popup_response_cb(void *data, Evas_Object *obj, vo
                elm_object_tree_focus_allow_set(ugd->c_layout, EINA_TRUE); // block the focus not to open IME.
                elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
                elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
-               elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
-               elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
 
                _composer_cancel_download_attachment(ugd);
 
@@ -1706,7 +1732,6 @@ void _composer_update_attachment_info(EmailComposerUGD *ugd, int index)
                                debug_log("info->downloaded : %d", info->downloaded);
                                debug_log("info->attach_id : %d", info->attach_id);
                                if (info->index == index) {
-                                       char newpath[MAX_PATH_LEN] = { 0, };
                                        info->downloaded = true;
                                        path = email_engine_get_attachment_path(info->attach_id);
 
@@ -1717,6 +1742,7 @@ void _composer_update_attachment_info(EmailComposerUGD *ugd, int index)
 
                                        if (attachment_data && path && STR_VALID(path)) {
                                                int ret;
+                                               char newpath[MAX_PATH_LEN] = { 0, };
                                                debug_log("path[%s]", path);
                                                ret = email_attachments_save_file(path, newpath, NULL);
                                                if (ret == EMAIL_EXT_SAVE_ERR_NONE) {
@@ -1962,6 +1988,12 @@ Eina_Bool _composer_idler_destroy(void *data)
        debug_log("");
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
+       char str[128] = { 0, };
+       snprintf(str, sizeof(str), "%s", _("IDS_EMAIL_POP_MESSAGE_DELETED"));
+       int ret = status_message_post(str);
+       if (ret)
+               debug_log("status_message_post failed: %d", ret);
+
        elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
 
        if (ugd->idler_save_draft) {
@@ -2229,7 +2261,6 @@ void _composer_add_cc_address(EmailComposerUGD *ugd)
                                email_composer_create_cc_field(ugd);
                                edje_object_signal_emit(_EDJ(ugd->c_layout), "show.bcc", "*");
                                email_composer_create_bcc_field(ugd);
-                               elm_object_text_set(ugd->cc_btn, N_("Remove Cc/Bcc"));
                                ugd->b_cc_bcc = false;
                        }
 
@@ -2335,7 +2366,6 @@ void _composer_add_cc_address(EmailComposerUGD *ugd)
                        email_composer_create_cc_field(ugd);
                        edje_object_signal_emit(_EDJ(ugd->c_layout), "show.bcc", "*");
                        email_composer_create_bcc_field(ugd);
-                       elm_object_text_set(ugd->cc_btn, N_("Remove Cc/Bcc"));
                        ugd->b_cc_bcc = false;
                }
        }
@@ -2360,7 +2390,6 @@ void _composer_add_bcc_address(EmailComposerUGD *ugd)
                                email_composer_create_bcc_field(ugd);
                                edje_object_signal_emit(_EDJ(ugd->c_layout), "show.cc", "*");
                                email_composer_create_cc_field(ugd);
-                               elm_object_text_set(ugd->cc_btn, N_("Remove Cc/Bcc"));
                                ugd->b_cc_bcc = false;
                        }
 
@@ -2466,7 +2495,6 @@ void _composer_add_bcc_address(EmailComposerUGD *ugd)
                        email_composer_create_bcc_field(ugd);
                        edje_object_signal_emit(_EDJ(ugd->c_layout), "show.cc", "*");
                        email_composer_create_cc_field(ugd);
-                       elm_object_text_set(ugd->cc_btn, N_("Remove Cc/Bcc"));
                        ugd->b_cc_bcc = false;
                }
        }
@@ -2883,7 +2911,7 @@ void _composer_add_origin_msg(EmailComposerUGD *ugd)
 /* Creates symbolic links to all the inline images */
 void _composer_add_softlink_to_inline_images(EmailComposerUGD *ugd)
 {
-       debug_log("Begin");
+       debug_enter();
 
        int i = 0;
        char *inline_image_name = NULL;
@@ -2947,7 +2975,6 @@ void _composer_add_attachment(EmailComposerUGD *ugd)
                                        break;
 
                                EMAIL_ATTACHMENT_INFO_S *attachment_info = (EMAIL_ATTACHMENT_INFO_S *)calloc(1, sizeof(EMAIL_ATTACHMENT_INFO_S));
-                               email_attachment_data_t *attachment_data = (email_attachment_data_t *)calloc(1, sizeof(email_attachment_data_t));
 
                                if (attachment_info) {
                                        attachment_info->mail_id = ugd->nExistingMailID;
@@ -2970,27 +2997,17 @@ void _composer_add_attachment(EmailComposerUGD *ugd)
                                        debug_log("attachments drm (%d)", attachment_info->drm);
                                        debug_log("attachments inline? (%d)", attachment_info->inline_content);
 
-                                       ugd->fw_attachment_list = g_list_append(ugd->fw_attachment_list, attachment_info);
-
-                                       //email_attachment_data_t *attachment_data = (email_attachment_data_t *)calloc(1, sizeof(email_attachment_data_t));
+                                       nTotalAttachmentSize = nTotalAttachmentSize + attachment_info->size;
 
-                                       attachment_data->attachment_id = attachment_info->attach_id;
-                                       attachment_data->attachment_name = COMPOSER_STRDUP(attachment_info->name);
-                                       attachment_data->attachment_path = COMPOSER_STRDUP(attachment_info->path);
-                                       attachment_data->save_status = 0;
-                                       attachment_data->attachment_size = attachment_info->size;
-                                       nTotalAttachmentSize = nTotalAttachmentSize + attachment_data->attachment_size;
-                               }
-
-                               if (fwd_attachment_data_list[i].inline_content_status == EINA_FALSE)
-                                       /* No need to add Inline images. They are added in _composer_attachment_create_list API. Line no:160. */
-                               {
                                        debug_log("fwd_attachment_data_list[%d] = %x", i, &fwd_attachment_data_list[i]);
                                        debug_log("downloaded attachment = %s", fwd_attachment_data_list[i].attachment_path);
-                                       nTotalAttachmentSize = nTotalAttachmentSize + fwd_attachment_data_list[i].attachment_size;
 
-                                       if (nTotalAttachmentSize / 1024 > MAX_ATTACHMENT_SIZE) {
+                                       if (ugd->existing_mail_info->mail_data->file_path_html) {
+                                               nTotalAttachmentSize += (int)email_get_file_size(ugd->existing_mail_info->mail_data->file_path_html);
+                                               debug_log("Total attachments size (including original html body): %d byte", nTotalAttachmentSize);
+                                       }
 
+                                       if (nTotalAttachmentSize / 1024 > MAX_ATTACHMENT_SIZE) {
                                                char msg[MAX_STR_LEN] = { 0, };
                                                snprintf(msg, sizeof(msg), _("IDS_EMAIL_POP_UNABLE_TO_ATTACH_MAXIMUM_SIZE_OF_FILES_IS_PD_KB"), MAX_ATTACHMENT_SIZE);
 
@@ -3000,20 +3017,40 @@ void _composer_add_attachment(EmailComposerUGD *ugd)
                                                }
                                                ugd->composer_noti = _composer_create_noti(ugd, false, dgettext("sys_string", "IDS_COM_POP_WARNING"),
                                                        msg, 0, NULL, NULL, 2.0, _composer_noti_response_cb);
+
+                                               if (attachment_info->name) {
+                                                       free(attachment_info->name);
+                                                       attachment_info->name = NULL;
+                                               }
+
+                                               if (attachment_info->path) {
+                                                       free(attachment_info->path);
+                                                       attachment_info->path = NULL;
+                                               }
+
+                                               if (attachment_info) {
+                                                       free(attachment_info);
+                                                       attachment_info = NULL;
+                                               }
                                                break;
-                                       } else {
-                                               attachment_data->attachment_name = COMPOSER_STRDUP(fwd_attachment_data_list[i].attachment_name);
-                                               attachment_data->attachment_path = COMPOSER_STRDUP(fwd_attachment_data_list[i].attachment_path);
-                                               attachment_data->save_status = fwd_attachment_data_list[i].save_status;
-                                               attachment_data->attachment_size = fwd_attachment_data_list[i].attachment_size;
                                        }
-                                       _composer_attachment_create_list_box(ugd, attachment_data);
-                               }
-                       }
 
-                       if (ugd->existing_mail_info->mail_data->file_path_html) {
-                               nTotalAttachmentSize += (int)email_get_file_size(ugd->existing_mail_info->mail_data->file_path_html);
-                               debug_log("Total attachments size (including original html body): %d byte", nTotalAttachmentSize);
+                                       ugd->fw_attachment_list = g_list_append(ugd->fw_attachment_list, attachment_info);
+
+                                       if (attachment_info->inline_content == EINA_FALSE) {
+                                               email_attachment_data_t *attachment_data = (email_attachment_data_t *)calloc(1, sizeof(email_attachment_data_t));
+
+                                               attachment_data->attachment_id = attachment_info->attach_id;
+                                               attachment_data->attachment_name = COMPOSER_STRDUP(attachment_info->name);
+                                               attachment_data->attachment_path = COMPOSER_STRDUP(attachment_info->path);
+                                               attachment_data->save_status = attachment_info->downloaded;
+                                               attachment_data->attachment_size = attachment_info->size;
+                                               attachment_data->mail_id = attachment_info->mail_id;
+                                               attachment_data->inline_content_status = attachment_info->inline_content;
+
+                                               _composer_attachment_create_list_box(ugd, attachment_data);
+                                       }
+                               }
                        }
                }
        }
@@ -3337,6 +3374,53 @@ void _composer_change_text_to_textblock(char *input, char **output, char *matche
        *output = temp;
 }
 
+static void _composer_popup_waiting_response_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       if (!data) {
+               debug_log("data is NULL");
+               return;
+       }
+
+       EmailComposerUGD *ugd = (EmailComposerUGD *)data;
+
+       if (ugd->timeout_noti) {
+               evas_object_del(ugd->timeout_noti);
+               ugd->timeout_noti = NULL;
+       }
+}
+
+void _composer_create_waiting_popup(EmailComposerUGD *ugd, const char *title_text, const char *style)
+{
+       debug_enter();
+       if (title_text == NULL) {
+               debug_log("popup text is null");
+               return;
+       }
+
+       Evas_Object *popup = elm_popup_add(ugd->win_main);
+       evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_text_set(popup, "title,text", title_text);
+
+       Evas_Object *progress = elm_progressbar_add(popup);
+       elm_object_style_set(progress, style);
+       elm_progressbar_pulse_set(progress, EINA_TRUE);
+       elm_progressbar_pulse(progress, EINA_TRUE);
+       evas_object_show(progress);
+
+       elm_object_content_set(popup, progress);
+
+       Evas_Object *btn1 = elm_button_add(popup);
+       elm_object_style_set(btn1, "popup_button/default");
+       elm_object_text_set(btn1, dgettext("sys_string", "IDS_COM_SK_CANCEL"));
+       elm_object_part_content_set(popup, "button1", btn1);
+       evas_object_smart_callback_add(btn1, "clicked", _composer_popup_waiting_response_cb, ugd);
+
+       ugd->timeout_noti = popup;
+
+       evas_object_show(popup);
+}
+
 Evas_Object *_composer_create_noti_with_list(EmailComposerUGD *ugd, bool use_win, char *title, char *content,
                                                                                int btn_num, char *btn1_lb, char *btn2_lb,
                                                                                double timeout, void (*response_cb) (void *data, Evas_Object *obj, void *event_info))
@@ -3649,6 +3733,7 @@ void _composer_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
        evas_object_del(ugd->composer_popup);
        ugd->composer_popup = NULL;
        ugd->is_mbe_selected = false;
+       ugd->selected_mbe_item = NULL;
 }
 
 Eina_Bool _composer_check_popup_exist(EmailComposerUGD *ugd)
@@ -3747,6 +3832,9 @@ char *_composer_get_service_fail_type(int type)
        } else if (type == EMAIL_ERROR_FAILED_BY_SECURITY_POLICY) {
                ret = _("IDS_EMAIL_POP_DOWNLOADING_ATTACHMENTS_ON_THE_MOBILE_DEVICE_IS_NOT_ALLOWED_BY_EXCHANGE_SERVER_POLICY");
                return g_strdup(ret);
+       } else if (type == EMAIL_ERROR_ATTACHMENT_SIZE_EXCEED_POLICY_LIMIT) {
+               ret = _("IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB");
+               return g_strdup(ret);
        } else if (type == EMAIL_ERROR_NETWORK_NOT_AVAILABLE) {
                ret = N_("Network not available");
                return g_strdup(ret);
@@ -3777,6 +3865,11 @@ Eina_Bool _composer_mbe_set_focus(void *data)
        debug_log("selected_entry = %x, to_mbe_entry = %x, cc_mbe_entry = %x, bcc_mbe_entry = %x, subject_entry = %x, body_ewkview = %x",
                ugd->selected_entry, ugd->to_mbe_entry, ugd->cc_mbe_entry, ugd->bcc_mbe_entry, ugd->subject_entry, ugd->body_ewkview);
 
+       if (ugd->focus_status != COMPOSER_FOCUS_STATUS_NONE) {
+               ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
+       }
+       elm_object_tree_focus_allow_set(ugd->c_layout, EINA_TRUE); // block the focus not to open IME.
+
        if ((ugd->selected_entry == ugd->to_mbe_entry) || (ugd->selected_entry == NULL)) {
                debug_log("TO MBE ENTRY FOCUS!!!");
                elm_object_focus_set(ugd->to_mbe, EINA_TRUE);
@@ -3863,16 +3956,19 @@ void _composer_input_panel_resize_cb(void *data, Ecore_IMF_Context *ctx, int val
        int x, y, w, h;
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
-       ecore_imf_context_input_panel_geometry_get (ctx, &x, &y, &w, &h);
-       debug_log("imf = [x:%d, y:%d, w:%d, h:%d]", x, y, w, h);
+       debug_log("ugd->selected_entry : %x", ugd->selected_entry);
+       if (ugd->selected_entry != ugd->body_ewkview) {
+               ecore_imf_context_input_panel_geometry_get (ctx, &x, &y, &w, &h);
+               debug_log("imf = [x:%d, y:%d, w:%d, h:%d]", x, y, w, h);
 
-       if (ugd->isHorizontal == false) {
-               ugd->is_prediction = ((h - COMPOSER_IME_HEIGHT_V) == 0) ? EINA_FALSE : EINA_TRUE;
-       } else {
-               ugd->is_prediction = ((h - COMPOSER_IME_HEIGHT_H) == 0) ? EINA_FALSE : EINA_TRUE;
+               if (ugd->isHorizontal == false) {
+                       ugd->is_prediction = ((h - COMPOSER_IME_HEIGHT_V) == 0) ? EINA_FALSE : EINA_TRUE;
+               } else {
+                       ugd->is_prediction = ((h - COMPOSER_IME_HEIGHT_H) == 0) ? EINA_FALSE : EINA_TRUE;
+               }
+               _composer_resize_body_webview(ugd, h);
+               elm_layout_sizing_eval(ugd->c_layout);
        }
-       _composer_resize_body_webview(ugd, h);
-       elm_layout_sizing_eval(ugd->c_layout);
 }
 
 void _composer_input_panel_state_changed_cb(void *data, Ecore_IMF_Context *ctx, int value)
@@ -3881,7 +3977,7 @@ void _composer_input_panel_state_changed_cb(void *data, Ecore_IMF_Context *ctx,
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
-       debug_log("ugd->selected_entry : %d", ugd->selected_entry);
+       debug_log("ugd->selected_entry : %x", ugd->selected_entry);
 
        if (ugd->selected_entry != ugd->body_ewkview) {
                if (ctx) {
@@ -3894,22 +3990,19 @@ void _composer_input_panel_state_changed_cb(void *data, Ecore_IMF_Context *ctx,
                        switch (value) {
                        case ECORE_IMF_INPUT_PANEL_STATE_HIDE: /* :1 */
                                debug_log("Hide");
-                               elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,hidden", "");
-                               ugd->is_ime_hided = TRUE;
+                               elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,shown", "");
                                _composer_resize_body_webview(ugd, 0);
                                break;
 
                        case ECORE_IMF_INPUT_PANEL_STATE_SHOW: /* :0 */
                                debug_log("Show");
                                elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,shown", "");
-                               ugd->is_ime_hided = FALSE;
                                _composer_resize_body_webview(ugd, h);
                                break;
 
                        default: /* ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW :2 */
                                debug_log("Will show");
                                elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,shown", "");
-                               ugd->is_ime_hided = FALSE;
                                break;
                        }
                }
index 31bc1fa..2e3207c 100755 (executable)
@@ -258,7 +258,7 @@ static void on_start(ui_gadget_h ug, service_h data, void *priv)
                switch (ugd->eComposerErrorType) {
                        case COMPOSER_ERROR_STORAGE_FULL:
                                debug_log("Storage full error");
-                               _composer_popup_warning(ugd, dgettext("sys_string", "IDS_COM_POP_WARNING"), N_("Storage full"));
+                               _composer_popup_warning(ugd, dgettext("sys_string", "IDS_COM_POP_WARNING"), _("IDS_EMAIL_POP_DEVICE_STORAGE_FULL"));
                                elm_object_style_set(ugd->bg, "transparent");
                                break;
 
@@ -348,6 +348,7 @@ static void on_resume(ui_gadget_h ug, service_h data, void *priv)
 
        ugd->is_hided = FALSE;
        debug_log("*** is_hided: FALSE");
+       ugd->is_clipboard_opened = false;
 }
 
 static void on_destroy(ui_gadget_h ug, service_h data, void *priv)
@@ -466,7 +467,7 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void *
                        if (ugd->composer_type == RUN_COMPOSER_REPLY || ugd->composer_type == RUN_COMPOSER_REPLY_ALL)
                                snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_HEADER_REPLY_ABB"));
                        else if (ugd->composer_type == RUN_COMPOSER_FORWARD)
-                               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_OPT_FORWARD"));
+                               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_HEADER_FORWARD"));
                        else if (ugd->composer_type == RUN_COMPOSER_EDIT)
                                snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", "IDS_COM_HEADER_EDIT"));
                        else
@@ -474,8 +475,6 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void *
                        elm_object_item_text_set(ugd->navi_item, title_str);
                }
 
-               if (ugd->send_btm_btn)
-                       elm_object_text_set(ugd->send_btm_btn, dgettext("sys_string", "IDS_COM_SK_SEND_ABB"));
                if (ugd->send_btn)
                        elm_object_text_set(ugd->send_btn, dgettext("sys_string", "IDS_COM_SK_SEND_ABB"));
                if (ugd->subject_editfield)
@@ -507,7 +506,15 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void *
                return;
        }
 
-       _composer_resize_body_webview(ugd, 0);
+       if (ugd->is_clipboard_opened == true) {
+               if (ugd->isHorizontal == false) {
+                       _composer_resize_body_webview(ugd, COMPOSER_IME_HEIGHT_V);
+               } else {
+                       _composer_resize_body_webview(ugd, COMPOSER_IME_HEIGHT_H);
+               }
+       } else {
+               _composer_resize_body_webview(ugd, 0);
+       }
        elm_layout_sizing_eval(ugd->c_layout);
 
        debug_log("win_main_angle: %d, win_rotation: %d, device_orientation: %d, event: %d", win_main_angle, elm_win_rotation_get(ugd->win_main), app_get_device_orientation(), event);
@@ -632,7 +639,7 @@ static void _composer_remove_temp_folder()
 
        struct dirent *dir_entry = NULL;
        DIR *dir;
-       char buffer[256];
+       char buffer[256] = {0, };
 
        dir = opendir(EMAIL_TMP_FOLDER);
        if (!dir) {
@@ -724,15 +731,11 @@ void _composer_free_initial_email_content(EmailComposerUGD *ugd)
                g_free(ugd->saved_subject);
                ugd->saved_subject = NULL;
        }
-       if (ugd->attachment_inline_item_list) {
-               eina_list_free(ugd->attachment_inline_item_list);
-               ugd->attachment_inline_item_list = NULL;
-       }
 }
 
 void create_composer_frame(EmailComposerUGD *ugd)
 {
-       debug_log("Begin");
+       debug_enter();
 
        if (ugd->win_main == NULL) {
                debug_log("ugd->win_main == NULL");
@@ -771,21 +774,13 @@ void create_composer_frame(EmailComposerUGD *ugd)
        if (ugd->composer_type == RUN_COMPOSER_REPLY || ugd->composer_type == RUN_COMPOSER_REPLY_ALL)
                snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_HEADER_REPLY_ABB"));
        else if (ugd->composer_type == RUN_COMPOSER_FORWARD)
-               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_OPT_FORWARD"));
+               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_HEADER_FORWARD"));
        else if (ugd->composer_type == RUN_COMPOSER_EDIT)
                snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", "IDS_COM_HEADER_EDIT"));
        else
                snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_BODY_NEW_EMAIL"));
 
-       // Bottom Back Button
-       Evas_Object *cancel_btm_btn = NULL;
-       cancel_btm_btn = elm_button_add(ugd->navi_bar);
-       elm_object_style_set(cancel_btm_btn, "naviframe/end_btn/default");
-       evas_object_smart_callback_add(cancel_btm_btn, "clicked", _composer_back_button_cb, ugd);
-       ugd->cancel_btm_btn = cancel_btm_btn;
-       debug_log("cancel_btm_btn of composer: %p", ugd->cancel_btm_btn);
-
-       ugd->navi_item = elm_naviframe_item_push(ugd->navi_bar, title_str, cancel_btm_btn, NULL, outer_layout, NULL);
+       ugd->navi_item = elm_naviframe_item_push(ugd->navi_bar, title_str, NULL, NULL, outer_layout, NULL);
 
        // Right : cancel button
        cancel_btn = elm_button_add(ugd->navi_bar);
@@ -802,19 +797,6 @@ void create_composer_frame(EmailComposerUGD *ugd)
        elm_object_item_part_content_set(ugd->navi_item, "title_more_btn", more_btn);
        evas_object_smart_callback_add(more_btn, "clicked", _composer_more_toolbar_button_cb, ugd);
 
-       Evas_Object *more_btm_btn = elm_button_add(ugd->navi_bar);
-       elm_object_style_set(more_btm_btn, "naviframe/more/default");
-       elm_object_focus_allow_set(more_btm_btn, EINA_FALSE);
-       elm_object_item_part_content_set(ugd->navi_item, "toolbar_more_btn", more_btm_btn);
-       evas_object_smart_callback_add(more_btm_btn, "clicked", _composer_more_toolbar_button_cb, ugd);
-
-       Evas_Object *send_btm_btn = elm_button_add(ugd->navi_bar);
-       elm_object_style_set(send_btm_btn, "naviframe/toolbar/default");
-       elm_object_text_set(send_btm_btn, dgettext("sys_string", "IDS_COM_SK_SEND_ABB"));
-       elm_object_item_part_content_set(ugd->navi_item, "toolbar_button1", send_btm_btn);
-       evas_object_smart_callback_add(send_btm_btn, "clicked", _composer_cbar_send_clicked, ugd);
-       ugd->send_btm_btn = send_btm_btn;
-
        // Left : send button
        send_btn = elm_button_add(ugd->navi_bar);
        elm_object_style_set(send_btn, "naviframe/toolbar/default");
@@ -827,16 +809,15 @@ void create_composer_frame(EmailComposerUGD *ugd)
 
        if (_composer_check_recipient_is_empty(ugd)) {
                elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
-               elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                ugd->bSendBtnDisabled = true;
        }
 
-       debug_log("End");
+       debug_leave();
 }
 
 void _composer_create_view(Evas_Object *parent, EmailComposerUGD *ugd)
 {
-       debug_log("Begin");
+       debug_enter();
 
        g_ugd = ugd;
 
@@ -892,6 +873,7 @@ static void _composer_init_data(void *data)
        ugd->cc_recipients_cnt = 0;
        ugd->bcc_recipients_cnt = 0;
 
+       ugd->selected_mbe_item = NULL;
        ugd->to_mbe_initial_list = NULL;
        ugd->cc_mbe_initial_list = NULL;
        ugd->bcc_mbe_initial_list = NULL;
@@ -905,7 +887,7 @@ static void _composer_init_data(void *data)
        ugd->idler_show_progress = NULL;
        ugd->bSendBtnDisabled = false;
        ugd->is_hided = false;
-       ugd->is_ime_hided = TRUE;
+       ugd->is_clipboard_opened = false;
 
        ugd->composer_noti = NULL;
        ugd->timeout_noti = NULL;
@@ -924,7 +906,7 @@ static void _composer_init_data(void *data)
        ugd->ps_on = false;
        ugd->cc_added = false;
        ugd->bcc_added = false;
-       ugd->me_added = false;
+       ugd->b_launch_finished = false;
        ugd->isRotated = false;
        ugd->isHorizontal = false;
        ugd->is_recipient_duplicated = false;
@@ -1514,8 +1496,9 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data)
                        if (argv[3] != NULL && strlen(argv[3]) != 0) {
                                ugd->new_mail_info->mail_data->full_address_bcc = _composer_parse_recipients_arg(ugd, argv[3]);
                        }
-                       if (argv[4] != NULL && strlen(argv[4]) != 0)
+                       if (argv[4] != NULL && strlen(argv[4]) != 0) {
                                ugd->new_mail_info->mail_data->subject = g_strdup(argv[4]);
+                       }
                        if (argv[5] != NULL && strlen(argv[5]) != 0) {
                                ugd->new_mail_info->mail_data->file_path_plain = g_strdup(argv[5]);
                                ugd->new_mail_info->mail_data->body_download_status = 1;
@@ -1724,7 +1707,7 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data)
                                }
 
                                ugd->selected_entry = ugd->body_ewkview;
-                               if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_FOCUS, _composer_focus_script_executed_cb, ugd) == EINA_FALSE)
+                               if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_FOCUS, _composer_script_executed_cb, ugd) == EINA_FALSE)
                                        debug_log("COMPOSER_JS_SET_FOCUS error.");
                        }
                } else {
diff --git a/images/M02_email_icon_popup_date.png b/images/M02_email_icon_popup_date.png
deleted file mode 100755 (executable)
index 4e477ef..0000000
Binary files a/images/M02_email_icon_popup_date.png and /dev/null differ
diff --git a/images/M02_email_icon_popup_sender.png b/images/M02_email_icon_popup_sender.png
deleted file mode 100755 (executable)
index 34df142..0000000
Binary files a/images/M02_email_icon_popup_sender.png and /dev/null differ
diff --git a/images/M02_email_icon_popup_sender_press.png b/images/M02_email_icon_popup_sender_press.png
deleted file mode 100755 (executable)
index c921611..0000000
Binary files a/images/M02_email_icon_popup_sender_press.png and /dev/null differ
similarity index 80%
rename from images/M02_email_icon_popup_advanced_press.png
rename to images/M02_icon_attach.png
index 1f345f6..6967dcb 100755 (executable)
Binary files a/images/M02_email_icon_popup_advanced_press.png and b/images/M02_icon_attach.png differ
diff --git a/images/M02_icon_event.png b/images/M02_icon_event.png
new file mode 100755 (executable)
index 0000000..24cdfd4
Binary files /dev/null and b/images/M02_icon_event.png differ
diff --git a/images/M02_icon_favorite_test.png b/images/M02_icon_favorite_test.png
new file mode 100755 (executable)
index 0000000..690bd0b
Binary files /dev/null and b/images/M02_icon_favorite_test.png differ
diff --git a/images/M02_icon_favorite_test_off.png b/images/M02_icon_favorite_test_off.png
new file mode 100755 (executable)
index 0000000..4372c1b
Binary files /dev/null and b/images/M02_icon_favorite_test_off.png differ
diff --git a/images/M02_icon_flag.png b/images/M02_icon_flag.png
new file mode 100755 (executable)
index 0000000..54f4f77
Binary files /dev/null and b/images/M02_icon_flag.png differ
diff --git a/images/M02_icon_flag_clear.png b/images/M02_icon_flag_clear.png
new file mode 100755 (executable)
index 0000000..7b8bdbc
Binary files /dev/null and b/images/M02_icon_flag_clear.png differ
diff --git a/images/M02_icon_flag_complete.png b/images/M02_icon_flag_complete.png
new file mode 100755 (executable)
index 0000000..9ec92a5
Binary files /dev/null and b/images/M02_icon_flag_complete.png differ
diff --git a/images/M02_icon_sms.png b/images/M02_icon_sms.png
new file mode 100755 (executable)
index 0000000..ceaf254
Binary files /dev/null and b/images/M02_icon_sms.png differ
similarity index 89%
rename from images/M02_email_icon_popup_title_press.png
rename to images/M02_icon_title_inbox.png
index c307de8..46f4501 100755 (executable)
Binary files a/images/M02_email_icon_popup_title_press.png and b/images/M02_icon_title_inbox.png differ
similarity index 83%
rename from images/M02_email_icon_popup_all_press.png
rename to images/M02_icon_title_inbox_1.png
index 0de4137..3a267a3 100755 (executable)
Binary files a/images/M02_email_icon_popup_all_press.png and b/images/M02_icon_title_inbox_1.png differ
diff --git a/images/M02_icon_voice_mail.png b/images/M02_icon_voice_mail.png
new file mode 100755 (executable)
index 0000000..8e7cff7
Binary files /dev/null and b/images/M02_icon_voice_mail.png differ
diff --git a/images/M02_list_icon_all_accounts.png b/images/M02_list_icon_all_accounts.png
new file mode 100755 (executable)
index 0000000..e89de51
Binary files /dev/null and b/images/M02_list_icon_all_accounts.png differ
diff --git a/images/M02_list_icon_other.png b/images/M02_list_icon_other.png
new file mode 100755 (executable)
index 0000000..de270d8
Binary files /dev/null and b/images/M02_list_icon_other.png differ
diff --git a/images/M02_popup_icon_add_account.png b/images/M02_popup_icon_add_account.png
new file mode 100755 (executable)
index 0000000..53508a5
Binary files /dev/null and b/images/M02_popup_icon_add_account.png differ
diff --git a/images/M02_popup_icon_add_to_home.png b/images/M02_popup_icon_add_to_home.png
new file mode 100755 (executable)
index 0000000..4d9d27e
Binary files /dev/null and b/images/M02_popup_icon_add_to_home.png differ
similarity index 82%
rename from images/M02_email_icon_popup_advanced.png
rename to images/M02_popup_icon_advanced.png
index 85362cc..5049b23 100755 (executable)
Binary files a/images/M02_email_icon_popup_advanced.png and b/images/M02_popup_icon_advanced.png differ
diff --git a/images/M02_popup_icon_all.png b/images/M02_popup_icon_all.png
new file mode 100755 (executable)
index 0000000..20098ba
Binary files /dev/null and b/images/M02_popup_icon_all.png differ
diff --git a/images/M02_popup_icon_block.png b/images/M02_popup_icon_block.png
new file mode 100755 (executable)
index 0000000..e16341e
Binary files /dev/null and b/images/M02_popup_icon_block.png differ
similarity index 79%
rename from images/M02_email_icon_popup_date_press.png
rename to images/M02_popup_icon_date.png
index 7c883bf..91f308c 100755 (executable)
Binary files a/images/M02_email_icon_popup_date_press.png and b/images/M02_popup_icon_date.png differ
similarity index 84%
rename from images/M02_email_icon_popup_all.png
rename to images/M02_popup_icon_delete_all.png
index 929cd98..5836388 100755 (executable)
Binary files a/images/M02_email_icon_popup_all.png and b/images/M02_popup_icon_delete_all.png differ
diff --git a/images/M02_popup_icon_rename.png b/images/M02_popup_icon_rename.png
new file mode 100755 (executable)
index 0000000..c862720
Binary files /dev/null and b/images/M02_popup_icon_rename.png differ
diff --git a/images/M02_popup_icon_sort_by.png b/images/M02_popup_icon_sort_by.png
new file mode 100755 (executable)
index 0000000..e346abe
Binary files /dev/null and b/images/M02_popup_icon_sort_by.png differ
similarity index 91%
rename from images/M02_email_icon_popup_title.png
rename to images/M02_popup_icon_title.png
index 1415601..5787171 100755 (executable)
Binary files a/images/M02_email_icon_popup_title.png and b/images/M02_popup_icon_title.png differ
index 15f4d88..6e74e2c 100755 (executable)
@@ -6,6 +6,7 @@ SET(SRCS
        ./src/email-mailbox-controlbar.c
        ./src/email-mailbox-item.c
        ./src/email-mailbox-list.c
+       ./src/email-mailbox-move.c
        ./src/email-mailbox-noti-mgr.c
        ./src/email-mailbox-search.c
        ./src/email-mailbox-sweep.c
@@ -57,6 +58,6 @@ ADD_CUSTOM_TARGET(email-mailbox-theme.edj
 )
 ADD_DEPENDENCIES(${PROJECT_NAME} email-mailbox-theme.edj)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${UGDIR})
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
 INSTALL(FILES ${CMAKE_MAILBOX_BINARY_DIR}/email-mailbox-theme.edj DESTINATION ${EDJDIR})
 
index 137beca..332525a 100755 (executable)
@@ -20,5 +20,7 @@
 
 void _create_controlbar(EmailMailboxUGD *mailbox_ugd);
 void _delete_controlbar(EmailMailboxUGD *mailbox_ugd);
+void _hide_toolbar(EmailMailboxUGD *mailbox_ugd);
+void _show_toolbar(EmailMailboxUGD *mailbox_ugd);
 
 #endif /* __DEF_EMAIL_MAILBOX_CONTROL_BAR_H_ */
diff --git a/mailbox/include/email-mailbox-move.h b/mailbox/include/email-mailbox-move.h
new file mode 100755 (executable)
index 0000000..34c7007
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.tizenopensource.org/license
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __DEF_EMAIL_MAILBOX_MOVE_H_
+#define __DEF_EMAIL_MAILBOX_MOVE_H_
+
+//#include "email-mailbox.h"
+#include "email-mailbox-item.h"
+
+int create_mailbox_move_list_view(void *data, int account_id);
+void clear_mailbox_move_list_data(EmailMailboxUGD *mailbox_ugd);
+
+#endif /* __DEF_EMAIL_MAILBOX_MOVE_H_ */
index bf6d2f3..f0d33dc 100755 (executable)
@@ -65,9 +65,9 @@
 #define ICON_VIEWMODE IMGDIR"/M02_controlbar_icon_view_mode.png"
 #define ICON_MORE IMGDIR"/M02_controlbar_icon_more.png"
 #define ICON_EDIT IMGDIR"/M02_controlbar_icon_edit.png"
-#define ICON_CLOSE IMGDIR"/M02_email_icon_title_down.png"
-#define ICON_OPEN IMGDIR"/M02_email_icon_title_up.png"
-#define ICON_TITLE_ALL_ACC IMGDIR"/M02_email_list_icon_allaccount.png"
+#define ICON_CLOSE IMGDIR"/M02_icon_title_inbox_1.png"
+#define ICON_OPEN IMGDIR"/M02_icon_title_inbox.png"
+#define ICON_TITLE_ALL_ACC IMGDIR"/M02_list_icon_all_accounts.png"
 #define ICON_INDEX_CLOSE IMGDIR"/M02_email_icon_index_close.png"
 
 #define CK_UNCHECKED   0
@@ -203,6 +203,14 @@ typedef struct _email_movefolder_list {
        EmailMailboxUGD *mailbox_ugd;
 } email_movefolder_list;
 
+typedef struct _email_move_list {
+       int mailbox_cnt;
+       EmailMailboxUGD *mailbox_ugd;
+       email_account_t *account_info;
+       email_mailbox_t *mailbox_list;
+       GNode *folder_root;
+} email_move_list;
+
 typedef struct _MailboxAdvSearchViewInfo {
        Evas_Object *clicked_object;
        Evas_Object *entry_title;
@@ -260,6 +268,7 @@ struct ug_data {
        Evas_Object *sync_progress;
        Elm_Object_Item *delete_all_button;
        Evas_Object *ctxpopup;
+       Evas_Object *folder_ctxpopup;
        Evas_Object *passwd_popup;
        Evas_Object *password_entry;
        GList *important_list;
@@ -304,16 +313,22 @@ struct ug_data {
        gint mailbox_id;
        email_mailbox_type_e mailbox_type;
        gchar *folder_alias;
-       gchar *user_email;
+       gchar *account_name;
        gint initial_run;
        gint b_thread_list;
        gint main_w;
        gint main_h;
 
-       EmailSearchType search_type;
-       email_movefolder_list *move_folder_list;        /* revised, used to dealloc */
-       gint move_folder_cnt;                                           /* revised, used to dealloc */
+       email_move_list *move_list;
+       email_account_t *move_account_list;
+       int move_account_cnt;
+       int move_src_mailbox_id;
+       int b_duplicated_node;
+       char *traverse_compare;
+       email_mailbox_t *traverse_compare_mlist;
+       GNode *current_parent;
 
+       EmailSearchType search_type;
        MailboxAdvSearchViewInfo *adv_search_info;
        gboolean b_advanced_search_view;
        int emf_handle;
@@ -338,6 +353,9 @@ struct ug_data {
 
        Elm_Genlist_Item_Class itc1;
        Elm_Genlist_Item_Class itc2;
+       Elm_Genlist_Item_Class itc3;
+       Elm_Genlist_Item_Class itc4;
+       Elm_Genlist_Item_Class itc5;
 };
 
 
@@ -414,7 +432,7 @@ struct ug_data {
                        if(mbox) email_free_mailbox(&mbox, 1);\
                        i_getmore;\
                })
-
+void _main_back_clicked(void *data, Evas_Object *obj, void *event_info);
 void _update_navigationbar_title(EmailMailboxUGD *mailbox_ugd);
 ui_gadget_h create_composer_ug(char *ug_name, service_h service, void *data);
 ui_gadget_h create_setting_ug(char *ug_name, service_h service, void *data);
index 72e6c8b..a1e34e4 100755 (executable)
 
 static Elm_Genlist_Item_Class itc_popup;
 static Evas_Object *radio_grp;
-Elm_Object_Item *g_delete_button;
-Elm_Object_Item *g_move_button;
-Elm_Object_Item *g_block_button;
-Elm_Object_Item *g_markunread_button;
-
 
 typedef struct {
        int index;
@@ -48,7 +43,6 @@ static void _viewby_cb(void *data, Evas_Object *obj, void *event_info);
 static void _more_toolbar_clicked_cb(void *data, Evas_Object *obj, void *event_info);
 static void _delete_all_emails_cb(void *data, Evas_Object *obj, void *event_info);
 static void _delete_mail_cb(void *data, Evas_Object *obj, void *event_info);
-static void _block_mail_cb(void *data, Evas_Object *obj, void *event_info);
 static void _markunread_mail_cb(void *data, Evas_Object *obj, void *event_info);
 static void _markread_mail_cb(void *data, Evas_Object *obj, void *event_info);
 static void _compose_toolbar_clicked_cb(void *data, Evas_Object *obj, void *event_info);
@@ -57,6 +51,7 @@ static void _radio_cb(void *data, Evas_Object *obj, void *event_info);
 static void _move_ctxpopup(Evas_Object *ctxpopup, Evas_Object *win);
 static void _move_mail_cb(void *data, Evas_Object *obj, void *event_info);
 static void _add_account_cb(void *data, Evas_Object *obj, void *event_info);
+static void _search_button_clicked_cb(void *data, Evas_Object *obj, void *event_info);
 
 static Evas_Object *_create_toolbar_more_btn(Evas_Object *parent, Evas_Smart_Cb func, void *data);
 static Evas_Object *_create_toolbar_btn(Evas_Object *parent, const char *text, Evas_Smart_Cb func, void *data);
@@ -66,113 +61,6 @@ static void _block_clicked_cb(void *data, Evas_Object *obj, void *event_info)
        evas_object_del(obj);
 }
 
-static void _block_mail_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-
-       if (data == NULL) {
-               debug_log("data == NULL");
-               return;
-       }
-
-       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
-       int i = 0, block_count = 0;
-       int e = 0;
-
-       Eina_List *list = edit_list;
-       int checked_count = eina_list_count(list);
-
-       if (mailbox_ugd->ctxpopup) {
-               evas_object_del(mailbox_ugd->ctxpopup);
-               mailbox_ugd->ctxpopup = NULL;
-       }
-
-       if (checked_count <= 0) return;
-
-       for (i = 0; i < checked_count; i++) {
-               Eina_List *nth_list = eina_list_nth_list(list, i);
-
-               list_data *ld = eina_list_data_get(nth_list);
-               email_rule_t *rule = NULL;
-
-               rule = MEM_ALLOC(rule, 1);
-               if(!rule) continue;
-
-               rule->account_id = mailbox_ugd->account_id;
-               rule->type = EMAIL_FILTER_FROM;
-
-               if (g_strcmp0(ld->sender, _("IDS_EMAIL_POP_NO_SENDER")) == 0) {
-                       FREE(rule);
-                       continue;
-               } else {
-                       rule->value = g_strdup(ld->sender);
-               }
-               rule->faction = EMAIL_FILTER_BLOCK;
-               rule->target_mailbox_id = GET_MAILBOX_ID(ld->account_id, EMAIL_MAILBOX_TYPE_SPAMBOX);
-               rule->flag1 = 1;
-               rule->flag2 = RULE_TYPE_INCLUDES;
-
-               if (email_add_rule(rule) < 0)
-                       debug_log("email_add_rule failed");
-
-               FREE(rule->value);
-               FREE(rule);
-               block_count++;
-       }
-
-#if 0
-       /* Create popup */
-       if (block_count > 0) {
-               debug_log("mail block popup");
-               Evas_Object *popup = elm_popup_add(mailbox_ugd->win_main);
-               elm_object_text_set(popup, _("IDS_EMAIL_POP_BLOCKED"));
-               //elm_popup_buttons_add(popup, 1, dgettext("sys_string", "IDS_COM_SK_OK"), ELM_POPUP_RESPONSE_OK, NULL);
-               Evas_Object *btn1 = elm_button_add(popup);
-               elm_object_text_set(btn1, dgettext("sys_string", "IDS_COM_SK_OK"));
-               elm_object_part_content_set(popup, "button1", btn1);
-               //evas_object_smart_callback_add(popup, "response", _response_cb, mailbox_ugd);
-               evas_object_smart_callback_add(btn1, "clicked", _response_cb, popup);
-               evas_object_smart_callback_add(popup, "block,clicked", _block_clicked_cb, NULL);
-               evas_object_show(popup);
-       }
-#else
-       if (block_count > 0) {
-               e = status_message_post(_("IDS_EMAIL_POP_BLOCKED"));
-
-               if (e) {
-                       debug_log("fail to status_message_post() : %d\n", e);
-               }
-       }
-#endif
-
-       mailbox_ugd->view_type = mailbox_ugd->previous_view;
-
-       edit_list = eina_list_free(edit_list);
-
-       //evas_object_smart_callback_add(mailbox_ugd->searchbar_en, "focused", _searchbar_entry_focus_cb, mailbox_ugd);
-       //evas_object_smart_callback_add(mailbox_ugd->searchbar_en, "unfocused", _searchbar_entry_unfocus_cb, mailbox_ugd);
-
-       elm_genlist_decorate_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_FALSE);
-       elm_genlist_reorder_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_FALSE);
-       elm_genlist_select_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], ELM_OBJECT_SELECT_MODE_DEFAULT);
-       b_editmode = false;
-       elm_object_disabled_set(mailbox_ugd->folder_button, EINA_FALSE);
-       _update_navigationbar_title(mailbox_ugd);
-
-       if (mailbox_ugd->isRotate == true) {
-               email_rotate_landscape(mailbox_ugd);
-               /*
-               if (mailbox_ugd->current_rotmode == APP_DEVICE_ORIENTATION_270)
-                       on_event(NULL, UG_EVENT_ROTATE_LANDSCAPE, NULL, mailbox_ugd);
-               else
-                       on_event(NULL, UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN, NULL, mailbox_ugd);
-               */
-       } else {
-               elm_object_part_content_set(mailbox_ugd->search_layout, "searchbar", mailbox_ugd->searchbar_layout);
-               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_searchbar", "search");
-       }
-}
-
 static void _markunread_mail_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
@@ -235,11 +123,7 @@ static void _markunread_mail_cb(void *data, Evas_Object *obj, void *event_info)
                else
                        on_event(NULL, UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN, NULL, mailbox_ugd);
                */
-       } else {
-               elm_object_part_content_set(mailbox_ugd->search_layout, "searchbar", mailbox_ugd->searchbar_layout);
-               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_searchbar", "search");
        }
-
        _refresh_mailbox(mailbox_ugd);
 
 }
@@ -306,9 +190,6 @@ static void _markread_mail_cb(void *data, Evas_Object *obj, void *event_info)
                else
                        on_event(NULL, UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN, NULL, mailbox_ugd);
                */
-       } else {
-               elm_object_part_content_set(mailbox_ugd->search_layout, "searchbar", mailbox_ugd->searchbar_layout);
-               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_searchbar", "search");
        }
 
        _refresh_mailbox(mailbox_ugd);
@@ -418,10 +299,15 @@ static void _more_toolbar_clicked_cb(void *data, Evas_Object *obj, void *event_i
 {
        debug_log("");
        EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+       Evas_Object* icon;
 
        mailbox_ugd->ctxpopup = elm_ctxpopup_add(mailbox_ugd->navi_bar);
        evas_object_smart_callback_add(mailbox_ugd->ctxpopup, "dismissed", _dismissed_cb, mailbox_ugd);
 
+       icon = elm_icon_add(mailbox_ugd->ctxpopup);
+       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_sort_by.png", NULL);
+       elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_SK_SORT_BY"), icon, _viewby_cb, mailbox_ugd);
+
        if (mailbox_ugd->view_type == EMAIL_VIEW_EDIT) {
                int i = 0;
                bool read_mail_exist = false;
@@ -438,19 +324,29 @@ static void _more_toolbar_clicked_cb(void *data, Evas_Object *obj, void *event_i
                                read_mail_exist = true;
                }
 
-               if (read_mail_exist)
-                       elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_OPT_MARK_AS_UNREAD"), NULL, _markunread_mail_cb, mailbox_ugd);
-               else
-                       elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_OPT_MARK_AS_READ"), NULL, _markread_mail_cb, mailbox_ugd);
-
-               elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_SK_BLOCK"), NULL, _block_mail_cb, mailbox_ugd);
+               if (read_mail_exist) {
+                       icon = elm_icon_add(mailbox_ugd->ctxpopup);
+                       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_mark_as_unread.png", NULL);
+                       elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_OPT_MARK_AS_UNREAD"), icon, _markunread_mail_cb, mailbox_ugd);
+               } else {
+                       icon = elm_icon_add(mailbox_ugd->ctxpopup);
+                       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_mark_as_unread.png", NULL);
+                       elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_OPT_MARK_AS_READ"), icon, _markread_mail_cb, mailbox_ugd);
+               }
 
-               if (mailbox_ugd->isRotate)
-                       elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, dgettext("sys_string", "IDS_COM_BODY_MOVE"), NULL, _move_mail_cb, mailbox_ugd);
+               if (mailbox_ugd->isRotate) {
+                       icon = elm_icon_add(mailbox_ugd->ctxpopup);
+                       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_move.png", NULL);
+                       elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, dgettext("sys_string", "IDS_COM_BODY_MOVE"), icon, _move_mail_cb, mailbox_ugd);
+               }
        } else {
+               icon = elm_icon_add(mailbox_ugd->ctxpopup);
+               elm_image_file_set(icon, IMGDIR "/M02_popup_icon_delete_all.png", NULL);
+               elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_OPT_DELETE_ALL"), icon, _delete_all_emails_cb, mailbox_ugd);
 
-               elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_OPT_DELETE_ALL"), NULL, _delete_all_emails_cb, mailbox_ugd);
-               elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_HEADER_ADD_ACCOUNT"), NULL, _add_account_cb, mailbox_ugd);
+               icon = elm_icon_add(mailbox_ugd->ctxpopup);
+               elm_image_file_set(icon, IMGDIR "/M02_popup_icon_add_account.png", NULL);
+               elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_HEADER_ADD_ACCOUNT"), icon, _add_account_cb, mailbox_ugd);
        }
 
        _move_ctxpopup(mailbox_ugd->ctxpopup, obj);
@@ -630,7 +526,6 @@ static void _viewby_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
        EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
-       Elm_Object_Item *item;
        Evas_Object *genlist;
 
        if (mailbox_ugd->ctxpopup) {
@@ -673,11 +568,11 @@ static void _viewby_cb(void *data, Evas_Object *obj, void *event_info)
                        case VIEWBY_SENDER_ZTOA:
                        case VIEWBY_UNREAD:
                        case VIEWBY_ATTACHMENT:
-                               item = elm_genlist_item_append(genlist, &itc_popup, &viewby_req[index], NULL,
+                               elm_genlist_item_append(genlist, &itc_popup, &viewby_req[index], NULL,
                                                ELM_GENLIST_ITEM_NONE, _gl_viewby_popup_sel, NULL);
                                break;
                        case VIEWBY_IMPORTANT:
-                               item = elm_genlist_item_append(genlist, &itc_popup, &viewby_req[index], NULL,
+                               elm_genlist_item_append(genlist, &itc_popup, &viewby_req[index], NULL,
                                                ELM_GENLIST_ITEM_NONE, _gl_viewby_popup_sel, NULL);
                                break;
                        case VIEWBY_UNKNOWN:
@@ -691,7 +586,7 @@ static void _viewby_cb(void *data, Evas_Object *obj, void *event_info)
        if (index > 4)
                index = 4;
        Evas_Object *box = elm_box_add(mailbox_ugd->viewby_popup);
-       evas_object_size_hint_min_set(box, 610 * elm_scale_get(), 113 * index * elm_scale_get());
+       evas_object_size_hint_min_set(box, 610 * elm_config_scale_get(), 113 * index * elm_config_scale_get());
        evas_object_show(genlist);
        elm_box_pack_end(box, genlist);
        elm_object_content_set(mailbox_ugd->viewby_popup, box);
@@ -844,7 +739,7 @@ static Evas_Object *create_control_option(EmailMailboxUGD *mailbox_ugd)
        elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "toolbar_button1", btn1);
        mailbox_ugd->controlbar_lbtn = btn1;
 
-       btn2 = _create_toolbar_btn(mailbox_ugd->navi_bar, _("IDS_EMAIL_SK_SORT_BY"), _viewby_cb, mailbox_ugd);
+       btn2 = _create_toolbar_btn(mailbox_ugd->navi_bar, dgettext("sys_string", "IDS_COM_SK_SEARCH"), _search_button_clicked_cb, mailbox_ugd);
        elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "toolbar_button2", btn2);
        mailbox_ugd->controlbar_rbtn = btn2;
 
@@ -937,7 +832,72 @@ static void _move_mail_cb(void *data, Evas_Object *obj, void *event_info)
        _delete_selection_info(mailbox_ugd);
        mailbox_process_move_mail(mailbox_ugd);
 }
+static void _search_button_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+
+       if (data == NULL) {
+               debug_log("data == NULL");
+               return;
+       }
+       EmailMailboxUGD* mailbox_ugd = (EmailMailboxUGD *)data;
+
+       if (evas_object_visible_get(mailbox_ugd->navi_title_ly)) {
+               debug_log("title is visible, hide title");
+               elm_object_item_part_content_unset(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "title");
+               evas_object_hide(mailbox_ugd->navi_title_ly);
+       }
+
+       if(!evas_object_visible_get(mailbox_ugd->searchbar_layout)) {
+               debug_log("search_bar is not visible, show search bar");
+               elm_object_part_content_set(mailbox_ugd->search_layout, "searchbar", mailbox_ugd->searchbar_layout);
+               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_searchbar", "search");
+               elm_object_focus_set(mailbox_ugd->searchbar_area, EINA_TRUE);
+       }
+
+}
+void _hide_toolbar(EmailMailboxUGD *mailbox_ugd)
+{
+       debug_log("");
 
+       if(mailbox_ugd->main_back_btn) {
+               evas_object_del(mailbox_ugd->main_back_btn);
+               mailbox_ugd->main_back_btn = NULL;
+       }
 
+       elm_object_item_part_content_unset(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "prev_btn");
 
+       if(mailbox_ugd->controlbar_lbtn) {
+               evas_object_del(mailbox_ugd->controlbar_lbtn);
+               mailbox_ugd->controlbar_lbtn = NULL;
+               elm_object_item_part_content_unset(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "toolbar_button1");
+       }
+       if(mailbox_ugd->controlbar_rbtn) {
+               evas_object_del(mailbox_ugd->controlbar_rbtn);
+               mailbox_ugd->controlbar_rbtn = NULL;
+               elm_object_item_part_content_unset(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "toolbar_more_btn");
+       }
+       if(mailbox_ugd->controlbar_more_btn) {
+               evas_object_del(mailbox_ugd->controlbar_more_btn);
+               mailbox_ugd->controlbar_more_btn = NULL;
+               elm_object_item_part_content_unset(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "toolbar_button2");
+       }
+       elm_object_item_signal_emit(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "elm,state,toolbar,close", "");
+}
 
+void _show_toolbar(EmailMailboxUGD *mailbox_ugd)
+{
+       debug_log("");
+
+       if(!mailbox_ugd->main_back_btn) {
+               Evas_Object *btn = elm_button_add(mailbox_ugd->navi_bar);
+               elm_object_style_set(btn, "naviframe/end_btn/default");
+               evas_object_smart_callback_add(btn, "clicked", _main_back_clicked, mailbox_ugd);
+               mailbox_ugd->main_back_btn = btn;
+       }
+       elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "prev_btn", mailbox_ugd->main_back_btn);
+
+       _create_controlbar(mailbox_ugd);
+
+       elm_object_item_signal_emit(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "elm,state,toolbar,open", "");
+}
index 0f96a24..97fa363 100755 (executable)
 #include "email-mailbox.h"
 #include "email-mailbox-item.h"
 #include "email-mailbox-list.h"
+#include "email-mailbox-move.h"
 
 
 gboolean _g_move_lock = false;
 gboolean _g_move_cancel_lock = false;
-static Elm_Genlist_Item_Class itc_mailbox;
 
 extern Eina_List *edit_list;
 extern gboolean b_editmode;
 extern gboolean list_lock;
 
-
-static Eina_Bool _create_mailbox_list_view(void *data);
-static void _mailbox_list_item_clicked(void *data, Evas_Object *obj, void *event_info);
-static void _mailbox_list_move_cancel_cb(void *data, Evas_Object *obj, void *event_info);
-static char *_gl_mailbox_list_text_get(void *data, Evas_Object *obj, const char *part);
-static Evas_Object *_gl_mailbox_list_content_get(void *data, Evas_Object *obj, const char *source);
-Eina_Bool _gl_mailbox_list_state_get(void *data, Evas_Object *obj, const char *part);
-static void _gl_mailbox_list_del(void *data, Evas_Object *obj);
-
-
-static Eina_Bool _create_mailbox_list_view(void *data)
-{
-       debug_log("");
-       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
-
-       Evas_Object *genlist = elm_genlist_add(mailbox_ugd->navi_bar);
-       Evas_Object *btn = elm_button_add(mailbox_ugd->navi_bar);
-       elm_object_style_set(btn, "naviframe/end_btn/default");
-       evas_object_smart_callback_add(btn, "clicked", _mailbox_list_move_cancel_cb, mailbox_ugd);
-       /*Elm_Object_Item *navibar_item = */elm_naviframe_item_push(mailbox_ugd->navi_bar, dgettext("sys_string", "IDS_COM_BODY_MOVE"), btn, NULL, genlist, NULL);
-       email_mailbox_t *mailbox_list = NULL;
-       int mailbox_count = 0;
-       int i = 0;
-
-       email_get_mailbox_list(mailbox_ugd->account_id, -1, &mailbox_list, &mailbox_count);
-
-       itc_mailbox.item_style = "1text.1icon.2";
-       itc_mailbox.func.text_get = _gl_mailbox_list_text_get;
-       itc_mailbox.func.content_get = _gl_mailbox_list_content_get;
-       itc_mailbox.func.state_get = _gl_mailbox_list_state_get;
-       itc_mailbox.func.del = _gl_mailbox_list_del;
-
-       email_movefolder_list *move_folder = (email_movefolder_list *) calloc(mailbox_count, sizeof(email_movefolder_list));
-
-       for (i = 0; i < mailbox_count; ++i) {
-               if (mailbox_list[i].mailbox_id != mailbox_ugd->mailbox_id &&
-                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_OUTBOX &&
-                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_SENTBOX &&
-                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_DRAFT &&
-                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_TRASH &&
-                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_ALL_EMAILS &&
-                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_SEARCH_RESULT) {
-                       debug_log("mailbox_name: [%s], mailbox_alias: [%s] ", mailbox_list[i].mailbox_name, mailbox_list[i].alias);
-
-                       if (g_strcmp0(mailbox_list[i].alias, "[Gmail]") && !mailbox_list[i].no_select) {
-                               move_folder[i].mailbox_list = &mailbox_list[i];
-                               move_folder[i].mailbox_ugd = mailbox_ugd;
-                               elm_genlist_item_append(genlist, &itc_mailbox, &move_folder[i], NULL, ELM_GENLIST_ITEM_NONE, _mailbox_list_item_clicked, NULL);
-                       } else {
-                               move_folder[i].mailbox_list = &mailbox_list[i];
-                               move_folder[i].mailbox_ugd = mailbox_ugd;
-                               Elm_Object_Item *item = elm_genlist_item_append(genlist, &itc_mailbox, &move_folder[i], NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-                               elm_object_item_disabled_set(item, EINA_TRUE);
-                       }
-
-               } else {
-                       move_folder[i].mailbox_list = &mailbox_list[i];
-                       move_folder[i].mailbox_ugd = mailbox_ugd;
-                       Elm_Object_Item *item = elm_genlist_item_append(genlist, &itc_mailbox, &move_folder[i], NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-                       elm_object_item_disabled_set(item, EINA_TRUE);
-               }
-       }
-       mailbox_ugd->move_folder_list = move_folder;
-       mailbox_ugd->move_folder_cnt = mailbox_count;
-
-       return 0;
-}
-
-static void _mailbox_list_item_clicked(void *data, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-       const Elm_Object_Item *it = (Elm_Object_Item *)event_info;
-       const void *item_data = elm_object_item_data_get(it);
-       email_movefolder_list *move_folder = (email_movefolder_list *) item_data;
-       EmailMailboxUGD *mailbox_ugd = move_folder->mailbox_ugd;
-       int post_rt = 0;
-
-       int count = g_list_length(mailbox_ugd->selected_list);
-       int mail_ids[count];
-       memset(mail_ids, 0, sizeof(mail_ids));
-       int i=0;
-       GList* cur = g_list_first(mailbox_ugd->selected_list);
-       for( ; i < count ; i++, cur=g_list_next(cur)) {
-               mail_ids[i] = (int) g_list_nth_data(cur, 0);
-               debug_log("mail_id (%d)", mail_ids[i]);
-       }
-
-       int e = email_move_mail_to_mailbox(mail_ids, count,move_folder->mailbox_list->mailbox_id);
-       if (e != EMAIL_ERROR_NONE) {
-               debug_warning("email_move_mail_to_mailbox acct(%d) mailbox_id(%d) num(%d) - err (%d)",
-                                                       mailbox_ugd->account_id, move_folder->mailbox_list->mailbox_id, count, e);
-       }
-
-       if (e == EMAIL_ERROR_NONE && count >0) {
-               post_rt = status_message_post(dgettext("sys_string", "IDS_COM_POP_MOVED"));
-               if (post_rt) {
-                       debug_log("fail to status_message_post() : %d\n", e);
-               }
-       }
-
-       g_list_free(mailbox_ugd->selected_list);
-       mailbox_ugd->selected_list = NULL;
-       email_free_mailbox(&(mailbox_ugd->move_folder_list->mailbox_list), mailbox_ugd->move_folder_cnt);
-       FREE(mailbox_ugd->move_folder_list);
-
-       elm_naviframe_item_pop(mailbox_ugd->navi_bar);
-
-       if(mailbox_ugd->view_type == EMAIL_VIEW_EDIT)
-       {
-               mailbox_ugd->view_type = mailbox_ugd->previous_view;
-
-               edit_list = eina_list_free(edit_list);
-               //evas_object_smart_callback_add(mailbox_ugd->searchbar_en, "focused", _searchbar_entry_focus_cb, mailbox_ugd);
-               //evas_object_smart_callback_add(mailbox_ugd->searchbar_en, "unfocused", _searchbar_entry_unfocus_cb, mailbox_ugd);
-
-               elm_genlist_decorate_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_FALSE);
-               elm_genlist_reorder_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_FALSE);
-               elm_genlist_select_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], ELM_OBJECT_SELECT_MODE_DEFAULT);
-
-               b_editmode = false;
-               elm_object_disabled_set(mailbox_ugd->folder_button, EINA_FALSE);
-               _update_navigationbar_title(mailbox_ugd);
-
-               if (mailbox_ugd->isRotate == true) {
-                       email_rotate_landscape(mailbox_ugd);
-                       /*
-                       if (mailbox_ugd->current_rotmode == APP_DEVICE_ORIENTATION_270)
-                               on_event(NULL, UG_EVENT_ROTATE_LANDSCAPE, NULL, mailbox_ugd);
-                       else
-                               on_event(NULL, UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN, NULL, mailbox_ugd);
-                       */
-               } else {
-                       elm_object_part_content_set(mailbox_ugd->search_layout, "searchbar", mailbox_ugd->searchbar_layout);
-                       edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_searchbar", "search");
-               }
-       }
-
-       if (_g_move_lock) {
-               _g_move_lock = false;
-       }
-
-}
-
-static void _mailbox_list_move_cancel_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
-
-       if (_g_move_cancel_lock)
-               return;
-       else
-               _g_move_cancel_lock = true;
-
-       _stop_emf_job(mailbox_ugd, mailbox_ugd->emf_handle, true);
-       elm_naviframe_item_pop(mailbox_ugd->navi_bar);
-
-       if(mailbox_ugd->selected_list) {
-               g_list_free(mailbox_ugd->selected_list);
-               mailbox_ugd->selected_list = NULL;
-       }
-       email_free_mailbox(&(mailbox_ugd->move_folder_list->mailbox_list), mailbox_ugd->move_folder_cnt);
-       FREE(mailbox_ugd->move_folder_list);
-
-       if (_g_move_lock) {
-               _g_move_lock = false;
-       }
-}
-
-static char *_gl_mailbox_list_text_get(void *data, Evas_Object *obj, const char *part)
-{
-       email_movefolder_list *move_folder = (email_movefolder_list *) data;
-
-       if (!g_strcmp0(part, "elm.text")) {
-               if (move_folder->mailbox_list->alias != NULL)
-                       return g_strdup(move_folder->mailbox_list->alias);
-       }
-
-       return NULL;
-}
-
-static Evas_Object *_gl_mailbox_list_content_get(void *data, Evas_Object *obj, const char *source)
-{
-       if (data == NULL) {
-               debug_log("data == NULL");
-               return NULL;
-       }
-
-       if (!g_strcmp0(source, "elm.icon")) {
-               char folder_icon_path[1024] = { 0, };
-               Evas_Object *ic = elm_icon_add(obj);
-               snprintf(folder_icon_path, sizeof(folder_icon_path), IMGDIR "/U01_icon_folder.png");
-               elm_image_file_set(ic, folder_icon_path, NULL);
-               elm_image_resizable_set(ic, 0, 0);
-               evas_object_image_smooth_scale_set(ic, 0);
-               evas_object_show(ic);
-
-               return ic;
-       }
-
-       return NULL;
-}
-
-Eina_Bool _gl_mailbox_list_state_get(void *data, Evas_Object *obj, const char *part)
-{
-       return EINA_FALSE;
-}
-
-static void _gl_mailbox_list_del(void *data, Evas_Object *obj)
-{
-       return;
-}
-
 void mailbox_process_move_mail(EmailMailboxUGD *mailbox_ugd)
 {
        debug_log("");
@@ -251,6 +39,7 @@ void mailbox_process_move_mail(EmailMailboxUGD *mailbox_ugd)
 
        Eina_List *list = edit_list;
        int checked_count = eina_list_count(list);
+       int account_id = 0;
        debug_log("checked_count: [%d]", checked_count);
        if (checked_count<= 0)  return;
 
@@ -260,14 +49,31 @@ void mailbox_process_move_mail(EmailMailboxUGD *mailbox_ugd)
                Eina_List *nth_list = eina_list_nth_list(list, i);
                list_data *ld = eina_list_data_get(nth_list);
 
-               /* save the mail-id to be moved */
-               debug_log("not Thread... previous_view[%d]", mailbox_ugd->previous_view);
-               int mail_id = ld->mail_id;
-               mailbox_ugd->selected_list = g_list_prepend(mailbox_ugd->selected_list, GINT_TO_POINTER(mail_id));
+               if(account_id < 1) {
+                       account_id = ld->account_id;
+                       mailbox_ugd->move_src_mailbox_id = ld->mailbox_id;
+               }
+
+               debug_log("Thread... previous_view[%d]", mailbox_ugd->previous_view);
+               /* Get thread mail list */
+               email_mail_list_item_t *mailbox_data = NULL;
+               int mail_list = 0;
+               int err = email_get_mail_list(ld->account_id, 0, ld->thread_id,
+                                                       -1, /* start_index */
+                                                       -1, /* limit_count */
+                                                       _mailbox_conv_sort_type(mailbox_ugd->sort_type), &mailbox_data, &mail_list);
+               if( err != EMAIL_ERROR_NONE ) {
+                       debug_warning("email_get_mail_list_ex - err(%d)", err);
+               }
+               int k = 0;
+               for( ; k<mail_list ; k++ )
+                       mailbox_ugd->selected_list = g_list_prepend(mailbox_ugd->selected_list,
+                                                                                                       GINT_TO_POINTER(mailbox_data[k].mail_id));
+               FREE(mailbox_data);
        }
 
 
-       _create_mailbox_list_view(mailbox_ugd);
+       create_mailbox_move_list_view(mailbox_ugd, account_id);
 
        _g_move_lock = true;
        _g_move_cancel_lock = false;
@@ -458,11 +264,7 @@ void _popup_response_delete_ok_cb(void *data, Evas_Object *obj, void *event_info
                else
                        on_event(NULL, UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN, NULL, mailbox_ugd);
                */
-       } else {
-               elm_object_part_content_set(mailbox_ugd->search_layout, "searchbar", mailbox_ugd->searchbar_layout);
-               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_searchbar", "search");
        }
-
 }
 
 void _popup_response_delete_all_ok_cb(void *data, Evas_Object *obj, void *event_info)
index b17c700..0a532fc 100755 (executable)
@@ -129,8 +129,10 @@ static void _my_gl_mode_right(void *data, Evas_Object *obj, void *event_info);
 static void _my_gl_mode_left(void *data, Evas_Object *obj, void *event_info);
 static char *_gl_group_text_get(void *data, Evas_Object *obj, const char *part);
 static char *_gl_mail_item_text_get(void *data, Evas_Object *obj, const char *part);
+static char *_gl_outbox_mail_item_text_get(void *data, Evas_Object *obj, const char *part);
 static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, const char *source);
-static void _important_status_changed_cb(void *data, Evas_Object *obj, void *event_info);
+static Evas_Object *_gl_outbox_mail_item_content_get(void *data, Evas_Object *obj, const char *source);
+static void _important_status_changed_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info);
 static void _item_followup_flag_touched_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info);
 static void _realized_cb(void *data, Evas_Object *obj, void *event_info);
 static Evas_Object *_create_progress_part_in_outbox(list_data *ld, Evas_Object *obj);
@@ -246,11 +248,10 @@ static void _get_more_clicked_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
-       email_mailbox_t *mailbox_list = NULL;
        email_account_t *account_list = NULL;
-       int mailbox_count = 0, account_count = 0;
+       int account_count = 0;
        int new_slot_size = 0;
-       int i = 0, j = 0;
+       int i = 0, j = 0, err = 0;
 
        if (g_get_more_progress_item || mailbox_ugd->view_type != EMAIL_VIEW_DATE) {
                debug_log("is_get_more_button exists or download in progress");
@@ -263,7 +264,13 @@ static void _get_more_clicked_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
-       email_get_account_list(&account_list, &account_count);
+       err = email_get_account_list(&account_list, &account_count);
+       if (err != EMAIL_ERROR_NONE || !account_list) {
+               email_free_account(&account_list, account_count);
+               debug_critical("email_get_account_list error Err(%d)", err);
+               return;
+       }
+
        _add_get_more_progress_item(mailbox_ugd);
        _stop_emf_job(mailbox_ugd, mailbox_ugd->emf_handle, true);
 
@@ -271,20 +278,35 @@ static void _get_more_clicked_cb(void *data, Evas_Object *obj, void *event_info)
        if (mailbox_ugd->mode == EMAIL_MAILBOX_MODE_ALL) {
                /* loop: All account */
                for (i = 0; i < account_count; ++i) {
-                       email_get_mailbox_list(account_list[i].account_id, -1, &mailbox_list, &mailbox_count);
+                       email_mailbox_t *mailbox_list = NULL;
+                       int mailbox_count = 0;
+                       err = email_get_mailbox_list(account_list[i].account_id, -1, &mailbox_list, &mailbox_count);
+                       if(err != EMAIL_ERROR_NONE || !mailbox_list) {
+                               email_free_mailbox(&mailbox_list, mailbox_count);
+                               email_free_account(&account_list, account_count);
+                               debug_critical("email_get_mailbox_list error Err(%d)", err);
+                               return;
+                       }
                        /* loop: All Mailbox */
                        for (j = 0; j < mailbox_count; ++j) {
                                new_slot_size = 0;
                                email_set_mail_slot_size(account_list[i].account_id, mailbox_list[j].mailbox_id, new_slot_size);
-                               debug_log("account_id: [%d], mailbox_name: [%s], slot_size: [%d]", account_list[i].account_id, mailbox_list[j].mailbox_name, new_slot_size);
+                               debug_log("account_id: [%d], mailbox_id: [%d], slot_size: [%d]", account_list[i].account_id, mailbox_list[j].mailbox_id, new_slot_size);
                        }
                        email_free_mailbox(&mailbox_list, mailbox_count);
                }
 
                _sync_all_folder(mailbox_ugd);
        } else {                        /* mailbox mode */
-
-               email_get_mailbox_list(mailbox_ugd->account_id, -1, &mailbox_list, &mailbox_count);
+               email_mailbox_t *mailbox_list = NULL;
+               int mailbox_count = 0;
+               err = email_get_mailbox_list(mailbox_ugd->account_id, -1, &mailbox_list, &mailbox_count);
+               if(err != EMAIL_ERROR_NONE || !mailbox_list) {
+                       email_free_mailbox(&mailbox_list, mailbox_count);
+                       email_free_account(&account_list, account_count);
+                       debug_critical("email_get_mailbox_list error Err(%d)", err);
+                       return;
+               }
                for (i = 0; i < mailbox_count; ++i) {
                        if (mailbox_list[i].mailbox_id == mailbox_ugd->mailbox_id) {
                                new_slot_size = 0;
@@ -293,6 +315,7 @@ static void _get_more_clicked_cb(void *data, Evas_Object *obj, void *event_info)
                }
                email_set_mail_slot_size(mailbox_ugd->account_id, mailbox_ugd->mailbox_id, new_slot_size);
                debug_log("account_id: [%d], mailbox_id: [%d], slot_size: [%d]", mailbox_ugd->account_id, mailbox_ugd->mailbox_id, new_slot_size);
+               email_free_mailbox(&mailbox_list, mailbox_count);
                _sync_curr_folder(mailbox_ugd, mailbox_ugd->mailbox_id);
        }
        //elm_object_disabled_set(mailbox_ugd->update_button, EINA_TRUE);
@@ -303,8 +326,10 @@ static void _add_get_more_progress_item(EmailMailboxUGD *mailbox_ugd)
 {
        debug_log("");
 
-       evas_object_smart_callback_del(mailbox_ugd->gl[mailbox_ugd->view_type], "edge,bottom", _get_more_clicked_cb);
-       b_enable_get_more = false;
+       if(b_enable_get_more) {
+               evas_object_smart_callback_del(mailbox_ugd->gl[mailbox_ugd->view_type], "edge,bottom", _get_more_clicked_cb);
+               b_enable_get_more = false;
+       }
 
        itc_get_more_progress.item_style = "1text.1icon.2";
        itc_get_more_progress.func.text_get = _gl_get_more_btn_text_get;
@@ -324,8 +349,11 @@ static void _add_get_more_progress_item(EmailMailboxUGD *mailbox_ugd)
        elm_genlist_item_select_mode_set(g_get_more_progress_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        elm_genlist_item_bring_in(g_get_more_progress_item, ELM_GENLIST_ITEM_SCROLLTO_IN);
 
-       evas_object_smart_callback_add(mailbox_ugd->gl[mailbox_ugd->view_type], "edge,bottom", _get_more_clicked_cb, mailbox_ugd);
-       b_enable_get_more = true;
+
+       if(b_enable_get_more == false) {
+               evas_object_smart_callback_add(mailbox_ugd->gl[mailbox_ugd->view_type], "edge,bottom", _get_more_clicked_cb, mailbox_ugd);
+               b_enable_get_more = true;
+       }
 
        debug_leave();
 }
@@ -362,7 +390,7 @@ static void _my_gl_mode_cancel(void *data, Evas_Object *obj, void *event_info)
 
 static Evas_Object *_create_progress_part_in_outbox(list_data *ld, Evas_Object *obj)
 {
-       /* debug_log(""); */
+       debug_log("ld->mail_status(%d)", ld->mail_status);
        if (ld == NULL || obj == NULL) {
                debug_critical("ld or obj is NULL");
                return NULL;
@@ -371,19 +399,27 @@ static Evas_Object *_create_progress_part_in_outbox(list_data *ld, Evas_Object *
        switch(ld->mail_status) {
                case EMAIL_MAIL_STATUS_SENDING: {
                        /* Since mail send is in progress,
-                       add a process icon to the entry in mail list view */
+                       add a process button to the entry in mail list view */
 
                        Evas_Object *progressbar = NULL;
+                       Evas_Object *progress_button = NULL;
 
                        progressbar = elm_progressbar_add(obj);
-                       elm_object_style_set(progressbar, "list_process");
+                       elm_object_style_set(progressbar, "list_process_small");
                        evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
                        evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-                       evas_object_show(progressbar);
                        elm_progressbar_pulse(progressbar, EINA_TRUE);
 
-                       debug_log("Added process icon");
-                       return progressbar;
+                       progress_button = elm_button_add(obj);
+                       elm_object_part_content_set(obj, "btn_default", progress_button);
+                       elm_object_content_set(progress_button, progressbar);
+                       elm_object_part_content_set(obj, "icon", progress_button);
+                       evas_object_size_hint_align_set(progress_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
+                       evas_object_size_hint_weight_set(progress_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+                       evas_object_show(progress_button);
+
+                       debug_log("Added process button");
+                       return progress_button;
                }
 
                case EMAIL_MAIL_STATUS_SEND_WAIT: {
@@ -463,7 +499,7 @@ static void _realized_cb(void *data, Evas_Object *obj, void *event_info)
                elm_object_disabled_set(ld->check, EINA_TRUE);
 }
 
-static void _important_status_changed_cb(void *data, Evas_Object *obj, void *event_info)
+static void _important_status_changed_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info)
 {
        debug_log("");
        list_data *ld = (list_data *)data;
@@ -484,7 +520,7 @@ static void _important_status_changed_cb(void *data, Evas_Object *obj, void *eve
                }
 
                int e = email_set_flags_field(ld->account_id, mail_ids, count,
-                                                                               EMAIL_FLAGS_FLAGGED_FIELD, ld->imp_sel, true);
+                                                                               EMAIL_FLAGS_FLAGGED_FIELD, ld->imp_sel ? 0 : 1, true);
                if (e != EMAIL_ERROR_NONE) {
                        debug_warning("_important_status_changed_cb account_id(%d) count(%d)- err (%d)",
                                                                                ld->account_id, count, e);
@@ -503,15 +539,15 @@ static void _item_followup_flag_touched_cb(void *data, Evas * evas, Evas_Object
        {
                case EMAIL_FLAG_TASK_STATUS_CLEAR:
                        ld->followup_flag = EMAIL_FLAG_TASK_STATUS_ACTIVE;
-                       elm_image_file_set(ld->flag_ic, IMGDIR "/M02_email_Flag_Active.png", NULL);
+                       elm_image_file_set(ld->flag_ic, IMGDIR "/M02_icon_flag.png", NULL);
                        break;
                case EMAIL_FLAG_TASK_STATUS_ACTIVE:
                        ld->followup_flag = EMAIL_FLAG_TASK_STATUS_COMPLETE;
-                       elm_image_file_set(ld->flag_ic, IMGDIR "/M02_email_Flag_Complete.png", NULL);
+                       elm_image_file_set(ld->flag_ic, IMGDIR "/M02_icon_flag_complete.png", NULL);
                        break;
                case EMAIL_FLAG_TASK_STATUS_COMPLETE:
                        ld->followup_flag = EMAIL_FLAG_TASK_STATUS_CLEAR;
-                       elm_image_file_set(ld->flag_ic, IMGDIR "/M02_email_Flag_Clear.png", NULL);
+                       elm_image_file_set(ld->flag_ic, IMGDIR "/M02_icon_flag_clear.png", NULL);
                        break;
                default :
                        debug_log("mail item has no followup flag");
@@ -573,39 +609,58 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
                        evas_object_show(icon);
                        return (void *)icon;
                }
-       } else if(!g_strcmp0(source, "elm.icon.3")) {
-               Evas_Object *box = elm_box_add(obj);
-               evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-               evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               elm_box_horizontal_set(box, EINA_TRUE);
-               elm_box_padding_set(box, 10, 0);
-
-               ld->important = elm_check_add(obj);
-               elm_check_state_pointer_set(ld->important, (Eina_Bool *)&ld->imp_sel);
-               elm_object_style_set(ld->important, "favorite/extended");
-               evas_object_smart_callback_add(ld->important, "changed", _important_status_changed_cb, data);
-               evas_object_propagate_events_set(ld->important, EINA_FALSE);
-               evas_object_size_hint_min_set(ld->important, 80, 60);
-               evas_object_show(ld->important);
-               elm_box_pack_end(box, ld->important);
-
+       } else if(!g_strcmp0(source, "elm.icon.4")) {
+               if (ld->followup_flag > EMAIL_FLAG_FLAGED) {
+                       ld->flag_ic = elm_icon_add(obj);
+                       switch(ld->followup_flag)
+                       {
+                       case EMAIL_FLAG_TASK_STATUS_CLEAR:
+                               elm_image_file_set(ld->flag_ic, IMGDIR "/M02_icon_flag_clear.png", NULL);
+                               break;
+                       case EMAIL_FLAG_TASK_STATUS_ACTIVE:
+                               elm_image_file_set(ld->flag_ic, IMGDIR "/M02_icon_flag.png", NULL);
+                               break;
+                       case EMAIL_FLAG_TASK_STATUS_COMPLETE:
+                               elm_image_file_set(ld->flag_ic, IMGDIR "/M02_icon_flag_complete.png", NULL);
+                               break;
+                       }
+                       evas_object_size_hint_min_set(ld->flag_ic, 38, 38);
+                       return ld->flag_ic;
+               }
+       } else if(!g_strcmp0(source, "elm.icon.4.touch")) {
+               Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj));
+               evas_object_size_hint_align_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               if(ld->followup_flag > EMAIL_FLAG_FLAGED)
+                       evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_UP, _item_followup_flag_touched_cb, data);
+               else
+                       evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_UP, _important_status_changed_cb, data);
 
+               evas_object_propagate_events_set(rect, EINA_FALSE);
+               evas_object_color_set(rect, 0, 0 ,0, 0);
+               return rect;
+       } else if(!g_strcmp0(source, "elm.icon.3")) {
                if(ld->is_attachment == true)
                {
+                       Evas_Object *box = elm_box_add(obj);
+                       evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+                       evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+                       elm_box_horizontal_set(box, EINA_TRUE);
                        icon = elm_icon_add(obj);
-                       elm_image_file_set(icon, IMGDIR "/M02_email_icon_attach.png", NULL);
-                       evas_object_size_hint_min_set(icon, 35, 35);
+                       elm_image_file_set(icon, IMGDIR "/M02_icon_attach.png", NULL);
+                       evas_object_size_hint_min_set(icon, 38, 38);
+                       evas_object_show(icon);
+                       elm_box_pack_start(box, icon);
+                       icon = evas_object_rectangle_add(evas_object_evas_get(obj));
+                       evas_object_color_set(icon, 0, 0, 0, 0);
+                       evas_object_size_hint_min_set(icon, 6, 16);
                        evas_object_show(icon);
                        elm_box_pack_start(box, icon);
-               }
 
-               icon = evas_object_rectangle_add(evas_object_evas_get(obj));
-               evas_object_color_set(icon, 0, 0, 0, 0);
-               evas_object_size_hint_min_set(icon, 6, 16);
-               evas_object_show(icon);
-               elm_box_pack_start(box, icon);
+                       return box;
+               } else
+                       return NULL;
 
-               return box;
        } else if (!g_strcmp0(source, "elm.slide.swallow.1")) {
                /* First button of Sweep Menu */
                if (NULL == ld->mailbox_ugd) {
@@ -675,19 +730,8 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
                {
                        return _create_sweep_delete_button(obj, ld);
                }
-       } else if (!g_strcmp0(source, "elm.swallow.outbox.progress")) {
-
-               Evas_Object *outbox_progress_part = NULL;
-
-               if (ld->mailbox_ugd->mode == EMAIL_MAILBOX_MODE_MAILBOX && ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX) {
-                       if (ld->mailbox_ugd->view_type != EMAIL_VIEW_SEARCH && ld->mailbox_ugd->view_type != EMAIL_VIEW_EDIT) {
-                               if (ld->mailbox_ugd->create_progress_part == true) {
-                                       outbox_progress_part = _create_progress_part_in_outbox(ld, obj);
-                               }
-                       }
-               }
-               return (void *)outbox_progress_part;
        }
+
 #if 0  // support low priority message, priority icon postion is changed
        else if(!g_strcmp0(source, "elm.icon.priority"))
        {
@@ -715,6 +759,92 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
        return NULL;
 }
 
+static Evas_Object *_gl_outbox_mail_item_content_get(void *data, Evas_Object *obj, const char *source)
+{
+       //debug_enter();
+       if (data == NULL) {
+               debug_log("data is NULL");
+               return NULL;
+       }
+
+       Evas_Object *icon = NULL;
+       list_data *ld = (list_data *)data;
+
+       debug_log("source: %s", source);
+
+       if (!g_strcmp0(source, "elm.swallow.colorbar")) {
+               Evas_Object *small_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
+               evas_object_size_hint_fill_set(small_rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+               int r = (ld->account_color & 0xff000000) >> 24;
+               int g = (ld->account_color & 0x00ff0000) >> 16;
+               int b = (ld->account_color & 0x0000ff00) >> 8;
+               int a = ld->account_color & 0x000000ff;
+
+               evas_object_color_set(small_rect, r, g, b, a);
+               return (void *)small_rect;
+       } else if (!g_strcmp0(source, "elm.icon.1")) {
+               ld->check = elm_check_add(obj);
+               elm_check_state_pointer_set(ld->check, (Eina_Bool *)&ld->chksel);
+               evas_object_smart_callback_add(ld->check, "changed", _item_check_changed_cb, data);
+               evas_object_propagate_events_set(ld->check, EINA_FALSE);
+               return ld->check;
+       } else if(!g_strcmp0(source, "elm.icon.2")){
+               if(ld->priority == EMAIL_OPTION_PRIORITY_HIGH) {
+                       icon = elm_icon_add(obj);
+                       elm_image_file_set(icon, IMGDIR "/M02_email_icon_priority.png", NULL);
+                       elm_image_resizable_set(icon, 0, 0);
+                       evas_object_image_smooth_scale_set(icon, 0);
+                       evas_object_show(icon);
+                       return (void *)icon;
+               } else if(ld->reply_flag)       {
+                       icon = elm_icon_add(obj);
+                       elm_image_file_set(icon, IMGDIR "/M02_email_icon_reply.png", NULL);
+                       elm_image_resizable_set(icon, 0, 0);
+                       evas_object_image_smooth_scale_set(icon, 0);
+                       evas_object_show(icon);
+                       return (void *)icon;
+               } else if (ld->forward_flag) {
+                       icon = elm_icon_add(obj);
+                       elm_image_file_set(icon, IMGDIR "/M02_email_icon_forward.png", NULL);
+                       elm_image_resizable_set(icon, 0, 0);
+                       evas_object_image_smooth_scale_set(icon, 0);
+                       evas_object_show(icon);
+                       return (void *)icon;
+               }
+       } else if(!g_strcmp0(source, "elm.icon.4")) {
+               Evas_Object *outbox_progress_part = NULL;
+
+               if (ld->mailbox_ugd->mode == EMAIL_MAILBOX_MODE_MAILBOX && ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX) {
+                       if (ld->mailbox_ugd->view_type != EMAIL_VIEW_SEARCH && ld->mailbox_ugd->view_type != EMAIL_VIEW_EDIT) {
+                               if (ld->mailbox_ugd->create_progress_part == true) {
+                                       outbox_progress_part = _create_progress_part_in_outbox(ld, obj);
+                               }
+                       }
+               }
+               return (void *)outbox_progress_part;
+       } else if (!g_strcmp0(source, "elm.slide.swallow.1")) {
+               /* First button of Sweep Menu */
+               if (NULL == ld->mailbox_ugd) {
+                       debug_critical(" ld->mailbox_ugd [%p] ", ld->mailbox_ugd);
+                       return NULL;
+               }
+
+               return _create_sweep_read_unread_button(obj,ld);
+
+       } else if (!g_strcmp0(source, "elm.slide.swallow.2")) {
+               /* Second button of Sweep Menu */
+               if (NULL == ld->mailbox_ugd) {
+                       debug_critical(" ld->mailbox_ugd [%p] ", ld->mailbox_ugd);
+                       return NULL;
+               }
+
+               return _create_sweep_delete_button(obj,ld);
+       }
+
+       return NULL;
+}
+
 static char *_gl_mail_item_text_get(void *data, Evas_Object *obj, const char *part)
 {
        if (data == NULL) {
@@ -765,6 +895,14 @@ static char *_gl_mail_item_text_get(void *data, Evas_Object *obj, const char *pa
                }
 
        } else if (!g_strcmp0(part, "elm.text.3")) {
+               if (ld->preview_body == NULL) {
+                       debug_log("preview text is NULL");
+                       return NULL;
+               } else {
+                       return g_strdup(ld->preview_body);
+               }
+
+       } else if (!g_strcmp0(part, "elm.text.4")) {
 
                if (ld->timeordate == NULL) {
                        debug_log("timeordate is NULL");
@@ -775,16 +913,76 @@ static char *_gl_mail_item_text_get(void *data, Evas_Object *obj, const char *pa
                        return g_strdup("");
                else
                        return g_strdup(ld->timeordate);
-       } else if (!g_strcmp0(part, "elm.text.4")) {
+       } else if (!g_strcmp0(part, "elm.slide.text.1")) {      /* Subject is to be displayed in Sweep Menu. ld->title stores Subject of email */
+               return g_strdup(ld->title);
+
+       } else {
+               debug_log("");
+               return NULL;
+       }
+
+       return NULL;
+}
+
+static char *_gl_outbox_mail_item_text_get(void *data, Evas_Object *obj, const char *part)
+{
+       if (data == NULL) {
+               debug_warning("ld is NULL");
+               return NULL;
+       }
+
+       list_data *ld = (list_data *)data;
+       EmailMailboxUGD *mailbox_ugd = ld->mailbox_ugd;
+
+       debug_log("part: %s", part);
+
+       if (mailbox_ugd == NULL) {
+               debug_warning("mailbox_ugd is NULL");
+               return NULL;
+       }
+       if (!g_strcmp0(part, "elm.text.1")) {
+               char title[SUBJECT_LEN + TAG_LEN*2 + 1] = {0}; /* two tags can be inserted */
+               strncat(title, ld->title, SUBJECT_LEN + TAG_LEN); /* search tag may be contained */
+               //strcat(title, "</>");
+               return g_strdup(title);
+       } else if (!g_strcmp0(part, "elm.text.2")) {
+               /*
+               if (ld->from == NULL) {
+                       debug_log("from is NULL");
+                       return NULL;
+               }
+               */
+               if (mailbox_ugd->view_type == EMAIL_VIEW_SEARCH) {
+                       if(ld->mailbox_ugd->mode == EMAIL_MAILBOX_MODE_MAILBOX &&
+                               (ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX ||
+                               ld->mailbox_type == EMAIL_MAILBOX_TYPE_SENTBOX ||
+                               ld->mailbox_type == EMAIL_MAILBOX_TYPE_DRAFT))
+                               return g_strdup(ld->recipient);
+                       else {
+                               if(ld->from)
+                                       return g_strdup(ld->from);
+                               else if(ld->alias)
+                                       return g_strdup(ld->alias);
+                       }
+               } else {
+                       if(ld->mailbox_ugd->mode == EMAIL_MAILBOX_MODE_MAILBOX &&
+                               (ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX ||
+                               ld->mailbox_type == EMAIL_MAILBOX_TYPE_SENTBOX ||
+                               ld->mailbox_type == EMAIL_MAILBOX_TYPE_DRAFT))
+                               return g_strdup(ld->recipient);
+                       else
+                               return g_strdup(ld->alias);
+               }
+       } else if (!g_strcmp0(part, "elm.text.3")) {
                if (ld->preview_body == NULL) {
                        debug_log("preview text is NULL");
                        return NULL;
                } else {
                        return g_strdup(ld->preview_body);
                }
-
        } else if (!g_strcmp0(part, "elm.slide.text.1")) {      /* Subject is to be displayed in Sweep Menu. ld->title stores Subject of email */
                return g_strdup(ld->title);
+
        } else {
                debug_log("");
                return NULL;
@@ -803,6 +1001,11 @@ static void _my_gl_mode_right(void *data, Evas_Object *obj, void *event_info)
        EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
        Evas_Coord x = 0, y = 0, w = 0, h = 0;
        Elm_Object_Item *prev = NULL;
+
+       /* Skip a group item*/
+       if (elm_genlist_item_select_mode_get(event_info) == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
+               return;
+
        evas_object_geometry_get((mailbox_ugd->gl[mailbox_ugd->view_type]), &x, &y, &w, &h);
        debug_log("x = %d, y = %d, w=%d, h=%d, isRotate = %d, view_type = %d", x, y, w,h, mailbox_ugd->isRotate, mailbox_ugd->view_type);
 
@@ -837,6 +1040,10 @@ static void _my_gl_mode_left(void *data, Evas_Object *obj, void *event_info)
                debug_log("event_info is NULL");return;
        }
 
+       /* Skip a group item*/
+       if (elm_genlist_item_select_mode_get(event_info) == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
+               return;
+
        /* Finish genlist sweep */
        elm_genlist_item_decorate_mode_set(event_info, "slide", EINA_FALSE);
        elm_genlist_item_select_mode_set(event_info, ELM_OBJECT_SELECT_MODE_DEFAULT);
@@ -885,30 +1092,52 @@ void mailbox_create_list_view(EmailMailboxUGD *mailbox_ugd)
        }
 
        /* Set genlist item class */
-       mailbox_ugd->itc1.item_style = "email.list";
-       mailbox_ugd->itc1.func.text_get = _gl_mail_item_text_get;
-       mailbox_ugd->itc1.func.content_get = _gl_mail_item_content_get;
+       mailbox_ugd->itc1.item_style = "grouptitle";
+       mailbox_ugd->itc1.func.text_get = _gl_group_text_get;
+       mailbox_ugd->itc1.func.content_get = NULL;
        mailbox_ugd->itc1.func.state_get = NULL;
        mailbox_ugd->itc1.func.del = NULL;
-       mailbox_ugd->itc1.decorate_all_item_style = "edit_default";
+       mailbox_ugd->itc1.decorate_all_item_style = NULL;
 
-       mailbox_ugd->itc2.item_style = "grouptitle";
-       mailbox_ugd->itc2.func.text_get = _gl_group_text_get;
-       mailbox_ugd->itc2.func.content_get = NULL;
+       mailbox_ugd->itc2.item_style = "email.list";
+       mailbox_ugd->itc2.func.text_get = _gl_mail_item_text_get;
+       mailbox_ugd->itc2.func.content_get = _gl_mail_item_content_get;
        mailbox_ugd->itc2.func.state_get = NULL;
        mailbox_ugd->itc2.func.del = NULL;
-       mailbox_ugd->itc2.decorate_all_item_style = NULL;
+       mailbox_ugd->itc2.decorate_all_item_style = "edit_default";
+
+       mailbox_ugd->itc3.item_style = "email.list.conversation";
+       mailbox_ugd->itc3.func.text_get = _gl_mail_item_text_get;
+       mailbox_ugd->itc3.func.content_get = _gl_mail_item_content_get;
+       mailbox_ugd->itc3.func.state_get = NULL;
+       mailbox_ugd->itc3.func.del = NULL;
+       mailbox_ugd->itc3.decorate_all_item_style = "edit_default";
+
+       mailbox_ugd->itc4.item_style = "email.outbox";
+       mailbox_ugd->itc4.func.text_get = _gl_outbox_mail_item_text_get;
+       mailbox_ugd->itc4.func.content_get = _gl_outbox_mail_item_content_get;
+       mailbox_ugd->itc4.func.state_get = NULL;
+       mailbox_ugd->itc4.func.del = NULL;
+       mailbox_ugd->itc4.decorate_all_item_style = "edit_default";
+
+       mailbox_ugd->itc5.item_style = "email.outbox.conversations";
+       mailbox_ugd->itc5.func.text_get = _gl_outbox_mail_item_text_get;
+       mailbox_ugd->itc5.func.content_get = _gl_outbox_mail_item_content_get;
+       mailbox_ugd->itc5.func.state_get = NULL;
+       mailbox_ugd->itc5.func.del = NULL;
+       mailbox_ugd->itc5.decorate_all_item_style = "edit_default";
 
        Evas_Object *gl = elm_genlist_add(mailbox_ugd->sub_layout[mailbox_ugd->view_type]);
        /*elm_object_theme_set(gl, mailbox_ugd->theme);*/
        evas_object_smart_callback_add(gl, "realized", _realized_cb, NULL);
 
        evas_object_smart_callback_add(gl, "drag,start,right", _my_gl_mode_right, mailbox_ugd);
-       evas_object_smart_callback_add(gl, "drag,start,left", _my_gl_mode_left, NULL);
+       evas_object_smart_callback_add(gl, "drag,start,left", _my_gl_mode_left, mailbox_ugd);
        evas_object_smart_callback_add(gl, "drag,start,up", _my_gl_mode_cancel, mailbox_ugd);
        evas_object_smart_callback_add(gl, "drag,start,down", _my_gl_mode_cancel, NULL);
 
        elm_object_style_set(gl, "handler");
+       elm_scroller_policy_set(gl, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
        elm_genlist_block_count_set(gl, BLOCK_COUNT);
        elm_genlist_homogeneous_set(gl, EINA_TRUE);
        //elm_genlist_mode_set(gl, ELM_LIST_COMPRESS); //genlist is updated when rotate event is detected(Resize)
@@ -1057,13 +1286,8 @@ static void _process_item_check_changed_cb(list_data *ld)
                mailbox_ugd->previous_view = mailbox_ugd->view_type;
                mailbox_ugd->view_type = EMAIL_VIEW_EDIT;
 
-               elm_entry_entry_set(mailbox_ugd->searchbar_en, "");
-               elm_object_focus_set(mailbox_ugd->searchbar_layout, EINA_FALSE);
-               elm_object_part_content_unset(mailbox_ugd->search_layout, "searchbar");
-               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "hide_searchbar", "search");
-               evas_object_hide(mailbox_ugd->searchbar_layout);
-
                _create_controlbar(mailbox_ugd);
+               //elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->previous_view], "controlbar", mailbox_ugd->controlbar_btns);
                elm_object_disabled_set(mailbox_ugd->folder_button, EINA_TRUE);
        }
        else if(cnt <= 0)
@@ -1119,24 +1343,22 @@ static void _list_item_clicked(void *data, Evas_Object *obj, void *event_info)
                email_mailbox_t *mbox = NULL;
                int e = email_get_mailbox_by_mailbox_id(ld->mailbox_id, &mbox);
                if (e != EMAIL_ERROR_NONE) {
+                       email_free_mailbox(&mbox, 1);
                        debug_log(" email_get_mailbox_by_mailbox_id mailbox_id(%d)- err[%d]", ld->mailbox_id, e);
                        return;
                }
 
-               if ((mbox->mailbox_type == EMAIL_MAILBOX_TYPE_DRAFT
-                               || (mbox->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX
-                               && (ld->mail_status == EMAIL_MAIL_STATUS_SEND_CANCELED
-                               || ld->mail_status == EMAIL_MAIL_STATUS_SEND_FAILURE)))
-                               && email_engine_check_body_download(ld->mail_id)) {
-
+               if (mbox->mailbox_type == EMAIL_MAILBOX_TYPE_DRAFT && email_engine_check_body_download(ld->mail_id)) {
                        if (ld->mailbox_ugd->ug_composer) {
                                debug_log("Composer UG is already launched");
+                               email_free_mailbox(&mbox, 1);
                                return;
                        }
                        service_h service;
                        if (SERVICE_ERROR_NONE != service_create(&service))
                        {
                                debug_log("creating service handle failed");
+                               email_free_mailbox(&mbox, 1);
                                return;
                        }
 
@@ -1181,23 +1403,20 @@ static void _insert_normal_item_to_mailist(EmailMailboxUGD *mailbox_ugd, list_da
 
        /* group item is not in genlist, insert group item and normal item in sequence*/
        if( !mailbox_ugd->git[view_type][ld->group_index] ) {
-               /* if next item exists, group item is placed before the next group item */
                if( ITEM_EXIST(next) ) {
-                       mailbox_ugd->git[view_type][ld->group_index] = elm_genlist_item_insert_before(
-                                                                       mailbox_ugd->gl[view_type],
-                                                                       &(mailbox_ugd->itc2),
+                       /* if next item exists, group item is placed before the next group item */
+                       mailbox_ugd->git[view_type][ld->group_index] = elm_genlist_item_insert_before(mailbox_ugd->gl[view_type],
+                                                                       &(mailbox_ugd->itc1),
                                                                        (void *)(ld->group_index + 1),
                                                                        NULL,
                                                                        mailbox_ugd->git[view_type][next->group_index],
                                                                        ELM_GENLIST_ITEM_GROUP,
                                                                        NULL, NULL);
                        elm_genlist_item_select_mode_set(mailbox_ugd->git[view_type][ld->group_index], ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-               }
-               /* if there is no next node, this group item is placed at end of list */
-               else {
-                       mailbox_ugd->git[view_type][ld->group_index] = elm_genlist_item_append(
-                                                                       mailbox_ugd->gl[view_type],
-                                                                       &(mailbox_ugd->itc2),
+               } else {
+                       /* if there is no next node, this group item is placed at end of list */
+                       mailbox_ugd->git[view_type][ld->group_index] = elm_genlist_item_append(mailbox_ugd->gl[view_type],
+                                                                       &(mailbox_ugd->itc1),
                                                                        (void *)(ld->group_index + 1),
                                                                        NULL,
                                                                        ELM_GENLIST_ITEM_GROUP,
@@ -1210,25 +1429,38 @@ static void _insert_normal_item_to_mailist(EmailMailboxUGD *mailbox_ugd, list_da
                        return;
                }
 
-               if (ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX || ld->mailbox_type == EMAIL_MAILBOX_TYPE_DRAFT)
-               {
+               if (ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX || ld->mailbox_type == EMAIL_MAILBOX_TYPE_DRAFT) {
                        debug_log("mode/slide ld->mailbox_type: %d, mailbox_ugd->view_type: %d", ld->mailbox_type,mailbox_ugd->view_type);
-                       mailbox_ugd->itc1.decorate_item_style = "mode/slide2";
+                       mailbox_ugd->itc2.decorate_item_style = "mode/slide2";
+                       mailbox_ugd->itc3.decorate_item_style = "mode/slide2";
+                       mailbox_ugd->itc4.decorate_item_style = "mode/slide2";
+                       mailbox_ugd->itc5.decorate_item_style = "mode/slide2";
                } else {
                        debug_log("mode/slide4 ld->mailbox_type: %d, mailbox_ugd->view_type: %d", ld->mailbox_type,mailbox_ugd->view_type);
-                       mailbox_ugd->itc1.decorate_item_style = "mode/slide4";
+                       mailbox_ugd->itc2.decorate_item_style = "mode/slide4";
+                       mailbox_ugd->itc3.decorate_item_style = "mode/slide4";
                }
 
                /* insert the item after group item */
-               ld->item = elm_genlist_item_insert_after(
-                                                                       mailbox_ugd->gl[view_type],
-                                                                       &(mailbox_ugd->itc1),
-                                                                       ld,
-                                                                       mailbox_ugd->git[view_type][ld->group_index],
-                                                                       mailbox_ugd->git[view_type][ld->group_index],
-                                                                       ELM_GENLIST_ITEM_NONE,
-                                                                       _list_item_clicked,
-                                                                       NULL);
+               if (ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX) {
+                       ld->item = elm_genlist_item_insert_after(mailbox_ugd->gl[view_type],
+                                       &(mailbox_ugd->itc4),
+                                       ld,
+                                       mailbox_ugd->git[view_type][ld->group_index],
+                                       mailbox_ugd->git[view_type][ld->group_index],
+                                       ELM_GENLIST_ITEM_NONE,
+                                       _list_item_clicked,
+                                       NULL);
+               } else {
+                       ld->item = elm_genlist_item_insert_after(mailbox_ugd->gl[view_type],
+                                       &(mailbox_ugd->itc2),
+                                       ld,
+                                       mailbox_ugd->git[view_type][ld->group_index],
+                                       mailbox_ugd->git[view_type][ld->group_index],
+                                       ELM_GENLIST_ITEM_NONE,
+                                       _list_item_clicked,
+                                       NULL);
+               }
        }
        /* there exists the another normal item among the same group. find the normal item in same group */
        else {
@@ -1237,26 +1469,47 @@ static void _insert_normal_item_to_mailist(EmailMailboxUGD *mailbox_ugd, list_da
                        return;
                }
 
-               if( ITEM_IN_SAME_GROUP(prev, ld) )
-                       ld->item = elm_genlist_item_insert_after(mailbox_ugd->gl[view_type],
-                                                       &(mailbox_ugd->itc1),
-                                                       ld,
-                                                       mailbox_ugd->git[view_type][ld->group_index],
-                                                       prev->item,
-                                                       ELM_GENLIST_ITEM_NONE,
-                                                       _list_item_clicked,
-                                                       NULL);
-
-               else if ( ITEM_IN_SAME_GROUP(next, ld) )
-                       ld->item = elm_genlist_item_insert_before(mailbox_ugd->gl[view_type],
-                                                       &(mailbox_ugd->itc1),
-                                                       ld,
-                                                       mailbox_ugd->git[view_type][ld->group_index],
-                                                       next->item,
-                                                       ELM_GENLIST_ITEM_NONE,
-                                                       _list_item_clicked,
-                                                       NULL);
-               else {
+               if( ITEM_IN_SAME_GROUP(prev, ld) ) {
+                       if (ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX) {
+                               ld->item = elm_genlist_item_insert_after(mailbox_ugd->gl[view_type],
+                                               &(mailbox_ugd->itc4),
+                                               ld,
+                                               mailbox_ugd->git[view_type][ld->group_index],
+                                               prev->item,
+                                               ELM_GENLIST_ITEM_NONE,
+                                               _list_item_clicked,
+                                               NULL);
+                       } else {
+                               ld->item = elm_genlist_item_insert_after(mailbox_ugd->gl[view_type],
+                                               &(mailbox_ugd->itc2),
+                                               ld,
+                                               mailbox_ugd->git[view_type][ld->group_index],
+                                               prev->item,
+                                               ELM_GENLIST_ITEM_NONE,
+                                               _list_item_clicked,
+                                               NULL);
+                       }
+               } else if ( ITEM_IN_SAME_GROUP(next, ld) ) {
+                       if (ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX) {
+                               ld->item = elm_genlist_item_insert_before(mailbox_ugd->gl[view_type],
+                                               &(mailbox_ugd->itc4),
+                                               ld,
+                                               mailbox_ugd->git[view_type][ld->group_index],
+                                               next->item,
+                                               ELM_GENLIST_ITEM_NONE,
+                                               _list_item_clicked,
+                                               NULL);
+                       } else {
+                               ld->item = elm_genlist_item_insert_before(mailbox_ugd->gl[view_type],
+                                               &(mailbox_ugd->itc2),
+                                               ld,
+                                               mailbox_ugd->git[view_type][ld->group_index],
+                                               next->item,
+                                               ELM_GENLIST_ITEM_NONE,
+                                               _list_item_clicked,
+                                               NULL);
+                       }
+               } else {
                        debug_warning("There is group item(%d), but prev item(%d) or next item(%d) is not same group",
                                ld->group_index, GROUP_INDEX(prev), GROUP_INDEX(next));
                        return;
@@ -2222,11 +2475,6 @@ void _edit_back_cb(void *data, Evas_Object *obj, void *event_info)
        b_editmode = false;
        elm_object_disabled_set(mailbox_ugd->folder_button, EINA_FALSE);
 
-       if (mailbox_ugd->isRotate == false) {
-               elm_object_part_content_set(mailbox_ugd->search_layout, "searchbar", mailbox_ugd->searchbar_layout);
-               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_searchbar", "search");
-       }
-
        debug_leave();
 }
 
@@ -2368,12 +2616,15 @@ void _mailbox_list_add_item(EmailMailboxUGD *mailbox_ugd, gint mail_id)
 
 static void _clear_genlist(EmailMailboxUGD *mailbox_ugd)
 {
-       debug_log("VIEW TYPE[%d]",mailbox_ugd->view_type);
+       debug_log();
+
        if (mailbox_ugd == NULL) {
                debug_log("mailbox_ugd is NULL");
                return;
        }
 
+       debug_log("VIEW TYPE[%d]",mailbox_ugd->view_type);
+
        if (mailbox_ugd->gl[mailbox_ugd->view_type]) {
                elm_genlist_clear(mailbox_ugd->gl[mailbox_ugd->view_type]);
                _reset_refer_item_and_idx(mailbox_ugd);
@@ -2550,59 +2801,61 @@ void _make_account_mail_list(void *data)
        EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
 
        if (mailbox_ugd->account_id == 0) {
-               mailbox_ugd->mode = EMAIL_MAILBOX_MODE_ALL;
-               debug_log("mailbox_type:[%d], mailbox_id:[%d]", mailbox_ugd->mailbox_type, mailbox_ugd->mailbox_id);
-               switch(mailbox_ugd->mailbox_type)
+               if (mailbox_ugd->mode == EMAIL_MAILBOX_MODE_ALL)
                {
-                       case EMAIL_MAILBOX_TYPE_INBOX:
-                       {
-                               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_INBOX"));
-                       }
-                               break;
-                       case EMAIL_MAILBOX_TYPE_SENTBOX:
-                       {
-                               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_SENTBOX"));
-                       }
-                               break;
-                       case EMAIL_MAILBOX_TYPE_TRASH:
-                       {
-                               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_TRASH"));
-                       }
-                               break;
-                       case EMAIL_MAILBOX_TYPE_DRAFT:
+                       debug_log("mailbox_type:[%d], mailbox_id:[%d]", mailbox_ugd->mailbox_type, mailbox_ugd->mailbox_id);
+                       switch(mailbox_ugd->mailbox_type)
                        {
-                               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_DRAFTS"));
-                       }
-                               break;
-                       case EMAIL_MAILBOX_TYPE_SPAMBOX:
-                       {
-                               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_SPAMBOX"));
-                       }
-                               break;
-                       case EMAIL_MAILBOX_TYPE_OUTBOX:
-                       {
-                               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", N_("Outbox"));
-                       }
-                               break;
-                       case EMAIL_MAILBOX_TYPE_FLAGGED:
-                       {
-                               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_OPT_FAVOURITES"));
-                       }
-                               break;
-                       default:
-                       {
-                               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_INBOX"));
+                               case EMAIL_MAILBOX_TYPE_INBOX:
+                               {
+                                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_INBOX"));
+                               }
+                                       break;
+                               case EMAIL_MAILBOX_TYPE_SENTBOX:
+                               {
+                                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_SENTBOX"));
+                               }
+                                       break;
+                               case EMAIL_MAILBOX_TYPE_TRASH:
+                               {
+                                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_TRASH"));
+                               }
+                                       break;
+                               case EMAIL_MAILBOX_TYPE_DRAFT:
+                               {
+                                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_DRAFTS"));
+                               }
+                                       break;
+                               case EMAIL_MAILBOX_TYPE_SPAMBOX:
+                               {
+                                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_SPAMBOX"));
+                               }
+                                       break;
+                               case EMAIL_MAILBOX_TYPE_OUTBOX:
+                               {
+                                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_HEADER_OUTBOX"));
+                               }
+                                       break;
+                               case EMAIL_MAILBOX_TYPE_FLAGGED:
+                               {
+                                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_OPT_FAVOURITES"));
+                               }
+                                       break;
+                               default:
+                               {
+                                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_INBOX"));
+                               }
+                                       break;
                        }
-                               break;
+                       elm_image_file_set(mailbox_ugd->sp_icon, ICON_TITLE_ALL_ACC, NULL);
+                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_HEADER_ALL_ACCOUNTS"));
                }
-               elm_image_file_set(mailbox_ugd->sp_icon, ICON_TITLE_ALL_ACC, NULL);
-               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_HEADER_ALL_ACCOUNTS"));
        }
        else {
                debug_log("mailbox_id: [%d], account_id: [%d]", mailbox_ugd->mailbox_id, mailbox_ugd->account_id);
 
                mailbox_ugd->mode = EMAIL_MAILBOX_MODE_MAILBOX;
-               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", mailbox_ugd->folder_alias);
+               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", mailbox_ugd->folder_alias);
                mailbox_ugd->mailbox_type = GET_MAILBOX_TYPE(mailbox_ugd->mailbox_id);
 
                email_account_t *account;
@@ -2612,7 +2865,7 @@ void _make_account_mail_list(void *data)
                        elm_image_file_set(mailbox_ugd->sp_icon, account->logo_icon_path, NULL);
                }
 
-               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", mailbox_ugd->user_email);
+               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", mailbox_ugd->account_name);
 
                if (account) {
                        elm_image_file_set(mailbox_ugd->sp_icon, account->logo_icon_path, NULL);
@@ -3166,38 +3419,62 @@ gint _compare_sort_rule_by_viewtype(gconstpointer a, gconstpointer b)
                        break;
 
                case EMAIL_VIEW_UNREAD:
-                       if(first_item->is_seen > second_item->is_seen)
-                               ret = 1;
-                       else if (first_item->is_seen == second_item->is_seen)
-                               ret = 1;
-                       else
+                       if(first_item->is_seen > second_item->is_seen) {
+                               if(first_item->absolute_time > second_item->absolute_time)
+                                       ret = -1;
+                               else
+                                       ret = 1;
+                       } else if (first_item->is_seen == second_item->is_seen) {
+                               if(first_item->absolute_time > second_item->absolute_time)
+                                       ret = -1;
+                               else
+                                       ret = 1;
+                       } else
                                ret = -1;
                        break;
 
                case EMAIL_VIEW_IMPORTANT:
-                       if(first_item->imp_sel > second_item->imp_sel)
-                               ret = -1;
-                       else if (first_item->imp_sel == second_item->imp_sel)
-                               ret = 1;
-                       else
+                       if(first_item->imp_sel > second_item->imp_sel) {
+                               if(first_item->absolute_time > second_item->absolute_time)
+                                       ret = -1;
+                               else
+                                       ret = 1;
+                       } else if (first_item->imp_sel == second_item->imp_sel) {
+                               if(first_item->absolute_time > second_item->absolute_time)
+                                       ret = -1;
+                               else
+                                       ret = 1;
+                       } else
                                ret = 1;
                        break;
 
                case EMAIL_VIEW_PRIORITY:
-                       if(first_item->priority > second_item->priority)
-                               ret = -1;
-                       else if (first_item->priority == second_item->priority)
-                               ret = 1;
-                       else
+                       if(first_item->priority > second_item->priority) {
+                               if(first_item->absolute_time > second_item->absolute_time)
+                                       ret = -1;
+                               else
+                                       ret = 1;
+                       } else if (first_item->priority == second_item->priority) {
+                               if(first_item->absolute_time > second_item->absolute_time)
+                                       ret = -1;
+                               else
+                                       ret = 1;
+                       } else
                                ret = 1;
                        break;
 
                case EMAIL_VIEW_ATTACHMENTS:
-                       if(first_item->is_attachment > second_item->is_attachment)
-                               ret = -1;
-                       else if (first_item->is_attachment == second_item->is_attachment)
-                               ret = 1;
-                       else
+                       if(first_item->is_attachment > second_item->is_attachment) {
+                               if(first_item->absolute_time > second_item->absolute_time)
+                                       ret = -1;
+                               else
+                                       ret = 1;
+                       } else if (first_item->is_attachment == second_item->is_attachment) {
+                               if(first_item->absolute_time > second_item->absolute_time)
+                                       ret = -1;
+                               else
+                                       ret = 1;
+                       } else
                                ret = 1;
                        break;
 
@@ -3251,13 +3528,23 @@ static void _insert_mail_to_recipient_mailist(EmailMailboxUGD *mailbox_ugd, list
                }
 
                // insert normal item
+               if (ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX) {
+               ld->item = elm_genlist_item_append(mailbox_ugd->gl[mailbox_ugd->view_type],
+                                               &(mailbox_ugd->itc4),
+                                               ld,
+                                               sender_group,
+                                               ELM_GENLIST_ITEM_NONE,
+                                               _list_item_clicked,
+                                               NULL);
+               } else {
                ld->item = elm_genlist_item_append(mailbox_ugd->gl[mailbox_ugd->view_type],
-                                               &(mailbox_ugd->itc1),
+                                               &(mailbox_ugd->itc2),
                                                ld,
                                                sender_group,
                                                ELM_GENLIST_ITEM_NONE,
                                                _list_item_clicked,
                                                NULL);
+               }
 
        }
        else
@@ -3272,13 +3559,24 @@ static void _insert_mail_to_recipient_mailist(EmailMailboxUGD *mailbox_ugd, list
                elm_genlist_item_select_mode_set(sender_group, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
                alias = g_strdup(ld->alias);
                // insert normal item
-               ld->item = elm_genlist_item_append(mailbox_ugd->gl[mailbox_ugd->view_type],
-                                               &(mailbox_ugd->itc1),
-                                               ld,
-                                               sender_group,
-                                               ELM_GENLIST_ITEM_NONE,
-                                               _list_item_clicked,
-                                               NULL);
+               if (ld->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX) {
+                       ld->item = elm_genlist_item_append(mailbox_ugd->gl[mailbox_ugd->view_type],
+                                                       &(mailbox_ugd->itc2),
+                                                       ld,
+                                                       sender_group,
+                                                       ELM_GENLIST_ITEM_NONE,
+                                                       _list_item_clicked,
+                                                       NULL);
+               } else {
+                       ld->item = elm_genlist_item_append(mailbox_ugd->gl[mailbox_ugd->view_type],
+                                                       &(mailbox_ugd->itc2),
+                                                       ld,
+                                                       sender_group,
+                                                       ELM_GENLIST_ITEM_NONE,
+                                                       _list_item_clicked,
+                                                       NULL);
+
+               }
        }
        debug_leave();
 }
diff --git a/mailbox/src/email-mailbox-move.c b/mailbox/src/email-mailbox-move.c
new file mode 100755 (executable)
index 0000000..d407b93
--- /dev/null
@@ -0,0 +1,941 @@
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.tizenopensource.org/license
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <status.h>
+#include "email-mailbox.h"
+#include "email-mailbox-list.h"
+#include "email-mailbox-item.h"
+#include "email-mailbox-move.h"
+
+extern gboolean _g_move_lock;
+extern gboolean _g_move_cancel_lock;
+
+extern Eina_List *edit_list;
+extern gboolean b_editmode;
+
+static Elm_Genlist_Item_Class itc_mailbox;
+static Elm_Genlist_Item_Class itc_mailbox_subtree;
+static Elm_Genlist_Item_Class itc_mailbox_subtree2;
+
+static void _make_folder_tree(email_move_list *move_list, void *data);
+static gboolean _mailbox_move_folder_item_dim_state_get(email_mailbox_t *mlist, EmailMailboxUGD *mailbox_ugd);
+static gboolean _mailbox_move_account_item_dim_state_get(int src_account_type, int account_id);
+static void _mailbox_list_move_cancel_cb(void *data, Evas_Object *obj, void *event_info);
+
+static Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part);
+static Evas_Object *_gl_icon_get_for_subitem(void *data, Evas_Object *obj, const char *part);
+static Evas_Object *_gl_icon_get_for_leafitem(void *data, Evas_Object *obj, const char *part);
+static char *_gl_label_get(void *data, Evas_Object *obj, const char *part);
+static char *_gl_label_get_for_subitem(void *data, Evas_Object *obj, const char *part);
+static void _gl_del(void *data, Evas_Object *obj);
+static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part);
+static void _gl_account_sel(void *data, Evas_Object *obj, void *event_info);
+static void _gl_sel(void *data, Evas_Object *obj, void *event_info);
+static void _gl_con(void *data, Evas_Object *obj, void *event_info);
+static void _gl_exp(void *data, Evas_Object *obj, void *event_info);
+static void _gl_exp_sel(void *data, Evas_Object *obj, void *event_info);
+static gboolean _check_duplicated_node(GNode *node, gpointer data);
+static void _folder_icon_clicked_cb(void *data, Evas_Object *obj, void *event_info);
+
+
+#define FOLDER_ICON_PLUS_FOLDER_LIST IMGDIR"/folder_plus.png"
+#define FOLDER_ICON_MINUS_FOLDER_LIST IMGDIR"/folder_minus.png"
+#define FOLDER_ICON_FOLDER_LIST IMGDIR"/folder.png"
+
+typedef struct _List_Item_Data List_Item_Data;
+struct _List_Item_Data {
+       EmailMailboxUGD *ug_data;
+       email_move_list *move_folder;
+
+       Elm_Object_Item *it; // Genlist Item pointer
+       Eina_Bool checked; // Check status
+
+       GNode *child;
+};
+
+int create_mailbox_move_list_view(void *data, int account_id)
+{
+       debug_log("");
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+
+       Evas_Object *genlist_for_move = elm_genlist_add(mailbox_ugd->navi_bar);
+       Evas_Object *btn = elm_button_add(mailbox_ugd->navi_bar);
+       elm_object_style_set(btn, "naviframe/end_btn/default");
+       evas_object_smart_callback_add(btn, "clicked", _mailbox_list_move_cancel_cb, mailbox_ugd);
+       elm_naviframe_item_push(mailbox_ugd->navi_bar, dgettext("sys_string", "IDS_COM_BODY_MOVE"), btn, NULL, genlist_for_move, NULL);
+
+       int i = 0;
+       int err = EMAIL_ERROR_NONE;
+       Elm_Object_Item *account_item = NULL;
+       int src_type = GET_ACCOUNT_SERVER_TYPE(account_id);
+
+       if(mailbox_ugd->move_account_list && mailbox_ugd->move_account_cnt > 0) {
+               err = email_engine_free_account_list(&(mailbox_ugd->move_account_list), mailbox_ugd->move_account_cnt);
+               if (err == 0) {
+                       debug_critical("fail to free account - err(%d)", err);
+               }
+       }
+
+       err = email_engine_get_account_list(&(mailbox_ugd->move_account_cnt), &(mailbox_ugd->move_account_list));
+
+       if (err != EMAIL_ERROR_NONE || mailbox_ugd->move_account_cnt == 0 || !mailbox_ugd->move_account_list) {
+               debug_critical("fail to get account list- err(%d), count(%d), account_list(%p)", err, mailbox_ugd->move_account_cnt, mailbox_ugd->move_account_list);
+               return err;
+       }
+       email_move_list *move_list = (email_move_list *) calloc(mailbox_ugd->move_account_cnt, sizeof(email_move_list));
+       memset((move_list), 0, (sizeof(email_move_list)*mailbox_ugd->move_account_cnt));
+
+       mailbox_ugd->move_list = move_list;
+
+       itc_mailbox.item_style = "dialogue/3text.1icon/expandable";
+       itc_mailbox.func.text_get = _gl_label_get;
+       itc_mailbox.func.content_get = _gl_icon_get;
+       itc_mailbox.func.state_get = _gl_state_get;
+       itc_mailbox.func.del = _gl_del;
+       itc_mailbox.decorate_all_item_style = NULL;
+
+       for (i = 0; i < mailbox_ugd->move_account_cnt; i++) {
+               List_Item_Data *tree_item_data;
+               int mailbox_list_count = 0;
+               int err = 0;
+               email_mailbox_t *mailbox_list = NULL;
+
+               err = email_get_mailbox_list_ex(mailbox_ugd->move_account_list[i].account_id, -1, 1, &mailbox_list, &mailbox_list_count);
+               if (err != EMAIL_ERROR_NONE) {
+                       debug_critical("email_get_mailbox_list return error");
+               }
+               move_list[i].mailbox_ugd = (EmailMailboxUGD *)data;
+               move_list[i].account_info = &(mailbox_ugd->move_account_list[i]);
+               move_list[i].mailbox_list = mailbox_list;
+               move_list[i].mailbox_cnt = mailbox_list_count;
+
+               _make_folder_tree(&move_list[i], mailbox_ugd);
+               tree_item_data = calloc(1, sizeof(List_Item_Data));
+               tree_item_data->ug_data = (EmailMailboxUGD *)data;
+               tree_item_data->move_folder = &move_list[i];
+               tree_item_data->child = (GNode *)&move_list[i];
+
+               if(mailbox_ugd->move_account_list[i].account_id == account_id){
+                       tree_item_data->it = account_item = elm_genlist_item_append(genlist_for_move, &itc_mailbox, tree_item_data, NULL, ELM_GENLIST_ITEM_TREE, _gl_account_sel, tree_item_data);
+               }
+               else {
+                       tree_item_data->it = elm_genlist_item_append(genlist_for_move, &itc_mailbox, tree_item_data, NULL, ELM_GENLIST_ITEM_TREE, _gl_account_sel, tree_item_data);
+                       if(_mailbox_move_account_item_dim_state_get(src_type, mailbox_ugd->move_account_list[i].account_id)) {
+                               elm_object_item_disabled_set(tree_item_data->it, EINA_TRUE);
+                       }
+               }
+       }
+
+       evas_object_smart_callback_add(genlist_for_move, "expanded", _gl_exp, data);
+       evas_object_smart_callback_add(genlist_for_move, "contracted", _gl_con, genlist_for_move);
+
+       elm_genlist_item_expanded_set(account_item, 1);
+       elm_genlist_item_selected_set(account_item, EINA_FALSE);
+
+       return 0;
+}
+
+static void _make_folder_tree(email_move_list *move_list, void *data)
+{
+       debug_log("");
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+
+       int i = 0;
+       int j = 0;
+       email_mailbox_t *mailbox_list = move_list->mailbox_list;
+       int mailbox_count = move_list->mailbox_cnt;
+       gchar **vector[mailbox_count];
+       GNode *root = g_node_new(NULL);
+
+       for (i=0; i<mailbox_count; i++) {
+               vector[i] = g_strsplit_set(mailbox_list[i].mailbox_name, "/", -1);
+
+               if (vector[i] == NULL) {
+                       debug_log("vector is NULL");
+                       continue;
+               }
+
+               int vlen = g_strv_length(vector[i]);
+
+               if (vlen <= 0) {
+                       continue;
+               }
+               //              debug_log("vector[%d]: %s, mailbox_list[%d].mailbox_name: %s", i, vector[i][vlen-1], i, mailbox_list[i].mailbox_name);
+
+               if (vlen == 1) {
+                       GNode *child = g_node_new(mailbox_list+i);
+                       g_node_insert(root, -1, child);
+                       continue;
+               }
+
+               mailbox_ugd->current_parent = root;
+               for (j=0; j<vlen; j++) {
+                       /*check if it exist among the leaves*/
+                       mailbox_ugd->traverse_compare = g_strdup(vector[i][j]);
+                       mailbox_ugd->traverse_compare_mlist = &mailbox_list[i];
+                       g_node_traverse(mailbox_ugd->current_parent, G_IN_ORDER, G_TRAVERSE_ALL, -1, _check_duplicated_node, (gpointer)mailbox_ugd);
+                       if (mailbox_ugd->b_duplicated_node == 1) {
+                               GNode *child = g_node_new(mailbox_list+i);
+                               email_mailbox_t *mlist = (email_mailbox_t *)(child->data);
+                               email_mailbox_t *mlist_parent = (email_mailbox_t *)(mailbox_ugd->current_parent->data);
+
+                               mailbox_ugd->current_parent = g_node_insert(mailbox_ugd->current_parent, -1, child);
+                               debug_log("*** parent:%s - child:%s", mlist_parent->mailbox_name, mlist->mailbox_name);
+                       }
+                       mailbox_ugd->b_duplicated_node = 0;
+                       g_free(mailbox_ugd->traverse_compare);
+                       mailbox_ugd->traverse_compare = NULL;
+               }
+               g_strfreev(vector[i]);
+       }
+       move_list->folder_root = root;
+}
+
+static void _mailbox_list_move_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+
+       if (_g_move_cancel_lock)
+               return;
+       else
+               _g_move_cancel_lock = true;
+
+       _stop_emf_job(mailbox_ugd, mailbox_ugd->emf_handle, true);
+       elm_naviframe_item_pop(mailbox_ugd->navi_bar);
+
+       if(mailbox_ugd->selected_list) {
+               g_list_free(mailbox_ugd->selected_list);
+               mailbox_ugd->selected_list = NULL;
+       }
+       clear_mailbox_move_list_data(mailbox_ugd);
+
+       if (_g_move_lock) {
+               _g_move_lock = false;
+       }
+}
+
+static Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part)
+{
+       debug_log("");
+       if (!data) {
+               debug_log("data is NULL");
+               return NULL;
+       }
+
+       List_Item_Data *item_data = (List_Item_Data *)data;
+       email_move_list *move_folder = item_data->move_folder;
+
+       if (!strcmp(part, "elm.icon") || !strcmp(part, "elm.icon.1"))
+       {
+               Evas_Object *icon = elm_icon_add(obj);
+
+               elm_image_file_set(icon, move_folder->account_info->logo_icon_path, NULL);
+               debug_log("logo_icon_path:%s", move_folder->account_info->logo_icon_path);
+
+               evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+
+               return icon;
+       }
+       else if (!strcmp(part, "elm.swallow.colorbar"))
+       {
+               account_user_data_t *user_data = (account_user_data_t *)move_folder->account_info->user_data;
+               unsigned int val = user_data->index_color;
+               int r = (val & 0xff000000) >> 24;
+               int g = (val & 0x00ff0000) >> 16;
+               int b = (val & 0x0000ff00) >> 8;
+               int a = val & 0x000000ff;
+
+               Evas_Object *color_bar = evas_object_rectangle_add(evas_object_evas_get(obj));
+               evas_object_size_hint_fill_set(color_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_color_set(color_bar, r, g, b, a);
+
+               return color_bar;
+       }
+       else
+       {
+               debug_log("part is invalid");
+       }
+
+       return NULL;
+}
+
+static Evas_Object *_gl_icon_get_for_subitem(void *data, Evas_Object *obj, const char *part)
+{
+       debug_log("");
+       if (!data) {
+               debug_log("data is NULL");
+               return NULL;
+       }
+
+       if (!strcmp(part, "elm.icon") || !strcmp(part, "elm.icon.1"))
+       {
+               Evas_Object *icon = elm_icon_add(obj);
+               elm_image_file_set(icon, FOLDER_ICON_PLUS_FOLDER_LIST, NULL);
+               evas_object_smart_callback_add(icon, "clicked", _folder_icon_clicked_cb, data);
+               evas_object_propagate_events_set(icon, EINA_FALSE);
+               evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+               return icon;
+       }
+       else
+       {
+               debug_log("part is invalid");
+       }
+
+       return NULL;
+}
+
+static Evas_Object *_gl_icon_get_for_leafitem(void *data, Evas_Object *obj, const char *part)
+{
+       debug_log("");
+       if (!data) {
+               debug_log("data is NULL");
+               return NULL;
+       }
+
+       if (!strcmp(part, "elm.icon") || !strcmp(part, "elm.icon.1"))
+       {
+               Evas_Object *icon = elm_icon_add(obj);
+               elm_image_file_set(icon, FOLDER_ICON_FOLDER_LIST, NULL);
+               evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+
+               return icon;
+       }
+       else
+       {
+               debug_log("part is invalid");
+       }
+
+       return NULL;
+}
+
+static char *_gl_label_get(void *data, Evas_Object *obj, const char *part)
+{
+       debug_log("");
+       List_Item_Data *tree_item_data = (List_Item_Data *)data;
+
+       if(!tree_item_data) {
+               debug_log("tree_item_data is NULL");
+               return NULL;
+       }
+       email_move_list *move_folder = tree_item_data->move_folder;
+
+       if (move_folder == NULL) {
+               debug_log("move_folder is NULL !!");
+               return NULL;
+       }
+
+       if (!strcmp(part, "elm.text.1")) {
+               if (move_folder->account_info->account_name != NULL) {
+                       debug_log("account_name: %s", move_folder->account_info->account_name);
+                       return g_strdup(move_folder->account_info->account_name);
+               }
+       } else if (!strcmp(part, "elm.text.2")) {
+               if (move_folder->account_info->user_email_address != NULL) {
+                       debug_log("user_email_addr: %s", move_folder->account_info->user_email_address);
+                       return g_strdup(move_folder->account_info->user_email_address);
+               }
+       }
+
+       return NULL;
+}
+
+static char *_gl_label_get_for_subitem(void *data, Evas_Object *obj, const char *part)
+{
+       debug_log("");
+       List_Item_Data *tree_item_data = (List_Item_Data*)data;
+
+       if(!tree_item_data) {
+               debug_log("tree_item_data is NULL");
+               return NULL;
+       }
+
+       GNode *node = (GNode *)tree_item_data->child;
+       email_mailbox_t *mlist = (email_mailbox_t *)(node->data);
+
+       if (mlist == NULL) {
+               debug_log("mlist is NULL !!");
+               return NULL;
+       }
+
+       if (!strcmp(part, "elm.text")) {
+               if (mlist->alias != NULL) {
+                       return g_strdup(mlist->alias);
+               }
+       }
+
+       return NULL;
+}
+
+static void _gl_del(void *data, Evas_Object *obj)
+{
+       debug_log("");
+       List_Item_Data *item_data = (List_Item_Data *)data;
+       FREE(item_data);
+}
+
+static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part)
+{
+       debug_log("");
+       return EINA_FALSE;
+}
+
+static void _gl_account_sel(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       Eina_Bool expanded = EINA_FALSE;
+       if (event_info)
+               elm_genlist_item_selected_set(event_info, EINA_FALSE);
+       expanded = elm_genlist_item_expanded_get(event_info);
+       elm_genlist_item_expanded_set(event_info, !expanded);
+}
+
+static void _gl_sel(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       if (data == NULL) {
+               debug_log("data is NULL");
+               return;
+       }
+       email_move_list *move_list = (email_move_list *) data;
+       Elm_Object_Item *it = event_info;
+       List_Item_Data *item_data = elm_object_item_data_get((const Elm_Object_Item *)it);
+
+       if (item_data == NULL) {
+               debug_log("item_data is NULL");
+               return;
+       }
+       EmailMailboxUGD *mailbox_ugd = move_list->mailbox_ugd;
+       int post_rt = 0;
+       int i = 0, err = 0, task_id = 0;
+       email_mail_list_item_t* mail_info = NULL;
+       GNode *node = (GNode *)item_data->child;
+       email_mailbox_t *mlist = (email_mailbox_t *)(node->data);
+       int count = g_list_length(mailbox_ugd->selected_list);
+       int mail_ids[count];
+
+       elm_genlist_item_update(it);
+       debug_log("selected account_id : %d, selected mailbox_id : %d", move_list->account_info->account_id, mlist->mailbox_id);
+
+       if(count < 0) {
+               debug_log("There's no selected mail.");
+               goto FINISH;
+       }
+
+       memset(mail_ids, 0, sizeof(mail_ids));
+
+       GList* cur = g_list_first(mailbox_ugd->selected_list);
+       for( ; i < count ; i++, cur=g_list_next(cur)) {
+               mail_ids[i] = (int) g_list_nth_data(cur, 0);
+               debug_log("mail_id (%d)", mail_ids[i]);
+       }
+
+       mail_info = get_mail_info(mail_ids[0]);
+       if(!mail_info) {
+               debug_log("get_mail_info is failed(mail_id : %d)", mail_ids[0]);
+               goto FINISH;
+       }
+
+       if(mail_info->account_id == move_list->account_info->account_id) {
+               err = email_move_mail_to_mailbox(mail_ids, count, mlist->mailbox_id);
+               if (err != EMAIL_ERROR_NONE) {
+                       debug_warning("email_move_mail_to_mailbox acct(%d) mailbox_id(%d) num(%d) - err (%d)",
+                                       move_list->account_info->account_id, mlist->mailbox_id, count, err);
+               }
+               if (err == EMAIL_ERROR_NONE && count >0) {
+                       post_rt = status_message_post(dgettext("sys_string", "IDS_COM_POP_MOVED"));
+                       if (post_rt) {
+                               debug_log("fail to status_message_post() : %d\n", err);
+                       }
+               }
+       }
+       else {
+               err = email_move_mails_to_mailbox_of_another_account(mail_info->mailbox_id, mail_ids, count, mlist->mailbox_id, &task_id);
+               if (err != EMAIL_ERROR_NONE) {
+                       debug_warning("email_move_mails_to_mailbox_of_another_account src mailbox(%d), dest acc(%d) mailbox_id(%d) num(%d) - err (%d)",
+                                       mail_info->mailbox_id, move_list->account_info->account_id, mlist->mailbox_id, count, err);
+               }
+       }
+
+       FREE(mail_info);
+
+FINISH:
+       g_list_free(mailbox_ugd->selected_list);
+       mailbox_ugd->selected_list = NULL;
+
+       elm_naviframe_item_pop(mailbox_ugd->navi_bar);
+
+       if(mailbox_ugd->view_type == EMAIL_VIEW_EDIT)
+       {
+               mailbox_ugd->view_type = mailbox_ugd->previous_view;
+
+               _clear_checked_status(mailbox_ugd);
+               edit_list = eina_list_free(edit_list);
+
+               elm_genlist_decorate_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_FALSE);
+               elm_genlist_reorder_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_FALSE);
+               elm_genlist_select_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], ELM_OBJECT_SELECT_MODE_DEFAULT);
+
+               b_editmode = false;
+               elm_object_disabled_set(mailbox_ugd->folder_button, EINA_FALSE);
+               elm_genlist_realized_items_update(mailbox_ugd->gl[mailbox_ugd->view_type]);
+               _update_navigationbar_title(mailbox_ugd);
+
+               if (mailbox_ugd->isRotate == true) {
+                       email_rotate_landscape(mailbox_ugd);
+               }
+       }
+
+       if (_g_move_lock) {
+               _g_move_lock = false;
+       }
+}
+
+static void _gl_con(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       Elm_Object_Item *it = event_info;
+
+       elm_genlist_item_selected_set(it, EINA_FALSE);
+       elm_genlist_item_subitems_clear(it);
+}
+
+static void _gl_exp(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+
+       Elm_Object_Item *it = event_info;
+       Evas_Object *gl = elm_object_item_widget_get(it);
+
+       itc_mailbox_subtree.item_style = "1text.1icon.2";
+       itc_mailbox_subtree.func.text_get = _gl_label_get_for_subitem;
+       itc_mailbox_subtree.func.content_get = _gl_icon_get_for_subitem;
+       itc_mailbox_subtree.func.state_get = _gl_state_get;
+       itc_mailbox_subtree.func.del = _gl_del;
+       itc_mailbox_subtree.decorate_all_item_style = NULL;
+
+       itc_mailbox_subtree2.item_style = "1text.1icon.2";
+       itc_mailbox_subtree2.func.text_get = _gl_label_get_for_subitem;
+       itc_mailbox_subtree2.func.content_get = _gl_icon_get_for_leafitem;
+       itc_mailbox_subtree2.func.state_get = _gl_state_get;
+       itc_mailbox_subtree2.func.del = _gl_del;
+       itc_mailbox_subtree2.decorate_all_item_style = NULL;
+
+       int i = 0;
+       int depth = elm_genlist_item_expanded_depth_get(it);
+       Elm_Object_Item *sub_it = NULL;
+       List_Item_Data *tree_item_data;
+
+       debug_log("depth: %d", depth);
+
+       if (depth == 0) {
+               List_Item_Data *item_data = (List_Item_Data *)elm_object_item_data_get((const Elm_Object_Item *)it);
+               if (item_data == NULL) {
+                       debug_log("item data is NULL");
+                       return;
+               }
+               email_move_list *move_folder = item_data->move_folder;
+
+               int n_children = g_node_n_children(move_folder->folder_root);
+               debug_log("n_children of root: %d", n_children);
+
+               for (i = 0; i < n_children; i++) {
+                       GNode *child = g_node_nth_child(move_folder->folder_root, i);
+                       if (g_node_n_children(child) > 0) {
+                               tree_item_data = calloc(1, sizeof(List_Item_Data));
+                               tree_item_data->ug_data = move_folder->mailbox_ugd;
+                               tree_item_data->move_folder = move_folder;
+                               tree_item_data->child = child;
+                               sub_it = tree_item_data->it = elm_genlist_item_append(gl, &itc_mailbox_subtree, tree_item_data, it,
+                                                       ELM_GENLIST_ITEM_TREE, _gl_exp_sel, move_folder);
+                               if(_mailbox_move_folder_item_dim_state_get((email_mailbox_t *)(child->data), tree_item_data->ug_data)) {
+                                       elm_object_item_disabled_set(tree_item_data->it, EINA_TRUE);
+                               }
+                               //debug_log("move_folder: %p, tree_item_data:%p, tree_item_data->it : %p, it: %p, child: %p", move_folder, tree_item_data, tree_item_data->it, it, child);
+                       } else {
+                               tree_item_data = calloc(1, sizeof(List_Item_Data));
+                               tree_item_data->ug_data = move_folder->mailbox_ugd;
+                               tree_item_data->move_folder = move_folder;
+                               tree_item_data->child = child;
+                               debug_log("tree_item_data : %p", tree_item_data);
+                               tree_item_data->it = elm_genlist_item_append(gl, &itc_mailbox_subtree2, tree_item_data, it,
+                                                       ELM_GENLIST_ITEM_NONE, _gl_sel, move_folder);
+                               if(_mailbox_move_folder_item_dim_state_get((email_mailbox_t *)(child->data), tree_item_data->ug_data)) {
+                                       elm_object_item_disabled_set(tree_item_data->it, EINA_TRUE);
+                               }
+                               //debug_log("move_folder: %p, tree_item_data:%p, tree_item_data->it : %p, it: %p, child: %p", move_folder, tree_item_data, tree_item_data->it, it, child);
+                       }
+               }
+       }
+       else if (depth > 0) {
+               List_Item_Data *item_data = (List_Item_Data *)elm_object_item_data_get((const Elm_Object_Item *)it);
+               if (item_data == NULL) {
+                       debug_log("item data is NULL");
+                       return;
+               }
+               GNode *sub_root = (GNode *)item_data->child;
+
+               int n_children = g_node_n_children(sub_root);
+               debug_log("n_children of sub_root depth[%d]: %d", depth, n_children);
+
+               Elm_Object_Item *parent_it =it;
+               for (i = 0; i < depth; i++)
+                       parent_it = elm_genlist_item_parent_get(parent_it);
+
+               List_Item_Data *parent_item_data = elm_object_item_data_get((const Elm_Object_Item *)parent_it);
+               if (parent_item_data == NULL) {
+                       debug_log("parent item data is NULL");
+                       return;
+               }
+               email_move_list *move_folder = item_data->move_folder;
+
+               for (i = 0; i < n_children; i++) {
+                       GNode *child = g_node_nth_child(sub_root, i);
+                       if (g_node_n_children(child) > 0) {
+                               tree_item_data = calloc(1, sizeof(List_Item_Data));
+                               tree_item_data->ug_data = move_folder->mailbox_ugd;
+                               tree_item_data->move_folder = move_folder;
+                               tree_item_data->child = child;
+                               sub_it = tree_item_data->it = elm_genlist_item_append(gl, &itc_mailbox_subtree, tree_item_data, it,
+                                                       ELM_GENLIST_ITEM_TREE, _gl_exp_sel, move_folder);
+                               if(_mailbox_move_folder_item_dim_state_get((email_mailbox_t *)(child->data), tree_item_data->ug_data)) {
+                                       elm_object_item_disabled_set(tree_item_data->it, EINA_TRUE);
+                               }
+                               //debug_log("move_folder: %p, tree_item_data:%p, tree_item_data->it : %p, it: %p, child: %p", move_folder, tree_item_data, tree_item_data->it, it, child);
+                       } else {
+                               tree_item_data = calloc(1, sizeof(List_Item_Data));
+                               tree_item_data->ug_data = move_folder->mailbox_ugd;
+                               tree_item_data->move_folder = move_folder;
+                               tree_item_data->child = child;
+                               tree_item_data->it = elm_genlist_item_append(gl, &itc_mailbox_subtree2, tree_item_data, it,
+                                                       ELM_GENLIST_ITEM_NONE, _gl_sel, move_folder);
+                               if(_mailbox_move_folder_item_dim_state_get((email_mailbox_t *)(child->data), tree_item_data->ug_data)) {
+                                       elm_object_item_disabled_set(tree_item_data->it, EINA_TRUE);
+                               }
+                               //debug_log("move_folder: %p, tree_item_data:%p, tree_item_data->it : %p, it: %p, child: %p", move_folder, tree_item_data, tree_item_data->it, it, child);
+                       }
+               }
+       }
+}
+
+static void _gl_exp_sel(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       if (!data) {
+               debug_log("data is NULL");
+               return;
+       }
+
+       email_move_list *move_list = (email_move_list *) data;
+       Elm_Object_Item *it = event_info;
+       List_Item_Data *item_data = elm_object_item_data_get((const Elm_Object_Item *)it);
+
+       if (item_data == NULL) {
+               debug_log("item_data is NULL");
+               return;
+       }
+       elm_genlist_item_selected_set(it, 0);
+
+       Evas_Coord x, y = 0;
+       evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y);
+       debug_log("X = %d, Y = %d", x, y);
+
+       GNode *node = (GNode *)item_data->child;
+       email_mailbox_t *mlist = (email_mailbox_t *)(node->data);
+       EmailMailboxUGD *mailbox_ugd = move_list->mailbox_ugd;
+       gchar **vector = NULL;
+       vector = g_strsplit_set(mlist->mailbox_name, "/", -1);
+       int vlen = g_strv_length(vector);
+
+       if (mailbox_ugd == NULL) {
+               debug_log("mailbox_ugd is NULL");
+               return;
+       }
+
+       int main_w = mailbox_ugd->main_w;
+       int main_h = mailbox_ugd->main_h;
+       debug_log("isRotate = %d, main_w: %d, main_h:%d", mailbox_ugd->isRotate, main_w, main_h);
+
+       if (mailbox_ugd->isRotate == false)
+       {
+               if (x > 0 && x < (100+(vlen*28))) {
+                       debug_log("Potrait Mode");
+                       return;
+               }
+       } else {
+               if (x > 0 && x < (100+(vlen*28))) {
+                       debug_log("Landscape Mode");
+                       return;
+               }
+       }
+       g_strfreev(vector);
+
+       if (mailbox_ugd->isRotate == false)
+       {
+               if (x > 0 && x < 148) {
+                       debug_log("Potrait Mode");
+                       return;
+               }
+       } else {
+               if (x > 0 && x < 148) {
+                       debug_log("Landscape Mode");
+                       return;
+               }
+       }
+
+       int post_rt = 0;
+       int i = 0, err = 0, task_id = 0;
+       email_mail_list_item_t* mail_info = NULL;
+       int count = g_list_length(mailbox_ugd->selected_list);
+       int mail_ids[count];
+
+       elm_genlist_item_update(it);
+       debug_log("selected account_id : %d, selected mailbox_id : %d", move_list->account_info->account_id, mlist->mailbox_id);
+
+       if(count < 0) {
+               debug_log("There's no selected mail.");
+               goto FINISH;
+       }
+
+       memset(mail_ids, 0, sizeof(mail_ids));
+
+       GList* cur = g_list_first(mailbox_ugd->selected_list);
+       for( ; i < count ; i++, cur=g_list_next(cur)) {
+               mail_ids[i] = (int) g_list_nth_data(cur, 0);
+               debug_log("mail_id (%d)", mail_ids[i]);
+       }
+
+       mail_info = get_mail_info(mail_ids[0]);
+       if(!mail_info) {
+               debug_log("get_mail_info is failed(mail_id : %d)", mail_ids[0]);
+               goto FINISH;
+       }
+
+       if(mail_info->account_id == move_list->account_info->account_id) {
+               err = email_move_mail_to_mailbox(mail_ids, count, mlist->mailbox_id);
+               if (err != EMAIL_ERROR_NONE) {
+                       debug_warning("email_move_mail_to_mailbox acct(%d) mailbox_id(%d) num(%d) - err (%d)",
+                                       move_list->account_info->account_id, mlist->mailbox_id, count, err);
+               }
+       }
+       else {
+               err = email_move_mails_to_mailbox_of_another_account(mail_info->mailbox_id, mail_ids, count, mlist->mailbox_id, &task_id);
+               if (err != EMAIL_ERROR_NONE) {
+                       debug_warning("email_move_mails_to_mailbox_of_another_account src mailbox(%d), dest acc(%d) mailbox_id(%d) num(%d) - err (%d)",
+                                       mail_info->mailbox_id, move_list->account_info->account_id, mlist->mailbox_id, count, err);
+               }
+       }
+
+       if (err == EMAIL_ERROR_NONE && count >0) {
+               post_rt = status_message_post(dgettext("sys_string", "IDS_COM_POP_MOVED"));
+               if (post_rt) {
+                       debug_log("fail to status_message_post() : %d\n", err);
+               }
+       }
+       FREE(mail_info);
+
+       FINISH:
+       g_list_free(mailbox_ugd->selected_list);
+       mailbox_ugd->selected_list = NULL;
+
+       elm_naviframe_item_pop(mailbox_ugd->navi_bar);
+
+       if(mailbox_ugd->view_type == EMAIL_VIEW_EDIT)
+       {
+               mailbox_ugd->view_type = mailbox_ugd->previous_view;
+
+               edit_list = eina_list_free(edit_list);
+
+               elm_genlist_decorate_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_FALSE);
+               elm_genlist_reorder_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_FALSE);
+               elm_genlist_select_mode_set(mailbox_ugd->gl[mailbox_ugd->view_type], ELM_OBJECT_SELECT_MODE_DEFAULT);
+
+               b_editmode = false;
+               elm_object_disabled_set(mailbox_ugd->folder_button, EINA_FALSE);
+               _update_navigationbar_title(mailbox_ugd);
+
+               if (mailbox_ugd->isRotate == true) {
+                       email_rotate_landscape(mailbox_ugd);
+               }
+       }
+
+       if (_g_move_lock) {
+               _g_move_lock = false;
+       }
+
+}
+
+static gboolean _check_duplicated_node(GNode *node, gpointer data)
+{
+       debug_log("");
+       if (!data) {
+               debug_log("data is NULL");
+               return FALSE;
+       }
+
+       if (!node) {
+               debug_log("node is NULL");
+               return FALSE;
+       }
+
+       if (!(node->data)) {
+               debug_log("node data is NULL");
+               return FALSE;
+       }
+
+       gboolean b_search_parent = FALSE;
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+       email_mailbox_t *node_data = (email_mailbox_t *)node->data;
+       gchar **vector = NULL;
+       vector = g_strsplit_set(node_data->mailbox_name, "/", -1);
+       int vlen = g_strv_length(vector);
+
+
+       gchar **vector2 = NULL;
+       vector2 = g_strsplit_set(mailbox_ugd->traverse_compare_mlist->mailbox_name, "/", -1);
+       int vlen2 = g_strv_length(vector2);
+       gchar *foler_name = g_strdup(vector2[vlen2-1]);
+       gchar* retval = g_strdup(mailbox_ugd->traverse_compare_mlist->mailbox_name);
+       gchar* ptr = NULL;
+       ptr = g_strrstr_len(retval, -1, foler_name);
+       if (ptr != NULL && vlen > 1 && vlen2 > 1){
+               gchar* temp = g_strndup(retval, ptr-retval-1);
+               b_search_parent = TRUE;
+               g_free(retval);
+               retval = g_strdup(temp);
+               g_free(temp);
+       }
+       if(node_data->mailbox_id == mailbox_ugd->traverse_compare_mlist->mailbox_id
+               || vlen != (vlen2-1))
+       {
+               g_free(retval);
+               g_strfreev(vector);
+               g_strfreev(vector2);
+               return FALSE;
+       }
+
+       if ((b_search_parent == FALSE && g_strcmp0(vector[vlen-1], mailbox_ugd->traverse_compare) == 0)
+               ||( b_search_parent == TRUE && g_strcmp0(node_data->mailbox_name, retval) == 0)) {
+               mailbox_ugd->b_duplicated_node = 1;
+               mailbox_ugd->current_parent = node;
+               debug_log("** find dup(%s), b_search_parent(%d)", vector[vlen-1], b_search_parent);
+
+               g_free(retval);
+               g_strfreev(vector);
+               g_strfreev(vector2);
+               return TRUE;
+       }
+
+       g_free(retval);
+       g_strfreev(vector);
+       g_strfreev(vector2);
+       return FALSE;
+}
+
+static gboolean _mailbox_move_folder_item_dim_state_get(email_mailbox_t *mlist, EmailMailboxUGD *mailbox_ugd)
+{
+       debug_log("");
+
+       if(mlist && mailbox_ugd) {
+               if (mlist->mailbox_id != mailbox_ugd->move_src_mailbox_id &&
+                               mlist->mailbox_type != EMAIL_MAILBOX_TYPE_OUTBOX &&
+                               mlist->mailbox_type != EMAIL_MAILBOX_TYPE_SENTBOX &&
+                               mlist->mailbox_type != EMAIL_MAILBOX_TYPE_DRAFT &&
+                               mlist->mailbox_type != EMAIL_MAILBOX_TYPE_TRASH &&
+                               mlist->mailbox_type != EMAIL_MAILBOX_TYPE_ALL_EMAILS &&
+                               mlist->mailbox_type != EMAIL_MAILBOX_TYPE_SEARCH_RESULT) {
+                       if (g_strcmp0(mlist->alias, "[Gmail]") && !mlist->no_select) {
+                               return FALSE;
+                       } else {
+                               return TRUE;
+                       }
+               } else {
+                       return TRUE;
+               }
+       }
+
+       return FALSE;
+}
+
+static gboolean _mailbox_move_account_item_dim_state_get(int src_account_type, int account_id)
+{
+       debug_log("");
+       int type = GET_ACCOUNT_SERVER_TYPE(account_id);
+
+       if(src_account_type == EMAIL_SERVER_TYPE_POP3 || src_account_type == EMAIL_SERVER_TYPE_IMAP4) {
+               if(type == EMAIL_SERVER_TYPE_ACTIVE_SYNC) {
+                       return TRUE;
+               }
+       } else if (src_account_type == EMAIL_SERVER_TYPE_ACTIVE_SYNC) {
+               return TRUE;
+       } else {
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
+static void _folder_icon_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       List_Item_Data *item_data = (List_Item_Data *)data;
+       Eina_Bool expanded = EINA_FALSE;
+
+       if (item_data->it)
+               elm_genlist_item_selected_set(item_data->it, EINA_FALSE);
+       expanded = elm_genlist_item_expanded_get(item_data->it);
+       elm_genlist_item_expanded_set(item_data->it, !expanded);
+
+       if (expanded) {
+               elm_image_file_set(obj, FOLDER_ICON_MINUS_FOLDER_LIST, NULL);
+       } else {
+               elm_image_file_set(obj, FOLDER_ICON_PLUS_FOLDER_LIST, NULL);
+       }
+
+}
+void clear_mailbox_move_list_data(EmailMailboxUGD *mailbox_ugd)
+{
+       debug_log("");
+       int err = EMAIL_ERROR_NONE;
+       int i = 0;
+
+       if(!mailbox_ugd) {
+               debug_log("data(mailbox_ugd) is NULL");
+               return;
+       }
+
+       if(mailbox_ugd->move_list) {
+               email_move_list *move_list = mailbox_ugd->move_list;
+               for (i = 0; i < mailbox_ugd->move_account_cnt; i++) {
+                       if(move_list[i].mailbox_list) {
+                               err = email_free_mailbox(&(move_list[i].mailbox_list), move_list[i].mailbox_cnt);
+                               if (err != EMAIL_ERROR_NONE) {
+                                       debug_critical("fail to free mailbox list - err(%d)", err);
+                               }
+                       }
+               }
+               err = email_engine_free_account_list(&(mailbox_ugd->move_account_list), mailbox_ugd->move_account_cnt);
+               if (err == 0) {
+                       debug_critical("fail to free account - err(%d)", err);
+               }
+       }
+
+       FREE(mailbox_ugd->move_list);
+       mailbox_ugd->move_list = NULL;
+       debug_log("mailbox_ugd->move_account_cnt : %d", mailbox_ugd->move_account_cnt);
+       mailbox_ugd->move_account_cnt = 0;
+
+}
index c74a521..aac0567 100755 (executable)
  * limitations under the License.
  */
 
+#include <status.h>
+
 #include "email-mailbox.h"
 #include "email-mailbox-item.h"
 #include "email-mailbox-list.h"
 #include "email-mailbox-search.h"
 #include "email-mailbox-noti-mgr.h"
+#include "email-mailbox-move.h"
+
 
 
 E_DBus_Connection *_g_mailbox_conn = NULL;
@@ -39,7 +43,9 @@ static void add_seed_mail_cb(void *data, Ecore_Thread *thd, void* msg_data);
 static gint _find_insert_position(gconstpointer a, gconstpointer b);
 static gint _find_next_group_position(gconstpointer a, gconstpointer b);
 static void _parse_set_flag_buf(char *inbuf, char **field_name, GList **mail_list);
-
+static void _mailbox_create_error_popup(int error_type, void *data);
+static void _popup_destroy_cb(void *data, Evas_Object *obj, void *event_info);
+static void _mailbox_remove_deleted_flag_mail(int mail_id, void *data);
 
 static gint _find_next_group_position(gconstpointer a, gconstpointer b)
 {
@@ -486,9 +492,9 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message)
 
                                        mailbox_ugd->account_id = 0;
                                        mailbox_ugd->mode = EMAIL_MAILBOX_MODE_ALL;
-                                       mailbox_ugd->mailbox_type = EMAIL_MAILBOX_TYPE_NONE;
+                                       mailbox_ugd->mailbox_type = EMAIL_MAILBOX_TYPE_INBOX;
                                        mailbox_ugd->mailbox_id = 0;
-                                       FREE(mailbox_ugd->user_email);
+                                       FREE(mailbox_ugd->account_name);
                                        FREE(mailbox_ugd->folder_alias);
 
                                        switch(view_type)
@@ -519,9 +525,13 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message)
                                break;
 
                        case NOTI_MAIL_MOVE:
+                               debug_log("NOTI_MAIL_MOVE");
                                account_id = data1;
                                msg_buf = data3;
 
+                               if(mailbox_ugd->move_account_list && mailbox_ugd->move_account_cnt > 0)
+                                       clear_mailbox_move_list_data(mailbox_ugd);
+
                                if(view_type == EMAIL_VIEW_RECIPIENT) {
                                        _refresh_mailbox(mailbox_ugd);
                                }
@@ -542,6 +552,7 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message)
                                break;
 
                        case NOTI_MAIL_DELETE:
+                               debug_log("NOTI_MAIL_DELETE");
                                account_id = data1;
                                msg_buf = data3;
 
@@ -565,6 +576,7 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message)
                                break;
 
                        case NOTI_MAIL_ADD: /* Seed mail was received */
+                               debug_log("NOTI_MAIL_ADD");
                                account_id = data1;
                                thread_id = data4;
                                mailid = data2;
@@ -687,6 +699,18 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message)
 
                                switch (update_type)
                                {
+                               case EMAIL_MAIL_ATTRIBUTE_FLAGS_DELETED_FIELD:
+                                       debug_log("DELETED FILED UPDATE");
+                                       if(mailbox_ugd->move_account_list && mailbox_ugd->move_account_cnt > 0) {
+                                               clear_mailbox_move_list_data(mailbox_ugd);
+                                               status_message_post(dgettext("sys_string", "IDS_COM_POP_MOVED"));
+                                       }
+
+                                       G_LIST_FOREACH(mail_list, cur, idx) {
+                                               debug_log("idx: [%d]", *idx);
+                                               _mailbox_remove_deleted_flag_mail(*idx, mailbox_ugd);
+                                       }
+                                       break;
                                case EMAIL_MAIL_ATTRIBUTE_FLAGS_SEEN_FIELD:
                                        G_LIST_FOREACH(mail_list, cur, idx) {
                                                debug_log("idx: [%d]", *idx);
@@ -728,6 +752,17 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message)
                                                }
                                        }
                                        break;
+                               case EMAIL_MAIL_ATTRIBUTE_SAVE_STATUS:
+                                       G_LIST_FOREACH(mail_list, cur, idx) {
+
+                                               debug_log("idx: [%d]", *idx);
+                                               list_data *ld = _find_mailinfo_by_mailid(*idx, mailbox_ugd->list_data[view_type]);
+                                               if(ld) {
+                                                       ld->mail_status = value;
+                                                       elm_genlist_item_update(ld->item);
+                                               }
+                                       }
+                                       break;
                                }
                                if(mail_list) {
                                        G_LIST_FOREACH(mail_list, cur, idx) {
@@ -793,6 +828,9 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message)
                                                evas_object_show(mailbox_ugd->update_button);
                                        }
 
+                                       if(data4 != EMAIL_ERROR_NONE)
+                                               _mailbox_create_error_popup(data4, local_data);
+
                                        if(subtype == NOTI_DOWNLOAD_FAIL && (data4 == EMAIL_ERROR_LOGIN_FAILURE || data4 == EMAIL_ERROR_AUTHENTICATE)) {
                                                int mailbox_id = 0;
                                                if(data2)
@@ -872,5 +910,89 @@ static void _parse_set_flag_buf(char *inbuf, char **field_name, GList **mail_lis
        g_strfreev(outer_tok);
 
 }
+static void _mailbox_create_error_popup(int error_type, void *data)
+{
+       debug_log("");
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+       Evas_Object *popup = NULL, *btn1 = NULL;
+       char *popup_text = NULL;
 
+       switch(error_type)
+       {
+               case EMAIL_ERROR_ACCOUNT_IS_BLOCKED:
+                       popup_text = _("IDS_EMAIL_POP_UNABLE_TO_CONNECT_TO_SERVER");
+                       break;
+
+               default:
+                       debug_log("Can't find error string. error_type : %d", error_type);
+                       break;
+       }
+
+       if(popup_text) {
+               popup = elm_popup_add(mailbox_ugd->win_main);
+               evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               elm_object_text_set(popup, popup_text);
+               btn1 = elm_button_add(popup);
+               elm_object_text_set(btn1, dgettext("sys_string", "IDS_COM_SK_OK"));
+               elm_object_part_content_set(popup, "button1", btn1);
+               evas_object_smart_callback_add(btn1, "clicked", _popup_destroy_cb, popup);
+               evas_object_show(popup);
+               debug_log("error_type : %d", error_type);
+       }
+}
+
+static void _popup_destroy_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       if(data) {
+               evas_object_del(data);
+       } else {
+               debug_log("popup destroy failed, data is null");
+       }
+}
+
+static void _mailbox_remove_deleted_flag_mail(int mail_id, void *data)
+{
+       debug_log("");
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+       int view_type = mailbox_ugd->view_type;
+
+       if(mail_id <= 0) {
+               debug_log("Invalid parameter(mail_id)");
+               return;
+       }
+       debug_log("mail_id : %d view_type : %d, mailbox_ugd->mode : %d", mail_id, view_type, mailbox_ugd->mode);
+       list_data *ld = _find_mailinfo_by_mailid(mail_id, mailbox_ugd->list_data[view_type]);
+       if(ld) {
+               debug_log("list data exist");
+               if(view_type != EMAIL_VIEW_EDIT && view_type != EMAIL_VIEW_SEARCH)
+               {
+                       debug_log("ld->mailbox_type %d ld->mailbox_id :%d, mailbox_ugd->mailbox_id : %d", ld->mailbox_type, ld->mailbox_id, mailbox_ugd->mailbox_id);
+                       if ((mailbox_ugd->mode == EMAIL_MAILBOX_MODE_ALL && mailbox_ugd->mailbox_type == ld->mailbox_type)
+                                       || (mailbox_ugd->mode == EMAIL_MAILBOX_MODE_MAILBOX && ld->mailbox_id == mailbox_ugd->mailbox_id)) {
+                               debug_log("Remove mail from list mail_id : %d", ld->mail_id);
+                               mailbox_delete_mail_item_from_list(mailbox_ugd, ld);
+                               /* to be checked
+                               if(!g_list_length(mailbox_ugd->list_data[view_type]))
+                               {
+                                       debug_log("list_lock  : %d", list_lock);
+                                       if (!list_lock) {
+                                               if (evas_object_visible_get(mailbox_ugd->gl[view_type]))
+                                                       evas_object_hide(mailbox_ugd->gl[view_type]);
+                                       }
 
+                                       Evas_Object *no_content = elm_object_part_content_get(mailbox_ugd->search_layout, "noc");
+                                       elm_layout_theme_set(no_content, "layout", "nocontents", "text");
+                                       elm_object_part_text_set(no_content, "elm.text", dgettext("sys_string", "IDS_COM_BODY_NO_CONTENTS"));
+                                       edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "hide_list", "elm");
+                                       edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_noc", "elm");
+                                       if (mailbox_ugd->delete_all_button != NULL) {
+                                               elm_object_item_disabled_set(mailbox_ugd->delete_all_button, EINA_TRUE);
+                                       }
+                                       list_lock = true;
+                               }*/
+                       }
+               }
+       }
+
+}
index 266180b..1d151ab 100755 (executable)
@@ -24,6 +24,7 @@
 #include "email-common-types.h"
 #include "email-mailbox.h"
 #include "email-mailbox-list.h"
+#include "email-mailbox-controlbar.h"
 #include "email-mailbox-search.h"
 
 
@@ -96,15 +97,17 @@ void mailbox_create_searchbar(EmailMailboxUGD *mailbox_ugd)
        evas_object_size_hint_weight_set(searchbar_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(searchbar_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       elm_object_part_content_set(mailbox_ugd->sub_layout[mailbox_ugd->view_type], "searchbar", searchbar_layout);
+       //elm_object_part_content_set(mailbox_ugd->sub_layout[mailbox_ugd->view_type], "searchbar", searchbar_layout);
 
        //searchbar category button
        mailbox_ugd->searchby_button = elm_button_add(searchbar_layout);
        Evas_Object *searchby_icon = elm_icon_add(mailbox_ugd->searchby_button);
-       elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_all_press.png", NULL);
-       elm_image_resizable_set(searchby_icon, 0, 0);
+       elm_image_file_set(searchby_icon, IMGDIR"/M02_popup_icon_all.png", NULL);
+       elm_image_resizable_set(searchby_icon, EINA_TRUE, EINA_TRUE);
        evas_object_image_smooth_scale_set(searchby_icon, 0);
        elm_object_content_set(mailbox_ugd->searchby_button, searchby_icon);
+       elm_object_style_set(mailbox_ugd->searchby_button, "circle/empty");
+
        evas_object_smart_callback_add(mailbox_ugd->searchby_button, "clicked", _searchby_clicked_cb, mailbox_ugd);
        mailbox_ugd->search_type = EMAIL_SEARCH_ALL;
 
@@ -183,20 +186,20 @@ static void _searchby_clicked_cb(void *data, Evas_Object *obj, void *event_info)
                mailbox_ugd->searchby_ctx_popup = NULL;
        }
 
-       mailbox_ugd->searchby_ctx_popup = elm_ctxpopup_add(mailbox_ugd->navi_bar);
+       mailbox_ugd->searchby_ctx_popup = elm_ctxpopup_add(mailbox_ugd->win_main);
        evas_object_smart_callback_add(mailbox_ugd->searchby_ctx_popup, "dismissed", _searchby_dismissed_cb, mailbox_ugd);
 
        Evas_Object* icon;
        icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-       elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_all.png", NULL);
+       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_all.png", NULL);
        elm_ctxpopup_item_append(mailbox_ugd->searchby_ctx_popup, dgettext("sys_string", "IDS_COM_BODY_ALL"), icon, _searchby_ctxpopup_cb, mailbox_ugd);
 
        icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-       elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_title.png", NULL);
+       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_title.png", NULL);
        elm_ctxpopup_item_append(mailbox_ugd->searchby_ctx_popup, dgettext("sys_string", "IDS_COM_BODY_DETAILS_TITLE"), icon, _searchby_ctxpopup_cb, mailbox_ugd);
 
        icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-       elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_sender.png", NULL);
+       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_sender.png", NULL);
 
        if ((mailbox_ugd->mailbox_type == EMAIL_MAILBOX_TYPE_SENTBOX)
                        || (mailbox_ugd->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX)
@@ -207,11 +210,11 @@ static void _searchby_clicked_cb(void *data, Evas_Object *obj, void *event_info)
        }
 
        icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-       elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_date.png", NULL);
+       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_date.png", NULL);
        elm_ctxpopup_item_append(mailbox_ugd->searchby_ctx_popup, _("IDS_EMAIL_OPT_DATE"), icon, _searchby_ctxpopup_cb, mailbox_ugd);
 
        icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-       elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_advanced.png", NULL);
+       elm_image_file_set(icon, IMGDIR "/M02_popup_icon_advanced.png", NULL);
        elm_ctxpopup_item_append(mailbox_ugd->searchby_ctx_popup, _("IDS_EMAIL_OPT_ADVANCED"), icon, _searchby_ctxpopup_cb, mailbox_ugd);
 
        _move_searchby_ctxpopup(mailbox_ugd->searchby_ctx_popup, obj);
@@ -282,26 +285,26 @@ static void _searchby_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info
 
        if (search_type == EMAIL_SEARCH_ALL)            // All
        {
-               elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_all_press.png", NULL);
+               elm_image_file_set(searchby_icon, IMGDIR"/M02_popup_icon_all.png", NULL);
        }
        else if (search_type == EMAIL_SEARCH_SUBJECT)   // SUBJECT
        {
-               elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_title_press.png", NULL);
+               elm_image_file_set(searchby_icon, IMGDIR"/M02_popup_icon_title.png", NULL);
        }
        else if (search_type == EMAIL_SEARCH_FROM || search_type == EMAIL_SEARCH_TO)    // FROM or Recipient(TO)
        {
-               elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_sender_press.png", NULL);
+               elm_image_file_set(searchby_icon, IMGDIR"/M02_popup_icon_sender.png", NULL);
        }
        else if (search_type == EMAIL_SEARCH_DATE)      // Date
        {
-               elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_date_press.png", NULL);
+               elm_image_file_set(searchby_icon, IMGDIR"/M02_popup_icon_date.png", NULL);
        }
        else if (search_type == EMAIL_SEARCH_ADVANCED)  // Advanced
        {
-               elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_advanced_press.png", NULL);
+               elm_image_file_set(searchby_icon, IMGDIR"/M02_popup_icon_advanced.png", NULL);
        }
 
-       elm_image_resizable_set(searchby_icon, 0, 0);
+       elm_image_resizable_set(searchby_icon, EINA_TRUE, EINA_TRUE);
        evas_object_image_smooth_scale_set(searchby_icon, 0);
        elm_object_content_set(mailbox_ugd->searchby_button, searchby_icon);
 
@@ -354,14 +357,10 @@ static void _searchbar_entry_focus_cb(void *data, Evas_Object *obj, void *event_
        }
 
        elm_genlist_realized_items_update(mailbox_ugd->gl[mailbox_ugd->view_type]);
-
-       //elm_object_item_part_content_unset(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "controlbar");
-
        //_delete_controlbar(mailbox_ugd);
-       elm_object_item_signal_emit(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "elm,state,controlbar,close", "");
+       _hide_toolbar(mailbox_ugd);
 
        debug_log("view_type = %d", mailbox_ugd->view_type);
-       elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_HEADER_SEARCH"));
 
        mailbox_ugd->previous_view = mailbox_ugd->view_type;
        mailbox_ugd->view_type = EMAIL_VIEW_SEARCH;
@@ -432,18 +431,34 @@ void mailbox_finish_search_mode(EmailMailboxUGD *mailbox_ugd)
 
        evas_object_smart_callback_del(mailbox_ugd->searchbar_en, "changed", _searchbar_entry_changed_cb);
        elm_entry_entry_set(mailbox_ugd->searchbar_en, "");
+       elm_object_signal_emit(mailbox_ugd->searchbar_area, "elm,state,eraser,hide", "elm");
        elm_object_signal_emit(mailbox_ugd->searchbar_area, "elm,state,guidetext,show", "elm");
        elm_object_signal_emit(mailbox_ugd->searchbar_area, "cancel,out", "");
        elm_object_focus_set(mailbox_ugd->searchbar_area, EINA_FALSE);
        elm_object_focus_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_TRUE);
 
-       elm_object_disabled_set(mailbox_ugd->folder_button, EINA_FALSE);
 
        mailbox_ugd->view_type = mailbox_ugd->previous_view;
 
        list_lock = false;
 
-       _update_navigationbar_title(mailbox_ugd);
+       if (!evas_object_visible_get(mailbox_ugd->navi_title_ly)) {
+               debug_log("title is not visible, show title. view_type:%d, previous_view:%d", mailbox_ugd->view_type, mailbox_ugd->previous_view);
+               elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "title", mailbox_ugd->navi_title_ly);
+               evas_object_show(mailbox_ugd->navi_title_ly);
+       }
+
+
+       if (evas_object_visible_get(mailbox_ugd->searchbar_layout)) {
+               debug_log("search_bar is visible, hide search bar");
+               elm_entry_entry_set(mailbox_ugd->searchbar_en, "");
+               elm_object_focus_set(mailbox_ugd->searchbar_layout, EINA_FALSE);
+               elm_object_part_content_unset(mailbox_ugd->search_layout, "searchbar");
+               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "hide_searchbar", "search");
+               evas_object_hide(mailbox_ugd->searchbar_layout);
+       }
+
+       _show_toolbar(mailbox_ugd);
        _refresh_mailbox(mailbox_ugd);
 }
 
@@ -562,7 +577,7 @@ static Eina_Bool _mailbox_create_search_criteria_view(int search_type, void *dat
        if ( search_type == EMAIL_SEARCH_ADVANCED ) {
                navi_item = elm_naviframe_item_push(mailbox_ugd->navi_bar, _("IDS_EMAIL_OPT_ADVANCED"), btn_back, NULL, genlist_for_search, NULL);
        } else if ( search_type == EMAIL_SEARCH_DATE ) {
-               navi_item = elm_naviframe_item_push(mailbox_ugd->navi_bar, N_("Date range"), btn_back, NULL, genlist_for_search, NULL);
+               navi_item = elm_naviframe_item_push(mailbox_ugd->navi_bar, _("IDS_EMAIL_HEADER_DATE_RANGE"), btn_back, NULL, genlist_for_search, NULL);
        }
 
        btn_ok = elm_button_add(mailbox_ugd->navi_bar);
@@ -573,8 +588,6 @@ static Eina_Bool _mailbox_create_search_criteria_view(int search_type, void *dat
        _mailbox_advanced_view_create_controlbar_button(btn_cancel, dgettext("sys_string", "IDS_COM_SK_CANCEL"), NULL, _mailbox_advanced_search_cancel_cb, data);
        elm_object_item_part_content_set(navi_item, "title_right_btn", btn_cancel);
 
-       elm_object_item_signal_emit(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "elm,state,controlbar,close", "");
-
        return 0;
 }
 void _mailbox_free_search_list_data(MailboxAdvSearchViewInfo *search_info)
@@ -611,14 +624,31 @@ static void _mailbox_advanced_search_cancel_cb(void *data, Evas_Object *obj, voi
        elm_naviframe_item_pop(mailbox_ugd->navi_bar);
        mailbox_ugd->b_advanced_search_view = false;
 
-       if(g_focus_lock) {
-               evas_object_smart_callback_del(mailbox_ugd->searchbar_en, "changed", _searchbar_entry_changed_cb);
-               evas_object_smart_callback_del(mailbox_ugd->searchbar_en, "preedit,changed", _searchbar_entry_changed_cb);
+       evas_object_smart_callback_del(mailbox_ugd->searchbar_en, "changed", _searchbar_entry_changed_cb);
+       evas_object_smart_callback_del(mailbox_ugd->searchbar_en, "preedit,changed", _searchbar_entry_changed_cb);
+
 
+       if(g_focus_lock) {
                elm_object_focus_set(mailbox_ugd->main_back_btn, EINA_TRUE);
                mailbox_finish_search_mode(mailbox_ugd);
-       }else {
-               _update_navigationbar_title(mailbox_ugd);
+       } else {
+               elm_object_focus_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_TRUE);
+
+               if (!evas_object_visible_get(mailbox_ugd->navi_title_ly)) {
+                       debug_log("title is not visible, show title. view_type:%d, previous_view:%d", mailbox_ugd->view_type, mailbox_ugd->previous_view);
+                       elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "title", mailbox_ugd->navi_title_ly);
+                       evas_object_show(mailbox_ugd->navi_title_ly);
+               }
+
+               if (evas_object_visible_get(mailbox_ugd->searchbar_layout)) {
+                       debug_log("search_bar is visible, hide search bar");
+                       elm_entry_entry_set(mailbox_ugd->searchbar_en, "");
+                       elm_object_focus_set(mailbox_ugd->searchbar_layout, EINA_FALSE);
+                       elm_object_part_content_unset(mailbox_ugd->search_layout, "searchbar");
+                       edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "hide_searchbar", "search");
+                       evas_object_hide(mailbox_ugd->searchbar_layout);
+               }
+               _show_toolbar(mailbox_ugd);
        }
 
 }
@@ -653,8 +683,6 @@ static void _mailbox_advanced_search_start_cb(void *data, Evas_Object *obj, void
 
                mailbox_ugd->b_advanced_search_view = false;
 
-               elm_object_item_signal_emit(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "elm,state,controlbar,close", "");
-
                elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_HEADER_SEARCH"));
 
                if(!g_focus_lock) {
@@ -697,13 +725,13 @@ static void _mailbox_create_list_view_for_advanced_search(void *data, int search
                i = 2;
                item_data[i].type = MAILBOX_SEARCH_LIST_TYPE_TITLE;
                item_data[i].search_info = mailbox_ugd->adv_search_info;
-               item = elm_genlist_item_append(genlist_for_search, &itc_search_view, &item_data[i], NULL,
+               elm_genlist_item_append(genlist_for_search, &itc_search_view, &item_data[i], NULL,
                                ELM_GENLIST_ITEM_NONE, _gl_advanced_search_sel_cb, &item_data[i]);
                /* Sender */
                i = 3;
                item_data[i].type = MAILBOX_SEARCH_LIST_TYPE_SENDER;
                item_data[i].search_info = mailbox_ugd->adv_search_info;
-               item = elm_genlist_item_append(genlist_for_search, &itc_search_view, &item_data[i], NULL,
+               elm_genlist_item_append(genlist_for_search, &itc_search_view, &item_data[i], NULL,
                                ELM_GENLIST_ITEM_NONE, _gl_advanced_search_sel_cb, &item_data[i]);
        } else if (search_type == EMAIL_SEARCH_DATE) {
                item_data = (mailbox_search_list_item *)calloc(2, sizeof(mailbox_search_list_item));
@@ -859,7 +887,7 @@ static Evas_Object *_gl_advanced_searcn_view_content_get_cb(void *data, Evas_Obj
                        search_info->from_date = t;
                        //should be replaced with new string
                        elm_object_part_content_set(search_info->search_date_from, "elm.icon", search_info->entry_date_from);
-                       elm_object_part_text_set(search_info->search_date_from, "elm.text", N_("From"));
+                       elm_object_part_text_set(search_info->search_date_from, "elm.text", _("IDS_EMAIL_BODY_FROM_M_PERIOD"));
                        evas_object_smart_callback_add(search_info->entry_date_from, "changed", _mailbox_search_from_date_changed_cb, data);
 
                        evas_object_show(search_info->entry_date_from);
@@ -883,7 +911,7 @@ static Evas_Object *_gl_advanced_searcn_view_content_get_cb(void *data, Evas_Obj
                        search_info->to_date = t;
                        //should be replaced with new string
                        elm_object_part_content_set(search_info->search_date_to, "elm.icon", search_info->entry_date_to);
-                       elm_object_part_text_set(search_info->search_date_to, "elm.text", N_("To"));
+                       elm_object_part_text_set(search_info->search_date_to, "elm.text", _("IDS_EMAIL_BODY_TO_M_PERIOD"));
                        evas_object_smart_callback_add(search_info->entry_date_to, "changed", _mailbix_search_to_date_changed_cb, data);
 
                        evas_object_show(search_info->entry_date_to);
index d3466f5..85ecc4b 100755 (executable)
@@ -62,8 +62,7 @@ Evas_Object* _create_sweep_read_unread_button(Evas_Object* parent,list_data* ld)
 
                evas_object_smart_callback_add(button, "clicked", _sweep_mark_as_read_unread_cb, ld);
 
-               if ((ld->mail_status == EMAIL_MAIL_STATUS_SENDING || ld->mail_status == EMAIL_MAIL_STATUS_SEND_WAIT)
-                       || (ld->thread_count > 1 && ld->mailbox_ugd->b_thread_list))
+               if ((ld->mail_status == EMAIL_MAIL_STATUS_SENDING || ld->mail_status == EMAIL_MAIL_STATUS_SEND_WAIT))
                {
                        elm_object_disabled_set(button,EINA_TRUE);
                }
@@ -204,7 +203,8 @@ static void _sweep_reply_cb(void *data, Evas_Object *obj, void *event_info)
        }
        list_data *ld = (list_data *)data;
 
-       debug_log("mailbox_ugd->account_id: %d", ld->account_id);
+       debug_log("ld->account_id: %d", ld->account_id);
+       debug_log("ld->mailbox_id: %d", ld->mailbox_id);
        debug_log("ld->mail_id: %d", ld->mail_id);
 
        if (ld->mailbox_ugd->ug_composer) {
index 99ad77b..35b9426 100755 (executable)
@@ -37,17 +37,22 @@ extern enum appcore_time_format icu_timeformat;
 extern Eina_List *edit_list;
 extern Elm_Object_Item *g_selected_item;
 
-
+extern gboolean g_focus_lock;
 /*
  * Function prototype declaration
  */
 static void _create_view(EmailMailboxUGD *mailbox_ugd);
+static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event);
 static void _title_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _change_unread_icon_to_read_icon(Elm_Object_Item *item);
 static void _create_all_emails_view(Evas_Object *parent, EmailMailboxUGD *mailbox_ugd);
 static Evas_Object *_create_navigation_layout(Evas_Object *parent);
-static void _account_cb(void *data, Evas_Object *obj, void *event_info);
-static void _folder_cb(void *data, Evas_Object *obj, void *event_info);
+static void _mailbox_account_cb(void *data, Evas_Object *obj, void *event_info);
+static void _mailbox_folder_ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void *event_info);
+static void _mailbox_folder_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info);
+static void _mailbox_move_folder_ctxpopup(Evas_Object *ctxpopup, Evas_Object *btn);
+static void _mailbox_create_folder_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info);
+static void _mailbox_show_all_folders(void *data, Evas_Object *obj, void *event_info);
 static void _add_account(void *data);
 //static void _process_mailview_back(EmailMailboxUGD *mailbox_ugd);
 //static char *_gl_text_get(void *data, Evas_Object *obj, const char *part);
@@ -62,7 +67,6 @@ static void _add_account(void *data);
 //static email_mail_list_item_t *_get_sender_mail_list(EmailMailboxUGD *mailbox_ugd, const char *key, int* mail_count);
 //static void _create_recipient_list(EmailMailboxUGD *mailbox_ugd, const char *text);
 //static void _sender_item_clicked(void *data, Evas_Object *obj, void *event_info);
-static void _main_back_clicked(void *data, Evas_Object *obj, void *event_info);
 static void _account_dim_clicked(void *data, Evas_Object *obj, const char *emission, const char *source);
 
 /* Callback function for Control bar */
@@ -313,7 +317,7 @@ static void on_destroy(ui_gadget_h ug, service_h service, void *priv)
 
        FREE(mailbox_ugd->address);
        FREE(mailbox_ugd->folder_alias);
-       FREE(mailbox_ugd->user_email);
+       FREE(mailbox_ugd->account_name);
        FREE(mailbox_ugd->display_name);
 
        /* theme extension */
@@ -598,12 +602,6 @@ static void _mailbox_rotate_to_potrait(void *data, int angle)
                        elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "title", mailbox_ugd->navi_title_ly);
        }
 
-       if (mailbox_ugd->view_type != EMAIL_VIEW_EDIT && !evas_object_visible_get(mailbox_ugd->searchbar_layout)) {
-               debug_log("search_bar is not visible, show search bar");
-               elm_object_part_content_set(mailbox_ugd->search_layout, "searchbar", mailbox_ugd->searchbar_layout);
-               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_searchbar", "search");
-       }
-
        if (elm_object_part_content_get(mailbox_ugd->panes, "right") == mailbox_ugd->split_nocontent) {
                elm_panes_content_left_size_set(mailbox_ugd->panes, 1.0);
                Evas_Object *r_content = elm_object_part_content_get(mailbox_ugd->panes, "right");
@@ -643,6 +641,20 @@ static void _mailbox_rotate_to_landscape(void *data, int angle)
                        debug_log("advanced search view exists. should be removed");
                        elm_naviframe_item_pop(mailbox_ugd->navi_bar);
                        mailbox_ugd->b_advanced_search_view = false;
+
+                       if(!g_focus_lock) {
+                               elm_object_focus_set(mailbox_ugd->gl[mailbox_ugd->view_type], EINA_TRUE);
+
+                               if (evas_object_visible_get(mailbox_ugd->searchbar_layout)) {
+                                       debug_log("search_bar is visible, hide search bar");
+                                       elm_entry_entry_set(mailbox_ugd->searchbar_en, "");
+                                       elm_object_focus_set(mailbox_ugd->searchbar_layout, EINA_FALSE);
+                                       elm_object_part_content_unset(mailbox_ugd->search_layout, "searchbar");
+                                       edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "hide_searchbar", "search");
+                                       evas_object_hide(mailbox_ugd->searchbar_layout);
+                               }
+                               _show_toolbar(mailbox_ugd);
+                       }
                }
 
                if(mailbox_ugd->view_type == EMAIL_VIEW_SEARCH)
@@ -686,14 +698,6 @@ static void _mailbox_rotate_to_landscape(void *data, int angle)
                evas_object_hide(mailbox_ugd->navi_title_ly);
        }
 
-       if (evas_object_visible_get(mailbox_ugd->searchbar_layout)) {
-               debug_log("search_bar is visible, hide search bar");
-               elm_entry_entry_set(mailbox_ugd->searchbar_en, "");
-               elm_object_focus_set(mailbox_ugd->searchbar_layout, EINA_FALSE);
-               elm_object_part_content_unset(mailbox_ugd->search_layout, "searchbar");
-               edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "hide_searchbar", "search");
-               evas_object_hide(mailbox_ugd->searchbar_layout);
-       }
 
        /* destroy account ug and create mailbox ug */
        if (mailbox_ugd->ug_account && mailbox_ugd->account_dim) {
@@ -811,7 +815,7 @@ static void layout_account_cb(ui_gadget_h ug, enum ug_mode mode, void *priv)
        if (!base)
                return;
 
-       scale_factor = elm_scale_get();
+       scale_factor = elm_config_scale_get();
        debug_log("ELM Scale[%f]", scale_factor);
 
        switch (mode) {
@@ -832,7 +836,8 @@ static void layout_account_cb(ui_gadget_h ug, enum ug_mode mode, void *priv)
                // create frame view
                evas_object_raise(base);
                evas_object_resize(base, acc_w, acc_max_h);
-               evas_object_move(base, 16, 168);        // indicator(50)+Navi(108) + 10(gap)
+               //evas_object_move(base, 16, 168);      // indicator(50)+Navi(108) + 10(gap)
+               evas_object_move(base, 16, 181); // indicator(60)+Navi(111) + 10(gap)
 
                //Hide wipe effect. and direction is up.
                transit = elm_transit_add();
@@ -937,7 +942,7 @@ static void result_cb(ui_gadget_h ug, service_h service, void *priv)
 
        mailbox_ugd = (EmailMailboxUGD *)priv;
 
-       FREE(mailbox_ugd->user_email);
+       FREE(mailbox_ugd->account_name);
        FREE(mailbox_ugd->folder_alias);
        mailbox_ugd->mailbox_type = EMAIL_MAILBOX_TYPE_NONE;
        mailbox_ugd->mailbox_id = 0;
@@ -965,21 +970,19 @@ static void result_cb(ui_gadget_h ug, service_h service, void *priv)
                        email_mailbox_t *mailbox = NULL;
                        int e = email_get_mailbox_by_mailbox_type(mailbox_ugd->account_id, EMAIL_MAILBOX_TYPE_INBOX, &mailbox);
 
-                       if( e == EMAIL_ERROR_NONE && mailbox ) {
-                               debug_log("email_get_mailbox_by_mailbox_type : account_id(%d) type(INBOX) - err(%d) or mailbox is NULL(%p)", mailbox_ugd->account_id, e, mailbox);
-
-                               ret = service_get_extra_data(service, EMAIL_BUNDLE_KEY_USER_EMAIL, &(mailbox_ugd->user_email));
+                       if(e == EMAIL_ERROR_NONE && mailbox) {
+                               ret = service_get_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_NAME, &(mailbox_ugd->account_name));
                                debug_log("service_get_extra_data: %d", ret);
 
                                mailbox_ugd->mode = EMAIL_MAILBOX_MODE_MAILBOX;
                                mailbox_ugd->mailbox_id = mailbox->mailbox_id;
                                mailbox_ugd->mailbox_type = EMAIL_MAILBOX_TYPE_INBOX;
                                mailbox_ugd->folder_alias = g_strdup(mailbox->alias);
-                               debug_log("account_id(%d), mailbox_id(%d), folder_alias(%s), user_email(%s)",
-                                               mailbox_ugd->account_id, mailbox_ugd->mailbox_id, mailbox_ugd->folder_alias, mailbox_ugd->user_email);
-
+                               debug_log("account_id(%d), mailbox_id(%d), folder_alias(%s), account_name(%s)",
+                                               mailbox_ugd->account_id, mailbox_ugd->mailbox_id, mailbox_ugd->folder_alias, mailbox_ugd->account_name);
                                email_free_mailbox(&mailbox, 1);
-                       }
+                       } else
+                               debug_log("email_get_mailbox_by_mailbox_type : account_id(%d) type(INBOX) - err(%d) or mailbox is NULL(%p)", mailbox_ugd->account_id, e, mailbox);
                } else {
                        ret = service_get_extra_data(service, EMAIL_BUNDLE_KEY_MAILBOX_TYPE, &(mailbox_type));
                        debug_log("service_get_extra_data: %d", ret);
@@ -1001,7 +1004,7 @@ static void result_cb(ui_gadget_h ug, service_h service, void *priv)
                debug_log("service_get_extra_data: %d", ret);
                ret = service_get_extra_data(service, EMAIL_BUNDLE_KEY_MAILBOX_ALIAS, &(mailbox_ugd->folder_alias));
                debug_log("service_get_extra_data: %d", ret);
-               ret = service_get_extra_data(service, EMAIL_BUNDLE_KEY_USER_EMAIL, &(mailbox_ugd->user_email));
+               ret = service_get_extra_data(service, EMAIL_BUNDLE_KEY_ACCOUNT_NAME, &(mailbox_ugd->account_name));
                debug_log("service_get_extra_data: %d", ret);
 
                mailbox_ugd->account_id = (gint) atoi(account_id);
@@ -1011,15 +1014,11 @@ static void result_cb(ui_gadget_h ug, service_h service, void *priv)
                } else
                        debug_critical("failure on getting mailbox_id");
                mailbox_ugd->mode = EMAIL_MAILBOX_MODE_MAILBOX;
-               debug_log("account_id[%d], mailbox_id[%d], folder_alias(%s), user_email(%s)",
-                       mailbox_ugd->account_id, mailbox_ugd->mailbox_id, mailbox_ugd->folder_alias, mailbox_ugd->user_email);
+               debug_log("account_id[%d], mailbox_id[%d], folder_alias(%s), account_name(%s)",
+                       mailbox_ugd->account_id, mailbox_ugd->mailbox_id, mailbox_ugd->folder_alias, mailbox_ugd->account_name);
 
                reset_get_more_progress_callback_status(mailbox_ugd);
                _make_account_mail_list(mailbox_ugd);
-       } else if (g_strcmp0(type, EMAIL_BUNDLE_VAL_ADD_ACCOUNT) == 0) {
-               debug_log("EMAIL_BUNDLE_VAL_ADD_ACCOUNT");
-
-               _add_account(mailbox_ugd);
        }
 
        g_free(type);
@@ -1430,16 +1429,6 @@ void _sync_all_folder(EmailMailboxUGD *mailbox_ugd)
 {
        debug_log("");
 
-       int handle = 0;
-       int err = 0;
-
-       err = email_sync_header_for_all_account(&handle);
-
-       if (err != EMAIL_ERROR_NONE) {
-               debug_critical("fail to sync header for all account - err(%d)", err);
-               return;
-       }
-       mailbox_ugd->emf_handle = handle;
        email_account_t *account_list = NULL;
        int account_cnt = 0, i = 0;
        int e = email_get_account_list(&account_list, &account_cnt);
@@ -1453,12 +1442,28 @@ void _sync_all_folder(EmailMailboxUGD *mailbox_ugd)
        EINA_LIST_FREE(g_account_list, data) {
                g_free(data);
        }
-       for (i = 0; i < account_cnt; ++i) {
-               int *account_id = (int *)calloc(1, sizeof(int));
-               *account_id = account_list[i].account_id;
-               g_account_list = eina_list_append(g_account_list, account_id);
+
+       if(account_cnt > 0 && account_list) {
+               int handle = 0;
+               int err = 0;
+
+               for (i = 0; i < account_cnt; ++i) {
+                       err = email_engine_sync_folder(account_list[i].account_id, GET_MAILBOX_ID(account_list[i].account_id, EMAIL_MAILBOX_TYPE_INBOX), &handle);
+                       if (err != EMAIL_ERROR_NONE) {
+                               debug_critical("fail to sync header - account_id(%d) err(%d)", account_list[i].account_id, err);
+                               email_free_account(&account_list, account_cnt);
+                               return;
+                       } else {
+                               int *account_id = (int *)calloc(1, sizeof(int));
+                               *account_id = account_list[i].account_id;
+                               g_account_list = eina_list_append(g_account_list, account_id);
+                               mailbox_ugd->emf_handle = handle; //TODO, handle management is needed.
+                               debug_log("mailbox_ugd->emf_handle : %d, account_id : %d", mailbox_ugd->emf_handle, account_list[i].account_id);
+                       }
+               }
+               email_free_account(&account_list, account_cnt);
        }
-       email_free_account(&account_list, account_cnt);
+
 }
 
 
@@ -1485,6 +1490,8 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
 
        elm_win_indicator_mode_set(win, ELM_WIN_INDICATOR_SHOW);
 
+       evas_object_smart_callback_add(mailbox_ugd->win_main, "profile,changed", _win_profile_changed_cb, mailbox_ugd);
+
        panes = elm_panes_add(layout);
        evas_object_size_hint_weight_set(panes, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(panes, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1514,7 +1521,7 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
        else
                elm_layout_file_set(mailbox_ugd->sub_layout[mailbox_ugd->view_type], THEME_PATH, "layout.email.mailbox");
        // TODO: remove mailbox_ugd->searchbar_layout later
-       //mailbox_create_searchbar(mailbox_ugd);
+       mailbox_create_searchbar(mailbox_ugd);
 
        /* create genlist */
        mailbox_create_list_view(mailbox_ugd);
@@ -1555,7 +1562,7 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
        elm_image_resizable_set(folder_icon, 1, 1);
        evas_object_image_smooth_scale_set(folder_icon, 0);
        elm_object_content_set(mailbox_ugd->folder_button, folder_icon);
-       evas_object_smart_callback_add(mailbox_ugd->folder_button, "clicked", _folder_cb, mailbox_ugd);
+       evas_object_smart_callback_add(mailbox_ugd->folder_button, "clicked", _mailbox_create_folder_ctxpopup_cb, mailbox_ugd);
        elm_object_part_content_set(mailbox_ugd->navi_title_ly, "left_btn", mailbox_ugd->folder_button);
 
        //Title Right Button for update
@@ -1576,17 +1583,17 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
        evas_object_size_hint_weight_set(mailbox_ugd->sync_progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_progressbar_pulse(mailbox_ugd->sync_progress, EINA_TRUE);
 
-       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_INBOX"));
+       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_INBOX"));
 
        if (mailbox_ugd->mode == EMAIL_MAILBOX_MODE_ALL)
-               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_HEADER_ALL_ACCOUNTS"));
+               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_HEADER_ALL_ACCOUNTS"));
        else
-               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", mailbox_ugd->user_email);
+               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", mailbox_ugd->account_name);
 
        // add service provider icon
        mailbox_ugd->sp_icon = elm_icon_add(mailbox_ugd->navi_title_ly);
        evas_object_show(mailbox_ugd->sp_icon);
-       elm_object_part_content_set(mailbox_ugd->navi_title_ly, "sub_left_icon", mailbox_ugd->sp_icon);
+       elm_object_part_content_set(mailbox_ugd->navi_title_ly, "title_icon", mailbox_ugd->sp_icon);
        elm_image_file_set(mailbox_ugd->sp_icon, ICON_TITLE_ALL_ACC, NULL);
 
        // add expand/collapse icon
@@ -1600,6 +1607,26 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
        evas_object_show(mailbox_ugd->ly);
 }
 
+static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event)
+{
+       debug_log("");
+       if (!data) {
+               debug_log("data is NULL");
+               return;
+       }
+
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+
+       const char *profile = elm_config_profile_get();
+       if (!g_strcmp0(profile, "desktop"))
+               elm_layout_theme_set(mailbox_ugd->layout_main, "layout", "application", "noindicator");
+       else
+               elm_layout_theme_set(mailbox_ugd->layout_main, "layout", "application", "default");
+
+       evas_object_size_hint_weight_set(mailbox_ugd->layout_main, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_show(mailbox_ugd->layout_main);
+}
+
 static void _title_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        debug_log("");
@@ -1621,7 +1648,7 @@ static void _title_clicked_cb(void *data, Evas_Object *obj, const char *emission
                if (mailbox_ugd->view_type != EMAIL_VIEW_EDIT && mailbox_ugd->view_type != EMAIL_VIEW_SEARCH)
                {
                        elm_image_file_set(mailbox_ugd->title_arrow, ICON_OPEN, NULL);
-                       _account_cb(data, obj, NULL);
+                       _mailbox_account_cb(data, obj, NULL);
                        elm_object_item_data_set(nf_it, (void *) (!oh_opened));
                }
                else
@@ -1630,7 +1657,7 @@ static void _title_clicked_cb(void *data, Evas_Object *obj, const char *emission
 
 }
 
-static void _main_back_clicked(void *data, Evas_Object *obj, void *event_info)
+void _main_back_clicked(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
 
@@ -1798,9 +1825,9 @@ static void _block_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 
 
 
-static void _account_cb(void *data, Evas_Object *obj, void *event_info)
+static void _mailbox_account_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       debug_log("");
+       debug_enter();
        EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
        int account_id = 0;
        if (email_engine_get_default_account(&account_id) == false) {
@@ -1834,9 +1861,123 @@ static void _account_cb(void *data, Evas_Object *obj, void *event_info)
                return;
 }
 
-static void _folder_cb(void *data, Evas_Object *obj, void *event_info)
+static void _mailbox_folder_ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       debug_log("");
+       debug_enter();
+
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+
+       evas_object_del(mailbox_ugd->folder_ctxpopup);
+       mailbox_ugd->folder_ctxpopup = NULL;
+}
+
+static void _mailbox_folder_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_enter();
+
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+       email_mailbox_t *mailbox = NULL;
+       email_mailbox_type_e mailbox_type = EMAIL_MAILBOX_TYPE_NONE;
+
+       const char *label = elm_object_item_text_get((Elm_Object_Item *) event_info);
+       if(!label) {
+               debug_critical("label is NULL");
+               goto CLEANUP;
+       }
+
+       debug_log("text(%s) is clicked\n", label);
+
+       if(!g_strcmp0(label, _("IDS_EMAIL_BODY_INBOX")))
+               mailbox_type = EMAIL_MAILBOX_TYPE_INBOX;
+       else if(!g_strcmp0(label, _("IDS_EMAIL_OPT_FAVOURITES")))
+               mailbox_type = EMAIL_MAILBOX_TYPE_FLAGGED;
+       else if(!g_strcmp0(label, _("IDS_EMAIL_BODY_DRAFTS")))
+               mailbox_type = EMAIL_MAILBOX_TYPE_DRAFT;
+       else if(!g_strcmp0(label, _("IDS_EMAIL_BODY_SENTBOX")))
+               mailbox_type = EMAIL_MAILBOX_TYPE_SENTBOX;
+       else if(!g_strcmp0(label, _("IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB"))) {
+               _mailbox_show_all_folders(data, obj, event_info);
+               goto CLEANUP;
+       }
+       else {
+               debug_critical("Never get here");
+               goto CLEANUP;
+       }
+
+       if (mailbox_ugd->account_id == 0) {
+               mailbox_ugd->mode = EMAIL_MAILBOX_MODE_ALL;
+               mailbox_ugd->mailbox_type = mailbox_type;
+               debug_log("account_id(%d), mailbox_type(%d)", mailbox_ugd->account_id, mailbox_ugd->mailbox_type);
+       } else {
+               int e = email_get_mailbox_by_mailbox_type(mailbox_ugd->account_id, mailbox_type, &mailbox);
+
+               if (e == EMAIL_ERROR_NONE && mailbox) {
+                       mailbox_ugd->mode = EMAIL_MAILBOX_MODE_MAILBOX;
+                       mailbox_ugd->mailbox_type = mailbox_type;
+                       mailbox_ugd->mailbox_id = mailbox->mailbox_id;
+                       mailbox_ugd->folder_alias = g_strdup(mailbox->alias);
+                       debug_log("account_id(%d), mailbox_id(%d), folder_alias(%s), account_name(%s)",
+                                       mailbox_ugd->account_id, mailbox_ugd->mailbox_id, mailbox_ugd->folder_alias, mailbox_ugd->account_name);
+
+                       email_free_mailbox(&mailbox, 1);
+               } else {
+                       debug_log("email_get_mailbox_by_mailbox_type : account_id(%d) type(INBOX) - err(%d) or mailbox is NULL(%p)", mailbox_ugd->account_id, e, mailbox);
+                       goto CLEANUP;
+               }
+       }
+
+       reset_get_more_progress_callback_status(mailbox_ugd);
+       _make_account_mail_list(mailbox_ugd);
+
+CLEANUP:
+       evas_object_del(mailbox_ugd->folder_ctxpopup);
+       mailbox_ugd->folder_ctxpopup = NULL;
+       return;
+}
+
+static void _mailbox_move_folder_ctxpopup(Evas_Object *ctxpopup, Evas_Object *btn)
+{
+       debug_enter();
+
+       Evas_Coord x, y, w, h;
+       evas_object_geometry_get(btn, &x, &y, &w, &h);
+       evas_object_move(ctxpopup, x + (w / 2), y + h);
+}
+
+static void _mailbox_create_folder_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_enter();
+
+       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
+
+       if(mailbox_ugd->folder_ctxpopup) {
+               evas_object_del(mailbox_ugd->folder_ctxpopup);
+               mailbox_ugd->folder_ctxpopup = NULL;
+       }
+
+       _stop_emf_job(mailbox_ugd, mailbox_ugd->emf_handle, true);
+
+       mailbox_ugd->folder_ctxpopup = elm_ctxpopup_add(mailbox_ugd->navi_bar);
+       evas_object_smart_callback_add(mailbox_ugd->folder_ctxpopup,"dismissed", _mailbox_folder_ctxpopup_dismissed_cb, mailbox_ugd);
+       if (mailbox_ugd->mailbox_type != EMAIL_MAILBOX_TYPE_INBOX)
+               elm_ctxpopup_item_append(mailbox_ugd->folder_ctxpopup, _("IDS_EMAIL_BODY_INBOX"), NULL, _mailbox_folder_ctxpopup_cb, mailbox_ugd);
+       if (mailbox_ugd->mode == EMAIL_MAILBOX_MODE_ALL && mailbox_ugd->mailbox_type != EMAIL_MAILBOX_TYPE_FLAGGED)
+               elm_ctxpopup_item_append(mailbox_ugd->folder_ctxpopup, _("IDS_EMAIL_OPT_FAVOURITES"), NULL, _mailbox_folder_ctxpopup_cb, mailbox_ugd);
+       if (mailbox_ugd->mailbox_type != EMAIL_MAILBOX_TYPE_DRAFT)
+               elm_ctxpopup_item_append(mailbox_ugd->folder_ctxpopup, _("IDS_EMAIL_BODY_DRAFTS"), NULL, _mailbox_folder_ctxpopup_cb, mailbox_ugd);
+       if (mailbox_ugd->mailbox_type != EMAIL_MAILBOX_TYPE_SENTBOX)
+               elm_ctxpopup_item_append(mailbox_ugd->folder_ctxpopup, _("IDS_EMAIL_BODY_SENTBOX"), NULL, _mailbox_folder_ctxpopup_cb, mailbox_ugd);
+       elm_ctxpopup_item_append(mailbox_ugd->folder_ctxpopup, _("IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB"), NULL, _mailbox_folder_ctxpopup_cb, mailbox_ugd);
+
+       _mailbox_move_folder_ctxpopup(mailbox_ugd->folder_ctxpopup, obj);
+       elm_ctxpopup_direction_priority_set(mailbox_ugd->folder_ctxpopup, ELM_CTXPOPUP_DIRECTION_DOWN, ELM_CTXPOPUP_DIRECTION_RIGHT, ELM_CTXPOPUP_DIRECTION_LEFT, ELM_CTXPOPUP_DIRECTION_UP);
+       evas_object_show(mailbox_ugd->folder_ctxpopup);
+}
+
+static void _mailbox_show_all_folders(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_enter();
+
        EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
        int account_id = 0;
 
@@ -1903,6 +2044,9 @@ static void _add_account(void *data)
        debug_log("service_add_extra_data: %d", ret);
 
        mailbox_ugd->ug_setting = create_setting_ug(UG_NAME_EMAIL_SETTING, service, mailbox_ugd);
+
+       ret = service_destroy(service);
+       debug_log("service_destroy: %d", ret);
 }
 
 static void _process_update(EmailMailboxUGD *mailbox_ugd)
@@ -2004,53 +2148,53 @@ void _update_navigationbar_title(EmailMailboxUGD *mailbox_ugd)
                case EMAIL_MAILBOX_TYPE_INBOX:
                {
                        elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_BODY_INBOX"));
-                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_INBOX"));
+                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_INBOX"));
                }
                break;
                case EMAIL_MAILBOX_TYPE_SENTBOX:
                {
                        elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_BODY_SENTBOX"));
-                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_SENTBOX"));
+                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_SENTBOX"));
                }
                break;
                case EMAIL_MAILBOX_TYPE_TRASH:
                {
                        elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_BODY_TRASH"));
-                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_TRASH"));
+                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_TRASH"));
                }
                break;
                case EMAIL_MAILBOX_TYPE_DRAFT:
                {
                        elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_BODY_DRAFTS"));
-                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_DRAFTS"));
+                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_DRAFTS"));
                }
                break;
                case EMAIL_MAILBOX_TYPE_SPAMBOX:
                {
                        elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_BODY_SPAMBOX"));
-                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_SPAMBOX"));
+                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_SPAMBOX"));
                }
                break;
                case EMAIL_MAILBOX_TYPE_OUTBOX:
                {
-                       elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], N_("Outbox"));
-                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", N_("Outbox"));
+                       elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_HEADER_OUTBOX"));
+                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_HEADER_OUTBOX"));
                }
                break;
                case EMAIL_MAILBOX_TYPE_FLAGGED:
                {
                        elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_OPT_FAVOURITES"));
-                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_OPT_FAVOURITES"));
+                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_OPT_FAVOURITES"));
                }
                break;
                default:
                {
                        elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], _("IDS_EMAIL_BODY_INBOX"));
-                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_BODY_INBOX"));
+                       elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_BODY_INBOX"));
                }
                break;
                }
-               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_HEADER_ALL_ACCOUNTS"));
+               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", _("IDS_EMAIL_HEADER_ALL_ACCOUNTS"));
 
                if (mailbox_ugd->isRotate == false) {
                        _create_controlbar(mailbox_ugd);
@@ -2060,8 +2204,8 @@ void _update_navigationbar_title(EmailMailboxUGD *mailbox_ugd)
                        _create_controlbar(mailbox_ugd);
                }
                elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], mailbox_ugd->folder_alias);
-               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", mailbox_ugd->folder_alias);
-               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", mailbox_ugd->user_email);
+               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", mailbox_ugd->folder_alias);
+               elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_title", mailbox_ugd->account_name);
 
                email_account_t *account;
                email_get_account(mailbox_ugd->account_id, 0, &account);
@@ -2226,6 +2370,8 @@ static void _mailbox_update_account_password(void *data)
 
        if( err != EMAIL_ERROR_NONE || !account_info) {
                debug_log("fail to get account info - err(%d)", err);
+               email_free_account(&account_info, 1);
+               return;
        }
        FREE(account_info->incoming_server_password);
        account_info->incoming_server_password = strdup(mailbox_ugd->str_password);
@@ -2236,9 +2382,7 @@ static void _mailbox_update_account_password(void *data)
                _sync_folder_with_new_password(mailbox_ugd->sync_needed_account_id, mailbox_ugd->sync_needed_mailbox_id, data);
        }
 
-       if (account_info) {
-               email_free_account(&account_info, 1);
-       }
+       email_free_account(&account_info, 1);
        mailbox_ugd->sync_needed_account_id = -1;
        mailbox_ugd->sync_needed_mailbox_id = -1;
        FREE(mailbox_ugd->str_password);
index aac48f4..aa2d88f 100755 (executable)
@@ -1221,7 +1221,8 @@ styles {
 }
 /* genlist multisense macro - end */
 
-#define SEARCHBAR_BACKGROUND_COLOR_DEFAULT 215 225 232 255
+//#define SEARCHBAR_BACKGROUND_COLOR_DEFAULT 215 225 232 255
+#define SEARCHBAR_BACKGROUND_COLOR_DEFAULT 248 246 239 255
 #define SEARCHBAR_BACKGROUND_COLOR_BLACK 36 36 36 255
 #define SEARCHBAR_BACKGROUND_COLOR_BLUE  17 23 27 255
 #define SEARCHBAR_BACKGROUND_COLOR_WHITE 215 225 232 255
index 86c95fa..5be3e95 100755 (executable)
@@ -93,6 +93,23 @@ collections
                                }
                        }
 
+                       part {
+                               name: "selection_info";
+                               type: SWALLOW;
+                               description { state: "default" 0.0;
+                                       fixed: 0 1;
+                                       align: 0.5 1.0;
+                                       rel1 {
+                                               relative: 0.0 1.0;
+                                               to:"list";
+                                       }
+                               }
+                               description { state: "hide" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 0;
+                               }
+                       }
+
                        part
                        {
                                name: "noc";
@@ -193,7 +210,7 @@ collections
                    description {
                        state: "default" 0.0;
                        visible: 1;
-                       min: 16 0;
+                       min: 26 0;
                        fixed: 1 0;
                        align: 0.0 0.5;
                        rel1 { relative: 0.0 0.0; to: "bg";}
@@ -209,7 +226,7 @@ collections
                    description {
                        state: "default" 0.0;
                        visible: 1;
-                       min: 80 16;
+                       min: 74 16;
                        fixed: 1 1;
                        align: 0.0 0.0;
                        rel1 { relative: 1.0 0.0; to: "searchbar_area_category_pad_left";}
@@ -225,7 +242,7 @@ collections
                    description {
                        state: "default" 0.0;
                        visible: 1;
-                       min: 80 16;
+                       min: 74 16;
                        fixed: 1 1;
                        align: 0.0 1.0;
                        rel1 { relative: 1.0 1.0; to: "searchbar_area_category_pad_left";}
@@ -241,8 +258,8 @@ collections
                    description {
                        state: "default" 0.0;
                        visible: 1;
-                       min: 80 80;
-                       max: 80 80;
+                       min: 74 74;
+                       max: 74 74;
                        fixed: 1 1;
                        align: 0.0 0.5;
                        rel1 { relative: 1.0 1.0;
@@ -273,67 +290,6 @@ collections
                } //end parts
        } //end group
 
-group { name: "horizontal_bottom_64";
-   parts {
-      part {
-         name: "bg";
-         type: RECT;
-         mouse_events: 1;
-         repeat_events: 1;
-         scale : 1;
-         description {
-            state: "default" 0.0;
-            min: SELECTION_INFO_MIN_VER_W_INC SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC;
-            fixed: 1 1;
-            align: 0.5 1.0;
-            rel1.relative: 0.5 1.0;
-            rel2.relative: 0.5 1.0;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "base";
-         type: RECT;
-         mouse_events: 1;
-         scale : 1;
-         description {
-            state: "default" 0.0;
-            min: 0 SELECTION_INFO_VER_PADDING_INC;
-            fixed: 0 1;
-            align: 0.5 0.0;
-            rel1 { relative: 0.0 0.0; to: "bg"; }
-            rel2 { relative: 1.0 0.32; to: "bg"; }
-            color: SELECTION_INFO_BACKGROUND_COLOR_INC;
-         }
-      }
-      part {
-         name: "elm.text";
-         type: TEXT;
-         mouse_events: 0;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0.5 0.0;
-            rel1 { to: "base"; }
-            rel2 { to: "base"; }
-            color: SELECTION_INFO_TEXT_COLOR_INC;
-            text {
-               font: "SLP";
-               size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
-               text: "";
-               text_class: "slp";
-            }
-         }
-      }
-   }
-   programs {
-      program {
-         name: "clicked";
-         signal: "mouse,clicked,1";
-         source: "base";
-         action: SIGNAL_EMIT "elm,action,click" "";
-      }
-   }
-}
        group
        {
                name: "layout.email.mailbox";
@@ -409,6 +365,23 @@ group { name: "horizontal_bottom_64";
                                }
                        }
 
+                       part {
+                               name: "selection_info";
+                               type: SWALLOW;
+                               description { state: "default" 0.0;
+                                       fixed: 0 1;
+                                       align: 0.5 1.0;
+                                       rel1 {
+                                               relative: 0.0 1.0;
+                                               to:"list";
+                                       }
+                               }
+                               description { state: "hide" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 0;
+                               }
+                       }
+
                        part
                        {
                                name: "noc";
@@ -503,7 +476,7 @@ group { name: "horizontal_bottom_64";
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 108;
+                                       min: 0 111;
                                        rel1 { relative: 0.0 0.0; }
                                        rel2 { relative: 1.0 1.0; }
                                        color: 0 0 0 0;
@@ -516,7 +489,7 @@ group { name: "horizontal_bottom_64";
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 11;
+                                       min: 0 4;
                                        fixed: 0 1;
                                        visible: 0;
                                        rel1 { to: "bg"; relative: 0 0; }
@@ -544,7 +517,7 @@ group { name: "horizontal_bottom_64";
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 5 0;
+                                       min: 16 0;
                                        fixed: 1 0;
                                        visible: 0;
                                        rel1 { to: "bg"; relative: 0 0; }
@@ -558,7 +531,7 @@ group { name: "horizontal_bottom_64";
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 5 0;
+                                       min: 26 0;
                                        fixed: 1 0;
                                        visible: 0;
                                        rel1 { to: "bg"; relative: 1 0; }
@@ -578,82 +551,108 @@ group { name: "horizontal_bottom_64";
                                                to_y: "top_padding";
                                        }
                                        rel2 {
-                                               relative: (440/720) 0.0;
+                                               relative: (482/720) 0.0;
                                                to_x: "bg";
                                                to_y: "bottom_padding";
                                        }
-                                       color: 0 0 0 10;
+                                       color: 248 246 239 255;
                                }
                        }
-
                        part {
-                               name: "txt_title";
-                               type: TEXT;
+                               name: "title_icon";
+                               type: SWALLOW;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: (16/440) 0.0; to: "title_area";}
-                                       rel2 { relative: (424/440) (52/88); to: "title_area";}
-                                       color : 59 115 182 255;
-                                       text { font: "SLP:style=Medium";
-                                               size: 40;
-                                               min: 0 0;
-                                               max: 1 0;
-                                               align: 0.0 0.5;
-                                               text_class: "slp";
-                                       }
-                                       align: 0.0 0.0;
                                        fixed: 1 1;
-                                       min: 0 48;
+                                       min: 68 68;
+                                       max: 68 68;
+                                       rel1 {
+                                               relative: 1.0 0.0;
+                                               to_x: "left_padding";
+                                               to_y: "bottom_padding";
+                                       }
+                                       rel2 {
+                                               relative: 1.0 0.0;
+                                               to_x: "title_area";
+                                               to_y: "bottom_padding";
+                                       }
+                                       align: 0.0 1.0;
                                }
                        }
-
-                       part { name: "sub_left_padding";
+                       part { name: "middle_padding";
                                type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 21 0;
+                                       min: 16 0;
                                        fixed: 1 0;
                                        visible: 0;
                                        rel1 {
                                                relative: 1.0 1.0;
-                                               to_x: "left_padding";
-                                               to_y: "txt_title";
+                                               to_x: "title_icon";
+                                               to_y: "top_padding";
                                        }
                                        rel2 {
                                                relative: 1.0 0.0;
-                                               to_x: "left_padding";
+                                               to_x: "title_icon";
                                                to_y: "bottom_padding";
                                        }
                                        align: 0.0 0.0;
                                }
                        }
-
                        part {
-                               name: "sub_left_icon";
-                               type: SWALLOW;
+                               name: "txt_title";
+                               type: TEXT;
                                scale: 1;
                                description {
-                                       state: "default" 0.0;
+                                       state: "default" 0.0;                   
+                                       rel1 { relative: (84/506) (14/96); to: "title_area";}
+                                       rel2 { relative: (506/506) (62/96); to: "title_area";}
+                                       color : 59 115 182 255;
+                                       text { font: "SLP:style=Medium";
+                                               size: 42;
+                                               min: 0 0;
+                                               max: 1 0;
+                                               align: 0.0 0.5;
+                                               text_class: "slp";
+                                       }
+                                       align: 0.0 0.0;
                                        fixed: 1 1;
-                                       min: 32 32;
-                                       max: 32 32;
+                                       min: 0 48;
+                               }
+                       }
+                       part {
+                               name: "txt_sub";
+                               type: TEXT;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
                                        rel1 {
                                                relative: 1.0 1.0;
-                                               to_x: "sub_left_padding";
+                                               to_x: "middle_padding";
                                                to_y: "txt_title";
                                        }
                                        rel2 {
-                                               relative: 1.0 0.0;
-                                               to_x: "sub_left_padding";
-                                               to_y: "bottom_padding";
+                                               relative: 1.0 1.0;
+                                               to_x: "title_area";
+                                               to_y: "title_area";
                                        }
-                                       align: 0.0 0.5;
+                                       color : 59 115 182 255;
+                                       text { font: "SLP:style=Medium";
+                                               size: 30;
+                                               min: 0 0;
+                                               max: 1 0;
+                                               align: 0.0 0.5;
+                                               text_class: "slp";
+                                       }
+                                       align: 0.0 0.0;
+                                       fixed: 1 1;
+                                       min: 0 34;
+                                       max: 356 34;
                                }
                        }
-
-                       part { name: "sub_mid_padding";
+                       part { name: "text_sub_padding";
                                type: RECT;
                                scale: 1;
                                description {
@@ -663,68 +662,58 @@ group { name: "horizontal_bottom_64";
                                        visible: 0;
                                        rel1 {
                                                relative: 1.0 1.0;
-                                               to_x: "sub_left_icon";
+                                               to_x: "txt_sub";
                                                to_y: "txt_title";
                                        }
                                        rel2 {
                                                relative: 1.0 0.0;
-                                               to_x: "sub_left_icon";
+                                               to_x: "txt_sub";
                                                to_y: "bottom_padding";
                                        }
                                        align: 0.0 0.0;
                                }
                        }
-
-                       part {
-                               name: "sub_right_icon";
-                               type: SWALLOW;
+                       part { name: "sub_icon_bottom_padding";
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       fixed: 1 1;
-                                       min: 32 32;
-                                       max: 32 32;
+                                       min: 0 6;
+                                       fixed: 0 1;
+                                       visible: 0;
                                        rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "title_area";
-                                               to_y: "txt_title";
+                                               relative: 1.0 0.0;
+                                               to_x: "text_sub_padding";
+                                               to_y: "bottom_padding";
                                        }
                                        rel2 {
                                                relative: 1.0 0.0;
                                                to_x: "title_area";
                                                to_y: "bottom_padding";
                                        }
-                                       align: 1.0 0.0;
+                                       align: 0.0 1.0;
                                }
                        }
-
                        part {
-                               name: "txt_sub";
-                               type: TEXT;
+                               name: "sub_right_icon";
+                               type: SWALLOW;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
+                                       fixed: 1 1;
+                                       min: 18 16;
+                                       max: 18 16;
                                        rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "sub_mid_padding";
-                                               to_y: "txt_title";
+                                               relative: 1.0 0.0;
+                                               to_x: "text_sub_padding";
+                                               to_y: "sub_icon_bottom_padding";
                                        }
                                        rel2 {
-                                               relative: 0.0 0.0;
-                                               to_x: "sub_right_icon";
-                                               to_y: "bottom_padding";
-                                       }
-                                       color : 59 115 182 255;
-                                       text { font: "SLP:style=Medium";
-                                               size: 24;
-                                               min: 0 0;
-                                               max: 1 0;
-                                               align: 0.0 0.5;
-                                               text_class: "slp";
+                                               relative: 1.0 0.0;
+                                               to_x: "title_area";
+                                               to_y: "sub_icon_bottom_padding";
                                        }
-                                       align: 0.0 0.0;
-                                       fixed: 1 1;
-                                       min: 0 40;
+                                       align: 0.0 1.0;
                                }
                        }
 
@@ -735,8 +724,8 @@ group { name: "horizontal_bottom_64";
                                description {
                                        state: "default" 0.0;
                                        fixed: 1 0;
-                                       min: 120 78;
-                                       max: 120 78;
+                                       min: 68 78;
+                                       max: 68 78;
                                        align: 1.0 0.5;
                                        rel1 {
                                                relative: 0.0 1.0;
@@ -752,14 +741,14 @@ group { name: "horizontal_bottom_64";
                        }
 
                        part {
-                               name: "seperator1";
+                               name: "button_padding";
                                type: SWALLOW;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       fixed: 1 1;
-                                       min: 2 48;
-                                       max: 2 48;
+                                       min: 18 0;
+                                       fixed: 1 0;
+                                       visible: 0;
                                        align: 1.0 0.5;
                                        rel1 {
                                                relative: 0.0 1.0;
@@ -782,31 +771,31 @@ group { name: "horizontal_bottom_64";
                                description {
                                        state: "default" 0.0;
                                        fixed: 1 0;
-                                       min: 120 78;
-                                       max: 120 78;
+                                       min: 68 78;
+                                       max: 68 78;
                                        align: 1.0 0.5;
                                        rel1 {
                                                relative: 0.0 1.0;
-                                               to_x: "seperator1";
+                                               to_x: "button_padding";
                                                to_y: "top_padding";
                                        }
                                        rel2 {
                                                relative: 0.0 0.0;
-                                               to_x: "seperator1";
+                                               to_x: "button_padding";
                                                to_y: "bottom_padding";
                                        }
                                }
                        }
-
+/*
                        part {
                                name: "seperator2";
                                type: SWALLOW;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       fixed: 1 1;
-                                       min: 2 48;
-                                       max: 2 48;
+                                       min: 18 0;
+                                       fixed: 1 0;
+                                       visible: 0;
                                        align: 1.0 0.5;
                                        rel1 {
                                                relative: 0.0 1.0;
@@ -821,7 +810,7 @@ group { name: "horizontal_bottom_64";
                                        //image.normal: "00_winset_title_line.png";
                                }
                        }
-
+*/
                        part {
                                name: "event_area";
                                ignore_flags: ON_HOLD;
@@ -904,7 +893,7 @@ group { name: "horizontal_bottom_64";
                                type: RECT;
                                description { state: "default" 0.0;
                                color: 0 0 0 153;
-                               min: 0 1124;            //213; height(1280) - (indicator(50)+Navi(111)+frameview(909)+10) +5
+                               min: 0 1120;            //213; height(1280) - (indicator(50)+Navi(111)+frameview(909)+10) +5
                                max: 9999 213;
                                fixed: 1 1;
                                visible: 1;
@@ -921,8 +910,8 @@ group { name: "horizontal_bottom_64";
                                max: 26 21;
                                align: 0.5 1.0;
 
-                               rel1 { relative: (56/720) (10/1122); to: "block_events";}
-                               rel2 { relative: (82/720) (10/1122); to: "block_events";}
+                               rel1 { relative: (56/720) (20/1119); to: "block_events";}
+                               rel2 { relative: (82/720) (20/1119); to: "block_events";}
                                image.normal: "M02_email_popup_bubble_tail_top.png";
                                }
                        }
index 011b5d9..e6847d0 100755 (executable)
@@ -271,6 +271,7 @@ static int _email_main_rotation_cb(app_device_orientation_e m, void *data)
 {
        debug_log("");
        struct appdata *ad = data;
+       int rotation_mode = -1;
 
        if (ad == NULL || ad->win_main == NULL) {
                return -1;
@@ -278,24 +279,45 @@ static int _email_main_rotation_cb(app_device_orientation_e m, void *data)
        debug_log("app_device_orientation: %d", m);
 
        switch (m) {
-       case APP_DEVICE_ORIENTATION_0:
-               ug_send_event(UG_EVENT_ROTATE_PORTRAIT);
-               break;
+               case APP_DEVICE_ORIENTATION_180:
+                       rotation_mode = UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN;
+                       break;
+
+               case APP_DEVICE_ORIENTATION_270:
+                       rotation_mode = UG_EVENT_ROTATE_LANDSCAPE;
+                       break;
+
+               case APP_DEVICE_ORIENTATION_90:
+                       rotation_mode = UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN;
+                       break;
+
+               case APP_DEVICE_ORIENTATION_0:
+               default:
+                       rotation_mode = UG_EVENT_ROTATE_PORTRAIT;
+                       break;
+       }
 
-       case APP_DEVICE_ORIENTATION_180:
-               ug_send_event(UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN);
-               break;
+       ug_send_event(rotation_mode);
 
-       case APP_DEVICE_ORIENTATION_270:
-               ug_send_event(UG_EVENT_ROTATE_LANDSCAPE);
-               break;
+       if (ad->setting_ug) {
+               int ret;
+               char buf[4] = {'\0',};
+               service_h service = NULL;
 
-       case APP_DEVICE_ORIENTATION_90:
-               ug_send_event(UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN);
-               break;
+               ret = service_create(&service);
+               if (!service) {
+                       debug_log("service create failed");
+                       return 0;
+               }
 
-       default:
-               break;
+               snprintf(buf, sizeof(buf), "%d", rotation_mode);
+               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_ROTATE, buf);
+               debug_log("service_add_extra_data: %d", ret);
+
+               ug_send_message(ad->setting_ug, service);
+
+               ret = service_destroy(service);
+               debug_log("service_destroy: %d", ret);
        }
 
        return 0;
index 12b950e..7bc71e7 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       org.tizen.email
 Summary:    Native email application
-Version:    0.0.14
+Version:    0.0.16
 Release:    1
 Group:      devel
 License:    Flora
@@ -94,8 +94,8 @@ ln -sf /usr/bin/ug-client %{_ugdir}/bin/email-setting-efl
 %{_libdir}/libemail-common.so
 %{_ugdir}/lib/libug-email-composer-efl.so
 %{_ugdir}/lib/libug-email-viewer-efl.so
-%{_ugdir}/lib/libug-email-account-efl.so
-%{_ugdir}/lib/libug-email-mailbox-efl.so
+%{_libdir}/libug-email-account-efl.so
+%{_libdir}/libug-email-mailbox-efl.so
 %{_ugdir}/lib/libug-email-setting-efl.so
 %{_pkgdir}/res/edje/email-viewer-theme.edj
 %{_pkgdir}/res/edje/email-setting-theme.edj
index dc48393..8f67a3f 100755 (executable)
--- a/po/ar.po
+++ b/po/ar.po
@@ -1765,3 +1765,105 @@ msgstr "عرض كل المجلدات"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "مرحبا!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "تعيين كمرسل ذي أولوية"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "إزالة من المرسلين ذوي الأولوية"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "سيتم إرسال رسالة البريد الإلكتروني في الوقت المجدول‬"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "علبة الصادر المجدولة"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "تحميل المزيد"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "تغيير حجم الصورة"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "أصلي"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "تم تعيين %s كمرسل ذي أولوية"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "تمت إزالة %s من القائمة مرسلون ذوو أولوية"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "انتقل إلى %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "تمت إزالة حدث من التقويم"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "إزالة Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "الصوت"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "خريطة"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "تقرير التوصيل"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "التاريخ و الوقت"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "ينبغي ضبط الوقت المحدد في المستقبل"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "تم الحفظ في ملفاتي"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "يتجاوز المرفق الحد الأقصى للحجم المسموح به من قبل نهج خادم Exchange هذا"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "تم مسح الرسالة"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "مخطط S"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "إضافة إلى مخطط S"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "حجب العنوان"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "إرسال إلي"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "تم مسح الرسالة"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "حفظ في المسودات"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "رسالة البريد الإلكتروني المجدولة"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "الأولوية"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "نقل لـ إلى"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "من"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "التقاط صورة"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "تحويل"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "الأولوية"
+
index d69de4c..49bc7b9 100755 (executable)
--- a/po/az.po
+++ b/po/az.po
@@ -1765,3 +1765,105 @@ msgstr "Bütün qovluqları göstər"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Salam!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Prioritet göndərən kimi qur"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Prioritet göndərənlərdən sil"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "E-poçtunuz planlaşdırılmış vaxtda göndəriləcək"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Planlı çıxış qutusu"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Əlavə yüklə"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Şəklin ölçüs. dəyişdir-si"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s prioritet göndərən kimi təyin edilib"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s prioritet göndərənlərin siyahısından silinib"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "%s-ə köçürülmüşdür"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Hadisə Təqvimdən silindi"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "CC/Bcc silinsin"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Xəritə"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Çatdırılma haqqında hesabat"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Tarix və vaxt"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Planlaşdırılmış vaxt gələcək zamanda təyin edilməlidir"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Fayllarımda saxlandı"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Qoşma bu Exchange server siyasətinin icazə verdiyi maksimal ölçünü keçir"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Mesaj silindi"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "S Planner-ə əlavə et"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Ünvanı blok et"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Özümə göndər"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Mesaj silindi"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Qaralamalarda saxla"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Planlaşdırılmış e-poçt"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Üstünlük"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Kimə sahəsinə keç"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Kimdən"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Şəkil çək"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Ötürün"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Üstünlük"
+
index 015ef57..fba3f0b 100755 (executable)
--- a/po/bg.po
+++ b/po/bg.po
@@ -1765,3 +1765,105 @@ msgstr "Показване на всички папки"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Здравейте!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Зад. като приор. подател"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Премах. от приорит. податели"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Вашият имейл ще бъде изпратен в планирания час"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Планирани изходящи"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Зарежд. още"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Преоразм. изображение"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Оригинален"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s е зададен като приоритетен подател"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s е премахнат от списъка с приоритетни податели"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Преместен в %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Събитието е премахнато от Календара"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Премахни полето CC/BCC"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Автоматично"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Карта"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Отчет за доставка"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Дата и час"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Насроченото време трябва да е зададено в бъдещето"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Записан в Моите файлове"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Прикаченият файл надвишава максималния размер, разрешен от тази политика на Exchange server"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Съобщението е изтрито"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Добавяне към S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Блокиране на адрес"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Send to myself"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Съобщението е изтрито"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Запис в чернови?"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Планиран имейл"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Приоритет"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Преместване в До"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "От"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Направи снимка"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Препращане"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Приоритет"
+
index 9ddac24..bb1dff5 100755 (executable)
--- a/po/ca.po
+++ b/po/ca.po
@@ -1765,3 +1765,105 @@ msgstr "Mostrar totes les carpetes"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hola"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Config. remitent prioritari"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Eliminar dels remit. prior."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "El seu correu electrònic s'enviarà a l'hora programada"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Bústia sortida programada"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Carregar més"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Canviar mida imatge"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s s'ha configurat com a remitent prioritari"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "S'ha eliminat %s de la llista de remitents prioritaris"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "S'ha mogut a %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Esdeveniment eliminat del calendari"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Esborrar a/c o c/o"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Àudio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Informe de lliurament"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Hora i data"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "L'hora programada s'ha de definir en el futur"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Desat a Els meus fitxers"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "El fitxer adjunt excedeix la mida màxima permesa per aquesta política de servidor d'Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Missatge esborrat"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "Planificador S"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Afegir a S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Bloquejar adreça"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Autoenviar-m'ho"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Missatge esborrat"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Desar a Esborranys"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Correu electrònic programat"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioritat"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Moure a Per a"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "De"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Fer foto"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Endavant"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioritat"
+
index 03ba216..33beb61 100755 (executable)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1765,3 +1765,105 @@ msgstr "Zobrazit všechny složky"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Ahoj!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Nast. jako prior. odesíl."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Odebrat z prior. odesílatelů"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "E-mail bude odeslán v naplánovaném čase"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Plánované k odeslání"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Načíst další"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Změnit velikost obrázku"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Původní"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s byl nastaven jako prioritní odesílatel"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s byl odebrán ze seznamu prioritních odesílatelů"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Přesunuto do %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Událost byla odebrána z Kalendáře"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Odebrat pole Kopie/Skrytá"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Zvuk"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Potvrzení o doručení"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Datum a čas"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Plánovaný čas musí být nastaven v budoucnu"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Uloženo do Mých souborů"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Příloha přesahuje maximální velikost povolenou zásadami serveru Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Zpráva odstraněna"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S plánovač"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Přidat do S plánovače"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokovat adresu"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Odeslat sám sobě"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Zpráva odstraněna"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Uložit do konceptů"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Naplánovaný e-mail"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Důležitost"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Přesunout do Komu"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Od"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Fotografovat"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Předat"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Důležitost"
+
index bee8154..ad2161f 100755 (executable)
--- a/po/da.po
+++ b/po/da.po
@@ -83,7 +83,7 @@ msgid "IDS_EMAIL_OPT_ADD_TO_CALENDAR"
 msgstr "Føj til kalender"
 
 msgid "IDS_EMAIL_OPT_CHANGE_EMAIL_ADDRESS_ABB"
-msgstr "Skift e-mail-adresse"
+msgstr "Skift e-mailadresse"
 
 msgid "IDS_EMAIL_BODY_SSL"
 msgstr "SSL"
@@ -104,7 +104,7 @@ msgid "IDS_EMAIL_OPT_ENCRYPT"
 msgstr "Kryptér"
 
 msgid "IDS_EMAIL_BODY_YOU_CAN_USE_EMAIL_ON_YOUR_DEVICE_BY_ADDING_YOUR_ACCOUNT_IF_YOU_DO_NOT_HAVE_AN_EMAIL_ACCOUNT_SIGN_UP_FIRST"
-msgstr "Du kan bruge e-mail på din enhed ved at tilføje din konto. Hvis du ikke har en e-mail-konto, skal du tilmelde dig først"
+msgstr "Du kan bruge e-mail på din enhed ved at tilføje din konto. Hvis du ikke har en e-mailkonto, skal du tilmelde dig først"
 
 msgid "IDS_EMAIL_BODY_AOL"
 msgstr "AOL"
@@ -266,7 +266,7 @@ msgid "IDS_EMAIL_BODY_SIGN_ALGORITHM"
 msgstr "Signaturalgoritme"
 
 msgid "IDS_EMAIL_BODY_EMAIL_CERTIFICATE"
-msgstr "E-mail-certifikat"
+msgstr "E-mailcertifikat"
 
 msgid "IDS_EMAIL_BODY_PHONE"
 msgstr "Telefon"
@@ -431,7 +431,7 @@ msgid "IDS_EMAIL_POP_TRY_AGAIN_IN_PD_MINUTES"
 msgstr "Prøv igen om %d minutter"
 
 msgid "IDS_EMAIL_POP_NO_EMAIL_ADDRESS"
-msgstr "Ingen e-mail-adresse"
+msgstr "Ingen e-mailadresse"
 
 msgid "IDS_EMAIL_BUTTON_MANUAL_SETUP"
 msgstr "Manuel opsætning"
@@ -491,7 +491,7 @@ msgid "IDS_EMAIL_OPT_CONTACTS_ABB"
 msgstr "kontakter"
 
 msgid "IDS_EMAIL_BODY_EMAIL_SIZE"
-msgstr "E-mail-størrelse"
+msgstr "E-mailstørrelse"
 
 msgid "IDS_EMAIL_BODY_100_KB"
 msgstr "100 KB"
@@ -587,7 +587,7 @@ msgid "IDS_EMAIL_BODY_MOVE_TO_TO"
 msgstr "Flyt til Til"
 
 msgid "IDS_EMAIL_HEADER_SELECT_EMAIL_ADDRESS"
-msgstr "Vælg e-mail-adresse"
+msgstr "Vælg e-mailadresse"
 
 msgid "IDS_EMAIL_POP_GIANT_M_TEXTSIZE"
 msgstr "Gigantisk"
@@ -659,7 +659,7 @@ msgid "IDS_EMAIL_HEADER_EDIT_RULES"
 msgstr "Redigér regler"
 
 msgid "IDS_EMAIL_HEADER_EMAIL_SETTINGS"
-msgstr "E-mail-indstil."
+msgstr "E-mailindstil."
 
 msgid "IDS_EMAIL_HEADER_MAILBOXES"
 msgstr "Postbokse"
@@ -710,7 +710,7 @@ msgid "IDS_EMAIL_BODY_DEFAULT_ACCOUNT"
 msgstr "Standardkonto"
 
 msgid "IDS_EMAIL_BODY_EMAIL_ACCOUNTS"
-msgstr "E-mail-konti"
+msgstr "E-mailkonti"
 
 msgid "IDS_EMAIL_BODY_END_TIME"
 msgstr "Sluttidspunkt"
@@ -791,7 +791,7 @@ msgid "IDS_EMAIL_POP_DOWNLOADING_ATTACHMENT_ING"
 msgstr "Downloader vedhæftning..."
 
 msgid "IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS"
-msgstr "Ugyldig e-mail-adresse"
+msgstr "Ugyldig e-mailadresse"
 
 msgid "IDS_EMAIL_POP_LOADING_CONTENTS_ING"
 msgstr "Indlæser indhold..."
@@ -1139,13 +1139,13 @@ msgid "IDS_EMAIL_HEADER_SEARCH"
 msgstr "Søg"
 
 msgid "IDS_EMAIL_POP_UNABLE_TO_OPEN_EMAIL_MESSAGE"
-msgstr "Kunne ikke åbne e-mail-meddelelse"
+msgstr "Kunne ikke åbne e-mailmeddelelse"
 
 msgid "IDS_EMAIL_POP_UNABLE_TO_COMPOSE_EMAIL_MESSAGE"
-msgstr "Kunne ikke skrive e-mail-meddelelse"
+msgstr "Kunne ikke skrive e-mailmeddelelse"
 
 msgid "IDS_EMAIL_POP_FAILED_TO_START_EMAIL_APPLICATION"
-msgstr "Kunne ikke starte e-mail-program"
+msgstr "Kunne ikke starte e-mailprogram"
 
 msgid "IDS_EMAIL_POP_UNABLE_TO_SAVE_SUBJECT_EMPTY"
 msgstr "Kan ikke gemme. Emne er tom"
@@ -1427,7 +1427,7 @@ msgid "IDS_EMAIL_BODY_USE_POP3_IMAP4_BEFORE_SMTP"
 msgstr "Brug POP3/IMAP4 før SMTP"
 
 msgid "IDS_EMAIL_POP_FAILED_TO_VALIDATE_ACCOUNT_CHECK_EMAIL_ADDRESS_AND_PASSWORD"
-msgstr "Kunne ikke validere konto. Kontrollér e-mail-adresse og adgangskode"
+msgstr "Kunne ikke validere konto. Kontrollér e-mailadresse og adgangskode"
 
 msgid "IDS_EMAIL_BODY_SMTP_PORT"
 msgstr "SMTP-port"
@@ -1472,7 +1472,7 @@ msgid "IDS_EMAIL_BODY_ONCE_A_DAY"
 msgstr "En gang om dagen"
 
 msgid "IDS_EMAIL_POP_CERTIFICATE_DOES_NOT_MATCH_EMAIL_ADDRESS"
-msgstr "Certifikat stemmer ikke overens med e-mail-adresse"
+msgstr "Certifikat stemmer ikke overens med e-mailadresse"
 
 msgid "IDS_EMAIL_POP_DECRYPTING_MESSAGE_ING"
 msgstr "Dekrypterer meddelelse ..."
@@ -1583,7 +1583,7 @@ msgid "IDS_EMAIL_OPT_READ"
 msgstr "Læs"
 
 msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES"
-msgstr "Tap to gange for at gå til toppen af listen over kontakter, liste over e-mails og e-mail-meddelelser"
+msgstr "Tap to gange for at gå til toppen af listen over kontakter, liste over e-mails og e-mailmeddelelser"
 
 msgid "IDS_EMAIL_OPT_EDIT_RESPONSE_BEFORE_SENDING"
 msgstr "Redigér svar før afsendelse"
@@ -1661,7 +1661,7 @@ msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
 msgstr "Lær om dobbelttryk"
 
 msgid "IDS_EMAIL_BODY_UNABLE_TO_ADD_MORE_ACCOUNTS_MAXIMUM_NUMBER_OF_ACCOUNTS_REACHED_MSG"
-msgstr "Kan ikke tilføje flere konti. Maks. kontoantal nået. For at tilføje flere konti skal du opgradere dit abonnent. Kontakt din serviceleverandør"
+msgstr "Kan ikke tilføje flere konti. Maks. kontoantal nået. For at tilføje flere konti skal du opgradere dit abonnent. Kontakt din tjenesteleverandør"
 
 msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
 msgstr "Anmod om leveringsrapporter"
@@ -1765,3 +1765,105 @@ msgstr "Vis alle mapper"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hallo!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Angiv som prior.afsender"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Fjern fra prior.afsendere"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Din e-mail vil blive sendt på det planlagte tidspunkt"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Planlagt udbakke"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Indlæs mere"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Tilpas billedstørrelse"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Originalt"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s er angivet som prioritetsafsender"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s er blevet fjernet fra din liste over prioritetsafsendere"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Flyttet til %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Hændelse fjernet fra Kalender"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Fjern Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Lyd"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Kort"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Leveringsrapport"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Dato og tid"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Planlagt tid skal indstilles til fremtiden"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Gemt i Mine filer"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Vedhæftede fil overskride den maksimalt tilladte størrelse ifølge politikken for denne Exchange-server"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Meddelelsen er slettet"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S-planlægger"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Føj til S-planlægger"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokér adresse"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Send til mig selv"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Meddelelsen er slettet"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S-notat"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Gem i Udkast"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Planlagt e-mail"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioritet"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Flyt til Til"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Fra"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Tag billede"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Videresend"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioritet"
+
index 87d6ffb..f95fd25 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Alle Ordner anzeigen"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hallo!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Als Hauptsender festlegen"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Von Prioritätensendern entf."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Ihre E-Mail wird zum geplanten Zeitpunkt gesendet."
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Geplanter Ausgang"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Weitere laden"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Größe ändern"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s wurde als Hauptsender festgelegt."
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s wurde aus der Liste der Hauptsender entfernt."
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Nach %s verschoben"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Ereignis aus Kalender entfernt"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Cc/Bcc entfernen"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Karte"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Zustellbericht"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Datum und Uhrzeit"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Geplante Zeit sollte in der Zukunft liegen"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "In “Eigene Dateien” gespeichert"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Anhang überschreitet die von dieser Exchange Server-Richtlinie gestattete maximale Größe"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Nachrichten gelöscht"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Zu S Planner hinzufügen"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Adresse blockieren"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "An mich senden"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Nachrichten gelöscht"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "In Entwürfe speichern"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Geplante E-Mail"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Priorität"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "In 'An' verschieben"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Von"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Foto aufnehmen"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Weiterleiten"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Priorität"
+
index a228a8b..29f349f 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Προβολή όλων των φακέλων"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Γεια σας!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Ορισμός ως αποστ. προτερ."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Κατάργ. από αποστ. προτερ."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Το email σας θα σταλεί την προγραμματισμένη ώρα"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Προγρ. φάκελος εξερχομ."
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Φόρτ. περισ."
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Αλλαγή μεγέθ.εικόνας"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Αρχικό"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "Ο χρήστης %s έχει οριστεί ως αποστολέας προτεραιότητας"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "Ο χρήστης %s αφαιρέθηκε από τη λίστα των αποστολέων προτεραιότητας"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Μετακινήθηκε στο %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Το συμβάν καταργήθηκε από το Ημερολόγιο"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Κατάργηση Κοιν./Ιδ.κοιν."
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Ήχος"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Χάρτης"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Αναφορά παράδοσης"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Ημερομηνία & ώρα"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Ο προγραμματισμένος χρόνος θα πρέπει να οριστεί στο μέλλον"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Αποθηκεύτηκε στο φάκελο “Τα αρχεία μου”"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Το μέγεθος του συνημμένου υπερβαίνει το μέγιστο επιτρεπόμενο μέγεθος της Πολιτικής του Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Το μήνυμα διαγράφηκε"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Προσθήκη στο S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Αποκλεισμός διεύθυνσης"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Αποστολή σε εμένα"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Το μήνυμα διαγράφηκε"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Αποθήκευση στα πρόχειρα"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Προγρ/σμένο email"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Προτεραιότητα"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Μετακίνηση σε Προς"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Από"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Λήψη φωτογραφίας"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Προώθηση"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Προτεραιότητα"
+
index a095336..68fcf83 100755 (executable)
--- a/po/en.po
+++ b/po/en.po
@@ -1765,3 +1765,105 @@ msgstr "Show all folders"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hello!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Set as priority sender"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Remove from priority senders"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Your email will be sent at the scheduled time"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Scheduled outbox"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Load more"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Image resize"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s has been set as a priority sender"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s has been removed from the list of priority senders"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Moved to %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Event removed from Calendar"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Remove Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Map"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Delivery report"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Date and time"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Scheduled time should set in the future"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Saved in My Files"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Attachment exceeds the maximum size allowed by this Exchange server policy"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Message deleted"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Add to S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Block address"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Send to myself"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Message deleted"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Save in Drafts"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Scheduled email"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Priority"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Move to To"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "From"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Take picture"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Forward"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Priority"
+
index 4fc1504..bd394f9 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Show all folders"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hello!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Set as priority sender"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Remove from priority senders"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Your Email will be sent at the scheduled time"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Scheduled outbox"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Load more"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Image resize"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s has been set as a priority sender"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s has been removed from the list of priority senders"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Moved to %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Event removed from Calendar"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Remove Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Map"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Delivery report"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Date and time"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Scheduled time should set in the future"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Saved in My Files"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Attachment exceeds the maximum size allowed by this Exchange server policy"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Message deleted"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Add to S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Block address"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Send to myself"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Message deleted"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Save in Drafts"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Scheduled Email"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Priority"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Move to To"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "From"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Take picture"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Forward"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Priority"
+
index b698fb6..c5fcb7f 100755 (executable)
@@ -1745,7 +1745,7 @@ msgid "IDS_EMAIL_POP_CREATED"
 msgstr "Created"
 
 msgid "IDS_EMAIL_POP_UNABLE_TO_DELETE_FOLDER"
-msgstr "Unable to delete folder"
+msgstr "Unable to delete folder."
 
 msgid "IDS_EMAIL_POP_UNABLE_TO_RENAME_FOLDER"
 msgstr "Unable to rename folder"
@@ -1765,3 +1765,105 @@ msgstr "Show all folders"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hello!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Set as priority sender"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Remove from priority senders"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Your email will be sent at the scheduled time"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Scheduled outbox"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Load more"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Image resize"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s has been set as a priority sender"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s has been removed from the list of priority senders"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Moved to %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Event removed from Calendar"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Delete Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Map"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Delivery report"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Date and time"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Scheduled time should set in the future"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Saved in My Files"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Attachment exceeds the maximum size allowed by this Exchange server policy"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Message deleted"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Add to S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Block address"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Send to myself"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Message deleted"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Save in Drafts"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Scheduled email"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Priority"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Move to To"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "From"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Take picture"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Forward"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Priority"
+
index 4f9ec9a..f90168f 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Mostrar todas las carpetas"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hola"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Config. como remit. prior."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Eliminar de remit. prior."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Su correo electrónico se enviará a la hora programada"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Buzón salida programada"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Cargar más"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Cambio de tamaño de imagen"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s se ha configurado como remitente prioritario"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s se ha eliminado de la lista de remitentes prioritarios"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Movido a %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Evento eliminado del calendario"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Eliminar Cc/Cco"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Informe de entrega"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Fecha y hora"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "La hora programada debe estar fijada en el futuro"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Guardado en Mis archivos"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "El archivo adjunto excede el tamaño máximo permitido por esta política de servidor de Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Mensaje eliminado"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "Planificador S"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Añadir a S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Bloquear dirección"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Enviármelo a mí"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Mensaje eliminado"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Guardar en Borradores"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Correo electrónico programado"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioridad"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Mover a Para"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "De"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Hacer foto"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Reenviar"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioridad"
+
index f4af14f..b86d42f 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Mostrar todas las carpetas"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "¡Hola!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Def. como remit. con prior."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Elim. de remit. con prior."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Se enviará su correo a la hora programada"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Buzón de salida programada"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Cargar más"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Cambio de tamaño de imagen"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "Se ha definido a %s como remitente con prioridad"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "Se eliminó a %s de la lista de remitentes con prioridad"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Movido a %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Evento eliminado del calendario"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Eliminar CC/CCO"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Informe de entrega"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Fecha y hora"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "La hora del evento debe ser posterior a la actual"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Guardado en Mis archivos"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "El archivo adjunto excede el tamaño máximo permitido por la política de este servidor de Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Mensaje eliminado"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Añadir a S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Bloquear por dirección"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Env. a mi mismo"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Mensaje eliminado"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Guardar en Borrador"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Correo programado"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioridad"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Mover a A"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "De"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Capturar imagen"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Reenviar"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioridad"
+
index 1606eec..c46d740 100755 (executable)
--- a/po/et.po
+++ b/po/et.po
@@ -1765,3 +1765,105 @@ msgstr "Näita kõiki kaustu"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Tere!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Määra priorit. saatjaks"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Eem. priorit. saatj. hulgast"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "E-kiri saadetakse planeeritud kuupäeval ja kellaajal"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Planeeritud väljundkaust"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Laadi veel"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Pildi suuruse muutmine"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Originaal"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s on määratud prioriteediga saatjaks"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s on eemaldatud prioriteediga saatjate loendist"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Teisald. asuk. %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Sündmus on kalendrist eemaldatud"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Eemalda koopia/pimekoopia"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Heli"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Kaart"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Kohaletoimetamisraport"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Kuupäev ja kellaaeg"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Plaanitud aeg tuleks tulevikus seadistada"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Salvestatud Minu failidesse"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Manus ületab selle Exchange'i serveripoliitika poolt lubatud maksimaalse suuruse"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Sõnum on kustutatud"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planeerija"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Lisa S Plannerisse"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokeeri aadress"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Saada endale"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Sõnum on kustutatud"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Salvesta mustanditesse"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Planeeritud e-kiri"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioriteet"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Teisalda kausta Kellele"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Saatja"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Pildista"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Edasta"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioriteet"
+
index 8898680..f2b5a4a 100755 (executable)
--- a/po/eu.po
+++ b/po/eu.po
@@ -1670,7 +1670,7 @@ msgid "IDS_EMAIL_HEADER_ADD_SUBJECT"
 msgstr "Gehitu gaia"
 
 msgid "IDS_EMAIL_BODY_BADGE"
-msgstr "Txapa"
+msgstr "Panela"
 
 msgid "IDS_EMAIL_BODY_ALERT_REPETITION"
 msgstr "Alerta errepikapena"
@@ -1765,3 +1765,105 @@ msgstr "Erakutsi karpeta guztiak"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Kaixo!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Ezarri leh. bidaltzaile gisa"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Kendu leh. bidaltzaileetatik"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Zure posta elektronikoa programatutako orduan bidaliko da"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Programat. irteera ontzia"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Kargatu gehiago"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Irudiaren tamaina aldatu"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Originala"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s-(e)k lehentasunezko igorle moduan ezarri da"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s kendu da lehentasunezko igorleen zerrendatik"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "%s-ra mugitu da"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Gertaera kendu da Egutegitik"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Kendu Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audioa"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Banaketa txostena"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Data eta ordua"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Etorkizunean ordua programatu behar da"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Nire fitxategietan gordeta"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Eranskinak Exchange zerbitzari politikak ahalbidetzen duen gehienezko neurria gainditzen du"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Mezua ezabatu da"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S planifikagailua"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Gehitu S Planner-i"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Helbidea blokeatu"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Bidali nire buruari"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Mezua ezabatu da"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Zirriborroetan gorde"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Programatutako posta elektronikoa"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Lehentasuna"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Mugitu Nori-ra"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Nork"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Argazkia atera"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Birbidali"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Lehentasuna"
+
index a956c7a..02380d8 100755 (executable)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1765,3 +1765,105 @@ msgstr "Näytä kaikki kansiot"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hei!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Aseta ensij. lähettäjäksi"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Poista ensisij. lähettäjistä"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Sähköpostiviestisi lähetetään ajoitettuna aikana"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Ajoitettu Lähtevät-kansio"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Lataa lisää"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Kuvan koon muuttaminen"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Alkuperäinen"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s on määritetty ensisijaiseksi lähettäjäksi"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s on poistettu ensijaisten lähettäjien luettelosta"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Siirretty kohteeseen %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Tapahtuma on poistettu kalenterista"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Poista kopio/piilokopio"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Ääni"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Kartta"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Toimitusraportti"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Päivämäärä ja aika"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Ajoitetun ajan on oltava tulevaisuudessa"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Tallennettu Omat tiedostot -kansioon"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Liite ylittää tässä Exchange-palvelinkäytännössä sallitun enimmäiskoon"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Viesti poistettu"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "Kalenteri"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Lisää S Planneriin"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Estä osoite"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Lähetä itselle"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Viesti poistettu"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Tallenna Luonnoksiin"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Ajoitettu sähköpostiviesti"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Tärkeys"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Siirrä kohteeseen"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Lähettäjä"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Ota kuva"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Lähetä edelleen"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Tärkeys"
+
index 58a5d42..7cab71f 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Afficher tous les dossiers"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Bonjour!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Définir expéd. prioritaire"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Supp. des expéd. prior."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Votre courriel sera envoyé à une heure précise"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Boite d'envoi programmée"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Charger plus"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Redimensionner l'image"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s a été défini comme expéditeur prioritaire"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s a été supprimé de la liste des expéditeurs prioritaires"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Déplacé vers %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Évènement supprimé du calendrier"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Supprimer Cc/Cci"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Plan"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Rapport de remise"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Date et heure"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "L'heure programmée doit être postérieure à l'heure actuelle"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Enregistré dans Mes fichiers"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "La taille de la pièce jointe est supérieure à la limite autorisée par la politique Exchange Server"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Message supprimé"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "Calendrier S"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Ajouter à S Calendrier"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Bloquer adresse"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Env. à moi-même"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Message supprimé"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Enregistrer dans Brouillons"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Courriel programmé"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Priorité"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Déplacer vers A"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "De"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Prendre une photo"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Transférer"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Priorité"
+
index 9a1a129..d8cb89e 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Afficher tous les dossiers"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Bonjour !"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Définir expéd. prioritaire"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Supp. des expéd. prior."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Votre e-mail sera envoyé à une heure précise"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Boîte d'envoi programmé"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Charger plus"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Redimensionner l'image"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s a été défini comme expéditeur prioritaire"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s a été supprimé de la liste des expéditeurs prioritaires"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Déplacé vers %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Evénement supprimé du calendrier"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Supprimer Cc/Cci"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Carte"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Accusé de réception"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Date et heure"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "L'heure programmée doit être postérieure à la date actuelle"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Enregistré dans Mes fichiers"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "La taille de la pièce jointe est supérieure à la limite autorisée par la politique Exchange Server"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Message supprimé"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Calendrier"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Ajouter à S Calendrier"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Bloquer adresse"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Env. à moi-même"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Message supprimé"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Enregistrer dans Brouillons"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "E-mail programmé"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Priorité"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Déplacer dans A"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "De"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Photographier"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Transférer"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Priorité"
+
index 8fe1181..cbe7929 100755 (executable)
--- a/po/ga.po
+++ b/po/ga.po
@@ -1765,3 +1765,105 @@ msgstr "Taispeáin gach fillteán"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Haló!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Socraigh mar sheoltóir tos."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Bain ó sheoltóirí tosaíochta"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Seolfar do r-phost ag an am sceidealta"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Bosca amach sceidealta"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Lódáil tuill."
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Athmhéidniú íomhá"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Bunúsach"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "Socraíodh %s mar sheoltóir tosaíochta"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "Tá %s bainte ó do liosta seoltóirí tosaíochta"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Bogtha chuig %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Imeacht bainte ón bhFéilire"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Bain Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Fuaim"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Léarscáil"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Admháil seachadta"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Dáta agus am"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Ní mór am sceidealaithe a shocrú sa todhchaí"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Sábháilte i Mo Chomhaid"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Sáraíonn an ceangaltán an t-uasmhéid a cheadaítear i mbeartas freastalaí Exchange seo"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Teachtaireacht scriosta"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Phleanálaí"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Cuir le S Pleanálaí"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blocáil seoladh"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Seol chugam féin"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Teachtaireacht scriosta"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Sábháil i nDreachtaí?"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "R-phost sceidealaithe"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Tosaíocht"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Bog chuig Chuig"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Ó"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Glac pictiúr"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Seol ar aghaidh"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Tosaíocht"
+
index dbbe340..12f3418 100755 (executable)
--- a/po/gl.po
+++ b/po/gl.po
@@ -1765,3 +1765,105 @@ msgstr "Amosar todas as carpetas"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Ola!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Def. remit. con priorid."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Elim. de remiten. prioridade"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "O teu correo electrónico enviarase á hora programada"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Caixa de saída programada"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Cargar máis"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Cambiar o tamaño da imaxe"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Orixinal"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s foi axustado como remitente con prioridade"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s eliminouse da lista de remitentes con prioridade"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Movido a %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Evento eliminado do Calendario"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Eliminar Cc/Cco"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Informe de entrega"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Data e hora"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "No futuro, debería establecerse a hora programada"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Gardado en Os meus arquivos"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "O adxunto supera o tamaño máximo permitido por esta política de servidor de Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Mensaxe eliminada"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Engadir a S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Bloquear enderezo"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Enviarme a min"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Mensaxe eliminada"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Gardar en Borradores"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Correo electrónico programado"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioridade"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Mover a Para"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "De"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Facer unha foto"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Reenviar"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioridade"
+
index 6f7b923..43e3bff 100755 (executable)
--- a/po/hi.po
+++ b/po/hi.po
@@ -1765,3 +1765,105 @@ msgstr "सभी फ़ोल्‍डर दिखाएँ"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "नमस्ते!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "प्राथमिक प्रेषक के रूप में सेट करें"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "प्राथमिक प्रेषक से निकालें"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "आपका ईमेल निर्धारित समय पर भेज दिया जाएगा"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "निर्धारित आउटबॉक्स"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "अधिक लोड करें"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "इमेज को पुन: आकार दें"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "मूल"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s को प्राथमिक प्रेषक के रूप में सेट किया गया है"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s को प्राथमिक प्रेषकों की सूची से निकाला गया है"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "%s ले जाया गया"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "कैलेंडर से प्रसंग निकाला गया"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "CC/Bcc निकालें"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "ऑडियो"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "मानचित्र"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "वितरण रिपोर्ट"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "दिनांक और समय"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "भविष्य में शेड्यूल्ड समय सेट करें"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "मेरी फ़ाइलों में सुरक्षित किया गया"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "संलग्नक का अधिकतम आकार इस एक्सचेंज सर्वर नीति द्वारा अनुमत सीमा से पार हो गया है"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "सन्देश हटाया गया है"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S प्लैनर"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "S Planner पर जोड़ें"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "अवरुद्ध पता"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "स्‍वयं को भेजें"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "सन्देश हटाया गया है"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "ड्राफ़्ट्‍स में सुरक्षित करें"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "निर्धारित किया गया ईमेल"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "प्राथमिकता"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "प्रति में ले जाएँ"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "से"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "तस्वीर लें"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "आगे भेजें"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "प्राथमिकता"
+
index b20b4de..9b1f40d 100755 (executable)
--- a/po/hr.po
+++ b/po/hr.po
@@ -1765,3 +1765,105 @@ msgstr "Prikaži sve mape"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Pozdrav!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Postavi kao prioritetni"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Ukloni iz prioritetnih"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Vaš će email biti poslan u postavljeno vrijeme"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Zakazane odlazne poruke"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Učitaj više"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Promjena veličine slike"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Originalna"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s je postavljen kao prioritetni kontakt"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s je uklonjen s popisa prioritetnih kontakata"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Premješteno na %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Događaj obrisan iz Kalendara"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Ukloni Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Zvuk"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Karta"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Izvješće o isporuci"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Datum i vrijeme"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Zakazano vrijeme treba biti u budućnosti"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Spremljeno u Moje datoteke"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Privitak prelazi maks. veličinu koju dopuštaju pravila Exchange poslužitelja"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Poruka obrisana"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planer"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Dodaj u S Planer"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokiraj adresu"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Pošalji meni"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Poruka obrisana"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S bilješka"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Spremi u Pripremu"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Zakazani email"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioritet"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Premjesti u Za"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Od"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Fotografiranje"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Proslijedi"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioritet"
+
index 441df00..3efb0b7 100755 (executable)
--- a/po/hu.po
+++ b/po/hu.po
@@ -1765,3 +1765,105 @@ msgstr "Összes mappa megjelenítése"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Üdvözöljük!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Beállítás fontos feladóként"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Fontos feladó eltávolítása"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Az e-mail az ütemezés szerinti időpontban el lesz küldve"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Ütemezett kimenő üzenetek"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Betöltés még"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Kép átméretezése"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Eredeti"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s beállítva fontos feladóként"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s eltávolítva a fontos feladók listájáról"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Áthelyezve a(z) %s mappába"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Esemény eltávolítva a Naptárból"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Másolat (Cc) /Titkos másolat (Bcc) mező eltávolítása"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Hang"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Térkép"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Kézbesítési jelentés"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Dátum és idő"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Az ütemezett időpontnak a jövőben kell lennie"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Mentve a Saját fájlok közé"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "A melléklet túllépi az Exchange-szerver irányelvei által megengedett maximális méretet"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Üzenet törölve"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S tervező"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Hozzáadás az S tervezőhöz"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Tiltott címek"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Küldés magamnak"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Üzenet törölve"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Piszkozat mentése"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Ütemezett e-mail"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioritás"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Áthelyezés a Címzett mezőbe"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Feladó"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Kép készítése"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Továbbküldés"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioritás"
+
index 017d077..8c2c75d 100755 (executable)
--- a/po/hy.po
+++ b/po/hy.po
@@ -1765,3 +1765,105 @@ msgstr "Ցույց տալ բոլոր թղթապանակները"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Բարև՛:"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Դրեք որպես առջնհրթ ուղարկող"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Հեռացրեք առջնհրթ ուղրկղներից"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Ձեր էլ. նամակը կուղարկվի պլանավորված ժամին"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Պլանավորված ելքի արկղ"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Բեռնել ավելին"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Պատկերի չափսերի փոփոխում"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Սկզբնական"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s նախադրվել է որպես առաջնահերթ ուղարկող"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s հեռացվել է առաջնահերթ ուղարկողների ցուցակից"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Տեղափոխվել է %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Իրադարձությունը հեռացվեց Օրացույցից"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Հեռացնել Պճ/Ծպճ"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Աուդիո"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Քարտեզ"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Առաքման զեկույց"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Անսաթիվ և ժամանակ"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Պլանավորված ժամանակը պետք է դրվի ապագայում"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Պահպանվել է Իմ Ֆայլերում"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Կցուրդը գերազանցում է Exchange սերվերի քաղաքականությամբ թույլատրվող առավելագույն չափը"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Հաղորդագրությունը ջնջված է"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Ավելացրեք S Planner-ին"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Արգելափակել հասցեն"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Ուղարկել ինքս ինձ"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Հաղորդագրությունը ջնջված է"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Պահել Սևագրերում"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Պլանավորված էլ. նամակ"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Առաջնություն"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Տեղափոխել դեպի Ում"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Ումից"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Նկարել"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Վերահասցեավորել"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Առաջնություն"
+
index b915b23..50d895e 100755 (executable)
--- a/po/is.po
+++ b/po/is.po
@@ -1765,3 +1765,105 @@ msgstr "Sýna allar möppur"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Halló!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Stilla sem sendanda í forg."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Fjarlægja sendanda í forg."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Tölvupósturinn þinn verður sendur á áætluðum tíma"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Áætlunarúthólf"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Hlaða meiru"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Breyta stærð myndar"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Tökustærð"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s hefur verið stillt(ur) sem sendandi í forgangi"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s var fjarlægð(ur) af lista yfir sendendur í forgangi"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Fært í %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Viðburður fjarlægður úr Dagbók"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Fjarlægja afrit"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Hljóð"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Kort"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Skilatilkynning"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Dagsetning og tími"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Áætlaður tími ætti að vera í framtíðinni"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Vistað í Skránum mínum"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Viðhengið er stærra en hámarksstærð sem Exchange-þjónsstefnan leyfir"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Boðum eytt"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S-skipulag"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Bæta við í S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Loka fyrir netfang"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Senda mér"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Boðum eytt"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Vista í Drögum"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Áætlaður tölvupóstur"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Forgangur"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Færa í Til"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Frá"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Taka mynd"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Framsenda"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Forgangur"
+
index 919b42f..f5d79b4 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Mostra tutte le cartelle"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Ciao!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Imposta come prioritario"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Rimuovi dai prioritari"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "L'e-mail verrà inviata all'orario pianificato"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Posta in uscita pianifica"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Carica altro"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Dimensioni immagini"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Originali"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s è stato impostato come mittente prioritario"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s è stato rimosso dall'elenco dei mittenti prioritari"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Spostato in %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Evento rimosso da Calendario"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Rimuovi Cc/Ccn"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mappa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Rapporto consegna"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Data e ora"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "L'ora programmata deve essere impostata nel futuro"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Salvato in Archivio"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Gli allegati superano le dimensioni massime consentite dalla policy di questo server Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Messaggio eliminato"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "Calendario"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Aggiungi a S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Indirizzo bloccato"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Invia a me stesso"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Messaggio eliminato"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Salva in Bozze"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "E-mail pianificata"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Priorità"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Sposta in A"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Da"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Scatta foto"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Inoltra"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Priorità"
+
index 41ce938..c5665f3 100755 (executable)
@@ -551,16 +551,16 @@ msgid "IDS_EMAIL_BODY_COMPLETE"
 msgstr "完了"
 
 msgid "IDS_EMAIL_BODY_ACCEPTED_C_PS"
-msgstr "この予定は受理されました: %s"
+msgstr "この予定は承認されました: %s"
 
 msgid "IDS_EMAIL_BODY_DECLINED_C_PS"
-msgstr "この予定は承認されませんでした %s"
+msgstr "この予定は承認されませんでした: %s"
 
 msgid "IDS_EMAIL_BODY_DOWNLOAD_FULL_MESSAGE"
 msgstr "メッセージ​全体​を​ダウンロード"
 
 msgid "IDS_EMAIL_BODY_TENTATIVE_C_PS"
-msgstr "仮の予定:%s"
+msgstr "この予定は仮承認されました: %s"
 
 msgid "IDS_EMAIL_BODY_WHEN_C_PS"
 msgstr "予定日時: %s"
@@ -731,7 +731,7 @@ msgid "IDS_EMAIL_BODY_MATCH_CRITERIA"
 msgstr "振り分けルール"
 
 msgid "IDS_EMAIL_BODY_NOT_USED"
-msgstr "利用不可"
+msgstr "未使用"
 
 msgid "IDS_EMAIL_BODY_NO_ACCOUNTS"
 msgstr "アカウントがありません。"
@@ -782,7 +782,7 @@ msgid "IDS_EMAIL_OPT_OPEN_URL"
 msgstr "URLを開く"
 
 msgid "IDS_EMAIL_OPT_UPDATE_EXISTING"
-msgstr "既存連絡先を更新"
+msgstr "連絡先を更新"
 
 msgid "IDS_EMAIL_POP_ADD_ACCOUNTS"
 msgstr "アカウント​を​追加​します"
@@ -860,7 +860,7 @@ msgid "IDS_EMAIL_HEADER_ATTACH_FILE"
 msgstr "ファイル​を​添付"
 
 msgid "IDS_EMAIL_BODY_ACCOUNT_PS_ALREADY_IN_USE"
-msgstr "ã\81\93ã\81®%sã\82¢ã\82«ã\82¦ã\83³ã\83\88は既に使用しています。"
+msgstr "ã\82¢ã\82«ã\82¦ã\83³ã\83\88%sは既に使用しています。"
 
 msgid "IDS_EMAIL_POP_ACCOUNT_ALREADY_EXISTS"
 msgstr "アカウントは既に存在します。"
@@ -1292,7 +1292,7 @@ msgid "IDS_EMAIL_BODY_MEETING_INVITATION"
 msgstr "会議への招待"
 
 msgid "IDS_EMAIL_OPT_SUGGEST_NEW_TIME_ABB"
-msgstr "æ\96°ã\81\97ã\81\84æ\99\82é\96\93を提案"
+msgstr "æ\96°ã\81\97ã\81\84æ\97¥æ\99\82を提案"
 
 msgid "IDS_EMAIL_BODY_VIEW_IN_CALENDAR"
 msgstr "カレンダーで表示"
@@ -1355,7 +1355,7 @@ msgid "IDS_EMAIL_POP_UNABLE_TO_DECRYPT_MESSAGE_CERTIFICATE_NOT_INSTALLED"
 msgstr "メッセージを解読できません。証明書がインストールされていません。"
 
 msgid "IDS_EMAIL_POP_UNABLE_TO_SIGN_OR_ENCRYPT_MESSAGE_CERTIFICATE_NOT_INSTALLED"
-msgstr "ã\83¡ã\83\83ã\82»ã\83¼ã\82¸ã\82\92ç½²å\90\8dã\81¾ã\81\9fã\81¯æ\9a\97å\8f·å\8c\96できません。証明書がインストールされていません。"
+msgstr "ã\83¡ã\83\83ã\82»ã\83¼ã\82¸ã\81¸ã\81®ç½²å\90\8dã\82\84æ\9a\97å\8f·å\8c\96ã\81\8cできません。証明書がインストールされていません。"
 
 msgid "IDS_EMAIL_POP_DOWNLOAD_MORE_DETAILS_TO_SHOW_S_MIME_MESSAGES_CONTINUE_Q"
 msgstr "S/MIMEメッセージを表示するには詳細情報をダウンロードしてください。続行しますか?"
@@ -1634,7 +1634,7 @@ msgid "IDS_EMAIL_BODY_EVERY_1_HOUR"
 msgstr "1時間ごと"
 
 msgid "IDS_EMAIL_OPT_SEND_EMAIL_TO_MYSELF_ABB"
-msgstr "自分あてにEメールを送信"
+msgstr "宛先に自分を追加"
 
 msgid "IDS_EMAIL_HEADER_SCHEDULED_EMAIL"
 msgstr "送信予約Eメール"
@@ -1765,3 +1765,105 @@ msgstr "全てのフォルダを表示"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "こんにちは"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "優先送信元として設定"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "優先送信元から削除"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Eメールは予約時刻に送信されます。"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "送信予約トレイ"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "さらに読み込む"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "画像のリサイズ"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "オリジナルサイズ"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%sを優先送信元として設定しました。"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%sを優先送信元のリストから削除しました。"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "[%s]に移動しました。"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "カレンダーから予定を削除しました。"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Cc/Bccを削除"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "オーディオ"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "地図"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "配信確認"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "日付と時刻"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "予定時刻は未来の時刻で設定してください"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "マイファイルに保存されました。"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "添付ファイルは、このExchangeサーバーポリシーによって許可された最大サイズを超えています。"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "メッセージを削除しました。"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "Sプランナー"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Sプランナーに追加"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "アドレスをブロック"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "自分宛に送信"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "メッセージを削除しました。"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "Sノート"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "下書きに保存"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "送信予約Eメール"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "優先度"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "宛先に移動"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "送信元"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "カメラを起動"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "転送"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "優先度"
+
index db8bf22..34b9a36 100755 (executable)
--- a/po/ka.po
+++ b/po/ka.po
@@ -1765,3 +1765,105 @@ msgstr "ყველა საქაღალდის ჩვენება"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "გამარჯობა!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "პრიორიტ. გამგზავნად არჩევა"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "პრიორ. გამგზავნებიდან ამოშლა"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "თქვენი ელწერილი გაიგზავნება დაგეგმილ დროს"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "დაგეგმილი გასაგზავნები"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "ჩატვირთე მეტი"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "სურათის ზომა"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "თავდაპირველი"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s დაყენებულია, როგორც პრიორიტეტული გამომგზავნი"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s წაიშალა პრიორიტეტული გამომგზავნის სიაში"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "გადავიდა ადგილზე: %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "მოვლენა წაიშალა კალენდარში"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "ასლის/ბრმა ასლის წაშლა"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "აუდიო"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "რუქა"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "მიტანის რეპორტი"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "თარიღი და დრო"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "დაგეგმილი დრო დანიშნული უნდა იყოს მომავალში"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "შენახულია ჩემს ფაილებში"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "დანართი აჭარბებს Exchange სერვერის მიერ ნებადართულ მაქსიმალურ ზომას"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "შეტყობინ. წაშლილია"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "დაამატეთ S Planner-ზე"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "მისამართის დაბლოკვა"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "გაგზავნე ჩემთან"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "შეტყობინ. წაშლილია"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "მონახაზებში შენახვა"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "დაგეგმილი ელწერილი"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "პრიორიტეტი"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "გადასვლა ველზე ”ვის”"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "საიდან"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "სურათის გადაღება"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "გადამისამართება"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "პრიორიტეტი"
+
index 08753a5..75d88ed 100755 (executable)
--- a/po/kk.po
+++ b/po/kk.po
@@ -149,7 +149,7 @@ msgid "IDS_EMAIL_OPT_HUGE_M_TEXTSIZE"
 msgstr "Ірі"
 
 msgid "IDS_EMAIL_BODY_ALWAYS_CC_BCC_MYSELF"
-msgstr "Мені әрдайым 'Көшірме/Жасырын көшірме' жолына қосу"
+msgstr "Мені әрдайым \"Көшірме/Жасырын көшірме\" жолына қосу"
 
 msgid "IDS_EMAIL_BODY_ALWAYS_CC_MYSELF"
 msgstr "Әрдайым мені көшірмеге"
@@ -584,7 +584,7 @@ msgid "IDS_EMAIL_MBODY_HUGE"
 msgstr "Ірі"
 
 msgid "IDS_EMAIL_BODY_MOVE_TO_TO"
-msgstr "'Кімге' жолына ауыстыру"
+msgstr "\"Кімге\" жолына ауыстыру"
 
 msgid "IDS_EMAIL_HEADER_SELECT_EMAIL_ADDRESS"
 msgstr "Электрондық пошта мекенжайын таңдаңыз"
@@ -1765,3 +1765,105 @@ msgstr "Барлық қалтаны көрсету"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Сәлем!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Басым. жіберуші етіп орнату"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Басым. жіберушілерден жою"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Электрондық пошта хабарыңыз жоспарланған уақытта жіберіледі"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Жоспар-ған шығыс қалтасы"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Қосымша жүк-у"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Сурет өлшемін өзгерту"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Түпнұсқа"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s басымдықты жіберуші ретінде орнатылды"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s басымдықты жіберушілер тізімінен жойылды"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "%s ішіне ауыстырылды"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Күнтізбеден жойылған оқиға"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Көшірме/жасырын көшірме жолын тазарту"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Аудио"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Карта"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Жеткізу жөніндегі есеп"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Күні және уақыты"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Жоспарланған уақыт келер уақытта белгіленуі керек"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "\"Менің файлдарым\" ішінде сақталды"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Тіркеме Exchange сервер саясатымен рұқсат етілген ең үлкен өлшем шегінен асып кетті"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Хабар өшірілді"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "S Planner құрамына қосу"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Мекен-жайды бұғаттау"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Өзіме жіберу"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Хабар өшірілді"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Жоспарларға сақтау"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Жоспарланған электрондық пошта"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Ерекшелігі"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "\"Кімге\" жолына ауыстыру"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Кімнен"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Суретке түсіру"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Қайта жіберу"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Ерекшелігі"
+
index 06c8b1a..0f4ae82 100755 (executable)
@@ -1484,7 +1484,7 @@ msgid "IDS_EMAIL_OPT_ACCEPT"
 msgstr "수락"
 
 msgid "IDS_EMAIL_OPT_DECLINE"
-msgstr "거절"
+msgstr "참여 거절"
 
 msgid "IDS_EMAIL_BODY_ALL_ACCOUNTS"
 msgstr "모든 계정"
@@ -1765,3 +1765,105 @@ msgstr "모든 폴더 보기"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "안녕하세요!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "중요 발신인으로 설정"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "중요 발신인에서 삭제"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "이메일이 예약된 시간에 전송됩니다"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "예약 메시지함"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "더 불러오기"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "이미지 크기 조절"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "원본"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s이(가) 중요 발신인으로 설정되었습니다"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s이(가) 중요 발신인 목록에서 삭제되었습니다"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "%s(으)로 이동되었습니다"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "캘린더에서 일정이 삭제되었습니다"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "참조/숨은참조 삭제"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "오디오"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "지도"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "수신 확인"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "날짜 및 시간"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "예약 시간은 현재 시간 이후로만 설정 가능합니다"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "내 파일에 저장되었습니다"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Exchange 서버 정책이 허용하는 최대 크기를 초과하는 파일입니다."
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "메시지가 삭제되었습니다"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S플래너"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "S 일정표에 추가"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "차단 주소"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "나에게 전송"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "메시지가 삭제되었습니다"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S노트"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "임시보관함에 저장"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "예약 이메일"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "중요도"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "수신인으로 이동"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "발신"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "사진 촬영"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "전달"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "중요도"
+
index 276dbc4..72debf5 100755 (executable)
--- a/po/lt.po
+++ b/po/lt.po
@@ -1765,3 +1765,105 @@ msgstr "Rodyti visus aplankus"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Sveiki!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Nust. kaip pirmenyb. siunt."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Šalinti iš pirmenyb. siunt."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Jūsų el. laiškas bus išsiųstas suplanuotu laiku"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Suplanuoti siunčiamieji"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Įkelti dar"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Pav. dydžio keitimas"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Originalas"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s siuntėjui nustatyta pirmenybė"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s buvo pašalintas iš pirmenybinių siuntėjų sąrašo"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Perkelta į %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Įvykis pašalintas iš kalendoriaus"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Pašalinti Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Garso"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Žemėlapis"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Ataskaita apie pristatymą"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Data ir laikas"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Planuojamas laikas turi būti nustatytas ateityje"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Išsaugota aplanke „Mano failai“"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Priedas yra didesnis nei leidžia šio „Exchange“ serverio politika"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Žinutė ištrinta"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Pridėti prie „S Planner“"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokuoti adresą"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Siųsti sau"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Žinutė ištrinta"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Įrašyti į  Juodraščius"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Suplanuotas el. laiškas"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Pirmenybė"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Perkelti į „Kam“"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Nuo"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Fotografuoti"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Persiųsti"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Pirmenybė"
+
index a10f3af..c3fd423 100755 (executable)
--- a/po/lv.po
+++ b/po/lv.po
@@ -1765,3 +1765,105 @@ msgstr "Parādīt visas mapes"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Sveicināti!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Iest. kā priorit. sūtītāju"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Noņ. no priorit. sūtītājiem"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Jūsu e-pasta ziņa tiks nosūtīta ieplānotajā laikā"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Plānotā izsūtne"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Ielādēt vēl"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Attēla lieluma mainīšana"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Sākotnējais"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s ir iestatīts kā prioritārais sūtītājs"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s ir noņemts no prioritāro sūtītāju saraksta"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Pārvietots uz mapi %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Notikums noņemts no kalendāra"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Noņemt kopiju/diskrēto kopiju"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Karte"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Piegādes atskaite"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Datums un laiks"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Turpmāk ir jāiestata ieplānotais laiks"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Saglabāts mapē Mani faili"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Pielikuma lielums pārsniedz šīs Exchange servera politikas atļauto maksimālo lielumu"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Ziņa izdzēsta"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Pievienot pie S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Bloķēt adresi"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Sūtīt sev"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Ziņa izdzēsta"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Saglabāt mapē Melnraksti"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Ieplānota e-pasta ziņa"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioritāte"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Pārvietot uz Kam"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "No"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Fotografēt"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Pārsūtīt"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioritāte"
+
index a05de8c..36f38cd 100755 (executable)
--- a/po/mk.po
+++ b/po/mk.po
@@ -1136,7 +1136,7 @@ msgid "IDS_EMAIL_OPT_DATE"
 msgstr "Датум"
 
 msgid "IDS_EMAIL_HEADER_SEARCH"
-msgstr "Побарај"
+msgstr "Пребарување"
 
 msgid "IDS_EMAIL_POP_UNABLE_TO_OPEN_EMAIL_MESSAGE"
 msgstr "Не може да се отвори email-пораката"
@@ -1310,7 +1310,7 @@ msgid "IDS_EMAIL_BODY_SMTP_SERVER"
 msgstr "SMTP сервер"
 
 msgid "IDS_EMAIL_OPT_SEARCH"
-msgstr "Побарај"
+msgstr "Пребарување"
 
 msgid "IDS_EMAIL_OPT_SHARE"
 msgstr "Сподели"
@@ -1765,3 +1765,105 @@ msgstr "Прикажи ги сите папки"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Здраво!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Одреди приоритетен испраќач"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Отстр. од приор. испраќачи"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Вашата е-пошта ќе се прати во закажаното време"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Закажано излезно сандаче"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Вчитај повеќе"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Смени големина на слика"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Оригинална"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s е поставен како приоритетен испраќач"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s е избришан од листата приоритетни испраќачи"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Преместено во %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Настанот е отстранет од Календарот"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Избриши Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "звук"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Мапа"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Извештај за испорака"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Датум и време"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Планираното време треба да биде во иднина"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Сочувано во Мои фајлови"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Прилогот ја надминува максималната големина дозволена со политиката на Exchange серверот"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Пораката е избришана"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Додај во S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Блокирај адреса"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Прати на себе"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Пораката е избришана"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Сочувај во Незавршени"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Закажана е-пошта"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Приоритет"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Премести во До"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Од"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Сликај"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Препрати"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Приоритет"
+
index 5658fad..9847bf0 100755 (executable)
--- a/po/nb.po
+++ b/po/nb.po
@@ -1765,3 +1765,105 @@ msgstr "Vis alle mapper"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hei!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Angi som prioritert avsender"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Fjern fra priorit. avsendere"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "E-posten din blir sendt til planlagt tid"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Utboks for planlagte meld."
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Last flere"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Skaler bilde"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s har blitt angitt som prioritert avsender"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s har blitt fjernet fra listen over prioriterte avsendere"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Flyttet til %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Hendelse fjernet fra Kalender"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Fjern Ko/Bko"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Lyd"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Kart"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Leveringsrapport"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Dato og tid"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Planlagt tidspunkt må angis i fremtiden"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Lagret i Mine filer"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Vedlegg overstiger maksimal størrelse som er tillatt av denne Exchange server-policyen"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Melding slettet"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Legg til i S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokker adresse"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Send til meg selv"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Melding slettet"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Lagre i Utkast"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Planlagt e-post"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioritet"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Flytt til Til"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Fra"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Ta bilde"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Videresend"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioritet"
+
index 28b065b..8eede13 100755 (executable)
@@ -1325,25 +1325,25 @@ msgid "IDS_EMAIL_OPT_NFC"
 msgstr "NFC"
 
 msgid "IDS_EMAIL_BODY_SUNDAY"
-msgstr "Zondag"
+msgstr "zondag"
 
 msgid "IDS_EMAIL_BODY_MONDAY"
-msgstr "Maandag"
+msgstr "maandag"
 
 msgid "IDS_EMAIL_BODY_TUESDAY"
-msgstr "Dinsdag"
+msgstr "dinsdag"
 
 msgid "IDS_EMAIL_BODY_WEDNESDAY"
-msgstr "Woensdag"
+msgstr "woensdag"
 
 msgid "IDS_EMAIL_BODY_THURSDAY"
-msgstr "Donderdag"
+msgstr "donderdag"
 
 msgid "IDS_EMAIL_BODY_FRIDAY"
-msgstr "Vrijdag"
+msgstr "vrijdag"
 
 msgid "IDS_EMAIL_BODY_SATURDAY"
-msgstr "Zaterdag"
+msgstr "zaterdag"
 
 msgid "IDS_EMAIL_BODY_OTHER"
 msgstr "Overige"
@@ -1765,3 +1765,105 @@ msgstr "Alle mappen weergeven"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hallo!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Inst. als afz. met prior."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Wis uit afzenders met prior."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Uw e-mail wordt verzonden op het geplande tijdstip"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Postvak UIT v. gepl. ber."
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Meer laden"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Vergroten/verkleinen"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Oorspronkelijk"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s is ingesteld als een afzender met prioriteit"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s is verwijderd uit de lijst met afzenders met prioriteit"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Verplaatst naar %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Agenda-item verwijderd uit agenda"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Cc-/Bcc-veld verwijderen"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Kaart"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Ontvangstbevestiging"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Datum en tijd"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Geplande tijd moet in de toekomst liggen"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Opgeslagen in Mijn bestanden"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Bijlage overschrijdt maximale grootte die is toegestaan door dit Exchange Server-beleid"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Bericht is verwijderd"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Toevoegen aan S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Adres blokkeren"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Verzend aan mij"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Bericht is verwijderd"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Opslaan in Concepten"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Geplande e-mail"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioriteit"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Verplaatsen naar Aan"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Van"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Foto maken"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Doorsturen"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioriteit"
+
index 44b799c..47f743f 100755 (executable)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1765,3 +1765,105 @@ msgstr "Pokaż wszystkie katalogi"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Witaj!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Ustaw jako nadawcę prioryt."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Usuń z nadawców priorytet."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Twój e-mail zostanie wysłany o planowanej godzinie"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Zaplanowane wysłania"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Załad. więcej"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Zmiana rozmiaru obrazu"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Oryginalny"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "Użytkownik %s został ustawiony jako nadawca priorytetowy"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "Użytkownik %s został usunięty z listy nadawców priorytetowych"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Przeniesiono do %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Usunięto wydarzenie z kalendarza"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Usuń DW/UDW"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Dźwięk"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Raport doręczenia"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Data i godzina"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Zaplanowana godzina powinna być przyszła"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Zapisano w Moich plikach"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Rozmiar załącznika przekracza limit dozwolony przez zasadę tego serwera Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Wiadomość usunięta"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Terminarz"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Dodaj do Terminarza S"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokuj adres"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Wyślij do mnie"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Wiadomość usunięta"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Zapisz w wersjach roboczych"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Zaplanowany e-mail"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Priorytet"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Przenieś do Do"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Od"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Zrób zdjęcie"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Przekaż"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Priorytet"
+
index 520f643..32f6ec9 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Mostrar todas as pastas"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Olá!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Def. como remet. prior."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Remover dos remet. priorit."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Seu e-mail será enviado na hora agendada"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Mensagens agendadas"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Carregar mais"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Redimensionar imagem"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s foi definido como um remetente prioritário"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s foi removido da lista de remetentes prioritários"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Movido para %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Evento removido do Calendário"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Remover Cc/Cco"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Áudio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Confirm. de entrega"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Data e Hora"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "O tempo programado deve ser definido no futuro"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Salvo em Meus arquivos"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "O anexo excedeu o tamanho máximo permitido pela política deste Exchange server"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Mensagem apagada"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Adicionar ao S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Bloquear endereço"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Enviar para mim"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Mensagem apagada"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Salvar nos Rascunhos"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "E-mail agendado"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioridade"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Mover para Para"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "De"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Tirar foto"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Encaminhar"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioridade"
+
index 42b1996..8029430 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Mostrar todas as pastas"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Olá!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Def. como remet. prioritár."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Remover dos remet. priorit."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "O seu e-mail será enviado à hora programada"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Caixa de saída programada"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Carregar mais"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Redimens. imagem"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s foi definido como remetente prioritário"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s foi removido da lista de remetentes prioritários"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Movido para %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Evento removido da Agenda"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Remover Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Áudio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Relatório de entrega"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Data e hora"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "O tempo programado deve ser especificado no futuro"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Guardado em Os meus ficheiros"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "O anexo ultrapassa o tamanho máximo permitido pela política deste servidor Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Mensagem apagada"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Adicionar ao S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Bloquear endereço"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Enviar para mim"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Mensagem apagada"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Guardar nos Rascunhos"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "E-mail programado"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioridade"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Mover para Para"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "De"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Tirar fotografia"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Reencaminhar"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioridade"
+
index b80a216..58306c3 100755 (executable)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1765,3 +1765,105 @@ msgstr "Afişare integrală foldere"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Bună ziua!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Setare expeditor prioritar"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Elim. din exped. prioritari"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "E-mailul va fi trimis la ora planificată"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Căsuţă de ieşire progr."
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Mai mult"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Redimensionare imagine"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s a fost setat ca expeditor prioritar"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s a fost eliminat de pe lista de expeditori prioritari"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Mutat în %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Eveniment eliminat din Calendar"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Eliminare Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Hartă"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Raport livrare"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Dată şi oră"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Momentul programat trebuie să fie în viitor"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Salvat în Fişierele mele"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Ataşarea depăşeşte dimensiunea maximă permisă de această politică Exchange Server"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Mesaj şters"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "Planificator S"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Adăugare la Planificator S"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blocare adresă"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Trim. către mine"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Mesaj şters"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Salvare în Ciorne"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "E-mail planificat"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioritate"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Mutare la Către"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "De la"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Fotografiere"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Transfer"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioritate"
+
index 2427a82..06e8230 100755 (executable)
@@ -1343,7 +1343,7 @@ msgid "IDS_EMAIL_BODY_FRIDAY"
 msgstr "Пятница"
 
 msgid "IDS_EMAIL_BODY_SATURDAY"
-msgstr "Сyббота"
+msgstr "Суббота"
 
 msgid "IDS_EMAIL_BODY_OTHER"
 msgstr "Другой"
@@ -1765,3 +1765,105 @@ msgstr "Показать все папки"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Добро пожаловать!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Сделать приорит. отправит."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Удалить из приорит. отправ."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Сообщение будет отправлено в заданное время"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Запланир. к отправке"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Загрузить еще"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Размер фото"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Исходный"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "Пользователь %s назначен приоритетным отправителем"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "Пользователь %s удален из списка приоритетных отправителей"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Перемещен в %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Событие удалено из календаря"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Удалить копию или скрытую копию"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Звук"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Карта"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Отчет о доставке"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Дата и время"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Запланированное время должно относиться к будущему"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Сохранено в папке 'Мои файлы'"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Превышен максимальный размер вложения, разрешенный политикой данного сервера Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Сообщение удалено"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Добавить в S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Адрес заблокирован"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Отправить себе"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Сообщение удалено"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Сохранить в Черновики"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Запланированная электронная почта"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Приоритет"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Переместить в"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "От"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Сделать фото"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Переслать"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Приоритет"
+
index 7b149a3..2efa466 100755 (executable)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1765,3 +1765,105 @@ msgstr "Zobraziť všetky priečinky"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Dobrý deň!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Nast. ako priorit. odosiel."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Odstr. z priorit. odosiel."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Váš e-mail sa odošle v naplánovanom čase"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Naplánované na odoslanie"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Načít. ďalšie"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Upraviť veľkosť obrázka"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Pôvodná"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "Odosielateľ %s bol nastavený ako prioritný odosielateľ"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "Odosielateľ %s bol odstránený zo zoznamu prioritných odosielateľov"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Presunuté do %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Udalosť bola odstránená z kalendára"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Odstrániť polia Kópia a Skrytá kópia"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Zvuk"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Potvrdenie o doručení"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Dátum a čas"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Naplánovaný čas musí byť nastavený v budúcnosti"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Uložené do priečinka Moje súbory"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Príloha prekračuje maximálnu veľkosť povolenú politikou tohto servera Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Správa vymazaná"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "Plánovač S"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Pridať do S plánovača"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokovať adresu"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Odoslať mne"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Správa vymazaná"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Uložiť do konceptov"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Naplánovaný e-mail"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Dôležitosť"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Premiestniť do poľa Adresát"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Od"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Fotografovať"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Preposlať"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Dôležitosť"
+
index 38e90cb..e83a743 100755 (executable)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1765,3 +1765,105 @@ msgstr "Pokaži vse mape"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Živjo!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Nastavi kot predn. pošilj."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Odstrani iz predn. pošilj."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "E-pošta bo poslana ob načrtovanem času"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Načrtovano pošiljanje"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Naloži več"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Spremeni velikost slike"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "Oseba %s je nastavljena kot prednostni pošiljatelj"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "Oseba %s je bila odstranjena s seznama prednostnih pošiljateljev"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Premaknjeno v %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Dogodek odstranjen iz Koledarja"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Odstrani Kp/Skp"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Zvok"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Zemljevid"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Poročilo o dostavi"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Datum in čas"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Načrtovani čas mora biti nastavljen v prihodnosti"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Shranjeno v Moje datoteke"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Priloga presega največjo dovoljeno velikost po tem pravilniku strežnika Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Sporočilo je izbrisano"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Dodaj v S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokiraj naslov"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Pošlji meni"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Sporočilo je izbrisano"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Shrani v Osnutke."
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Načrtovana e-pošta"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Pomembnost"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Premakni v polje Za"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Od"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Posnemi sliko"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Posreduj"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Pomembnost"
+
index 42f3d11..69f5ab2 100755 (executable)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1765,3 +1765,105 @@ msgstr "Prikaži sve foldere"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Zdravo!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Postavi priorit. pošiljaoca"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Ukloni iz prio. pošiljalaca"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Tvoja e-poruka će biti poslata u planirano vreme"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Ot. sand. zakaz. e-poruka"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Učitaj još"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Promena veličine slike"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Original"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s je postavljen kao prioritetni pošiljalac"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s je uklonjen sa liste prioritetnih pošiljalaca"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Premešteno u %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Događaj je uklonjen iz kalendara"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Ukloni Cc/Bcc polje"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Zvuk"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Mapa"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Izveštaj o prispeću"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Datum i vreme"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Planirano vreme treba da bude u budućnosti"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Sačuvano u Mojim fajlovima"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Prilog premašuje maksimalnu veličinu koju dozvoljava politika ovog Exchange servera"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Poruka obrisana"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S planer"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Dodaj u S planer"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blokiraj adresu"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Pošalji meni"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Poruka obrisana"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Sačuvaj u Skice?"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Planirana e-poruka"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioritet"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Premesti u „Za“"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Od"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Slikaj"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Prosledi"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioritet"
+
index ea9151d..b90b9d2 100755 (executable)
--- a/po/sv.po
+++ b/po/sv.po
@@ -41,7 +41,7 @@ msgid "IDS_EMAIL_BODY_BLOCK_EMAILS"
 msgstr "Blockera e-post"
 
 msgid "IDS_EMAIL_BODY_CC"
-msgstr "Cc"
+msgstr "Kopia"
 
 msgid "IDS_EMAIL_BODY_DRAFTS"
 msgstr "Utkast"
@@ -1765,3 +1765,105 @@ msgstr "Visa alla mappar"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Hej!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Ställ in som priorit. avs."
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Ta bort från priorit. avs."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Ditt e-postmeddelande kommer att skickas vid den schemalagda tidpunkten"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Schemalagd utkorg"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Läs in mer"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Ändra bildstorlek"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Ursprunglig"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s är inställd som prioriterad avsändare"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s har tagits bort från listan med prioriterade avsändare"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Flyttat till %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Händelsen togs bort från Kalender"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Ta bort Cc/Bcc"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Ljud"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Karta"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Leveransrapport"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Datum och tid"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Schemalagd tid ska vara i framtiden"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Sparat i Mina filer"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Bilagan överskrider den maximalt tillåtna storleken som tillåts för Exchange Server-policyn"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Meddelande raderat"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Lägg till i S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Blockera adress"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Skicka till mig"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Meddelande raderat"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Spara i Utkast"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Schemalagt e-postmeddelande"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Prioritet"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Flytta till Till"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Från"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Ta foto"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Vidarebefordra"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Prioritet"
+
index 335e798..41ad370 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "Tüm dosyaları göster"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Selam!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Öncelikli gönderen olarak belirle"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Öncelikli gndrnlerden kaldır"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "E-postanız belirtilen saatte gönderilecek"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Planlanmış giden kutusu"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Dh fzla yükle"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Resim yeniden boyutlandır"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Orijinal"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s öncelikli gönderen olarak ayarlandı"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s öncelikli gönderenler listesinden çıkartıldı"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "%s konumuna taşındı"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Etkinlik Takvimden kaldırıldı"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Cc/Bcc alanını kaldır"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Ses"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Harita"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "İletim raporu"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Tarih ve saat"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Planlanan zaman gelecekte ayarlanmalı"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Dosyalarım'a kaydedildi"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Bu ek, Exchange sunucusu politikasının izin verdiği maksimum boyutu aşıyor"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Mesaj silindi"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planlayıcı"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "S Planlayıcıya ekle"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Engellenen adresler"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Bana gönder"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Mesaj silindi"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Taslaklara kaydet"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Zamanlanan e-posta"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Öncelik"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Alıcıya taşı"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Kimden"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Resim çek"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "İlet"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Öncelik"
+
index 33206aa..8f39d6a 100755 (executable)
--- a/po/uk.po
+++ b/po/uk.po
@@ -584,7 +584,7 @@ msgid "IDS_EMAIL_MBODY_HUGE"
 msgstr "Великий"
 
 msgid "IDS_EMAIL_BODY_MOVE_TO_TO"
-msgstr "Перемістити у поле 'Кому'"
+msgstr "Перемістити у поле \"Кому\""
 
 msgid "IDS_EMAIL_HEADER_SELECT_EMAIL_ADDRESS"
 msgstr "Вибір адреси Email"
@@ -1765,3 +1765,105 @@ msgstr "Відображення всіх папок"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Вітаємо!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Встановити як пріор.відправника"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Видалити зі спис.пріор.відправ."
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "Повідомлення Email буде надіслано в запланований час"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Запл. вихід. повідомлення"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Завант. інші"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Змінення розміру зображ."
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Оригінал"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s встановлено як пріоритетний відправник"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s видалено зі списку пріоритетних відправників"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "Переміщено в %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Подію видалено з календаря"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Видалити \"Копія/Пр.к.\""
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Аудіо"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Мапа"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Звіт про доставку"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Дата і час"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Запланований час слід встановити у майбутньому"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Збережено в моїх файлах"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Розмір вкладення перевищує максимально дозволений політикою сервера Exchange"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Повідомлення видалено"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "Додати до S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Блокувати адресу"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "Надіслати собі"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Повідомлення видалено"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Зберегти в чернетках"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Заплановане повідомлення Email"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Пріоритет"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Перемістити у поле \"Кому\""
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Від"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Зробити знімок"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Переслати"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Пріоритет"
+
index 71352f6..c45f6d4 100755 (executable)
--- a/po/uz.po
+++ b/po/uz.po
@@ -1208,7 +1208,7 @@ msgid "IDS_EMAIL_OPT_VIEW"
 msgstr "Ko‘rib chiqish"
 
 msgid "IDS_EMAIL_OPT_COPY_LINK"
-msgstr "'Link'dan nusxa ko‘chirish"
+msgstr "\"Link\"dan nusxa ko‘chirish"
 
 msgid "IDS_EMAIL_POP_FAILED_TO_MARK_AS_READ"
 msgstr "O‘qilgan sifatida belgilab bo‘lmadi"
@@ -1765,3 +1765,105 @@ msgstr "Barcha jildlarni ko‘rsatish"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "Salom!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "Ust. ega yub. sifatida o‘rn"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "Ust. ega yub. olib tashla"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "E-pochta xabaringiz rejalashtirilgan vaqtda yuboriladi"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "Reja-gan chiq/xab. qutisi"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "Ko‘proq"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "Rasm o‘lchamini o‘zgartirish"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "Asl nusxa"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s ustunlikka ega yuboruvchi sifatida o‘rnatilgan"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s ustunlikka ega yuboruvchilar ro‘yxatidan olib tashlangan"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "%sga ko‘chirildi"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "Voqea Kalendardan olib tashlandi"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "Nusxa/yashirin nusxani o‘chirish"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "Audio"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "Xarita"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "Yetkazilganlik haqidagi hisobot"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "Sana va vaqt"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "Belgilangan vaqt keyinchalik o‘rnatilishi kerak"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "Mening fayllarimda saqlangan"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "Biriktirma o‘lchami ushbu Exchange serveri siyosati tomonidan ruxsat etilgan maksimal o‘lchamdan katta"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "Xabar o'chirildi"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "S Plannerga qo‘shish"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "Manzilni bloklash"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "O‘zimga yuborish"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "Xabar o'chirildi"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "Qoral-da saql."
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "Rejalashtirilgan e-pochta"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "Ustunlik"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "Quyidagiga ko‘chirish"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "Quyidagidan"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "Rasmga olish"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "Boshqaga yo‘naltirish"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "Ustunlik"
+
index e6d1f1a..a52469a 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "显示全部文件夹"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "你好!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "设置为优先发件人"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "从优先发件人移除"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "您的电子邮件将在预定时间发送"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "定时发件箱"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "载入更多"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "图像调整"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "原作"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s 已被设置为优先发件人"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s 已从优先发件人的列表移除"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "已移动到 %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "事件已从日历移除"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "移除抄送/暗送"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "声音"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "地图"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "发送报告"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "日期和时间"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "预定的时间应当在将来"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "已保存在我的文件中"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "附件超过该 Exchange 服务器政策允许的最大大小"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "信息已删除"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S日历"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "添加到 S 日历"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "阻止地址"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "发送至我自己"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "信息已删除"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "保存到草稿箱"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "预定的电子邮件"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "优先级"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "移到收件人"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "发件人"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "拍照"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "转发"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "优先级"
+
index ea588aa..c29e6b8 100755 (executable)
@@ -65,7 +65,7 @@ msgid "IDS_EMAIL_BODY_SIGNATURE"
 msgstr "簽名"
 
 msgid "IDS_EMAIL_BODY_SPAMBOX"
-msgstr "垃圾"
+msgstr "垃圾郵件匣"
 
 msgid "IDS_EMAIL_OPT_SENDER"
 msgstr "寄件人"
@@ -800,7 +800,7 @@ msgid "IDS_EMAIL_POP_MAXIMUM_NUMBER_OF_ATTACHMENTS_REACHED"
 msgstr "附件數目已達上限"
 
 msgid "IDS_EMAIL_POP_MOVE_TO_SPAMBOX_Q"
-msgstr "要移動到垃圾嗎?"
+msgstr "要移動到垃圾郵件匣嗎?"
 
 msgid "IDS_EMAIL_POP_NO_RECIPIENTS_ADDED_ENTER_RECIPIENTS"
 msgstr "未加入收件人。請輸入收件人"
@@ -1223,7 +1223,7 @@ msgid "IDS_EMAIL_OPT_COPY_URL"
 msgstr "複製網址"
 
 msgid "IDS_EMAIL_OPT_MOVE_TO_SPAMBOX"
-msgstr "移動到垃圾"
+msgstr "移動到垃圾郵件匣"
 
 msgid "IDS_EMAIL_POP_DISCARD_CURRENT_MESSAGE_Q"
 msgstr "捨棄目前的訊息嗎?"
@@ -1370,7 +1370,7 @@ msgid "IDS_EMAIL_BODY_UNREAD"
 msgstr "未讀"
 
 msgid "IDS_EMAIL_BODY_CLEAR"
-msgstr "æ\99´æ\9c\97"
+msgstr "æ¸\85é\99¤"
 
 msgid "IDS_EMAIL_BODY_OLDER_M_HISTORY"
 msgstr "較舊的"
@@ -1765,3 +1765,105 @@ msgstr "顯示所有資料夾"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "您好!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "設定為優先寄件人"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "從優先寄件人移除"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "您的電子郵件將在預定時間發送"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "預定寄件匣"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "載入更多"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "圖像調整大小"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "原圖"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s 已被設定為優先寄件人"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s 已從優先寄件人清單中移除"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "已移動到 %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "事件已從日曆中移除"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "移除抄送/密送"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "音訊"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "地圖"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "傳遞報告"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "日期和時間"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "列入日程的時間需設為未來時間"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "儲存到我的檔案"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "附件超過 Exchange 伺服器政策的檔案大小上限"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "電子郵件已刪除"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "加入至 S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "封鎖地址"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "發送給我自己"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "電子郵件已刪除"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "存儲到草稿匣"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "預定的電子郵件"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "優先次序"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "移動到至"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "由"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "拍照"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "轉寄"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "優先次序"
+
index 1ddc033..ae92b0e 100755 (executable)
@@ -1765,3 +1765,105 @@ msgstr "显示全部文件夹"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "你好!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "设置为优先发件人"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "从优先发件人移除"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "您的电子邮件将在预定时间发送"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "定时发件箱"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "载入更多"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "调整图像大小"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "原始尺寸"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s 已被设置为优先发件人"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s 已从优先发件人的列表移除"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "已移动到 %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "事件已从日历移除"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "移除抄送/暗送"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "音频"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "地图"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "送达报告"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "日期和时间"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "预定的时间应当在将来"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "已保存在我的文件中"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "附件超过该 Exchange 服务器政策允许的最大大小"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "讯息已删除"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "添加到 S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "封锁地址"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "发送至我自己"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "讯息已删除"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "储存至草稿箱"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "预定的电子邮件"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "优先"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "移动到收件人"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "发件人"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "拍照"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "转发"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "优先"
+
index c99a4d3..4ee01ed 100755 (executable)
@@ -149,7 +149,7 @@ msgid "IDS_EMAIL_OPT_HUGE_M_TEXTSIZE"
 msgstr "超大"
 
 msgid "IDS_EMAIL_BODY_ALWAYS_CC_BCC_MYSELF"
-msgstr "總是寄送副件/密件給自己"
+msgstr "總是寄送副件/密件副本給自己"
 
 msgid "IDS_EMAIL_BODY_ALWAYS_CC_MYSELF"
 msgstr "總是抄送給自己"
@@ -302,7 +302,7 @@ msgid "IDS_EMAIL_OPT_TO_ALL_ABB"
 msgstr "到全部"
 
 msgid "IDS_EMAIL_OPT_ADD_CC_BCC"
-msgstr "加入副本/密件副本"
+msgstr "新增副本/密件副本"
 
 msgid "IDS_EMAIL_OPT_MOVE_TO_CC"
 msgstr "移動到副本"
@@ -578,7 +578,7 @@ msgid "IDS_EMAIL_OPT_OTHERS"
 msgstr "其他"
 
 msgid "IDS_EMAIL_OPT_UNREAD"
-msgstr "未讀"
+msgstr "未讀"
 
 msgid "IDS_EMAIL_MBODY_HUGE"
 msgstr "超大"
@@ -701,7 +701,7 @@ msgid "IDS_EMAIL_BODY_BODY"
 msgstr "本文"
 
 msgid "IDS_EMAIL_BODY_CC_BCC"
-msgstr "副本/密件"
+msgstr "副本/密件副本"
 
 msgid "IDS_EMAIL_BODY_CHECK_INTERVAL"
 msgstr "檢查時間間隔"
@@ -1765,3 +1765,105 @@ msgstr "顯示所有資料夾"
 msgid "IDS_EMAIL_BODY_HELLO_E"
 msgstr "您好!"
 
+msgid "IDS_EMAIL_OPT_SET_AS_PRIORITY_SENDER_ABB"
+msgstr "設定為優先寄件人"
+
+msgid "IDS_EMAIL_OPT_REMOVE_FROM_PRIORITY_SENDERS_ABB"
+msgstr "自優先寄件人移除"
+
+msgid "IDS_EMAIL_BODY_YOUR_EMAIL_WILL_BE_SENT_AT_THE_SCHEDULED_TIME"
+msgstr "您的電子郵件將在預定時間發送"
+
+msgid "IDS_EMAIL_MBODY_SCHEDULED_OUTBOX"
+msgstr "預定發送寄件匣"
+
+msgid "IDS_EMAIL_BODY_LOAD_MORE_ABB"
+msgstr "載入更多"
+
+msgid "IDS_EMAIL_HEADER_IMAGE_RESIZE"
+msgstr "調整影像大小"
+
+msgid "IDS_EMAIL_POP_ORIGINAL_M_SIZE"
+msgstr "原圖"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_SET_AS_A_PRIORITY_SENDER"
+msgstr "%s 已被設定為優先寄件人"
+
+msgid "IDS_EMAIL_POP_PS_HAS_BEEN_REMOVED_FROM_THE_LIST_OF_PRIORITY_SENDERS"
+msgstr "%s 已自優先寄件人清單中移除"
+
+msgid "IDS_EMAIL_POP_MOVED_TO_PS"
+msgstr "已移動到 %s"
+
+msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_CALENDAR"
+msgstr "活動已自日曆中移除"
+
+msgid "IDS_EMAIL_OPT_REMOVE_CC_BCC"
+msgstr "移除副本/密件副本"
+
+msgid "IDS_EMAIL_OPT_AUDIO"
+msgstr "音訊"
+
+msgid "IDS_EMAIL_OPT_MAP"
+msgstr "地圖"
+
+msgid "IDS_EMAIL_OPT_DELIVERY_REPORT"
+msgstr "傳遞報告"
+
+msgid "IDS_EMAIL_BODY_DATE_AND_TIME"
+msgstr "日期與時間"
+
+msgid "IDS_EMAIL_POP_SCHEDULED_TIME_SHOULD_SET_IN_THE_FUTURE"
+msgstr "預定的時間應該設在未來"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_MY_FILES"
+msgstr "儲存到我的檔案"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB"
+msgstr "附件超過 Exchange 伺服器政策的檔案大小上限"
+
+msgid "IDS_EMAIL_BODY_MESSAGE_DELETED"
+msgstr "訊息已刪除"
+
+msgid "IDS_EMAIL_OPT_S_PLANNER"
+msgstr "S Planner"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER"
+msgstr "新增至 S Planner"
+
+msgid "IDS_EMAIL_OPT_BLOCK_ADDRESS"
+msgstr "封鎖地址"
+
+msgid "IDS_EMAIL_OPT_SEND_TO_MYSELF_ABB"
+msgstr "傳送給我自己"
+
+msgid "IDS_EMAIL_POP_MESSAGE_DELETED"
+msgstr "訊息已刪除"
+
+msgid "IDS_EMAIL_OPT_S_NOTE"
+msgstr "S Note"
+
+msgid "IDS_EMAIL_OPT_SAVE_IN_DRAFTS"
+msgstr "儲存在草稿匣中"
+
+msgid "IDS_EMAIL_OPT_SCHEDULED_EMAIL"
+msgstr "預定的電子郵件"
+
+msgid "IDS_EMAIL_OPT_PRIORITY"
+msgstr "優先順序"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_TO"
+msgstr "移動到至"
+
+msgid "IDS_EMAIL_HEADER_FROM"
+msgstr "自"
+
+msgid "IDS_EMAIL_OPT_TAKE_PICTURE"
+msgstr "拍照"
+
+msgid "IDS_EMAIL_HEADER_FORWARD"
+msgstr "轉寄"
+
+msgid "IDS_EMAIL_HEADER_PRIORITY"
+msgstr "優先順序"
+
index 0b0ca92..f39e9f2 100755 (executable)
@@ -23,9 +23,12 @@ typedef enum {
        VIEW_SP_SELECT,
        VIEW_ACCOUNT_SETUP,
        VIEW_MANUAL_SETUP,
+       VIEW_SLOT_SIZE,
        VIEW_ACCOUNT_EDIT,
+       VIEW_SHOW_EMAIL_COUNT,
        VIEW_MAILBOX_MAPPING,
        VIEW_ACCOUNT_OPTIONS,
+       VIEW_DEFAULT_ACCOUNT,
        VIEW_INITIAL_ACCESS,
        VIEW_SYNC_SCHEDULE,
        VIEW_SYNC_SETUP,
index 7825571..d579ebb 100755 (executable)
 
 #define _EDJ(o) elm_layout_edje_get(o)
 
+#define ACCOUNT_ICON_EXCHANGE IMGDIR"/M02_email_list_icon_exchange.png"
 #define ACCOUNT_ICON_GMAIL IMGDIR"/M02_email_list_icon_gmail.png"
 #define ACCOUNT_ICON_HOTMAIL IMGDIR"/M02_email_list_icon_hotmail.png"
 #define ACCOUNT_ICON_YAHOO IMGDIR"/M02_email_list_icon_YahooMail.png"
 #define ACCOUNT_ICON_AOL IMGDIR"/M02_email_list_icon_AOL.png"
-#define ACCOUNT_ICON_OTHERS IMGDIR"/M02_title_icon_others.png"
+#define ACCOUNT_ICON_OTHERS IMGDIR"/M02_list_icon_other.png"
 
 #define CBAR_ICON_ADD IMGDIR"/01_controlbar_icon_create_folder.png"
 #define TITLE_ICON_REFRESH IMGDIR"/00_icon_refresh.png"
index 9e31a80..ffb42b1 100755 (executable)
@@ -56,6 +56,7 @@ static int _parse_option(service_h service, struct ug_data *ugd);
 static void _dispatch_view(struct ug_data *ugd);
 static void _create_navigationbar(struct ug_data *ugd);
 static Evas_Object *_create_layout(Evas_Object *parent, struct ug_data *ugd);
+static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event);
 
 static void _layout_block_cb(ui_gadget_h ug, enum ug_mode mode, void *priv);
 static void _result_block_cb(ui_gadget_h ug, service_h service, void *priv);
@@ -145,6 +146,7 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi
        /*elm_theme_extension_add(ugd->theme, EV_BLOCK_THEME_PATH); //Use block theme*/
 
        ugd->layout_main = _create_layout(parent, ugd);
+       evas_object_smart_callback_add(ugd->win, "profile,changed", _win_profile_changed_cb, ugd);
        _create_navigationbar(ugd);
        ugd->base = ugd->layout_main;
        elm_win_indicator_mode_set(ugd->win, ELM_WIN_INDICATOR_SHOW);
@@ -155,6 +157,7 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi
 static void on_event(ui_gadget_h ug, enum ug_event event, service_h service, void *priv)
 {
        debug_log("");
+
        switch (event) {
        case UG_EVENT_LOW_MEMORY:
                break;
@@ -238,6 +241,37 @@ static void on_key_event(ui_gadget_h ug, enum ug_key_event event, service_h serv
 static void on_message(ui_gadget_h ug, service_h msg, service_h service, void *priv)
 {
        debug_log("");
+       EmailSettingUGD *ugd = NULL;
+       char *rotation_str = NULL;
+       int rotation_mode = UG_EVENT_ROTATE_PORTRAIT;
+
+       ugd = (EmailSettingUGD *)priv;
+       if (!ug || !msg)
+               return;
+
+       service_get_extra_data(msg, EMAIL_BUNDLE_KEY_ROTATE, &rotation_str);
+       if (rotation_str) {
+               debug_log("rotation mode: %s", rotation_str);
+               int angle = 0;
+               rotation_mode = atoi(rotation_str);
+               switch (rotation_mode) {
+                       case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
+                               angle = 180;
+                               break;
+                       case UG_EVENT_ROTATE_LANDSCAPE:
+                               angle = -90;
+                               break;
+                       case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
+                               angle = 90;
+                               break;
+                       case UG_EVENT_ROTATE_PORTRAIT:
+                       default:
+                               angle = 0;
+                               break;
+               }
+
+               elm_win_rotation_with_resize_set(ugd->win, angle);
+       }
        return;
 }
 
@@ -838,6 +872,26 @@ static Evas_Object *_create_layout(Evas_Object *parent, struct ug_data *ugd)
        return base;
 }
 
+static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event)
+{
+       debug_log("");
+       if (!data) {
+               debug_log("data is NULL");
+               return;
+       }
+
+       EmailSettingUGD *ugd = (EmailSettingUGD *)data;
+
+       const char *profile = elm_config_profile_get();
+       if (!g_strcmp0(profile, "desktop"))
+               elm_layout_theme_set(ugd->layout_main, "layout", "application", "noindicator");
+       else
+               elm_layout_theme_set(ugd->layout_main, "layout", "application", "default");
+
+       evas_object_size_hint_weight_set(ugd->layout_main, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_show(ugd->layout_main);
+}
+
 static void _layout_block_cb(ui_gadget_h ug, enum ug_mode mode, void *priv)
 {
        debug_log("");
index 0c5050b..d09ba53 100755 (executable)
@@ -1532,7 +1532,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
                        elm_entry_input_panel_return_key_disabled_set(p->entry_password, EINA_TRUE);
                        elm_entry_password_set(p->entry_password, 1);
                        elm_entry_cnp_mode_set(p->entry_password, ELM_CNP_MODE_PLAINTEXT);
-                       elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_EMAIL);
+                       elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_NORMAL);
                        evas_object_smart_callback_add(p->entry_password, "changed", _backup_input_cb, p->ef_password);
                        evas_object_smart_callback_add(p->entry_password, "focused", _entry_focused_cb, p->ef_password);
                        evas_object_smart_callback_add(p->entry_password, "unfocused", _entry_unfocused_cb, p->ef_password);
@@ -1683,7 +1683,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
                        elm_entry_input_panel_return_key_disabled_set(p->entry_sending_password, EINA_TRUE);
                        elm_entry_password_set(p->entry_sending_password, 1);
                        elm_entry_cnp_mode_set(p->entry_sending_password, ELM_CNP_MODE_PLAINTEXT);
-                       elm_entry_input_panel_layout_set(p->entry_sending_password, ELM_INPUT_PANEL_LAYOUT_EMAIL);
+                       elm_entry_input_panel_layout_set(p->entry_sending_password, ELM_INPUT_PANEL_LAYOUT_NORMAL);
                        if (account_data->outgoing_server_use_same_authenticator) {
                                elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_TRUE);
                        } else {
index 948879e..b344ec7 100755 (executable)
@@ -62,6 +62,7 @@ static Evas_Object *_gl_ex_size_content_get_cb(void *data, Evas_Object *obj, con
 static Evas_Object *_gl_ex_recent_content_get_cb(void *data, Evas_Object *obj, const char *part);
 static Evas_Object *_gl_ex_deleting_content_get_cb(void *data, Evas_Object *obj, const char *part);
 static void _gl_sel_cb(void *data, Evas_Object *obj, void *event_info);
+static void _gl_sig_sel_cb(void *data, Evas_Object *obj, void *event_info);
 static void _gl_ex_sel_cb(void *data, Evas_Object *obj, void *event_info);
 static void _gl_ex_cc_sel_cb(void *data, Evas_Object *obj, void *event_info);
 static void _gl_ex_size_sel_cb(void *data, Evas_Object *obj, void *event_info);
@@ -459,7 +460,7 @@ static void _create_list(struct viewdata *vd)
 
        /*--signature--*/
        p->gl_sig_item = elm_genlist_item_append(p->genlist, &(p->itc_ef), NULL,
-                       git, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+                       git, ELM_GENLIST_ITEM_NONE, _gl_sig_sel_cb, NULL);
        if (account_data->options.add_signature == FALSE) {
                if (p->gl_sig_item)
                        elm_object_item_disabled_set(p->gl_sig_item, EINA_TRUE);
@@ -494,7 +495,7 @@ static void _create_list(struct viewdata *vd)
        if (account_data->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4 ||
                        account_data->incoming_server_type == EMAIL_SERVER_TYPE_POP3) {
                i = 6;
-               item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i,
+               elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i,
                                git, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i);
        }
 
@@ -972,7 +973,7 @@ static char *_gl_recent_text_get_cb(void *data, Evas_Object *obj, const char *pa
 
        if (!g_strcmp0(part, "elm.text.1")) {
                char buf[MAX_STR_LEN] = { 0, };
-               snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_RECENT_EMAILS"));
+               snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB"));
                return g_strdup(buf);
        }
 
@@ -1504,6 +1505,15 @@ static void _gl_sel_cb(void *data, Evas_Object *obj, void *event_info)
        _update_account_info(vd);
 }
 
+static void _gl_sig_sel_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+
+       Elm_Object_Item *item = (Elm_Object_Item *)event_info;
+       elm_genlist_item_selected_set(item, EINA_FALSE);
+
+
+}
 static void _gl_ex_sel_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
index c81b740..171def3 100755 (executable)
@@ -55,6 +55,7 @@ static void _popup_cancel_validation_cb(void *data, Evas_Object *obj, void *even
 static void _backup_input_cb(void *data, Evas_Object *obj, void *event_info);
 static void _entry_focused_cb(void *data, Evas_Object *obj, void *event_info);
 static void _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info);
+static void _entry_theme_changed_cb(void *data, Evas_Object *obj, void *event_info);
 static void _eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _input_panel_state_changed_cb(void *data, Ecore_IMF_Context *ctx, int value);
 static void _gl_ef_sel_cb(void *data, Evas_Object *obj, void *event_info);
@@ -264,6 +265,11 @@ static int _destroy(struct viewdata *vd)
        evas_object_del(p->genlist);
        evas_object_del(p->tool_btn);
 
+       if (p->str_password) {
+               g_free(p->str_password);
+               p->str_password = NULL;
+       }
+
        if (ugd->password_timer) {
                ecore_timer_del(ugd->password_timer);
                ugd->password_timer = NULL;
@@ -333,7 +339,7 @@ static void _push_naviframe(struct viewdata *vd)
        evas_object_show(p->l_button);
 
        if (vd->ugd->account_info == NULL) {
-               elm_object_text_set(p->l_button, dgettext("sys_string", "IDS_COM_SK_NEXT"));
+               elm_object_text_set(p->l_button, dgettext("sys_string", "IDS_COM_BUTTON_LOGIN"));
                evas_object_smart_callback_add(p->l_button, "clicked", _next_cb, vd);
        } else {
                elm_object_text_set(p->l_button, dgettext("sys_string", "IDS_COM_BUTTON_LOGIN"));
@@ -1267,7 +1273,6 @@ static Eina_Bool _after_validation_cb(void *data)
 
        setting_change_view(VIEW_SYNC_SETUP, ugd);
 
-       setting_get_small_notify(vd, _("IDS_EMAIL_POP_SUCCEEDED"));
 
        /*debug_log("_after_validation_cb %s", vd->ugd->start_view_type);
 
@@ -1486,7 +1491,7 @@ static void _backup_input_cb(void *data, Evas_Object *obj, void *event_info)
                        p->str_password = NULL;
                }
 
-               p->str_password = g_strdup((char *)elm_entry_markup_to_utf8(elm_entry_entry_get(eo)));
+               p->str_password = (char *)elm_entry_markup_to_utf8(elm_entry_entry_get(eo));
        }
 
        if (ugd->account_info == NULL) {
@@ -1566,6 +1571,36 @@ static void _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
        elm_object_signal_emit(data, "elm,state,eraser,hide", "elm");
 }
 
+static void _entry_theme_changed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+
+       if (!obj) {
+               debug_log("obj is NULL");
+               return;
+       }
+
+       struct viewdata *vd = (struct viewdata *)data;
+
+       if (vd == NULL) {
+               debug_log("vd is NULL");
+               return;
+       }
+
+       struct priv_data *p = NULL;
+       p = vd->priv;
+
+       Ecore_IMF_Context *imf_context = NULL;
+       imf_context = elm_entry_imf_context_get(p->entry_password);
+       if (imf_context) {
+               ecore_imf_context_input_panel_event_callback_del(imf_context,
+                               ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_state_changed_cb);
+               ecore_imf_context_input_panel_event_callback_add(imf_context,
+                               ECORE_IMF_INPUT_PANEL_STATE_EVENT,
+                               _input_panel_state_changed_cb, (void *)vd);
+       }
+}
+
 static void _eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        debug_log("");
@@ -1663,12 +1698,12 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
        int index = (int)data;
        struct viewdata *vd = g_vd;
        struct priv_data *p = vd->priv;
-       EmailSettingUGD *ugd = vd->ugd;
+       //EmailSettingUGD *ugd = vd->ugd;
        Ecore_IMF_Context *imf_context = NULL;
 
        if (!strcmp(part, "elm.icon")) {
                if (index == 1) {
-                       p->icon_get_cnt1++;
+                       //p->icon_get_cnt1++;
 
                        debug_log("");
                        p->ef_account_name = elm_layout_add(p->genlist);
@@ -1702,7 +1737,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
                        if (p->str_account_name)
                                elm_entry_entry_set(p->entry_account_name, p->str_account_name);
 
-                       if (ugd->account_info == NULL && p->icon_get_cnt1 == 2 &&
+                       /*if (ugd->account_info == NULL && p->icon_get_cnt1 == 2 &&
                                        strcmp(ugd->start_view_type, EMAIL_BUNDLE_VAL_VIEW_ACCOUNT_ADD) != 0) {
                                p->clicked_object = p->entry_account_name;
                                evas_object_show(p->entry_account_name);
@@ -1714,7 +1749,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
                                p->clicked_object = p->entry_account_name;
                                evas_object_show(p->entry_account_name);
                                elm_object_focus_set(p->entry_account_name, EINA_TRUE);
-                       }
+                       }*/
 
                        return p->ef_account_name;
                } else if (index == 2) {
@@ -1786,7 +1821,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 
                        return p->ef_display_name;
                } else if (index == 4) {
-                       p->icon_get_cnt2++;
+                       //p->icon_get_cnt2++;
 
                        debug_log("");
                        p->ef_email_address = elm_layout_add(p->genlist);
@@ -1820,7 +1855,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
                        if (p->str_email_address)
                                elm_entry_entry_set(p->entry_email_address, p->str_email_address);
 
-                       if (ugd->account_info != NULL && p->icon_get_cnt2 == 2 &&
+                       /*if (ugd->account_info != NULL && p->icon_get_cnt2 == 2 &&
                                        strcmp(ugd->start_view_type, EMAIL_BUNDLE_VAL_VIEW_ACCOUNT_ADD) != 0) {
                                p->clicked_object = p->entry_email_address;
                                evas_object_show(p->entry_email_address);
@@ -1834,7 +1869,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
                                evas_object_show(p->entry_email_address);
                                elm_object_focus_set(p->entry_email_address, EINA_TRUE);
                                elm_entry_cursor_begin_set(p->entry_email_address);
-                       }
+                       }*/
 
                        return p->ef_email_address;
                } else if (index == 5) {
@@ -1846,7 +1881,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
                        elm_entry_single_line_set(p->entry_password, EINA_TRUE);
                        elm_entry_input_panel_return_key_disabled_set(p->entry_password, EINA_TRUE);
                        elm_entry_cnp_mode_set(p->entry_password, ELM_CNP_MODE_PLAINTEXT);
-                       elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_EMAIL);
+                       elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_NORMAL);
                        elm_entry_editable_set(p->entry_password, EINA_TRUE);
                        elm_entry_password_set(p->entry_password, EINA_TRUE);
 
index 535a5db..497a2ec 100755 (executable)
@@ -884,7 +884,6 @@ static Eina_Bool _after_validation_cb(void *data)
 
        setting_change_view(VIEW_SYNC_SETUP, ugd);
 
-       setting_get_small_notify(vd, _("IDS_EMAIL_POP_SUCCEEDED"));
 
        /*if (vd->ugd->start_view_type != NULL &&
                        g_strcmp0(vd->ugd->start_view_type, "first-setup") == 0) {
@@ -1343,7 +1342,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
                        elm_entry_single_line_set(p->entry_password, EINA_TRUE);
                        elm_entry_input_panel_return_key_disabled_set(p->entry_password, EINA_TRUE);
                        elm_entry_cnp_mode_set(p->entry_password, ELM_CNP_MODE_PLAINTEXT);
-                       elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_EMAIL);
+                       elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_NORMAL);
                        elm_entry_editable_set(p->entry_password, EINA_TRUE);
                        elm_entry_password_set(p->entry_password, EINA_TRUE);
 
index c1fa323..d7f846f 100755 (executable)
@@ -355,16 +355,7 @@ static void _create_list(struct viewdata *vd)
        else
                p->default_account_item = elm_genlist_item_append(p->genlist, &(p->itc6), (void *)i, git,
                                ELM_GENLIST_ITEM_NONE, _gl_sel_cb, NULL);
-/* setting UI is implemented.
-       i = 4;
-       elm_genlist_item_append(p->genlist, &(p->itc3), (void *)i, git,
-                       ELM_GENLIST_ITEM_NONE, _priority_senders_email_cb, (void *)vd);
-*/
-/* For Text templates
-       i = 5;
-       elm_genlist_item_append(p->genlist, &(p->itc3), (void *)i, git,
-                       ELM_GENLIST_ITEM_NONE, NULL, (void *)vd);
-*/
+
        i = 6;
        git = elm_genlist_item_append(p->genlist, &(p->itc5), (void *)i, NULL,
                        ELM_GENLIST_ITEM_GROUP, NULL, NULL);
index 4b117d2..3f2f796 100755 (executable)
@@ -649,6 +649,7 @@ static void _refresh_cb(void *data, Evas_Object *obj, void *event_info)
        email_mailbox_t *mailbox = NULL;
        ret = email_get_mailbox_by_mailbox_type(account_id, EMAIL_MAILBOX_TYPE_INBOX, &mailbox);
        if (ret != EMAIL_ERROR_NONE || mailbox == NULL || mailbox->mailbox_name == NULL) {
+               email_free_mailbox(&mailbox, 1);
                debug_log("email_get_mailbox_by_mailbox_type failed");
                return;
        }
@@ -738,8 +739,6 @@ static Eina_Bool _after_delete_cb(void *data)
                } else {
                        setting_back_to_prev_view(vd);
                }
-
-               setting_get_small_notify(vd, dgettext("sys_string", "IDS_COM_POP_DELETED"));
        }
 
        return ECORE_CALLBACK_CANCEL;
index 1987e09..2660907 100755 (executable)
@@ -766,7 +766,6 @@ static Eina_Bool _after_delete_cb(void *data)
                }
                vd->ugd->atomic_pop = 0;
 
-               setting_get_small_notify(vd, dgettext("sys_string", "IDS_COM_POP_DELETED"));
        }
 
        return ECORE_CALLBACK_CANCEL;
index 17c3f27..f7408ab 100755 (executable)
@@ -718,7 +718,7 @@ collections {
                                        rel2 { relative: 1.0 1.0;}
                                }
                        }
-                       
+
                        part {
                                name: "top_padding";
                                type: RECT;
@@ -735,88 +735,6 @@ collections {
                        }
 
                        part {
-                               name: "bg_for_sp";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 0 1;
-                                       min: 0 80;
-                                       rel1 { relative: 0 1; to: "top_padding"; }
-                                       rel2 { relative: 1 1; to: "top_padding"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       
-                       part {
-                               name: "sp2";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.5 0.5; offset: -52 0; to: "bg_for_sp"; }
-                                       rel2 { relative: 0.5 0.5; offset: -52 0; to: "bg_for_sp"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_gmail.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp1";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.0 0.5; offset: -64 0; to: "sp2"; }
-                                       rel2 { relative: 0.0 0.5; offset: -64 0; to: "sp2"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_exchange.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp3";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.5 0.5; offset: 52 0; to: "bg_for_sp"; }
-                                       rel2 { relative: 0.5 0.5; offset: 52 0; to: "bg_for_sp"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_hotmail.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp4";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 1.0 0.5; offset: 64 0; to: "sp3"; }
-                                       rel2 { relative: 1.0 0.5; offset: 64 0; to: "sp3"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_AOL.png";
-                               }
-                       }
-
-                       part {
-                               name: "middle_padding2";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 52;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 1.0; to_y: "bg_for_sp"; }
-                                       rel2 { relative: 1.0 1.0; to_y: "bg_for_sp"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-
-                       part {
                                name: "label";
                                type: SWALLOW;
                                scale: 1;
@@ -824,14 +742,14 @@ collections {
                                        state: "default" 0.0;
                                        fixed: 0 1;
                                        min: 0 200;
-                                       rel1 { relative: 0.0 1.0; to_y: "middle_padding2"; offset: 50 0; }
-                                       rel2 { relative: 1.0 1.0; to_y: "middle_padding2"; offset: -50 0; }
+                                       rel1 { relative: 0.0 1.0; to_y: "top_padding"; offset: 50 0; }
+                                       rel2 { relative: 1.0 1.0; to_y: "top_padding"; offset: -50 0; }
                                        align: 0.5 0.0;
                                }
                        }
-                       
+
                        part {
-                               name: "middle_padding3";
+                               name: "middle_padding";
                                type: RECT;
                                scale: 1;
                                description {
@@ -851,7 +769,7 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; to: "middle_padding3"; }
+                                       rel1 { relative: 0.0 1.0; to: "middle_padding"; }
                                        rel2 { relative: 1.0 1.0; to: "bg"; }
                                }
                        }
@@ -878,7 +796,7 @@ collections {
                                        rel2 { relative: 1.0 1.0;}
                                }
                        }
-                       
+
                        part {
                                name: "top_padding";
                                type: RECT;
@@ -895,75 +813,6 @@ collections {
                        }
 
                        part {
-                               name: "bg_for_sp";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 0 1;
-                                       min: 0 80;
-                                       rel1 { relative: 0 1; to: "top_padding"; }
-                                       rel2 { relative: 1 1; to: "top_padding"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       
-                       part {
-                               name: "sp2";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.5 0.5; to: "bg_for_sp"; }
-                                       rel2 { relative: 0.5 0.5; to: "bg_for_sp"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_hotmail.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp1";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.0 0.5; offset: -64 0; to: "sp2"; }
-                                       rel2 { relative: 0.0 0.5; offset: -64 0; to: "sp2"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_gmail.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp3";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 1.0 0.5; offset: 64 0; to: "sp2"; }
-                                       rel2 { relative: 1.0 0.5; offset: 64 0; to: "sp2"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_AOL.png";
-                               }
-                       }
-
-                       part {
-                               name: "middle_padding2";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 52;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 1.0; to_y: "bg_for_sp"; }
-                                       rel2 { relative: 1.0 1.0; to_y: "bg_for_sp"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-
-                       part {
                                name: "label";
                                type: SWALLOW;
                                scale: 1;
@@ -971,14 +820,14 @@ collections {
                                        state: "default" 0.0;
                                        fixed: 0 1;
                                        min: 0 200;
-                                       rel1 { relative: 0.0 1.0; to_y: "middle_padding2"; offset: 50 0; }
-                                       rel2 { relative: 1.0 1.0; to_y: "middle_padding2"; offset: -50 0; }
+                                       rel1 { relative: 0.0 1.0; to_y: "top_padding"; offset: 50 0; }
+                                       rel2 { relative: 1.0 1.0; to_y: "top_padding"; offset: -50 0; }
                                        align: 0.5 0.0;
                                }
                        }
-                       
+
                        part {
-                               name: "middle_padding3";
+                               name: "middle_padding";
                                type: RECT;
                                scale: 1;
                                description {
@@ -998,13 +847,13 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; to: "middle_padding3"; }
+                                       rel1 { relative: 0.0 1.0; to: "middle_padding"; }
                                        rel2 { relative: 1.0 1.0; to: "bg"; }
                                }
                        }
                }
        }
-       
+
        group { name: "initial_access_hd_public";
 
                images {
@@ -1025,7 +874,7 @@ collections {
                                        rel2 { relative: 1.0 1.0;}
                                }
                        }
-                       
+
                        part {
                                name: "top_padding";
                                type: RECT;
@@ -1042,75 +891,6 @@ collections {
                        }
 
                        part {
-                               name: "bg_for_sp";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 0 1;
-                                       min: 0 248;
-                                       rel1 { relative: 0 1; to: "top_padding"; }
-                                       rel2 { relative: 1 1; to: "top_padding"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       
-                       part {
-                               name: "sp2";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.5 0.5; to: "bg_for_sp"; }
-                                       rel2 { relative: 0.5 0.5; to: "bg_for_sp"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_hotmail.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp1";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.0 0.5; offset: -100 0; to: "sp2"; }
-                                       rel2 { relative: 0.0 0.5; offset: -100 0; to: "sp2"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_gmail.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp3";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 1.0 0.5; offset: 100 0; to: "sp2"; }
-                                       rel2 { relative: 1.0 0.5; offset: 100 0; to: "sp2"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_AOL.png";
-                               }
-                       }
-                       
-                       part {
-                               name: "middle_padding2";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 16;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 1.0; to_y: "bg_for_sp"; }
-                                       rel2 { relative: 1.0 1.0; to_y: "bg_for_sp"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-
-                       part {
                                name: "label";
                                type: SWALLOW;
                                scale: 1;
@@ -1118,15 +898,15 @@ collections {
                                        state: "default" 0.0;
                                        fixed: 0 1;
                                        min: 0 114;
-                                       rel1 { relative: 0.0 1.0; to_y: "middle_padding2"; offset: 50 0; }
-                                       rel2 { relative: 1.0 1.0; to_y: "middle_padding2"; offset: -50 0; }
+                                       rel1 { relative: 0.0 1.0; to_y: "top_padding"; offset: 50 0; }
+                                       rel2 { relative: 1.0 1.0; to_y: "top_padding"; offset: -50 0; }
                                        align: 0.5 0.0;
                                }
                        }
 
-                       
+
                        part {
-                               name: "middle_padding3";
+                               name: "middle_padding";
                                type: RECT;
                                scale: 1;
                                description {
@@ -1146,7 +926,7 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; to: "middle_padding3"; }
+                                       rel1 { relative: 0.0 1.0; to: "middle_padding"; }
                                        rel2 { relative: 1.0 1.0; to: "bg"; }
                                }
                        }
@@ -1174,99 +954,18 @@ collections {
                                        rel2 { relative: 1.0 1.0;}
                                }
                        }
-                       
+
                        part {
                                name: "top_padding";
                                type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 26;
+                                       min: 0 65;
                                        fixed: 0 1;
                                        rel1 { relative: 0 0; to: "bg"; }
                                        rel2 { relative: 1 0; to: "bg"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-
-                       part {
-                               name: "bg_for_sp";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 0 1;
-                                       min: 0 248;
-                                       rel1 { relative: 0 1; to: "top_padding"; }
-                                       rel2 { relative: 1 1; to: "top_padding"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
 
-                       part {
-                               name: "sp2";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.5 0.5; offset: -70 0; to: "bg_for_sp"; }
-                                       rel2 { relative: 0.5 0.5; offset: -70 0; to: "bg_for_sp"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_gmail.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp1";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.0 0.5; offset: -100 0; to: "sp2"; }
-                                       rel2 { relative: 0.0 0.5; offset: -100 0; to: "sp2"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_exchange.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp3";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 0.5 0.5; offset: 70 0; to: "bg_for_sp"; }
-                                       rel2 { relative: 0.5 0.5; offset: 70 0; to: "bg_for_sp"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_hotmail.png";
-                               }
-                       }
-
-                       part {
-                               name: "sp4";
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 80 80;
-                                       rel1 { relative: 1.0 0.5; offset: 100 0; to: "sp3"; }
-                                       rel2 { relative: 1.0 0.5; offset: 100 0; to: "sp3"; }
-                                       align: 0.5 0.5;
-                                       image.normal: "M02_email_list_icon_AOL.png";
-                               }
-                       }
-                       
-                       part {
-                               name: "middle_padding2";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 16;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 1.0; to_y: "bg_for_sp"; }
-                                       rel2 { relative: 1.0 1.0; to_y: "bg_for_sp"; }
                                        align: 0.0 0.0;
                                        visible: 0;
                                }
@@ -1280,20 +979,20 @@ collections {
                                        state: "default" 0.0;
                                        fixed: 0 1;
                                        min: 0 114;
-                                       rel1 { relative: 0.0 1.0; to_y: "middle_padding2"; offset: 50 0; }
-                                       rel2 { relative: 1.0 1.0; to_y: "middle_padding2"; offset: -50 0; }
+                                       rel1 { relative: 0.0 1.0; to_y: "top_padding"; offset: 50 0; }
+                                       rel2 { relative: 1.0 1.0; to_y: "top_padding"; offset: -50 0; }
                                        align: 0.5 0.0;
                                }
                        }
 
-                       
+
                        part {
-                               name: "middle_padding3";
+                               name: "middle_padding";
                                type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 16;
+                                       min: 0 30;
                                        fixed: 0 1;
                                        rel1 { relative: 0.0 1.0; to_y: "label"; }
                                        rel2 { relative: 1.0 1.0; to_y: "label"; }
@@ -1308,7 +1007,7 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; to: "middle_padding3"; }
+                                       rel1 { relative: 0.0 1.0; to: "middle_padding"; }
                                        rel2 { relative: 1.0 1.0; to: "bg"; }
                                }
                        }
@@ -1492,7 +1191,7 @@ collections {
                                }
                        }
                }
-               
+
                programs {
                        program {
                                name: "text1_clicked";
@@ -1509,7 +1208,7 @@ collections {
                        }
                }
        }
-       
+
        group { name: "account_add_checkbox_set_wvga";
                parts {
 
@@ -1687,7 +1386,7 @@ collections {
                                }
                        }
                }
-               
+
                programs {
                        program {
                                name: "text1_clicked";
@@ -1793,7 +1492,7 @@ collections {
                        }
                }
        }
-       
+
        group { name: "account_add_manual_button_wvga";
                parts {
                        part { name: "base";
@@ -1897,7 +1596,7 @@ collections {
                                        align: 0.0 0.0;
                                }
                        }
-                       
+
                        part { name: "list";
                                type: SWALLOW;
                                scale: 1;
@@ -1946,7 +1645,7 @@ collections {
                                        align: 0.0 0.0;
                                }
                        }
-                       
+
                        part { name: "list";
                                type: SWALLOW;
                                scale: 1;
@@ -1980,9 +1679,9 @@ collections {
                        }
                }
        }
-       
+
 #define _SCALE 0.64
-       
+
        group { name: "account_add_wvga";
                parts {
                        part { name: "bg";
@@ -1997,7 +1696,7 @@ collections {
                                        align: 0.0 0.0;
                                }
                        }
-                       
+
                        part { name: "list";
                                type: SWALLOW;
                                scale: 1;
@@ -2046,7 +1745,7 @@ collections {
                                        align: 0.0 0.0;
                                }
                        }
-                       
+
                        part { name: "list";
                                type: SWALLOW;
                                scale: 1;
@@ -2080,7 +1779,7 @@ collections {
                        }
                }
        }
-       
+
        group { name: "elm/genlist/item/dialogue/email.1text.1icon.2/default";
                alias: "elm/genlist/item_odd/dialogue/email.1text.1icon.2/default";
                alias: "elm/genlist/item_compress/dialogue/email.1text.1icon.2/default";
@@ -2118,7 +1817,7 @@ collections {
                                }
                                GENLIST_DESCRIPTION_FLIP_ENABLED
                        }
-                       
+
                        part { name: "elm.padding.icon.right";
                                clip_to: "disclip";
                                type: RECT;
@@ -2135,7 +1834,7 @@ collections {
                                        visible: 0;
                                }
                        }
-                               
+
                        part { name: "elm.text";
                                clip_to: "disclip";
                                type: TEXT;
@@ -2203,7 +1902,7 @@ collections {
                        //GENLIST_PROGRAM_PLAY_BUTTON_PRESS
                }
        }
-       
+
        group { name: "elm/bg/base/email_default";
                parts {
                        part { name: "base";
@@ -2213,17 +1912,17 @@ collections {
                                        color: 210 210 210 255;
                                }
                        }
-                       
+
                        part { name: "elm.swallow.rectangle";
                                type: SWALLOW;
                                description { state: "default" 0.0; }
                        }
-                       
+
                        part { name: "elm.swallow.background";
                                type: SWALLOW;
                                description { state: "default" 0.0; }
                        }
-                       
+
                        part { name: "elm.swallow.content";
                                type: SWALLOW;
                                description { state: "default" 0.0; }
index 8f2ec8e..a3ff797 100755 (executable)
@@ -499,6 +499,7 @@ static void _webview_contextmenu_selected_cb(void *data, Evas_Object *webview, v
        Ewk_Context_Menu_Item* menu_item = (Ewk_Context_Menu_Item*)event_info;
        Ewk_Context_Menu_Item_Tag menu_item_tag = EWK_CONTEXT_MENU_ITEM_TAG_NO_ACTION;
 
+       int image_type = -1;
        gsize img_buf_len = 0;
        gchar *img_buf = NULL;
        char *img_url = NULL;
@@ -513,15 +514,26 @@ static void _webview_contextmenu_selected_cb(void *data, Evas_Object *webview, v
        debug_log("View image : img_url(%s)", img_url);
 
        if (img_url != NULL) {
-               ewk_hit_test = ewk_view_hit_test_new(ug_data->webview, _g_pos_x, _g_pos_y, EWK_HIT_TEST_RESULT_CONTEXT_IMAGE);
-
-               if (ewk_hit_test != NULL) {
-                       char *ext = NULL;
-                       img_buf = ewk_hit_test_image_buffer_get(ewk_hit_test);
-                       img_buf_len = ewk_hit_test_image_buffer_length_get(ewk_hit_test);
-                       debug_log("View image : img_buf_len(%d)", img_buf_len);
-                       ext = (char *)ewk_hit_test_image_file_name_extension_get(ewk_hit_test);
-                       debug_log("View image : ext(%s)", ext);
+               if (!strncmp(img_url, "file://", 7)) {
+                       debug_log("inline!");
+                       image_type = 0; // inline image
+               }
+
+               if (!strncmp(img_url, "http://", 7)) {
+                       image_type = 2; // remote image
+                       ewk_hit_test = ewk_view_hit_test_new(ug_data->webview, _g_pos_x, _g_pos_y, EWK_HIT_TEST_RESULT_CONTEXT_IMAGE);
+
+                       if (ewk_hit_test != NULL) {
+                               char *ext = NULL;
+                               img_buf = ewk_hit_test_image_buffer_get(ewk_hit_test);
+                               img_buf_len = ewk_hit_test_image_buffer_length_get(ewk_hit_test);
+                               debug_log("View image : img_buf_len(%d)", img_buf_len);
+                               ext = (char *)ewk_hit_test_image_file_name_extension_get(ewk_hit_test);
+                               debug_log("View image : ext(%s)", ext);
+                       } else {
+                               debug_log("ewk_hit_test is NULL");
+                               return;
+                       }
                }
        }
 
@@ -544,25 +556,37 @@ static void _webview_contextmenu_selected_cb(void *data, Evas_Object *webview, v
        case EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG + 1 : //Save image
        {
                int ret = 0;
-               if (viewer_get_filepath_from_path(DIR_DEFAULT_MEDIA_PHONE"/Downloads", img_url, new_path, EINA_TRUE) != EMAIL_EXT_SAVE_ERR_NONE) {
-                       debug_log("file exist!");
-               }
 
                ret = media_content_connect();
                if (!ret) {
-                       if (viewer_save_file(new_path, img_buf, img_buf_len) == EINA_FALSE) {
-                               debug_log("viewer_save_file error!");
+                       if (viewer_get_filepath_from_path(DIR_DEFAULT_MEDIA_PHONE"/Downloads", img_url, new_path, EINA_TRUE) != EMAIL_EXT_SAVE_ERR_NONE) {
+                               debug_log("file exist!");
+                       }
+
+                       if (image_type == 0) {
+                               if (ecore_file_cp(img_url+7, new_path) == EINA_FALSE) {
+                                       debug_log("img_url = %s", img_url+7);
+                                       debug_log("new_path = %s", new_path);
+                                       ret = EINA_FALSE;
+                               }
                        } else {
+                               ret = viewer_save_file(new_path, img_buf, img_buf_len); 
+                       }
+
+                       if (ret == EINA_TRUE) {
                                char str[128] = { 0, };
                                snprintf(str, sizeof(str), "%s", dgettext("sys_string", "IDS_COM_POP_SAVED"));
                                ret = status_message_post(str);
                                if (ret)
                                        debug_log("status_message_post failed: %d", ret);
-                               ret = media_content_scan_file(new_path);
                                debug_log("media_content_scan_file: %d", ret);
+                       } else {
+                               debug_log("save file is failed : %d", ret);
                        }
 
+                       ret = media_content_scan_file(new_path);
                        ret = media_content_disconnect();
+
                        if (ret) {
                                debug_log("media_content_disconnect() is failed!");
                        }
@@ -574,14 +598,33 @@ static void _webview_contextmenu_selected_cb(void *data, Evas_Object *webview, v
 
        case EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG + 2 : // View image
        {
-               if (viewer_get_filepath_from_path(EMAIL_VIEWER_TMP_FOLDER, img_url, new_path, EINA_FALSE) == EMAIL_EXT_SAVE_ERR_NONE) {
-                       debug_log("file existed!");
-               }
-               if (viewer_save_file(new_path, img_buf, img_buf_len) == EINA_FALSE) {
-                       debug_log("viewer_save_file error!");
+               int ret = 0;
+               ret = media_content_connect();
+
+               if (!ret) {
+                       if (image_type == 0) {
+                               snprintf(new_path, sizeof(new_path), "%s", img_url+7);
+                               debug_log("new_path : %s", new_path);
+                       } else {
+                               if (viewer_get_filepath_from_path(EMAIL_VIEWER_TMP_FOLDER, img_url, new_path, EINA_FALSE) == EMAIL_EXT_SAVE_ERR_NONE) {
+                                       debug_log("file existed!");
+                               }
+
+                               if (viewer_save_file(new_path, img_buf, img_buf_len) == EINA_FALSE) {
+                                       debug_log("viewer_save_file error!");
+                               }
+                       }
+
+                       ret = media_content_scan_file(new_path);
+                       ret = media_content_disconnect();
+
+                       if (ret) {
+                               debug_log("media_content_disconnect() is failed!");
+                       }
+               } else {
+                       debug_log("media_content_connect() is failed!");
                }
 
-               int ret;
                service_h service = NULL;
                ret = service_create(&service);
                debug_log("service_create: %d", ret);
@@ -612,5 +655,4 @@ static void _webview_contextmenu_selected_cb(void *data, Evas_Object *webview, v
        }
 }
 
-
 /* EOF */
index 85cb7ce..bc92c42 100755 (executable)
@@ -142,7 +142,6 @@ static int _init_webview_data(EmailViewerUGD *ug_data);
 static Eina_Bool _check_body_download(void *data);
 static int _update_attachment_info(EmailViewerUGD *ug_data, int index);
 static int _get_attachment_info_index(EmailViewerUGD *ug_data, int index);
-static void _show_select_info(EmailViewerUGD *ug_data, char *str);
 static void _save_attachment(EmailViewerUGD *ug_data, int index);
 static void _show_attachment(EmailViewerUGD *ug_data, int index);
 static void _save_attachment_all(EmailViewerUGD *ug_data);
@@ -836,6 +835,18 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void *
        default:
                break;
        }
+
+       int resized_w = 0;
+       int resized_h = 0;
+       if (ug_data->isRotate) {
+               resized_w = ug_data->webview_width_landscape * ug_data->scale_factor;
+               resized_h = ug_data->webview_height_landscape * ug_data->scale_factor;
+       } else {
+               resized_w = ug_data->webview_width * ug_data->scale_factor;
+               resized_h = ug_data->webview_height * ug_data->scale_factor;
+       }
+       debug_log("resized_w:%d, resized_h:%d", resized_w, resized_h);
+       evas_object_size_hint_min_set(ug_data->webview, resized_w, resized_h);
 }
 
 static void on_key_event(ui_gadget_h ug, enum ug_key_event event, service_h data, void *priv)
@@ -1119,6 +1130,9 @@ static void _reset_view(EmailViewerUGD *ug_data)
        }
 
        /* reset subject */
+       ug_data->lb_subject = elm_label_add(ug_data->ly_subject);
+       evas_object_del(elm_object_part_content_unset(ug_data->ly_subject, "elm.text"));
+       elm_object_part_content_set(ug_data->ly_subject, "elm.text", ug_data->lb_subject);
        char *_subject = elm_entry_utf8_to_markup(prop->subject);
        if (!g_strcmp0(_subject, "")) {
                g_free(_subject);
@@ -1576,6 +1590,7 @@ static Evas_Object *_create_cc_addrs(EmailViewerUGD *ug_data)
        char *cc_str = g_strconcat("<font_size=36><color=#000000FF>", desc, "</color></font_size>", NULL);
        elm_object_text_set(cc_mbe, cc_str);
        g_free(cc_str);
+
        evas_object_smart_callback_add(cc_mbe, "item,clicked", _mbe_selected_cb, ug_data);
        evas_object_smart_callback_add(cc_mbe, "item,added", _mbe_added_cb, ug_data);
        evas_object_smart_callback_add(cc_mbe, "focused", _mbe_focused_cb, ug_data);
@@ -1644,6 +1659,7 @@ static Evas_Object *_create_bcc_addrs(EmailViewerUGD *ug_data)
        char *bcc_str = g_strconcat("<font_size=36><color=#000000FF>", desc, "</color></font_size>", NULL);
        elm_object_text_set(bcc_mbe, bcc_str);
        g_free(bcc_str);
+
        evas_object_smart_callback_add(bcc_mbe, "item,clicked", _mbe_selected_cb, ug_data);
        evas_object_smart_callback_add(bcc_mbe, "item,added", _mbe_added_cb, ug_data);
        evas_object_smart_callback_add(bcc_mbe, "focused", _mbe_focused_cb, ug_data);
@@ -3435,7 +3451,9 @@ static void _mark_as_unread_cb(void *data, Evas_Object *obj, void *event_info)
        } else {
                char str[128] = { 0, };
                snprintf(str, sizeof(str), "%s", _("IDS_EMAIL_POP_MARKED_AS_UNREAD"));
-               _show_select_info(ug_data, str);
+               int ret = status_message_post(str);
+               if (ret)
+                       debug_log("status_message_post failed: %d", ret);
        }
 }
 
@@ -3467,7 +3485,9 @@ static void _mark_as_read_cb(void *data, Evas_Object *obj, void *event_info)
        } else {
                char str[128] = { 0, };
                snprintf(str, sizeof(str), "%s", _("IDS_EMAIL_POP_MARKED_AS_READ"));
-               _show_select_info(ug_data, str);
+               int ret = status_message_post(str);
+               if (ret)
+                       debug_log("status_message_post failed: %d", ret);
        }
 }
 
@@ -3560,7 +3580,7 @@ static Eina_Bool _save_email_prog_cb(void *data)
                        debug_log("errno: %d", nErr);
                        if (nErr == -1) {
                                debug_log("Eml file folder creation failed");
-                               return -1;
+                               goto error;
                        }
                } else
                        debug_log("Eml file folder already exists.");
@@ -3602,11 +3622,6 @@ static Eina_Bool _save_email_prog_cb(void *data)
                g_free(subject);
        }
 
-       if (mail_t) {
-               email_free_mail_data(&(mail_t), 1);
-               mail_t = NULL;
-       }
-
        if (ug_data->timeout_popup) {
                evas_object_del(ug_data->timeout_popup);
                ug_data->timeout_popup = NULL;
@@ -3618,12 +3633,23 @@ static Eina_Bool _save_email_prog_cb(void *data)
                                                NULL, NULL, NULL, NULL, _popup_response_cb);
        } else {
                char str[128] = { 0, };
-               snprintf(str, sizeof(str), "%s", N_("Saved in My files"));
+               snprintf(str, sizeof(str), "%s", _("IDS_EMAIL_POP_SAVED_IN_MY_FILES"));
                int ret = status_message_post(str);
                if (ret)
                        debug_log("status_message_post failed: %d", ret);
        }
 
+error:
+       if (ug_data->timeout_popup) {
+               evas_object_del(ug_data->timeout_popup);
+               ug_data->timeout_popup = NULL;
+       }
+
+       if (mail_t) {
+               email_free_mail_data(&(mail_t), 1);
+               mail_t = NULL;
+       }
+
        if (attachment_t) {
                email_free_attachment_data(&(attachment_t), attachment_count);
                attachment_t = NULL;
@@ -3796,6 +3822,30 @@ static void _ctxpopup_add_contact_cb(void *data, Evas_Object *obj, void *event_i
        debug_log("service_destroy: %d", ret);
 }
 
+static void _delete_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+       if (_g_ug_data == NULL) {
+               debug_log("_g_ug_data == NULL");
+               return;
+       }
+
+       EmailViewerUGD *ug_data = (EmailViewerUGD *)data;
+
+       if (ug_data->con_popup != NULL) {
+               evas_object_del(ug_data->con_popup);
+               ug_data->con_popup = NULL;
+       }
+
+       Elm_Object_Item *item = NULL;
+       item = elm_multibuttonentry_selected_item_get(ug_data->to_mbe);
+       elm_multibuttonentry_item_selected_set(item, EINA_FALSE);
+       item = elm_multibuttonentry_selected_item_get(ug_data->cc_mbe);
+       elm_multibuttonentry_item_selected_set(item, EINA_FALSE);
+       item = elm_multibuttonentry_selected_item_get(ug_data->bcc_mbe);
+       elm_multibuttonentry_item_selected_set(item, EINA_FALSE);
+}
+
 static void _popup_waiting_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
@@ -4184,8 +4234,6 @@ static void _outter_scroller_scroll_cb(void *data, Evas_Object *obj, void *event
 static void _mbe_focused_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
-       Elm_Object_Item *item = elm_multibuttonentry_selected_item_get(obj);
-       elm_multibuttonentry_item_selected_set(item, EINA_FALSE);
 }
 
 static void _mbe_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
@@ -4223,6 +4271,7 @@ static void _mbe_selected_cb(void *data, Evas_Object *obj, void *event_info)
                debug_log("cannot create context popup");
                return;
        }
+               evas_object_smart_callback_add(ug_data->con_popup, "dismissed", _delete_ctxpopup_cb, ug_data);
 
        if (contact_list_item) {
                debug_log("Contact Item Exist: index[%d]", contact_list_item->index);
@@ -4581,33 +4630,6 @@ static int _get_attachment_info_index(EmailViewerUGD *ug_data, int index)
        return attach_index;
 }
 
-static void _show_select_info(EmailViewerUGD *ug_data, char *str)
-{
-       debug_log("");
-
-       if (ug_data->select_info != NULL) {
-               evas_object_del(ug_data->select_info);
-               ug_data->select_info = NULL;
-       }
-
-       if (ug_data->selectioninfo_layout != NULL) {
-               evas_object_del(ug_data->selectioninfo_layout);
-               ug_data->selectioninfo_layout = NULL;
-       }
-
-       ug_data->select_info = elm_notify_add(ug_data->win_main);
-       elm_notify_align_set(ug_data->select_info, ELM_NOTIFY_ALIGN_FILL, 1.0);
-
-       ug_data->selectioninfo_layout = elm_layout_add(ug_data->layout_main);
-       elm_object_content_set(ug_data->select_info, ug_data->selectioninfo_layout);
-
-       elm_layout_theme_set(ug_data->selectioninfo_layout, "standard", "selectioninfo", "center_text");
-
-       edje_object_part_text_set(_EDJ(ug_data->selectioninfo_layout), "elm.text", str);
-       elm_notify_timeout_set(ug_data->select_info, 3);
-       evas_object_show(ug_data->select_info);
-}
-
 static void _save_attachment(EmailViewerUGD *ug_data, int index)
 {
        debug_log("");
@@ -4724,7 +4746,11 @@ static void _show_attachment(EmailViewerUGD *ug_data, int index)
                        debug_log("status_message_post failed: %d", ret);
 
                if (g_str_has_suffix(info->path, ".vcs")) {
-                       calendar_connect();
+                       ret = calendar_connect();
+                       if (ret != CALENDAR_ERROR_NONE) {
+                               debug_error("calendar_connect is failed.");
+                               return;
+                       }
 
                        FILE * fp = NULL;
                        fp = fopen(newpath, "r");
@@ -5523,6 +5549,9 @@ static char *_get_service_fail_type(int type)
        } else if (type == EMAIL_ERROR_FAILED_BY_SECURITY_POLICY) {
                ret = _("IDS_EMAIL_POP_DOWNLOADING_ATTACHMENTS_ON_THE_MOBILE_DEVICE_IS_NOT_ALLOWED_BY_EXCHANGE_SERVER_POLICY");
                return g_strdup(ret);
+       } else if (type == EMAIL_ERROR_ATTACHMENT_SIZE_EXCEED_POLICY_LIMIT) {
+               ret = _("IDS_EMAIL_BODY_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB");
+               return g_strdup(ret);
        } else if (type == EMAIL_ERROR_NETWORK_NOT_AVAILABLE) {
                ret = N_("Network not available");
                return g_strdup(ret);