From 9e3eca7a45bc31e7dfaaa60aebfef44bc08d4751 Mon Sep 17 00:00:00 2001 From: Sungbok Park Date: Thu, 3 Jan 2013 22:23:22 +0900 Subject: [PATCH] email_0.0.13 package upload Change-Id: I9d6ccc2512f79bce432f8bf909b42d90644ad4ce --- common/src/email-engine.c | 1 - common/src/email-utils.c | 2 +- composer/include/email-composer-type.h | 25 --------- composer/src/email-composer-attachment.c | 1 + composer/src/email-composer-callback.c | 11 ++-- composer/src/email-composer-contents.c | 7 ++- composer/src/email-composer-recipient.c | 2 + composer/src/email-composer-util.c | 2 +- composer/src/email-composer.c | 90 ++++++++++++++++++++------------ packaging/org.tizen.email.spec | 4 +- po/ar.po | 12 +++++ po/az.po | 12 +++++ po/bg.po | 12 +++++ po/ca.po | 12 +++++ po/cs.po | 12 +++++ po/da.po | 12 +++++ po/de_DE.po | 12 +++++ po/el_GR.po | 12 +++++ po/en.po | 12 +++++ po/en_PH.po | 12 +++++ po/en_US.po | 12 +++++ po/es_ES.po | 12 +++++ po/es_MX.po | 12 +++++ po/et.po | 12 +++++ po/eu.po | 12 +++++ po/fi.po | 12 +++++ po/fr_CA.po | 12 +++++ po/fr_FR.po | 12 +++++ po/ga.po | 12 +++++ po/gl.po | 12 +++++ po/hi.po | 12 +++++ po/hr.po | 12 +++++ po/hu.po | 12 +++++ po/hy.po | 12 +++++ po/is.po | 12 +++++ po/it_IT.po | 12 +++++ po/ja_JP.po | 12 +++++ po/ka.po | 12 +++++ po/kk.po | 12 +++++ po/ko_KR.po | 16 +++++- po/lt.po | 12 +++++ po/lv.po | 12 +++++ po/mk.po | 12 +++++ po/nb.po | 12 +++++ po/nl_NL.po | 12 +++++ po/pl.po | 14 ++++- po/pt_BR.po | 12 +++++ po/pt_PT.po | 12 +++++ po/ro.po | 12 +++++ po/ru_RU.po | 12 +++++ po/sk.po | 12 +++++ po/sl.po | 12 +++++ po/sr.po | 12 +++++ po/sv.po | 12 +++++ po/tr_TR.po | 12 +++++ po/uk.po | 12 +++++ po/uz.po | 12 +++++ po/zh_CN.po | 12 +++++ po/zh_HK.po | 12 +++++ po/zh_SG.po | 12 +++++ po/zh_TW.po | 12 +++++ setting/src/email-setting.c | 22 -------- viewer/src/email-viewer-webview.c | 15 +----- viewer/src/email-viewer.c | 4 +- 64 files changed, 691 insertions(+), 113 deletions(-) diff --git a/common/src/email-engine.c b/common/src/email-engine.c index d8be502..dd5ac37 100755 --- a/common/src/email-engine.c +++ b/common/src/email-engine.c @@ -877,5 +877,4 @@ int email_engine_get_count_account(void) return count; } - /* EOF */ diff --git a/common/src/email-utils.c b/common/src/email-utils.c index 4a900e3..8f39c21 100755 --- a/common/src/email-utils.c +++ b/common/src/email-utils.c @@ -1215,7 +1215,7 @@ int email_get_contacts_list_info(contacts_list_h list, EMAIL_CONTACT_LIST_INFO_S contacts_record_h ct_value = NULL; contacts_list_get_current_record_p(list, &ct_value); debug_log("ct_ret = %d", ct_ret); - debug_log("ct_value = %d", (ct_value == NULL)); + debug_log("ct_value = %p, %d", ct_value, (ct_value == NULL)); if (ct_value) { ct_ret = contacts_record_get_int(ct_value, _contacts_contact_email.contact_id, &index); if (index > 0) { diff --git a/composer/include/email-composer-type.h b/composer/include/email-composer-type.h index 6fa8d2a..81f0829 100755 --- a/composer/include/email-composer-type.h +++ b/composer/include/email-composer-type.h @@ -80,11 +80,6 @@ #define ATTACHMENT_VCARD_FILE_PATH IMGDIR"/composer_attachment_vcard.png" #define ATTACHMENT_VCALENDAR_FILE_PATH IMGDIR"/composer_attachment_vcalender.png" -#define EMAIL_THEME_TIZEN_BLACK "tizen-black" -#define EMAIL_THEME_TIZEN_BLACK_HD "tizen-black-hd" -#define EMAIL_THEME_TIZEN_WHITE "tizen" -#define EMAIL_THEME_TIZEN_WHITE_HD "tizen-hd" - typedef struct { gchar email_addr[MAX_RECIPIENT_ADDRESS_LEN]; /* Specific email address of recipient */ int email_type; @@ -101,26 +96,6 @@ typedef struct { } EmailRecpInfo; typedef enum { - EMAIL_THEME_BLACK, - EMAIL_THEME_WHITE, - EMAIL_THEME_MAX -} EmailThemeType; - -typedef enum { - EMAIL_COMPOSER_LAUNCH_INLINE_IMAGE, - EMAIL_COMPOSER_LAUNCH_GALLERY, - EMAIL_COMPOSER_LAUNCH_TAKE_PHOTO, - EMAIL_COMPOSER_LAUNCH_RECORD_VIDEO, - EMAIL_COMPOSER_LAUNCH_VOICE_RECORDER, - EMAIL_COMPOSER_LAUNCH_FILE, - EMAIL_COMPOSER_LAUNCH_NAMECARD, - EMAIL_COMPOSER_LAUNCH_CALENDAR, - EMAIL_COMPOSER_LAUNCH_MEMO, - EMAIL_COMPOSER_LAUNCH_MESSAGE_COMPOSER, - EMAIL_COMPOSER_LAUNCH_MAX, -} EmailComposerLaunchType; - -typedef enum { COMPOSER_ATTACHMENT_ITEM_IMAGE, COMPOSER_ATTACHMENT_ITEM_SOUND, COMPOSER_ATTACHMENT_ITEM_VIDEO, diff --git a/composer/src/email-composer-attachment.c b/composer/src/email-composer-attachment.c index 332c114..221e20b 100755 --- a/composer/src/email-composer-attachment.c +++ b/composer/src/email-composer-attachment.c @@ -931,6 +931,7 @@ static void _composer_attachment_delete_icon_clicked_cb(void *data, Evas_Object email_free_attachment_data(&attachment_data, 1); attachment_data = NULL; } + _composer_mbe_set_focus(ugd); elm_box_recalculate(ugd->attachment_item_box); diff --git a/composer/src/email-composer-callback.c b/composer/src/email-composer-callback.c index 4627723..7611aad 100755 --- a/composer/src/email-composer-callback.c +++ b/composer/src/email-composer-callback.c @@ -118,6 +118,8 @@ static void _composer_ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void * { EmailComposerUGD *ugd = (EmailComposerUGD *)data; + ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE; + evas_object_del(ugd->context_popup); ugd->context_popup = NULL; } @@ -1864,6 +1866,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_focus_set(ugd->composer_noti, EINA_TRUE); myemail_itc.item_style = "email.2text.3icon.3"; myemail_itc.func.text_get = _composer_myemail_gl_text_get; @@ -1882,8 +1885,6 @@ void _composer_select_myemail_popup(EmailComposerUGD *ugd) elm_genlist_item_append(ugd->account_gen_list, &myemail_itc, (void *)acc_index, NULL, ELM_GENLIST_ITEM_NONE, _composer_myemail_gl_sel, (void *)acc_index); } - elm_genlist_tree_effect_enabled_set(ugd->account_gen_list, EINA_FALSE); - #ifdef _POPUP_WITH_LIST debug_log("acc_index:%d", acc_index); if (acc_index > 5) @@ -2360,6 +2361,7 @@ void _composer_cbar_priority_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_focus_set(popup, EINA_TRUE); if (ugd->clipboard_on) { ugd->clipboard_on = false; @@ -2398,8 +2400,6 @@ void _composer_cbar_priority_clicked(void *data, Evas_Object *obj, void *event_i gen_item[index] = elm_genlist_item_append(priority_genlist, &priority_itc, (void *)index, NULL, ELM_GENLIST_ITEM_NONE, _composer_priority_gl_sel, (void *)index); } - elm_genlist_tree_effect_enabled_set(priority_genlist, EINA_FALSE); - #ifdef _POPUP_WITH_LIST Evas_Object *box = elm_box_add(ugd->composer_noti); evas_object_size_hint_min_set(box, 610 * elm_config_scale_get(), 113 * index * elm_config_scale_get()); @@ -2511,6 +2511,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_focus_set(popup, EINA_TRUE); if (ugd->clipboard_on) { ugd->clipboard_on = false; @@ -2549,8 +2550,6 @@ void _composer_cbar_tracking_clicked(void *data, Evas_Object *obj, void *event_i gen_item[index] = elm_genlist_item_append(tracking_genlist, &tracking_itc, (void *)index, NULL, ELM_GENLIST_ITEM_NONE, _composer_tracking_gl_sel, (void *)index); } - elm_genlist_tree_effect_enabled_set(tracking_genlist, EINA_FALSE); - #ifdef _POPUP_WITH_LIST Evas_Object *box = elm_box_add(ugd->composer_noti); evas_object_size_hint_min_set(box, 610 * elm_config_scale_get(), 113 * index * elm_config_scale_get()); diff --git a/composer/src/email-composer-contents.c b/composer/src/email-composer-contents.c index 1ef6ece..0b37e23 100755 --- a/composer/src/email-composer-contents.c +++ b/composer/src/email-composer-contents.c @@ -28,10 +28,11 @@ void _composer_webview_reach_top_cb(void *data, Evas_Object *obj, void *event_info); void _composer_webview_reach_bottom_cb(void *data, Evas_Object *obj, void *event_info); -void _composer_webview_mouse_down_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info); +void _composer_webview_mouse_down_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info); void _composer_webview_mouse_move_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info); void _composer_webview_mouse_up_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info); + void _composer_webkit_loadFinished_cb(void *data, Evas_Object *obj, void *event_info); static void _composer_webkit_script_executed_cb(Evas_Object *o, const char *result, void *data); @@ -174,6 +175,8 @@ Evas_Object *_composer_create_subject_editfield(Evas_Object *parent, char *title elm_entry_scrollable_set(entry, EINA_TRUE); elm_entry_single_line_set(entry, EINA_TRUE); elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_NORMAL); + elm_entry_prediction_allow_set(entry, EINA_TRUE); + elm_entry_autocapital_type_set(entry, ELM_AUTOCAPITAL_TYPE_SENTENCE); elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT); evas_object_show(entry); elm_entry_text_style_user_push(entry, "DEFAULT='font_size=32 color=#000000'"); @@ -323,6 +326,8 @@ 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); } static void _composer_webkit_focused_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) diff --git a/composer/src/email-composer-recipient.c b/composer/src/email-composer-recipient.c index d44cd56..06bcd06 100755 --- a/composer/src/email-composer-recipient.c +++ b/composer/src/email-composer-recipient.c @@ -98,6 +98,8 @@ static Evas_Object *_composer_mbe_create_mbe(Evas_Object *parent, COMPOSER_RECIP entry = elm_multibuttonentry_entry_get(mbe); elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_EMAIL); + elm_entry_prediction_allow_set(entry, EINA_FALSE); + elm_entry_autocapital_type_set(entry, ELM_AUTOCAPITAL_TYPE_NONE); elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT); elm_entry_text_style_user_push(entry, "DEFAULT='font_size=32 color=#000000'"); diff --git a/composer/src/email-composer-util.c b/composer/src/email-composer-util.c index d356b3f..2a31f25 100755 --- a/composer/src/email-composer-util.c +++ b/composer/src/email-composer-util.c @@ -3000,7 +3000,7 @@ void _composer_add_attachment(EmailComposerUGD *ugd) attachment_data->save_status = 1; attachment_data->attachment_size = fwd_attachment_data_list[i].attachment_size; } - } + } _composer_attachment_create_list_box(ugd, attachment_data); } diff --git a/composer/src/email-composer.c b/composer/src/email-composer.c index c74a793..10673d4 100755 --- a/composer/src/email-composer.c +++ b/composer/src/email-composer.c @@ -432,14 +432,35 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void * debug_log(""); EmailComposerUGD *ugd = (EmailComposerUGD *)priv; - int win_main_angle = 0; + int win_main_angle = -1; switch (event) { - case UG_EVENT_LOW_MEMORY: + case UG_EVENT_ROTATE_PORTRAIT: + debug_log("Portrait"); + elm_layout_theme_set(ugd->main_layout, "layout", "application", "default"); + ugd->isHorizontal = false; + win_main_angle = 0; break; - case UG_EVENT_LOW_BATTERY: + case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN: + debug_log("Portrait upsidedown"); + elm_layout_theme_set(ugd->main_layout, "layout", "application", "default"); + ugd->isHorizontal = false; + win_main_angle = 180; + break; + case UG_EVENT_ROTATE_LANDSCAPE: + debug_log("Landscape"); + elm_layout_theme_set(ugd->main_layout, "layout", "application", "noindicator"); + ugd->isHorizontal = true; + win_main_angle = 270; + break; + case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN: + debug_log("Landscape upsidedown"); + elm_layout_theme_set(ugd->main_layout, "layout", "application", "noindicator"); + ugd->isHorizontal = true; + win_main_angle = 90; break; case UG_EVENT_LANG_CHANGE: + debug_log("Language changed"); if (ugd->navi_item) { char title_str[50] = { 0, }; if (ugd->composer_type == RUN_COMPOSER_REPLY || ugd->composer_type == RUN_COMPOSER_REPLY_ALL) @@ -477,32 +498,14 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void * snprintf(recp_string, sizeof(recp_string), "%s%s", _("IDS_EMAIL_BODY_FROM"), ":"); elm_object_text_set(ugd->from_mbe, recp_string); } - break; - case UG_EVENT_ROTATE_PORTRAIT: - elm_layout_theme_set(ugd->main_layout, "layout", "application", "default"); - ugd->isHorizontal = false; - win_main_angle = 0; - break; - case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN: - elm_layout_theme_set(ugd->main_layout, "layout", "application", "default"); - ugd->isHorizontal = false; - win_main_angle = 180; - break; - case UG_EVENT_ROTATE_LANDSCAPE: - elm_layout_theme_set(ugd->main_layout, "layout", "application", "noindicator"); - ugd->isHorizontal = true; - win_main_angle = 270; - break; - case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN: - elm_layout_theme_set(ugd->main_layout, "layout", "application", "noindicator"); - ugd->isHorizontal = true; - win_main_angle = 90; - break; case UG_EVENT_REGION_CHANGE: - break; + case UG_EVENT_LOW_MEMORY: + case UG_EVENT_LOW_BATTERY: default: - break; + debug_log("event: %d, win_main_angle: %d", event, win_main_angle); + return; } + _composer_resize_body_webview(ugd, 0); elm_layout_sizing_eval(ugd->c_layout); @@ -1426,6 +1429,16 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data) ret = service_get_extra_data(data, EMAIL_BUNDLE_KEY_BODY, (char **)&argv[5]); debug_log("service_get_extra_data: %d", ret); debug_log("body:%s", argv[5]); + + ret = service_get_extra_data(data, EMAIL_BUNDLE_KEY_ATTACHMENT, (char **)&argv[6]); + debug_log("service_get_extra_data: %d", ret); + debug_log("attachment:%s", argv[6]); + if (argv[6] && !argv[5]) { + if (g_str_has_prefix(argv[6], "http://")) { + argv[5] = g_strdup(argv[6]); + debug_log("body:%s", argv[5]); + } + } } else { /* ug called by appcontrol request */ debug_log("ug called by appcontrol request"); ret = service_get_extra_data(data, SERVICE_DATA_TO, (char **)&argv[1]); @@ -1443,6 +1456,16 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data) ret = service_get_extra_data(data, SERVICE_DATA_TEXT, (char **)&argv[5]); debug_log("service_get_extra_data: %d", ret); debug_log("body:%s", argv[5]); + + ret = service_get_uri(data, (char **)&argv[6]); + debug_log("service_get_uri: %d", ret); + debug_log("uri:%s", argv[6]); + if (argv[6] && !argv[5]) { + if (g_str_has_prefix(argv[6], "http://")) { + argv[5] = g_strdup(argv[6]); + debug_log("body:%s", argv[5]); + } + } } } else { int ret; @@ -1464,23 +1487,21 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data) ugd->save_drafts = 0; break; + case RUN_COMPOSER_EDIT: case RUN_COMPOSER_REPLY_ALL: case RUN_COMPOSER_REPLY: case RUN_COMPOSER_FORWARD: if (argv[1]) ugd->account_info->account_id = atoi(argv[1]); - if (argv[2]) ugd->mailbox_info->mailbox_id = atoi(argv[2]); - if (argv[3]) ugd->nExistingMailID = atoi(argv[3]); ugd->save_drafts = 1; - debug_log(""); - break; + case RUN_COMPOSER_EXTERNAL: if (argv[1] != NULL && strlen(argv[1]) != 0) { ugd->new_mail_info->mail_data->full_address_to = _composer_parse_recipients_arg(ugd, argv[1]); @@ -1499,8 +1520,8 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data) } ugd->save_drafts = 1; - break; + default: debug_log("[email-composer] unknown composer type!!"); return COMPOSER_ERROR_UNKOWN_TYPE; @@ -1519,7 +1540,6 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data) } return COMPOSER_ERROR_NONE; - } else { if (operation == NULL) { /* ug called by ug_create */ debug_log("ug called by ug_create"); @@ -1591,7 +1611,7 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data) int ret; ret = service_get_uri(data, (char **)&argv[0]); debug_log("service_get_uri: %d", ret); - debug_log("attachment:%s", argv[0]); + debug_log("uri:%s", argv[0]); if (!argv[0]) { ret = service_get_extra_data(data, EMAIL_BUNDLE_KEY_ATTACHMENT, (char **)&argv[0]); debug_log("service_get_extra_data: %d", ret); @@ -1600,6 +1620,7 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data) } if (argv[0] != NULL) { + if (!g_str_has_prefix(argv[0], "http://")) { Eina_List *list = NULL; char tmp_file_path[MAX_PATH_LEN + 1] = { 0, }; char *file_ext = NULL; @@ -1674,6 +1695,7 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data) g_free(argv[0]); } + } } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1882,7 +1904,7 @@ static void _on_edbus_event_composer_receive(void *data, DBusMessage * message) debug_log("draft mail"); ugd->send_timer = ecore_timer_add(0.5, _composer_save_draft_mail, ugd); } - } + } ugd->need_download = EINA_FALSE; } } else { diff --git a/packaging/org.tizen.email.spec b/packaging/org.tizen.email.spec index e5b3ede..58385a3 100755 --- a/packaging/org.tizen.email.spec +++ b/packaging/org.tizen.email.spec @@ -1,6 +1,6 @@ Name: org.tizen.email Summary: Native email application -Version: 0.0.12 +Version: 0.0.13 Release: 1 Group: devel License: Flora @@ -75,7 +75,6 @@ mkdir -p %{buildroot}/usr/share/license %make_install - %post /usr/bin/vconftool set -t int file/private/org.tizen.email/defaultaccount "1" -g 6514 /usr/bin/vconftool set -t int file/private/org.tizen.email/slot_size "50" -g 6514 @@ -88,7 +87,6 @@ mkdir -p %{_ugdir}/bin/ ln -sf /usr/bin/ug-client %{_ugdir}/bin/email-composer-efl ln -sf /usr/bin/ug-client %{_ugdir}/bin/email-setting-efl - %files %manifest org.tizen.email.manifest %defattr(-,root,root,-) diff --git a/po/ar.po b/po/ar.po index b2ed86e..dc48393 100755 --- a/po/ar.po +++ b/po/ar.po @@ -1753,3 +1753,15 @@ msgstr "تتعذر إعادة تسمية المجلد" msgid "IDS_EMAIL_BODY_ONCE" msgstr "مرة واحدة" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "عدد رسائل البريد الإلكتروني المطلوب تحميلها" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "‏‫صندوق وارد المرسلون ذوو الأولوية" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "عرض كل المجلدات" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "مرحبا!" + diff --git a/po/az.po b/po/az.po index 5378b71..d69de4c 100755 --- a/po/az.po +++ b/po/az.po @@ -1753,3 +1753,15 @@ msgstr "Qovluğu adını dəyişmək mümkün deyil" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Bir dəfə" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Yüklənəcək epoçtlrın sayı" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Prioritet göndərən qutusu" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Bütün qovluqları göstər" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Salam!" + diff --git a/po/bg.po b/po/bg.po index 5fd60c4..015ef57 100755 --- a/po/bg.po +++ b/po/bg.po @@ -1753,3 +1753,15 @@ msgstr "Папката не може да се преименува" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Веднъж" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Брой имейли за зареждане" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Вх. поща от приорит. подат." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Показване на всички папки" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Здравейте!" + diff --git a/po/ca.po b/po/ca.po index 4fb1623..9ddac24 100755 --- a/po/ca.po +++ b/po/ca.po @@ -1753,3 +1753,15 @@ msgstr "No es pot canviar el nom de la carpeta" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Una vegada" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Nombre cor el per carregar" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Safata entr. remit. prior." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Mostrar totes les carpetes" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hola" + diff --git a/po/cs.po b/po/cs.po index 9b09236..03ba216 100755 --- a/po/cs.po +++ b/po/cs.po @@ -1753,3 +1753,15 @@ msgstr "Nelze přejmenovat složku" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Jednou" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Počet e-mailů k načtení" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Přijaté od priorit. odes." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Zobrazit všechny složky" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Ahoj!" + diff --git a/po/da.po b/po/da.po index 6868448..bee8154 100755 --- a/po/da.po +++ b/po/da.po @@ -1753,3 +1753,15 @@ msgstr "Kunne ikke omdøbe mappe" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Én gang" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Antal e-mails til indlæs." + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Prioritets-afs. indbakke" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Vis alle mapper" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hallo!" + diff --git a/po/de_DE.po b/po/de_DE.po index 3586f04..87d6ffb 100755 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1753,3 +1753,15 @@ msgstr "Ordner kann nicht umbenannt werden" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Einmal" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Anzahl zu ladende E-Mails" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Posteingang Hauptsender" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Alle Ordner anzeigen" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hallo!" + diff --git a/po/el_GR.po b/po/el_GR.po index 06dc36e..a228a8b 100755 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -1753,3 +1753,15 @@ msgstr "Δεν είναι δυνατή η μετονομασία φακέλου" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Μία φορά" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Αριθμός email για φόρτωση" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Εισερχ. αποστολέα προτερ." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Προβολή όλων των φακέλων" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Γεια σας!" + diff --git a/po/en.po b/po/en.po index fb8b038..a095336 100755 --- a/po/en.po +++ b/po/en.po @@ -1753,3 +1753,15 @@ msgstr "Unable to rename folder" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Once" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Number of emails to load" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Priority sender inbox" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Show all folders" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hello!" + diff --git a/po/en_PH.po b/po/en_PH.po index b00b8b3..4fc1504 100755 --- a/po/en_PH.po +++ b/po/en_PH.po @@ -1753,3 +1753,15 @@ msgstr "Unable to rename folder" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Once" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Number of emails to load" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Priority sender inbox" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Show all folders" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hello!" + diff --git a/po/en_US.po b/po/en_US.po index b84ea2a..b698fb6 100755 --- a/po/en_US.po +++ b/po/en_US.po @@ -1753,3 +1753,15 @@ msgstr "Unable to rename folder" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Once" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Number of emails to load" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Priority sender inbox" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Show all folders" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hello!" + diff --git a/po/es_ES.po b/po/es_ES.po index cf26f6b..4f9ec9a 100755 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1753,3 +1753,15 @@ msgstr "No se puede cambiar el nombre a la carpeta" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Una vez" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Núm corr elec para cargar" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Bandeja entr. remit. prior." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Mostrar todas las carpetas" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hola" + diff --git a/po/es_MX.po b/po/es_MX.po index 9711a6e..f4af14f 100755 --- a/po/es_MX.po +++ b/po/es_MX.po @@ -1753,3 +1753,15 @@ msgstr "No se puede renombrar" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Una vez" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Cant. correos para cargar" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Buzón entrada remit. prior." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Mostrar todas las carpetas" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "¡Hola!" + diff --git a/po/et.po b/po/et.po index dcda06d..1606eec 100755 --- a/po/et.po +++ b/po/et.po @@ -1753,3 +1753,15 @@ msgstr "Kausta ei saa ümber nimetada" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Üks kord" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Laetavate e-kirjade arv" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Prior.-ga saatja sis. kaust" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Näita kõiki kaustu" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Tere!" + diff --git a/po/eu.po b/po/eu.po index 945f830..8898680 100755 --- a/po/eu.po +++ b/po/eu.po @@ -1753,3 +1753,15 @@ msgstr "Ezin da karpeta berrizendatu" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Behin" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Kargatzeko mezu elek. kop." + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "L. igorle sarrera ontzia" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Erakutsi karpeta guztiak" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Kaixo!" + diff --git a/po/fi.po b/po/fi.po index 76af43c..a956c7a 100755 --- a/po/fi.po +++ b/po/fi.po @@ -1753,3 +1753,15 @@ msgstr "Kansiota ei voi nimetä uudelleen" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Kerran" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Ladatt. sähköpostiv. määrä" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Ensisij. läh. Saap.-kansio" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Näytä kaikki kansiot" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hei!" + diff --git a/po/fr_CA.po b/po/fr_CA.po index b1a838e..58a5d42 100755 --- a/po/fr_CA.po +++ b/po/fr_CA.po @@ -1753,3 +1753,15 @@ msgstr "Impossible de renommer le dossier" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Une fois" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Nombre de courriels à charger" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Boite récept. expéd. prior." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Afficher tous les dossiers" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Bonjour!" + diff --git a/po/fr_FR.po b/po/fr_FR.po index 2474a1a..9a1a129 100755 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1753,3 +1753,15 @@ msgstr "Impossible de renommer le dossier" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Une fois" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Nombre d'e-mails à charger" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Boîte récept. expéd. prio." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Afficher tous les dossiers" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Bonjour !" + diff --git a/po/ga.po b/po/ga.po index 49ed4eb..8fe1181 100755 --- a/po/ga.po +++ b/po/ga.po @@ -1753,3 +1753,15 @@ msgstr "Ní féidir fillteán a athainmniú" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Uair amháin" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Líon na r-phost le lódáil" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Bosca isteach seoltóirí tos." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Taispeáin gach fillteán" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Haló!" + diff --git a/po/gl.po b/po/gl.po index e98421b..dbbe340 100755 --- a/po/gl.po +++ b/po/gl.po @@ -1753,3 +1753,15 @@ msgstr "Non se pode cambiar o nome da carpeta" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Unha vez" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Número de correos a cargar" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Caixa entr. remit. priorid." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Amosar todas as carpetas" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Ola!" + diff --git a/po/hi.po b/po/hi.po index d9178d7..6f7b923 100755 --- a/po/hi.po +++ b/po/hi.po @@ -1753,3 +1753,15 @@ msgstr "फ़ोल्‍डर का नाम बदलने में अ msgid "IDS_EMAIL_BODY_ONCE" msgstr "एकबार" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "लोड करने के लिए ईमेल की संख्या" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "प्राथमिक प्रेषक इनबॉक्स" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "सभी फ़ोल्‍डर दिखाएँ" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "नमस्ते!" + diff --git a/po/hr.po b/po/hr.po index b6c1521..b20b4de 100755 --- a/po/hr.po +++ b/po/hr.po @@ -1753,3 +1753,15 @@ msgstr "Nemoguće preimenovati mapu" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Jednom" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Broj emailova za učitati" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Pretinac prioritetnih kontakata" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Prikaži sve mape" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Pozdrav!" + diff --git a/po/hu.po b/po/hu.po index c6ade72..441df00 100755 --- a/po/hu.po +++ b/po/hu.po @@ -1753,3 +1753,15 @@ msgstr "A mappa nem nevezhető át" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Egyszer" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Betöltendő e-mailek száma" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Fontos feladók – bejövő" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Összes mappa megjelenítése" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Üdvözöljük!" + diff --git a/po/hy.po b/po/hy.po index 914967c..017d077 100755 --- a/po/hy.po +++ b/po/hy.po @@ -1753,3 +1753,15 @@ msgstr "Անհնար է վերանվանել թղթապանակը" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Մեկ անգամ" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Բեռնվող էլ-նամակների քանակ" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Առաջնհերթ ուղարկողի մ. արկղ" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Ցույց տալ բոլոր թղթապանակները" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Բարև՛:" + diff --git a/po/is.po b/po/is.po index e3ba388..b915b23 100755 --- a/po/is.po +++ b/po/is.po @@ -1753,3 +1753,15 @@ msgstr "Ekki tókst að endurnefna möppu" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Einu sinni" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Fjöldi skeyta sem hlaðast" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Forgangspósthólf" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Sýna allar möppur" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Halló!" + diff --git a/po/it_IT.po b/po/it_IT.po index 82ef89a..919b42f 100755 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1753,3 +1753,15 @@ msgstr "Impossibile rinominare cartella" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Una volta" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Nr. di e-mail da caricare" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Posta mittenti prioritari" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Mostra tutte le cartelle" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Ciao!" + diff --git a/po/ja_JP.po b/po/ja_JP.po index d38c868..41ce938 100755 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -1753,3 +1753,15 @@ msgstr "フォルダ名を変更できません。" msgid "IDS_EMAIL_BODY_ONCE" msgstr "1回のみ" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "読み込むEメール数" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "優先送信元受信トレイ" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "全てのフォルダを表示" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "こんにちは" + diff --git a/po/ka.po b/po/ka.po index 47d0547..db8bf22 100755 --- a/po/ka.po +++ b/po/ka.po @@ -1753,3 +1753,15 @@ msgstr "საქაღალდეს სახელს ვერ შეუც msgid "IDS_EMAIL_BODY_ONCE" msgstr "ერთხელ" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "ჩასატვირთ ელწერილთა რიცხვი" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "პრიორიტეტული წერილები" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "ყველა საქაღალდის ჩვენება" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "გამარჯობა!" + diff --git a/po/kk.po b/po/kk.po index 8c45711..08753a5 100755 --- a/po/kk.po +++ b/po/kk.po @@ -1753,3 +1753,15 @@ msgstr "Қалтаның атын өзгерту мүмкін емес" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Бір рет" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Жүктелетін пош. хаб-ң саны" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Басым. жіб. кіріс жәшігі" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Барлық қалтаны көрсету" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Сәлем!" + diff --git a/po/ko_KR.po b/po/ko_KR.po index 5fd04b1..06c8b1a 100755 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1736,7 +1736,7 @@ msgid "IDS_EMAIL_POP_CREATING_FOLDER_ING" msgstr "폴더 생성 중..." msgid "IDS_EMAIL_POP_MOVE_P1SS_TO_P2SS_Q" -msgstr "Move %1$s to %2$s?" +msgstr "%1$s을(를) %2$s(으)로 이동할까요?" msgid "IDS_EMAIL_POP_RENAMING_ING" msgstr "이름 변경 중..." @@ -1745,7 +1745,7 @@ msgid "IDS_EMAIL_POP_CREATED" msgstr "생성되었습니다" msgid "IDS_EMAIL_POP_UNABLE_TO_DELETE_FOLDER" -msgstr "Unable to delete folder" +msgstr "폴더를 삭제할 수 없습니다" msgid "IDS_EMAIL_POP_UNABLE_TO_RENAME_FOLDER" msgstr "이름을 변경할 수 없습니다" @@ -1753,3 +1753,15 @@ msgstr "이름을 변경할 수 없습니다" msgid "IDS_EMAIL_BODY_ONCE" msgstr "한 번만" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "표시할 이메일 수" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "중요 발신인 이메일함" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "모든 폴더 보기" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "안녕하세요!" + diff --git a/po/lt.po b/po/lt.po index 38f7e49..276dbc4 100755 --- a/po/lt.po +++ b/po/lt.po @@ -1753,3 +1753,15 @@ msgstr "Neįmanoma pervardinti aplanko." msgid "IDS_EMAIL_BODY_ONCE" msgstr "Vieną kartą" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Keliamų el. laiškų skaič." + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Gauta iš pirmenyb. siuntėjų" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Rodyti visus aplankus" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Sveiki!" + diff --git a/po/lv.po b/po/lv.po index fe574cb..a10f3af 100755 --- a/po/lv.po +++ b/po/lv.po @@ -1753,3 +1753,15 @@ msgstr "Nevar pārdēvēt mapi" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Vienu reizi" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Ielādējamo vēstuļu skaits" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Prioritāro sūtītāju iesūtne" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Parādīt visas mapes" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Sveicināti!" + diff --git a/po/mk.po b/po/mk.po index ae89b54..a05de8c 100755 --- a/po/mk.po +++ b/po/mk.po @@ -1753,3 +1753,15 @@ msgstr "Не може да се преименува папката" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Еднократно" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Број пораки за вчитување" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Сандаче на приорит. испраќач" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Прикажи ги сите папки" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Здраво!" + diff --git a/po/nb.po b/po/nb.po index 4662962..5658fad 100755 --- a/po/nb.po +++ b/po/nb.po @@ -1753,3 +1753,15 @@ msgstr "Kan ikke endre navn på mappe" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Én gang" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Antall e-poster som lastes" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Prioritert avsender-innboks" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Vis alle mapper" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hei!" + diff --git a/po/nl_NL.po b/po/nl_NL.po index a5b4cf1..28b065b 100755 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -1753,3 +1753,15 @@ msgstr "Kan de naam van de map niet wijzigen" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Eenmalig" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Aantal e-mails om te laden" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Postvak IN afz. met prior." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Alle mappen weergeven" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hallo!" + diff --git a/po/pl.po b/po/pl.po index 3a423be..44b799c 100755 --- a/po/pl.po +++ b/po/pl.po @@ -1745,7 +1745,7 @@ msgid "IDS_EMAIL_POP_CREATED" msgstr "Utworzono" msgid "IDS_EMAIL_POP_UNABLE_TO_DELETE_FOLDER" -msgstr "Nie można usunąć folderu" +msgstr "Nie można usunąć katalogu" msgid "IDS_EMAIL_POP_UNABLE_TO_RENAME_FOLDER" msgstr "Nie można zmienić nazwy katalogu" @@ -1753,3 +1753,15 @@ msgstr "Nie można zmienić nazwy katalogu" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Raz" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Liczba e-maili do załadow." + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Skrz. poczt. nad. prioryt." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Pokaż wszystkie katalogi" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Witaj!" + diff --git a/po/pt_BR.po b/po/pt_BR.po index f6063cb..520f643 100755 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1753,3 +1753,15 @@ msgstr "Impossível mudar o nome da pasta" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Uma vez" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Nº de e-mails p/ carregar" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Cx. ent. remet. prior." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Mostrar todas as pastas" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Olá!" + diff --git a/po/pt_PT.po b/po/pt_PT.po index 24e91de..42b1996 100755 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1753,3 +1753,15 @@ msgstr "Impossível mudar o nome da pasta" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Uma vez" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "N.º e-mails para carregar" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Cx entrada rem. prioritário" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Mostrar todas as pastas" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Olá!" + diff --git a/po/ro.po b/po/ro.po index 5173015..b80a216 100755 --- a/po/ro.po +++ b/po/ro.po @@ -1753,3 +1753,15 @@ msgstr "Imposibil de redenumit folderul" msgid "IDS_EMAIL_BODY_ONCE" msgstr "O dată" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Nr. de e-mailuri de încăr." + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Inbox expeditori prioritari" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Afişare integrală foldere" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Bună ziua!" + diff --git a/po/ru_RU.po b/po/ru_RU.po index a8bbe42..2427a82 100755 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1753,3 +1753,15 @@ msgstr "Невозможно переименовать папку" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Один раз" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Число сообщ. для загрузки" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Приоритетная папка" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Показать все папки" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Добро пожаловать!" + diff --git a/po/sk.po b/po/sk.po index 3731bbd..7b149a3 100755 --- a/po/sk.po +++ b/po/sk.po @@ -1753,3 +1753,15 @@ msgstr "Priečinok sa nedá premenovať" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Raz" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Počet e-mailov na načít." + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Dor. pošta od prior. odos." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Zobraziť všetky priečinky" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Dobrý deň!" + diff --git a/po/sl.po b/po/sl.po index 248c6be..38e90cb 100755 --- a/po/sl.po +++ b/po/sl.po @@ -1753,3 +1753,15 @@ msgstr "Mape ni mogoče preimenovati" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Enkrat" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Št. e-poštnih sp. za nal." + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Prejeto od predn. pošiljat." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Pokaži vse mape" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Živjo!" + diff --git a/po/sr.po b/po/sr.po index 542506a..42f3d11 100755 --- a/po/sr.po +++ b/po/sr.po @@ -1753,3 +1753,15 @@ msgstr "Nemoguće preimenovati folder" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Jednom" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Br. e-poruka za učitavanje" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Prij. sand. prio. pošilj." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Prikaži sve foldere" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Zdravo!" + diff --git a/po/sv.po b/po/sv.po index b4c02a6..ea9151d 100755 --- a/po/sv.po +++ b/po/sv.po @@ -1753,3 +1753,15 @@ msgstr "Kan inte byta namn på mapp" msgid "IDS_EMAIL_BODY_ONCE" msgstr "En gång" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Antal e-postm. att läsa in" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Inkorg för prioriterad avs." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Visa alla mappar" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Hej!" + diff --git a/po/tr_TR.po b/po/tr_TR.po index e047cc5..335e798 100755 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -1753,3 +1753,15 @@ msgstr "Klasör yeniden adlandırılamıyor" msgid "IDS_EMAIL_BODY_ONCE" msgstr "1 kez" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Yüklenecek e-posta sayısı" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Öncelikli gndrn glen kutusu" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Tüm dosyaları göster" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Selam!" + diff --git a/po/uk.po b/po/uk.po index 4bbcf10..33206aa 100755 --- a/po/uk.po +++ b/po/uk.po @@ -1753,3 +1753,15 @@ msgstr "Неможливо перейменувати папку" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Один раз" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Повідомл. для завантаження" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Вхідні від пріорит.відправ." + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Відображення всіх папок" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Вітаємо!" + diff --git a/po/uz.po b/po/uz.po index ffaacd9..71352f6 100755 --- a/po/uz.po +++ b/po/uz.po @@ -1753,3 +1753,15 @@ msgstr "Jild nomini o‘zgartirib bo‘lmaydi" msgid "IDS_EMAIL_BODY_ONCE" msgstr "Bir marta" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "Yuklash u-n e-pochta soni" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "Ust/yub. kiruvchilar qutisi" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "Barcha jildlarni ko‘rsatish" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "Salom!" + diff --git a/po/zh_CN.po b/po/zh_CN.po index 027cb64..e6d1f1a 100755 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1753,3 +1753,15 @@ msgstr "无法重新命名文件夹" msgid "IDS_EMAIL_BODY_ONCE" msgstr "一次" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "载入的电子邮件的数目" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "优先发件人收件箱" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "显示全部文件夹" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "你好！" + diff --git a/po/zh_HK.po b/po/zh_HK.po index 442b86f..ea588aa 100755 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -1753,3 +1753,15 @@ msgstr "無法重新命名資料夾" msgid "IDS_EMAIL_BODY_ONCE" msgstr "一次" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "要載入的電子郵件數量" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "優先寄件人收件匣" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "顯示所有資料夾" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "您好！" + diff --git a/po/zh_SG.po b/po/zh_SG.po index d2f25ff..1ddc033 100755 --- a/po/zh_SG.po +++ b/po/zh_SG.po @@ -1753,3 +1753,15 @@ msgstr "无法重新命名文件夹" msgid "IDS_EMAIL_BODY_ONCE" msgstr "一次" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "载入的电子邮件的数目" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "优先发件人收件箱" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "显示全部文件夹" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "你好！" + diff --git a/po/zh_TW.po b/po/zh_TW.po index 2b9cdc8..c99a4d3 100755 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1753,3 +1753,15 @@ msgstr "無法重新命名資料夾" msgid "IDS_EMAIL_BODY_ONCE" msgstr "一次" +msgid "IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB" +msgstr "要載入的電子郵件數量" + +msgid "IDS_EMAIL_OPT_PRIORITY_SENDER_INBOX_ABB" +msgstr "優先寄件人收件匣" + +msgid "IDS_EMAIL_BODY_SHOW_ALL_FOLDERS_ABB" +msgstr "顯示所有資料夾" + +msgid "IDS_EMAIL_BODY_HELLO_E" +msgstr "您好！" + diff --git a/setting/src/email-setting.c b/setting/src/email-setting.c index e804d5b..9e31a80 100755 --- a/setting/src/email-setting.c +++ b/setting/src/email-setting.c @@ -56,7 +56,6 @@ 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); @@ -146,7 +145,6 @@ 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); @@ -840,26 +838,6 @@ 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(""); diff --git a/viewer/src/email-viewer-webview.c b/viewer/src/email-viewer-webview.c index 1c9bffd..8f2ec8e 100755 --- a/viewer/src/email-viewer-webview.c +++ b/viewer/src/email-viewer-webview.c @@ -32,8 +32,6 @@ static void _webview_load_progress_cb(void *data, Evas_Object *obj, void *event_ /* Double_Scroller */ static void _webview_edge_top_cb(void *data, Evas_Object *obj, void *event_info); static void _webview_edge_bottom_cb(void *data, Evas_Object *obj, void *event_info); -static void _webview_scroll_up_cb(void *data, Evas_Object *obj, void *event_info); -static void _webview_scroll_down_cb(void *data, Evas_Object *obj, void *event_info); static void _webview_mouse_down_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info); static void _webview_contextmenu_customize_cb(void *data, Evas_Object *webview, void *event_info); static void _webview_contextmenu_selected_cb(void *data, Evas_Object *webview, void *event_info); @@ -65,8 +63,6 @@ Evas_Object *viewer_get_webview(EmailViewerUGD *ug_data, gboolean has_html) ewk_view_vertical_panning_hold_set(ug_data->webview, EINA_TRUE); evas_object_smart_callback_add(ug_data->webview, "edge,top", _webview_edge_top_cb, ug_data); evas_object_smart_callback_add(ug_data->webview, "edge,bottom", _webview_edge_bottom_cb, ug_data); - evas_object_smart_callback_add(ug_data->webview, "scroll,up", _webview_scroll_up_cb, ug_data); - evas_object_smart_callback_add(ug_data->webview, "scroll,down", _webview_scroll_down_cb, ug_data); evas_object_smart_callback_add(ug_data->webview, "load,committed", _webview_load_committed_cb, ug_data); evas_object_smart_callback_add(ug_data->webview, "load,finished", _webview_load_finished_cb, ug_data); @@ -384,19 +380,10 @@ static void _webview_edge_bottom_cb(void *data, Evas_Object *obj, void *event_in debug_log(""); } -static void _webview_scroll_up_cb(void *data, Evas_Object *obj, void *event_info) -{ - //debug_log(""); -} - -static void _webview_scroll_down_cb(void *data, Evas_Object *obj, void *event_info) -{ - //debug_log(""); -} - static void _webview_mouse_down_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info) { debug_log(""); + EmailViewerUGD *ug_data = (EmailViewerUGD *)data; Evas_Event_Mouse_Down *mouse_info = (Evas_Event_Mouse_Down *)event_info; diff --git a/viewer/src/email-viewer.c b/viewer/src/email-viewer.c index b56ccaa..05349f2 100755 --- a/viewer/src/email-viewer.c +++ b/viewer/src/email-viewer.c @@ -5283,7 +5283,7 @@ static void *_contact_search_by_email(EmailViewerUGD *ug_data, const char *searc contacts_list_h list = NULL; ct_ret = email_get_contacts_list(CONTACTS_MATCH_EXACTLY, &list, search_word); - debug_log("email_get_contacts_record:%d, list : %x", ct_ret, list); + debug_log("email_get_contacts_record:%d, list : %p", ct_ret, list); if (!list) { debug_log("list is NULL"); @@ -5302,7 +5302,7 @@ static void *_contact_search_by_email(EmailViewerUGD *ug_data, const char *searc contacts_disconnect2(); return NULL; } - debug_log("email_get_contacts_list_info:%d contacts_list_item : %x", ct_ret, contacts_list_item); + debug_log("email_get_contacts_list_info:%d, contacts_list_item : %p", ct_ret, contacts_list_item); contacts_list_destroy(list, true); contacts_disconnect2(); -- 2.7.4