From 23e5a1e5568ff4be5da6f306b20e2d2f95376996 Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:03:57 +0900 Subject: [PATCH] merge with master --- account/src/email-account-folder.c | 59 +- common/include/email-common-types.h | 15 + composer/src/email-composer-callback.c | 12 +- composer/src/email-composer.c | 7 + images/M02_color_btn_ef.png | Bin 0 -> 3840 bytes images/M02_color_btn_ef_dim.png | Bin 0 -> 3847 bytes images/M02_color_btn_ef_press.png | Bin 0 -> 3947 bytes images/M02_color_btn_masking.png | Bin 0 -> 2967 bytes mailbox/include/email-mailbox-list.h | 2 +- mailbox/include/email-mailbox-noti-mgr.h | 1 + mailbox/include/email-mailbox.h | 1 + mailbox/src/email-mailbox-controlbar.c | 6 - mailbox/src/email-mailbox-item.c | 35 +- mailbox/src/email-mailbox-list.c | 193 +++- mailbox/src/email-mailbox-move.c | 22 +- mailbox/src/email-mailbox-noti-mgr.c | 158 +++- packaging/org.tizen.email.spec | 3 +- po/ar.po | 157 +++- po/az.po | 129 ++- po/bg.po | 129 ++- po/ca.po | 129 ++- po/cs.po | 131 ++- po/da.po | 157 +++- po/de_DE.po | 129 ++- po/el_GR.po | 129 ++- po/en.po | 129 ++- po/en_PH.po | 129 ++- po/en_US.po | 129 ++- po/es_ES.po | 137 ++- po/es_MX.po | 133 ++- po/et.po | 129 ++- po/eu.po | 131 ++- po/fi.po | 131 ++- po/fr_CA.po | 129 ++- po/fr_FR.po | 131 ++- po/ga.po | 149 ++- po/gl.po | 133 ++- po/hi.po | 129 ++- po/hr.po | 129 ++- po/hu.po | 131 ++- po/hy.po | 131 ++- po/is.po | 129 ++- po/it_IT.po | 129 ++- po/ja_JP.po | 151 ++- po/ka.po | 129 ++- po/kk.po | 129 ++- po/ko_KR.po | 131 ++- po/lt.po | 129 ++- po/lv.po | 129 ++- po/mk.po | 141 ++- po/nb.po | 147 ++- po/nl_NL.po | 143 ++- po/pl.po | 129 ++- po/pt_BR.po | 129 ++- po/pt_PT.po | 129 ++- po/ro.po | 129 ++- po/ru_RU.po | 133 ++- po/sk.po | 129 ++- po/sl.po | 129 ++- po/sr.po | 129 ++- po/sv.po | 131 ++- po/tr_TR.po | 135 ++- po/uk.po | 129 ++- po/uz.po | 129 ++- po/zh_CN.po | 131 ++- po/zh_HK.po | 129 ++- po/zh_SG.po | 129 ++- po/zh_TW.po | 129 ++- setting/include/email-setting-defines.h | 5 - setting/include/email-setting-string.h | 239 +++++ setting/include/email-setting-view.h | 1 + setting/include/email-setting.h | 2 + setting/src/email-setting-account-set.c | 4 +- setting/src/email-setting.c | 66 +- setting/src/email-view-account-edit.c | 796 ++++++++-------- setting/src/email-view-account-options.c | 1004 +++++++++++--------- setting/src/email-view-account-setup.c | 784 ++++++---------- setting/src/email-view-initial.c | 31 +- setting/src/email-view-mailbox-mapping.c | 37 +- setting/src/email-view-manual-setup.c | 657 ++++++------- setting/src/email-view-setting.c | 586 +++++++----- setting/src/email-view-sp-select.c | 29 +- setting/src/email-view-sync-schedule.c | 332 ++++--- setting/src/email-view-sync-setup.c | 317 ++++--- setting/theme/email-setting-theme.edc | 1466 ++++++++++++++---------------- viewer/CMakeLists.txt | 2 +- viewer/src/email-viewer.c | 9 +- 87 files changed, 10154 insertions(+), 3492 deletions(-) create mode 100644 images/M02_color_btn_ef.png create mode 100644 images/M02_color_btn_ef_dim.png create mode 100644 images/M02_color_btn_ef_press.png create mode 100644 images/M02_color_btn_masking.png create mode 100755 setting/include/email-setting-string.h diff --git a/account/src/email-account-folder.c b/account/src/email-account-folder.c index cebe64b..5e607f2 100755 --- a/account/src/email-account-folder.c +++ b/account/src/email-account-folder.c @@ -109,6 +109,8 @@ 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 _eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source); +static int _folder_get_favourite_mail_count(bool unread_only); + //static void _changed_cb(void *data, Evas_Object *obj, void *event_info); //static void _focused_cb(void *data, Evas_Object *obj, void *event_info); //static void _unfocused_cb(void *data, Evas_Object *obj, void *event_info); @@ -601,12 +603,7 @@ void _create_folder_view(EmailAccountUGD *ug_data) ug_data->all_acc_unread_count[ACC_MAILBOX_TYPE_OUTBOX] += mailbox_list[j].unread_count; } break; - case EMAIL_MAILBOX_TYPE_FLAGGED: - { - ug_data->all_acc_read_count[ACC_MAILBOX_TYPE_FLAGGED] += mailbox_list[j].total_mail_count_on_local; - ug_data->all_acc_unread_count[ACC_MAILBOX_TYPE_FLAGGED] += mailbox_list[j].unread_count; - } - break; + default: break; } @@ -616,6 +613,9 @@ void _create_folder_view(EmailAccountUGD *ug_data) _make_folder_tree(alist + i, ug_data); } + ug_data->all_acc_read_count[ACC_MAILBOX_TYPE_FLAGGED] = _folder_get_favourite_mail_count(false); + ug_data->all_acc_unread_count[ACC_MAILBOX_TYPE_FLAGGED] = _folder_get_favourite_mail_count(true); + ug_data->alist = alist; } else @@ -3728,6 +3728,53 @@ static gboolean _folder_item_dim_state_get(email_mailbox_t *mlist, int folder_mo return FALSE; } +static int _folder_get_favourite_mail_count(bool unread_only) +{ + debug_enter(); + + email_mail_list_item_t *mail_list = NULL; + email_list_filter_t *filter_list = NULL; + int cnt_filter_list = 1; + int mail_count = 0; + int err = 0; + int i = 0; + + if(unread_only) + cnt_filter_list = cnt_filter_list + 2; + + filter_list = malloc(sizeof(email_list_filter_t) * cnt_filter_list); + memset(filter_list, 0, sizeof(email_list_filter_t) * cnt_filter_list); + + filter_list[i].list_filter_item_type = EMAIL_LIST_FILTER_ITEM_RULE; + filter_list[i].list_filter_item.rule.target_attribute = EMAIL_MAIL_ATTRIBUTE_FLAGS_FLAGGED_FIELD; + filter_list[i].list_filter_item.rule.rule_type = EMAIL_LIST_FILTER_RULE_EQUAL; + filter_list[i].list_filter_item.rule.key_value.integer_type_value = 1; + i++; + + if(unread_only) { + filter_list[i].list_filter_item_type = EMAIL_LIST_FILTER_ITEM_OPERATOR; + filter_list[i].list_filter_item.operator_type = EMAIL_LIST_FILTER_OPERATOR_AND; + i++; + + filter_list[i].list_filter_item_type = EMAIL_LIST_FILTER_ITEM_RULE; + filter_list[i].list_filter_item.rule.target_attribute = EMAIL_MAIL_ATTRIBUTE_FLAGS_SEEN_FIELD; + filter_list[i].list_filter_item.rule.rule_type = EMAIL_LIST_FILTER_RULE_EQUAL; + filter_list[i].list_filter_item.rule.key_value.integer_type_value = 0; + i++; + + } + + err = email_get_mail_list_ex(filter_list, cnt_filter_list, NULL, 0, -1, -1, &mail_list, &mail_count); + if (err != EMAIL_ERROR_NONE) + debug_warning("email_get_mail_list_ex - err (%d)", err); + + email_free_list_filter(&filter_list, cnt_filter_list); + + debug_warning("mail_count(%d)", mail_count); + FREE(mail_list); + + return mail_count; +} // Codes for removing elm_editfield : START /* diff --git a/common/include/email-common-types.h b/common/include/email-common-types.h index 9eeb958..e6db9b1 100755 --- a/common/include/email-common-types.h +++ b/common/include/email-common-types.h @@ -97,6 +97,21 @@ #define EMAIL_BUNDLE_VAL_ESP_MSN "msn" #define EMAIL_BUNDLE_VAL_ESP_OTHERS "others" +#define COLOR1 ((231 << 24) | (28 << 16) | (28 << 8) | 255) +#define COLOR2 ((215 << 24) | (182 << 16) | (30 << 8) | 255) +#define COLOR3 ((171 << 24) | (176 << 16) | (41 << 8) | 255) +#define COLOR4 ((53 << 24) | (164 << 16) | (72 << 8) | 255) +#define COLOR5 ((73 << 24) | (165 << 16) | (157 << 8) | 255) +#define COLOR6 ((34 << 24) | (129 << 16) | (157 << 8) | 255) +#define COLOR7 ((37 << 24) | (38 << 16) | (119 << 8) | 255) +#define COLOR8 ((128 << 24) | (58 << 16) | (177 << 8) | 255) +#define COLOR9 ((194 << 24) | (81 << 16) | (182 << 8) | 255) +#define COLOR10 ((189 << 24) | (21 << 16) | (92 << 8) | 255) +#define R_MASKING(val) (((val) & 0xff000000) >> 24) +#define G_MASKING(val) (((val) & 0x00ff0000) >> 16) +#define B_MASKING(val) (((val) & 0x0000ff00) >> 8) +#define A_MASKING(val) (((val) & 0x000000ff)) + typedef enum { RUN_TYPE_UNKNOWN = -1, RUN_COMPOSER_NEW, /*< Specific new type. this type is used to create new email */ diff --git a/composer/src/email-composer-callback.c b/composer/src/email-composer-callback.c index 0f14fb6..4732915 100755 --- a/composer/src/email-composer-callback.c +++ b/composer/src/email-composer-callback.c @@ -1151,6 +1151,13 @@ Eina_Bool _composer_send_mail_cb(void *data) } if (ugd->send_result == COMPOSER_ERROR_NONE) { +#if 1 + int ret = status_message_post(dgettext("sys_string", "IDS_COM_POP_SENDING")); + if (ret) + debug_log("status_message_post() failed: %d", ret); + + ug_destroy_me(ugd->ug_main); +#else if (ugd->composer_noti) { evas_object_del(ugd->composer_noti); ugd->composer_noti = NULL; @@ -1192,6 +1199,7 @@ 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); +#endif } else { if (ugd->composer_noti) { evas_object_del(ugd->composer_noti); @@ -1201,7 +1209,7 @@ Eina_Bool _composer_send_mail_cb(void *data) _("IDS_EMAIL_POP_UNABLE_TO_SEND_EMAIL"), 0, NULL, NULL, 2.0, _composer_fail_to_send_popup_cb); } - return EINA_TRUE; + return EINA_FALSE; } Eina_Bool _composer_region_show_cb(void *data) @@ -2554,7 +2562,7 @@ void _composer_cbar_send_clicked(void *data, Evas_Object *obj, void *event_info) _composer_download_attachment(ugd); } else { ugd->bSendBtnDisabled = true; - ugd->send_timer = ecore_timer_add(0.5, _composer_send_mail_cb, ugd); + ugd->send_timer = ecore_timer_add(0.1, _composer_send_mail_cb, ugd); } } diff --git a/composer/src/email-composer.c b/composer/src/email-composer.c index 0e0628d..ad2f561 100755 --- a/composer/src/email-composer.c +++ b/composer/src/email-composer.c @@ -1623,6 +1623,13 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data) if (argv[0] != NULL) { if (!g_str_has_prefix(argv[0], "http://")) { + if (!strncmp(argv[0], "file://", 7)) { + char *filepath = NULL; + filepath = g_strdup(argv[0] + 7); + g_free(argv[0]); + argv[0] = filepath; + } + Eina_List *list = NULL; char tmp_file_path[MAX_PATH_LEN + 1] = { 0, }; char *file_ext = NULL; diff --git a/images/M02_color_btn_ef.png b/images/M02_color_btn_ef.png new file mode 100644 index 0000000000000000000000000000000000000000..377dd2d7678b84e567f1315f7212a1172fad3359 GIT binary patch literal 3840 zcmV+b5C8CqP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000ClNkl)J*fYiQbLq3PD7U6bGYJ|5CwmNqe! z4Wz&42{|O>k`K@4d7k%4cm)xmEE)j32H*t%PrzSs3BXqXJ^`>&dQ+4EIs)Kad}<;v zlT2JorDhWWt*jK1wlWnP8%YEwN~Wwd39@PDcI4md!YZ|z*7L81Mrg|A{W447cZP2y}g*e z?7D7VDP^}hn2o~oJekWa2g2K04jn%7WIuqt62Pg+iSbk_H9O{p!>dYb3n4&&@19C) z>$pxnm6{!!oET35IHdu^=H`;|NZ4IfN)Z5zj{cr`_x%rZGc&W&51G^6-e%uE^JeJq zz~e1SDRP}qer_%q@7>oI(*XK23+XS~+FEUqBk<09ALP!S{mhBQV%iUYhKGl}lP6zX z{_%%z0RX{ZgGr^*^8lXJ0901!f~>sCWULm9smXCcI*QpziP4Iu>qKv5x4lFPqgjGywDRG}DwW!orEG&qH7rV!U4u0i*p1{L3DLbUcMufwbuEA}5WTdx?g zV(S#+F2;)8!%3P6RU@PsPt61>DMrPo?+KN0ATHAN7im_k>KMdDx~?M4eCj%^au6%V zirp{8_^?{-u&USfH_o8Df(OO=21Qn^wqjhQdELS5j{7?(GNEcBRZ)z8ok!&y#0gaE z&kF?JC;}B5MIID4GbplRwYwNE?Ke=2m-h85#$AlN*d_>Z7u!@Yp!(W8?}I8i@II){ zL5LM&#aJ;`?0+yxa|%^UAwJF5cbaEH)d;a-|3Zk1bp3M>$KCl;mO<8%AWLl8+V>|* zFxH9^psZH9(HKvbJ`ssT2tb#Q(Cm$b!-1xzU;rQ(<4LEG-d%pH7}K)@&^Ny;sLhncm)7%K{eg34xd!AE)y9EwH< zj{KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000CsNkl%# z#Kf5R2k6E>p)qRe%2m^76BFakxX_BN{XtAA!!$M)J4~kt(=tG3=G}W-z|&!1hQSaQ zymKaR@or}GKKXvnIrqGmD~Je1Q3K$8051c08o`Ro0L}t94PeP%6h(k~0h~!pPK53x zr*5Rv(^Da>tQ3;AGZjl#c%G5bM|QQeKEAiBqw}Bya00-^Vn8nd`0nbJOBa&KKYook zPQJFb){|0_5Mo=)hKOLT75RK#-JhQix3ug#*4=aLIRGyL_+Ai^3*h%l7cX3UkeRvS zx^7-6Ww$$+^}_Q!xv;PpiZn)#KGpk7H-P;Tz({;zJe^KYkGYXZPHAl+1PBP+rL?w= z>*Ukv>9P34cpAWn1~8aPB@+!1H>Z>$0LWxAe}4Me7o%T&{mpz3lruDR+ z(_W<%xlVmPl}aW$4|EMm0Nr!5GpSHWTc73WPd@+o#G5ABEmc{>gv- zaJa_Y&-`^4z+nx*wbndTQdz9jt3>=}&T*VOLWo=t6huU!;o;%k#xpskR9H!6y@Iy{ zpiu*W5MoWW8WI_oIR&i*H;UCYic~Uk<#`ZslIC#-k30UyMv)1XGg29g@n#IAeGm(% z(#Hz~o+tt(6Gd(mH`6Gx#VS{^(xE-E#dv7H8H;fh<0`fZLR`f*6%44lGS4H|QVu*1 zsFF}BzichWpCD<>h|%~!XZXF}x&@oS$A2yv3Gz7OJ9t)C(VSxbT} zvC~$bpDe*xD||p%t#qw1p7j5*zinR_KwW^))IZsCq)sUj1_;J@(y4P?0QWS2Yt6fM zKbCv=U{-5w0pQfhH=b>5XwYZRozDb;&d}gX4X?lUYM*~!C=^t~j%YK0xFDhr#;^bO z_Sn_YZ=0HSEGi`fosNvLVs0)|f21dNyz9{6GyVZf6QiR)CZ=vDesLW)7gR{bSdm@G zhFkZv_r+rU?EnsF09gR9#A5wF0Km=3>z7^E$%R58qm(2mxA_@n)(T^+C=?1Rn_UP$ z(Q)W#EY{x#;CTSq(nH?PO~!BJZ%^GyEN16tXYSpdQA*kEtr{bDHb1(v-i<`}w6?W( zbRMh$FpQEz-u$Qm@D`Sj32Xz<84!2H0o(#`9>A9KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000D*Nkl~?my$$a{Ke!b26imFnu5#S|Y8?c$-vg^Q~z!@OUFFJ(}Yy@V1{pIJE8;$FeVHm6% z85vPyM9WMiO;yq~71#CJ6B8S5yt;e#ci>0h8h~U9ng;g$@clQtf}pkD_x;#)-Bd(W zL`p3iRYg^$+wGbl2pqpwZ@l*UTl2sP;F74S3mp9RLz=Eq`;B7(xuxfr8W-;X<;U~KO6shz+s2bgI#Z?5SXhXXh?nyp#@ua;COylEa7Jo!PNt`&MI&`hGQTHgB#6W*p$@C<<%! z`cqN>h}j6%=zs)DGh8o+Y^#LzD( zcYqLxve$7zMQa_9Qvj5#_<#s`d(#6%--;Dw9u`zo20(du72%Amq$tHkQTwHqJoj`m zP-O#@7T|Px0E!%RMJK)7k^-b+qE1Qx$mye|zUHhhAkqSm+~X1`NS7t+rKngbpdO(9 zeC}RO`}kTnS=J+_tMD0^gGxQ54%Wod+Xid*O<2|j*eW5WLyE(O*h4BvhgdX&1vIeC zTRt|#Y=}Lwgsg%dL_tox|3bJMX(UOp3tNg$!Z>!k-s+bKiJFMDa)dI4B zp7=h<=4d;MJ%(A#+I^NgETVh=FJ?o`R2imjB%C#>TC95pc@^7A7Y*HLhK~H04&@ z)QITxGh3!UJ@(;Hz*%mossv%^Y}_<`4OlS1{Oq2+XGiPfjdnY95>*+-vx5{!RHfYx zozePuV|LHpv%tK`^32J7`wyI{`s;4D7F%8zMNXU~CQnqQp5Rp_P7)JFk<(gid46rQ zxo`i0Gr&opD}__=HUfL+=6-td`d^nPx^bu4i9%0|sFbv+RuoNDDqb~mol3Z2^VH4V zyJzQt?^t%oTe0_f0oV@If$)^I002ovPDHLk FV1kB-dz%0N literal 0 HcmV?d00001 diff --git a/images/M02_color_btn_masking.png b/images/M02_color_btn_masking.png new file mode 100644 index 0000000000000000000000000000000000000000..3527fde90e02d9aeb7510f15b1537796e3c7cbd7 GIT binary patch literal 2967 zcmV;I3uyF-P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0002ONkllU%tw+25U~ zWm(d82Lyls0s2FrYxS;{LDr|btwBs1uh^%$40c%N>b&;^odr|M`18Pb3N0RjXF zkN^P!1PBlyK!5-V5FkK+009C7NPqwV0t5&UAV2~H2oNAZfB*pkBtU=w0RjXF5Fh~p z1PBlyK!5->4`?x0-@QPO>Nyb3tGcgkOupzcg8%^n^uPT8009600|4l9Oy`Sv&Vc{` N002ovPDHLkV1m0VY1jY& literal 0 HcmV?d00001 diff --git a/mailbox/include/email-mailbox-list.h b/mailbox/include/email-mailbox-list.h index 50ef88c..e074623 100755 --- a/mailbox/include/email-mailbox-list.h +++ b/mailbox/include/email-mailbox-list.h @@ -74,6 +74,6 @@ void _remove_get_more_progress_item(EmailMailboxUGD *mailbox_ugd); email_mail_list_item_t *_mailbox_get_mail_list_by_mailbox_type(int account_id, int mailbox_type, int sort_type, int thread_id, EmailSearchType search_type, const EmailSearchData *search_data, int *mail_count); email_mail_list_item_t *_mailbox_get_mail_list_by_mailbox_id(int account_id, int mailbox_id, int sort_type, int thread_id, EmailSearchType search_type, const EmailSearchData *search_data, int *mail_count); void reset_get_more_progress_callback_status(EmailMailboxUGD *mailbox_ugd); - +void mailbox_update_edit_list_view(EmailMailboxUGD * mailbox_ugd, list_data * ld); #endif /* __DEF_EMAIL_MAILBOX_LIST_H_ */ diff --git a/mailbox/include/email-mailbox-noti-mgr.h b/mailbox/include/email-mailbox-noti-mgr.h index cea2da3..8641de7 100755 --- a/mailbox/include/email-mailbox-noti-mgr.h +++ b/mailbox/include/email-mailbox-noti-mgr.h @@ -21,6 +21,7 @@ void _dbus_receiver_setup(EmailMailboxUGD *mailbox_ugd); void _remove_dbus_receiver(EmailMailboxUGD *mailbox_ugd); void _release_noti_Q_event(EmailMailboxUGD *mailbox_ugd); +void email_maillist_insert_sorted(list_data *ld); void _move_mail_item_cb(void *data, Ecore_Thread *thd, void* msg_data); void _move_finish_cb(void* data, Ecore_Thread *thd); void _delete_mail_item_cb(void *data, Ecore_Thread *thd, void* msg_data); diff --git a/mailbox/include/email-mailbox.h b/mailbox/include/email-mailbox.h index 985ac72..8a6fa60 100755 --- a/mailbox/include/email-mailbox.h +++ b/mailbox/include/email-mailbox.h @@ -337,6 +337,7 @@ struct ug_data { int move_account_cnt; int move_src_mailbox_id; int b_duplicated_node; + bool need_deleted_noti; //If "Deleted" notification message is needed char *traverse_compare; email_mailbox_t *traverse_compare_mlist; GNode *current_parent; diff --git a/mailbox/src/email-mailbox-controlbar.c b/mailbox/src/email-mailbox-controlbar.c index 33287ef..3267658 100755 --- a/mailbox/src/email-mailbox-controlbar.c +++ b/mailbox/src/email-mailbox-controlbar.c @@ -160,8 +160,6 @@ static void _markunread_mail_cb(void *data, Evas_Object *obj, void *event_info) on_event(NULL, UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN, NULL, mailbox_ugd); */ } - _refresh_mailbox(mailbox_ugd); - } static void _markread_mail_cb(void *data, Evas_Object *obj, void *event_info) @@ -227,9 +225,6 @@ static void _markread_mail_cb(void *data, Evas_Object *obj, void *event_info) on_event(NULL, UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN, NULL, mailbox_ugd); */ } - - _refresh_mailbox(mailbox_ugd); - } static void _dismissed_cb(void *data, Evas_Object *obj, void *event_info) @@ -1235,7 +1230,6 @@ static void _set_as_favourite_mail_cb(void *data, Evas_Object *obj, void *event_ if (mailbox_ugd->isRotate == true) { email_rotate_landscape(mailbox_ugd); } - _refresh_mailbox(mailbox_ugd); } static void _set_as_unfavourite_mail_cb(void *data, Evas_Object *obj, void *event_info) diff --git a/mailbox/src/email-mailbox-item.c b/mailbox/src/email-mailbox-item.c index 91575ec..2158fa7 100755 --- a/mailbox/src/email-mailbox-item.c +++ b/mailbox/src/email-mailbox-item.c @@ -167,11 +167,10 @@ void mailbox_process_delete_mail(void* data, Ecore_Thread *thd) int e_post = 0; if (result == EMAIL_ERROR_NONE) { - e_post = status_message_post(dgettext("sys_string", "IDS_COM_POP_DELETED")); - - if (e_post) { - debug_log("fail to status_message_post() : %d\n", e_post); - } + mailbox_ugd->need_deleted_noti = true; + } else { + mailbox_ugd->need_deleted_noti = false; + status_message_post(_("IDS_EMAIL_POP_FAILED_TO_DELETE")); } for (i = 0; i < max_account_id; ++i) { @@ -180,9 +179,20 @@ void mailbox_process_delete_mail(void* data, Ecore_Thread *thd) mail_list[i] = NULL; } } - + _clear_checked_status(mailbox_ugd); edit_list = eina_list_free(edit_list); + Elm_Object_Item *prev = NULL; + /* Get sweeped item */ + prev = (Elm_Object_Item *)elm_genlist_decorated_item_get(mailbox_ugd->gl[mailbox_ugd->view_type]); + if(prev) + { + //If sweeped item exist, revert it. + elm_genlist_item_decorate_mode_set(prev, "slide", EINA_FALSE); + elm_genlist_item_select_mode_set(prev, ELM_OBJECT_SELECT_MODE_DEFAULT); + } + elm_genlist_realized_items_update(mailbox_ugd->gl[mailbox_ugd->view_type]); + FREE(req); } void mailbox_delete_mail_item_from_list(EmailMailboxUGD * mailbox_ugd, list_data * ld) @@ -195,14 +205,21 @@ void mailbox_delete_mail_item_from_list(EmailMailboxUGD * mailbox_ugd, list_data Elm_Object_Item *parent = elm_genlist_item_parent_get(ld->item); Elm_Object_Item *next = elm_genlist_item_next_get(ld->item); Elm_Object_Item *prev = elm_genlist_item_prev_get(ld->item); + + EmailMailboxViewType vt = mailbox_ugd->view_type; + + if(vt == EMAIL_VIEW_EDIT) { + vt = mailbox_ugd->previous_view; + } + if(parent == prev && (NULL == next || NULL == elm_genlist_item_parent_get(next))) { elm_object_item_del(parent); - mailbox_ugd->git[mailbox_ugd->view_type][ld->group_index] = NULL; + mailbox_ugd->git[vt][ld->group_index] = NULL; } if(ld->item) elm_object_item_del(ld->item); - mailbox_ugd->list_data[mailbox_ugd->view_type] = - g_list_remove(mailbox_ugd->list_data[mailbox_ugd->view_type], ld); + mailbox_ugd->list_data[vt] = + g_list_remove(mailbox_ugd->list_data[vt], ld); _free_list_data_simple(ld); } diff --git a/mailbox/src/email-mailbox-list.c b/mailbox/src/email-mailbox-list.c index f3bf197..e9dbddf 100755 --- a/mailbox/src/email-mailbox-list.c +++ b/mailbox/src/email-mailbox-list.c @@ -1216,6 +1216,11 @@ void email_maillist_select_info(EmailMailboxUGD *mailbox_ugd) list = edit_list; cnt = eina_list_count(list); + if (mailbox_ugd->ctxpopup) { + evas_object_del(mailbox_ugd->ctxpopup); + mailbox_ugd->ctxpopup = NULL; + } + if(mailbox_ugd->selectioninfo_layout) { elm_object_signal_emit(mailbox_ugd->sub_layout[mailbox_ugd->previous_view], "hide_selection_info", "elm"); } @@ -1291,9 +1296,18 @@ static void _process_item_check_changed_cb(list_data *ld) if(cnt > 0 && !b_editmode) { - + Elm_Object_Item *prev = NULL; debug_log("Enter edit mode"); + /* Get sweeped item */ + prev = (Elm_Object_Item *)elm_genlist_decorated_item_get(mailbox_ugd->gl[mailbox_ugd->view_type]); + if(prev) + { + //If sweeped item exist, revert it. + elm_genlist_item_decorate_mode_set(prev, "slide", EINA_FALSE); + elm_genlist_item_select_mode_set(prev, ELM_OBJECT_SELECT_MODE_DEFAULT); + } + /* update controlbar to edit menu */ b_editmode = true; if (GET_MAILBOX_TYPE(mailbox_ugd->mailbox_id) == EMAIL_MAILBOX_TYPE_OUTBOX) { @@ -1348,6 +1362,11 @@ static void _list_item_clicked(void *data, Evas_Object *obj, void *event_info) return; } + if (ld->mailbox_ugd->ctxpopup) { + evas_object_del(ld->mailbox_ugd->ctxpopup); + ld->mailbox_ugd->ctxpopup = NULL; + } + if (b_editmode) { ld->mailbox_ugd->view_type = EMAIL_VIEW_EDIT; } @@ -3075,6 +3094,11 @@ void _worker_get_delete_mail_list_cb(void* data, Ecore_Thread *thd) _parse_delete_mail_buf(req->msg_buf, &mail_list); + if(vt == EMAIL_VIEW_EDIT) { + vt = mailbox_ugd->previous_view; + } + debug_log("view_type : %d, previous_view : %d", mailbox_ugd->view_type, mailbox_ugd->previous_view); + debug_log("size of mail_list : %d", g_list_length(mail_list)); G_LIST_FOREACH(mail_list, cur, idx) { debug_log("idx: [%d]", *idx); @@ -3203,50 +3227,127 @@ void _worker_get_move_mail_list_cb(void* data, Ecore_Thread *thd) int folder_type = GET_MAILBOX_TYPE(dst_mailbox_id); req->mailbox_type = folder_type; + if(vt == EMAIL_VIEW_EDIT) { + vt = mailbox_ugd->previous_view; + } + debug_log("view_type : %d, previous_view : %d", mailbox_ugd->view_type, mailbox_ugd->previous_view); + if (mailbox_ugd->mode == EMAIL_MAILBOX_MODE_ALL) { - if(vt != EMAIL_VIEW_EDIT && vt != EMAIL_VIEW_SEARCH) - { - G_LIST_FOREACH(mail_list, cur, idx) { - ld = _find_mailinfo_by_mailid(*idx, mailbox_ugd->list_data[vt]); - if(ld) { - //mailbox_delete_mail_item_from_list(mailbox_ugd, ld); - delete_ret_t *ret = MEM_ALLOC(ret, 1); - if(!ret) return; - *ret = (delete_ret_t) {ld, *idx}; - CHECK_THREAD_BUSY(); - ecore_thread_feedback(thd, ret); - debug_log("Mail(%d) found in this view(%d)", *idx, vt); + G_LIST_FOREACH(mail_list, cur, idx) { + ld = _find_mailinfo_by_mailid(*idx, mailbox_ugd->list_data[vt]); + if(ld) { + //mailbox_delete_mail_item_from_list(mailbox_ugd, ld); + delete_ret_t *ret = MEM_ALLOC(ret, 1); + if(!ret) return; + *ret = (delete_ret_t) {ld, *idx}; + CHECK_THREAD_BUSY(); + ecore_thread_feedback(thd, ret); + debug_log("Mail(%d) found in this view(%d)", *idx, vt); + } + + /* add sent email in Sentbox */ + debug_log("mailbox_type(%d), req->mailbox_type(%d)", mailbox_ugd->mailbox_type, req->mailbox_type); + if (mailbox_ugd->mailbox_type == req->mailbox_type) { + if (list_lock) { + debug_log("locked"); + if (!evas_object_visible_get(mailbox_ugd->gl[vt])) + evas_object_show(mailbox_ugd->gl[vt]); + + edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "hide_noc", "elm"); + edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_list", "elm"); + + list_lock = false; + } + + email_mail_list_item_t* mail_info = get_mail_info(*idx); + if (!mail_info) { + debug_warning("no email exits(%d)", *idx); + goto CLEANUP; } + list_data *ld = make_list_data(mail_info, NULL, mailbox_ugd); + if(!ld) { + debug_warning("make_list_data() failed."); + goto CLEANUP; + } + + /* The group items might be inserted before to receive any normal mail item */ + mailbox_ugd->list_data[vt] = + g_list_insert_sorted(mailbox_ugd->list_data[vt], ld, _compare_sort_rule_by_viewtype); + + if(mailbox_ugd->view_type != EMAIL_VIEW_DATE) + email_maillist_insert_sorted(ld); + + if (mailbox_ugd->view_type != EMAIL_VIEW_RECIPIENT) { + if (!group_title[ld->group_index][0]) + group_title[ld->group_index][0] = g_strdup(ld->group_title); + if (!group_title[ld->group_index][1]) + group_title[ld->group_index][1] = g_strdup(ld->group_date); + debug_log("group_title: %s", group_title[ld->group_index][0]); + } + + _insert_mail_to_mailist(mailbox_ugd, ld); } } - else { - debug_log("Nothing to move: mode(%d), view(%d), acc(%d)", mailbox_ugd->mode, vt, mailbox_ugd->account_id); - goto CLEANUP; - } } /* is mailbox_ugd->account_id == account_id necessary?*/ else if(mailbox_ugd->mode == EMAIL_MAILBOX_MODE_MAILBOX && mailbox_ugd->account_id == req->account_id) { - if(vt != EMAIL_VIEW_EDIT && vt != EMAIL_VIEW_SEARCH) - { - G_LIST_FOREACH(mail_list, cur, idx) { - ld = _find_mailinfo_by_mailid(*idx, mailbox_ugd->list_data[vt]); - if(ld) { - //mailbox_delete_mail_item_from_list(mailbox_ugd, ld); - delete_ret_t *ret = MEM_ALLOC(ret, 1); - if(!ret) return; - *ret = (delete_ret_t) {ld, *idx}; - CHECK_THREAD_BUSY(); - ecore_thread_feedback(thd, ret); - debug_log("Mail(%d) found in this view(%d)", *idx, vt); + G_LIST_FOREACH(mail_list, cur, idx) { + ld = _find_mailinfo_by_mailid(*idx, mailbox_ugd->list_data[vt]); + if(ld) { + //mailbox_delete_mail_item_from_list(mailbox_ugd, ld); + delete_ret_t *ret = MEM_ALLOC(ret, 1); + if(!ret) return; + *ret = (delete_ret_t) {ld, *idx}; + CHECK_THREAD_BUSY(); + ecore_thread_feedback(thd, ret); + debug_log("Mail(%d) found in this view(%d)", *idx, vt); + } + + /* add sent email in Sentbox */ + debug_log("mailbox_id(%d), dst_mailbox_id(%d)", mailbox_ugd->mailbox_id, dst_mailbox_id); + if (mailbox_ugd->mailbox_id == dst_mailbox_id) { + if (list_lock) { + debug_log("locked"); + if (!evas_object_visible_get(mailbox_ugd->gl[vt])) + evas_object_show(mailbox_ugd->gl[vt]); + + edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "hide_noc", "elm"); + edje_object_signal_emit(_EDJ(mailbox_ugd->search_layout), "show_list", "elm"); + + list_lock = false; + } + + email_mail_list_item_t* mail_info = get_mail_info(*idx); + if (!mail_info) { + debug_warning("no email exits(%d)", *idx); + goto CLEANUP; + } + list_data *ld = make_list_data(mail_info, NULL, mailbox_ugd); + if(!ld) { + debug_warning("make_list_data() failed."); + goto CLEANUP; + } + + /* The group items might be inserted before to receive any normal mail item */ + mailbox_ugd->list_data[vt] = + g_list_insert_sorted(mailbox_ugd->list_data[vt], ld, _compare_sort_rule_by_viewtype); + + if(mailbox_ugd->view_type != EMAIL_VIEW_DATE) + email_maillist_insert_sorted(ld); + + if (mailbox_ugd->view_type != EMAIL_VIEW_RECIPIENT) { + if (!group_title[ld->group_index][0]) + group_title[ld->group_index][0] = g_strdup(ld->group_title); + if (!group_title[ld->group_index][1]) + group_title[ld->group_index][1] = g_strdup(ld->group_date); + debug_log("group_title: %s", group_title[ld->group_index][0]); } + + _insert_mail_to_mailist(mailbox_ugd, ld); } } - else { - debug_log("Nothing to move: mode(%d), view(%d), acc(%d)", mailbox_ugd->mode, vt, mailbox_ugd->account_id); - goto CLEANUP; - } } else { debug_log("Nothing to move: mode(%d), view(%d), acc(%d)", mailbox_ugd->mode, vt, mailbox_ugd->account_id); @@ -3691,3 +3792,29 @@ void reset_get_more_progress_callback_status(EmailMailboxUGD *mailbox_ugd) } } +void mailbox_update_edit_list_view(EmailMailboxUGD * mailbox_ugd, list_data * ld) +{ + debug_enter(); + if(ld == NULL || ld->item == NULL) { + debug_warning("ld == NULL or ld->item == NULL"); + return; + } + + edit_list = eina_list_remove(edit_list, ld); + + int cnt = eina_list_count(edit_list); + debug_log("list count = %d", cnt); + + if(cnt <= 0) + { + debug_log("Exit edit mode"); + + /* update controlbar to mailbox menu */ + b_editmode = false; +// elm_toolbar_item_selected_set(mailbox_ugd->edit_cancel_button, EINA_TRUE); + _edit_back_cb(mailbox_ugd, NULL, NULL); + elm_object_disabled_set(mailbox_ugd->folder_button, EINA_FALSE); + } + email_maillist_select_info(mailbox_ugd); +} + diff --git a/mailbox/src/email-mailbox-move.c b/mailbox/src/email-mailbox-move.c index bef8654..b4e3a03 100644 --- a/mailbox/src/email-mailbox-move.c +++ b/mailbox/src/email-mailbox-move.c @@ -89,10 +89,7 @@ int create_mailbox_move_list_view(void *data, int 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); - } + clear_mailbox_move_list_data(mailbox_ugd); } err = email_engine_get_account_list(&(mailbox_ugd->move_account_cnt), &(mailbox_ugd->move_account_list)); @@ -465,12 +462,7 @@ static void _gl_sel(void *data, Evas_Object *obj, void *event_info) 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); - } + status_message_post(_("IDS_EMAIL_POP_FAILED_TO_MOVE")); } } else { @@ -478,6 +470,7 @@ static void _gl_sel(void *data, Evas_Object *obj, void *event_info) 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); + status_message_post(_("IDS_EMAIL_POP_FAILED_TO_MOVE")); } } @@ -741,6 +734,7 @@ static void _gl_exp_sel(void *data, Evas_Object *obj, void *event_info) 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); + status_message_post(_("IDS_EMAIL_POP_FAILED_TO_MOVE")); } } else { @@ -748,13 +742,7 @@ static void _gl_exp_sel(void *data, Evas_Object *obj, void *event_info) 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); + status_message_post(_("IDS_EMAIL_POP_FAILED_TO_MOVE")); } } FREE(mail_info); diff --git a/mailbox/src/email-mailbox-noti-mgr.c b/mailbox/src/email-mailbox-noti-mgr.c index ea27f8a..0f7ded7 100755 --- a/mailbox/src/email-mailbox-noti-mgr.c +++ b/mailbox/src/email-mailbox-noti-mgr.c @@ -38,7 +38,6 @@ extern char *group_title[EMAIL_GROUP_MAX][2]; DBusHandlerResult _on_dbus_receive(DBusConnection *connection, DBusMessage *message, void *user_data); static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message); static Eina_Bool email_check_account_list(int account_id); -static void email_maillist_insert_sorted(list_data *ld); 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); @@ -116,7 +115,7 @@ void _delete_finish_cb(void* data, Ecore_Thread *thd) debug_leave(); } -static void email_maillist_insert_sorted(list_data *ld) +void email_maillist_insert_sorted(list_data *ld) { debug_log(""); EmailMailboxUGD *mailbox_ugd = ld->mailbox_ugd; @@ -246,20 +245,30 @@ void _delete_mail_item_cb(void *data, Ecore_Thread *thd, void* msg_data) EmailMailboxUGD *mailbox_ugd = req->mailbox_ugd; EmailMailboxViewType vt = mailbox_ugd->view_type; - if(!_find_mailinfo_by_mailid(ret->mail_id, mailbox_ugd->list_data[vt])) - goto CLEANUP; - if(req->current_view != vt) { debug_warning("mismatched view_type: current_view(%d), mailbox_ugd_view(%d)", req->current_view, vt); goto CLEANUP; } + + if(vt == EMAIL_VIEW_EDIT) { + vt = mailbox_ugd->previous_view; + } + debug_log("view_type : %d, previous_view : %d", mailbox_ugd->view_type, mailbox_ugd->previous_view); + + if(!_find_mailinfo_by_mailid(ret->mail_id, mailbox_ugd->list_data[vt])) + goto CLEANUP; + + if(req->current_view == EMAIL_VIEW_EDIT) { + debug_log("edit list update first"); + mailbox_update_edit_list_view(mailbox_ugd, ld); + } mailbox_delete_mail_item_from_list(mailbox_ugd, ld); if(!g_list_length(mailbox_ugd->list_data[vt])) { if (!list_lock) { - if (evas_object_visible_get(mailbox_ugd->gl[mailbox_ugd->view_type])) - evas_object_hide(mailbox_ugd->gl[mailbox_ugd->view_type]); + if (evas_object_visible_get(mailbox_ugd->gl[vt])) + evas_object_hide(mailbox_ugd->gl[vt]); } Evas_Object *no_content = elm_object_part_content_get(mailbox_ugd->search_layout, "noc"); @@ -300,10 +309,14 @@ void _move_mail_item_cb(void *data, Ecore_Thread *thd, void* msg_data) goto CLEANUP; } + if(vt == EMAIL_VIEW_EDIT) { + vt = mailbox_ugd->previous_view; + } + debug_log("view_type : %d, previous_view : %d", mailbox_ugd->view_type, mailbox_ugd->previous_view); + if(!_find_mailinfo_by_mailid(ret->mail_id, mailbox_ugd->list_data[vt])) goto CLEANUP; - if(mailbox_ugd->mode != EMAIL_MAILBOX_MODE_MAILBOX && req->mailbox_type == EMAIL_MAILBOX_TYPE_SENTBOX) { @@ -311,14 +324,18 @@ void _move_mail_item_cb(void *data, Ecore_Thread *thd, void* msg_data) } else { + if(req->current_view == EMAIL_VIEW_EDIT) { + debug_log("edit list update first"); + mailbox_update_edit_list_view(mailbox_ugd, ld); + } mailbox_delete_mail_item_from_list(mailbox_ugd, ld); } if(!g_list_length(mailbox_ugd->list_data[vt])) { if (!list_lock) { - if (evas_object_visible_get(mailbox_ugd->gl[mailbox_ugd->view_type])) - evas_object_hide(mailbox_ugd->gl[mailbox_ugd->view_type]); + if (evas_object_visible_get(mailbox_ugd->gl[vt])) + evas_object_hide(mailbox_ugd->gl[vt]); } Evas_Object *no_content = elm_object_part_content_get(mailbox_ugd->search_layout, "noc"); @@ -546,8 +563,13 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message) account_id = data1; msg_buf = data3; - if(mailbox_ugd->move_account_list && mailbox_ugd->move_account_cnt > 0) + if(mailbox_ugd->move_account_list && mailbox_ugd->move_account_cnt > 0) { + status_message_post(dgettext("sys_string", "IDS_COM_POP_MOVED")); clear_mailbox_move_list_data(mailbox_ugd); + } else if(mailbox_ugd->need_deleted_noti) { + status_message_post(dgettext("sys_string", "IDS_COM_POP_DELETED")); + mailbox_ugd->need_deleted_noti = false; + } if(view_type == EMAIL_VIEW_RECIPIENT) { _refresh_mailbox(mailbox_ugd); @@ -568,11 +590,27 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message) } break; + case NOTI_MAIL_MOVE_FAIL: + debug_log("NOTI_MAIL_MOVE_FAIL"); + if(mailbox_ugd->move_account_list && mailbox_ugd->move_account_cnt > 0) { + status_message_post(_("IDS_EMAIL_POP_FAILED_TO_MOVE")); + clear_mailbox_move_list_data(mailbox_ugd); + } else if(mailbox_ugd->need_deleted_noti) { + status_message_post(_("IDS_EMAIL_POP_FAILED_TO_MOVE")); + mailbox_ugd->need_deleted_noti = false; + } + break; + case NOTI_MAIL_DELETE: debug_log("NOTI_MAIL_DELETE"); account_id = data1; msg_buf = data3; + if(mailbox_ugd->need_deleted_noti) { + status_message_post(dgettext("sys_string", "IDS_COM_POP_DELETED")); + mailbox_ugd->need_deleted_noti = false; + } + if(view_type == EMAIL_VIEW_RECIPIENT) { _refresh_mailbox(mailbox_ugd); } else { @@ -592,6 +630,14 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message) } break; + case NOTI_MAIL_DELETE_FAIL: + debug_log("NOTI_MAIL_DELETE_FAIL"); + if(mailbox_ugd->need_deleted_noti) { + status_message_post(_("IDS_EMAIL_POP_FAILED_TO_DELETE")); + mailbox_ugd->need_deleted_noti = false; + } + break; + case NOTI_MAIL_ADD: /* Seed mail was received */ debug_log("NOTI_MAIL_ADD"); account_id = data1; @@ -731,21 +777,41 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message) case EMAIL_MAIL_ATTRIBUTE_FLAGS_SEEN_FIELD: 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]); + list_data *ld = NULL; + if(view_type == EMAIL_VIEW_EDIT) { + ld = _find_mailinfo_by_mailid(*idx, mailbox_ugd->list_data[mailbox_ugd->previous_view]); + } else { + ld = _find_mailinfo_by_mailid(*idx, mailbox_ugd->list_data[view_type]); + } if(ld) { - ld->is_seen = value; - elm_genlist_item_update(ld->item); + if (view_type == EMAIL_VIEW_UNREAD) { + mailbox_delete_mail_item_from_list(mailbox_ugd, ld); + _mailbox_list_add_item(mailbox_ugd, *idx); + } else { + ld->is_seen = value; + elm_genlist_item_update(ld->item); + } } } break; case EMAIL_MAIL_ATTRIBUTE_FLAGS_FLAGGED_FIELD: 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]); + list_data *ld = NULL; + if(view_type == EMAIL_VIEW_EDIT) { + ld = _find_mailinfo_by_mailid(*idx, mailbox_ugd->list_data[mailbox_ugd->previous_view]); + } else { + ld = _find_mailinfo_by_mailid(*idx, mailbox_ugd->list_data[view_type]); + } if(ld) { - ld->followup_flag = value; - ld->imp_sel = value; - elm_genlist_item_update(ld->item); + if (view_type == EMAIL_VIEW_IMPORTANT) { + mailbox_delete_mail_item_from_list(mailbox_ugd, ld); + _mailbox_list_add_item(mailbox_ugd, *idx); + } else { + ld->followup_flag = value; + ld->imp_sel = value; + elm_genlist_item_update(ld->item); + } } } break; @@ -978,35 +1044,41 @@ static void _mailbox_remove_deleted_flag_mail(int mail_id, void *data) debug_log("Invalid parameter(mail_id)"); return; } + + if(view_type == EMAIL_VIEW_EDIT) { + view_type = mailbox_ugd->previous_view; + } + list_data *ld = _find_mailinfo_by_mailid(mail_id, mailbox_ugd->list_data[view_type]); if(ld) { - if(view_type != EMAIL_VIEW_EDIT && view_type != EMAIL_VIEW_SEARCH) - { - 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]); - } + 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); - 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; - }*/ + if(mailbox_ugd->view_type == EMAIL_VIEW_EDIT) { + debug_log("edit list update first"); + mailbox_update_edit_list_view(mailbox_ugd, ld); + } + + mailbox_delete_mail_item_from_list(mailbox_ugd, ld); + 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; } } } - } diff --git a/packaging/org.tizen.email.spec b/packaging/org.tizen.email.spec index 7eb4492..0d71f41 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.27 +Version: 0.0.35 Release: 1 Group: devel License: Flora @@ -31,7 +31,6 @@ BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(contacts-service2) BuildRequires: pkgconfig(ethumb) -BuildRequires: pkgconfig(libmedia-utils) BuildRequires: pkgconfig(calendar-service2) BuildRequires: pkgconfig(drm-client) BuildRequires: pkgconfig(status) diff --git a/po/ar.po b/po/ar.po index a1af7dd..f364638 100755 --- a/po/ar.po +++ b/po/ar.po @@ -116,7 +116,7 @@ msgid "IDS_EMAIL_HEADER_BLOCK_EMAILS" msgstr "حجب الإيميلات" msgid "IDS_EMAIL_HEADER_DELETE" -msgstr "حذف" +msgstr "مسح" msgid "IDS_EMAIL_HEADER_EMAIL" msgstr "بريد إلكتروني" @@ -149,7 +149,7 @@ msgid "IDS_EMAIL_OPT_HUGE_M_TEXTSIZE" msgstr "ضخم" msgid "IDS_EMAIL_BODY_ALWAYS_CC_BCC_MYSELF" -msgstr "إرسال Cc/Bcc لنفسي دوما" +msgstr "إرسال نسخة/نسخة مخفية لنفسي دوما" msgid "IDS_EMAIL_BODY_ALWAYS_CC_MYSELF" msgstr "إرسال نسخة لنفسي دائما" @@ -311,7 +311,7 @@ msgid "IDS_EMAIL_OPT_MOVE_TO_BCC" msgstr "نقل إلى Bcc" msgid "IDS_EMAIL_OPT_VIEW_CONTACT" -msgstr "عرض الاسم" +msgstr "عرض جهة الاتصال" msgid "IDS_EMAIL_HEADER_ATTACH_ABB" msgstr "إرفاق" @@ -458,13 +458,13 @@ msgid "IDS_EMAIL_SK3_FORWARD" msgstr "تحويل" msgid "IDS_EMAIL_BODY_DELETE" -msgstr "حذف" +msgstr "مسح" msgid "IDS_EMAIL_BODY_TO_C_PS" msgstr "إلى: %s" msgid "IDS_EMAIL_OPT_ADD_TO_CONTACTS" -msgstr "إضافة إلى الأسماء" +msgstr "إضافة إلى جهات الاتصال" msgid "IDS_EMAIL_BUTTON_PD_ATTACHMENTS_ABB" msgstr "%d مرفقات" @@ -494,7 +494,7 @@ msgid "IDS_EMAIL_BODY_EMAIL_SIZE" msgstr "حجم البريد الإلكتروني" msgid "IDS_EMAIL_BODY_100_KB" -msgstr "100 KB" +msgstr "100ك.ب" msgid "IDS_EMAIL_TAB_ADDRESS" msgstr "العنوان" @@ -533,7 +533,7 @@ msgid "IDS_EMAIL_BODY_1_KB" msgstr "1 KB" msgid "IDS_EMAIL_OPT_PD_KB" -msgstr "%d KB" +msgstr "KB" msgid "IDS_EMAIL_OPT_PHONE_ONLY" msgstr "الهاتف فقط" @@ -577,9 +577,6 @@ msgstr "الرسالة الأصلية" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "أخرى" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "غير مقروء" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "ضخم" @@ -1517,7 +1514,7 @@ msgid "IDS_EMAIL_POP_RETRIEVING_ING" msgstr "جاري التحميل…" msgid "IDS_EMAIL_BODY_EVERY_PD_MINUTES" -msgstr "كل d% دقائق" +msgstr "كل %d دقائق" msgid "IDS_EMAIL_SK3_RETRIEVE" msgstr "استرداد" @@ -1579,9 +1576,6 @@ msgstr "الموضوع" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "يتعذر البحث" -msgid "IDS_EMAIL_OPT_READ" -msgstr "المقروءة" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "انقر نقرا مزدوجا للانتقال إلى أعلى قوائم جهات الاتصال وقوائم البريد الإلكتروني ورسائل البريد الإلكتروني" @@ -1694,7 +1688,7 @@ msgid "IDS_EMAIL_POP_UNABLE_TO_MOVE_FOLDER" msgstr "يتعذر نقل المجلد" msgid "IDS_EMAIL_BODY_NOTIFICATION" -msgstr "الإشعار" +msgstr "الإخطار" msgid "IDS_EMAIL_BODY_DISPLAY_CONTENTS" msgstr "عرض المحتويات" @@ -1916,7 +1910,7 @@ msgid "IDS_EMAIL_POP_FAILED_TO_UNBLOCK_THIS_ADDRESS" msgstr "فشل إلغاء حظر هذا العنوان" msgid "IDS_EMAIL_POP_FAILED_TO_SET_AS_PRIORITY_SENDER" -msgstr "فشل التعيين كمرسل ذي أولوية" +msgstr "فشل التعيين كمرسل ذوي أولوية" msgid "IDS_EMAIL_POP_FAILED_TO_REMOVE_FROM_PRIORITY_SENDERS" msgstr "فشلت الإزالة من المرسلين ذوي الأولوية" @@ -1934,16 +1928,16 @@ msgid "IDS_EMAIL_HEADER_TEXT_TEMPLATES" msgstr "نماذج نصية" msgid "IDS_EMAIL_POP_EVENT_HAS_BEEN_ADDED_TO_S_PLANNER" -msgstr "تمت إضافة الحدث إلى S Planner" +msgstr "تمت إضافة الحدث إلى مخطط S" msgid "IDS_EMAIL_BODY_REMOVE_EVENT_FROM_S_PLANNER" -msgstr "إزالة حدث من ‏‫S Planner" +msgstr "إزالة حدث من ‏مخطط ‫S" msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_S_PLANNER" -msgstr "تمت إزالة حدث من ‏‫S Planner" +msgstr "تمت إزالة حدث من مخطط ‏‫S" msgid "IDS_EMAIL_POP_EVENT_ADDED_TO_S_PLANNER" -msgstr "تمت إضافة حدث إلى S Planner" +msgstr "تمت إضافة حدث إلى مخطط S" msgid "IDS_EMAIL_POP_NO_EMAIL_SELECTED" msgstr "لم يتم تحديد بريد إلكتروني" @@ -1951,3 +1945,126 @@ msgstr "لم يتم تحديد بريد إلكتروني" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "يتجاوز المرفق الحد الأقصى للحجم المسموح به من قبل نهج خادم Exchange هذا" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "بريد إلكتروني جديد" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "تم حفظ الرسالة" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "كل دقيقتان" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "تم حظر وظائف SMIME بواسطة نهج IT" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "لا يوجد ذاكرة كافية. امسح بعض العناصر" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "إدارة التطبيقات" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "إعدادات الوارد" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "إعدادات البريد الصادر" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "نغمة رنين التنبيه‬" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "كامل" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "الموضوع (من أ إلى ي)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "الموضوع (من ي إلى أ)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "المفضلة" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "رسالة بريد إلكتروني جديدة" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "لديك %d رسائل بريد إلكتروني جديدة في %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "لديك رسالة بريد إلكتروني واحدة في %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "قراءة" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "غير مقروءة" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "غير مميزة بعلامة" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "مميزة بعلامة" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "تحديد كمفضلة" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "تم تغيير كلمة مرور الخادم. أدخل كلمة المرور التي تم تغييرها" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "إلغاء التحديد كمفضلة" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "تم الوصول إلى الحد المسموح به لحسابات البريد الإلكتروني" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "سطر معاينة الرسالة" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "سطر واحد" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "سطران" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 أسطر" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "سطر العنوان في القائمة" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "على سبيل الإعلام" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "سأتصل بك لاحقا." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "شكرا لك على رسالة البريد الإلكتروني." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "الرجاء الاتصال بي عبر هاتفي المحمول." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "سأرسل ردا لاحقا." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "أنا موجود خارج المكتب. وسأرد على بريدك الإلكتروني فور عودتي إليه." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "كيف حالك؟" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "الرجاء التحقق من الملف المرفق." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "فلنتقابل على الغداء." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "الرجاء التذكير لاحقا." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "يتعذر إنشاء المجلد. تم تجاوز الحد الأقصى لطول اسم المجلد" + diff --git a/po/az.po b/po/az.po index 1ce386c..df09cf8 100755 --- a/po/az.po +++ b/po/az.po @@ -577,9 +577,6 @@ msgstr "İlkin mesaj" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Digərləri" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Oxunmamış" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Böyük" @@ -1579,9 +1576,6 @@ msgstr "Mövzu" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Axtarış mümkün deyil" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Oxu" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Kontakt siyahılarının, e-poçt siyahılarının və mesajların yuxarısına keçmək üçün iki dəfə vurun" @@ -1951,3 +1945,126 @@ msgstr "Heç bir e-poçt seçilməmişdir" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Yeni epoçt" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Mesaj yaddaşa yazıldı" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Hər 2 dəqiqədən" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME funksiyası İT siyasəti tərəfindən bloklanıb" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Yaddaş kifayət etmir. Xahiş olunur bəzi elementləri silin" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Proqramları idarə edin" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Gələn parametrlər" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Gedən parametrlər" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Siqnalın tonu" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Tam" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Mövzu (A - Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Mövzu (Z- A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Sevimlilər" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Yeni epoçtlar" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%s daxilində %d yeni e-poçt" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "%s daxilində 1 yeni epoçt" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Oxunmuş" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Oxunmamış" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Bayraqsız" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Bayraqlı" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Sevimli kimi qeyd et" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Serverin parolu dəyişib. Dəyişmiş parolu daxil edin" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Sevimli kimi sil" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "E-poçt hesablarının sayı maksimuma çatmışdır" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Mesaja önbaxış sətri" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 sətir" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 sətir" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 sətir" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Başlıq xətti siyahıda" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Məlumatınız üçün" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Sənə sonra zəng edərəm." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "E-poçtunuza görə təşəkkür edirik." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Zəhmət olmasa, mənimlə mobil telefonla əlaqə saxlayın." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Mən daha sonra cavab yazacam." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Mən ofisdə deyiləm. Geri qayıtdıqdan sonra e-poçtunuza tez bir müddətdə cavab verəcəyəm." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Necəsən?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Zəhmət olmasa, əlavə edilmiş faylı yoxlayın." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Gəl nahara görüşək." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Zəhmət olmasa, daha sonra xatırlat." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Qovluğu yaratmaq mümkün deyil. Qovluğun adı maksimal qovluq adı uzunluğunu keçib" + diff --git a/po/bg.po b/po/bg.po index 7166c64..0be93ce 100755 --- a/po/bg.po +++ b/po/bg.po @@ -577,9 +577,6 @@ msgstr "Оригинално съобщение" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Други" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Непрочетени" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Огромен" @@ -1579,9 +1576,6 @@ msgstr "Тема" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Не може да се търси" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Прочетено" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Чукнете двукратно, за да отидете в горната част на списъците със записи, списъците с имейли и имейл съобщенията" @@ -1951,3 +1945,126 @@ msgstr "Не е избран email" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "Прикаченият файл надвишава максималния размер, разрешен от тази политика на Exchange server" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "Нов имейл" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Съобщението е запаметено" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Всеки 2 минути" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Функционалността за SMIME е блокирана от правилата за ИТ" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Няма достатъчно памет. Изтрийте някои елементи" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Управление на приложенията" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Настройки за входящи" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Изходящи настройки" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Тон звън. за предуп." + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Завършено" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Тема (А до Я)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Тема (Я до A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Предпочитани" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Нови имейли" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d нови email-и в %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 нов email в %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Прочетени" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Непрочетени" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Без флаг" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "С флаг" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Марк. като предпоч." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Паролата за сървъра е променена. Въведете променената парола" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Демарк. от предпоч." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Достигнат е максималният брой акаунти за email" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Ред за предварителен преглед на съобщението" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 ред" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 реда" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 реда" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Заглавен ред в списък" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "За ваша информация" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Ще ви се обадя по-късно." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Благодаря ви за имейла." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Моля, търсете ме на мобилния ми телефон." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Ще изпратя отговор по-късно." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "В момента не съм в офиса. Ще отговоря на имейла ви възможно най-скоро, когато се върна." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Как си?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Моля, вижте прикачения файл." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Да отидем на обяд." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Моля, напомнете ми по-късно." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Папката не може да се създаде. Надвишена е максималната дължина на име на папка" + diff --git a/po/ca.po b/po/ca.po index d922cd5..58ec801 100755 --- a/po/ca.po +++ b/po/ca.po @@ -577,9 +577,6 @@ msgstr "Missatge original" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Altres" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Sense llegir" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Enorme" @@ -1579,9 +1576,6 @@ msgstr "Assumpte" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Error de cerca" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Llegir" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Toqui dos cops per anar al principi de la llista de contactes, la llista de correus electrònics i els missatges de correu electrònic" @@ -1951,3 +1945,126 @@ msgstr "No s'ha seleccionat cap correu electrònic" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nou correu electrònic" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Missatge desat" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Cada 2 minuts" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Funcionalitat SMIME bloquejada per la política TI" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "No hi ha prou memòria. Esborrar-ne alguns elements" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Administrar aplicacions" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Ajustaments d'entrada" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Ajustaments de sortida" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Melodia d'avís" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Finalitzar" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Assumpte (A a Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Assumpte (Z a A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Preferits" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nous correus electrònics" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d correus electrònics nous a %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nou correu electrònic a %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Llegits" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Sense llegir" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Sense marcar" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Marcat" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marcar preferit" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "S'ha canviat la contrasenya del servidor. Introdueixi la contrasenya canviada" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Desmarcar preferit" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "S'ha assolit el nombre màxim de comptes de correu electrònic" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Línia de vista prèvia del missatge" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 línia" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 línies" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 línies" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Títol de la llista" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Per a la seva informació" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Et trucaré més tard." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Gràcies pel seu correu electrònic." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Posa't en contacte amb mi al telèfon mòbil." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "T'envio una resposta més tard." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Sóc fora de l'oficina. Respondré el teu correu electrònic tan aviat com pugui quan torni." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Com va?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Revisa el fitxer adjunt." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Quedem per dinar." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Recorda-m'ho més tard." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "No es pot crear la carpeta. S'ha excedit la longitud màxima de nom de carpeta" + diff --git a/po/cs.po b/po/cs.po index 59b88b2..a9d11db 100755 --- a/po/cs.po +++ b/po/cs.po @@ -577,9 +577,6 @@ msgstr "Původní zpráva" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Jiné" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Nepřečteno" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Velmi velké" @@ -755,7 +752,7 @@ msgid "IDS_EMAIL_BODY_START_TIME" msgstr "Čas zahájení" msgid "IDS_EMAIL_BODY_TRASH" -msgstr "Trash" +msgstr "Koš" msgid "IDS_EMAIL_BODY_WITHOUT_ATTACHMENTS" msgstr "Bez příloh" @@ -1579,9 +1576,6 @@ msgstr "Předmět" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Chyba vyhledávání" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Přečteno" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Poklepáním přejdete na začátek seznamů kontaktů, seznamů e-mailů a e-mailových zpráv" @@ -1951,3 +1945,126 @@ msgstr "Nebyl vybrán žádný e-mail" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nový e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Zpráva uložena" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Každé 2 minuty" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Funkčnost SMIME je blokována zásadami IT" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Nedostatek paměti. Odstraňte některé položky" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Správa aplikací" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Příchozí nastavení" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Nastavení odchozí pošty" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Vyzv. tón upozornění" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Dokončit" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Předmět (od A do Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Předmět (od Z do A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Oblíbené" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nové e-maily" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nových e-mailů na %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nový e-mail na %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Přečtené" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Nepřečtené" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Bez příznaku" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "S příznakem" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Označit jako oblíb." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Heslo serveru bylo změněno. Zadejte změněné heslo" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Zruš. ozn. jako obl." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Bylo dosaženo maximálního počtu e-mailových účtů" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Řádek náhledu zprávy" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 řádek" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 řádky" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 řádky" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Záhlaví seznamu" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Pro vaši informaci" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Zavolám později." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Děkujeme za váš e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Kontaktujte mě prostřednictvím mého mobilního telefonu." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Odešlu vám odpověď později." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Jsem mimo kancelář. Odpovím na váš e-mail co nejdříve po svém návratu." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Jak se máte?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Podívejte se na připojený soubor." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Sejděme se na obědě." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Připomeňte mi to později." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Složku se nepodařilo vytvořit. Byla překročena maximální délka názvu složky" + diff --git a/po/da.po b/po/da.po index 75a4bdf..2c7688e 100755 --- a/po/da.po +++ b/po/da.po @@ -236,7 +236,7 @@ msgid "IDS_EMAIL_OPT_RECIPIENT_HZ_TO_A" msgstr "Modtager (Z til A)" msgid "IDS_EMAIL_BODY_FLICK_UP_TO_SEARCH_ON_SERVER" -msgstr "Vip op for at søge på server" +msgstr "Svirp opad for at søge på server" msgid "IDS_EMAIL_BODY_RECENT_EMAILS" msgstr "Nyeste e-mails" @@ -577,9 +577,6 @@ msgstr "Oprindelig meddelelse" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Andre" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Ulæst" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Meget stor" @@ -1274,7 +1271,7 @@ msgid "IDS_EMAIL_OPT_DELETE_FROM_CALENDAR" msgstr "Slet fra kalender" msgid "IDS_EMAIL_BODY_FLICK_UP_TO_SEARCH_ON_SERVER_AGAIN" -msgstr "Vip op for at søge på server igen" +msgstr "Svirp opad for at søge på server igen" msgid "IDS_EMAIL_BODY_HIGH_M_PRIORITY" msgstr "Høj" @@ -1325,25 +1322,25 @@ msgid "IDS_EMAIL_OPT_NFC" msgstr "NFC" msgid "IDS_EMAIL_BODY_SUNDAY" -msgstr "Søndag" +msgstr "søndag" msgid "IDS_EMAIL_BODY_MONDAY" -msgstr "Mandag" +msgstr "mandag" msgid "IDS_EMAIL_BODY_TUESDAY" -msgstr "Tirsdag" +msgstr "tirsdag" msgid "IDS_EMAIL_BODY_WEDNESDAY" -msgstr "Onsdag" +msgstr "onsdag" msgid "IDS_EMAIL_BODY_THURSDAY" -msgstr "Torsdag" +msgstr "torsdag" msgid "IDS_EMAIL_BODY_FRIDAY" -msgstr "Fredag" +msgstr "fredag" msgid "IDS_EMAIL_BODY_SATURDAY" -msgstr "Lørdag" +msgstr "lørdag" msgid "IDS_EMAIL_BODY_OTHER" msgstr "Anden" @@ -1370,7 +1367,7 @@ msgid "IDS_EMAIL_BODY_UNREAD" msgstr "Ulæst" msgid "IDS_EMAIL_BODY_CLEAR" -msgstr "Slet" +msgstr "Ryd" msgid "IDS_EMAIL_BODY_OLDER_M_HISTORY" msgstr "Ældre" @@ -1579,9 +1576,6 @@ msgstr "Emne" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Kan ikke søge" -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-mailmeddelelser" @@ -1904,7 +1898,7 @@ msgid "IDS_EMAIL_POP_SCHEDULED_EMAIL_CANCELLED" msgstr "Planlagt e-mail annulleret" msgid "IDS_EMAIL_BODY_FLICK_SCREEN_TO_SHOW_MORE" -msgstr "Vip skærmen for at få vist mere" +msgstr "Svirp på skærmen for at få vist mere" msgid "IDS_EMAIL_BUTTON_MOVE_TO_RECYCLE_BIN" msgstr "Flyt til Papirkurv" @@ -1916,7 +1910,7 @@ msgid "IDS_EMAIL_POP_FAILED_TO_UNBLOCK_THIS_ADDRESS" msgstr "Kunne ikke fjerne blokering af denne adresse" msgid "IDS_EMAIL_POP_FAILED_TO_SET_AS_PRIORITY_SENDER" -msgstr "Indstilling angive som prioritetsafsender" +msgstr "Kunne ikke angive som prioritetsafsender" msgid "IDS_EMAIL_POP_FAILED_TO_REMOVE_FROM_PRIORITY_SENDERS" msgstr "Kunne ikke fjerne fra prioritetsafsendere" @@ -1934,7 +1928,7 @@ msgid "IDS_EMAIL_HEADER_TEXT_TEMPLATES" msgstr "Tekstskabeloner" msgid "IDS_EMAIL_POP_EVENT_HAS_BEEN_ADDED_TO_S_PLANNER" -msgstr "Begivenhed er blevet tilføjet til S-planlægger" +msgstr "Begivenhed er blevet føjet til S-planlægger" msgid "IDS_EMAIL_BODY_REMOVE_EVENT_FROM_S_PLANNER" msgstr "Fjern begivenhed fra S-planlægger" @@ -1943,7 +1937,7 @@ msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_S_PLANNER" msgstr "Begivenhed fjernet fra S-planlægger" msgid "IDS_EMAIL_POP_EVENT_ADDED_TO_S_PLANNER" -msgstr "Begivenhed tilføjet til S-planlægger" +msgstr "Begivenhed føjet til S-planlægger" msgid "IDS_EMAIL_POP_NO_EMAIL_SELECTED" msgstr "Ingen e-mail valgt" @@ -1951,3 +1945,126 @@ msgstr "Ingen e-mail valgt" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Ny e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Meddelelsen er gemt" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Hvert 2. minut" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME-funktionalitet blokeret af it-politik" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Der er ikke tilstrækkelig hukommelse. Slet nogle elementer" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Administrér programmer" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Indstillinger for indgående" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Udgående indstillinger" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Advarselsringetone" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Udført" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Emne (A til Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Emne (Z til A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoritter" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nye e-mails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nye e-mails i %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 ny e-mail i %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Læst" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Ulæst" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Ikke mark. med flag" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Markeret med flag" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Mark. som favoritter" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Serveradgangskode er blevet ændret. Indtast den ændrede adgangskode" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Fjern mark. som for." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Det maksimale antal e-mailkonti er nået" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Forhåndsvisning af meddelelseslinje" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 linje" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 linjer" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 linjer" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Titellinje på liste" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Til din orientering" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Jeg ringer tilbage til dig senere." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Tak for din e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Kontakt mig på min mobiltelefon." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Jeg svarer senere." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Jeg er ikke på kontoret. Jeg svarer på din e-mail så hurtigt som muligt, når jeg er tilbage." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Hvordan går det?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Kontrollér venligst den vedhæftede fil." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Lad os mødes til frokost." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Mind mig om venligst om dette senere." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Kunne ikke oprette mappen. Maksimal længde på mappenavn overskredet" + diff --git a/po/de_DE.po b/po/de_DE.po index 6982cc0..eeb6715 100755 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -577,9 +577,6 @@ msgstr "Ursprüngliche Nachricht" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Sonstiges" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Ungelesen" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Sehr groß" @@ -1579,9 +1576,6 @@ msgstr "Betreff" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Suche nicht möglich" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Gelesen" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Tippen Sie zweimal, um zum Anfang der Kontakt-, E-Mail-Liste und der E-Mails zu gelangen." @@ -1951,3 +1945,126 @@ msgstr "Keine E-Mail ausgewählt" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Neue E-Mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Nachricht gespeichert" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Alle 2 Minuten" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME-Funktion von IT-Richtlinie blockiert" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Nicht genügend Speicher. Löschen Sie einige Elemente" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Anwendungen verwalten" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Anmeldeinformationen" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Ausgangsserver" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Alarmton" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Abschließen" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Betreff (A bis Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Betreff (Z bis A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoriten" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Neue E-Mails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d neue E-Mails in %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 neue E-Mail in %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Gelesen" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Ungelesen" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Nicht markiert" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Markiert" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Als Favorit mark." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Das Serverpasswort wurde geändert. Geben Sie das geänderte Passwort ein." + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Favoriten aufheben" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maximale Anzahl an E-Mail-Konten erreicht." + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Nachrichten-Vorschauzeile" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 Zeile" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 Zeilen" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 Zeilen" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Titelzeile in Liste" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Als Information" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Ich rufe Dich später an." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Vielen Dank für Ihre E-Mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Bitte kontaktieren Sie mich über mein Mobiltelefon." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Ich sende später eine Antwort." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Ich bin zur Zeit nicht erreichbar. Ich werde Ihre E-Mail nach meiner Rückkehr schnellstmöglich beantworten." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Wie geht's?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Bitte überprüfen Sie die angehängte Datei." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Lass uns zum Mittagessen treffen." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Bitte erinnern Sie mich später daran." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Erstellen des neuen Ordners nicht möglich. Maximale Länge des Ordnernamens ist überschritten." + diff --git a/po/el_GR.po b/po/el_GR.po index 8640b12..54c012a 100755 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -577,9 +577,6 @@ msgstr "Αρχικό μήνυμα" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Άλλα" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Μη αναγνωσμένο" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Τεράστιο" @@ -1579,9 +1576,6 @@ msgstr "Θέμα" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Δεν είναι δυνατή η αναζήτηση" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Ανάγνωση" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Μεταβείτε στην κορυφή της λίστας επαφών, της λίστας email και των μηνυμάτων email με διπλό πάτημα" @@ -1951,3 +1945,126 @@ msgstr "Δεν επιλέχθηκε email" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "Το μέγεθος του συνημμένου υπερβαίνει το μέγιστο επιτρεπόμενο μέγεθος της Πολιτικής του Exchange" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "Νέο email" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Το μήνυμα αποθηκεύτηκε" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Κάθε 2 λεπτά" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Η λειτουργία SMIME αποκλείστηκε από την πολιτική IT" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Δεν υπάρχει αρκετή μνήμη. Διαγράψτε ορισμένα στοιχεία" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Διαχείριση εφαρμογών" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Ρυθμίσεις εισερχομ." + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Ρυθμίσεις εξερχομένων" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Ήχος ειδοποίησης" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Ολοκληρώθηκε" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Θέμα (Α προς Ω)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Θέμα (Ω προς Α)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Αγαπημένα" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Νέα email" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d νέα email στο %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 νέο email στο %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Ανάγνωση" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Μη αναγνωσμένο" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Καταρ. η επισήμανση" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Επισημάνθηκε" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Σήμανση ως αγαπημ." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Ο κωδικός πρόσβασης διακομιστή έχει αλλάξει. Καταχωρίστε το νέο κωδικό πρόσβασης" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Κατάρ. ως αγαπημένων" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Συμπληρώθηκε ο μέγιστος αριθμός λογαριασμών email" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Γραμμή προεπισκόπησης μηνύματος" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 γραμμή" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 γραμμές" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 γραμμές" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Γραμμή τίτλου σε λίστα" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Θα ήθελα να σας ενημερώσω" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Θα σας καλέσω αργότερα." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Ευχαριστούμε για το email σας." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Επικοινωνήστε μαζί μου στον αριθμό του κινητού τηλεφώνου μου." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Θα απαντήσω αργότερα." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Είμαι εκτός γραφείου. Θα απαντήσω στο email σας το συντομότερο δυνατό μόλις επιστρέψω." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Τι κάνεις;" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Ελέγξτε το συνημμένο αρχείο." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Ας συναντηθούμε για φαγητό." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Στείλτε μου μια υπενθύμιση αργότερα." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Δεν είναι δυνατή η δημιουργία του φακέλου. Έγινε υπέρβαση του μέγιστου μήκους για ονόματα φακέλων" + diff --git a/po/en.po b/po/en.po index 279349a..b2ed217 100755 --- a/po/en.po +++ b/po/en.po @@ -577,9 +577,6 @@ msgstr "Original message" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Others" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Unread" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Huge" @@ -1579,9 +1576,6 @@ msgstr "Subject" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Unable to search" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Read" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Double tap to go to the top of contacts lists, email lists and email messages" @@ -1951,3 +1945,126 @@ msgstr "No email selected" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "New email" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Message saved" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Every 2 minutes" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME functionality blocked by IT policy" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Not enough memory. Delete some items" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Manage applications" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Incoming settings" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Outgoing settings" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Alert ringtone" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Complete" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Subject (A to Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Subject (Z to A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favourites" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "New emails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d new emails in %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 new email in %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Read" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Unread" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Unflagged" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Flagged" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Mark as favourites" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "The server password has been changed. Enter the changed password" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Unmark as favourites" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maximum number of email accounts reached" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Message preview line" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 line" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 lines" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 lines" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Title line in list" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "For your information" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "I'll call you later." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Thank you for your email." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Please contact me via my mobile phone." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "I'll send a reply later." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "I am out of the office. I will respond to your email as soon as possible on my return." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "How are you?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Please check the attached file." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Let's meet for lunch." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Please remind me later." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Unable to create the folder. Maximum folder name length exceeded" + diff --git a/po/en_PH.po b/po/en_PH.po index 042c593..8cefc67 100755 --- a/po/en_PH.po +++ b/po/en_PH.po @@ -577,9 +577,6 @@ msgstr "Original message" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Others" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Unread" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Huge" @@ -1579,9 +1576,6 @@ msgstr "Subject" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Unable to search" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Read" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Double tap to go to the top of contacts lists, Email lists and email messages" @@ -1951,3 +1945,126 @@ msgstr "No Email selected" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "New Email" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Message saved" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Every 2 minutes" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME functionality blocked by IT policy" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Not enough memory. Delete some items" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Manage applications" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Incoming settings" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Outgoing settings" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Alert ringtone" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Complete" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Subject (A to Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Subject (Z to A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favorites" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "New Emails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d new Emails in %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 new Email in %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Read" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Unread" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Unflagged" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Flagged" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Mark as favorites" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "The server password has been changed. Enter the changed password" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Unmark as favorites" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maximum number of Email accounts reached" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Message preview line" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 line" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 lines" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 lines" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Title line in list" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "For your information" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "I'll call you later." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Thank you for your Email." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Please contact me via my mobile phone." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "I'll send a reply later." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "I am out of the office. I will respond to your Email as soon as possible on my return." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "How are you?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Please check the attached file." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Let's meet for lunch." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Please remind me later." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Unable to create the folder. Maximum folder name length exceeded" + diff --git a/po/en_US.po b/po/en_US.po index 58e721f..3d037d0 100755 --- a/po/en_US.po +++ b/po/en_US.po @@ -577,9 +577,6 @@ msgstr "Original message" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Others" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Unread" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Huge" @@ -1579,9 +1576,6 @@ msgstr "Subject" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Unable to search" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Read" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Double tap to go to the top of contacts lists, email lists and email messages" @@ -1951,3 +1945,126 @@ msgstr "No email selected" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "New email" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Message saved" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Every 2 minutes" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME functionality blocked by IT policy" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Not enough memory. Delete some items" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Manage applications" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Incoming settings" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Outgoing settings" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Alert ringtone" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Complete" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Subject (A to Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Subject (Z to A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favorites" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "New emails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d new emails in %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 new email in %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Read" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Unread" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Unflagged" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Flagged" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Mark as favorite" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "The server password has been changed. Enter the changed password." + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Unmark as favorites" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maximum number of email accounts reached" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Message preview line" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 line" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 lines" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 lines" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Title line in list" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "For your information" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "I'll call you later." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Thank you for your email." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Please contact me via my mobile phone." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "I'll send a reply later." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "I am out of the office. I will respond to your email as soon as possible on my return." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "How are you?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Please check the attached file." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Let's meet for lunch." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Please remind me later." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Unable to create the folder. Maximum folder name length exceeded." + diff --git a/po/es_ES.po b/po/es_ES.po index 030e4ce..505cbab 100755 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -577,9 +577,6 @@ msgstr "Mensaje original" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Otros" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "No leídos" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Enorme" @@ -1579,9 +1576,6 @@ msgstr "Asunto" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "No se puede buscar" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Leído" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Toque dos veces para ir al principio de la lista de contactos, la lista de correos electrónicos y los mensajes de correo electrónico" @@ -1874,13 +1868,13 @@ msgid "IDS_EMAIL_POP_EMAIL_HAS_BEEN_SAVED_AS_PSEML_IN_PS" msgstr "Se ha guardado el correo electrónico como %s.eml en %s" msgid "IDS_EMAIL_OPT_LARGE_HPDP_M_SIZE" -msgstr "Grande (%d %)" +msgstr "Grande (%d%)" msgid "IDS_EMAIL_OPT_MEDIUM_HPDP_M_SIZE" -msgstr "Medio (%d %)" +msgstr "Medio (%d%)" msgid "IDS_EMAIL_OPT_SMALL_HPDP_M_SIZE" -msgstr "Pequeño (%d %)" +msgstr "Pequeño (%d%)" msgid "IDS_EMAIL_OPT_UNBLOCK_ADDRESS" msgstr "Desbloquear dirección" @@ -1895,7 +1889,7 @@ msgid "IDS_EMAIL_OPT_HIDE_TEXT_TOOLS" msgstr "Ocultar herramientas de texto" msgid "IDS_EMAIL_HEADER_SEND_AS_SCHEDULED_MESSAGE" -msgstr "Enviar mensaje programado" +msgstr "Enviar como mensaje programado" msgid "IDS_EMAIL_POP_THE_TIME_SCHEDULED_FOR_SENDING_HAS_PASSED_SEND_ANYWAY_Q" msgstr "Ha pasado el tiempo programado para el envío. ¿Enviar de todos modos?" @@ -1951,3 +1945,126 @@ msgstr "No se ha seleccionado ningún email" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Correo electrónico nuevo" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Mensaje guardado" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Cada 2 minutos" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Función SMIME bloqueada por directiva de TI" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "No hay memoria suficiente. Elimine algunos elementos" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Administrar aplicaciones" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Ajustes entrantes" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Ajustes salientes" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Melodía de alerta" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Completo" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Asunto (A a Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Asunto (Z a A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoritos" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Correos electrónicos nuevos" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d correos electrónicos nuevos en %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nuevo correo electrónico en %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Leídos" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "No leídos" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Sin marcar" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Marcado" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marcar como fav" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Se ha cambiado la contraseña del servidor. Introduzca la contraseña cambiada" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Quitar de favoritos" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Número máximo de cuentas de correo electrónico alcanzado" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Línea de vista previa de mensaje" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 línea" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 líneas" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 líneas" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Título de la lista" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Para su información" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Te llamo más tarde" + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Gracias por su correo electrónico" + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Ponte en contacto conmigo por teléfono móvil" + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Te respondo más tarde" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Estoy fuera de la oficina. Responderé a tu correo electrónico lo antes posible en cuanto regrese" + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "¿Cómo estás?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Revisa el archivo adjunto" + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Quedemos para comer" + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Recuérdamelo más tarde" + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "No se puede crear la carpeta. Se ha excedido la longitud máxima de nombre de carpeta" + diff --git a/po/es_MX.po b/po/es_MX.po index dd71c19..669891d 100755 --- a/po/es_MX.po +++ b/po/es_MX.po @@ -577,9 +577,6 @@ msgstr "Mensaje original" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Otros" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "No leídos" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Enorme" @@ -1579,9 +1576,6 @@ msgstr "Asunto" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "No se puede buscar" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Leídos" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Presione dos veces para ir al inicio de las listas de contactos, listas de correo y mensajes de correo" @@ -1910,7 +1904,7 @@ msgid "IDS_EMAIL_BUTTON_MOVE_TO_RECYCLE_BIN" msgstr "Mover a la Papelera" msgid "IDS_EMAIL_BUTTON_DELETE_PERMANENTLY" -msgstr "Eliminar definitiv." +msgstr "Eliminar permanente." msgid "IDS_EMAIL_POP_FAILED_TO_UNBLOCK_THIS_ADDRESS" msgstr "No se pudo desbloquear esta dirección" @@ -1925,7 +1919,7 @@ msgid "IDS_EMAIL_OPT_READ_REPORT" msgstr "Informe de lectura" msgid "IDS_EMAIL_POP_PS_HAS_BEEN_BLOCKED_AND_THE_EMAIL_HAS_BEEN_MOVED_TO_SPAMBOX" -msgstr "Se bloqueó %s y el correo se movió a la Bandeja de correos no deseados" +msgstr "Se bloqueó %s y el correo se movió a la Bandeja de spam" msgid "IDS_EMAIL_BUTTON_SELECT_RESPONSE" msgstr "Selecc. respuesta" @@ -1951,3 +1945,126 @@ msgstr "No se ha seleccionado ningún correo" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nuevo correo" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Mensaje guardado" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Cada 2 minutos" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Función SMIME bloqueada por directiva de TI" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Memoria insuficiente. Elimine algunos elementos" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Administrar aplicaciones" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Configuración entrante" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Configuración saliente" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Tono timbre alerta" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Completar" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Asunto (A a Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Asunto (Z a A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoritos" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nuevos correos" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nuevos correos en %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nuevo correo en %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Leído" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "No leído" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Desmarcado" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Marcado" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marcar como favorit." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Se cambió la contraseña del servidor. Ingrese la nueva contraseña" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Desmarcar como fav." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Número máximo de cuentas de correo alcanzado" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Línea de vista previa de mensaje" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 línea" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 líneas" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 líneas" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Línea de título en lista" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Para su información" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Te llamaré más tarde." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Gracias por su correo." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Contáctenme por teléfono móvil." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Responderé más tarde." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Estoy fuera de la oficina. Responderé su correo cuando regrese." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "¿Cómo estás?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Revise el archivo adjunto." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Juntémonos a almorzar." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Recordarme más tarde." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "No se puede crear la carpeta. Se excedió la longitud máxima del nombre de la carpeta" + diff --git a/po/et.po b/po/et.po index a2b8200..a79fcbf 100755 --- a/po/et.po +++ b/po/et.po @@ -577,9 +577,6 @@ msgstr "Algne sõnum" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Muud" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Lugemata" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Ülisuur" @@ -1579,9 +1576,6 @@ msgstr "Teema" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Ei saa otsida" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Loe" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Toksake kaks korda, et liikuda kontaktide loendi, e-kirjade loendi ja e-kirjade ülaossa" @@ -1951,3 +1945,126 @@ msgstr "Ühtegi e-kirja pole valitud" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Uus e-kiri" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Sõnum on salvestatud" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Iga 2 minuti järel" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "IT-poliitika on blokeerinud SMIME-funktsionaalsuse" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Mälu pole piisavalt. Kustutage mõned üksused" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Halda rakendusi" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Saabuvate seaded" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Väljuvad seaded" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Märguande helin" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Lõpeta" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Teema (A kuni Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Teema (Z kuni A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Lemmikud" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Uued e-kirjad" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d uut e-kirja kontol %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 uus e-kiri kontol %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Loetud" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Lugemata" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Sildistamata" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Sildistatud" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Märgi lemmikuteks" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Serveri parooli on vahetatud. Sisestage muudetud parool" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Tüh. lemmikute märg." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maksimaalne arv e-posti kontosid on saavutatud" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Sõnumi eelvaaterida" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 rida" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 rida" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 rida" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Pealkirja rida loendis" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Teadmiseks" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Helistan sulle hiljem." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Täname teid e-kirja eest." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Võta minuga ühendust mobiiltelefoni kaudu." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Saadan vastuse hiljem." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Olen kontorist väljas. Vastan e-kirjale esimesel võimalusel, kui naasen." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Kuidas läheb?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Kontrollige manuses olevat faili." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Lähme lõunale." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Tuleta mulle hiljem meelde." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Kausta ei saa luua. Kausta nime maksimaalne pikkus on ületatud" + diff --git a/po/eu.po b/po/eu.po index 43d2c21..a7224fc 100755 --- a/po/eu.po +++ b/po/eu.po @@ -577,9 +577,6 @@ msgstr "Jatorrizko mezua" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Besteak" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Irakurri gabea" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Erraldoia" @@ -1579,9 +1576,6 @@ msgstr "Gaia" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Ezin da bilatu" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Irakurrita" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Ukitu bi aldiz kontaktu zerrendaren, mezu elektronikoen zerrendaren eta mezu elektronikoen goiko aldera joateko" @@ -1901,7 +1895,7 @@ msgid "IDS_EMAIL_POP_THE_TIME_SCHEDULED_FOR_SENDING_HAS_PASSED_SEND_ANYWAY_Q" msgstr "Bidaltzeko programatutako ordua igaro da. Bidali edonola ere?" msgid "IDS_EMAIL_POP_SCHEDULED_EMAIL_CANCELLED" -msgstr "Programatutako mezu elektronikoa utzita" +msgstr "Programatutako mezu elektronikoa ezeztatuta" msgid "IDS_EMAIL_BODY_FLICK_SCREEN_TO_SHOW_MORE" msgstr "Astindu pantaila gehiago erakusteko" @@ -1951,3 +1945,126 @@ msgstr "Ez da posta mezurik aukeratu" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Mezu elektroniko berria" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Mezua gorde da" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "2 minuturo" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME funtzioa IT politikak blokeatu du" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Ez dago memoria nahikoa. Elementu batzuk ezabatu" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Kudeatu aplikazioak" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Sarrerako ezarpenak" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Irteera ezarpenak" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Alertaren doinua" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Osatuta" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Gaia (Atik Zra)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Gaia (Ztik Ara)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Gogokoak" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Mezu elektroniko berriak" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d mezu elektroniko berri %s-(e)n" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "Mezu elektroniko berri 1 %s-(e)n" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Irakurri" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Irakurri gabea" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Marka gabea" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Markatuta" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Markatu gogoko gisa" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Zerbitzariaren pasahitza aldatu da. Idatzi aldatutako pasahitza" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Kendu gogokoen marka" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Gehienezko helbide elektroniko kontu kopurura iritsi zara" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Mezuaren aurrebista lerroa" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "Lerro 1" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 lerro" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 lerro" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Zerrenda izenburu lerroa" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Jakin dezazun" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Geroago deituko dizut." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Eskerrik asko zure mezu elektronikoagatik." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Mesedez, jarri harremanetan nirekin nire telefono mugikorraren bidez." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Geroago bidaliko dizut erantzuna." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Bulegotik kanpo nago. Zure mezu elektronikoa ahalik eta lasterren erantzungo dut itzultzen naizenean." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Zer moduz?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Mesedez, egiaztatu erantsitako fitxategia." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Gera gaitezen bazkaltzeko." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Mesedez, gogorazi geroago." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Ezin da karpeta sortu. Karpetaren izenaren gehieneko luzera gainditu da" + diff --git a/po/fi.po b/po/fi.po index a11a43c..d038037 100755 --- a/po/fi.po +++ b/po/fi.po @@ -577,9 +577,6 @@ msgstr "Alkuperäinen viesti" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Muut" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Lukematon" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Suuri" @@ -1579,9 +1576,6 @@ msgstr "Aihe" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Ei voi hakea" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Lue" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Siirry yhteystietoluetteloiden, sähköpostiluetteloiden ja sähköpostiviestien alkuun kaksoisnapauttamalla" @@ -1826,7 +1820,7 @@ msgid "IDS_EMAIL_BODY_MESSAGE_DELETED" msgstr "Viesti poistettu" msgid "IDS_EMAIL_OPT_S_PLANNER" -msgstr "Kalenteri" +msgstr "S Planner" msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER" msgstr "Lisää S Planneriin" @@ -1951,3 +1945,126 @@ msgstr "Yhtään sähköpostiviestiä ei ole valittu" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Uusi sähköposti" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Viesti tallennettu" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "2 minuutin välein" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "IT-käytäntö estää SMIME-toiminnon käytön" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Muisti ei riitä. Poista joitain kohteita" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Hallitse sovelluksia" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Saapuvat asetukset" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Lähtevät asetukset" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Hälytyssoittoääni" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Valmis" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Aihe (A–Ö)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Aihe (Ö–A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Suosikit" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Uudet sähköpostit" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d uutta sähköpostiviestiä %s-tilillä" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 uusi sähköpostiviesti %s-tilillä" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Luettu" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Lukematta" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Merkitsemättä" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Merkitty" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Merkitse suosikeiksi" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Palvelimen salasana on vaihdettu. Anna vaihdettu salasana" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Poista suos. merk." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Sähköpostitilien enimmäismäärä on saavutettu" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Viestin esikatselurivi" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 rivi" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 riviä" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 riviä" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Luettelon otsikkorivi" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Tiedoksi" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Soitan sinulle myöhemmin." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Kiitos sähköpostiviestistäsi." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Ota minuun yhteyttä matkapuhelimitse." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Lähetän vastauksen myöhemmin." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Olen poissa. Vastaan sähköpostiviestiisi mahdollisimman pian palattuani työpaikalle." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Mitä kuuluu?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Tarkista liitetiedosto." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Mennään lounaalle." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Muistuta minua myöhemmin." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Kansiota ei voi luoda. Kansion nimen enimmäispituus on ylitetty" + diff --git a/po/fr_CA.po b/po/fr_CA.po index 96ddbaa..a408c02 100755 --- a/po/fr_CA.po +++ b/po/fr_CA.po @@ -577,9 +577,6 @@ msgstr "Message d'origine" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Autres" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Non lu" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Très grande" @@ -1579,9 +1576,6 @@ msgstr "Objet" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Impossible de rechercher" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Lu" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Touchez deux fois pour revenir en haut des listes de contacts, des listes de courriels et des courriels" @@ -1951,3 +1945,126 @@ msgstr "Aucun courriel sélectionné" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nouveau courriel" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Message enregistré" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Toutes les 2 min" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Fonctionnalité SMIME bloquée par les règles des technologies de l'information" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Mémoire insuffisante. Supprimez certains éléments" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Gérer les applications" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Paramètres des messages entrants" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Paramètres sortants" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Sonnerie d'alerte" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Terminé" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Objet (A à Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Objet (Z à A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoris" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nouveaux courriels" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nouveaux courriels sur %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nouvel courriel sur %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Lu" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Non lu" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Non marqué" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Marqué" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marquer comme fav." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Le mot de passe du serveur a été modifié. Saisissez le nouveau mot de passe" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Suppr. des favoris" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Nombre maximum de messageries atteint" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Ligne d'aperçu du message" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 ligne" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 lignes" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 lignes" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Ligne de titre dans liste" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Pour votre information" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Je te rappelle plus tard." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Merci pour votre courriel." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Contacte-moi sur mon téléphone mobile." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Je répondrai plus tard." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Je suis absent. Je répondrai à votre courriel dès mon retour." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Comment ça va?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Consultez le fichier en pièce jointe." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Déjeunons ensemble." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Me le rappeler plus tard." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Impossible de créer le dossier. La longueur maximale de nom de dossier est dépassée" + diff --git a/po/fr_FR.po b/po/fr_FR.po index 4b4c01b..e84a9ce 100755 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -577,9 +577,6 @@ msgstr "Message d'origine" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Autres" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Non lu" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Très grande" @@ -881,7 +878,7 @@ msgid "IDS_EMAIL_OPT_INSERT_IMAGE" msgstr "Insérer une image" msgid "IDS_EMAIL_OPT_CLIPBOARD" -msgstr "Presse-papiers" +msgstr "Presse-papier" msgid "IDS_EMAIL_OPT_VIEW_CONTACT_DETAILS" msgstr "Afficher détails du contact" @@ -1579,9 +1576,6 @@ msgstr "Objet" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Impossible de rechercher" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Lu" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Appuyez deux fois pour revenir en haut des listes de contacts, des listes d'e-mails et des e-mails" @@ -1951,3 +1945,126 @@ msgstr "Aucun e-mail sélectionné" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nouvel e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Message enregistré" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Toutes les 2 min" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Fonctionnalité SMIME bloquée par les règles des technologies de l'information" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Mémoire insuffisante. Supprimez certains éléments" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Gérer les applications" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Paramètres entrants" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Paramètres sortants" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Sonnerie d'alerte" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Terminé" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Objet (A à Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Objet (Z à A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoris" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nouveaux e-mails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nouveaux e-mails sur %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nouvel e-mail sur %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Lu" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Non lu" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Non marqué" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Marqué" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marquer comme fav." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Le mot de passe du serveur a été modifié. Saisissez le nouveau mot de passe" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Suppr. des favoris" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Nombre maximum de messageries atteint" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Ligne d'aperçu du message" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 ligne" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 lignes" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 lignes" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Ligne de titre dans liste" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Pour votre information" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Je vous rappelle plus tard." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Merci pour votre e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Contactez-moi sur mon téléphone mobile." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Je répondrai plus tard." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Je suis absent. Je répondrai à votre e-mail dès que possible à mon retour." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Comment allez-vous ?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Consultez le fichier en pièce jointe." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Déjeunons ensemble." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Rappelez-le moi plus tard." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Impossible de créer le dossier. La longueur maximale de nom de dossier est dépassée" + diff --git a/po/ga.po b/po/ga.po index 79576f4..e02f4f3 100755 --- a/po/ga.po +++ b/po/ga.po @@ -577,9 +577,6 @@ msgstr "Teachtaireacht bhunaidh" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Cinn Eile" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Neamhléite" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Ollmhór" @@ -1579,9 +1576,6 @@ msgstr "Ábhar" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Ní féidir cuardach" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Léite" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Déthapáil le dhul chuig barr an liosta teagmhálaithe, liostaí r-phoist, agus teachtaireachtaí r-phoist" @@ -1883,10 +1877,10 @@ msgid "IDS_EMAIL_OPT_SMALL_HPDP_M_SIZE" msgstr "Beag (%d%)" msgid "IDS_EMAIL_OPT_UNBLOCK_ADDRESS" -msgstr "Bain an bac den seoladh" +msgstr "Bain an bac ón seoladh" msgid "IDS_EMAIL_POP_PS_HAS_BEEN_UNBLOCKED_AND_THE_EMAIL_HAS_BEEN_MOVED_TO_INBOX" -msgstr "Baineadh an bac de %s agus bogadh an ríomhphost go dtí an Bosca Isteach" +msgstr "Baineadh an bac ó %s agus bogadh an r-phost chuig an mBosca Isteach" msgid "IDS_EMAIL_OPT_SHOW_TEXT_TOOLS" msgstr "Taispeáin uirlisí téacs" @@ -1898,22 +1892,22 @@ msgid "IDS_EMAIL_HEADER_SEND_AS_SCHEDULED_MESSAGE" msgstr "Seol mar theachtaireacht sceidealta" msgid "IDS_EMAIL_POP_THE_TIME_SCHEDULED_FOR_SENDING_HAS_PASSED_SEND_ANYWAY_Q" -msgstr "Tá an t-am a bhí sceidealta lena sheoladh istigh. Seol ar aon nós?" +msgstr "Tá an t-am sceidealta lena sheoladh istigh. Seol ar aon nós?" msgid "IDS_EMAIL_POP_SCHEDULED_EMAIL_CANCELLED" msgstr "R-phost sceidealaithe curtha ar ceal" msgid "IDS_EMAIL_BODY_FLICK_SCREEN_TO_SHOW_MORE" -msgstr "Tabhair smeach don scáileán chun tuilleadh a thaispeáint" +msgstr "Smeach an scáileán le tuilleadh a thaispeáint" msgid "IDS_EMAIL_BUTTON_MOVE_TO_RECYCLE_BIN" -msgstr "Bog chuig Bsc athchúrs." +msgstr "Bog go Bsc athchúrs." msgid "IDS_EMAIL_BUTTON_DELETE_PERMANENTLY" msgstr "Scrios go buan" msgid "IDS_EMAIL_POP_FAILED_TO_UNBLOCK_THIS_ADDRESS" -msgstr "Theip ar an mbac a bhaint den seoladh seo" +msgstr "Theip ar an mbac a bhaint ón seoladh seo" msgid "IDS_EMAIL_POP_FAILED_TO_SET_AS_PRIORITY_SENDER" msgstr "Theip ar shocrú mar sheoltóir tosaíochta" @@ -1925,16 +1919,16 @@ msgid "IDS_EMAIL_OPT_READ_REPORT" msgstr "Admháil léite" msgid "IDS_EMAIL_POP_PS_HAS_BEEN_BLOCKED_AND_THE_EMAIL_HAS_BEEN_MOVED_TO_SPAMBOX" -msgstr "Cuireadh bac ar %s agus bogadh an ríomhphost go dtí an Bosca Turscair" +msgstr "Cuireadh bac ar %s agus bogadh an r-phost chuig an mBosca Turscair" msgid "IDS_EMAIL_BUTTON_SELECT_RESPONSE" -msgstr "Roghnaigh freagra" +msgstr "Roghnaigh freagairt" msgid "IDS_EMAIL_HEADER_TEXT_TEMPLATES" msgstr "Teimpléid téacs" msgid "IDS_EMAIL_POP_EVENT_HAS_BEEN_ADDED_TO_S_PLANNER" -msgstr "Cuireadh imeacht le S Planner" +msgstr "Cuireadh an t-imeacht le S Planner" msgid "IDS_EMAIL_BODY_REMOVE_EVENT_FROM_S_PLANNER" msgstr "Bain an t-imeacht ó S Planner" @@ -1943,7 +1937,7 @@ msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_S_PLANNER" msgstr "Imeacht bainte ó S Planner" msgid "IDS_EMAIL_POP_EVENT_ADDED_TO_S_PLANNER" -msgstr "Cuireadh imeacht le S Planner" +msgstr "Cuireadh an t-imeacht le S Planner" msgid "IDS_EMAIL_POP_NO_EMAIL_SELECTED" msgstr "Níl r-phost roghnaithe" @@ -1951,3 +1945,126 @@ msgstr "Níl r-phost roghnaithe" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "R-phost nua" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Teachtaireacht sábháilte" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Gach 2 nóiméad" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Chuir beartas TF bac ar fheidhmiúlacht SMIME" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Easpa cuimhne. Scrios roinnt míreanna" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Bainistigh feidhmchláir" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Socruithe isteach" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Socruithe amach" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Clingthon foláirimh" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Déanta" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Ábhar (A go Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Ábhar (Z go A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Ceanáin" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "R-phoist nua" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d r-phost nua i %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 r-phost nua i %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Léite" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Neamhléite" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Gan bhratach" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Bratach leis" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marcáil mar cheanáin" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Athraíodh pasfhocal an fhreastalaí. Iontráil an pasfhocal athraithe" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Bain mar cheanáin" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Uaslíon na gcuntas r-phost bainte amach" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Líne réamhamhairc teachtaireachta" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 líne" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 líne" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 líne" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Líne teidil sa liosta" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Mar eolas" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Glaofaidh mé ort níos déanaí." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Go raibh maith agat as do r-phost." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Déan teagmháil liom ar m'fhón póca." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Seolfaidh mé freagra ar ball." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Níl mé san oifig faoi láthair. Freagróidh mé do r-phost a luaithe is féidir nuair a fhillfidh mé." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Conas atá tú?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Seiceáil an comhad ceangailte." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Buailimis le chéile fá choinne lóin." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Meabhraigh dom ar ball." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Ní féidir an fillteán a chruthú. Sáraíodh uasfhad ainm an fhillteáin" + diff --git a/po/gl.po b/po/gl.po index f688861..d7a2afe 100755 --- a/po/gl.po +++ b/po/gl.po @@ -577,9 +577,6 @@ msgstr "Mensaxe orixinal" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Outros" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Non lidas" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Enorme" @@ -1579,9 +1576,6 @@ msgstr "Asunto" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Non se pode buscar" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Ler" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Toca dúas veces para ir á parte superior das listas de contactos, das listas de correos electrónicos e das mensaxes de correo electrónico" @@ -1907,7 +1901,7 @@ msgid "IDS_EMAIL_BODY_FLICK_SCREEN_TO_SHOW_MORE" msgstr "Xira a pantalla para amosar máis" msgid "IDS_EMAIL_BUTTON_MOVE_TO_RECYCLE_BIN" -msgstr "Móvete á papeleira" +msgstr "Mover á papeleira" msgid "IDS_EMAIL_BUTTON_DELETE_PERMANENTLY" msgstr "Eliminar permanent." @@ -1925,7 +1919,7 @@ msgid "IDS_EMAIL_OPT_READ_REPORT" msgstr "Informe de lectura" msgid "IDS_EMAIL_POP_PS_HAS_BEEN_BLOCKED_AND_THE_EMAIL_HAS_BEEN_MOVED_TO_SPAMBOX" -msgstr "%s bloqueouse e o correo electrónico moveuse a Spambox" +msgstr "%s bloqueouse e o correo electrónico moveuse á caixa de Spam" msgid "IDS_EMAIL_BUTTON_SELECT_RESPONSE" msgstr "Selec. resposta" @@ -1951,3 +1945,126 @@ msgstr "Non hai correos electrónicos seleccionados" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Correo electrónico novo" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Mensaxe gardada" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Cada 2 minutos" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Funcionalidade SMIME bloqueada por política informática" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Non hai suficiente memoria. Elimine algúns elementos" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Xestionar aplicacións" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Axustes de entrada" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Axustes de saída" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Melodía alerta" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Completas" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Asunto (de A a Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Asunto (de Z a A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoritos" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Correos electrónicos novos" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d correos electrónicos novos en %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 novo correo electrónico en %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Lido" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Non lido" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Non etiquetado" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Etiquetado" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marc. como favoritos" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Cambiouse o contrasinal do servidor. Insire o contrasinal cambiado" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Desmarc. como favor." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Alcanzouse o número máximo de correos electrónicos" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Liña de vista previa das mensaxes" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 liña" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 liñas" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 liñas" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Liña de título na lista" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Para a túa información" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Chámote máis tarde" + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Grazas polo teu correo electrónico" + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Ponte en contacto comigo por teléfono móbil" + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Enviareiche unha resposta máis tarde" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Non estou na oficina. Responderei o teu correo electrónico tan pronto como sexa posible cando regrese" + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Como estás?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Consulta o arquivo anexo" + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Quedemos para comer." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Lémbramo máis tarde" + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Non se pode crear a carpeta. Superouse a lonxitude máxima no nome da carpeta" + diff --git a/po/hi.po b/po/hi.po index b1a86be..c3eb05f 100755 --- a/po/hi.po +++ b/po/hi.po @@ -577,9 +577,6 @@ msgstr "मूल सन्देश" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "अन्य" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "अपठित" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "बहुत बड़ा" @@ -1579,9 +1576,6 @@ msgstr "विषय" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "खोजने में अक्षम" -msgid "IDS_EMAIL_OPT_READ" -msgstr "पठित" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "संपर्क सूचियों, ईमेल सूचियों, और ईमेल संदेशों के शीर्ष पर जाने के लिए डबल टैप करें" @@ -1951,3 +1945,126 @@ msgstr "कोई ईमेल चयनित नहीं" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "संलग्नक का अधिकतम आकार इस एक्सचेंज सर्वर नीति द्वारा अनुमत सीमा से पार हो गया है" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "नयी ईमेल" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "सन्देश सुरक्षित हुआ" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "प्रत्येक 2 मिनट" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "IT नीति द्वारा SMIME कार्यक्षमता अवरुद्ध की गई" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "पर्याप्त मेमोरी नहीं। कुछ मदें हटाएँ" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "अनुप्रयोग व्यवस्थापित करें" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "इनकमिंग सेटिंग्स" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "आऊटगोईंग सेटिंग" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "सतर्क रिंगटोन" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "पूर्ण" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "विषय (A से Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "विषय (Z से A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "पसंदीदा" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "नए ईमेल" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%s में %d नए ईमेल" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "%s में 1 नया ईमेल" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "पठित" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "अपठित" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "अनफ़्लैग किया गया" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "फ़्लैग किया गया" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "पसंदीदा के रूप में चिह्नित करें" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "सर्वर पासवर्ड बदल दिया गया है। अपना बदला गया पासवर्ड दर्ज करें" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "पसंदीदा के रूप में अचिह्नित करें" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "ईमेल खातों की अधिकतम संख्‍या पहुँची" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "सन्देश प्रिव्यू लाइन" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 लाइन" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 लाइन" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 लाइन" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "सूची में शीर्षक पंक्ति" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "आपकी जानकारी के लिए" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "मैं आपको बाद में कॉल करता हूँ।" + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "आपके ईमेल के लिए धन्‍यवाद।" + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "मेरे मोबाइल फ़ोन द्वारा मुझसे संपर्क करें।" + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "मैं एक जवाब पत्र भेजूँगा।" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "मैं कार्यालय से बाहर हूँ। मेरे वापस आने पर जितनी जल्‍दी हो सके मैं आपको जवाब दूँगा।" + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "आप कैसे हैं?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "कृपया संलग्न की गई फ़ाइल की जाँच करें।" + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "हम लंच पर मिलेंगे।" + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "कृपया मुझे बाद में याद दिलाएँ।" + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "फ़ोल्डर बनाने में अक्षम। अधिकतम फ़ोल्डर नाम सीमा अधिक हुई" + diff --git a/po/hr.po b/po/hr.po index 4a308db..b427f32 100755 --- a/po/hr.po +++ b/po/hr.po @@ -577,9 +577,6 @@ msgstr "Izvorna poruka" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Ostalo" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Nepročitano" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Jako velika" @@ -1579,9 +1576,6 @@ msgstr "Naslov" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Traženje nemoguće" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Pročitano" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Dvaput dodirnite za odlazak na vrh popisa kontakata, popisa emailova i email poruka" @@ -1951,3 +1945,126 @@ msgstr "Nije odabran email" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Novi email" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Poruka spremljena" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Svake 2 minute" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "IT odredbe blokiraju SMIME funkcionalnost" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Nedovoljno memorije. Obrišite neke datoteke" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Upravljanje aplikacijama" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Dolazne postavke" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Odlazne postavke" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Ton zvona upozorenja" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Dovrši" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Naslov (A do Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Naslov (Z do A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoriti" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nove email poruke" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d novih emailova na %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 novi email u %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Čitaj" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Nepročitano" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Neobilj. zastavicom" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Obilj. zastavicom" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Označi kao favorite" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Lozinka poslužitelja je promijenjena. Unesite promijenjenu lozinku" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Odznači kao favorite" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maks. broj email računa" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Linija pregleda poruke" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 linija" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 linije" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 linije" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Naslov popisa" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Za vaše informiranje" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Nazvat ću poslije." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Hvala vam na emailu." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Kontaktirajte me putem mog mobilnog telefona." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Odgovorit ću kasnije." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Nisam u uredu. Odgovorit ću na email čim se vratim." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Kako si?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Provjerite datoteku u privitku." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Nađimo se na ručku." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Podsjeti me kasnije." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Nemoguće napraviti mapu. Premašena maksimalna duljina naziva mape" + diff --git a/po/hu.po b/po/hu.po index f5d7236..a06e851 100755 --- a/po/hu.po +++ b/po/hu.po @@ -577,9 +577,6 @@ msgstr "Eredeti üzenet" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Egyéb" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Olvasatlan" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Nagyon nagy" @@ -1579,9 +1576,6 @@ msgstr "Tárgy" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Nem sikerült keresni" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Elolvasva" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Dupla érintéssel a névjegyzékek, e-mail listák, illetve e-mail üzenetek tetejére ugorhat" @@ -1826,7 +1820,7 @@ msgid "IDS_EMAIL_BODY_MESSAGE_DELETED" msgstr "Üzenet törölve" msgid "IDS_EMAIL_OPT_S_PLANNER" -msgstr "S tervező" +msgstr "S Tervező" msgid "IDS_EMAIL_OPT_ADD_TO_S_PLANNER" msgstr "Hozzáadás az S tervezőhöz" @@ -1951,3 +1945,126 @@ msgstr "Nincs e-mail kijelölve" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Új e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Üzenet mentve" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "2 percenként" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Az IT-irányelv blokkolja a SMIME funkciót" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Kevés a memória. Töröljön néhány tételt" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Alkalmazások kezelése" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Bejövő beállításai" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Kimenő beállítások" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Jelzőhang" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Kész" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Tárgy (A-tól Z-ig)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Tárgy (Z-től A-ig)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Kedvencek" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Új e-mail" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d új e-mail a(z) %s fiókban" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 új e-mail a(z) %s fiókban" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Elolvasva" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Olvasatlan" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Jelöletlen" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Megjelölt" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Kedvencként megjelöl" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "A szerver jelszavát megváltoztatták. Adja meg a megváltoztatott jelszót" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Kedvencjelölés törl." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Elérte az e-mail fiókok maximális számát" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Üzenet előnézet" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 sor" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 sor" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 sor" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Címsor a listában" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Tájékoztatásul" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Később visszahívom." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Köszönöm az e-mailt." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Kérem, vegye fel velem a kapcsolatot a mobilszámomon." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Később válaszolok." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Házon kívül vagyok. Miután visszajöttem, lehetőségem szerint mihamarabb válaszolok az e-mailjére." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Hogy vagy?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Kérem, tekintse meg a csatolt fájlt." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Ebédeljünk együtt." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Kérem, emlékeztessen később." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Nem lehet létrehozni a mappát. Túllépte a mappanév maximális hosszát" + diff --git a/po/hy.po b/po/hy.po index ba63628..0e87595 100755 --- a/po/hy.po +++ b/po/hy.po @@ -577,9 +577,6 @@ msgstr "Սկզբնական հաղորդագրություն" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Այլ" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Չկարդացած" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Խոշոր" @@ -1579,9 +1576,6 @@ msgstr "Թեմա" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Անհնար է որոնել" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Ընթերցում" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Կրկնակի թակեք՝ կոնտակտների ցանկերի վերնամաս, էլ-նամակների ցանկեր և էլեկտրոնային հաղորդագրություններ գնալու համար" @@ -1898,7 +1892,7 @@ msgid "IDS_EMAIL_HEADER_SEND_AS_SCHEDULED_MESSAGE" msgstr "Ուղարկել որպես պլանավորված հաղորդագրություն" msgid "IDS_EMAIL_POP_THE_TIME_SCHEDULED_FOR_SENDING_HAS_PASSED_SEND_ANYWAY_Q" -msgstr "Ուղարկման համար պլանավորված ժամն անցել է. ուղարկե՞լ այնուամենայնիվ:" +msgstr "Ուղարկման համար պլանավորված ժամն անցել է: Ուղարկե՞լ այնուամենայնիվ:" msgid "IDS_EMAIL_POP_SCHEDULED_EMAIL_CANCELLED" msgstr "Պլանավորված էլ-նամակը չեղյալ է համարվել" @@ -1951,3 +1945,126 @@ msgstr "Ոչ մի էլփոստ չի ընտրվել" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "Կցուրդը գերազանցում է Exchange սերվերի քաղաքականությամբ թույլատրվող առավելագույն չափը" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "Նոր էլ. փոստ" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Հաղորդագրությունը պահպանված է" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Յուրաքանչյուր 2 րոպե" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME գործառականությունն արգելափակվել է՝ ըստ ՏՏ քաղաքականության" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Հիշողությունը չի բավարարում: Ջնջեք որոշ տարրեր" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Կառավարել ծրագրերը" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Մուտքային դրվածքներ" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Ելից դրվածքներ" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Զգուշացման հնչերանգ" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Ավարտել" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Թեմա (Ա-ից Ֆ)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Թեմա (Ֆ-ից Ա)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Սիրվածներ" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Նոր էլ. Փոստի հաղորդագրություններ" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d նոր նամակներ %s-ում" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 նոր էլ-նամակ %s-ում" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Կարդացված" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Չկարդացված" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Չդրոշված" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Դրոշված" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Նշել որպես սիրվածներ" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Սերվերի գաղտնաբառը փոխվել է: Մուտքագրեք փոխված գաղտնաբառը" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Սիրվածների նշ. հանել" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Հասել է էլփոստի հաշիվների առավելագույն քանակին" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Հաղորդագրության նախադիտման տող" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 տող" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 տող" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 տող" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Վերնագրի տողը՝ ցուցակում" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Ի գիտություն" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Ձեզ ավելի ուշ կզանգեմ:" + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Շնորհակալություն Ձեր էլ-նամակի համար:" + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Խնդրում եմ ինձ հետ կապվել իմ շարժական հեռախոսով:" + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Ձեզ պատասխան կուղարկեմ ավելի ուշ:" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Ես աշխատավայրում չեմ: Ես Ձեր էլ-նամակին կպատասխանեմ վերադառնալուց հետո հնարավորինս շուտ:" + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Ինչպե՞ս ես:" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Խնդրում ենք ստուգել կցված ֆայլը:" + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Արի միասին ճաշենք:" + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Խնդրում եմ հիշեցնել ինձ ավելի ուշ:" + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Անհնար է պանակը ստեղծել: Պանակի անվան առավելագույն երկարությունը գերազանցվել է" + diff --git a/po/is.po b/po/is.po index 20bb40c..e6ce8f8 100755 --- a/po/is.po +++ b/po/is.po @@ -577,9 +577,6 @@ msgstr "Upphafleg skilaboð" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Aðrir" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Ólesið" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Risastórt" @@ -1579,9 +1576,6 @@ msgstr "Efni" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Mistókst að leita" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Lesið" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Tvípikkaðu til að fara efst í tengiliðalista, lista yfir tölvupóst og í meginmáli" @@ -1951,3 +1945,126 @@ msgstr "Enginn tölvupóstur valinn" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nýr póstur" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Boð vistuð" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Hverjar tvær mínútur" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Tæknistefna leyfir ekki notkun SMIME" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Ekki er nægt minni. Eyðið nokkrum atriðum" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Vinna með forrit" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Móttökustillingar" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Sendingastillingar" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Hringitónn áminninga" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Ljúka" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Efnisatriði (A t. Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Efnisatriði (Z t. A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Uppáhalds" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nýir póstar" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d ný skeyti í %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nýr tölvupóstur í %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Lesið" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Ólesið" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Ómerkt" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Merkt" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Merkja sem uppáhald" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Lykilorði þjónsins hefur verið breytt. Sláðu inn nýja lykilorðið" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Ekki uppáhald" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Hámarksfjölda pósthólfa hefur verið náð" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Forskoðunarlína skilaboða" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 lína" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 línur" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 línur" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Titillína á lista" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Til fróðleiks" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Ég hringi í þig seinna." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Takk fyrir tölvupóstinn." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Hafðu samband í gegnum farsíma." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Ég sendi svar seinna." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Ég er ekki í vinnunni. Ég svara tölvupóstinum um leið og ég sný aftur." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Hvernig hefurðu það?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Skoðaðu meðfylgjandi skrá." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Hittumst yfir hádegismat." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Minntu mig á seinna." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Ekki tókst að búa til möppuna. Hámarkslengd möppuheitis náð" + diff --git a/po/it_IT.po b/po/it_IT.po index a8fc0d8..6301326 100755 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -577,9 +577,6 @@ msgstr "Messaggio originale" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Altro" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Non letto" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Molto grande" @@ -1579,9 +1576,6 @@ msgstr "Oggetto" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Ricerca impossibile" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Letto" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Toccate due volte per tornare all'inizio degli elenchi contatti, degli elenchi e-mail e dei messaggi e-mail" @@ -1951,3 +1945,126 @@ msgstr "Nessuna e-mail selezionata" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nuova e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Messaggio salvato" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Ogni 2 minuti" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Funzionalità SMIME bloccata dal criterio IT" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Memoria insufficiente. Eliminare alcuni elementi" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Gestisci applicazioni" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Impostazioni Posta in arrivo" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Impostazioni Posta in uscita" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Suoneria avviso" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Completato" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Oggetto (A-Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Oggetto (Z-A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Preferiti" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nuove e-mail" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nuove e-mail su %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nuova e-mail su %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Letta" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Non letta" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Non contrassegnate" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Contrassegnata" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Segna come prefer." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "La password del server è stata modificata. Inserite la password modificata" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Desel. come preferiti" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Raggiunto numero massimo di account email" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Linea anteprima messaggio" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 riga" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 righe" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 righe" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Linea titolo in elenco" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Per presa visione" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Ti richiamo più tardi." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Grazie per la tua e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Contattami sul mio telefono cellulare." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Ti invierò una risposta più tardi." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Non sono in ufficio. Risponderò alla tua e-mail il prima possibile." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Come stai?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Controllare il file allegato." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Incontriamoci a pranzo." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Ricordamelo più tardi." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Impossibile creare la cartella. Lunghezza massima del nome della cartella superata" + diff --git a/po/ja_JP.po b/po/ja_JP.po index 9137143..4bae929 100755 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -395,7 +395,7 @@ msgid "IDS_EMAIL_OPT_COPY_IMAGE" msgstr "画像をコピー" msgid "IDS_EMAIL_OPT_CUT" -msgstr "カット" +msgstr "切り取り" msgid "IDS_EMAIL_OPT_PASTE" msgstr "貼り付け" @@ -577,9 +577,6 @@ msgstr "元のメール" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "その他" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "未読" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "最大" @@ -1579,9 +1576,6 @@ msgstr "件名" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "検索できません。" -msgid "IDS_EMAIL_OPT_READ" -msgstr "既読" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "連絡先リスト、EメールリストおよびEメールメッセージのトップに移動するには、ダブルタップしてください。" @@ -1805,7 +1799,7 @@ msgid "IDS_EMAIL_OPT_AUDIO" msgstr "オーディオ" msgid "IDS_EMAIL_OPT_MAP" -msgstr "地図" +msgstr "マップ" msgid "IDS_EMAIL_OPT_DELIVERY_REPORT" msgstr "配信確認" @@ -1871,7 +1865,7 @@ msgid "IDS_EMAIL_POP_FAILED_TO_SAVE_EMAIL" msgstr "Eメール​の​保存​に​失敗​しました" msgid "IDS_EMAIL_POP_EMAIL_HAS_BEEN_SAVED_AS_PSEML_IN_PS" -msgstr "Eメールが%sに%s.emlとして保存されました。" +msgstr "Eメールが%2$sに「%1$s.eml」として保存されました。" msgid "IDS_EMAIL_OPT_LARGE_HPDP_M_SIZE" msgstr "大(%d%)" @@ -1886,7 +1880,7 @@ msgid "IDS_EMAIL_OPT_UNBLOCK_ADDRESS" msgstr "アドレスのブロック解除" msgid "IDS_EMAIL_POP_PS_HAS_BEEN_UNBLOCKED_AND_THE_EMAIL_HAS_BEEN_MOVED_TO_INBOX" -msgstr "%sのブロックが解除され、Eメールは受信トレイに移動されました。" +msgstr "%sのブロックを解除し、Eメールを受信トレイに移動しました。" msgid "IDS_EMAIL_OPT_SHOW_TEXT_TOOLS" msgstr "テキストツールを表示" @@ -1898,16 +1892,16 @@ msgid "IDS_EMAIL_HEADER_SEND_AS_SCHEDULED_MESSAGE" msgstr "送信予定メッセージとして送信" msgid "IDS_EMAIL_POP_THE_TIME_SCHEDULED_FOR_SENDING_HAS_PASSED_SEND_ANYWAY_Q" -msgstr "送信予定時刻が過ぎました。送信しますか？" +msgstr "送信予定時刻を過ぎています。送信しますか？" msgid "IDS_EMAIL_POP_SCHEDULED_EMAIL_CANCELLED" -msgstr "送信予定Eメールがキャンセルされました。" +msgstr "送信予定Eメールをキャンセルしました。" msgid "IDS_EMAIL_BODY_FLICK_SCREEN_TO_SHOW_MORE" msgstr "続きを表示するには、画面をフリックしてください。" msgid "IDS_EMAIL_BUTTON_MOVE_TO_RECYCLE_BIN" -msgstr "ゴミ箱に移動" +msgstr "ごみ箱に移動" msgid "IDS_EMAIL_BUTTON_DELETE_PERMANENTLY" msgstr "完全に削除" @@ -1916,7 +1910,7 @@ msgid "IDS_EMAIL_POP_FAILED_TO_UNBLOCK_THIS_ADDRESS" msgstr "このアドレスのブロック解除に失敗しました。" msgid "IDS_EMAIL_POP_FAILED_TO_SET_AS_PRIORITY_SENDER" -msgstr "優先送信元として設定するのに失敗しました。" +msgstr "優先送信元としての設定に失敗しました。" msgid "IDS_EMAIL_POP_FAILED_TO_REMOVE_FROM_PRIORITY_SENDERS" msgstr "優先送信元からの削除に失敗しました。" @@ -1925,7 +1919,7 @@ msgid "IDS_EMAIL_OPT_READ_REPORT" msgstr "レポートを読む" msgid "IDS_EMAIL_POP_PS_HAS_BEEN_BLOCKED_AND_THE_EMAIL_HAS_BEEN_MOVED_TO_SPAMBOX" -msgstr "%sがブロックされ、Eメールが迷惑メールトレイに移動されました。" +msgstr "%sをブロックし、Eメールを迷惑メールトレイに移動しました。" msgid "IDS_EMAIL_BUTTON_SELECT_RESPONSE" msgstr "応答を選択" @@ -1940,10 +1934,10 @@ msgid "IDS_EMAIL_BODY_REMOVE_EVENT_FROM_S_PLANNER" msgstr "Sプランナーからイベントを削除" msgid "IDS_EMAIL_POP_EVENT_REMOVED_FROM_S_PLANNER" -msgstr "イベントがSプランナーから削除されました。" +msgstr "Sプランナーからイベントが削除されました。" msgid "IDS_EMAIL_POP_EVENT_ADDED_TO_S_PLANNER" -msgstr "イベントがSプランナーに追加されました。" +msgstr "Sプランナーにイベントが追加されました。" msgid "IDS_EMAIL_POP_NO_EMAIL_SELECTED" msgstr "Eメールが選択されていません。" @@ -1951,3 +1945,126 @@ msgstr "Eメールが選択されていません。" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "添付ファイルは、このExchangeサーバーポリシーによって許可された最大サイズを超えています。" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "新規Eメール" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "メッセージ​は​保存​され​ました" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "2分ごと" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIMEの機能はITポリシーによってブロックされました。" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "メモリが不足しています。不要なアイテムを削除してください。" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "アプリケーション管理" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "受信設定" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "送信設定" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "通知音" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "完了" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "件名(A～Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "件名(Z～A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "お気に入り" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "新規Eメール" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d件の新着Eメールが%sにあります" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1件の新着Eメールが%sにあります" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "既読" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "未読" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "チェック解除" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "チェック" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "お気に入りとしてﾁｪｯｸ" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "サーバーのパスワードが変更されました。変更後のパスワードを入力してください。" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "お気に入りを解除" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "最大メールアカウント数に達しました" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "本文のプレビュー行数" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1行" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2行" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3行" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "リスト内のタイトル行" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "ご参考までに" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "後ほどかけ直します。" + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Eメールありがとうございました。" + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "私宛に電話で連絡をお願いします。" + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "後ほど返信します。" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "外出しています。戻り次第すぐEメールに返信します。" + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "お元気ですか？" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "添付ファイルをご確認ください。" + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "一緒に昼食を食べましょう。" + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "後ほど通知してください。" + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "フォルダを作成できません。フォルダ名が長さの最大を超えました。" + diff --git a/po/ka.po b/po/ka.po index b577d59..5e1d2da 100755 --- a/po/ka.po +++ b/po/ka.po @@ -577,9 +577,6 @@ msgstr "თავდაპირველი წერილი" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "სხვები" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "წაუკითხავი" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "ძალიან დიდი" @@ -1579,9 +1576,6 @@ msgstr "თემა" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "ვერ იძებნება" -msgid "IDS_EMAIL_OPT_READ" -msgstr "წაკითხვა" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "ორჯერ შეხებით გადახვალთ კონტაქტების სიების თავში, ელფოსტების სიებში და ელფოსტის წერილებში" @@ -1951,3 +1945,126 @@ msgstr "ელ.ფოსტა არ არის შერჩეული" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "დანართი აჭარბებს Exchange სერვერის მიერ ნებადართულ მაქსიმალურ ზომას" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "ახალი ელ.წერილი" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "შეტყობინ. შენახულია" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "ყოველ 2 წუთში" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME ფუნქციები დაბლოკილია IT პოლიტიკით" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "მეხსიერება საკმარისი არაა. წაშალეთ ზოგიერთი ელემენტი" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "პროგრამების მართვა" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "შემომავალის პარამეტრები" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "გასაგზავნი წერილების პარამეტრები" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "სიგნალის მელოდია" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "დასრულება" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "თემა (ა-დან ჰ-მდე)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "თემა (ჰ–დან ა–მდე)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "ფავორიტები" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "ახალი ელ. წერილები" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d ახალი ელ.წერილია %s-ში" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 ახალი წერილია %s-ში" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "წაკითხვა" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "წაუკითხავი" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "ალმის გარეშე" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "ალმიანი" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "ფავორიტებად მონიშვნა" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "სერვერის პაროლი შეიცვალა. შეიყვანეთ შეცვლილი პაროლი" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "ფავორიტის მოხსნა" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "მიღწეულია ელ.ფოსტის ანგარიშების მაქსიმალური რაოდენობა" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "წერილის გადახედვის სტრიქონი" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 სტრიქონი" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 სტრიქონი" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 სტრიქონი" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "სათაურის სტრიქონი სიაში" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "თქვენი ინფორმაციისთვის" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "მოგვიანებით დაგირეკავ." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "მადლობას გიხდით ელ.წერილისთვის." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "გთხოვთ, დამიკავშირდეთ ჩემი მობილური ტელეფონით." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "მოგვიანებით გიპასუხებთ." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "ოფისიდან გასული ვარ. როგორც კი დავბრუნდები, მაშინვე ვუპასუხებ წერილს." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "როგორ ხარ?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "გთხოვთ, იხილოთ მიმაგრებული ფაილი." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "ლანჩზე შევხვდეთ." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "გთხოვთ, მოგვიანებით შემახსენოთ." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "საქაღალდეს ვერ შექმნით. გადაჭარბებულია საქაღალდის სახელის მაქსიმალური სიგრძე" + diff --git a/po/kk.po b/po/kk.po index 4fc2556..2e5cf86 100755 --- a/po/kk.po +++ b/po/kk.po @@ -577,9 +577,6 @@ msgstr "Түпнұсқа хабар" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Басқалар" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Оқылмаған" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Ірі" @@ -1579,9 +1576,6 @@ msgstr "Нысан" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Іздеу мүмкін емес" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Оқу" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Контактілер тізімінің, электрондық пошта тізімінің және электрондық пошта хабарларының жоғарғы жағына өту үшін екі рет түртіңіз" @@ -1951,3 +1945,126 @@ msgstr "Электрондық пошта таңдалмады" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "Тіркеме Exchange сервер саясатымен рұқсат етілген ең үлкен өлшем шегінен асып кетті" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "Жаңа email" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Хабар сақталды" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "2 минут сайын" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME функциялары АҚ саясатымен бұғатталды" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Жад жетыспейт.Көп арналы жою." + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Қосымшаларды басқару" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Кіріс қоңырау параметрлері" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Шығыс параметрлері" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Ескерту рингтоны" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Аяқталды" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Тақырып (А-Я)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Тақырып (Я-А)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Таңдаулылар" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Жаңа emails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%s ішінде %d жаңа электрондық пошта хабары" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "%s ішінде 1 жаңа электрондық пошта хабары" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Оқылған" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Оқылмаған" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Жалауша қойылмаған" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Жалауша қойылған" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Таңдаулы рет. белг-у" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Сервер құпиясөзі өзгертілді. Өзгертілген құпиясөзді енгізіңіз" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Таңд-р. рет. бел-меу" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Электрондық поштаның есептік жазбаларының ең көп санына жетті" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Хабар көру жолы" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 жол" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 жол" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 жол" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Тізімдегі тақырып жолы" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Сіздің назарыңызға" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Сізге кейінірек қоңырау шаламын." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Электрондық хатыңызға рақмет." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Ұялы телефоным арқылы маған хабарласыңыз." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Жауапты кейінірек жіберемін." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Жұмыста емеспін. Электрондық хатыңызға келісімен жауап беремін." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Қалыңыз қалай?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Тіркелген файлды тексеріңіз." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Түстік ішуге кездесейік." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Кейінірек менің есіме салыңыз." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Қалтаны жасау мүмкін емес. Ең ұзақ қалта атауынан асып кетті" + diff --git a/po/ko_KR.po b/po/ko_KR.po index 0c04871..1775493 100755 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -577,9 +577,6 @@ msgstr "원본 메시지" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "기타" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "읽지 않음" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "아주 크게" @@ -1579,9 +1576,6 @@ msgstr "제목" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "검색할 수 없습니다" -msgid "IDS_EMAIL_OPT_READ" -msgstr "읽음" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "연락처 목록, 이메일 목록 및 이메일 메시지의 맨 위로 이동하려면 두 번 누르세요" @@ -1919,7 +1913,7 @@ msgid "IDS_EMAIL_POP_FAILED_TO_SET_AS_PRIORITY_SENDER" msgstr "중요 발신인으로 설정하지 못하였습니다" msgid "IDS_EMAIL_POP_FAILED_TO_REMOVE_FROM_PRIORITY_SENDERS" -msgstr "중요 발신인 목록에서 삭제하지 못하였습니다" +msgstr "중요 발신인에서 삭제하지 못하였습니다" msgid "IDS_EMAIL_OPT_READ_REPORT" msgstr "읽음 확인" @@ -1951,3 +1945,126 @@ msgstr "선택된 이메일이 없습니다" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "Exchange 서버 정책이 허용하는 최대 크기를 초과하는 파일입니다." +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "새 이메일" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "메시지가 저장되었습니다" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "2분마다" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "IT 정책에 따라 SMIME 기능이 제한되었습니다" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "저장 공간이 없습니다. 필요 없는 파일을 삭제하세요" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "애플리케이션 관리" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "수신 설정" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "발신 설정" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "알림음" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "완료" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "제목(가나다순)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "제목(가나다역순)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "중요 표시" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "새 이메일" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "새 이메일 %d개가 %s에 있습니다" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "새 이메일 1개가 %s에 있습니다" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "읽음" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "읽지 않음" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "플래그 없음" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "플래그" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "즐겨찾기로 표시" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "서버 비밀번호가 변경되었습니다. 변경된 비밀번호를 입력하세요" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "즐겨찾기 표시 해제" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "최대 이메일 계정 수를 초과하였습니다" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "메시지 미리보기 표시줄" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1줄" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2줄" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3줄" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "목록의 제목란" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "참고" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "나중에 전화하겠습니다." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "이메일을 보내 주셔서 감사합니다." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "제 휴대폰으로 연락 바랍니다." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "나중에 회신하겠습니다" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "부재 중입니다. 회사로 돌아가면 바로 이메일에 회신하겠습니다." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "잘 지내지?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "첨부파일을 확인하세요." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "만나서 점심 먹자." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "나중에 알려 주세요." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "폴더를 만들 수 없습니다. 폴더 이름이 최대 길이를 초과하였습니다" + diff --git a/po/lt.po b/po/lt.po index 9e97e5d..c1cc223 100755 --- a/po/lt.po +++ b/po/lt.po @@ -577,9 +577,6 @@ msgstr "Originali žinutė" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Kiti" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Neperskaityta" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Milžiniškas" @@ -1579,9 +1576,6 @@ msgstr "Tema" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Neįmanoma ieškoti" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Skaityti" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Bakstelėkite dukart, kad pereitumėte į adresatų sąrašo, el. laiškų sąrašo ir el. laiškų pradžią" @@ -1951,3 +1945,126 @@ msgstr "Nepasirinktas el. paštas" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Naujas el. laiškas" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Žinutė įrašyta" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Kas 2 min." + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Laikantis IT politikos, SMIME veikimas blokuojamas" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Nepakanka atminties. Ištrinkite kai kuriuos elementus" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Tvarkyti programas" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Gaunamųjų nustatymai" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Siunčiamo pašto nustatymai" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Įspėjamasis tonas" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Baigta" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Tema (A–Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Tema (Z–A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Mėgstamiausieji" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nauji el. laiškai" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "Naujų el. laiškų „%s“: %d" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 naujas el. laiškas, esantis „%s“" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Skaityti" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Neperskaityti" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Nepažymėti" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Pažymėti" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Žymėt kaip parankinį" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Serverio slaptažodis pakeistas. Įveskite pakeistą slaptažodį" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Panaik.mėgstam.žym." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Pasiektas didžiausias el. pašto paskyrų skaičius" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Žinutės peržiūros eilutė" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 eilutė" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 eilutės" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 eilutės" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Sąrašo pavadinimo eilutė" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Jūsų informacijai" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Paskambinsiu vėliau." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Dėkojame už el. laišką." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Susisiekite su manimi mobiliuoju telefonu." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Atsakymą atsiųsiu vėliau." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Nesu biure. Grįžęs (-usi) atsakysiu į jūsų laišką kuo greičiau." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Kaip sekasi?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Patikrinkite pridėtą failą." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Susitikime priešpiečių." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Priminkite vėliau." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Neįmanoma sukurti aplanko. Viršytas didžiausias aplanko pavadinimo ilgis" + diff --git a/po/lv.po b/po/lv.po index a316ecd..231a693 100755 --- a/po/lv.po +++ b/po/lv.po @@ -577,9 +577,6 @@ msgstr "Sākotnējā ziņa" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Citi" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Nelasīts" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Ļoti liels" @@ -1579,9 +1576,6 @@ msgstr "Tēma" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Nevar meklēt" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Lasīta" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Veiciet dubultskārienu, lai dotos uz kontaktu saraksta, e-pastu saraksta un e-pasta ziņu saraksta sākumu" @@ -1951,3 +1945,126 @@ msgstr "Nav izvēlēts neviens e-pasts" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Jauna e-pasta ziņa" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Ziņa saglabāta" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Ik pēc 2 minūtēm" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME funkcionalitāti bloķē IT politika" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Nepietiek atmiņas. Izdzēsiet dažus vienumus" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Pārvaldīt programmas" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Ienākošie iestatījumi" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Izejošo ziņu iestatījumi" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Brīdinājuma signāls" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Pabeigts" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Tēma (no A līdz Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Tēma (no Z līdz A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Izlase" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Jaunas e-pasta ziņas" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d jaunas e-pasta ziņas %s kontā" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 jauna e-pasta ziņa %s kontā" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Lasītās ziņas" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Nelasītās ziņas" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Bez karodziņa" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Ar karodziņu" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Atzīmēt kā izlasi" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Servera parole ir nomainīta. Ievadiet nomainīto paroli" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Noņemt no izlases" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Sasniegts maksimālais e-pasta kontu skaits" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Ziņas priekšskatījuma rinda" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 rinda" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 rindas" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 rindas" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Virsraksta rinda sarakstā" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Jūsu zināšanai" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Piezvanīšu vēlāk." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Paldies par jūsu e-pastu." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Lūdzu, sazinieties ar mani, zvanot uz mobilā tālruņa numuru." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Atbildēšu vēlāk." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Neatrodos birojā. Atbildēšu uz e-pastu, kolīdz atgriezīšos." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Kā tev klājas?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Lūdzu, skatiet pievienoto failu." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Tiekamies pusdienās." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Lūdzu, atgādiniet man vēlāk." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Mapi nevar izveidot. Pārsniegts mapes nosaukuma maksimālais garums" + diff --git a/po/mk.po b/po/mk.po index 2f760c3..eaff644 100755 --- a/po/mk.po +++ b/po/mk.po @@ -71,7 +71,7 @@ msgid "IDS_EMAIL_OPT_SENDER" msgstr "Праќач" msgid "IDS_EMAIL_OPT_SEND_EMAIL" -msgstr "Прати e-mail" +msgstr "Прати е-пошта" msgid "IDS_EMAIL_BODY_ACCEPT_ALL_SSL_CERTIFICATES" msgstr "Прифати ги сите сертификати SSL" @@ -119,7 +119,7 @@ msgid "IDS_EMAIL_HEADER_DELETE" msgstr "Избриши" msgid "IDS_EMAIL_HEADER_EMAIL" -msgstr "E-mail" +msgstr "Е-пошта" msgid "IDS_EMAIL_HEADER_ADD_ACCOUNT" msgstr "Додај сметка" @@ -431,7 +431,7 @@ msgid "IDS_EMAIL_POP_TRY_AGAIN_IN_PD_MINUTES" msgstr "Обидете се повторно за %d минути" msgid "IDS_EMAIL_POP_NO_EMAIL_ADDRESS" -msgstr "Нема e-mail адреса" +msgstr "Нема адреса на е-пошта" msgid "IDS_EMAIL_BUTTON_MANUAL_SETUP" msgstr "Рачно поставување" @@ -577,9 +577,6 @@ msgstr "Оригинална порака" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Други" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Непрочитано" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Огромни" @@ -1319,7 +1316,7 @@ msgid "IDS_EMAIL_OPT_MESSAGE" msgstr "Порака" msgid "IDS_EMAIL_OPT_EMAIL" -msgstr "E-mail" +msgstr "Е-пошта" msgid "IDS_EMAIL_OPT_NFC" msgstr "NFC" @@ -1579,9 +1576,6 @@ msgstr "Наслов" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Не може да се пребара" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Читање" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Допрете двапати да одите најгоре во листата контакти, листата е-пошта и пораки" @@ -1889,10 +1883,10 @@ msgid "IDS_EMAIL_POP_PS_HAS_BEEN_UNBLOCKED_AND_THE_EMAIL_HAS_BEEN_MOVED_TO_INBOX msgstr "%s е одблокиран и е-поштата е преместена во Влезното сандаче" msgid "IDS_EMAIL_OPT_SHOW_TEXT_TOOLS" -msgstr "Покажи алати за текст" +msgstr "Покажи алатки за текст" msgid "IDS_EMAIL_OPT_HIDE_TEXT_TOOLS" -msgstr "Сокриј алати за текст" +msgstr "Сокриј алатки за текст" msgid "IDS_EMAIL_HEADER_SEND_AS_SCHEDULED_MESSAGE" msgstr "Прати како закажана порака" @@ -1951,3 +1945,126 @@ msgstr "Не е избран email" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "Прилогот ја надминува максималната големина дозволена со политиката на Exchange серверот" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "Нова email" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Пораката е меморирана" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "На 2 минути" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Функцијата SMIME е блокирана од IT-политиката" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Нема доволно меморија. Избришете некој запис" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Уреди апликации" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Опции за прием" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Појдовни опции" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Ѕвон. за известување" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Завршено" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Предмет (А кон Ш)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Предмет (Ш кон A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Омилени" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Нови email пораки" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d нови email-и во %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 нов email на %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Прочитани" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Непрочитани" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Без знаменце" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Со знаменце" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Означи како омилени" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Лозинката на серверот е сменета. Внесете ја сменетата лозинка" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Одозн. како омилени" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Достигнат е максималниот број сметки за email" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Ред за преглед на пораката" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 ред" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 реда" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 редa" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Наслов во листа" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "За ваша информација" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Ќе ти се јавам покасно." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Ви благодарам за email-от." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Те молам јави ми се на мобилен." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Ќе ти одговорам покасно." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Не сум на работа. Ќе ти одговорам на мејлот штом можам кога ќе се вратам." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Како си?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Види го приложениот фајл." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Да се најдеме за ручек." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Те молам потсети ме подоцна." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Не може да се направи папката. Надмината е максималната должина за име на папка" + diff --git a/po/nb.po b/po/nb.po index a7e2b11..ad5a951 100755 --- a/po/nb.po +++ b/po/nb.po @@ -577,9 +577,6 @@ msgstr "Opprinnelig melding" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Andre" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Ulest" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Veldig stor" @@ -1325,25 +1322,25 @@ msgid "IDS_EMAIL_OPT_NFC" msgstr "NFC" msgid "IDS_EMAIL_BODY_SUNDAY" -msgstr "Søndag" +msgstr "søndag" msgid "IDS_EMAIL_BODY_MONDAY" -msgstr "Mandag" +msgstr "mandag" msgid "IDS_EMAIL_BODY_TUESDAY" -msgstr "Tirsdag" +msgstr "tirsdag" msgid "IDS_EMAIL_BODY_WEDNESDAY" -msgstr "Onsdag" +msgstr "onsdag" msgid "IDS_EMAIL_BODY_THURSDAY" -msgstr "Torsdag" +msgstr "torsdag" msgid "IDS_EMAIL_BODY_FRIDAY" -msgstr "Fredag" +msgstr "fredag" msgid "IDS_EMAIL_BODY_SATURDAY" -msgstr "Lørdag" +msgstr "lørdag" msgid "IDS_EMAIL_BODY_OTHER" msgstr "Annet" @@ -1579,9 +1576,6 @@ msgstr "Emne" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Søking mislyktes" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Lest" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Dobbeltrykk for å gå til toppen av kontaktlistene, e-postlistene og e-postmeldingene" @@ -1898,7 +1892,7 @@ msgid "IDS_EMAIL_HEADER_SEND_AS_SCHEDULED_MESSAGE" msgstr "Send som planlagt melding" msgid "IDS_EMAIL_POP_THE_TIME_SCHEDULED_FOR_SENDING_HAS_PASSED_SEND_ANYWAY_Q" -msgstr "Det planlagte sendetidspunktet har passert. Sende likevel?" +msgstr "Det planlagte sendetidspunktet har passert. Vil du sende likevel?" msgid "IDS_EMAIL_POP_SCHEDULED_EMAIL_CANCELLED" msgstr "Planlagt e-post avbrutt" @@ -1916,7 +1910,7 @@ msgid "IDS_EMAIL_POP_FAILED_TO_UNBLOCK_THIS_ADDRESS" msgstr "Kunne ikke oppheve blokkeringen av denne adressen" msgid "IDS_EMAIL_POP_FAILED_TO_SET_AS_PRIORITY_SENDER" -msgstr "Kunne ikke angi som prioritert sender" +msgstr "Kunne ikke angi som prioritert avsender" msgid "IDS_EMAIL_POP_FAILED_TO_REMOVE_FROM_PRIORITY_SENDERS" msgstr "Kunne ikke fjerne fra prioriterte avsendere" @@ -1951,3 +1945,126 @@ msgstr "Ingen e-post valgt" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Ny e-post" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Melding lagret" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Hvert 2. minutt" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME-funksjon blokkert av IT-policy" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Ikke nok minne. Slett noen elementer" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Administrer programmer" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Innkommende innstillinger" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Utgående innstillinger" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Varselsringetone" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Fullført" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Emne (A til Å)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Emne (Å til A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoritter" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nye e-poster" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nye e-postmeldinger i %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 ny e-post i %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Lest" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Ulest" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Ikke flagget" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Flagget" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marker som favoritt" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Serverpassordet har blitt endret. Oppgi det endrede passordet" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Fjern fav.markering" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maksimalt antall e-postkontoer er nådd" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Linje ved forhåndsvisning av meldinger" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 linje" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 linjer" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 linjer" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Tittellinje i liste" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Til informasjon" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Jeg ringer tilbake senere." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Takk for din e-post." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Kontakt meg via mobiltelefon." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Jeg svarer deg senere." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Jeg er borte fra kontoret. Jeg svarer på e-posten din så snart jeg er tilbake." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Hvordan går det?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Vennligst se vedlagt fil." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "La oss møtes til lunsj." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Påminn meg senere." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Kan ikke opprette mappen. Maksimumslengde for mappenavn overskredet" + diff --git a/po/nl_NL.po b/po/nl_NL.po index 5ddc27a..cc84158 100755 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -577,9 +577,6 @@ msgstr "Oorspronkelijk bericht" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Overige" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Ongelezen" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Extra groot" @@ -1325,25 +1322,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" @@ -1579,9 +1576,6 @@ msgstr "Onderwerp" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Kan niet zoeken" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Gelezen" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Dubbeltik om naar het begin van contactenlijsten, e-maillijsten of e-mailberichten te gaan" @@ -1951,3 +1945,126 @@ msgstr "Geen e-mail geselecteerd" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nieuwe e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Bericht opgeslagen" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Om de 2 minuten" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME-functionaliteit geblokkeerd door IT-beleid" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Onvoldoende geheugen. Wis een aantal items" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Applicaties beheren" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Instellingen inkomende e-mail" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Instellingen uitgaande e-mail" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Beltoon alarm" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Voltooid" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Onderwerp (A tot Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Onderwerp (Z tot A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favorieten" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nieuwe e-mails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nieuwe e-mails in %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nieuwe e-mail in %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Gelezen" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Niet gelezen" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Niet gemarkeerd" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Gemarkeerd" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Markeer als favoriet" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Het serverwachtwoord is gewijzigd. Voer het gewijzigde wachtwoord in" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Mark. als fav. ophef" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maximumaantal e-mailaccounts bereikt" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Berichtvoorbeeldregel" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 regel" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 regels" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 regels" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Titelregel in lijst" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Voor uw informatie" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Ik bel u later." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Bedankt voor uw e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Neem contact op via mijn mobiele telefoon." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Ik stuur later een antwoord." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Ik ben niet op kantoor. Als ik terugkom, zal ik uw e-mail zo snel mogelijk beantwoorden." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Hoe gaat het?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Controleer het bijgevoegde bestand." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Laten we samen lunchen." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Herinner me er later aan." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Kan de map niet maken. Maximale lengte van mapnaam overschreden" + diff --git a/po/pl.po b/po/pl.po index c87e188..82c9c9f 100755 --- a/po/pl.po +++ b/po/pl.po @@ -577,9 +577,6 @@ msgstr "Oryginalna wiadomość" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Inne" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Nieprzeczytane" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Bardzo duża" @@ -1579,9 +1576,6 @@ msgstr "Temat" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Nie można wyszukać" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Przeczytano" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Dotknij dwukrotnie, aby przejść na górę list kontaktów, adresów i wiadomości e-mail" @@ -1951,3 +1945,126 @@ msgstr "Nie wybrano wiadomości e-mail" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr ": Nowy e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Wiadomość zapisana" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Co 2 min" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Funkcję SMIME blokują ustawienia zasady IT" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Brak pamięci. Usuń niektóre elementy" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Zarządzaj aplikacjami" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Ustawienia poczty przychodzącej" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Ustawienia poczty wych." + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Dzwonek alarmu" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Zakończono" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Temat (od A do Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Temat (od Z do A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Ulubione" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nowych e-mail" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "Nowe wiad. (%d) e-mail na koncie %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "Nowe wiad. (1) e-mail na koncie %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Przeczytane" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Nieprzeczytane" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Nieoznaczone flagą" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Oznaczone flagą" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Zazn. jako ulubione" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Hasło serwera zostało zmienione. Wprowadź zmienione hasło" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Usuń zaz. jako Ulub." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Osiągnięto maksymalną liczbę kont e-mail" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Liczba wierszy w podglądzie" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "Wierszy: 1" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "Wierszy: 2" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "Wierszy: 3" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Linia tytułu na liście" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Do Twojej wiadomości" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Oddzwonię później." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Dziękuję Ci za e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Skontaktuj się ze mną przez mój telefon komórkowy." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Wyślę odpowiedź później." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Jestem poza biurem. Odpowiem na Twój e-mail jak najszybciej po powrocie." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Co słychać?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Sprawdź załączony plik." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Zjedzmy razem obiad." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Przypomnij mi później." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Nie można utworzyć katalogu. Przekroczono maksymalną długość nazwy katalogu" + diff --git a/po/pt_BR.po b/po/pt_BR.po index 7c1348d..173385b 100755 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -577,9 +577,6 @@ msgstr "Mensagem original" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Outros" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Não lida" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Enorme" @@ -1579,9 +1576,6 @@ msgstr "Assunto" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Impossível procurar" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Lida" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Toque duas vezes para ir para o topo das listas de contatos, listas de e-mail e mensagens de e-mail" @@ -1951,3 +1945,126 @@ msgstr "Nenhum e-mail selecionado" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Novo e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Mensagem salva" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Cada 2 minutos" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Funcionalidade de SMIME bloqueada por política de TI" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Memória insuficiente. Apague alguns itens" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Gerenciar aplicações" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Configurações de entrada" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Configurações de saída" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Toque de alerta" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Concluído" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Assunto (A até Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Assunto (Z até A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoritos" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Novos e-mails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d novos e-mails em %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 e-mail novo em %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Lido" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Não lido" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Não sinalizada" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Sinalizada" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marcar c/ favoritos" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "A senha do servidor foi alterada. Insira a senha alterada" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Desm. como favoritos" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Número máximo de contas de e-mails atingido" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Linha de pré-visualização de mensagem" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 linha" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 linhas" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 linhas" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Linha de título na lista" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Para sua informação" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Te ligo mais tarde." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Obrigado pelo seu e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Entre em contato comigo pelo meu celular." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Enviarei uma resposta mais tarde." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Estou ausente do escritório. Quando retornar, responderei ao seu e-mail assim que for possível." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Como você está?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Verifique o arquivo anexo." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Vamos nos encontrar para o almoço." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Lembre-me mais tarde." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Não é possível criar a pasta. Comprimento máximo do nome da pasta excedido" + diff --git a/po/pt_PT.po b/po/pt_PT.po index 8daef04..236fae3 100755 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -577,9 +577,6 @@ msgstr "Mensagem original" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Outros" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Não lida" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Muito grande" @@ -1579,9 +1576,6 @@ msgstr "Assunto" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Impossível procurar" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Ler" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Toque duas vezes para ir para o início de listas de contactos, listas de e-mails e mensagens de e-mail" @@ -1951,3 +1945,126 @@ msgstr "Nenhum e-mail seleccionado" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Novo e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Mensagem guardada" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Cada 2 minutos" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Funcionalidade de SMIME bloqueada por política de TI" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Memória insuficiente. Apague alguns itens" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Gerir aplicações" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Definições de recepção" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Definições de saída" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Tom de toque alerta" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Concluída" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Assunto (A a Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Assunto (Z para A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoritos" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Novos e-mails" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d novos e-mails em %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 e-mail novo em %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Lida" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Não lida" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Não sinalizada" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Sinalizada" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marcar como favorit." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "A palavra-passe do servidor foi alterada. Introduza a palavra-passe alterada" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Desmarcar como fav" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Número máximo de contas de e-mails atingido" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Linhas de pré-visualização de mensagem" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 linha" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 linhas" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 linhas" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Linha de título na lista" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Para sua informação" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Eu telefono mais tarde." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Obrigado pelo seu e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Contacte-me através do meu telemóvel." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Envio uma resposta mais tarde." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Estou fora do escritório. Respondo ao seu e-mail assim que possível após o meu regresso." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Como estás?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "É favor verificar o ficheiro anexo." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Vamos almoçar juntos." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "É favor lembrar-me mais tarde." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Impossível criar a pasta. Comprimento máximo de nome de pasta excedido" + diff --git a/po/ro.po b/po/ro.po index 5d6352f..5634caa 100755 --- a/po/ro.po +++ b/po/ro.po @@ -577,9 +577,6 @@ msgstr "Mesaj original" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Altele" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Necitit" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Foarte mare" @@ -1579,9 +1576,6 @@ msgstr "Subiect" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Imposibil de căutat" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Citit" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Atingeţi de două ori pentru a vă deplasa la începutul listei de contacte, al listei de e-mailuri şi al mesajelor de e-mail" @@ -1951,3 +1945,126 @@ msgstr "Nu a fost selectat niciun e-mail" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Email nou" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Mesaj salvat" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "La fiecare 2 minute" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Funcţionalitate SMIME blocată prin politica IT" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Memorie insuficientă. Ştergeţi câteva elemente" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Gestionare aplicaţii" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Setări de intrare" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Setări de ieşire" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Ton sonerie alertă" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Finalizat" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Subiect (A-Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Subiect (Z-A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favorite" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Mesaje email noi" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d e-mailuri noi în %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 e-mail nou în %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Citite" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Necitite" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Nesemnalizate" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Semnalizate" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Marcare preferinţe" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Parola serverului a fost schimbată. Introduceţi noua parolă" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Deselectare ca pref." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "S-a atins numărul maxim de conturi de email" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Linie previzualizare mesaj" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 rând" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 rânduri" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 rânduri" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Linie de titlu listă" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Pentru referinţa dvs." + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Vă sun mai târziu." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Vă mulţumim pentru e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Contactaţi-mă pe telefonul mobil." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Voi trimite un răspuns ulterior." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Nu sunt la birou. Voi răspunde la e-mailul dvs. la întoarcere, în cel mai scurt timp posibil." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Ce faceţi?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Verificaţi fişierul ataşat." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Hai să ne întâlnim să luăm prânzul." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Aminteşte-mi mai târziu." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Folderul nu poate fi creat. S-a depăşit limita de lungime pentru numele de folder" + diff --git a/po/ru_RU.po b/po/ru_RU.po index 2d6aa45..d7fcc95 100755 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -577,9 +577,6 @@ msgstr "Исходное сообщение" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Прочее" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Непрочитанные" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Огромный" @@ -1579,9 +1576,6 @@ msgstr "Тема" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Не удалось выполнить поиск" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Прочитано" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Коснитесь дважды для перехода в начало списка контактов, адресов электронной почты или сообщений" @@ -1871,7 +1865,7 @@ msgid "IDS_EMAIL_POP_FAILED_TO_SAVE_EMAIL" msgstr "Не удалось сохранить сообщение электронной почты" msgid "IDS_EMAIL_POP_EMAIL_HAS_BEEN_SAVED_AS_PSEML_IN_PS" -msgstr "Сообщение сохранено как файл %s.eml в папке \"%s\"" +msgstr "Сообщение сохранено как файл %s.eml в папке '%s'" msgid "IDS_EMAIL_OPT_LARGE_HPDP_M_SIZE" msgstr "Крупное (%d%)" @@ -1886,7 +1880,7 @@ msgid "IDS_EMAIL_OPT_UNBLOCK_ADDRESS" msgstr "Разблокировать адрес" msgid "IDS_EMAIL_POP_PS_HAS_BEEN_UNBLOCKED_AND_THE_EMAIL_HAS_BEEN_MOVED_TO_INBOX" -msgstr "Адрес %s разблокирован, а сообщение перемещено в папку \"Входящие\"" +msgstr "Адрес %s разблокирован, а сообщение перемещено в папку 'Входящие'" msgid "IDS_EMAIL_OPT_SHOW_TEXT_TOOLS" msgstr "Показать текстовые инструменты" @@ -1951,3 +1945,126 @@ msgstr "Сообщение электронной почты не выбрано msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "Превышен максимальный размер вложения, разрешенный политикой данного сервера Exchange" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "Новое сообщение E-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Сообщение сохранено" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Каждые 2 минуты" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Функции SMIME заблокированы политикой" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Недостаточно памяти. Удалите некоторые элементы" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Управление приложениями" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Параметры: входящие" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Исходящая почта" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Мелодия уведомления" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Завершено" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Тема (от А до Я)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Тема (от Я до А)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Избранное" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Новые сообщения E-mail" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "Новых сообщений электронной почты в %s: %d" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 новое сообщение электронной почты в %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Прочитанные" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Непрочитанные" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Неотмеченные" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Отмеченные" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Отметить как избр." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Пароль сервера был изменен. Введите измененный пароль" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Удал. из избранного" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Достигнуто максимальное число учетных записей электронной почты" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Строка предварительного просмотра сообщения" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 строка" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 строки" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 строки" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Строка заголовка в списке" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "К вашему сведению" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Перезвоню позже." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Спасибо за сообщение." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Позвоните мне на мобильный телефон." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Я отвечу позже." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Меня нет в офисе. Я отвечу на ваше сообщение, как только вернусь." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Как дела?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Пожалуйста, просмотрите вложенный файл." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Давай вместе пообедаем." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Напомните мне позже." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Не удается создать папку. Превышена максимальная длина имени папки" + diff --git a/po/sk.po b/po/sk.po index 944a431..dcaacac 100755 --- a/po/sk.po +++ b/po/sk.po @@ -577,9 +577,6 @@ msgstr "Pôvodná správa" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Ostatné" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Neprečítané" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Veľmi veľké" @@ -1579,9 +1576,6 @@ msgstr "Predmet" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Nedá sa nájsť" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Prečítané" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Dvojitým ťuknutím môžete prejsť na začiatok zoznamu kontaktov, e-mailov a e-mailových správ" @@ -1951,3 +1945,126 @@ msgstr "Žiadny vybratý e-mail" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nový e-mail" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Správa uložená" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Každé 2 minúty" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Funkciu SMIME blokuje politika IT" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Nedostatok pamäte. Vymažte niektoré položky" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Spravovať aplikácie" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Nastavenia prichádzajúcej pošty" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Nastavenia odchádzajúcej pošty" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Vyzv. tón upozorn." + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Dokončené" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Predmet (od A po Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Predmet (od Z po A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Obľúbené" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nové e-maily" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nových e-mailov v %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nový e-mail v %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Prečítané" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Neprečítané" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Bez príznaku" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "S príznakom" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Označiť ako obľúbené" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Heslo servera bolo zmenené. Zadajte zmenené heslo" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Zrušiť ozn. ako obľ." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Dosiahol sa maximálny počet e-mailových kont" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Riadok s ukážkou správy" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 riadok" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 riadky" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 riadky" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Titulný riadok v zozname" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Informácie" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Zavolám neskôr." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Ďakujeme za váš e-mail." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Kontaktujte ma prostredníctvom môjho mobilného telefónu." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Odpoviem neskôr." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Som mimo kancelárie. Odpoviem na váš e-mail čo najskôr po mojom návrate." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Ako sa máš?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Skontrolujte priložený súbor." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Stretneme sa na obede." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Pripomenúť neskôr." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Nedá sa vytvoriť priečinok. Prekročila sa maximálna dĺžka názvu priečinka" + diff --git a/po/sl.po b/po/sl.po index 1455e79..157b657 100755 --- a/po/sl.po +++ b/po/sl.po @@ -577,9 +577,6 @@ msgstr "Izvirno sporočilo" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Drugo" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Neprebrano" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Zelo velika" @@ -1579,9 +1576,6 @@ msgstr "Zadeva" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Iskanje ni mogoče" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Prebrano" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Dvakrat pritisnite, če se želite premakniti na vrh seznamov stikov, seznamov e-pošte in e-poštnih sporočil" @@ -1951,3 +1945,126 @@ msgstr "Ni izbrane e-pošte" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nova e-pošta" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Sporočilo je shranjeno" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Vsaki 2 minuti" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Pravilnik IT je blokiral delovanje SMIME" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Ni dovolj pomnilnika. Izbrišite nekaj predmetov" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Uredi aplikacije" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Dohodne nastavitve" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Odhodne nastavitve" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Zvonjenje opozorila" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Končano" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Zadeva (od A do Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Zadeva (od Z do A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Priljubljene" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nove e-pošte" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d novih e-poštnih sporočil v računu %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nova e-pošta v računu %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Prebrano" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Neprebrano" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Brez zastavice" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Z zastavico" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Oz. kot priljubljeno" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Geslo za strežnik je spremenjeno. Vnesite spremenjeno geslo" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Odstr. ozn. priljub." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Doseženo je največje dovoljeno število računov za e-pošto" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Vrstica za predogled sporočila" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 vrstica" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 vrstici" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 vrstice" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Vrst. z nasl. na seznamu" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Za vašo evidenco" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Pokličem pozneje." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Hvala za vašo e-pošto." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Pokliči me prek mobilnega telefona." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Odgovor pošljem pozneje." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Nisem v pisarni. Na e-pošto bom odgovoril takoj, ko se vrnem." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Kako ste?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Preverite priloženo datoteko." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Pojdiva na kosilo." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Opomni me pozneje." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Mape ni mogoče ustvariti. Največja dovoljena dolžina imena mape je presežena" + diff --git a/po/sr.po b/po/sr.po index 15fe034..923f985 100755 --- a/po/sr.po +++ b/po/sr.po @@ -577,9 +577,6 @@ msgstr "Originalna poruka" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Ostalo" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Nepročitano" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Veliki" @@ -1579,9 +1576,6 @@ msgstr "Naslov" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Nemoguće pretraživati" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Pročitano" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Dvaput kucni za odlazak na vrh listi kontakata, slanje listi putem e-pošte ili slanje e-poruka" @@ -1951,3 +1945,126 @@ msgstr "Nema izabranih e-poruka" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Nova e-poruka" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Poruka sačuvana" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Svaka 2 min." + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "IT politika je blokirala SMIME funkciju" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Nedovoljno memorije. Obriši neke od stavki" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Organizuj aplikacije" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Dolazna podešavanja" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Podešavanja odlazne pošte" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Ton zvona upozorenja" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Završeno" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Tema (od A do Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Tema (od Z do A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Omiljeni" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Nove e-poruke" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d novih poruka u %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nova e-poruka u %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Pročitano" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Nepročitano" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Bez zastavice" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Označeno zastavicom" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Označi kao omiljene" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Promenjena je lozinka servera. Unesi promenjenu lozinku" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Ozn. kao neomiljene" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Dostignut maksimalan broj naloga e-pošte" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Red u pregledu poruke" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "Jedna linija" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 reda" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 reda" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Linija naslova na listi" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Informacije na uvid" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Čujemo se kasnije." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Hvala ti na e-poruci." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Kontaktiraj me putem mog mobilnog telefona." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Odgovor ću poslati kasnije." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Nisam u kancelariji. Odgovoriću na tvoju e-poruku čim se budem vratio/la." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Kako si?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Proveri priloženi fajl." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Hajde da se vidimo na ručku." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Podseti me kasnije." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Kreiranje foldera nije moguće. Premašena je maksimalna dužina naziva foldera" + diff --git a/po/sv.po b/po/sv.po index fa8e3cf..28a7053 100755 --- a/po/sv.po +++ b/po/sv.po @@ -577,9 +577,6 @@ msgstr "Originalmeddelande" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Annat" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Oläst" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Jättestor" @@ -1579,9 +1576,6 @@ msgstr "Rubrik" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Det går inte att söka" -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 "Dubbeltryck för att gå till toppen av kontaktlistan, e-postlistan och e-postmeddelanden" @@ -1799,7 +1793,7 @@ 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" +msgstr "Ta bort kopia/hemlig kopia" msgid "IDS_EMAIL_OPT_AUDIO" msgstr "Ljud" @@ -1951,3 +1945,126 @@ msgstr "Ingen e-post har valts" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Ny e-post" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Meddelande sparat" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Var 2 min." + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME-funktioner blockeras av IT-policy" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Minnet räcker inte. Radera några objekt" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Hantera program" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Inställningar för inkommande" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Inställningar för utgående" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Meddelandesignal" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Klar" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Ämne (A till Ö)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Ämne (Ö till A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoriter" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Ny e-post" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%d nya e-postmeddelanden i %s" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 nytt e-postmeddelande i %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Lästa" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Olästa" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Ej flaggade" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Flaggade" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Markera som favor." + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Serverlösenordet har ändrats. Ange det ändrade lösenordet" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Avmarkera som fav." + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Högsta antal e-postkonton har uppnåtts" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Rad för meddelandeförhandsgranskning" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 rad" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 rader" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 rader" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Titelrad i lista" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "För information" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Jag ringer dig senare." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Tack för ditt e-postmeddelande." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Ring mig på min mobiltelefon." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Jag skickar ett svar senare." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Jag är inte på kontoret. Jag kommer att svara på ditt e-postmeddelande så snart möjligt när jag kommer tilllbaka." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Hur mår du?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Kontrollera den bifogade filen." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Vi kan träffas för lunch." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Påminn mig senare." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Det går inte att skapa mappen. Den högsta längden för mappnamn har överskridits" + diff --git a/po/tr_TR.po b/po/tr_TR.po index 7ab984e..ae96dd4 100755 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -577,9 +577,6 @@ msgstr "Orjinal mesaj" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Diğerleri" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Okunmadı" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Çok büyük" @@ -932,7 +929,7 @@ msgid "IDS_EMAIL_OPT_UNDO" msgstr "Geri al" msgid "IDS_EMAIL_OPT_REDO" -msgstr "Yinele" +msgstr "İleri al" msgid "IDS_EMAIL_OPT_BOLD" msgstr "Kalın" @@ -1136,7 +1133,7 @@ msgid "IDS_EMAIL_OPT_DATE" msgstr "Tarih" msgid "IDS_EMAIL_HEADER_SEARCH" -msgstr "Buluyor" +msgstr "Arama" msgid "IDS_EMAIL_POP_UNABLE_TO_OPEN_EMAIL_MESSAGE" msgstr "E-posta mesajı açılamıyor" @@ -1310,7 +1307,7 @@ msgid "IDS_EMAIL_BODY_SMTP_SERVER" msgstr "SMTP sunucusu" msgid "IDS_EMAIL_OPT_SEARCH" -msgstr "Buluyor" +msgstr "Arama" msgid "IDS_EMAIL_OPT_SHARE" msgstr "Paylaşıma aç" @@ -1579,9 +1576,6 @@ msgstr "Konu" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Aranamıyor" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Oku" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Kişi listeleri, e-posta listeleri ve e-posta mesajlarının başına gitmek için çift dokunun" @@ -1951,3 +1945,126 @@ msgstr "Hiçbir e-posta seçili değil" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "yeni E-posta" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Mesaj kaydedildi" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Her 2 dakikada bir" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME fonksiyonu IT politikası nedeniyle engellendi" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Yeterli hafıza yok. Bazı öğeleri silin." + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Uygulamaları yönet" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Gelen e-posta ayarları" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Giden e-posta ayarları" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Uyarı zil sesi" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Tamamlandı" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Konu (A'dan Z'ye)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Konu (Z'den A'ya)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Favoriler" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Yeni e-posta" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%s adresinde %d yeni e-posta" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "%s içinde 1 yeni e-posta" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Okunmuş" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Okunmamış" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Bayraksız" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Bayraklı" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Favori olark işartle" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Sunucu şifresi değiştirilmiş. Değiştirilen şifreyi girin" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Favorilerden kaldır" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maksimum e-posta hesabı sayısına ulaşıldı" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Mesajı önizleme satırı" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 hat" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 satır" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 satır" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Listedeki başlık satırı" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Bilgilerinize" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Seni sonra arayacağım." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "E-postanız için teşekkür ederiz." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Lütfen benimle cep telefonuyla irtibat kur." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Daha sonra yanıtlayacağım." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Ofiste değilim. E-postanıza döner dönmez yanıt vereceğim." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Nasılsın?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Lütfen ekteki dosyayı kontrol edin." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Öğle yemeği için buluşalım." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Lütfen sonra hatırlat." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Klasör oluşturulamıyor. Maksimum klasör adı uzunluğu aşıldı" + diff --git a/po/uk.po b/po/uk.po index f299e57..52a35d9 100755 --- a/po/uk.po +++ b/po/uk.po @@ -577,9 +577,6 @@ msgstr "Оригінальне повідомлення" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Інші" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "Непрочитані" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Великий" @@ -1579,9 +1576,6 @@ msgstr "Тема" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Неможливо виконати пошук" -msgid "IDS_EMAIL_OPT_READ" -msgstr "Прочитане" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Двічі постукайте, щоб перейти вгору списку контактів, списку повідомлень Email або будь-якого повідомлення Email" @@ -1951,3 +1945,126 @@ msgstr "Не вибрано жодного повідомлення Email" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "Розмір вкладення перевищує максимально дозволений політикою сервера Exchange" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "Новий Email" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Повідомлення збережено" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Кожні 2 хвилини" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "Функція SMIME заблокована IT-політикою" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Недостатньо пам’яті. Видаліть деякі об’єкти" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Керувати програмами" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Установки вхідної пошти" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Установки вихідної пошти" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Звук сигналу" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Завершити" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Тема (від А до Я)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Тема (від Я до А)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Обране" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Нові повідомлення Email" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "Нових повідомлень Email у %s: %d" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "1 нове повідомлення Email в %s" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "Прочитано" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "Непрочитано" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Непозначено" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Позначено" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Позначити як обране" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Пароль сервера змінено. Введіть змінений пароль" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Зняти позн. ""Обране""" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Досягнуто максимальної кількості облікових записів Email" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Рядок перегляду повідомлення" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 рядок" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 рядки" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 рядки" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Рядок назви у списку" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Для довідки" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Передзвоню тобі пізніше." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "Дякую за повідомлення електронної пошти." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Зателефонуй мені на мобільний телефон." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Я відповім пізніше." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Мене немає на робочомі місці. Я відповім на ваше повідомлення електронної пошти одразу після повернення." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Як справи?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Перегляньте вкладений файл." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Давай разом пообідаємо." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Нагадайте мені пізніше." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Неможливо створити папку. Перевищено максимальну довжину імені папки" + diff --git a/po/uz.po b/po/uz.po index ea2d26b..3ba7e51 100755 --- a/po/uz.po +++ b/po/uz.po @@ -577,9 +577,6 @@ msgstr "Asl xabar" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "Boshqalar" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "O‘qilmaganlar" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "Ulkan" @@ -1579,9 +1576,6 @@ msgstr "Mavzu" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "Qidirib bo‘lmaydi" -msgid "IDS_EMAIL_OPT_READ" -msgstr "O‘qilganlar" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "Kontaktlar ro‘yxati, e-pochtalar ro‘yxati va e-pochta xabarlarining eng yuqorisiga o‘tish uchun, ikki marta cherting" @@ -1951,3 +1945,126 @@ msgstr "Elektron pochta tanlanmagan" msgid "IDS_EMAIL_POP_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_HEADER_NEW_EMAIL" +msgstr "Yangi e-pochta" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "Xabar saqlandi" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "Har 2 daqiqa" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME funksionalligi AT siyosati tomonidan bloklangan" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "Xotira yetarli emas. Ba’zi elementlarni o'chiring" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "Ilovalarni boshqarish" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "Kiruvchi parametrlari" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "Chiquvchi xabarlar parametrlari" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "Signal ringtoni" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "Yakunlash" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "Mavzu (A dan Z ga)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "Mavzu (Z dan A ga)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "Tanlanganlar" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "Yangi e-pochtalar" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%sda %d ta yangi e-pochta xabari" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "%sda 1 ta yangi e-pochta xabari" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "O‘qilgan" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "O‘qilmagan" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "Belgi ol/tashlangan" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "Belgi qo‘yilgan" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "Tnlngn. sif. belgila" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "Server paroli o‘zgartirildi. O‘zgartirilgan parolni kiriting" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "Tnlngn belgi ol/tash" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "E-pochta hisob qaydnomalari soni ruxsat etilgan maksimal miqdorga yetdi" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "Xabarni dastlabki ko‘rib chiqish satri" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 satr" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 satr" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 satr" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "Ro‘yxatdagi sarlavha" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "Axborotingiz uchun" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "Sizga keyinroq qo‘ng‘iroq qilaman." + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "E-pochta xabaringiz uchun rahmat." + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "Iltimos, mobil telefon orqali men bilan bog‘laning." + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "Javobni keyinroq yuboraman." + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "Men ofisdan tashqaridaman. Qaytishim bilanoq e-pochta xabaringizga javob yozaman." + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "Yaxshimisiz?" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "Iltimos, biriktirilgan faylni tekshiring." + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "Keling tushlikda ko‘rishamiz." + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "Keyinroq eslatilsin." + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "Jildni yaratib bo‘lmaydi. Jild nomi uzunligi maksimal miqdordan oshib ketdi" + diff --git a/po/zh_CN.po b/po/zh_CN.po index faa1e09..b9982be 100755 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -577,9 +577,6 @@ msgstr "原始邮件" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "其它" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "未读" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "巨大" @@ -1439,7 +1436,7 @@ msgid "IDS_EMAIL_BODY_LAST_MONTH" msgstr "上个月" msgid "IDS_EMAIL_BODY_1_WEEK_AGO" -msgstr "1 星期前" +msgstr "1 周之前" msgid "IDS_EMAIL_OPT_LOG_IN" msgstr "登录" @@ -1579,9 +1576,6 @@ msgstr "主题：" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "无法搜索" -msgid "IDS_EMAIL_OPT_READ" -msgstr "已读" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "双击以转至联系人列表、电子邮件列表和电子邮件消息的顶部" @@ -1951,3 +1945,126 @@ msgstr "未选择电子邮件" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "附件超过该 Exchange 服务器政策允许的最大大小" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "新邮件" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "已保存信息" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "每 2 分钟" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME功能已被IT政策阻止" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "存储空间不足。请删除部分项目" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "管理应用程序" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "接收设置" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "发送设置" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "提醒铃声" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "完成" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "主题（A 至 Z）" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "主题（Z 至 A）" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "收藏" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "新邮件" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%s中有%d封新电子邮件" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "%s中有1封新电子邮件" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "已读" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "未读" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "未标记" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "已标记" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "标记为收藏" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "服务器密码已更改。输入已更改的密码" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "取消标记为收藏" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "已达到电子邮件帐户的数量上限" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "邮件预览行" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 行" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 行" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 行" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "列表中的标题行" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "供您参考" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "我会稍后打给您" + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "感谢您的电子邮件" + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "请通过手机联系我" + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "我会稍后发送回复" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "我不在办公室。我会在回来后立即回复您的电子邮件" + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "你好吗？" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "请查看附加文件" + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "我们一起吃午餐吧" + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "请稍后提醒我" + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "无法创建文件夹。已超过最大文件夹名称长度" + diff --git a/po/zh_HK.po b/po/zh_HK.po index e84eced..b776c60 100755 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -577,9 +577,6 @@ msgstr "原有訊息" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "其他" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "未讀取" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "巨大" @@ -1579,9 +1576,6 @@ msgstr "主題" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "無法搜尋" -msgid "IDS_EMAIL_OPT_READ" -msgstr "已讀取" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "輕觸兩次以前往聯絡人清單、電子郵件清單以及電子郵件訊息的頂部" @@ -1951,3 +1945,126 @@ msgstr "未選擇電子郵件" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "附件超過 Exchange 伺服器政策的檔案大小上限" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "新電子郵件" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "訊息已儲存" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "每 2 分鐘" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME 功能已被 IT 政策封鎖" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "記憶體不足。請刪除一些項目" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "管理應用程式" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "接收設定" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "外寄設定" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "提醒鈴聲" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "完成" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "主題 (A 至 Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "主題 (Z 至 A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "我的最愛" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "新電子郵件" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%s 中有 %d 封新的電子郵件" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "%s 中有 1 封新的電子郵件" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "已讀" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "未讀" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "未標記" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "已標記" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "標記為我的最愛" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "伺服器密碼已變更。輸入變更的密碼" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "取消標記為我的最愛" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "已達電子郵件帳戶的數量上限" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "訊息預覽線" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 行" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 行" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 行" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "清單中的標題文字" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "供您參考" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "待會回電" + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "謝謝您的電子郵件" + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "請致電我的手機" + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "稍後回覆" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "我目前外出中。我會在回來後盡快回覆電子郵件給您" + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "您好嗎？" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "請檢查附加檔案" + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "一起共進午餐吧！" + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "稍後請再提醒我" + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "無法建立資料夾。超過資料夾名稱長度上限" + diff --git a/po/zh_SG.po b/po/zh_SG.po index 5764395..0b4d3a3 100755 --- a/po/zh_SG.po +++ b/po/zh_SG.po @@ -577,9 +577,6 @@ msgstr "原始信息" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "其它" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "未读" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "巨大" @@ -1579,9 +1576,6 @@ msgstr "主题" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "无法搜索" -msgid "IDS_EMAIL_OPT_READ" -msgstr "阅读" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "双击以转至联系人列表、电子邮件列表和电子邮件消息的顶部" @@ -1951,3 +1945,126 @@ msgstr "未选择电子邮件" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "附件超过该 Exchange 服务器政策允许的最大大小" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "新邮件" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "已保存信息" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "每2分钟" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME功能已被IT政策阻止" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "内存已满\n请删除项目" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "管理应用程序" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "来信设置" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "发出设置" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "提醒铃声" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "完成" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "科目（A 至 Z）" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "科目（Z 至 A）" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "收藏夹" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "新邮件" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%s中有%d封新电子邮件" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "%s中有1封新电子邮件" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "已读" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "未读" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "未标记" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "已标记" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "标记为收藏" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "服务器密码已更改。输入已更改的密码" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "取消标记为收藏" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "最大的电子邮件帐户数达到" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "信息预览列" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 行" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 行" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 行" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "列表中的标题行" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "供您参考" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "我会稍后打给您" + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "感谢您的电子邮件" + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "请通过手机联系我" + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "我会稍后发送回复" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "我不在办公室。我会在回来后立即回复您的电子邮件" + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "你好吗？" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "请查看附加文件" + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "我们一起吃午餐吧" + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "请稍后提醒我" + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "无法创建文件夹。已超过最大文件夹名称长度" + diff --git a/po/zh_TW.po b/po/zh_TW.po index 13b15cd..f5da8a2 100755 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -577,9 +577,6 @@ msgstr "原始郵件" msgid "IDS_EMAIL_OPT_OTHERS" msgstr "其他" -msgid "IDS_EMAIL_OPT_UNREAD" -msgstr "未讀取" - msgid "IDS_EMAIL_MBODY_HUGE" msgstr "超大" @@ -1579,9 +1576,6 @@ msgstr "主旨" msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH" msgstr "無法搜尋" -msgid "IDS_EMAIL_OPT_READ" -msgstr "已讀取" - msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES" msgstr "輕觸兩次前往聯絡人清單、電子郵件清單以及電子郵件訊息頂部" @@ -1951,3 +1945,126 @@ msgstr "沒有選擇電子郵件" msgid "IDS_EMAIL_POP_ATTACHMENT_EXCEEDS_THE_MAXIMUM_SIZE_ALLOWED_BY_THIS_EXCHANGE_SERVER_POLICY_ABB" msgstr "附件超過 Exchange 伺服器政策的檔案大小上限" +msgid "IDS_EMAIL_HEADER_NEW_EMAIL" +msgstr "新電子郵件" + +msgid "IDS_EMAIL_POP_MESSAGE_SAVED" +msgstr "訊息已存" + +msgid "IDS_EMAIL_OPT_EVERY_2_MINUTES" +msgstr "每 2 分鐘" + +msgid "IDS_EMAIL_POP_SMIME_FUNCTIONALITY_BLOCKED_BY_IT_POLICY" +msgstr "SMIME 功能被 IT 政策阻擋" + +msgid "IDS_EMAIL_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" +msgstr "記憶體不足。請刪除部分項目" + +msgid "IDS_EMAIL_BUTTON_MANAGE_APPLICATIONS" +msgstr "管理應用程式" + +msgid "IDS_EMAIL_BODY_INCOMING_SETTINGS" +msgstr "來電設定" + +msgid "IDS_EMAIL_BODY_OUTGOING_SETTINGS" +msgstr "發送設定" + +msgid "IDS_EMAIL_BODY_ALERT_RINGTONE_ABB" +msgstr "提醒鈴聲" + +msgid "IDS_EMAIL_OPT_COMPLETE_ABB" +msgstr "完成" + +msgid "IDS_EMAIL_OPT_SUBJECT_HA_TO_Z_ABB" +msgstr "主旨 (A 至 Z)" + +msgid "IDS_EMAIL_OPT_SUBJECT_HZ_TO_A_ABB" +msgstr "主旨 (Z 至 A)" + +msgid "IDS_EMAIL_OPT_FAVOURITES_ABB" +msgstr "我的最愛" + +msgid "IDS_EMAIL_BODY_NEW_EMAILS" +msgstr "新電子郵件" + +msgid "IDS_EMAIL_BODY_PD_NEW_EMAILS_IN_PS" +msgstr "%s 有 %d 封新的電子郵件" + +msgid "IDS_EMAIL_BODY_1_NEW_EMAIL_IN_PS" +msgstr "%s 中有 1 封新的電子郵件" + +msgid "IDS_EMAIL_OPT_READ_M_MARK_AS_ABB" +msgstr "已讀" + +msgid "IDS_EMAIL_OPT_UNREAD_M_MARK_AS_ABB" +msgstr "未讀" + +msgid "IDS_EMAIL_OPT_UNFLAGGED_M_SET_AS_ABB" +msgstr "未標記" + +msgid "IDS_EMAIL_OPT_FLAGGED_M_SET_AS_ABB" +msgstr "已標記" + +msgid "IDS_EMAIL_OPT_MARK_AS_FAVOURITES_ABB" +msgstr "標記為我的最愛" + +msgid "IDS_EMAIL_BODY_THE_SERVER_PASSWORD_HAS_BEEN_CHANGED_ENTER_THE_CHANGED_PASSWORD" +msgstr "伺服器密碼已變更。輸入變更的密碼" + +msgid "IDS_EMAIL_OPT_UNMARK_AS_FAVOURITES_ABB" +msgstr "取消標記為我的最愛" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "電子郵件帳號已達道最大數量" + +msgid "IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE" +msgstr "預覽行數" + +msgid "IDS_EMAIL_BODY_1_LINE" +msgstr "1 行" + +msgid "IDS_EMAIL_BODY_2_LINES" +msgstr "2 行" + +msgid "IDS_EMAIL_BODY_3_LINES" +msgstr "3 行" + +msgid "IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST" +msgstr "清單中的標題文字" + +msgid "IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE" +msgstr "僅供參考" + +msgid "IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE" +msgstr "待會回電" + +msgid "IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE" +msgstr "謝謝您的電子郵件" + +msgid "IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE" +msgstr "請撥打我的手機" + +msgid "IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE" +msgstr "稍後回覆" + +msgid "IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE" +msgstr "我目前外出。將盡快回覆電子郵件給您" + +msgid "IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE" +msgstr "你好嗎？" + +msgid "IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE" +msgstr "煩請確認附件" + +msgid "IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE" +msgstr "一起共進午餐吧！" + +msgid "IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE" +msgstr "稍後請再提醒我" + +msgid "IDS_EMAIL_BODY_SERVER_DOES_NOT_SUPPORT_THIS_ACTION" +msgstr "Server does not support this action" + +msgid "IDS_EMAIL_BODY_UNABLE_TO_CREATE_THE_FOLDER_MAXIMUM_FOLDER_NAME_LENGTH_EXCEEDED" +msgstr "無法建立資料夾。超過資料夾名稱長度上限" + diff --git a/setting/include/email-setting-defines.h b/setting/include/email-setting-defines.h index e54dc6b..926dd8a 100755 --- a/setting/include/email-setting-defines.h +++ b/setting/include/email-setting-defines.h @@ -23,11 +23,6 @@ #define PADDING_HEIGHT 400 -#define COLOR1 255 255 255 -#define COLOR2 153 153 153 -#define COLOR3 0 0 0 -#define COLOR4 128 128 128 - #endif /* __EMAIL_SETTING_DEFINE_H__ */ /* EOF */ diff --git a/setting/include/email-setting-string.h b/setting/include/email-setting-string.h new file mode 100755 index 0000000..dde6293 --- /dev/null +++ b/setting/include/email-setting-string.h @@ -0,0 +1,239 @@ +/* + Email Application + +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd All Rights Reserved +Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0 +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 __EMAIL_SETTING_STRING_H__ +#define __EMAIL_SETTING_STRING_H__ + +/* system string */ +#define EMAIL_SETTING_STRING_ACCOUNTS dgettext("sys_string", "IDS_COM_BODY_ACCOUNTS") +#define EMAIL_SETTING_STRING_EMAIL_ADDRESS dgettext("sys_string", "IDS_COM_BODY_EMAIL_ADDRESS") +#define EMAIL_SETTING_STRING_EMAIL_SIZE dgettext("sys_string", "IDS_COM_BODY_EMAIL_SIZE") +#define EMAIL_SETTING_STRING_EMAIL_SYNC dgettext("sys_string", "IDS_COM_BODY_EMAIL_SYNC") +#define EMAIL_SETTING_STRING_MANUAL dgettext("sys_string", "IDS_COM_BODY_MANUAL") +#define EMAIL_SETTING_STRING_NO_CONTENTS dgettext("sys_string", "IDS_COM_BODY_NO_CONTENTS") +#define EMAIL_SETTING_STRING_NONE dgettext("sys_string", "IDS_COM_BODY_NONE") +#define EMAIL_SETTING_STRING_OFF dgettext("sys_string", "IDS_COM_BODY_OFF") +#define EMAIL_SETTING_STRING_OTHERS dgettext("sys_string", "IDS_COM_BODY_OTHERS") +#define EMAIL_SETTING_STRING_PWD dgettext("sys_string", "IDS_COM_BODY_PASSWORD") +#define EMAIL_SETTING_STRING_SELECT_ALL dgettext("sys_string", "IDS_COM_BODY_SELECT_ALL") +#define EMAIL_SETTING_STRING_USER_NAME dgettext("sys_string", "IDS_COM_BODY_USER_NAME") +#define EMAIL_SETTING_STRING_LOGIN dgettext("sys_string", "IDS_COM_BUTTON_LOGIN") +#define EMAIL_SETTING_STRING_HEADER_EDIT dgettext("sys_string", "IDS_COM_HEADER_EDIT") +#define EMAIL_SETTING_STRING_ALREADY_EXIST dgettext("sys_string", "IDS_COM_POP_ALREDY_EXISTS") +#define EMAIL_SETTING_STRING_CONNECTION_FAIL dgettext("sys_string", "IDS_COM_POP_CONNECTION_FAILED") +#define EMAIL_SETTING_STRING_DELETED dgettext("sys_string", "IDS_COM_POP_DELETED") +#define EMAIL_SETTING_STRING_SELECTED dgettext("sys_string", "IDS_COM_POP_SELECTED") +#define EMAIL_SETTING_STRING_UNABLE_DELETE dgettext("sys_string", "IDS_COM_POP_UNABLE_TO_DELETE") +#define EMAIL_SETTING_STRING_UNKNOWN_ERROR dgettext("sys_string", "IDS_COM_POP_UNKNOWN_ERROR_OCCURRED") +#define EMAIL_SETTING_STRING_WARNING dgettext("sys_string", "IDS_COM_POP_WARNING") +#define EMAIL_SETTING_STRING_ADD dgettext("sys_string", "IDS_COM_SK_ADD") +#define EMAIL_SETTING_STRING_SK_ADD_ACCOUNT dgettext("sys_string", "IDS_COM_SK_ADD_ACCOUNT") +#define EMAIL_SETTING_STRING_CANCEL dgettext("sys_string", "IDS_COM_SK_CANCEL") +#define EMAIL_SETTING_STRING_SK_DELETE dgettext("sys_string", "IDS_COM_SK_DELETE") +#define EMAIL_SETTING_STRING_DONE dgettext("sys_string", "IDS_COM_SK_DONE") +#define EMAIL_SETTING_STRING_SK_EDIT dgettext("sys_string", "IDS_COM_SK_EDIT") +#define EMAIL_SETTING_STRING_NO dgettext("sys_string", "IDS_COM_SK_NO") +#define EMAIL_SETTING_STRING_OK dgettext("sys_string", "IDS_COM_SK_OK") +#define EMAIL_SETTING_STRING_SAVE dgettext("sys_string", "IDS_COM_SK_SAVE") +#define EMAIL_SETTING_STRING_SET dgettext("sys_string", "IDS_COM_SK_SET") +#define EMAIL_SETTING_STRING_YES dgettext("sys_string", "IDS_COM_SK_YES") + +/* application string */ +#define EMAIL_SETTING_STRING_ACCOUNT_NAME _("IDS_EMAIL_BODY_ACCOUNT_NAME") +#define EMAIL_SETTING_STRING_ADD_ADDRESS _("IDS_EMAIL_BODY_ADD_ADDRESS") +#define EMAIL_SETTING_STRING_ADDRESS _("IDS_EMAIL_BODY_ADDRESS") +#define EMAIL_SETTING_STRING_ADD_SIGNATURE _("IDS_EMAIL_BODY_ADD_SIGNATURE") +#define EMAIL_SETTING_STRING_ALERT_REP _("IDS_EMAIL_BODY_ALERT_REPETITION") +#define EMAIL_SETTING_STRING_ALWAYS_BCC _("IDS_EMAIL_BODY_ALWAYS_BCC_MYSELF") +#define EMAIL_SETTING_STRING_ALWAYS_CC_BCC _("IDS_EMAIL_BODY_ALWAYS_CC_BCC_MYSELF") +#define EMAIL_SETTING_STRING_ALWAYS_CC _("IDS_EMAIL_BODY_ALWAYS_CC_MYSELF") +#define EMAIL_SETTING_STRING_BADGE _("IDS_EMAIL_BODY_BADGE") +#define EMAIL_SETTING_STRING_DEFAULT_SENDING_ACCOUNT _("IDS_EMAIL_BODY_DEFAULT_SENDING_ACCOUNT") +#define EMAIL_SETTING_STRING_DELETING_OPTION _("IDS_EMAIL_BODY_DELETING_OPTIONS") +#define EMAIL_SETTING_STRING_DISPLAY_CONTENTS _("IDS_EMAIL_BODY_DISPLAY_CONTENTS") +#define EMAIL_SETTING_STRING_DRAFTS _("IDS_EMAIL_BODY_DRAFTS") +#define EMAIL_SETTING_STRING_EMAIL_CERT _("IDS_EMAIL_BODY_EMAIL_CERTIFICATE") +#define EMAIL_SETTING_STRING_ENCRYPT _("IDS_EMAIL_BODY_ENCRYPT") +#define EMAIL_SETTING_STRING_ENCRYPT_ALG _("IDS_EMAIL_BODY_ENCRYPTION_ALGORITHM") +#define EMAIL_SETTING_STRING_ENTIRE_EMAIL _("IDS_EMAIL_BODY_ENTIRE_EMAIL") +#define EMAIL_SETTING_STRING_E_10MIN _("IDS_EMAIL_BODY_EVERY_10_MINUTES") +#define EMAIL_SETTING_STRING_E_1H _("IDS_EMAIL_BODY_EVERY_1_HOUR") +#define EMAIL_SETTING_STRING_E_30MIN _("IDS_EMAIL_BODY_EVERY_30_MINUTES") +#define EMAIL_SETTING_STRING_E_5MIN _("IDS_EMAIL_BODY_EVERY_5_MINUTES") +#define EMAIL_SETTING_STRING_PD_H _("IDS_EMAIL_BODY_EVERY_PD_HOURS") +#define EMAIL_SETTING_STRING_PD_MIN _("IDS_EMAIL_BODY_EVERY_PD_MINUTES") +#define EMAIL_SETTING_STRING_FWD_WITH_FILES _("IDS_EMAIL_BODY_FORWARD_WITH_FILES") +#define EMAIL_SETTING_STRING_GENERAL_SETTINGS _("IDS_EMAIL_BODY_GENERAL_SETTINGS") +#define EMAIL_SETTING_STRING_HEADER_ONLY _("IDS_EMAIL_BODY_HEADER_ONLY") +#define EMAIL_SETTING_STRING_IMAP4 _("IDS_EMAIL_BODY_IMAP4") +#define EMAIL_SETTING_STRING_IMAP4_PORT _("IDS_EMAIL_BODY_IMAP4_PORT") +#define EMAIL_SETTING_STRING_IMAP4_SERVER _("IDS_EMAIL_BODY_IMAP4_SERVER") +#define EMAIL_SETTING_STRING_INCOMING_MAIL_SERVER_TYPE _("IDS_EMAIL_BODY_INCOMING_MAIL_SERVER_TYPE") +#define EMAIL_SETTING_STRING_INCOMING_PORT _("IDS_EMAIL_BODY_INCOMING_PORT") +#define EMAIL_SETTING_STRING_INCOMING_SERVER _("IDS_EMAIL_BODY_INCOMING_SERVER") +#define EMAIL_SETTING_STRING_MAILBOX_SETUP _("IDS_EMAIL_BODY_MAILBOX_SETUP") +#define EMAIL_SETTING_STRING_MANUAL_SETUP _("IDS_EMAIL_BODY_MANUAL_SETUP") +#define EMAIL_SETTING_STRING_EAS _("IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC") +#define EMAIL_SETTING_STRING_NO_ADDR _("IDS_EMAIL_BODY_NO_ADDRESS") +#define EMAIL_SETTING_STRING_NOTI _("IDS_EMAIL_BODY_NOTIFICATION") +#define EMAIL_SETTING_STRING_NUM_EMAIL_TO_LOAD _("IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB") +#define EMAIL_SETTING_STRING_ONCE _("IDS_EMAIL_BODY_ONCE") +#define EMAIL_SETTING_STRING_ONCE_A_DAY _("IDS_EMAIL_BODY_ONCE_A_DAY") +#define EMAIL_SETTING_STRING_OUTGOING_PORT _("IDS_EMAIL_BODY_OUTGOING_PORT") +#define EMAIL_SETTING_STRING_OUTGOING_SERVER _("IDS_EMAIL_BODY_OUTGOING_SERVER") +#define EMAIL_SETTING_STRING_PHONE_AND_SERVER _("IDS_EMAIL_BODY_PHONE_AND_SERVER") +#define EMAIL_SETTING_STRING_PHONE_ONLY _("IDS_EMAIL_BODY_PHONE_ONLY") +#define EMAIL_SETTING_STRING_POP3 _("IDS_EMAIL_BODY_POP3") +#define EMAIL_SETTING_STRING_POP3_BEFORE_SMTP _("IDS_EMAIL_BODY_POP3_BEFORE_SMTP") +#define EMAIL_SETTING_STRING_POP3_PORT _("IDS_EMAIL_BODY_POP3_PORT") +#define EMAIL_SETTING_STRING_POP3_SERVER _("IDS_EMAIL_BODY_POP3_SERVER") +#define EMAIL_SETTING_STRING_PRIORITY_SENDERS _("IDS_EMAIL_BODY_PRIORITY_SENDERS") +#define EMAIL_SETTING_STRING_RECEIVING_OPTIONS _("IDS_EMAIL_BODY_RECEIVING_OPTIONS") +#define EMAIL_SETTING_STRING_REPLY_WITH_BODY _("IDS_EMAIL_BODY_REPLY_WITH_BODY") +#define EMAIL_SETTING_STRING_REQUEST_DELIVERY_REPORTS _("IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS") +#define EMAIL_SETTING_STRING_REQUEST_READ_REPORTS _("IDS_EMAIL_BODY_REQUEST_READ_REPORTS") +#define EMAIL_SETTING_STRING_SAME_AS_POP3_IMAP4 _("IDS_EMAIL_BODY_SAME_AS_POP3_IMAP4") +#define EMAIL_SETTING_STRING_SECURE_CONNECTION _("IDS_EMAIL_BODY_SECURE_CONNECTION") +#define EMAIL_SETTING_STRING_SECURITY_OPTIONS _("IDS_EMAIL_BODY_SECURITY_OPTIONS") +#define EMAIL_SETTING_STRING_SEND_EMAIL_FROM_THIS_ACCOUNT_BY_DEFAULT _("IDS_EMAIL_BODY_SEND_EMAIL_FROM_THIS_ACCOUNT_BY_DEFAULT") +#define EMAIL_SETTING_STRING_SENDING_OPTIONS _("IDS_EMAIL_BODY_SENDING_OPTIONS") +#define EMAIL_SETTING_STRING_SEND_READ_REPORT _("IDS_EMAIL_BODY_SEND_READ_REPORT") +#define EMAIL_SETTING_STRING_SENTBOX _("IDS_EMAIL_BODY_SENTBOX") +#define EMAIL_SETTING_STRING_SENT_FROM_SAMSUNG_MOBILE _("IDS_EMAIL_BODY_SENT_FROM_SAMSUNG_MOBILE") +#define EMAIL_SETTING_STRING_SHOW_IMAGES _("IDS_EMAIL_BODY_SHOW_IMAGES") +#define EMAIL_SETTING_STRING_SHOW_PASSWORD _("IDS_EMAIL_BODY_SHOW_PASSWORD") +#define EMAIL_SETTING_STRING_SIGN _("IDS_EMAIL_BODY_SIGN") +#define EMAIL_SETTING_STRING_SIGN_ALGORITHM _("IDS_EMAIL_BODY_SIGN_ALGORITHM") +#define EMAIL_SETTING_STRING_SIGNATURE _("IDS_EMAIL_BODY_SIGNATURE") +#define EMAIL_SETTING_STRING_SMTP_AUTHENTICATION _("IDS_EMAIL_BODY_SMTP_AUTHENTICATION") +#define EMAIL_SETTING_STRING_SPAMBOX _("IDS_EMAIL_BODY_SPAMBOX") +#define EMAIL_SETTING_STRING_SSL _("IDS_EMAIL_BODY_SSL") +#define EMAIL_SETTING_STRING_SYNC_SCHEDULE _("IDS_EMAIL_BODY_SYNC_SCHEDULE") +#define EMAIL_SETTING_STRING_TLS _("IDS_EMAIL_BODY_TLS") +#define EMAIL_SETTING_STRING_TRASH _("IDS_EMAIL_BODY_TRASH") +#define EMAIL_SETTING_STRING_FIRST_SIGN_UP _("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") +#define EMAIL_SETTING_STRING_ACCOUNT_SETTINGS _("IDS_EMAIL_HEADER_ACCOUNT_SETTINGS") +#define EMAIL_SETTING_STRING_ADD_ACCOUNT _("IDS_EMAIL_HEADER_ADD_ACCOUNT") +#define EMAIL_SETTING_STRING_DELETE _("IDS_EMAIL_HEADER_DELETE") +#define EMAIL_SETTING_STRING_EMAIL_SETTINGS _("IDS_EMAIL_HEADER_EMAIL_SETTINGS") +#define EMAIL_SETTING_STRING_HEADER_MAILBOX_SETUP _("IDS_EMAIL_HEADER_MAILBOX_SETUP") +#define EMAIL_SETTING_STRING_NOTIFICATION_SETTINGS _("IDS_EMAIL_HEADER_NOTIFICATION_SETTINGS") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATES _("IDS_EMAIL_HEADER_TEXT_TEMPLATES") +#define EMAIL_SETTING_STRING_BLOCK _("IDS_EMAIL_OPT_BLOCK") +#define EMAIL_SETTING_STRING_PD_MOST_RECENT_EMAILS _("IDS_EMAIL_OPT_PD_MOST_RECENT_EMAILS") +#define EMAIL_SETTING_STRING_REFRESH _("IDS_EMAIL_OPT_REFRESH") +#define EMAIL_SETTING_STRING_ACCOUNT_ALREADY_EXISTS _("IDS_EMAIL_POP_ACCOUNT_ALREADY_EXISTS") +#define EMAIL_SETTING_STRING_ACCOUNT_CREATION_CANCELLED _("IDS_EMAIL_POP_ACCOUNT_CREATION_CANCELLED") +#define EMAIL_SETTING_STRING_ACCOUNT_EDITED _("IDS_EMAIL_POP_ACCOUNT_EDITED") +#define EMAIL_SETTING_STRING_ACCOUNT_LIST_NOT_FOUND _("IDS_EMAIL_POP_ACCOUNT_LIST_NOT_FOUND") +#define EMAIL_SETTING_STRING_EAS_ACCOUNT_UNAVAIL _("IDS_EMAIL_POP_ACTIVESYNC_EXCHANGE_ACCOUNT_NOT_AVAILABLE") +#define EMAIL_SETTING_STRING_ALERT _("IDS_EMAIL_POP_ALERT") +#define EMAIL_SETTING_STRING_ALL_DATA_DELETED_Q _("IDS_EMAIL_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q") +#define EMAIL_SETTING_STRING_ALREADY_BLOCKED _("IDS_EMAIL_POP_ALREADY_BLOCKED") +#define EMAIL_SETTING_STRING_AUTHENTICATION_FAILED _("IDS_EMAIL_POP_AUTHENTICATION_FAILED") +#define EMAIL_SETTING_STRING_DEVICE_STORAGE_FULL _("IDS_EMAIL_POP_DEVICE_STORAGE_FULL") +#define EMAIL_SETTING_STRING_DOWNLOAD_CANCELLED _("IDS_EMAIL_POP_DOWNLOAD_CANCELLED") +#define EMAIL_SETTING_STRING_EMAIL_DELETED_FROM_SERVER _("IDS_EMAIL_POP_EMAIL_DELETED_FROM_SERVER") +#define EMAIL_SETTING_STRING_EAS_UNAVAIL_NOTI _("IDS_EMAIL_POP_EXCHANGE_ACTIVESYNC_ACCOUNT_NOT_AVAILABLE_NOTI") +#define EMAIL_SETTING_STRING_FAILED_TO_START_EMAIL_APPLICATION _("IDS_EMAIL_POP_FAILED_TO_START_EMAIL_APPLICATION") +#define EMAIL_SETTING_STRING_HOST_NOT_FOUND _("IDS_EMAIL_POP_HOST_NOT_FOUND") +#define EMAIL_SETTING_STRING_INCORRECT_USER_NAME_OR_PASSWORD _("IDS_EMAIL_POP_INCORRECT_USER_NAME_OR_PASSWORD") +#define EMAIL_SETTING_STRING_INVALID_EMAIL_ADDRESS _("IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS") +#define EMAIL_SETTING_STRING_NETWORK_BUSY _("IDS_EMAIL_POP_NETWORK_BUSY") +#define EMAIL_SETTING_STRING_NO_EMAIL_ADDRESS _("IDS_EMAIL_POP_NO_EMAIL_ADDRESS") +#define EMAIL_SETTING_STRING_FILL_MANDATORY_FIELDS _("IDS_EMAIL_POP_PLEASE_FILL_ALL_THE_MANDATORY_FIELDS") +#define EMAIL_SETTING_STRING_QUERYING_SERVER_INFORMATION_ING _("IDS_EMAIL_POP_QUERYING_SERVER_INFORMATION_ING") +#define EMAIL_SETTING_STRING_SECURITY_POLICY_USE_EMAIL _("IDS_EMAIL_POP_SECURITY_POLICY_RESTRICTS_USE_OF_POP_IMAP_EMAIL") +#define EMAIL_SETTING_STRING_SERVER_QUERY_FAIL _("IDS_EMAIL_POP_SERVER_INFORMATION_QUERY_FAILED_ENTER_SERVER_INFORMATION_MANUALLY") +#define EMAIL_SETTING_STRING_SERVER_NOT_AVAILABLE _("IDS_EMAIL_POP_SERVER_NOT_AVAILABLE") +#define EMAIL_SETTING_STRING_SUCCEEDED _("IDS_EMAIL_POP_SUCCEEDED") +#define EMAIL_SETTING_STRING_NO_ACCOUNT _("IDS_EMAIL_POP_THERE_IS_NO_ACCOUNT_CREATE_A_NEW_ACCOUNT_FIRST") +#define EMAIL_SETTING_STRING_UNABLE_TO_ADD_ACCOUNT _("IDS_EMAIL_POP_UNABLE_TO_ADD_ACCOUNT") +#define EMAIL_SETTING_STRING_VALIDATING_ACCOUNT_ING _("IDS_EMAIL_POP_VALIDATING_ACCOUNT_ING") +#define EMAIL_SETTING_STRING_VALIDATION_FAILED _("IDS_EMAIL_POP_VALIDATION_FAILED") +#define EMAIL_SETTING_STRING_ONLY_LOG_PD_MIN _("IDS_EMAIL_POP_YOU_CAN_ONLY_LOG_IN_ONCE_EVERY_PD_MINUTES") +#define EMAIL_SETTING_STRING_INCOMING_SETTINGS _("IDS_EMAIL_BODY_INCOMING_SETTINGS") +#define EMAIL_SETTING_STRING_OUTGOING_SETTINGS _("IDS_EMAIL_BODY_OUTGOING_SETTINGS") +#define EMAIL_SETTING_STRING_ALERT_RINGTON _("IDS_EMAIL_BODY_ALERT_RINGTONE_ABB") +#define EMAIL_SETTING_STRING_FONT_SIZE _("IDS_EMAIL_OPT_FONT_SIZE") +#define EMAIL_SETTING_STRING_ACCOUNT_NUM_MAX _("IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED") +#define EMAIL_SETTING_STRING_SUBJECT _("IDS_EMAIL_BODY_SUBJECT") +#define EMAIL_SETTING_STRING_SENDER _("IDS_EMAIL_OPT_SENDER") +#define EMAIL_SETTING_STRING_MSG_PREVIEW_LINE _("IDS_EMAIL_BODY_MESSAGE_PREVIEW_LINE") +#define EMAIL_SETTING_STRING_MSG_PREVIEW_LINE_1LINE _("IDS_EMAIL_BODY_1_LINE") +#define EMAIL_SETTING_STRING_MSG_PREVIEW_LINE_2LINE _("IDS_EMAIL_BODY_2_LINES") +#define EMAIL_SETTING_STRING_MSG_PREVIEW_LINE_3LINE _("IDS_EMAIL_BODY_3_LINES") +#define EMAIL_SETTING_STRING_TITLE_LINE_IN_LIST _("IDS_EMAIL_MBODY_TITLE_LINE_IN_LIST") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_1 _("IDS_EMAIL_BODY_FOR_YOUR_INFORMATION_M_QUICK_RESPONSE") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_2 _("IDS_EMAIL_BODY_ILL_CALL_YOU_LATER_M_QUICK_RESPONSE") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_3 _("IDS_EMAIL_BODY_THANK_YOU_FOR_YOUR_EMAIL_M_QUICK_RESPONSE") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_4 _("IDS_EMAIL_BODY_PLEASE_CONTACT_ME_VIA_MY_MOBILE_PHONE_M_QUICK_RESPONSE") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_5 _("IDS_EMAIL_BODY_ILL_SEND_A_REPLY_LATER_M_QUICK_RESPONSE") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_6 _("IDS_EMAIL_BODY_I_AM_OUT_OF_THE_OFFICE_I_WILL_RESPOND_TO_YOUR_EMAIL_AS_SOON_AS_POSSIBLE_ON_MY_RETURN_M_QUICK_RESPONSE") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_7 _("IDS_EMAIL_BODY_HOW_ARE_YOU_Q_M_QUICK_RESPONSE") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_8 _("IDS_EMAIL_BODY_PLEASE_CHECK_THE_ATTACHED_FILE_M_QUICK_RESPONSE") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_9 _("IDS_EMAIL_BODY_LETS_MEET_FOR_LUNCH_M_QUICK_RESPONSE") +#define EMAIL_SETTING_STRING_TEXT_TEMPLATE_10 _("IDS_EMAIL_BODY_PLEASE_REMIND_ME_LATER_M_QUICK_RESPONSE") + +/* strings undefined */ +#define EMAIL_SETTING_STRING_AES_128 N_("AES 128bit") +#define EMAIL_SETTING_STRING_AES_192 N_("AES 192bit") +#define EMAIL_SETTING_STRING_AES_256 N_("AES 256bit") +#define EMAIL_SETTING_STRING_AUTH_NOT_SUPPORT N_("Authentication not supported") +#define EMAIL_SETTING_STRING_AUTH_REQ N_("Authentication required") +#define EMAIL_SETTING_STRING_CANCEL_USER N_("Cancelled by user") +#define EMAIL_SETTING_STRING_CERT_FAIL N_("Certificate failure") +#define EMAIL_SETTING_STRING_DISCONNECT N_("Connection disconnected") +#define EMAIL_SETTING_STRING_CONN_BROKEN N_("Connection was broken") +#define EMAIL_SETTING_STRING_DB_FAIL N_("DB operation failed") +#define EMAIL_SETTING_STRING_DES N_("DES") +#define EMAIL_SETTING_STRING_FAIL_SECURITY_POLICY N_("Failed by security policy") +#define EMAIL_SETTING_STRING_FAIL_CREATE_THREAD N_("Failed to create thread") +#define EMAIL_SETTING_STRING_FAIL_PARSE_XML N_("Failed to parse resource XML") +#define EMAIL_SETTING_STRING_FLIGHT_ENABLE N_("Flight mode enabled") +#define EMAIL_SETTING_STRING_MD5 N_("MD5") +#define EMAIL_SETTING_STRING_NETWORK_UNAVAIL N_("Network not available") +#define EMAIL_SETTING_STRING_NO_SERVER_RESPONSE N_("No server response") +#define EMAIL_SETTING_STRING_NO_SIM N_("No SIM inserted") +#define EMAIL_SETTING_STRING_RC2_128 N_("RC2 128bit") +#define EMAIL_SETTING_STRING_RC2_40 N_("RC2 40bit") +#define EMAIL_SETTING_STRING_RC2_64 N_("RC2 64bit") +#define EMAIL_SETTING_STRING_SECURE_STORAGE_FAIL N_("Secure storage failure") +#define EMAIL_SETTING_STRING_SEED N_("SEED") +#define EMAIL_SETTING_STRING_TLS_NOT_SUPPORTED N_("Server not support TLS") +#define EMAIL_SETTING_STRING_SHA_1 N_("SHA-1") +#define EMAIL_SETTING_STRING_SOCKET_FAIL N_("Socket operation failed") +#define EMAIL_SETTING_STRING_SYSTEM_FAIL N_("Sytem failure") +#define EMAIL_SETTING_STRING_TLS_SSL_FAIL N_("TLS/SSL failure") +#define EMAIL_SETTING_STRING_MANY_LOGIN_FAIL N_("Too many login failure") +#define EMAIL_SETTING_STRING_TRIPLE_DES N_("Triple DES") +#define EMAIL_SETTING_STRING_VALIDATE_ACCOUNT_FAIL N_("Validate account failure") +#define EMAIL_SETTING_STRING_FILTER_SETTINGS N_("Filter settings") +#define EMAIL_SETTING_STRING_GENERAL N_("General") + +// TTS +#define EMAIL_SETTING_STRING_LIST N_("List") +#define EMAIL_SETTING_STRING_DOUBLE_TAP_OPEN N_("Double tap to open list") +#define EMAIL_SETTING_STRING_EXP_LIST N_("Expandable list") +#define EMAIL_SETTING_STRING_ONOFF_BTN N_("On/Off button") +#define EMAIL_SETTING_STRING_ON N_("On") +#define EMAIL_SETTING_STRING_EDITFIELD N_("Editfield") +#define EMAIL_SETTING_STRING_TEMPLATE N_("Template") +#define EMAIL_SETTING_STRING_EDIT_TEMPLATE_SAVED N_("Saved") +#define EMAIL_SETTING_STRING_EDIT_TEMPLATE_ADDED N_("Added") +#define EMAIL_SETTING_STRING_EDIT_TEMPLATE_FAILED N_("Failed") +#define EMAIL_SETTING_STRING_NO_TEMPLATES N_("No Templates") + +#endif /* __EMAIL_SETTING_STRING_H__ */ diff --git a/setting/include/email-setting-view.h b/setting/include/email-setting-view.h index f39e9f2..35c9d96 100755 --- a/setting/include/email-setting-view.h +++ b/setting/include/email-setting-view.h @@ -49,6 +49,7 @@ struct viewdata { int (*destroy) (struct viewdata *vd); int (*show) (struct viewdata *vd); int (*hide) (struct viewdata *vd); + int (*lang_change) (struct viewdata *vd); Evas_Object *ly; Evas_Object *layout; diff --git a/setting/include/email-setting.h b/setting/include/email-setting.h index 2a96a59..2adf454 100755 --- a/setting/include/email-setting.h +++ b/setting/include/email-setting.h @@ -42,6 +42,7 @@ #include "email-common-types.h" #include "email-setting-defines.h" #include "email-setting-view.h" +#include "email-setting-string.h" #define SETTING_PACKAGE "email-setting" #define EDJ_PATH EDJDIR @@ -116,6 +117,7 @@ struct ug_data { Evas_Object *layout_main; Evas_Object *base; Evas_Object *bg; + Evas_Object *conformant; Evas_Object *popup_one; Evas_Object *popup_validate; Evas_Object *popup_color; diff --git a/setting/src/email-setting-account-set.c b/setting/src/email-setting-account-set.c index 34cc975..70fae10 100755 --- a/setting/src/email-setting-account-set.c +++ b/setting/src/email-setting-account-set.c @@ -242,7 +242,9 @@ static void _set_others_email(struct viewdata *vd) int rgb = 0x006400ff; _set_display_name_with_email_addr(account->user_email_address, &(account->user_display_name)); - _set_user_name_with_email_addr(account->user_email_address, &(account->incoming_server_user_name)); + //_set_user_name_with_email_addr(account->user_email_address, &(account->incoming_server_user_name)); + if (!account->incoming_server_user_name) + _set_user_name_with_email_addr(account->user_email_address, &(account->incoming_server_user_name)); account->user_display_name = g_strdup(account->incoming_server_user_name); account->reply_to_address = g_strdup(account->user_email_address); diff --git a/setting/src/email-setting.c b/setting/src/email-setting.c index a4a9387..6f1bd39 100755 --- a/setting/src/email-setting.c +++ b/setting/src/email-setting.c @@ -66,6 +66,8 @@ static void _popup_ok_cb(void *data, Evas_Object *obj, void *event_info); static void _create_max_account_popup_create(EmailSettingUGD *ugd); static void _max_account_popup_ok_cb(void *data, Evas_Object *obj, void *event_info); +static void _language_changed_cb(EmailSettingUGD *ugd); + UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops) { @@ -139,13 +141,9 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi /* Init Setting View Data */ _init_data(ugd); - /* DBUS */ - _dbus_receiver_setup(ugd); - /* theme extension */ ugd->theme = elm_theme_new(); elm_theme_ref_set(ugd->theme, NULL); - /*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); @@ -172,6 +170,7 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h service, voi case UG_EVENT_LOW_BATTERY: break; case UG_EVENT_LANG_CHANGE: + _language_changed_cb(ugd); break; case UG_EVENT_ROTATE_PORTRAIT: case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN: @@ -306,11 +305,6 @@ static void on_destroy(ui_gadget_h ug, service_h service, void *priv) ugd->popup_validate = NULL; } - if (ugd->password_timer) { - ecore_timer_del(ugd->password_timer); - ugd->password_timer = NULL; - } - if (ugd->focus_timer) { ecore_timer_del(ugd->focus_timer); ugd->focus_timer = NULL; @@ -339,7 +333,6 @@ static void on_destroy(ui_gadget_h ug, service_h service, void *priv) setting_free_sp_desc(ugd); /* theme extension */ - /*elm_theme_extension_del(ugd->theme, EV_BLOCK_THEME_PATH);*/ elm_theme_free(ugd->theme); /* Free Viewdata's memory */ @@ -392,22 +385,24 @@ static void on_start(ui_gadget_h ug, service_h service, void *priv) { debug_log(""); struct ug_data *ugd; + int ret = 0; if (!ug || !priv) return; ugd = priv; + ugd->conformant = (Evas_Object *)ug_get_conformant(); /* Init Email Service */ if (!email_engine_initialize()) { Evas_Object *popup = elm_popup_add(ugd->layout_main); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_part_text_set(popup, "title,text", dgettext("sys_string", "IDS_COM_POP_WARNING")); - elm_object_text_set(popup, _("IDS_EMAIL_POP_FAILED_TO_START_EMAIL_APPLICATION")); + elm_object_part_text_set(popup, "title,text", EMAIL_SETTING_STRING_WARNING); + elm_object_text_set(popup, EMAIL_SETTING_STRING_FAILED_TO_START_EMAIL_APPLICATION); 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_OK")); + elm_object_text_set(btn1, EMAIL_SETTING_STRING_OK); elm_object_part_content_set(popup, "button1", btn1); evas_object_smart_callback_add(btn1, "clicked", _popup_ok_cb, ugd); evas_object_show(popup); @@ -426,12 +421,12 @@ static void on_start(ui_gadget_h ug, service_h service, void *priv) if(!xml_source) { Evas_Object *popup = elm_popup_add(ugd->layout_main); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_part_text_set(popup, "title,text", dgettext("sys_string", "IDS_COM_POP_WARNING")); - elm_object_text_set(popup, N_("Failed to parse resource XML")); + elm_object_part_text_set(popup, "title,text", EMAIL_SETTING_STRING_WARNING); + elm_object_text_set(popup, EMAIL_SETTING_STRING_FAIL_PARSE_XML); 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_OK")); + elm_object_text_set(btn1, EMAIL_SETTING_STRING_OK); elm_object_part_content_set(popup, "button1", btn1); evas_object_smart_callback_add(btn1, "clicked", _popup_ok_cb, ugd); evas_object_show(popup); @@ -458,6 +453,9 @@ static void on_start(ui_gadget_h ug, service_h service, void *priv) _dispatch_view(ugd); + /* DBUS */ + _dbus_receiver_setup(ugd); + return; } @@ -727,12 +725,12 @@ static int _parse_option(service_h service, struct ug_data *ugd) debug_critical("account info is @niL"); Evas_Object *popup = elm_popup_add(ugd->layout_main); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_part_text_set(popup, "title,text", dgettext("sys_string", "IDS_COM_POP_WARNING")); - elm_object_text_set(popup, _("IDS_EMAIL_POP_ACCOUNT_LIST_NOT_FOUND")); + elm_object_part_text_set(popup, "title,text", EMAIL_SETTING_STRING_WARNING); + elm_object_text_set(popup, EMAIL_SETTING_STRING_ACCOUNT_LIST_NOT_FOUND); 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_OK")); + elm_object_text_set(btn1, EMAIL_SETTING_STRING_OK); elm_object_part_content_set(popup, "button1", btn1); evas_object_smart_callback_add(btn1, "clicked", _popup_ok_cb, ugd); evas_object_show(popup); @@ -769,12 +767,12 @@ static int _parse_option(service_h service, struct ug_data *ugd) debug_critical("account info is @niL"); Evas_Object *popup = elm_popup_add(ugd->layout_main); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_part_text_set(popup, "title,text", dgettext("sys_string", "IDS_COM_POP_WARNING")); - elm_object_text_set(popup, _("IDS_EMAIL_POP_ACCOUNT_LIST_NOT_FOUND")); + elm_object_part_text_set(popup, "title,text", EMAIL_SETTING_STRING_WARNING); + elm_object_text_set(popup, EMAIL_SETTING_STRING_ACCOUNT_LIST_NOT_FOUND); 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_OK")); + elm_object_text_set(btn1, EMAIL_SETTING_STRING_OK); elm_object_part_content_set(popup, "button1", btn1); evas_object_smart_callback_add(btn1, "clicked", _popup_ok_cb, ugd); evas_object_show(popup); @@ -982,11 +980,11 @@ static void _create_max_account_popup_create(EmailSettingUGD *ugd) debug_log(""); Evas_Object *popup = elm_popup_add(ugd->win); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(popup, N_("Maximum number of email accounts reached")); + elm_object_text_set(popup, EMAIL_SETTING_STRING_ACCOUNT_NUM_MAX); ugd->popup_one = popup; //Use ugd->popup_one member Evas_Object *btn1 = elm_button_add(popup); - elm_object_text_set(btn1, dgettext("sys_string", "IDS_COM_SK_OK")); + elm_object_text_set(btn1, EMAIL_SETTING_STRING_OK); elm_object_part_content_set(popup, "button1", btn1); evas_object_smart_callback_add(btn1, "clicked", _max_account_popup_ok_cb, ugd); evas_object_show(popup); @@ -1012,4 +1010,24 @@ static void _max_account_popup_ok_cb(void *data, Evas_Object *obj, void *event_i } +static void _language_changed_cb(EmailSettingUGD *ugd) +{ + debug_log(""); + struct viewdata *vd = NULL; + int count; + Viewtype cur_view;; + + if (ugd->view_top < 0) { + debug_log("View stack is empty.."); + return; + } + + for (count = ugd->view_top; count >= 0; count--) { + cur_view = ugd->view_st[count]; + vd = ugd->vd[cur_view]; + debug_log("language change: %s", vd->grp_nm); + if (vd->lang_change) + vd->lang_change(vd); + } +} /* EOF */ diff --git a/setting/src/email-view-account-edit.c b/setting/src/email-view-account-edit.c index 027609a..e1cf98e 100755 --- a/setting/src/email-view-account-edit.c +++ b/setting/src/email-view-account-edit.c @@ -24,6 +24,7 @@ static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_list(struct viewdata *vd); @@ -42,6 +43,8 @@ static Eina_Bool _after_save_cb(void *data); static void _popup_ok_cb(void *data, Evas_Object *obj, void *event_info); static void _popup_cancel_validation_cb(void *data, Evas_Object *obj, void *event_info); +static void _input_panel_state_up_cb(void *data, Evas_Object *obj, void *event_info); +static void _input_panel_state_down_cb(void *data, Evas_Object *obj, void *event_info); 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); @@ -69,9 +72,32 @@ static void _gl_con_cb(void *data, Evas_Object *obj, void *event_info); static struct viewdata *g_vd = NULL; +enum { + ACCOUNT_NAME_LIST_ITEM = 1, + EMAIL_ADDRESS_LIST_ITEM, + USERNAME_LIST_ITEM, + PASSWORD_LIST_ITEM, + OUTGOING_SETTING_TITLE_LIST_ITEM, + OUTGOING_SERVER_LIST_ITEM, + OUTGOING_PORT_LIST_ITEM, + OUTGOING_SECURE_CONN_LIST_ITEM, + INCOMING_SETTING_TITLE_LIST_ITEM, + INCOMMING_SERVER_TYPE_LIST_ITEM, + POP3_SERVER_LIST_ITEM, + POP3_PORT_LIST_ITEM, + POP3_SECURE_CONN_LIST_ITEM, + POP3_BEFORE_SMTP_LIST_ITEM, + SMTP_AUTH_LIST_ITEM, + SAME_POP3_IMAP4_LIST_ITEM, + SMTP_USERNAME_LIST_ITEM, + SMTP_PASSWORD_LIST_ITEM +}; + struct priv_data { struct viewdata *vd; + GSList *list_items; + Evas_Object *entry_account_name; Evas_Object *entry_email_address; Evas_Object *entry_user_name; @@ -99,45 +125,23 @@ struct priv_data { Evas_Object *sending_secure_radio_grp; Evas_Object *incoming_secure_radio_grp; Evas_Object *genlist; + Elm_Object_Item *navi_it; Evas_Object *l_button; Evas_Object *r_button1; Evas_Object *r_button2; Evas_Object *tool_btn; - Evas_Object *clicked_object; Evas_Object *cbar; Evas_Object *onoff[3]; Elm_Genlist_Item_Class itc_sep; - Elm_Genlist_Item_Class itc_sep2; Elm_Genlist_Item_Class itc_ef; Elm_Genlist_Item_Class itc_secure; Elm_Genlist_Item_Class itc_ex_sending; Elm_Genlist_Item_Class itc_ex_incoming; - Elm_Genlist_Item_Class itc_title; Elm_Genlist_Item_Class itc_type; Elm_Genlist_Item_Class itc_onoff; - - Elm_Object_Item *gl_account_name_item; - Elm_Object_Item *gl_email_addr_item; - Elm_Object_Item *gl_user_name_item; - Elm_Object_Item *gl_pw_item; - - Elm_Object_Item *gl_smtp_server_item; - Elm_Object_Item *gl_smtp_port_item; - Elm_Object_Item *gl_ex_item1; - - Elm_Object_Item *gl_incoming_server_type_item; - Elm_Object_Item *gl_incoming_server_item; - Elm_Object_Item *gl_incoming_port_item; - Elm_Object_Item *gl_ex_item2; - - Elm_Object_Item *gl_pop3_before_smtp_item; - Elm_Object_Item *gl_smtp_auth_item; - Elm_Object_Item *gl_same_item; - Elm_Object_Item *gl_sending_user_item; - Elm_Object_Item *gl_sending_pw_item; - Elm_Object_Item * c_item[4]; + Elm_Genlist_Item_Class itc_title; char *str_account_name; char *str_user_name; @@ -158,6 +162,12 @@ struct priv_data { int handle; }; +typedef struct _ListItemData { + int index; + Elm_Object_Item *gl_it; + struct priv_data *p; +} ListItemData; + void setting_init_account_edit_view(struct viewdata *vd) { debug_log(""); @@ -167,6 +177,7 @@ void setting_init_account_edit_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_account_edit"; } @@ -228,14 +239,14 @@ void setting_edit_validation_failed_cb(EmailSettingUGD *ugd, gboolean canceled) char *err_msg = setting_get_service_fail_type(ugd->err_code); if (canceled) { - snprintf(fail_msg, sizeof(fail_msg), "%s", _("IDS_EMAIL_POP_ACCOUNT_CREATION_CANCELLED")); - ugd->popup_one = setting_get_notify(vd, dgettext("sys_string", "IDS_COM_POP_WARNING"), fail_msg, 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + snprintf(fail_msg, sizeof(fail_msg), "%s", EMAIL_SETTING_STRING_ACCOUNT_CREATION_CANCELLED); + ugd->popup_one = setting_get_notify(vd, EMAIL_SETTING_STRING_WARNING, fail_msg, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); } else { - snprintf(fail_msg, sizeof(fail_msg), "%s
%s", _("IDS_EMAIL_POP_VALIDATION_FAILED"), err_msg); - ugd->popup_one = setting_get_notify(vd, dgettext("sys_string", "IDS_COM_POP_WARNING"), fail_msg, 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + snprintf(fail_msg, sizeof(fail_msg), "%s
%s", EMAIL_SETTING_STRING_VALIDATION_FAILED, err_msg); + ugd->popup_one = setting_get_notify(vd, EMAIL_SETTING_STRING_WARNING, fail_msg, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); } @@ -297,10 +308,8 @@ static int _destroy(struct viewdata *vd) return FALSE; } - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) - ecore_imf_context_input_panel_hide(imf_context); + evas_object_smart_callback_del(vd->ugd->conformant, "virtualkeypad,state,on", _input_panel_state_up_cb); + evas_object_smart_callback_del(vd->ugd->conformant, "virtualkeypad,state,off", _input_panel_state_down_cb); evas_object_del(p->l_button); evas_object_del(p->r_button1); @@ -391,6 +400,13 @@ static int _destroy(struct viewdata *vd) account_data = NULL; } + GSList *l = p->list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->list_items); + return TRUE; } @@ -420,43 +436,39 @@ static int _hide(struct viewdata *vd) return TRUE; } -static void _push_naviframe(struct viewdata *vd) +static int _lang_change(struct viewdata *vd) { debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + struct priv_data *p = vd->priv; - /*p->cbar = elm_toolbar_add(vd->ugd->navi_bar); - elm_toolbar_shrink_mode_set(p->cbar, ELM_TOOLBAR_SHRINK_EXPAND); - elm_object_style_set(p->cbar, "naviframe"); - evas_object_show(p->cbar); + // refreshing genlist. + elm_genlist_realized_items_update(p->genlist); + + // set button + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_SET); + + return TRUE; +} - p->c_item[0] = elm_toolbar_item_append(p->cbar, NULL, - dgettext("sys_string", "IDS_COM_SK_SET"), _save_cb, vd); - elm_object_item_disabled_set(elm_toolbar_item_append(p->cbar, NULL, "", NULL, NULL), EINA_TRUE); - elm_object_item_disabled_set(elm_toolbar_item_append(p->cbar, NULL, "", NULL, NULL), EINA_TRUE);*/ +static void _push_naviframe(struct viewdata *vd) +{ + debug_log(""); + struct priv_data *p = vd->priv; p->l_button = elm_button_add(vd->ugd->navi_bar); - //elm_object_style_set(p->l_button, "naviframe/title/default"); elm_object_style_set(p->l_button, "naviframe/back_btn/default"); - //elm_object_text_set(p->l_button, dgettext("sys_string", "IDS_COM_SK_CANCEL")); evas_object_smart_callback_add(p->l_button, "clicked", _back_cb, vd); evas_object_show(p->l_button); - /*p->r_button1 = elm_button_add(vd->ugd->navi_bar); - elm_object_style_set(p->r_button1, "naviframe/title/default"); - elm_object_text_set(p->r_button1, dgettext("sys_string", "IDS_COM_SK_DELETE")); - evas_object_smart_callback_add(p->r_button1, "clicked", _delete_cb, vd); - evas_object_show(p->r_button1);*/ - - /*p->r_button2 = elm_button_add(vd->ugd->navi_bar); - elm_object_style_set(p->r_button2, "naviframe/title/default"); - elm_object_text_set(p->r_button2, dgettext("sys_string", "IDS_COM_SK_SAVE")); - evas_object_smart_callback_add(p->r_button2, "clicked", _save_cb, vd); - evas_object_show(p->r_button2);*/ - p->tool_btn = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->tool_btn, "naviframe/toolbar/default"); - elm_object_text_set(p->tool_btn, dgettext("sys_string", "IDS_COM_SK_SET")); + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_SET); evas_object_smart_callback_add(p->tool_btn, "clicked", _save_cb, vd); Evas_Object *title_ic = elm_icon_add(vd->ugd->navi_bar); @@ -469,8 +481,10 @@ static void _push_naviframe(struct viewdata *vd) Elm_Object_Item *navi_it = NULL; navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, p->str_account_name, p->l_button, NULL, p->layout, NULL); - /*elm_object_item_part_content_set(navi_it, "title_left_btn", p->r_button1); - elm_object_item_part_content_set(navi_it, "title_right_btn", p->r_button2);*/ + evas_object_smart_callback_add(vd->ugd->conformant, "virtualkeypad,state,on", _input_panel_state_up_cb, p); + evas_object_smart_callback_add(vd->ugd->conformant, "virtualkeypad,state,off", _input_panel_state_down_cb, p); + p->navi_it = navi_it; + if (user_data->is_preset_account != 0) elm_object_item_part_content_set(navi_it, "icon", title_ic); elm_object_item_part_content_set(navi_it, "toolbar_button1", p->tool_btn); @@ -482,8 +496,7 @@ static void _create_list(struct viewdata *vd) debug_log(""); struct priv_data *p; EmailSettingUGD *ugd; - - int i = 0; + ListItemData *li = NULL; if (!vd) { debug_critical("vd is null!"); @@ -499,6 +512,9 @@ static void _create_list(struct viewdata *vd) p->genlist = elm_genlist_add(ugd->navi_bar); elm_genlist_mode_set(p->genlist, ELM_LIST_COMPRESS); elm_object_style_set(p->genlist, "dialogue"); + evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); p->sending_secure_radio_grp = elm_radio_add(p->genlist); elm_radio_value_set(p->sending_secure_radio_grp, 0); @@ -544,146 +560,249 @@ static void _create_list(struct viewdata *vd) p->itc_onoff.func.state_get = NULL; p->itc_onoff.func.del = NULL; - p->itc_title.item_style = "dialogue/title"; - p->itc_title.func.text_get = _gl_sp_text_get_cb; - p->itc_title.func.content_get = NULL; - p->itc_title.func.state_get = NULL; - p->itc_title.func.del = NULL; - p->itc_sep.item_style = "dialogue/separator"; p->itc_sep.func.text_get = NULL; p->itc_sep.func.content_get = NULL; p->itc_sep.func.state_get = NULL; p->itc_sep.func.del = NULL; - p->itc_sep2.item_style = "dialogue/separator/end"; - p->itc_sep2.func.text_get = NULL; - p->itc_sep2.func.content_get = NULL; - p->itc_sep2.func.state_get = NULL; - p->itc_sep2.func.del = NULL; + p->itc_title.item_style = "dialogue/title"; + p->itc_title.func.text_get = _gl_sp_text_get_cb; + p->itc_title.func.content_get = NULL; + p->itc_title.func.state_get = NULL; + p->itc_title.func.del = NULL; git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* account name */ - i = 1; - p->gl_account_name_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = ACCOUNT_NAME_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* email address */ - i = 2; - p->gl_email_addr_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = EMAIL_ADDRESS_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); - elm_object_item_disabled_set(item, EINA_TRUE); + p->list_items = g_slist_append(p->list_items, li); /* user name */ - i = 3; - p->gl_user_name_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = USERNAME_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); elm_object_item_disabled_set(item, EINA_TRUE); + p->list_items = g_slist_append(p->list_items, li); /* password */ - i = 4; - p->gl_pw_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = PASSWORD_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); + /* separator */ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + /* Outgoing setting title */ + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = OUTGOING_SETTING_TITLE_LIST_ITEM; + li->p = p; + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)li, NULL, + ELM_GENLIST_ITEM_GROUP, NULL, NULL); + elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); + /* smtp server */ - i = 5; - p->gl_smtp_server_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = OUTGOING_SERVER_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* smtp port */ - i = 6; - p->gl_smtp_port_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = OUTGOING_PORT_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* sending security */ - i = 1; - p->gl_ex_item1 = item = elm_genlist_item_append(p->genlist, &(p->itc_secure), (void *)i, - NULL, ELM_GENLIST_ITEM_TREE, _gl_secure_sel_cb, (void *)vd); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + li->index = OUTGOING_SECURE_CONN_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_secure), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_secure_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); + + /* separator */ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + /* Incoming settings title */ + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = INCOMING_SETTING_TITLE_LIST_ITEM; + li->p = p; + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)li, NULL, + ELM_GENLIST_ITEM_GROUP, NULL, NULL); + elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); + /* incoming server type */ - p->gl_incoming_server_type_item = item = elm_genlist_item_append(p->genlist, &(p->itc_type), NULL, NULL, + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = INCOMMING_SERVER_TYPE_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_type), (void *)li, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_object_item_disabled_set(item, EINA_TRUE); + p->list_items = g_slist_append(p->list_items, li); /* incoming server */ - i = 7; - p->gl_incoming_server_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = POP3_SERVER_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* incoming port */ - i = 8; - p->gl_incoming_port_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = POP3_PORT_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* secure connection */ - i = 2; - p->gl_ex_item2 = item = elm_genlist_item_append(p->genlist, &(p->itc_secure), (void *)i, - NULL, ELM_GENLIST_ITEM_TREE, _gl_secure_sel_cb, (void *)vd); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = POP3_SECURE_CONN_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_secure), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_secure_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); + /* separator */ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* SMTP Authentication */ /* POP before SMTP */ - i = 0; - p->gl_pop3_before_smtp_item = item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_onoff_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = POP3_BEFORE_SMTP_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_onoff_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /* SMTP Auth */ - i = 1; - p->gl_smtp_auth_item = item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_onoff_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SMTP_AUTH_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_onoff_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /* Same as POP3/IMAP4 */ - i = 2; - p->gl_same_item = item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_onoff_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SAME_POP3_IMAP4_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_onoff_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /* user name */ - i = 9; - p->gl_sending_user_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); - elm_genlist_item_select_mode_set(p->gl_sending_user_item, ELM_OBJECT_SELECT_MODE_NONE); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SMTP_USERNAME_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); + elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* password */ - i = 10; - p->gl_sending_pw_item = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); - elm_genlist_item_select_mode_set(p->gl_sending_pw_item, ELM_OBJECT_SELECT_MODE_NONE); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SMTP_PASSWORD_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); + elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); if (account_data->outgoing_server_use_same_authenticator) { - elm_object_item_disabled_set(p->gl_sending_user_item, EINA_TRUE); - elm_object_item_disabled_set(p->gl_sending_pw_item, EINA_TRUE); + GSList *l = p->list_items; + while (l) { + li = (ListItemData *)l->data; + if (li->index == SMTP_USERNAME_LIST_ITEM) + elm_object_item_disabled_set(li->gl_it, EINA_TRUE); + else if (li->index == SMTP_PASSWORD_LIST_ITEM) + elm_object_item_disabled_set(li->gl_it, EINA_TRUE); + l = g_slist_next(l); + } } - git = elm_genlist_item_append(p->genlist, &(p->itc_sep2), NULL, NULL, + /* separator */ + git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); - elm_object_part_content_set(p->layout, "elm.swallow.content", p->genlist); } @@ -943,14 +1062,40 @@ static void _validate_account(struct viewdata *vd, int account_id) if (ret) { debug_log("Start Account Validation"); - ugd->popup_validate = setting_get_pb_notify(vd, _("IDS_EMAIL_POP_VALIDATING_ACCOUNT_ING"), 1, - dgettext("sys_string", "IDS_COM_SK_CANCEL"), + ugd->popup_validate = setting_get_pb_notify(vd, EMAIL_SETTING_STRING_VALIDATING_ACCOUNT_ING, 1, + EMAIL_SETTING_STRING_CANCEL, _popup_cancel_validation_cb, NULL, NULL); } else { setting_edit_validation_failed_cb(vd->ugd, FALSE); } } +static void _input_panel_state_up_cb(void *data, Evas_Object *obj, void *event_info) +{ + debug_log(""); + struct priv_data *p = (struct priv_data *)data; + struct viewdata *vd = p->vd; + EmailSettingUGD *ugd = vd->ugd; + + debug_log("input panel show"); + int rotation = elm_win_rotation_get(ugd->win); + if (abs(rotation) == 90 || abs(rotation) == 270) + elm_naviframe_item_title_visible_set(p->navi_it, EINA_TRUE); +} + +static void _input_panel_state_down_cb(void *data, Evas_Object *obj, void *event_info) +{ + debug_log(""); + struct priv_data *p = (struct priv_data *)data; + struct viewdata *vd = p->vd; + EmailSettingUGD *ugd = vd->ugd; + + debug_log("input panel hide"); + int rotation = elm_win_rotation_get(ugd->win); + if (abs(rotation) == 90 || abs(rotation) == 270) + elm_naviframe_item_title_visible_set(p->navi_it, EINA_TRUE); +} + static void _save_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); @@ -980,9 +1125,9 @@ static void _save_cb(void *data, Evas_Object *obj, void *event_info) if (!_check_null_field(vd)) { debug_log("Please dont leave empty fields"); - ugd->popup_one = setting_get_notify(vd, dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_PLEASE_FILL_ALL_THE_MANDATORY_FIELDS"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + ugd->popup_one = setting_get_notify(vd, EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_FILL_MANDATORY_FIELDS, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); return; } @@ -996,50 +1141,33 @@ static void _onoff_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; - + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; Eina_Bool state = elm_check_state_get(obj); - if (obj == p->onoff[0]) { + if (li->index == POP3_BEFORE_SMTP_LIST_ITEM) { account_data->pop_before_smtp = state; debug_log("pop before smtp %d", account_data->pop_before_smtp); } - - if (obj == p->onoff[1]) { + else if (li->index == SMTP_AUTH_LIST_ITEM) { account_data->outgoing_server_need_authentication = state; debug_log("smtp auth %d", account_data->outgoing_server_need_authentication); } - - if (obj == p->onoff[2]) { + else if (li->index == SAME_POP3_IMAP4_LIST_ITEM) { account_data->outgoing_server_use_same_authenticator = state; debug_log("same as pop3/imap4 %d", account_data->outgoing_server_use_same_authenticator); - if (account_data->outgoing_server_use_same_authenticator) { - /* user name */ - if (p->gl_sending_user_item) { - elm_object_item_disabled_set(p->gl_sending_user_item, EINA_TRUE); - elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_TRUE); - } - - /* password */ - if (p->gl_sending_pw_item) { - elm_object_item_disabled_set(p->gl_sending_pw_item, EINA_TRUE); - elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_TRUE); - } - } else { - /* user name */ - if (p->gl_sending_user_item) { - elm_object_item_disabled_set(p->gl_sending_user_item, EINA_FALSE); - elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_FALSE); - } - - /* password */ - if (p->gl_sending_pw_item) { - elm_object_item_disabled_set(p->gl_sending_pw_item, EINA_FALSE); - elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_FALSE); - } + GSList *l = p->list_items; + while (l) { + li = (ListItemData *)l->data; + if (li->index == SMTP_USERNAME_LIST_ITEM) + elm_object_item_disabled_set(li->gl_it, account_data->outgoing_server_use_same_authenticator ? EINA_TRUE : EINA_FALSE); + else if (li->index == SMTP_PASSWORD_LIST_ITEM) + elm_object_item_disabled_set(li->gl_it, account_data->outgoing_server_use_same_authenticator ? EINA_TRUE : EINA_FALSE); + l = g_slist_next(l); } + elm_entry_context_menu_disabled_set(p->entry_sending_username, account_data->outgoing_server_use_same_authenticator ? EINA_TRUE : EINA_FALSE); + elm_entry_context_menu_disabled_set(p->entry_sending_password, account_data->outgoing_server_use_same_authenticator ? EINA_TRUE : EINA_FALSE); } //_update_account_info(vd); @@ -1049,11 +1177,9 @@ static void _back_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); struct viewdata *vd = data; - struct priv_data *p = vd->priv; - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - ecore_imf_context_input_panel_hide(imf_context); + if (ecore_imf_input_panel_hide()) + return; setting_back_to_prev_view(vd); } @@ -1072,7 +1198,7 @@ static Eina_Bool _after_save_cb(void *data) } setting_back_to_prev_view(vd); - setting_get_small_notify(vd, _("IDS_EMAIL_POP_ACCOUNT_EDITED")); + setting_get_small_notify(vd, EMAIL_SETTING_STRING_ACCOUNT_EDITED); return ECORE_CALLBACK_CANCEL; } @@ -1306,54 +1432,54 @@ static void _sending_password_focused_cb(void *data, Evas_Object *obj, void *eve static char *_gl_secure_text_get_cb(void *data, Evas_Object *obj, const char *part) { debug_enter(); - int index = (int)data; + ListItemData *li = (ListItemData *)data; email_account_t *account = account_data; char buf[MAX_STR_LEN] = { 0, }; if (!g_strcmp0(part, "elm.text.1")) { - switch (index) { - case 1: - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SECURE_CONNECTION")); + switch (li->index) { + case OUTGOING_SECURE_CONN_LIST_ITEM: + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SECURE_CONNECTION); break; - case 2: - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SECURE_CONNECTION")); + case POP3_SECURE_CONN_LIST_ITEM: + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SECURE_CONNECTION); break; default: - debug_log("No corresponding label for index(%d)", index); + debug_log("No corresponding label for index(%d)", li->index); return NULL; } return g_strdup(buf); } else if (!g_strcmp0(part, "elm.text.2")) { - switch (index) { - case 1: + switch (li->index) { + case OUTGOING_SECURE_CONN_LIST_ITEM: if (account->outgoing_server_secure_connection == 0) - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_OFF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_OFF); else if (account->outgoing_server_secure_connection == 1) - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SSL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SSL); else if (account->outgoing_server_secure_connection == 2) - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_TLS")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_TLS); else debug_warning("No corresponding label for index(%d) outgoing_server_secure_connection(%d)", - index, account->outgoing_server_secure_connection); + li->index, account->outgoing_server_secure_connection); break; - case 2: + case POP3_SECURE_CONN_LIST_ITEM: if (account->incoming_server_secure_connection == 0) - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_OFF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_OFF); else if (account->incoming_server_secure_connection == 1) - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SSL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SSL); else if (account->incoming_server_secure_connection == 2) - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_TLS")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_TLS); else debug_warning("No corresponding label for index(%d) incoming_server_secure_connection(%d)", - index, account->incoming_server_secure_connection); + li->index, account->incoming_server_secure_connection); break; default: - debug_warning("No corresponding label for index(%d)", index); + debug_warning("No corresponding label for index(%d)", li->index); return NULL; } return g_strdup(buf); @@ -1371,13 +1497,13 @@ static char *_gl_ex_secure_text_get_cb(void *data, Evas_Object *obj, const char char buf[MAX_STR_LEN] = { 0, }; switch (index) { case 0: - snprintf(buf, MAX_STR_LEN, "%s", dgettext("sys_string", "IDS_COM_BODY_OFF")); + snprintf(buf, MAX_STR_LEN, "%s", EMAIL_SETTING_STRING_OFF); break; case 1: - snprintf(buf, MAX_STR_LEN, "%s", _("IDS_EMAIL_BODY_SSL")); + snprintf(buf, MAX_STR_LEN, "%s", EMAIL_SETTING_STRING_SSL); break; case 2: - snprintf(buf, MAX_STR_LEN, "%s", _("IDS_EMAIL_BODY_TLS")); + snprintf(buf, MAX_STR_LEN, "%s", EMAIL_SETTING_STRING_TLS); break; default: debug_warning("No correspoding label"); @@ -1396,15 +1522,15 @@ static char *_gl_server_type_text_get_cb(void *data, Evas_Object *obj, const cha char buf[MAX_STR_LEN] = { 0, }; if (!g_strcmp0(part, "elm.text.1")) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_INCOMING_MAIL_SERVER_TYPE")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_INCOMING_MAIL_SERVER_TYPE); return g_strdup(buf); } else if (!g_strcmp0(part, "elm.text.2")) { if (account->incoming_server_type == EMAIL_SERVER_TYPE_POP3) - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_POP3")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_POP3); else if (account->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4) - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_IMAP4")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_IMAP4); else debug_log("unsupported server type"); return g_strdup(buf); @@ -1416,22 +1542,17 @@ static char *_gl_server_type_text_get_cb(void *data, Evas_Object *obj, const cha static char *_gl_onoff_text_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; + ListItemData *li = (ListItemData *)data; if (!g_strcmp0(part, "elm.text")) { char buf[MAX_STR_LEN] = { 0, }; - if (index == 0) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_POP3_BEFORE_SMTP")); - } - - if (index == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SMTP_AUTHENTICATION")); - } - - if (index == 2) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SAME_AS_POP3_IMAP4")); - } + if (li->index == POP3_BEFORE_SMTP_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_POP3_BEFORE_SMTP); + else if (li->index == SMTP_AUTH_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SMTP_AUTHENTICATION); + else if (li->index == SAME_POP3_IMAP4_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SAME_AS_POP3_IMAP4); return g_strdup(buf); } @@ -1439,30 +1560,21 @@ static char *_gl_onoff_text_get_cb(void *data, Evas_Object *obj, const char *par return NULL; } - static char *_gl_sp_text_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; + ListItemData *li = (ListItemData *)data; if (!g_strcmp0(part, "elm.text")) { - if (index == 1) { - char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ACCOUNT")); - return g_strdup(buf); - } + char buf[MAX_STR_LEN] = { 0, }; - if (index == 2) { - char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_OUTGOING")); - return g_strdup(buf); + if (li->index == INCOMING_SETTING_TITLE_LIST_ITEM) { + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_INCOMING_SETTINGS); + } else if (li->index == OUTGOING_SETTING_TITLE_LIST_ITEM) { + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_OUTGOING_SETTINGS); } - if (index == 3) { - char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_INCOMING")); - return g_strdup(buf); - } + return g_strdup(buf); } return NULL; @@ -1471,14 +1583,14 @@ static char *_gl_sp_text_get_cb(void *data, Evas_Object *obj, const char *part) static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const char *part) { debug_enter(); - int index = (int)data; struct viewdata *vd = g_vd; struct priv_data *p = vd->priv; email_account_t *account = account_data; + ListItemData *li = (ListItemData *)data; if (!g_strcmp0(part, "elm.icon")) { - switch (index) { - case 1: + switch (li->index) { + case ACCOUNT_NAME_LIST_ITEM: p->ef_account_name = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_account_name, "layout", "editfield", "title"); p->entry_account_name = elm_entry_add(p->genlist); @@ -1492,7 +1604,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_account_name, "unfocused", _entry_unfocused_cb, p->ef_account_name); elm_object_part_content_set(p->ef_account_name, "elm.swallow.content", p->entry_account_name); - elm_object_part_text_set(p->ef_account_name, "elm.text", _("IDS_EMAIL_BODY_ACCOUNT_NAME")); + elm_object_part_text_set(p->ef_account_name, "elm.text", EMAIL_SETTING_STRING_ACCOUNT_NAME); elm_object_signal_callback_add(p->ef_account_name, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_account_name); if (p->str_account_name) @@ -1500,7 +1612,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch return p->ef_account_name; - case 2: + case EMAIL_ADDRESS_LIST_ITEM: p->ef_email_address = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_email_address, "layout", "editfield", "title"); p->entry_email_address = elm_entry_add(p->genlist); @@ -1515,7 +1627,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_email_address, "unfocused", _entry_unfocused_cb, p->ef_email_address); elm_object_part_content_set(p->ef_email_address, "elm.swallow.content", p->entry_email_address); - elm_object_part_text_set(p->ef_email_address, "elm.text", dgettext("sys_string", "IDS_COM_BODY_EMAIL_ADDRESS")); + elm_object_part_text_set(p->ef_email_address, "elm.text", EMAIL_SETTING_STRING_EMAIL_ADDRESS); elm_object_signal_callback_add(p->ef_email_address, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_email_address); if (p->str_email_address) @@ -1523,7 +1635,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch return p->ef_email_address; - case 3: + case USERNAME_LIST_ITEM: p->ef_user_name = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_user_name, "layout", "editfield", "title"); p->entry_user_name = elm_entry_add(p->genlist); @@ -1538,7 +1650,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_user_name, "unfocused", _entry_unfocused_cb, p->ef_user_name); elm_object_part_content_set(p->ef_user_name, "elm.swallow.content", p->entry_user_name); - elm_object_part_text_set(p->ef_user_name, "elm.text", dgettext("sys_string", "IDS_COM_BODY_USER_NAME")); + elm_object_part_text_set(p->ef_user_name, "elm.text", EMAIL_SETTING_STRING_USER_NAME); elm_object_signal_callback_add(p->ef_user_name, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_user_name); if (p->str_user_name) @@ -1546,7 +1658,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch return p->ef_user_name; - case 4: + case PASSWORD_LIST_ITEM: p->ef_password = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_password, "layout", "editfield", "title"); p->entry_password = elm_entry_add(p->genlist); @@ -1562,7 +1674,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_password, "focused", _password_focused_cb, p->entry_password); elm_object_part_content_set(p->ef_password, "elm.swallow.content", p->entry_password); - elm_object_part_text_set(p->ef_password, "elm.text", dgettext("sys_string", "IDS_COM_BODY_PASSWORD")); + elm_object_part_text_set(p->ef_password, "elm.text", EMAIL_SETTING_STRING_PWD); elm_object_signal_callback_add(p->ef_password, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_password); if (p->str_password) @@ -1570,7 +1682,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch return p->ef_password; - case 5: + case OUTGOING_SERVER_LIST_ITEM: p->ef_smtp_server = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_smtp_server, "layout", "editfield", "title"); p->entry_smtp_server = elm_entry_add(p->genlist); @@ -1584,7 +1696,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_smtp_server, "unfocused", _entry_unfocused_cb, p->ef_smtp_server); elm_object_part_content_set(p->ef_smtp_server, "elm.swallow.content", p->entry_smtp_server); - elm_object_part_text_set(p->ef_smtp_server, "elm.text", _("IDS_EMAIL_BODY_OUTGOING_SERVER")); + elm_object_part_text_set(p->ef_smtp_server, "elm.text", EMAIL_SETTING_STRING_OUTGOING_SERVER); elm_object_signal_callback_add(p->ef_smtp_server, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_smtp_server); if (p->str_smtp_server) @@ -1592,7 +1704,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch return p->ef_smtp_server; - case 6: + case OUTGOING_PORT_LIST_ITEM: p->ef_smtp_port = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_smtp_port, "layout", "editfield", "title"); p->entry_smtp_port = elm_entry_add(p->genlist); @@ -1606,7 +1718,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_smtp_port, "unfocused", _entry_unfocused_cb, p->ef_smtp_port); elm_object_part_content_set(p->ef_smtp_port, "elm.swallow.content", p->entry_smtp_port); - elm_object_part_text_set(p->ef_smtp_port, "elm.text", _("IDS_EMAIL_BODY_OUTGOING_PORT")); + elm_object_part_text_set(p->ef_smtp_port, "elm.text", EMAIL_SETTING_STRING_OUTGOING_PORT); elm_object_signal_callback_add(p->ef_smtp_port, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_smtp_port); if (p->str_smtp_port) @@ -1614,7 +1726,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch return p->ef_smtp_port; - case 7: + case POP3_SERVER_LIST_ITEM: p->ef_incoming_server = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_incoming_server, "layout", "editfield", "title"); p->entry_incoming_server = elm_entry_add(p->genlist); @@ -1629,11 +1741,11 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_object_part_content_set(p->ef_incoming_server, "elm.swallow.content", p->entry_incoming_server); if (account->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4) { - elm_object_part_text_set(p->ef_incoming_server, "elm.text", _("IDS_EMAIL_BODY_IMAP4_SERVER")); + elm_object_part_text_set(p->ef_incoming_server, "elm.text", EMAIL_SETTING_STRING_IMAP4_SERVER); } else if (account->incoming_server_type == EMAIL_SERVER_TYPE_POP3) { - elm_object_part_text_set(p->ef_incoming_server, "elm.text", _("IDS_EMAIL_BODY_POP3_SERVER")); + elm_object_part_text_set(p->ef_incoming_server, "elm.text", EMAIL_SETTING_STRING_POP3_SERVER); } else { - elm_object_part_text_set(p->ef_incoming_server, "elm.text", _("IDS_EMAIL_BODY_INCOMING_SERVER")); + elm_object_part_text_set(p->ef_incoming_server, "elm.text", EMAIL_SETTING_STRING_INCOMING_SERVER); } elm_object_signal_callback_add(p->ef_incoming_server, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_incoming_server); @@ -1642,7 +1754,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch return p->ef_incoming_server; - case 8: + case POP3_PORT_LIST_ITEM: p->ef_incoming_port = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_incoming_port, "layout", "editfield", "title"); p->entry_incoming_port = elm_entry_add(p->genlist); @@ -1657,11 +1769,11 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_object_part_content_set(p->ef_incoming_port, "elm.swallow.content", p->entry_incoming_port); if (account->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4) { - elm_object_part_text_set(p->ef_incoming_port, "elm.text", _("IDS_EMAIL_BODY_IMAP4_PORT")); + elm_object_part_text_set(p->ef_incoming_port, "elm.text", EMAIL_SETTING_STRING_IMAP4_PORT); } else if (account->incoming_server_type == EMAIL_SERVER_TYPE_POP3) { - elm_object_part_text_set(p->ef_incoming_port, "elm.text", _("IDS_EMAIL_BODY_POP3_PORT")); + elm_object_part_text_set(p->ef_incoming_port, "elm.text", EMAIL_SETTING_STRING_POP3_PORT); } else { - elm_object_part_text_set(p->ef_incoming_port, "elm.text", _("IDS_EMAIL_BODY_INCOMING_PORT")); + elm_object_part_text_set(p->ef_incoming_port, "elm.text", EMAIL_SETTING_STRING_INCOMING_PORT); } elm_object_signal_callback_add(p->ef_incoming_port, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_incoming_port); @@ -1669,7 +1781,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_entry_entry_set(p->entry_incoming_port, p->str_incoming_port); return p->ef_incoming_port; - case 9: + case SMTP_USERNAME_LIST_ITEM: p->ef_sending_username = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_sending_username, "layout", "editfield", "title"); p->entry_sending_username = elm_entry_add(p->genlist); @@ -1689,7 +1801,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_sending_username, "unfocused", _entry_unfocused_cb, p->ef_sending_username); elm_object_part_content_set(p->ef_sending_username, "elm.swallow.content", p->entry_sending_username); - elm_object_part_text_set(p->ef_sending_username, "elm.text", dgettext("sys_string", "IDS_COM_BODY_USER_NAME")); + elm_object_part_text_set(p->ef_sending_username, "elm.text", EMAIL_SETTING_STRING_USER_NAME); elm_object_signal_callback_add(p->ef_sending_username, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_sending_username); if (p->str_sending_username) @@ -1697,7 +1809,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch return p->ef_sending_username; - case 10: + case SMTP_PASSWORD_LIST_ITEM: p->ef_sending_password = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_sending_password, "layout", "editfield", "title"); p->entry_sending_password = elm_entry_add(p->genlist); @@ -1719,7 +1831,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_sending_password, "focused", _sending_password_focused_cb, p->entry_sending_password); elm_object_part_content_set(p->ef_sending_password, "elm.swallow.content", p->entry_sending_password); - elm_object_part_text_set(p->ef_sending_password, "elm.text", dgettext("sys_string", "IDS_COM_BODY_PASSWORD")); + elm_object_part_text_set(p->ef_sending_password, "elm.text", EMAIL_SETTING_STRING_PWD); elm_object_signal_callback_add(p->ef_sending_password, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_sending_password); if (p->str_sending_password) @@ -1783,7 +1895,7 @@ static Evas_Object *_gl_ex_incoming_secure_content_get_cb(void *data, Evas_Objec static Evas_Object *_gl_onoff_content_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; + ListItemData *li = (ListItemData *)data; struct viewdata *vd = g_vd; EmailSettingUGD *ugd = vd->ugd; struct priv_data *p = vd->priv; @@ -1791,22 +1903,20 @@ static Evas_Object *_gl_onoff_content_get_cb(void *data, Evas_Object *obj, const if (!g_strcmp0(part, "elm.icon")) { Evas_Object *check = elm_check_add(ugd->navi_bar); elm_object_style_set(check, "on&off"); - evas_object_smart_callback_add(check, "changed", _onoff_cb, vd); + evas_object_smart_callback_add(check, "changed", _onoff_cb, li); evas_object_propagate_events_set(check, EINA_FALSE); - if (index == 0) { + if (li->index == POP3_BEFORE_SMTP_LIST_ITEM) { elm_check_state_set(check, account_data->pop_before_smtp); - p->onoff[index] = check; + p->onoff[li->index % 3] = check; } - - if (index == 1) { + else if (li->index == SMTP_AUTH_LIST_ITEM) { elm_check_state_set(check, account_data->outgoing_server_need_authentication); - p->onoff[index] = check; + p->onoff[li->index % 3] = check; } - - if (index == 2) { + else if (li->index == SAME_POP3_IMAP4_LIST_ITEM) { elm_check_state_set(check, account_data->outgoing_server_use_same_authenticator); - p->onoff[index] = check; + p->onoff[li->index % 3] = check; } return check; @@ -1818,63 +1928,11 @@ static Evas_Object *_gl_onoff_content_get_cb(void *data, Evas_Object *obj, const static void _gl_ef_sel_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - int index = (int)data; - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; - - Elm_Object_Item *item = (Elm_Object_Item *)event_info; - elm_genlist_item_selected_set(item, EINA_FALSE); - - switch (index) { - case 1: - p->clicked_object = p->entry_account_name; - break; - case 2: - p->clicked_object = p->entry_email_address; - break; - case 3: - p->clicked_object = p->entry_user_name; - break; - case 4: - p->clicked_object = p->entry_password; - break; - case 5: - p->clicked_object = p->entry_smtp_server; - break; - case 6: - p->clicked_object = p->entry_smtp_port; - break; - case 7: - p->clicked_object = p->entry_incoming_server; - break; - case 8: - p->clicked_object = p->entry_incoming_port; - break; - case 9: - p->clicked_object = p->entry_sending_username; - break; - case 10: - p->clicked_object = p->entry_sending_password; - break; - default: - p->clicked_object = NULL; - debug_warning("No corresponding item"); - } } static void _gl_secure_sel_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; - - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) - ecore_imf_context_input_panel_hide(imf_context); - elm_object_focus_set(p->clicked_object, EINA_FALSE); - Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, EINA_FALSE); @@ -1921,7 +1979,7 @@ static void _gl_ex_sending_secure_sel_cb(void *data, Evas_Object *obj, void *eve } elm_radio_value_set(p->sending_secure_radio_grp, index); - elm_genlist_item_update(p->gl_ex_item1); + elm_genlist_item_update(elm_genlist_item_parent_get(item)); } static void _gl_ex_incoming_secure_sel_cb(void *data, Evas_Object *obj, void *event_info) @@ -1954,62 +2012,48 @@ static void _gl_ex_incoming_secure_sel_cb(void *data, Evas_Object *obj, void *ev } elm_radio_value_set(p->incoming_secure_radio_grp, index); - elm_genlist_item_update(p->gl_ex_item2); + elm_genlist_item_update(elm_genlist_item_parent_get(item)); } static void _gl_onoff_sel_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - int index = (int)data; + ListItemData *li = (ListItemData *)data; struct viewdata *vd = g_vd; struct priv_data *p = vd->priv; Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, EINA_FALSE); - switch (index) { - case 0: + switch (li->index) { + case POP3_BEFORE_SMTP_LIST_ITEM: account_data->pop_before_smtp = !account_data->pop_before_smtp; - elm_check_state_set(p->onoff[0], account_data->pop_before_smtp); + elm_check_state_set(p->onoff[li->index % 3], account_data->pop_before_smtp); debug_log("pop before smtp %d", account_data->pop_before_smtp); break; - case 1: + case SMTP_AUTH_LIST_ITEM: account_data->outgoing_server_need_authentication = !account_data->outgoing_server_need_authentication; - elm_check_state_set(p->onoff[1], account_data->outgoing_server_need_authentication); + elm_check_state_set(p->onoff[li->index % 3], account_data->outgoing_server_need_authentication); debug_log("smtp auth %d", account_data->outgoing_server_need_authentication); break; - case 2: + case SAME_POP3_IMAP4_LIST_ITEM: account_data->outgoing_server_use_same_authenticator = !account_data->outgoing_server_use_same_authenticator; - elm_check_state_set(p->onoff[2], account_data->outgoing_server_use_same_authenticator); + elm_check_state_set(p->onoff[li->index % 3], account_data->outgoing_server_use_same_authenticator); debug_log("same as pop3/imap4 %d", account_data->outgoing_server_use_same_authenticator); - if (account_data->outgoing_server_use_same_authenticator) { - /* user name */ - if (p->gl_sending_user_item) { - elm_object_item_disabled_set(p->gl_sending_user_item, EINA_TRUE); - elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_TRUE); - } - - /* password */ - if (p->gl_sending_pw_item) { - elm_object_item_disabled_set(p->gl_sending_pw_item, EINA_TRUE); - elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_TRUE); - } - } else { - /* user name */ - if (p->gl_sending_user_item) { - elm_object_item_disabled_set(p->gl_sending_user_item, EINA_FALSE); - elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_FALSE); - } - - /* password */ - if (p->gl_sending_pw_item) { - elm_object_item_disabled_set(p->gl_sending_pw_item, EINA_FALSE); - elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_FALSE); - } + GSList *l = p->list_items; + while (l) { + li = (ListItemData *)l->data; + if (li->index == SMTP_USERNAME_LIST_ITEM) + elm_object_item_disabled_set(li->gl_it, account_data->outgoing_server_use_same_authenticator ? EINA_TRUE : EINA_FALSE); + else if (li->index == SMTP_PASSWORD_LIST_ITEM) + elm_object_item_disabled_set(li->gl_it, account_data->outgoing_server_use_same_authenticator ? EINA_TRUE : EINA_FALSE); + l = g_slist_next(l); } + elm_entry_context_menu_disabled_set(p->entry_sending_username, account_data->outgoing_server_use_same_authenticator ? EINA_TRUE : EINA_FALSE); + elm_entry_context_menu_disabled_set(p->entry_sending_password, account_data->outgoing_server_use_same_authenticator ? EINA_TRUE : EINA_FALSE); break; } @@ -2019,30 +2063,31 @@ static void _gl_onoff_sel_cb(void *data, Evas_Object *obj, void *event_info) static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info) { Elm_Object_Item *it = event_info; - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; - Evas_Object *parent = NULL; + Elm_Object_Item *parent = NULL; + ListItemData *li = (ListItemData *)elm_object_item_data_get(it); parent = elm_genlist_item_parent_get(it); if (!parent) { - if (p->gl_account_name_item == it || - p->gl_smtp_server_item == it || - p->gl_incoming_server_type_item == it || - p->gl_pop3_before_smtp_item == it) - elm_object_item_signal_emit(it, "elm,state,top", ""); - else if (p->gl_pw_item == it || - p->gl_ex_item1 == it || - p->gl_ex_item2 == it || - p->gl_sending_pw_item == it) - elm_object_item_signal_emit(it, "elm,state,bottom", ""); - else - elm_object_item_signal_emit(it, "elm,state,center", ""); + if (li) { + if (li->index == ACCOUNT_NAME_LIST_ITEM || + li->index == OUTGOING_SERVER_LIST_ITEM || + li->index == INCOMMING_SERVER_TYPE_LIST_ITEM || + li->index == POP3_BEFORE_SMTP_LIST_ITEM) + elm_object_item_signal_emit(it, "elm,state,top", ""); + else if (li->index == PASSWORD_LIST_ITEM || + li->index == OUTGOING_SECURE_CONN_LIST_ITEM || + li->index == POP3_SECURE_CONN_LIST_ITEM || + li->index == SMTP_PASSWORD_LIST_ITEM) + elm_object_item_signal_emit(it, "elm,state,bottom", ""); + else + elm_object_item_signal_emit(it, "elm,state,center", ""); + } } else { - int index = elm_object_item_data_get(it); + int index = (int)elm_object_item_data_get(it); if (index == 0) elm_object_item_signal_emit(it, "elm,state,top", ""); else if (index == 2) @@ -2060,23 +2105,20 @@ static void _gl_exp_cb(void *data, Evas_Object *obj, void *event_info) struct viewdata *vd = (struct viewdata *)data; struct priv_data *p = vd->priv; int i = 0; + ListItemData *li = (ListItemData *)elm_object_item_data_get(it); - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) - ecore_imf_context_input_panel_hide(imf_context); - elm_object_focus_set(p->clicked_object, EINA_FALSE); - - /* sending security */ - if (it == p->gl_ex_item1) { - for (i = 0; i < 3; i++) { - elm_genlist_item_append(p->genlist, &(p->itc_ex_sending), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_sending_secure_sel_cb, (void *)i); + if (li) { + /* sending security */ + if (li->index == OUTGOING_SECURE_CONN_LIST_ITEM) { + for (i = 0; i < 3; i++) { + elm_genlist_item_append(p->genlist, &(p->itc_ex_sending), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_sending_secure_sel_cb, (void *)i); + } } - } - /* incoming security */ - if (it == p->gl_ex_item2) { - for (i = 0; i < 3; i++) { - elm_genlist_item_append(p->genlist, &(p->itc_ex_incoming), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_incoming_secure_sel_cb, (void *)i); + /* incoming security */ + if (li->index == POP3_SECURE_CONN_LIST_ITEM) { + for (i = 0; i < 3; i++) { + elm_genlist_item_append(p->genlist, &(p->itc_ex_incoming), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_incoming_secure_sel_cb, (void *)i); + } } } } diff --git a/setting/src/email-view-account-options.c b/setting/src/email-view-account-options.c index f33e040..ab38da9 100755 --- a/setting/src/email-view-account-options.c +++ b/setting/src/email-view-account-options.c @@ -26,6 +26,7 @@ static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_list(struct viewdata *vd); @@ -33,6 +34,8 @@ static void _update_account_info(struct viewdata *vd); static void _print_option_details(void); static int _get_mail_slot_size_index(struct viewdata *vd); +static void _input_panel_state_up_cb(void *data, Evas_Object *obj, void *event_info); +static void _input_panel_state_down_cb(void *data, Evas_Object *obj, void *event_info); static void _back_cb(void *data, Evas_Object *obj, void *event_info); static void _account_edit_cb(void *data, Evas_Object *obj, void *event_info); static void _setup_mailbox_cb(void *data, Evas_Object *obj, void *event_info); @@ -64,7 +67,6 @@ 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); @@ -74,11 +76,37 @@ static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info); static void _gl_exp_cb(void *data, Evas_Object *obj, void *event_info); static void _gl_con_cb(void *data, Evas_Object *obj, void *event_info); +enum { + ACCOUNT_LIST_ITEM = 1, + SENDING_OPTION_TITLE_LIST_ITEM, + REPLY_WITH_BODY_LIST_ITEM, + FWD_WITH_FILE_LIST_ITEM, + ALWAYS_CC_BCC_LIST_ITEM = 5, + REQ_READ_REPORT_LIST_ITEM, + DELIVERY_REPORT_LIST_ITEM, + ADD_SIGNATURE_LIST_ITEM, + SIGNATURE_LIST_ITEM, + SECURITY_OPTION_LIST_ITEM = 10, + RECEIVING_OPTION_TITLE_LIST_ITEM, + EMAIL_SIZE_LIST_ITEM, + SHOW_IMAGE_LIST_ITEM, + RECENT_EMAIL_NUM_LIST_ITEM, + SEND_READ_REPORT_LIST_ITEM = 15, + DELETING_OPTION_LIST_ITEM, + MAILBOX_SETUP_TITLE_LIST_ITEM, + SENTBOX_LIST_ITEM, + DRAFT_LIST_ITEM, + TRASH_LIST_ITEM = 20, + SPAMBOX_LIST_ITEM, +}; + struct priv_data { struct viewdata *vd; + GSList *list_items; + + Elm_Object_Item *navi_it; Evas_Object *entry_sig; - Evas_Object *onoff[7]; Evas_Object *l_button; Evas_Object *layout; @@ -109,26 +137,21 @@ struct priv_data { Elm_Genlist_Item_Class itc_ef; Elm_Genlist_Item_Class itc_title; - Elm_Object_Item *gl_account_item; - Elm_Object_Item *gl_sig_item; - Elm_Object_Item *gl_size_item; - Elm_Object_Item *gl_onoff_sig_item; - Elm_Object_Item *gl_cc_item; - - Elm_Object_Item *gl_recent_item; - Elm_Object_Item *gl_deleting_item; - Elm_Object_Item *gl_mailbox_item[4]; - - Elm_Object_Item *first_item1; - Elm_Object_Item *last_item1; - Elm_Object_Item *first_item2; - Elm_Object_Item *last_item2; - Elm_Object_Item *first_item3; - Elm_Object_Item *last_item3; + int first_index1; + int last_index1; + int first_index2; + int last_index2; char *signature_backup; }; +typedef struct _ListItemData { + int index; + Elm_Object_Item *gl_it; + Evas_Object *check; + struct priv_data *p; +} ListItemData; + void setting_init_account_options_view(struct viewdata *vd) { debug_log(""); @@ -138,6 +161,7 @@ void setting_init_account_options_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_account_options"; } @@ -166,7 +190,7 @@ static int _create(struct viewdata *vd) _print_option_details(); p->layout = setting_add_inner_layout(vd); _push_naviframe(vd); -// elm_object_part_content_set(ugd->win, "elm.swallow.content", p->layout); + // elm_object_part_content_set(ugd->win, "elm.swallow.content", p->layout); } g_vd = vd; @@ -187,16 +211,25 @@ static int _update(struct viewdata *vd) struct priv_data *p = vd->priv; EmailSettingUGD *ugd = vd->ugd; + int index = -1; if (vd->refresh) { if (ugd->setup_mailbox == EMAIL_MAILBOX_TYPE_SENTBOX) { - elm_genlist_item_update(p->gl_mailbox_item[0]); + index = SENTBOX_LIST_ITEM; } else if (ugd->setup_mailbox == EMAIL_MAILBOX_TYPE_DRAFT) { - elm_genlist_item_update(p->gl_mailbox_item[1]); + index = DRAFT_LIST_ITEM; } else if (ugd->setup_mailbox == EMAIL_MAILBOX_TYPE_TRASH) { - elm_genlist_item_update(p->gl_mailbox_item[2]); + index = TRASH_LIST_ITEM; } else if (ugd->setup_mailbox == EMAIL_MAILBOX_TYPE_SPAMBOX) { - elm_genlist_item_update(p->gl_mailbox_item[3]); + index = SPAMBOX_LIST_ITEM; + } + + GSList *l = p->list_items; + while (l && index > 0) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == index) + elm_genlist_item_update(_li->gl_it); + l = g_slist_next(l); } } return TRUE; @@ -212,24 +245,18 @@ static int _destroy(struct viewdata *vd) } struct priv_data *p = vd->priv; - int i = 0; if (p == NULL) { debug_log("priv is NULL"); return FALSE; } - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->entry_sig); - if (imf_context) - ecore_imf_context_input_panel_hide(imf_context); + evas_object_smart_callback_del(vd->ugd->conformant, "virtualkeypad,state,on", _input_panel_state_up_cb); + evas_object_smart_callback_del(vd->ugd->conformant, "virtualkeypad,state,off", _input_panel_state_down_cb); evas_object_del(p->l_button); evas_object_del(p->entry_sig); - for (i = 0; i < 7; i++) - evas_object_del(p->onoff[i]); - evas_object_del(p->genlist); evas_object_del(p->cc_radio_grp); evas_object_del(p->size_radio_grp); @@ -241,6 +268,13 @@ static int _destroy(struct viewdata *vd) account_data = NULL; } + GSList *l = p->list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->list_items); + return TRUE; } @@ -283,6 +317,26 @@ static int _hide(struct viewdata *vd) return TRUE; } +static int _lang_change(struct viewdata *vd) +{ + debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + + struct priv_data *p = vd->priv; + + // refreshing genlist. + elm_genlist_realized_items_update(p->genlist); + + // navi title + elm_object_item_part_text_set(p->navi_it, "elm.text.title", EMAIL_SETTING_STRING_ACCOUNT_SETTINGS); + + return TRUE; +} + static void _push_naviframe(struct viewdata *vd) { debug_log(""); @@ -292,7 +346,9 @@ static void _push_naviframe(struct viewdata *vd) elm_object_style_set(p->l_button, "naviframe/back_btn/default"); evas_object_smart_callback_add(p->l_button, "clicked", _back_cb, vd); - elm_naviframe_item_push(vd->ugd->navi_bar, _("IDS_EMAIL_HEADER_ACCOUNT_SETTINGS"), p->l_button, NULL, p->layout, NULL); + p->navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, EMAIL_SETTING_STRING_ACCOUNT_SETTINGS, p->l_button, NULL, p->layout, NULL); + evas_object_smart_callback_add(vd->ugd->conformant, "virtualkeypad,state,on", _input_panel_state_up_cb, p); + evas_object_smart_callback_add(vd->ugd->conformant, "virtualkeypad,state,off", _input_panel_state_down_cb, p); evas_object_show(vd->ugd->navi_bar); } @@ -309,7 +365,8 @@ static void _create_list(struct viewdata *vd) EmailSettingUGD *ugd = vd->ugd; Elm_Object_Item *item = NULL; Elm_Object_Item *git = NULL; - int i = 0; + ListItemData *li = NULL; + int i = -1; p->cc_radio_grp = elm_radio_add(ugd->navi_bar); elm_radio_value_set(p->cc_radio_grp, 0); @@ -330,6 +387,10 @@ static void _create_list(struct viewdata *vd) p->genlist = elm_genlist_add(ugd->navi_bar); elm_object_style_set(p->genlist, "dialogue"); + evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); + p->itc_account.item_style = "dialogue/2text.2icon.3.tb";//dialogue/2text.3icon"; p->itc_account.func.text_get = _gl_account_text_get_cb; p->itc_account.func.content_get = _gl_account_content_get_cb; @@ -413,13 +474,7 @@ static void _create_list(struct viewdata *vd) p->itc_sep.func.content_get = NULL; p->itc_sep.func.state_get = NULL; p->itc_sep.func.del = NULL; - - p->itc_sep2.item_style = "dialogue/separator/end"; - p->itc_sep2.func.text_get = NULL; - p->itc_sep2.func.content_get = NULL; - p->itc_sep2.func.state_get = NULL; - p->itc_sep2.func.del = NULL; - + if (account_data->options.signature) p->signature_backup = g_strdup(account_data->options.signature); @@ -429,9 +484,14 @@ static void _create_list(struct viewdata *vd) elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /*account*/ - item = elm_genlist_item_append(p->genlist, &(p->itc_account), NULL, NULL, - ELM_GENLIST_ITEM_NONE, _account_edit_cb, (void *)vd); - p->gl_account_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = ACCOUNT_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_account), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _account_edit_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*seperator*/ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, @@ -439,54 +499,90 @@ static void _create_list(struct viewdata *vd) elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /*title-sending option*/ - i = 0; - git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)i, NULL, + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SENDING_OPTION_TITLE_LIST_ITEM; + li->p = p; + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)li, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); /*sending option*/ /*--replay with body--*/ - i = 0; - item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, - NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); - p->first_item1 = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = REPLY_WITH_BODY_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); + p->first_index1 = li->index; /*--forward with files--*/ - i = 1; - item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, - NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = FWD_WITH_FILE_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*--always cc/bcc myself--*/ - item = elm_genlist_item_append(p->genlist, &(p->itc_cc), NULL, - NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)vd); - p->gl_cc_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = ALWAYS_CC_BCC_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_cc), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*--request read report--*/ - i = 2; - item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, - NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = REQ_READ_REPORT_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*--request delivery report--*/ - i = 3; - item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, - NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = DELIVERY_REPORT_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*--add signature--*/ - i = 4; - item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, - NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); - p->gl_onoff_sig_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = ADD_SIGNATURE_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*--signature--*/ - item = p->gl_sig_item = elm_genlist_item_append(p->genlist, &(p->itc_ef), NULL, - NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_select_mode_set(p->gl_sig_item, ELM_OBJECT_SELECT_MODE_NONE); - if (account_data->options.add_signature == FALSE) { - if (p->gl_sig_item) - elm_object_item_disabled_set(p->gl_sig_item, EINA_TRUE); - } + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); - p->last_item1 = item; + li->index = p->last_index1 = SIGNATURE_LIST_ITEM; // editfield is different from other items. + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc_ef), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + if (account_data->options.add_signature == FALSE) + elm_object_item_disabled_set(item, EINA_TRUE); + p->list_items = g_slist_append(p->list_items, li); /*seperator*/ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, @@ -494,45 +590,76 @@ static void _create_list(struct viewdata *vd) elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /*title-receiving option*/ - i = 1; - git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)i, NULL, + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = RECEIVING_OPTION_TITLE_LIST_ITEM; + li->p = p; + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)li, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); /*receiving option*/ /*--email size--*/ - item = elm_genlist_item_append(p->genlist, &(p->itc_size), NULL, NULL, - ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)vd); - p->gl_size_item = p->first_item2 = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = EMAIL_SIZE_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_size), (void *)li, NULL, + ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); + p->first_index2 = li->index; /*--show images--*/ - i = 5; - item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, - NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SHOW_IMAGE_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*--recent emails for IMAP POP3--*/ if (account_data->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4 || account_data->incoming_server_type == EMAIL_SERVER_TYPE_POP3) { - item = elm_genlist_item_append(p->genlist, &(p->itc_recent), (void *)ugd, - NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)vd); - p->gl_recent_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = RECENT_EMAIL_NUM_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_recent), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); } /*--send read report for IMAP POP3--*/ 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, - NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SEND_READ_REPORT_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); } /*--deleting option for POP3--*/ if (account_data->incoming_server_type == EMAIL_SERVER_TYPE_POP3) { - item = elm_genlist_item_append(p->genlist, &(p->itc_deleting), NULL, - NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)vd); - p->gl_deleting_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = DELETING_OPTION_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_deleting), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); } - p->last_item2 = item; + p->last_index2 = li->index; /*seperator*/ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, @@ -541,45 +668,35 @@ static void _create_list(struct viewdata *vd) /*title-mailbox setup*/ if (account_data->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4) { - i = 2; - git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)i, + + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = MAILBOX_SETUP_TITLE_LIST_ITEM; + li->p = p; + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)li, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); - } else { - git = elm_genlist_item_append(p->genlist, &(p->itc_sep2), NULL, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); } - elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /*mailbox setup for IMAP*/ if (account_data->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4) { - i = EMAIL_MAILBOX_TYPE_SENTBOX; - p->gl_mailbox_item[0] = elm_genlist_item_append(p->genlist, &(p->itc_mailbox), - (void *)i, NULL, ELM_GENLIST_ITEM_NONE, _setup_mailbox_cb, (void *)vd); - - i = EMAIL_MAILBOX_TYPE_DRAFT; - p->gl_mailbox_item[1] = elm_genlist_item_append(p->genlist, &(p->itc_mailbox), - (void *)i, NULL, ELM_GENLIST_ITEM_NONE, _setup_mailbox_cb, (void *)vd); - - i = EMAIL_MAILBOX_TYPE_TRASH; - p->gl_mailbox_item[2] = elm_genlist_item_append(p->genlist, &(p->itc_mailbox), - (void *)i, NULL, ELM_GENLIST_ITEM_NONE, _setup_mailbox_cb, (void *)vd); - - i = EMAIL_MAILBOX_TYPE_SPAMBOX; - p->gl_mailbox_item[3] = elm_genlist_item_append(p->genlist, &(p->itc_mailbox), - (void *)i, NULL, ELM_GENLIST_ITEM_NONE, _setup_mailbox_cb, (void *)vd); + for (i = SENTBOX_LIST_ITEM; i <= SPAMBOX_LIST_ITEM; i++) { + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = i; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_mailbox), + (void *)li, NULL, ELM_GENLIST_ITEM_NONE, _setup_mailbox_cb, (void *)li); + } - git = elm_genlist_item_append(p->genlist, &(p->itc_sep2), NULL, NULL, + git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - - p->first_item3 = p->gl_mailbox_item[0]; - p->last_item3 = p->gl_mailbox_item[3]; } - evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); - elm_object_part_content_set(p->layout, "elm.swallow.content", p->genlist); } @@ -646,45 +763,69 @@ static int _get_mail_slot_size_index(struct viewdata *vd) debug_log("Current recent mail slot: [%d]", slot_size); switch (slot_size) { - case 25: - slot_idx = 0; - break; - case 50: - slot_idx = 1; - break; - case 75: - slot_idx = 2; - break; - case 100: - slot_idx = 3; - break; - case 150: - slot_idx = 4; - break; - case 200: - slot_idx = 5; - break; - default: - debug_log("Invalid initail mail slot count [%d]", slot_size); - slot_idx = 3; /* set default value */ - break; + case 25: + slot_idx = 0; + break; + case 50: + slot_idx = 1; + break; + case 75: + slot_idx = 2; + break; + case 100: + slot_idx = 3; + break; + case 150: + slot_idx = 4; + break; + case 200: + slot_idx = 5; + break; + default: + debug_log("Invalid initail mail slot count [%d]", slot_size); + slot_idx = 3; /* set default value */ + break; } return slot_idx; } +static void _input_panel_state_up_cb(void *data, Evas_Object *obj, void *event_info) +{ + debug_log(""); + struct priv_data *p = (struct priv_data *)data; + struct viewdata *vd = p->vd; + EmailSettingUGD *ugd = vd->ugd; + + debug_log("input panel show"); + int rotation = elm_win_rotation_get(ugd->win); + if (abs(rotation) == 90 || abs(rotation) == 270) + elm_naviframe_item_title_visible_set(p->navi_it, EINA_TRUE); +} + +static void _input_panel_state_down_cb(void *data, Evas_Object *obj, void *event_info) +{ + debug_log(""); + struct priv_data *p = (struct priv_data *)data; + struct viewdata *vd = p->vd; + EmailSettingUGD *ugd = vd->ugd; + + debug_log("input panel hide"); + int rotation = elm_win_rotation_get(ugd->win); + if (abs(rotation) == 90 || abs(rotation) == 270) + elm_naviframe_item_title_visible_set(p->navi_it, EINA_TRUE); +} + static void _back_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); struct viewdata *vd = data; struct priv_data *p = NULL; - Ecore_IMF_Context *imf_context = NULL; p = vd->priv; - imf_context = elm_entry_imf_context_get(p->entry_sig); - if (imf_context) - ecore_imf_context_input_panel_hide(imf_context); + if (ecore_imf_input_panel_hide()) + return; if (/*account_data->options.add_signature == TRUE && */p->signature_backup) { debug_log("signature %s", p->signature_backup); @@ -700,7 +841,9 @@ static void _back_cb(void *data, Evas_Object *obj, void *event_info) static void _account_edit_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - struct viewdata *vd = (struct viewdata *)data; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; Elm_Object_Item *item = (Elm_Object_Item *)event_info; @@ -722,8 +865,9 @@ static void _account_edit_cb(void *data, Evas_Object *obj, void *event_info) static void _setup_mailbox_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; Elm_Object_Item *it = (Elm_Object_Item *)event_info; @@ -735,16 +879,16 @@ static void _setup_mailbox_cb(void *data, Evas_Object *obj, void *event_info) return; } - if (it == p->gl_mailbox_item[0]) { + if (li->index == SENTBOX_LIST_ITEM) { ugd->setup_mailbox = EMAIL_MAILBOX_TYPE_SENTBOX; debug_log("EMAIL_MAILBOX_TYPE_SENTBOX"); - } else if (it == p->gl_mailbox_item[1]) { + } else if (li->index == DRAFT_LIST_ITEM) { ugd->setup_mailbox = EMAIL_MAILBOX_TYPE_DRAFT; debug_log("EMAIL_MAILBOX_TYPE_DRAFT"); - } else if (it == p->gl_mailbox_item[2]) { + } else if (li->index == TRASH_LIST_ITEM) { ugd->setup_mailbox = EMAIL_MAILBOX_TYPE_TRASH; debug_log("EMAIL_MAILBOX_TYPE_TRASH"); - } else if (it == p->gl_mailbox_item[3]) { + } else if (li->index == SPAMBOX_LIST_ITEM) { ugd->setup_mailbox = EMAIL_MAILBOX_TYPE_SPAMBOX; debug_log("EMAIL_MAILBOX_TYPE_SPAMBOX"); } @@ -756,62 +900,59 @@ static void _onoff_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; Eina_Bool state = elm_check_state_get(obj); - if (obj == p->onoff[0]) { + if (li->index == REPLY_WITH_BODY_LIST_ITEM) { account_data->options.reply_with_body = state; debug_log("reply with body %d", account_data->options.reply_with_body); } - - if (obj == p->onoff[1]) { + else if (li->index == FWD_WITH_FILE_LIST_ITEM) { account_data->options.forward_with_files = state; debug_log("Forward with files %d", account_data->options.forward_with_files); } - - if (obj == p->onoff[2]) { + else if (li->index == REQ_READ_REPORT_LIST_ITEM) { account_data->options.req_read_receipt = state; debug_log("request read report %d", account_data->options.req_read_receipt); } - - if (obj == p->onoff[3]) { + else if (li->index == DELIVERY_REPORT_LIST_ITEM) { account_data->options.req_delivery_receipt = state; debug_log("request delivery report %d", account_data->options.req_delivery_receipt); } - - if (obj == p->onoff[4]) { - /*char *buf = NULL; - buf = (char *)elm_entry_entry_get(p->entry_sig);*/ + else if (li->index == ADD_SIGNATURE_LIST_ITEM) { account_data->options.add_signature = state; debug_log("add signature %d", account_data->options.add_signature); + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == SIGNATURE_LIST_ITEM) + elm_object_item_disabled_set(_li->gl_it, + account_data->options.add_signature == TRUE ? EINA_FALSE : EINA_TRUE); + l = g_slist_next(l); + } if (account_data->options.add_signature == TRUE) { - if (p->gl_sig_item) { - elm_object_item_disabled_set(p->gl_sig_item, EINA_FALSE); - elm_entry_context_menu_disabled_set(p->entry_sig, EINA_FALSE); - elm_entry_editable_set(p->entry_sig, TRUE); - } + elm_entry_context_menu_disabled_set(p->entry_sig, EINA_FALSE); + elm_entry_editable_set(p->entry_sig, TRUE); } else { - if (p->gl_sig_item) { - elm_object_item_disabled_set(p->gl_sig_item, EINA_TRUE); - elm_entry_context_menu_disabled_set(p->entry_sig, EINA_TRUE); - elm_entry_editable_set(p->entry_sig, FALSE); - } + elm_entry_context_menu_disabled_set(p->entry_sig, EINA_TRUE); + elm_entry_editable_set(p->entry_sig, FALSE); } - } - if (obj == p->onoff[5]) { - account_user_data_t *user_data = (account_user_data_t *)account_data->user_data; - user_data->show_images = state; - debug_log("show images %d", user_data->show_images); - } + if (li->index == SHOW_IMAGE_LIST_ITEM) { + account_user_data_t *user_data = (account_user_data_t *)account_data->user_data; + user_data->show_images = state; + debug_log("show images %d", user_data->show_images); + } - if (obj == p->onoff[6]) { - account_user_data_t *user_data = (account_user_data_t *)account_data->user_data; - user_data->send_read_report = state; - debug_log("send read report %d", user_data->send_read_report); + if (li->index == SEND_READ_REPORT_LIST_ITEM) { + account_user_data_t *user_data = (account_user_data_t *)account_data->user_data; + user_data->send_read_report = state; + debug_log("send read report %d", user_data->send_read_report); + } } _update_account_info(vd); @@ -916,38 +1057,25 @@ static char *_gl_account_text_get_cb(void *data, Evas_Object *obj, const char *p static char *_gl_onoff_text_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; + ListItemData *li = (ListItemData *)data; if (!g_strcmp0(part, "elm.text")) { char buf[MAX_STR_LEN] = { 0, }; - if (index == 0) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_REPLY_WITH_BODY")); - } - - if (index == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_FORWARD_WITH_FILES")); - } - - if (index == 2) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_REQUEST_READ_REPORTS")); - } - - if (index == 3) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS")); - } - - if (index == 4) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ADD_SIGNATURE")); - } - - if (index == 5) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SHOW_IMAGES")); - } - - if (index == 6) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SEND_READ_REPORT")); - } + if (li->index == REPLY_WITH_BODY_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_REPLY_WITH_BODY); + else if (li->index == FWD_WITH_FILE_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_FWD_WITH_FILES); + else if (li->index == REQ_READ_REPORT_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_REQUEST_READ_REPORTS); + else if (li->index == DELIVERY_REPORT_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_REQUEST_DELIVERY_REPORTS); + else if (li->index == ADD_SIGNATURE_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ADD_SIGNATURE); + else if (li->index == SHOW_IMAGE_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SHOW_IMAGES); + else if (li->index == SEND_READ_REPORT_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SEND_READ_REPORT); return g_strdup(buf); } @@ -961,7 +1089,7 @@ static char *_gl_cc_text_get_cb(void *data, Evas_Object *obj, const char *part) if (!g_strcmp0(part, "elm.text.1")) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ALWAYS_CC_BCC_MYSELF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ALWAYS_CC_BCC); return g_strdup(buf); } @@ -970,11 +1098,11 @@ static char *_gl_cc_text_get_cb(void *data, Evas_Object *obj, const char *part) /*TODO : check data flag*/ if (account_data->options.add_my_address_to_bcc == EMAIL_ADD_MY_ADDRESS_OPTION_DO_NOT_ADD) { - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_NONE")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_NONE); } else if (account_data->options.add_my_address_to_bcc == EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_CC) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ALWAYS_CC_MYSELF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ALWAYS_CC); } else if (account_data->options.add_my_address_to_bcc == EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_BCC) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ALWAYS_BCC_MYSELF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ALWAYS_BCC); } return g_strdup(buf); } @@ -988,7 +1116,7 @@ static char *_gl_size_text_get_cb(void *data, Evas_Object *obj, const char *part if (!g_strcmp0(part, "elm.text.1")) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_EMAIL_SIZE")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_EMAIL_SIZE); return g_strdup(buf); } @@ -996,9 +1124,9 @@ static char *_gl_size_text_get_cb(void *data, Evas_Object *obj, const char *part char buf[MAX_STR_LEN] = { 0, }; if (account_data->auto_download_size == 0) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_HEADER_ONLY")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_HEADER_ONLY); } else if (account_data->auto_download_size == 512*1024) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ENTIRE_EMAIL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ENTIRE_EMAIL); } else if (account_data->auto_download_size == 1024/2){ snprintf(buf, sizeof(buf), "0.5KB"); } else { @@ -1014,18 +1142,16 @@ static char *_gl_recent_text_get_cb(void *data, Evas_Object *obj, const char *pa { debug_log(""); - /*EmailSettingUGD *ugd = (EmailSettingUGD *)data;*/ - if (!g_strcmp0(part, "elm.text.1")) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_NUMBER_OF_EMAILS_TO_LOAD_ABB")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_NUM_EMAIL_TO_LOAD); return g_strdup(buf); } if (!g_strcmp0(part, "elm.text.2")) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), _("IDS_EMAIL_OPT_PD_MOST_RECENT_EMAILS"), account_data->default_mail_slot_size); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_MOST_RECENT_EMAILS, account_data->default_mail_slot_size); return g_strdup(buf); } @@ -1038,7 +1164,7 @@ static char *_gl_deleting_text_get_cb(void *data, Evas_Object *obj, const char * if (!g_strcmp0(part, "elm.text.1")) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_DELETING_OPTIONS")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_DELETING_OPTION); return g_strdup(buf); } @@ -1048,9 +1174,9 @@ static char *_gl_deleting_text_get_cb(void *data, Evas_Object *obj, const char * /*TODO : check data flag*/ if (user_data->pop3_deleting_option == 0) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_PHONE_ONLY")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_PHONE_ONLY); } else if (user_data->pop3_deleting_option == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_PHONE_AND_SERVER")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_PHONE_AND_SERVER); } return g_strdup(buf); @@ -1063,32 +1189,38 @@ static char *_gl_mailbox_text_get_cb(void *data, Evas_Object *obj, const char *p { debug_log(""); - int type = (int)data; - struct viewdata *vd = g_vd; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; if (!g_strcmp0(part, "elm.text.1")) { char buf[MAX_STR_LEN] = { 0, }; - if (type == EMAIL_MAILBOX_TYPE_SENTBOX) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SENTBOX")); - } - if (type == EMAIL_MAILBOX_TYPE_DRAFT) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_DRAFTS")); - } - if (type == EMAIL_MAILBOX_TYPE_TRASH) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_TRASH")); - } - if (type == EMAIL_MAILBOX_TYPE_SPAMBOX) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SPAMBOX")); - } + if (li->index == SENTBOX_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SENTBOX); + else if (li->index == DRAFT_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_DRAFTS); + else if (li->index == TRASH_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_TRASH); + else if (li->index == SPAMBOX_LIST_ITEM) + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SPAMBOX); return g_strdup(buf); - } - - if (!g_strcmp0(part, "elm.text.2")) { + } else if (!g_strcmp0(part, "elm.text.2")) { email_mailbox_t *mailbox = NULL; char buf[MAX_STR_LEN] = { 0, }; - + int type = 0; + + if (li->index == SENTBOX_LIST_ITEM) + type = EMAIL_MAILBOX_TYPE_SENTBOX; + else if (li->index == DRAFT_LIST_ITEM) + type = EMAIL_MAILBOX_TYPE_DRAFT; + else if (li->index == TRASH_LIST_ITEM) + type = EMAIL_MAILBOX_TYPE_TRASH; + else if (li->index == SPAMBOX_LIST_ITEM) + type = EMAIL_MAILBOX_TYPE_SPAMBOX; + + debug_log("mailbox type: %d", type); email_get_mailbox_by_mailbox_type(ugd->account_id, type, &mailbox); if (mailbox) { snprintf(buf, sizeof(buf), "%s", mailbox->alias); @@ -1110,11 +1242,11 @@ static char *_gl_ex_cc_text_get_cb(void *data, Evas_Object *obj, const char *par char buf[MAX_STR_LEN] = { 0, }; if (index == 0) { - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_NONE")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_NONE); } else if (index == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ALWAYS_CC_MYSELF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ALWAYS_CC); } else if (index == 2) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ALWAYS_BCC_MYSELF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ALWAYS_BCC); } return g_strdup(buf); @@ -1132,7 +1264,7 @@ static char *_gl_ex_size_text_get_cb(void *data, Evas_Object *obj, const char *p char buf[MAX_STR_LEN] = { 0, }; if (index == 0) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_HEADER_ONLY")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_HEADER_ONLY); } else if (index == 1){ snprintf(buf, sizeof(buf), "0.5KB"); } else if (index == 2){ @@ -1150,7 +1282,7 @@ static char *_gl_ex_size_text_get_cb(void *data, Evas_Object *obj, const char *p } else if (index == 8){ snprintf(buf, sizeof(buf), "100KB"); } else if (index == 9) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ENTIRE_EMAIL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ENTIRE_EMAIL); } return g_strdup(buf); @@ -1168,9 +1300,9 @@ static char *_gl_ex_recent_text_get_cb(void *data, Evas_Object *obj, const char char buf[MAX_STR_LEN] = { 0, }; if (index < 4) - snprintf(buf, sizeof(buf), _("IDS_EMAIL_OPT_PD_MOST_RECENT_EMAILS"), (index + 1) * 25); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_MOST_RECENT_EMAILS, (index + 1) * 25); else if (index >= 4) - snprintf(buf, sizeof(buf), _("IDS_EMAIL_OPT_PD_MOST_RECENT_EMAILS"), 100 + (index - 3) * 50); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_MOST_RECENT_EMAILS, 100 + (index - 3) * 50); return g_strdup(buf); } @@ -1187,9 +1319,9 @@ static char *_gl_ex_deleting_text_get_cb(void *data, Evas_Object *obj, const cha char buf[MAX_STR_LEN] = { 0, }; if (index == 0) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_PHONE_ONLY")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_PHONE_ONLY); } else if (index == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_PHONE_AND_SERVER")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_PHONE_AND_SERVER); } return g_strdup(buf); @@ -1201,17 +1333,17 @@ static char *_gl_ex_deleting_text_get_cb(void *data, Evas_Object *obj, const cha static char *_gl_sp_text_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; + ListItemData *li = (ListItemData *)data; if (!g_strcmp0(part, "elm.text")) { char buf[MAX_STR_LEN] = { 0, }; - if (index == 0) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SENDING_OPTIONS")); - } else if (index == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_RECEIVING_OPTIONS")); - } else if (index == 2) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_MAILBOX_SETUP")); + if (li->index == SENDING_OPTION_TITLE_LIST_ITEM) { + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SENDING_OPTIONS); + } else if (li->index == RECEIVING_OPTION_TITLE_LIST_ITEM) { + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_RECEIVING_OPTIONS); + } else if (li->index == MAILBOX_SETUP_TITLE_LIST_ITEM) { + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_MAILBOX_SETUP); } return g_strdup(buf); @@ -1224,15 +1356,17 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con { debug_log(""); - struct viewdata *vd = g_vd; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; - struct priv_data *p = vd->priv; Evas_Object *color_bar = NULL; if (!g_strcmp0(part, "elm.icon.1")) { Evas_Object *icon = elm_icon_add(ugd->navi_bar); elm_image_file_set(icon, account_data->logo_icon_path, NULL); + evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); p->account_icon = icon; @@ -1255,66 +1389,58 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con return color_bar; } - - /*if (!g_strcmp0(part, "elm.icon.2")) { - Evas_Object *icon = elm_button_add(ugd->navi_bar); - elm_object_style_set(icon, "reveal"); - - return icon; - }*/ - return NULL; } static Evas_Object *_gl_onoff_content_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; - struct viewdata *vd = g_vd; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; - struct priv_data *p = vd->priv; if (!g_strcmp0(part, "elm.icon")) { Evas_Object *check = elm_check_add(ugd->navi_bar); elm_object_style_set(check, "on&off"); - evas_object_smart_callback_add(check, "changed", _onoff_cb, vd); + evas_object_smart_callback_add(check, "changed", _onoff_cb, li); evas_object_propagate_events_set(check, EINA_FALSE); - if (index == 0) { + if (li->index == REPLY_WITH_BODY_LIST_ITEM) { elm_check_state_set(check, account_data->options.reply_with_body); - p->onoff[index] = check; + li->check = check; } - if (index == 1) { + if (li->index == FWD_WITH_FILE_LIST_ITEM) { elm_check_state_set(check, account_data->options.forward_with_files); - p->onoff[index] = check; + li->check = check; } - if (index == 2) { + if (li->index == REQ_READ_REPORT_LIST_ITEM) { elm_check_state_set(check, account_data->options.req_read_receipt); - p->onoff[index] = check; + li->check = check; } - if (index == 3) { + if (li->index == DELIVERY_REPORT_LIST_ITEM) { elm_check_state_set(check, account_data->options.req_delivery_receipt); - p->onoff[index] = check; + li->check = check; } - if (index == 4) { + if (li->index == ADD_SIGNATURE_LIST_ITEM) { elm_check_state_set(check, account_data->options.add_signature); - p->onoff[index] = check; + li->check = check; } - if (index == 5) { + if (li->index == SHOW_IMAGE_LIST_ITEM) { account_user_data_t *user_data = (account_user_data_t *)account_data->user_data; elm_check_state_set(check, user_data->show_images); - p->onoff[index] = check; + li->check = check; } - if (index == 6) { + if (li->index == SEND_READ_REPORT_LIST_ITEM) { account_user_data_t *user_data = (account_user_data_t *)account_data->user_data; elm_check_state_set(check, user_data->send_read_report); - p->onoff[index] = check; + li->check = check; } return check; @@ -1326,8 +1452,9 @@ static Evas_Object *_gl_onoff_content_get_cb(void *data, Evas_Object *obj, const static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; static Elm_Entry_Filter_Limit_Size limit_filter_data; if (!g_strcmp0(part, "elm.icon")) { @@ -1359,7 +1486,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_show(p->entry_sig); elm_object_part_content_set(p->ef, "elm.swallow.content", p->entry_sig); - elm_object_part_text_set(p->ef, "elm.text", _("IDS_EMAIL_BODY_SIGNATURE")); + elm_object_part_text_set(p->ef, "elm.text", EMAIL_SETTING_STRING_SIGNATURE); elm_object_signal_callback_add(p->ef, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_sig); if (account_data->options.signature) @@ -1386,7 +1513,7 @@ static Evas_Object *_gl_ex_cc_content_get_cb(void *data, Evas_Object *obj, const if (index == account_data->options.add_my_address_to_bcc) { elm_radio_value_set(p->cc_radio_grp, - account_data->options.add_my_address_to_bcc); + account_data->options.add_my_address_to_bcc); } return radio; } @@ -1483,95 +1610,81 @@ static Evas_Object *_gl_ex_deleting_content_get_cb(void *data, Evas_Object *obj, static void _gl_sel_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - int index = (int)data; - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; - /*char *buf = NULL;*/ + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, EINA_FALSE); account_user_data_t *user_data = NULL; - if (p->entry_sig) - elm_object_focus_set(p->entry_sig, EINA_FALSE); - - switch (index) { - case 0: - account_data->options.reply_with_body = !account_data->options.reply_with_body; - elm_check_state_set(p->onoff[0], account_data->options.reply_with_body); - debug_log("reply with body %d", account_data->options.reply_with_body); - break; - - case 1: - account_data->options.forward_with_files = !account_data->options.forward_with_files; - elm_check_state_set(p->onoff[1], account_data->options.forward_with_files); - debug_log("Forward with files %d", account_data->options.forward_with_files); - break; + switch (li->index) { + case REPLY_WITH_BODY_LIST_ITEM: + account_data->options.reply_with_body = !account_data->options.reply_with_body; + elm_check_state_set(li->check, account_data->options.reply_with_body); + debug_log("reply with body %d", account_data->options.reply_with_body); + break; - case 2: - account_data->options.req_read_receipt = !account_data->options.req_read_receipt; - elm_check_state_set(p->onoff[2], account_data->options.req_read_receipt); - debug_log("request read report %d", account_data->options.req_read_receipt); - break; + case FWD_WITH_FILE_LIST_ITEM: + account_data->options.forward_with_files = !account_data->options.forward_with_files; + elm_check_state_set(li->check, account_data->options.forward_with_files); + debug_log("Forward with files %d", account_data->options.forward_with_files); + break; - case 3: - account_data->options.req_delivery_receipt = !account_data->options.req_delivery_receipt; - elm_check_state_set(p->onoff[3], account_data->options.req_delivery_receipt); - debug_log("request delivery report %d", account_data->options.req_delivery_receipt); - break; + case REQ_READ_REPORT_LIST_ITEM: + account_data->options.req_read_receipt = !account_data->options.req_read_receipt; + elm_check_state_set(li->check, account_data->options.req_read_receipt); + debug_log("request read report %d", account_data->options.req_read_receipt); + break; - case 4: - /*buf = (char *)elm_entry_entry_get(p->entry_sig);*/ - account_data->options.add_signature = !account_data->options.add_signature; - elm_check_state_set(p->onoff[4], account_data->options.add_signature); - debug_log("add signature %d", account_data->options.add_signature); + case DELIVERY_REPORT_LIST_ITEM: + account_data->options.req_delivery_receipt = !account_data->options.req_delivery_receipt; + elm_check_state_set(li->check, account_data->options.req_delivery_receipt); + debug_log("request delivery report %d", account_data->options.req_delivery_receipt); + break; - if (account_data->options.add_signature == TRUE) { - if (p->gl_sig_item) { - elm_object_item_disabled_set(p->gl_sig_item, EINA_FALSE); + case ADD_SIGNATURE_LIST_ITEM: + /*buf = (char *)elm_entry_entry_get(p->entry_sig);*/ + account_data->options.add_signature = !account_data->options.add_signature; + elm_check_state_set(li->check, account_data->options.add_signature); + debug_log("add signature %d", account_data->options.add_signature); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == SIGNATURE_LIST_ITEM) + elm_object_item_disabled_set(_li->gl_it, + account_data->options.add_signature == TRUE ? EINA_FALSE : EINA_TRUE); + l = g_slist_next(l); + } + if (account_data->options.add_signature == TRUE) { elm_entry_context_menu_disabled_set(p->entry_sig, EINA_FALSE); elm_entry_editable_set(p->entry_sig, TRUE); - } - } else { - if (p->gl_sig_item) { - elm_object_item_disabled_set(p->gl_sig_item, EINA_TRUE); + } else { elm_entry_context_menu_disabled_set(p->entry_sig, EINA_TRUE); elm_entry_editable_set(p->entry_sig, FALSE); } - } - break; + break; - case 5: - user_data = (account_user_data_t *)account_data->user_data; - user_data->show_images = !user_data->show_images; - elm_check_state_set(p->onoff[5], user_data->show_images); - break; + case SHOW_IMAGE_LIST_ITEM: + user_data = (account_user_data_t *)account_data->user_data; + user_data->show_images = !user_data->show_images; + elm_check_state_set(li->check, user_data->show_images); + break; - case 6: - user_data = (account_user_data_t *)account_data->user_data; - user_data->send_read_report = !user_data->send_read_report; - elm_check_state_set(p->onoff[6], user_data->send_read_report); - break; + case SEND_READ_REPORT_LIST_ITEM: + user_data = (account_user_data_t *)account_data->user_data; + user_data->send_read_report = !user_data->send_read_report; + elm_check_state_set(li->check, user_data->send_read_report); + break; } _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(""); - /*struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv;*/ - Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, EINA_FALSE); @@ -1599,31 +1712,37 @@ static void _gl_ex_cc_sel_cb(void *data, Evas_Object *obj, void *event_info) return; switch (index) { - case 0: - account_data->options.add_my_address_to_bcc = + case 0: + account_data->options.add_my_address_to_bcc = EMAIL_ADD_MY_ADDRESS_OPTION_DO_NOT_ADD; - break; - case 1: - account_data->options.add_my_address_to_bcc = + break; + case 1: + account_data->options.add_my_address_to_bcc = EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_CC; - break; - case 2: - account_data->options.add_my_address_to_bcc = + break; + case 2: + account_data->options.add_my_address_to_bcc = EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_BCC; - break; - - default: - { - debug_log("Unknown value: %d", sel_radio); break; - } + + default: + { + debug_log("Unknown value: %d", sel_radio); + break; + } } elm_radio_value_set(p->cc_radio_grp, index); _update_account_info(vd); - elm_genlist_item_update(p->gl_cc_item); + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == ALWAYS_CC_BCC_LIST_ITEM) + elm_genlist_item_update(_li->gl_it); + l = g_slist_next(l); + } } static void _gl_ex_size_sel_cb(void *data, Evas_Object *obj, void *event_info) @@ -1643,37 +1762,37 @@ static void _gl_ex_size_sel_cb(void *data, Evas_Object *obj, void *event_info) return; switch (index) { - case 0: + case 0: account_data->auto_download_size = 0; break; - case 1: + case 1: account_data->auto_download_size = 1024/2; break; - case 2: + case 2: account_data->auto_download_size = 1024; break; - case 3: + case 3: account_data->auto_download_size = 1024*2; break; - case 4: + case 4: account_data->auto_download_size = 1024*5; break; - case 5: + case 5: account_data->auto_download_size = 1024*10; break; - case 6: + case 6: account_data->auto_download_size = 1024*20; break; - case 7: + case 7: account_data->auto_download_size = 1024*50; break; - case 8: + case 8: account_data->auto_download_size = 1024*100; break; - case 9: + case 9: account_data->auto_download_size = 1024*512; break; - default: + default: debug_log("Unknown size value: %d", sel_radio); break; } @@ -1682,7 +1801,13 @@ static void _gl_ex_size_sel_cb(void *data, Evas_Object *obj, void *event_info) _update_account_info(vd); - elm_genlist_item_update(p->gl_size_item); + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == EMAIL_SIZE_LIST_ITEM) + elm_genlist_item_update(_li->gl_it); + l = g_slist_next(l); + } } static void _gl_ex_recent_sel_cb(void *data, Evas_Object *obj, void *event_info) @@ -1712,7 +1837,13 @@ static void _gl_ex_recent_sel_cb(void *data, Evas_Object *obj, void *event_info) _update_account_info(vd); email_set_mail_slot_size(ugd->account_id, 0, account_data->default_mail_slot_size); - elm_genlist_item_update(p->gl_recent_item); + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == RECENT_EMAIL_NUM_LIST_ITEM) + elm_genlist_item_update(_li->gl_it); + l = g_slist_next(l); + } } static void _gl_ex_deleting_sel_cb(void *data, Evas_Object *obj, void *event_info) @@ -1734,66 +1865,79 @@ static void _gl_ex_deleting_sel_cb(void *data, Evas_Object *obj, void *event_inf account_user_data_t *user_data = NULL; switch (index) { - case 0: - { - user_data = (account_user_data_t *)account_data->user_data; - user_data->pop3_deleting_option = 0; - break; - } - case 1: - { - user_data = (account_user_data_t *)account_data->user_data; - user_data->pop3_deleting_option = 1; - break; - } - default: - { - debug_log("Unknown value: %d", sel_radio); - break; - } + case 0: + { + user_data = (account_user_data_t *)account_data->user_data; + user_data->pop3_deleting_option = 0; + break; + } + case 1: + { + user_data = (account_user_data_t *)account_data->user_data; + user_data->pop3_deleting_option = 1; + break; + } + default: + { + debug_log("Unknown value: %d", sel_radio); + break; + } } elm_radio_value_set(p->deleting_radio_grp, index); _update_account_info(vd); - elm_genlist_item_update(p->gl_deleting_item); + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == DELETING_OPTION_LIST_ITEM) + elm_genlist_item_update(_li->gl_it); + l = g_slist_next(l); + } } static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info) { Elm_Object_Item *it = event_info; + ListItemData *li = elm_object_item_data_get(it); + Elm_Object_Item *parent = NULL; struct viewdata *vd = (struct viewdata *)data; struct priv_data *p = vd->priv; - Elm_Object_Item *parent = NULL; parent = elm_genlist_item_parent_get(it); if (!parent) { - if (p->gl_account_item != it) - { - if (p->first_item1 == it || - p->first_item2 == it || - (p->first_item3 && p->first_item3 == it)) - elm_object_item_signal_emit(it, "elm,state,top", ""); - else if (p->last_item1 == it || - p->last_item2 == it || - (p->last_item3 && p->last_item3 == it)) - elm_object_item_signal_emit(it, "elm,state,bottom", ""); - else - elm_object_item_signal_emit(it, "elm,state,center", ""); - } + if (!li) + return; + if (li->index == ACCOUNT_LIST_ITEM) + return; + if (p->first_index1 == li->index || + p->first_index2 == li->index || + li->index == SENTBOX_LIST_ITEM) + elm_object_item_signal_emit(it, "elm,state,top", ""); + else if (p->last_index2 == li->index || + (account_data->incoming_server_type == EMAIL_SERVER_TYPE_ACTIVE_SYNC && li->index == SECURITY_OPTION_LIST_ITEM) || + (account_data->incoming_server_type != EMAIL_SERVER_TYPE_ACTIVE_SYNC && li->index == SIGNATURE_LIST_ITEM) || + li->index == SPAMBOX_LIST_ITEM) + elm_object_item_signal_emit(it, "elm,state,bottom", ""); + else + elm_object_item_signal_emit(it, "elm,state,center", ""); } else { - int index = elm_object_item_data_get(it); + int index = (int)elm_object_item_data_get(it); + ListItemData *p_li = (ListItemData *)elm_object_item_data_get(parent); int start_index = 0; int end_index = 0; - if (p->gl_cc_item == parent) + + if (!p_li) + return; + if (p_li->index == ALWAYS_CC_BCC_LIST_ITEM) end_index = 2; - else if (p->gl_size_item == parent) + else if (p_li->index == EMAIL_SIZE_LIST_ITEM) end_index = 9; - else if (p->gl_recent_item == parent) + else if (p_li->index == RECENT_EMAIL_NUM_LIST_ITEM) end_index = 5; - else if (p->gl_deleting_item == parent) + else if (p_li->index == DELETING_OPTION_LIST_ITEM) end_index = 1; if (index == start_index) @@ -1809,31 +1953,29 @@ static void _gl_exp_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); Elm_Object_Item *it = event_info; + ListItemData *li = elm_object_item_data_get(it); struct viewdata *vd = (struct viewdata *)data; struct priv_data *p = vd->priv; /*EmailSettingUGD *ugd = vd->ugd;*/ int i = 0; - if (p->entry_sig) - elm_object_focus_set(p->entry_sig, EINA_FALSE); - - if (it == p->gl_cc_item) { + if (li->index == ALWAYS_CC_BCC_LIST_ITEM) { for (i = 0; i < 3; i++) { elm_genlist_item_append(p->genlist, &(p->itc_ex_cc), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_cc_sel_cb, (void *)i); } - } else if (it == p->gl_size_item) { + } else if (li->index == EMAIL_SIZE_LIST_ITEM) { for (i = 0; i < 10; i++) { elm_genlist_item_append(p->genlist, &(p->itc_ex_size), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_size_sel_cb, (void *)i); } - } else if (it == p->gl_recent_item) { + } else if (li->index == RECENT_EMAIL_NUM_LIST_ITEM) { for (i = 0; i < 6; i++) { elm_genlist_item_append(p->genlist, &(p->itc_ex_recent), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_recent_sel_cb, (void *)i); } - } else if (it == p->gl_deleting_item) { + } else if (li->index == DELETING_OPTION_LIST_ITEM) { for (i = 0; i < 2; i++) { elm_genlist_item_append(p->genlist, &(p->itc_ex_deleting), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_deleting_sel_cb, (void *)i); diff --git a/setting/src/email-view-account-setup.c b/setting/src/email-view-account-setup.c index 7b8a309..d97a6bb 100755 --- a/setting/src/email-view-account-setup.c +++ b/setting/src/email-view-account-setup.c @@ -19,11 +19,15 @@ #include "email-setting-utils.h" #include "email-setting-account-set.h" +#define EMAIL_SETTING_TEXT1_OPEN_TAG "" +#define EMAIL_SETTING_TEXT1_CLOSE_TAG "" + static int _create(struct viewdata *vd); static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_view(struct viewdata *vd); @@ -47,7 +51,6 @@ static void _check2_clicked_cb(void *data, Evas_Object *obj, void *event_info); static void _check1_clicked_cb2(void *data, Evas_Object *obj, const char *emission, const char *source); static void _check2_clicked_cb2(void *data, Evas_Object *obj, const char *emission, const char *source); static Eina_Bool _after_validation_cb(void *data); -static Eina_Bool _password_state_cb(void *data); static Eina_Bool _startup_focus_cb(void *data); static void _popup_ok_cb(void *data, Evas_Object *obj, void *event_info); @@ -55,9 +58,9 @@ 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 _input_panel_state_up_cb(void *data, Evas_Object *obj, void *event_info); +static void _input_panel_state_down_cb(void *data, Evas_Object *obj, void *event_info); static void _gl_ef_sel_cb(void *data, Evas_Object *obj, void *event_info); static char *_gl_group_text_get(void *data, Evas_Object *obj, const char *part); static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const char *part); @@ -65,10 +68,20 @@ static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info); static struct viewdata *g_vd = NULL; +enum { + ACCOUNT_NAME_LIST_ITEM = 1, + USER_ID_LIST_ITEM, + DISPLAY_NAME_LIST_ITEM, + EMAIL_ADDRESS_LIST_ITEM, + PASSWORD_LIST_ITEM +}; + struct priv_data { struct viewdata *vd; int handle; + GSList *list_items; + char *str_account_name; char *str_display_name; char *str_email_address; @@ -87,11 +100,12 @@ struct priv_data { Evas_Object *ef_user_id; Evas_Object *ef_password; + Evas_Object *label_default_email; + Evas_Object *label_show_pass; + Evas_Object *layout; Evas_Object *scroller; - Evas_Object *l_button; - Evas_Object *r_button; Evas_Object *r_button2; Evas_Object *tool_btn; Evas_Object *manual_btn; @@ -107,8 +121,6 @@ struct priv_data { Elm_Genlist_Item_Class itc3; Evas_Object *cbar; - Elm_Object_Item *gl_email_address_item; - Elm_Object_Item *gl_pw_item; Elm_Object_Item * c_item[4]; Elm_Object_Item *navi_it; @@ -117,6 +129,12 @@ struct priv_data { int set_default_account; }; +typedef struct _ListItemData { + int index; + Elm_Object_Item *gl_it; + struct priv_data *p; +} ListItemData; + void setting_init_account_setup_view(struct viewdata *vd) { debug_log(""); @@ -126,6 +144,7 @@ void setting_init_account_setup_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_account_setup"; } @@ -183,15 +202,15 @@ void setting_account_validation_failed_cb(EmailSettingUGD *ugd, gboolean cancele if (canceled || ugd->err_code == EMAIL_ERROR_CANCELLED) { ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_ACCOUNT_CREATION_CANCELLED"), - 1, dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_ACCOUNT_CREATION_CANCELLED, + 1, EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); } else { char *type = setting_get_service_fail_type(ugd->err_code); ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - type, 1, dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + type, 1, EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); g_free(type); } @@ -255,16 +274,9 @@ static int _destroy(struct viewdata *vd) struct priv_data *p = vd->priv; EmailSettingUGD *ugd = vd->ugd; - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) { - ecore_imf_context_input_panel_hide(imf_context); - ecore_imf_context_input_panel_event_callback_del(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_state_changed_cb); - } + evas_object_smart_callback_del(vd->ugd->conformant, "virtualkeypad,state,on", _input_panel_state_up_cb); + evas_object_smart_callback_del(vd->ugd->conformant, "virtualkeypad,state,off", _input_panel_state_down_cb); - evas_object_del(p->l_button); - evas_object_del(p->r_button); evas_object_del(p->genlist); evas_object_del(p->tool_btn); @@ -273,11 +285,6 @@ static int _destroy(struct viewdata *vd) p->str_password = NULL; } - if (ugd->password_timer) { - ecore_timer_del(ugd->password_timer); - ugd->password_timer = NULL; - } - if (ugd->focus_timer) { ecore_timer_del(ugd->focus_timer); ugd->focus_timer = NULL; @@ -297,6 +304,13 @@ static int _destroy(struct viewdata *vd) ugd->popup_validate = NULL; } + GSList *l = p->list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->list_items); + ugd->account_info = NULL; setting_new_acct_final(vd); @@ -331,31 +345,52 @@ static int _hide(struct viewdata *vd) return TRUE; } -static void _push_naviframe(struct viewdata *vd) +static int _lang_change(struct viewdata *vd) { debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + struct priv_data *p = vd->priv; - p->l_button = elm_button_add(vd->ugd->navi_bar); - elm_object_style_set(p->l_button, "naviframe/toolbar/default"); - elm_object_focus_allow_set(p->l_button, EINA_FALSE); - evas_object_show(p->l_button); + // refreshing genlist. + elm_genlist_realized_items_update(p->genlist); - if (vd->ugd->account_info == NULL) { - 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")); - evas_object_smart_callback_add(p->l_button, "clicked", _save_cb, vd); - } + // navi title + elm_object_item_part_text_set(p->navi_it, "elm.text.title", EMAIL_SETTING_STRING_ADD_ACCOUNT); - elm_object_disabled_set(p->l_button, EINA_TRUE); + // default email + char *desc = g_strdup(EMAIL_SETTING_STRING_SEND_EMAIL_FROM_THIS_ACCOUNT_BY_DEFAULT); + char *text = g_strconcat(EMAIL_SETTING_TEXT1_OPEN_TAG, + desc, EMAIL_SETTING_TEXT1_CLOSE_TAG, NULL); + elm_object_text_set(p->label_default_email, text); + g_free(desc); + g_free(text); - p->r_button = elm_button_add(vd->ugd->navi_bar); - elm_object_style_set(p->r_button, "naviframe/end_btn/default"); - /*elm_object_text_set(p->r_button, dgettext("sys_string", "IDS_COM_SK_CANCEL"));*/ - evas_object_smart_callback_add(p->r_button, "clicked", _back_cb, vd); - evas_object_show(p->r_button); + // show password + desc = g_strdup(EMAIL_SETTING_STRING_SHOW_PASSWORD); + text = g_strconcat(EMAIL_SETTING_TEXT1_OPEN_TAG, + desc, EMAIL_SETTING_TEXT1_CLOSE_TAG, NULL); + elm_object_text_set(p->label_show_pass, text); + g_free(desc); + g_free(text); + + // manual button + elm_object_text_set(p->manual_btn, EMAIL_SETTING_STRING_MANUAL_SETUP); + + // login button + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_LOGIN); + + return TRUE; +} + +static void _push_naviframe(struct viewdata *vd) +{ + debug_log(""); + struct priv_data *p = vd->priv; p->r_button2 = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->r_button2, "naviframe/end_btn/default"); @@ -364,7 +399,7 @@ static void _push_naviframe(struct viewdata *vd) p->tool_btn = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->tool_btn, "naviframe/toolbar/default"); - elm_object_text_set(p->tool_btn, dgettext("sys_string", "IDS_COM_BUTTON_LOGIN")); + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_LOGIN); if (vd->ugd->account_info == NULL) { evas_object_smart_callback_add(p->tool_btn, "clicked", _next_cb, vd); } else { @@ -374,11 +409,13 @@ static void _push_naviframe(struct viewdata *vd) elm_object_disabled_set(p->tool_btn, EINA_TRUE); Elm_Object_Item *navi_it = NULL; - navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, _("IDS_EMAIL_HEADER_ADD_ACCOUNT"), NULL, NULL, p->layout, NULL); - elm_object_item_part_content_set(navi_it, "title_toolbar_button1", p->l_button); - elm_object_item_part_content_set(navi_it, "title_prev_btn", p->r_button); + navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, EMAIL_SETTING_STRING_ADD_ACCOUNT, NULL, NULL, p->layout, NULL); elm_object_item_part_content_set(navi_it, "toolbar_button1", p->tool_btn); elm_object_item_part_content_set(navi_it, "prev_btn", p->r_button2); + + evas_object_smart_callback_add(vd->ugd->conformant, "virtualkeypad,state,on", _input_panel_state_up_cb, p); + evas_object_smart_callback_add(vd->ugd->conformant, "virtualkeypad,state,off", _input_panel_state_down_cb, p); + p->navi_it = navi_it; evas_object_show(vd->ugd->navi_bar); } @@ -402,67 +439,90 @@ static void _create_view(struct viewdata *vd) debug_log("WINDOW W[%d] H[%d]", w, h); Evas_Object *sub_ly = elm_layout_add(ugd->navi_bar); - elm_layout_file_set(sub_ly, EV_THEME_PATH, "add_account"); + + if (w == 480) + elm_layout_file_set(sub_ly, EV_THEME_PATH, "account_add_wvga"); + else + elm_layout_file_set(sub_ly, EV_THEME_PATH, "account_add"); evas_object_size_hint_weight_set(sub_ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(sub_ly); _create_list(vd); - elm_object_part_content_set(sub_ly, "add_account/layout", p->genlist); + elm_object_part_content_set(sub_ly, "list", p->genlist); - Evas_Object *check1 = elm_check_add(sub_ly); + Evas_Object *checkbox_set = elm_layout_add(sub_ly); + if (w == 480) + elm_layout_file_set(checkbox_set, EV_THEME_PATH, "account_add_checkbox_set_wvga"); + else + elm_layout_file_set(checkbox_set, EV_THEME_PATH, "account_add_checkbox_set"); + evas_object_size_hint_weight_set(checkbox_set, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(checkbox_set); + + Evas_Object *check1 = elm_check_add(checkbox_set); elm_check_state_set(check1, EINA_FALSE); evas_object_smart_callback_add(check1, "changed", _check1_clicked_cb, (void *)vd); - elm_object_part_content_set(sub_ly, "add_account/check1", check1); + elm_object_part_content_set(checkbox_set, "checkbox.1", check1); elm_object_focus_allow_set(check1, EINA_FALSE); p->default_account_check = check1; - Evas_Object *check2 = elm_check_add(sub_ly); + Evas_Object *check2 = elm_check_add(checkbox_set); elm_check_state_set(check2, EINA_FALSE); evas_object_smart_callback_add(check2, "changed", _check2_clicked_cb, (void *)vd); - elm_object_part_content_set(sub_ly, "add_account/check2", check2); + elm_object_part_content_set(checkbox_set, "checkbox.2", check2); elm_object_focus_allow_set(check2, EINA_FALSE); p->show_passwd_check = check2; - char *desc = g_strdup(_("IDS_EMAIL_BODY_SEND_EMAIL_FROM_THIS_ACCOUNT_BY_DEFAULT")); - Evas_Object *label1 = elm_label_add(sub_ly); - elm_label_wrap_width_set(label1, 600*elm_config_scale_get()); + char *desc = g_strdup(EMAIL_SETTING_STRING_SEND_EMAIL_FROM_THIS_ACCOUNT_BY_DEFAULT); + Evas_Object *label1 = elm_label_add(checkbox_set); elm_label_line_wrap_set(label1, ELM_WRAP_WORD); - char *text = g_strconcat("", - desc, "", NULL); - edje_object_signal_callback_add(elm_layout_edje_get(sub_ly), + char *text = g_strconcat(EMAIL_SETTING_TEXT1_OPEN_TAG, + desc, EMAIL_SETTING_TEXT1_CLOSE_TAG, NULL); + edje_object_signal_callback_add(elm_layout_edje_get(checkbox_set), "elm,action,text1_clicked", "elm", _check1_clicked_cb2, (void *)vd); elm_object_text_set(label1, text); evas_object_show(label1); g_free(desc); g_free(text); - elm_object_part_content_set(sub_ly, "add_account/text1", label1); + elm_object_part_content_set(checkbox_set, "text.1", label1); + p->label_default_email = label1; - desc = g_strdup(_("IDS_EMAIL_BODY_SHOW_PASSWORD")); - Evas_Object *label2 = elm_label_add(sub_ly); - elm_label_wrap_width_set(label2, 600*elm_config_scale_get()); + desc = g_strdup(EMAIL_SETTING_STRING_SHOW_PASSWORD); + Evas_Object *label2 = elm_label_add(checkbox_set); elm_label_line_wrap_set(label2, ELM_WRAP_WORD); - text = g_strconcat("", - desc, "", NULL); - edje_object_signal_callback_add(elm_layout_edje_get(sub_ly), + text = g_strconcat(EMAIL_SETTING_TEXT1_OPEN_TAG, + desc, EMAIL_SETTING_TEXT1_CLOSE_TAG, NULL); + edje_object_signal_callback_add(elm_layout_edje_get(checkbox_set), "elm,action,text2_clicked", "elm", _check2_clicked_cb2, (void *)vd); elm_object_text_set(label2, text); evas_object_show(label2); g_free(desc); g_free(text); - elm_object_part_content_set(sub_ly, "add_account/text2", label2); + elm_object_part_content_set(checkbox_set, "text.2", label2); + p->label_show_pass = label2; + + elm_object_part_content_set(sub_ly, "checkbox_set", checkbox_set); + + Evas_Object *button_set = elm_layout_add(sub_ly); + if (w == 480) + elm_layout_file_set(button_set, EV_THEME_PATH, "account_add_manual_button_wvga"); + else + elm_layout_file_set(button_set, EV_THEME_PATH, "account_add_manual_button"); + evas_object_size_hint_weight_set(button_set, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(button_set); - Evas_Object *btn = elm_button_add(sub_ly); - elm_object_text_set(btn, _("IDS_EMAIL_BODY_MANUAL_SETUP")); + Evas_Object *btn = elm_button_add(button_set); + elm_object_text_set(btn, EMAIL_SETTING_STRING_MANUAL_SETUP); evas_object_smart_callback_add(btn, "clicked", _manual_cb, (void *)vd); elm_object_style_set(btn, "text_only/style2"); evas_object_show(btn); p->manual_btn = btn; - elm_object_part_content_set(sub_ly, "add_account/button", btn); + elm_object_part_content_set(button_set, "btn", btn); elm_object_disabled_set(p->manual_btn, EINA_TRUE); + elm_object_part_content_set(sub_ly, "button_set", button_set); + elm_object_content_set(p->scroller, sub_ly); - elm_scroller_policy_set(p->scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); } static void _create_list(struct viewdata *vd) @@ -476,7 +536,7 @@ static void _create_list(struct viewdata *vd) struct priv_data *p; EmailSettingUGD *ugd; - int i = 0; + ListItemData *li = NULL; ugd = vd->ugd; p = vd->priv; @@ -487,6 +547,7 @@ static void _create_list(struct viewdata *vd) p->genlist = elm_genlist_add(ugd->navi_bar); elm_object_style_set(p->genlist, "dialogue"); evas_object_show(p->genlist); + evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); p->itc1.item_style = "dialogue/separator"; p->itc1.func.text_get = NULL; @@ -506,41 +567,37 @@ static void _create_list(struct viewdata *vd) p->itc3.func.state_get = NULL; p->itc3.func.del = NULL; - git = elm_genlist_item_append(p->genlist, &(p->itc3), NULL, NULL, + /* separator */ + git = elm_genlist_item_append(p->genlist, &(p->itc1), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - if (ugd->account_info == NULL) { - /* Account name for OTHER */ - /* i = 1; - item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, git, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); - elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); */ - - /* User name */ - /*i = 2; - item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, git, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i);*/ - } - - /* Display name */ - /*i = 3; - item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, git, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i);*/ + /* group title */ + git = elm_genlist_item_append(p->genlist, &(p->itc3), NULL, NULL, + ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* Email address */ - i = 4; - p->gl_email_address_item = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = EMAIL_ADDRESS_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); /* Password */ - i = 5; - p->gl_pw_item = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); - elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); - evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); + li->index = PASSWORD_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); + elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); } static void _create_validation_popup(struct viewdata *vd, int account_id) @@ -573,16 +630,14 @@ static void _create_validation_popup(struct viewdata *vd, int account_id) } vd->ugd->cancel_event = 0; - elm_object_disabled_set(p->l_button, EINA_TRUE); - elm_object_disabled_set(p->r_button, EINA_TRUE); elm_object_disabled_set(p->r_button2, EINA_TRUE); elm_object_disabled_set(p->manual_btn, EINA_TRUE); elm_object_disabled_set(p->tool_btn, EINA_TRUE); debug_log("Start Account Validation"); ugd->popup_validate = setting_get_pb_process_notify(vd, - _("IDS_EMAIL_POP_VALIDATING_ACCOUNT_ING"), 1, - dgettext("sys_string", "IDS_COM_SK_CANCEL"), + EMAIL_SETTING_STRING_VALIDATING_ACCOUNT_ING, 1, + EMAIL_SETTING_STRING_CANCEL, _popup_cancel_validation_cb, NULL, NULL); } @@ -622,15 +677,15 @@ static void _create_account(void *data) if (error_code == EMAIL_ERROR_ALREADY_EXISTS) ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - dgettext("sys_string", "IDS_COM_POP_ALREDY_EXISTS"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_ALREADY_EXIST, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); else ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_UNABLE_TO_ADD_ACCOUNT"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_UNABLE_TO_ADD_ACCOUNT, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); } return; @@ -805,12 +860,6 @@ static void _next_cb(void *data, Evas_Object *obj, void *event_info) p = vd->priv; ugd = vd->ugd; - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) { - ecore_imf_context_input_panel_hide(imf_context); - } - /* Save the Account Data */ _read_all_entries(vd); email_account_t *account = vd->ugd->new_account; @@ -835,9 +884,9 @@ static void _next_cb(void *data, Evas_Object *obj, void *event_info) ret = _check_null_field(vd); if (!ret) { ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_PLEASE_FILL_ALL_THE_MANDATORY_FIELDS"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_FILL_MANDATORY_FIELDS, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); return; } @@ -848,9 +897,9 @@ static void _next_cb(void *data, Evas_Object *obj, void *event_info) ret = email_get_address_validation(buf); if (!ret) { ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_INVALID_EMAIL_ADDRESS, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); free(buf); @@ -881,12 +930,6 @@ static void _save_cb(void *data, Evas_Object *obj, void *event_info) p = vd->priv; ugd = vd->ugd; - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) { - ecore_imf_context_input_panel_hide(imf_context); - } - /* Save the data */ _read_all_entries(vd); email_account_t *account = vd->ugd->new_account; @@ -910,9 +953,9 @@ static void _save_cb(void *data, Evas_Object *obj, void *event_info) if (!ret) { debug_log("empty space in account info"); ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_PLEASE_FILL_ALL_THE_MANDATORY_FIELDS"), - 1, dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_FILL_MANDATORY_FIELDS, + 1, EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); return; } @@ -923,9 +966,9 @@ static void _save_cb(void *data, Evas_Object *obj, void *event_info) if (ret == FALSE) { debug_log("wrong ISP server name for preset accounts"); ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS"), - 1, dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_INVALID_EMAIL_ADDRESS, + 1, EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); free(buf); return; @@ -939,9 +982,9 @@ static void _save_cb(void *data, Evas_Object *obj, void *event_info) if (!ret) { debug_log("Wrong character in email address"); ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS"), - 1, dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_INVALID_EMAIL_ADDRESS, + 1, EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); free(buf); return; @@ -995,9 +1038,9 @@ static void _manual_cb(void *data, Evas_Object *obj, void *event_info) ret = _check_preset_null_field(vd); if (!ret) { ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_PLEASE_FILL_ALL_THE_MANDATORY_FIELDS"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_FILL_MANDATORY_FIELDS, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); return; } @@ -1009,9 +1052,9 @@ static void _manual_cb(void *data, Evas_Object *obj, void *event_info) if (ret == FALSE) { debug_log("wrong ISP server name for preset accounts"); ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS"), - 1, dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_INVALID_EMAIL_ADDRESS, + 1, EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); free(buf); return; @@ -1025,9 +1068,9 @@ static void _manual_cb(void *data, Evas_Object *obj, void *event_info) ret = email_get_address_validation(buf); if (!ret) { ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_INVALID_EMAIL_ADDRESS, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); free(buf); @@ -1049,7 +1092,9 @@ static void _back_cb(void *data, Evas_Object *obj, void *event_info) debug_log(""); struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; + + if (ecore_imf_input_panel_hide()) + return; if (vd->ugd->atomic_pop) { debug_log("During atomic poping"); @@ -1119,31 +1164,18 @@ static void _check2_clicked_cb(void *data, Evas_Object *obj, void *event_info) } struct priv_data *p = vd->priv; - EmailSettingUGD *ugd = NULL; - ugd = vd->ugd; Eina_Bool state = elm_check_state_get(obj); + elm_entry_password_set(p->entry_password, !state); - if (state) - elm_entry_password_set(p->entry_password, EINA_FALSE); - else - elm_entry_password_set(p->entry_password, EINA_TRUE); - - if (elm_object_focus_get(p->entry_password)) { - if (ugd->password_timer) { - ecore_timer_del(ugd->password_timer); - ugd->password_timer = NULL; - } - ugd->password_timer = ecore_timer_add(0.1, _password_state_cb, (void *)vd); + if (state) { + char *pass_str1 = elm_entry_markup_to_utf8(elm_entry_entry_get(p->entry_password)); + char *pass_str2 = elm_entry_utf8_to_markup(pass_str1); - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->entry_password); - int state = ecore_imf_context_input_panel_state_get(imf_context); + elm_entry_entry_set(p->entry_password, pass_str2); - if (state == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW || state == ECORE_IMF_INPUT_PANEL_STATE_HIDE) { - debug_log("input panel show"); - elm_object_item_signal_emit(p->navi_it, "elm,state,sip,shown", ""); - } + g_free(pass_str1); + g_free(pass_str2); } } @@ -1158,35 +1190,10 @@ static void _check2_clicked_cb2(void *data, Evas_Object *obj, const char *emissi } struct priv_data *p = vd->priv; - EmailSettingUGD *ugd = NULL; - ugd = vd->ugd; Eina_Bool state = elm_check_state_get(p->show_passwd_check); - - if (state) { - elm_check_state_set(p->show_passwd_check, EINA_FALSE); - elm_entry_password_set(p->entry_password, EINA_TRUE); - } else { - elm_check_state_set(p->show_passwd_check, EINA_TRUE); - elm_entry_password_set(p->entry_password, EINA_FALSE); - } - - if (elm_object_focus_get(p->entry_password)) { - if (ugd->password_timer) { - ecore_timer_del(ugd->password_timer); - ugd->password_timer = NULL; - } - ugd->password_timer = ecore_timer_add(0.1, _password_state_cb, (void *)vd); - - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->entry_password); - int state = ecore_imf_context_input_panel_state_get(imf_context); - - if (state == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW || state == ECORE_IMF_INPUT_PANEL_STATE_HIDE) { - debug_log("input panel show"); - elm_object_item_signal_emit(p->navi_it, "elm,state,sip,shown", ""); - } - } + elm_check_state_set(p->show_passwd_check, !state); + _check2_clicked_cb(data, p->show_passwd_check, NULL); } static Eina_Bool _after_validation_cb(void *data) @@ -1226,7 +1233,7 @@ static Eina_Bool _after_validation_cb(void *data) } } - status_message_post(_("IDS_EMAIL_POP_SUCCEEDED")); + status_message_post(EMAIL_SETTING_STRING_SUCCEEDED); setting_change_view(VIEW_SYNC_SETUP, ugd); @@ -1257,40 +1264,6 @@ static Eina_Bool _after_validation_cb(void *data) return ECORE_CALLBACK_CANCEL; } -static Eina_Bool _password_state_cb(void *data) -{ - debug_log(""); - - struct viewdata *vd = (struct viewdata *)data; - - if (vd == NULL) { - debug_log("vd is NULL"); - return ECORE_CALLBACK_CANCEL; - } - - struct priv_data *p = NULL; - p = vd->priv; - EmailSettingUGD *ugd = NULL; - ugd = vd->ugd; - - if (ugd->password_timer) { - ecore_timer_del(ugd->password_timer); - ugd->password_timer = NULL; - } - - 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); - } - - return ECORE_CALLBACK_CANCEL; -} - static Eina_Bool _startup_focus_cb(void *data) { debug_log(""); @@ -1341,38 +1314,11 @@ static void _popup_ok_cb(void *data, Evas_Object *obj, void *event_info) ugd->popup_validate = NULL; } - elm_object_disabled_set(p->l_button, EINA_FALSE); - elm_object_disabled_set(p->r_button, EINA_FALSE); elm_object_disabled_set(p->r_button2, EINA_FALSE); elm_object_disabled_set(p->manual_btn, EINA_FALSE); elm_object_disabled_set(p->tool_btn, EINA_FALSE); } -/*static void _popup_cancel_cb(void *data, Evas_Object *obj, void *event_info) -{ - debug_log(""); - if (!data) { - debug_log("data is NULL"); - return; - } - - struct viewdata *vd = (struct viewdata *)data; - EmailSettingUGD *ugd = vd->ugd; - struct priv_data *p = vd->priv; - - if (ugd->popup_one) { - evas_object_del(ugd->popup_one); - ugd->popup_one = NULL; - } - if (ugd->popup_validate) { - evas_object_del(ugd->popup_validate); - ugd->popup_validate = NULL; - } - - elm_object_disabled_set(p->r_button, EINA_FALSE); - elm_object_disabled_set(p->r_button2, EINA_FALSE); -}*/ - static void _popup_cancel_validation_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); @@ -1399,8 +1345,6 @@ static void _popup_cancel_validation_cb(void *data, Evas_Object *obj, void *even email_engine_stop_working(account_id, p->handle); email_engine_delete_account(account_id); - elm_object_disabled_set(p->l_button, EINA_FALSE); - elm_object_disabled_set(p->r_button, EINA_FALSE); elm_object_disabled_set(p->r_button2, EINA_FALSE); elm_object_disabled_set(p->manual_btn, EINA_FALSE); elm_object_disabled_set(p->tool_btn, EINA_FALSE); @@ -1460,22 +1404,22 @@ static void _backup_input_cb(void *data, Evas_Object *obj, void *event_info) p->str_password = NULL; } - p->str_password = g_strdup(elm_entry_entry_get(eo)); + if (elm_check_state_get(p->show_passwd_check)) + p->str_password = elm_entry_markup_to_utf8(elm_entry_entry_get(eo)); + else + p->str_password = g_strdup(elm_entry_entry_get(eo)); } if (p->str_email_address == NULL || p->str_password == NULL) { - elm_object_disabled_set(p->l_button, EINA_TRUE); elm_object_disabled_set(p->manual_btn, EINA_TRUE); elm_object_disabled_set(p->tool_btn, EINA_TRUE); return; } if (g_strcmp0(p->str_email_address, "") == 0 || g_strcmp0(p->str_password, "") == 0) { - elm_object_disabled_set(p->l_button, EINA_TRUE); elm_object_disabled_set(p->manual_btn, EINA_TRUE); elm_object_disabled_set(p->tool_btn, EINA_TRUE); } else { - elm_object_disabled_set(p->l_button, EINA_FALSE); elm_object_disabled_set(p->manual_btn, EINA_FALSE); elm_object_disabled_set(p->tool_btn, EINA_FALSE); } @@ -1490,21 +1434,6 @@ static void _entry_focused_cb(void *data, Evas_Object *obj, void *event_info) return; } - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; - - if (obj == p->entry_password) { - 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); - } - } - if (!elm_entry_is_empty(obj)) elm_object_signal_emit(data, "elm,state,eraser,show", "elm"); elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm"); @@ -1524,7 +1453,7 @@ 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) +static void _eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source) { debug_log(""); @@ -1533,91 +1462,54 @@ static void _entry_theme_changed_cb(void *data, Evas_Object *obj, void *event_in 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); - } + elm_entry_entry_set(data, ""); } -static void _eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source) +static void _input_panel_state_up_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); + struct priv_data *p = (struct priv_data *)data; + struct viewdata *vd = p->vd; + EmailSettingUGD *ugd = vd->ugd; - if (!obj) { - debug_log("obj is NULL"); - return; - } - - elm_entry_entry_set(data, ""); + debug_log("input panel show"); + int rotation = elm_win_rotation_get(ugd->win); + if (abs(rotation) == 90 || abs(rotation) == 270) + elm_naviframe_item_title_visible_set(p->navi_it, EINA_TRUE); } -static void _input_panel_state_changed_cb(void *data, Ecore_IMF_Context *ctx, int value) +static void _input_panel_state_down_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); + struct priv_data *p = (struct priv_data *)data; + struct viewdata *vd = p->vd; + EmailSettingUGD *ugd = vd->ugd; - if (!data) { - debug_log("data is NULL"); - return; - } - - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; - - int state = ecore_imf_context_input_panel_state_get(ctx); - - if (state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) - debug_log("state:SHOW"); - else if (state == ECORE_IMF_INPUT_PANEL_STATE_HIDE) - debug_log("state HIDE"); - - if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) - debug_log("value:SHOW"); - else if (value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) - debug_log("value HIDE"); - - if (state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) { - debug_log("input panel show"); - elm_object_item_signal_emit(p->navi_it, "elm,state,sip,shown", ""); - } else if (state == ECORE_IMF_INPUT_PANEL_STATE_HIDE) { - debug_log("input panel hide"); - elm_object_item_signal_emit(p->navi_it, "elm,state,sip,hidden", ""); - } + debug_log("input panel hide"); + int rotation = elm_win_rotation_get(ugd->win); + if (abs(rotation) == 90 || abs(rotation) == 270) + elm_naviframe_item_title_visible_set(p->navi_it, EINA_TRUE); } static void _gl_ef_sel_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - int index = (int)data; + ListItemData *li = (ListItemData *)data; struct viewdata *vd = g_vd; struct priv_data *p = vd->priv; Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, EINA_FALSE); - if (index == 1) { + if (li->index == ACCOUNT_NAME_LIST_ITEM) { p->clicked_object = p->entry_account_name; - } else if (index == 2) { + } else if (li->index == USER_ID_LIST_ITEM) { p->clicked_object = p->entry_user_id; - } else if (index == 3) { + } else if (li->index == DISPLAY_NAME_LIST_ITEM) { p->clicked_object = p->entry_display_name; - } else if (index == 4) { + } else if (li->index == EMAIL_ADDRESS_LIST_ITEM) { p->clicked_object = p->entry_email_address; - } else if (index == 5) { + } else if (li->index == PASSWORD_LIST_ITEM) { p->clicked_object = p->entry_password; } } @@ -1636,7 +1528,7 @@ static char *_gl_group_text_get(void *data, Evas_Object *obj, const char *part) else snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", vd->ugd->account_info->name_str_id)); } else { - snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", "IDS_COM_BODY_OTHERS")); + snprintf(title_str, sizeof(title_str), "%s", EMAIL_SETTING_STRING_OTHERS); } return g_strdup(title_str); @@ -1648,158 +1540,30 @@ static char *_gl_group_text_get(void *data, Evas_Object *obj, const char *part) static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; + ListItemData *li = (ListItemData *)data; struct viewdata *vd = g_vd; struct priv_data *p = vd->priv; //EmailSettingUGD *ugd = vd->ugd; - Ecore_IMF_Context *imf_context = NULL; - - if (!strcmp(part, "elm.icon")) { - if (index == 1) { - //p->icon_get_cnt1++; - debug_log(""); - p->ef_account_name = elm_layout_add(p->genlist); - elm_layout_theme_set(p->ef_account_name, "layout", "editfield", "title"); - p->entry_account_name = elm_entry_add(p->genlist); - elm_entry_scrollable_set(p->entry_account_name, EINA_TRUE); - elm_entry_single_line_set(p->entry_account_name, EINA_TRUE); - elm_entry_input_panel_return_key_disabled_set(p->entry_account_name, EINA_TRUE); - elm_entry_cnp_mode_set(p->entry_account_name, ELM_CNP_MODE_PLAINTEXT); - elm_entry_input_panel_layout_set(p->entry_account_name, ELM_INPUT_PANEL_LAYOUT_EMAIL); - elm_entry_editable_set(p->entry_account_name, TRUE); - evas_object_smart_callback_add(p->entry_account_name, "changed", _backup_input_cb, p->ef_account_name); - evas_object_smart_callback_add(p->entry_account_name, "focused", _entry_focused_cb, p->ef_account_name); - evas_object_smart_callback_add(p->entry_account_name, "unfocused", _entry_unfocused_cb, p->ef_account_name); - evas_object_show(p->entry_account_name); - - imf_context = elm_entry_imf_context_get(p->entry_account_name); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - - elm_object_part_content_set(p->ef_account_name, "elm.swallow.content", p->entry_account_name); - /*elm_object_part_text_set(p->ef_account_name, "elm.guidetext", str);*/ - elm_object_part_text_set(p->ef_account_name, "elm.text", _("IDS_EMAIL_BODY_ACCOUNT_NAME")); - elm_object_signal_callback_add(p->ef_account_name, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_account_name); - - evas_object_size_hint_weight_set(p->ef_account_name, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(p->ef_account_name); - - 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 && - 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); - elm_object_focus_set(p->entry_account_name, EINA_TRUE); - } - - if (ugd->account_info == NULL && p->icon_get_cnt1 == 3 && - 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); - elm_object_focus_set(p->entry_account_name, EINA_TRUE); - }*/ - - return p->ef_account_name; - } else if (index == 2) { - debug_log(""); - p->ef_user_id = elm_layout_add(p->genlist); - elm_layout_theme_set(p->ef_user_id, "layout", "editfield", "title"); - p->entry_user_id = elm_entry_add(p->genlist); - elm_entry_scrollable_set(p->entry_user_id, EINA_TRUE); - elm_entry_single_line_set(p->entry_user_id, EINA_TRUE); - elm_entry_input_panel_return_key_disabled_set(p->entry_user_id, EINA_TRUE); - elm_entry_cnp_mode_set(p->entry_user_id, ELM_CNP_MODE_PLAINTEXT); - elm_entry_input_panel_layout_set(p->entry_user_id, ELM_INPUT_PANEL_LAYOUT_EMAIL); - elm_entry_editable_set(p->entry_user_id, TRUE); - evas_object_smart_callback_add(p->entry_user_id, "changed", _backup_input_cb, p->ef_user_id); - evas_object_smart_callback_add(p->entry_user_id, "focused", _entry_focused_cb, p->ef_user_id); - evas_object_smart_callback_add(p->entry_user_id, "unfocused", _entry_unfocused_cb, p->ef_user_id); - evas_object_show(p->entry_user_id); - - imf_context = elm_entry_imf_context_get(p->entry_user_id); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - - elm_object_part_content_set(p->ef_user_id, "elm.swallow.content", p->entry_user_id); - /*elm_object_part_text_set(p->ef_user_id, "elm.guidetext", dgettext("sys_string", "IDS_COM_BODY_USER_NAME"));*/ - elm_object_part_text_set(p->ef_user_id, "elm.text", dgettext("sys_string", "IDS_COM_BODY_USER_NAME")); - elm_object_signal_callback_add(p->ef_user_id, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_user_id); - - evas_object_size_hint_weight_set(p->ef_user_id, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(p->ef_user_id); - - if (p->str_user_id) - elm_entry_entry_set(p->entry_user_id, p->str_user_id); - - return p->ef_user_id; - } else if (index == 3) { - debug_log(""); - p->ef_display_name = elm_layout_add(p->genlist); - elm_layout_theme_set(p->ef_display_name, "layout", "editfield", "title"); - p->entry_display_name = elm_entry_add(p->genlist); - elm_entry_scrollable_set(p->entry_display_name, EINA_TRUE); - elm_entry_single_line_set(p->entry_display_name, EINA_TRUE); - elm_entry_input_panel_return_key_disabled_set(p->entry_display_name, EINA_TRUE); - elm_entry_cnp_mode_set(p->entry_display_name, ELM_CNP_MODE_PLAINTEXT); - elm_entry_input_panel_layout_set(p->entry_display_name, ELM_INPUT_PANEL_LAYOUT_EMAIL); - elm_entry_editable_set(p->entry_display_name, TRUE); - evas_object_smart_callback_add(p->entry_display_name, "changed", _backup_input_cb, p->ef_display_name); - evas_object_smart_callback_add(p->entry_display_name, "focused", _entry_focused_cb, p->ef_display_name); - evas_object_smart_callback_add(p->entry_display_name, "unfocused", _entry_unfocused_cb, p->ef_display_name); - evas_object_show(p->entry_display_name); - - imf_context = elm_entry_imf_context_get(p->entry_display_name); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - - elm_object_part_content_set(p->ef_display_name, "elm.swallow.content", p->entry_display_name); - /*elm_object_part_text_set(p->ef_display_name, "elm.guidetext", _("IDS_EMAIL_BODY_YOUR_NAME"));*/ - elm_object_part_text_set(p->ef_display_name, "elm.text", dgettext("sys_string", "IDS_COM_BODY_DETAILS_NAME")); - elm_object_signal_callback_add(p->ef_display_name, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_display_name); - - evas_object_size_hint_weight_set(p->ef_display_name, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(p->ef_display_name); - - if (p->str_display_name) - elm_entry_entry_set(p->entry_display_name, p->str_display_name); - - return p->ef_display_name; - } else if (index == 4) { - //p->icon_get_cnt2++; + if (!strcmp(part, "elm.icon")) { + if (li->index == EMAIL_ADDRESS_LIST_ITEM) { + debug_log(""); + p->ef_email_address = elm_layout_add(p->genlist); + elm_layout_theme_set(p->ef_email_address, "layout", "editfield", "title"); + p->entry_email_address = elm_entry_add(p->genlist); + elm_entry_scrollable_set(p->entry_email_address, EINA_TRUE); + elm_entry_single_line_set(p->entry_email_address, EINA_TRUE); + elm_entry_cnp_mode_set(p->entry_email_address, ELM_CNP_MODE_PLAINTEXT); + elm_entry_input_panel_layout_set(p->entry_email_address, ELM_INPUT_PANEL_LAYOUT_EMAIL); + elm_entry_editable_set(p->entry_email_address, TRUE); - debug_log(""); - p->ef_email_address = elm_layout_add(p->genlist); - elm_layout_theme_set(p->ef_email_address, "layout", "editfield", "title"); - p->entry_email_address = elm_entry_add(p->genlist); - elm_entry_scrollable_set(p->entry_email_address, EINA_TRUE); - elm_entry_single_line_set(p->entry_email_address, EINA_TRUE); - //elm_entry_input_panel_return_key_disabled_set(p->entry_email_address, EINA_TRUE); - elm_entry_cnp_mode_set(p->entry_email_address, ELM_CNP_MODE_PLAINTEXT); - elm_entry_input_panel_layout_set(p->entry_email_address, ELM_INPUT_PANEL_LAYOUT_EMAIL); - elm_entry_editable_set(p->entry_email_address, TRUE); evas_object_smart_callback_add(p->entry_email_address, "changed", _backup_input_cb, p->ef_email_address); evas_object_smart_callback_add(p->entry_email_address, "focused", _entry_focused_cb, p->ef_email_address); evas_object_smart_callback_add(p->entry_email_address, "unfocused", _entry_unfocused_cb, p->ef_email_address); evas_object_show(p->entry_email_address); - imf_context = elm_entry_imf_context_get(p->entry_email_address); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - elm_object_part_content_set(p->ef_email_address, "elm.swallow.content", p->entry_email_address); - /*_set_help_string(p->ef_email_address, vd);*/ - elm_object_part_text_set(p->ef_email_address, "elm.text", dgettext("sys_string", "IDS_COM_BODY_EMAIL_ADDRESS")); + elm_object_part_text_set(p->ef_email_address, "elm.text", EMAIL_SETTING_STRING_EMAIL_ADDRESS); elm_object_signal_callback_add(p->ef_email_address, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_email_address); evas_object_size_hint_weight_set(p->ef_email_address, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1807,67 +1571,29 @@ 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 && - 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); - elm_object_focus_set(p->entry_email_address, EINA_TRUE); - elm_entry_cursor_begin_set(p->entry_email_address); - } - - if (ugd->account_info != NULL && p->icon_get_cnt2 == 3 && - 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); - 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) { + } else if (li->index == PASSWORD_LIST_ITEM) { debug_log(""); p->ef_password = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_password, "layout", "editfield", "title"); + p->entry_password = elm_entry_add(p->genlist); elm_entry_scrollable_set(p->entry_password, EINA_TRUE); 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_NORMAL); - elm_entry_editable_set(p->entry_password, EINA_TRUE); + elm_entry_entry_set(p->entry_password, p->str_password ? p->str_password : ""); elm_entry_password_set(p->entry_password, EINA_TRUE); + elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_PASSWORD); 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); - //evas_object_smart_callback_add(p->entry_password, "theme,changed", _entry_theme_changed_cb, (void *)vd); - evas_object_show(p->entry_password); - - imf_context = elm_entry_imf_context_get(p->entry_password); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); + evas_object_propagate_events_set(p->entry_password, EINA_TRUE); elm_object_part_content_set(p->ef_password, "elm.swallow.content", p->entry_password); - /*elm_object_part_text_set(p->ef_password, "elm.guidetext", _("IDS_EMAIL_BODY_USER_PASSWORD"));*/ - elm_object_part_text_set(p->ef_password, "elm.text", dgettext("sys_string", "IDS_COM_BODY_PASSWORD")); elm_object_signal_callback_add(p->ef_password, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_password); - evas_object_size_hint_weight_set(p->ef_password, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(p->ef_password); - - if (p->str_password) - elm_entry_entry_set(p->entry_password, p->str_password); - - Eina_Bool state = elm_check_state_get(p->show_passwd_check); - - if (state) - elm_entry_password_set(p->entry_password, EINA_FALSE); - else - elm_entry_password_set(p->entry_password, EINA_TRUE); - + elm_object_part_text_set(p->ef_password, "elm.text", EMAIL_SETTING_STRING_PWD); + evas_object_show(p->entry_password); return p->ef_password; } } @@ -1878,12 +1604,14 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info) { Elm_Object_Item *it = event_info; - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; + ListItemData *li = elm_object_item_data_get(it); + + if (!li) + return; - if (p->gl_email_address_item == it) + if (li->index == EMAIL_ADDRESS_LIST_ITEM) elm_object_item_signal_emit(it, "elm,state,top", ""); - else if (p->gl_pw_item == it) + else if (li->index == PASSWORD_LIST_ITEM) elm_object_item_signal_emit(it, "elm,state,bottom", ""); else elm_object_item_signal_emit(it, "elm,state,center", ""); diff --git a/setting/src/email-view-initial.c b/setting/src/email-view-initial.c index 28719ee..4d913a2 100755 --- a/setting/src/email-view-initial.c +++ b/setting/src/email-view-initial.c @@ -22,6 +22,7 @@ static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_view(struct viewdata *vd); @@ -45,7 +46,10 @@ struct priv_data { Evas_Object *b_btn2; Evas_Object *b_btn; + Elm_Object_Item *navi_it; + Elm_Genlist_Item_Class itc1; + Elm_Genlist_Item_Class itc2; Elm_Genlist_Item_Class itc3; Elm_Genlist_Item_Class itc4; Ecore_Timer *vc_timer; @@ -61,6 +65,7 @@ void setting_init_initial_access_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_initial_access"; } @@ -141,6 +146,26 @@ static int _hide(struct viewdata *vd) return TRUE; } +static int _lang_change(struct viewdata *vd) +{ + debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + + struct priv_data *p = vd->priv; + + // refreshing genlist. + elm_genlist_realized_items_update(p->list); + + // navi title + elm_object_item_part_text_set(p->navi_it, "elm.text.title", EMAIL_SETTING_STRING_ADD_ACCOUNT); + + return TRUE; +} + static void _push_naviframe(struct viewdata *vd) { debug_log(""); @@ -150,7 +175,7 @@ static void _push_naviframe(struct viewdata *vd) evas_object_smart_callback_add(p->l_button, "clicked", _back_cb, vd); evas_object_show(p->l_button); - elm_naviframe_item_push(vd->ugd->navi_bar, _("IDS_EMAIL_HEADER_ADD_ACCOUNT"), + p->navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, EMAIL_SETTING_STRING_ADD_ACCOUNT, p->l_button, NULL, p->layout, NULL); elm_object_style_set(p->l_button, "naviframe/end_btn/default"); evas_object_show(vd->ugd->navi_bar); @@ -184,7 +209,7 @@ static void _create_view(struct viewdata *vd) evas_object_size_hint_weight_set(sub_ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(sub_ly); - char *desc = g_strdup(_("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")); + char *desc = g_strdup(EMAIL_SETTING_STRING_FIRST_SIGN_UP); Evas_Object *label = elm_label_add(ugd->navi_bar); elm_label_line_wrap_set(label, ELM_WRAP_WORD); elm_label_wrap_width_set(label, 440); @@ -312,7 +337,7 @@ static char *_gl_text_get_cb(void *data, Evas_Object *obj, const char *part) else str = g_strdup(dgettext("sys_string", desc->name_str_id)); } else { - str = g_strdup(dgettext("sys_string", "IDS_COM_BODY_OTHERS")); + str = g_strdup(EMAIL_SETTING_STRING_OTHERS); } return str; diff --git a/setting/src/email-view-mailbox-mapping.c b/setting/src/email-view-mailbox-mapping.c index 680e2af..4c60fe0 100755 --- a/setting/src/email-view-mailbox-mapping.c +++ b/setting/src/email-view-mailbox-mapping.c @@ -25,6 +25,7 @@ static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_list(struct viewdata *vd); @@ -49,10 +50,9 @@ struct priv_data { Evas_Object *radio_grp; Evas_Object *genlist; - Elm_Object_Item * c_item[4]; + Elm_Object_Item *navi_it; Elm_Genlist_Item_Class itc; Elm_Genlist_Item_Class itc2; - Elm_Genlist_Item_Class itc3; email_mailbox_t *mailbox_list; email_mailbox_t *mailbox_type; @@ -69,6 +69,7 @@ void setting_init_mailbox_mapping_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_mailbox_mapping"; } @@ -136,6 +137,26 @@ static int _hide(struct viewdata *vd) return TRUE; } +static int _lang_change(struct viewdata *vd) +{ + debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + + struct priv_data *p = vd->priv; + + // refreshing genlist. + elm_genlist_realized_items_update(p->genlist); + + // navi title + elm_object_item_part_text_set(p->navi_it, "elm.text.title", EMAIL_SETTING_STRING_MAILBOX_SETUP); + + return TRUE; +} + static void _push_naviframe(struct viewdata *vd) { debug_log(""); @@ -146,8 +167,8 @@ static void _push_naviframe(struct viewdata *vd) evas_object_smart_callback_add(p->l_button, "clicked", _back_cb, vd); evas_object_show(p->l_button); - elm_naviframe_item_push(vd->ugd->navi_bar, - _("IDS_EMAIL_HEADER_MAILBOX_SETUP"), p->l_button, NULL, p->layout, NULL); + p->navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, + EMAIL_SETTING_STRING_HEADER_MAILBOX_SETUP, p->l_button, NULL, p->layout, NULL); evas_object_show(vd->ugd->navi_bar); } @@ -186,12 +207,6 @@ static void _create_list(struct viewdata *vd) p->itc2.func.state_get = _gl_state_get_cb; p->itc2.func.del = _gl_del_cb; - p->itc3.item_style = "dialogue/separator/end"; - p->itc3.func.text_get = NULL; - p->itc3.func.content_get = NULL; - p->itc3.func.state_get = _gl_state_get_cb; - p->itc3.func.del = _gl_del_cb; - git = elm_genlist_item_append(p->genlist, &(p->itc2), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); @@ -204,7 +219,7 @@ static void _create_list(struct viewdata *vd) } } - git = elm_genlist_item_append(p->genlist, &(p->itc3), NULL, NULL, + git = elm_genlist_item_append(p->genlist, &(p->itc2), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); diff --git a/setting/src/email-view-manual-setup.c b/setting/src/email-view-manual-setup.c index f5b9d32..c1f80db 100755 --- a/setting/src/email-view-manual-setup.c +++ b/setting/src/email-view-manual-setup.c @@ -23,6 +23,7 @@ static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_list(struct viewdata *vd); @@ -41,12 +42,14 @@ 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 _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 _input_panel_state_up_cb(void *data, Evas_Object *obj, void *event_info); +static void _input_panel_state_down_cb(void *data, Evas_Object *obj, void *event_info); static char *_gl_text_get_cb(void *data, Evas_Object *obj, const char *part); static void _gl_ef_sel_cb(void *data, Evas_Object *obj, void *event_info); static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const char *part); static char *_gl_ex_secure_text_get_cb(void *data, Evas_Object *obj, const char *part); +static char *_gl_sp_text_get_cb(void *data, Evas_Object *obj, const char *part); static Evas_Object *_gl_ex_sending_secure_content_get_cb(void *data, Evas_Object *obj, const char *part); static char *_gl_ex_incoming_type_text_get_cb(void *data, Evas_Object *obj, const char *part); static Evas_Object *_gl_ex_incoming_type_content_get_cb(void *data, Evas_Object *obj, const char *part); @@ -61,11 +64,26 @@ static void _gl_con_cb(void *data, Evas_Object *obj, void *event_info); static struct viewdata *g_vd = NULL; +enum { + ACCOUNT_NAME_LIST_ITEM = 1, + USERNAME_LIST_ITEM, + PASSWORD_LIST_ITEM, + OUTGOING_SETTING_TITLE_LIST_ITEM, + OUTGOING_SERVER_LIST_ITEM, + OUTGOING_PORT_LIST_ITEM, + OUTGOING_SECURE_CONN_LIST_ITEM, + INCOMING_SETTING_TITLE_LIST_ITEM, + INCOMING_SERVER_TYPE_LIST_ITEM, + POP3_SERVER_LIST_ITEM, + POP3_PORT_LIST_ITEM, + POP3_SECURE_CONN_LIST_ITEM +}; + struct priv_data { struct viewdata *vd; int handle; - int icon_get_cnt1; + GSList *list_items; char *str_account_name; char *str_user_name; @@ -95,20 +113,15 @@ struct priv_data { Evas_Object *ef_sending_username; Evas_Object *ef_sending_password; - Evas_Object *icon; Evas_Object *layout; Evas_Object *sending_secure_radio_grp; Evas_Object *incoming_type_radio_grp; Evas_Object *incoming_secure_radio_grp; - Evas_Object *r_button; - Evas_Object *l_button; Evas_Object *l_button2; Evas_Object *tool_btn; - Evas_Object *clicked_object; Evas_Object *genlist; - Evas_Object *cbar; email_account_t *account; @@ -118,26 +131,18 @@ struct priv_data { Elm_Genlist_Item_Class itc4; Elm_Genlist_Item_Class itc5; Elm_Genlist_Item_Class itc6; - Elm_Genlist_Item_Class itc7; - - Elm_Object_Item *gl_account_name_item; - Elm_Object_Item *gl_user_name_item; - Elm_Object_Item *gl_pw_item; + Elm_Genlist_Item_Class itc_title; - Elm_Object_Item *gl_smtp_server_item; - Elm_Object_Item *gl_smtp_port_item; - Elm_Object_Item *gl_ex_item1; - - Elm_Object_Item *gl_ex_item2; - Elm_Object_Item *gl_incoming_server_type_item; - Elm_Object_Item *gl_incoming_server_item; - Elm_Object_Item *gl_incoming_port_item; - Elm_Object_Item *gl_ex_item3; - - Elm_Object_Item * c_item[4]; Elm_Object_Item *navi_it; }; +typedef struct _ListItemData { + int index; + Elm_Object_Item *gl_it; + struct priv_data *p; +} ListItemData; + + void setting_init_manual_setup_view(struct viewdata *vd) { debug_log(""); @@ -147,6 +152,7 @@ void setting_init_manual_setup_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_manual_setup"; } @@ -209,17 +215,17 @@ void setting_manual_validation_failed_cb(EmailSettingUGD *ugd, gboolean canceled if (canceled) { snprintf(fail_msg, sizeof(fail_msg), "%s", - _("IDS_EMAIL_POP_ACCOUNT_CREATION_CANCELLED")); + EMAIL_SETTING_STRING_ACCOUNT_CREATION_CANCELLED); ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), fail_msg, 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, fail_msg, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); } else { snprintf(fail_msg, sizeof(fail_msg), "%s
%s", - _("IDS_EMAIL_POP_VALIDATION_FAILED"), err_msg); + EMAIL_SETTING_STRING_VALIDATION_FAILED, err_msg); ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), fail_msg, 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, fail_msg, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); } g_free(err_msg); @@ -283,16 +289,9 @@ static int _destroy(struct viewdata *vd) struct priv_data *p = vd->priv; EmailSettingUGD *ugd = vd->ugd; - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) { - ecore_imf_context_input_panel_hide(imf_context); - ecore_imf_context_input_panel_event_callback_del(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_state_changed_cb); - } + evas_object_smart_callback_del(vd->ugd->conformant, "virtualkeypad,state,on", _input_panel_state_up_cb); + evas_object_smart_callback_del(vd->ugd->conformant, "virtualkeypad,state,off", _input_panel_state_down_cb); - evas_object_del(p->l_button); - evas_object_del(p->r_button); evas_object_del(p->genlist); evas_object_del(p->tool_btn); @@ -310,6 +309,13 @@ static int _destroy(struct viewdata *vd) ugd->popup_validate = NULL; } + GSList *l = p->list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->list_items); + return TRUE; } @@ -340,23 +346,42 @@ static int _hide(struct viewdata *vd) return TRUE; } -static void _push_naviframe(struct viewdata *vd) +static int _lang_change(struct viewdata *vd) { debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + struct priv_data *p = vd->priv; - p->r_button = elm_button_add(vd->ugd->navi_bar); - elm_object_style_set(p->r_button, "naviframe/toolbar/default"); - elm_object_text_set(p->r_button, dgettext("sys_string", "IDS_COM_SK_SET")); - evas_object_smart_callback_add(p->r_button, "clicked", _save_cb, vd); - elm_object_disabled_set(p->r_button, EINA_TRUE); - evas_object_show(p->r_button); + // refreshing genlist. + elm_genlist_realized_items_update(p->genlist); - p->l_button = elm_button_add(vd->ugd->navi_bar); - elm_object_style_set(p->l_button, "naviframe/end_btn/default"); - /*elm_object_text_set(p->l_button, dgettext("sys_string", "IDS_COM_SK_CANCEL"));*/ - evas_object_smart_callback_add(p->l_button, "clicked", _back_cb, vd); - evas_object_show(p->l_button); + // navi title + char title_str[50] = { 0, }; + if (vd->ugd->account_info) { + if (g_str_has_prefix(vd->ugd->account_info->name_str_id, "IDS_EMAIL")) + snprintf(title_str, sizeof(title_str), "%s", _(vd->ugd->account_info->name_str_id)); + else + snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", vd->ugd->account_info->name_str_id)); + } else { + snprintf(title_str, sizeof(title_str), "%s", EMAIL_SETTING_STRING_OTHERS); + } + elm_object_item_part_text_set(p->navi_it, "elm.text.title", title_str); + + // set button + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_SET); + + return TRUE; +} + +static void _push_naviframe(struct viewdata *vd) +{ + debug_log(""); + struct priv_data *p = vd->priv; p->l_button2 = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->l_button2, "naviframe/end_btn/default"); @@ -365,7 +390,7 @@ static void _push_naviframe(struct viewdata *vd) p->tool_btn = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->tool_btn, "naviframe/toolbar/default"); - elm_object_text_set(p->tool_btn, dgettext("sys_string", "IDS_COM_SK_SET")); + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_SET); evas_object_smart_callback_add(p->tool_btn, "clicked", _save_cb, vd); Evas_Object *title_ic = elm_icon_add(vd->ugd->navi_bar); @@ -381,17 +406,16 @@ static void _push_naviframe(struct viewdata *vd) elm_image_file_set(title_ic, vd->ugd->account_info->icon_path, NULL); } else { - snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", "IDS_COM_BODY_OTHERS")); + snprintf(title_str, sizeof(title_str), "%s", EMAIL_SETTING_STRING_OTHERS); } Elm_Object_Item *navi_it = NULL; navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, title_str, NULL, NULL, p->layout, NULL); - + evas_object_smart_callback_add(vd->ugd->conformant, "virtualkeypad,state,on", _input_panel_state_up_cb, p); + evas_object_smart_callback_add(vd->ugd->conformant, "virtualkeypad,state,off", _input_panel_state_down_cb, p); if (vd->ugd->account_info) { elm_object_item_part_content_set(navi_it, "icon", title_ic); } - elm_object_item_part_content_set(navi_it, "title_toolbar_button1", p->r_button); - elm_object_item_part_content_set(navi_it, "title_prev_btn", p->l_button); elm_object_item_part_content_set(navi_it, "toolbar_button1", p->tool_btn); elm_object_item_part_content_set(navi_it, "prev_btn", p->l_button2); p->navi_it = navi_it; @@ -409,7 +433,7 @@ static void _create_list(struct viewdata *vd) struct priv_data *p; EmailSettingUGD *ugd; - int i = 0; + ListItemData *li = NULL; ugd = vd->ugd; p = vd->priv; @@ -419,6 +443,9 @@ static void _create_list(struct viewdata *vd) p->genlist = elm_genlist_add(ugd->navi_bar); elm_object_style_set(p->genlist, "dialogue"); + evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); p->sending_secure_radio_grp = elm_radio_add(p->genlist); elm_radio_value_set(p->sending_secure_radio_grp, 0); @@ -468,91 +495,160 @@ static void _create_list(struct viewdata *vd) p->itc6.func.state_get = NULL; p->itc6.func.del = NULL; - p->itc7.item_style = "dialogue/separator/end"; - p->itc7.func.text_get = NULL; - p->itc7.func.content_get = NULL; - p->itc7.func.state_get = NULL; - p->itc7.func.del = NULL; + p->itc_title.item_style = "dialogue/title"; + p->itc_title.func.text_get = _gl_sp_text_get_cb; + p->itc_title.func.content_get = NULL; + p->itc_title.func.state_get = NULL; + p->itc_title.func.del = NULL; git = elm_genlist_item_append(p->genlist, &(p->itc1), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* Account name */ - i = 1; - p->gl_account_name_item = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = ACCOUNT_NAME_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* User name */ - i = 2; - p->gl_user_name_item = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = USERNAME_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* Password */ - i = 3; - p->gl_pw_item = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = PASSWORD_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); + /* Separator */ git = elm_genlist_item_append(p->genlist, &(p->itc1), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + /* Outgoing setting title */ + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = OUTGOING_SETTING_TITLE_LIST_ITEM; + li->p = p; + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)li, NULL, + ELM_GENLIST_ITEM_GROUP, NULL, NULL); + elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); + /* smtp server */ - i = 4; - p->gl_smtp_server_item = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = OUTGOING_SERVER_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* smtp port */ - i = 5; - p->gl_smtp_port_item = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = OUTGOING_PORT_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* sending security */ - i = 1; - p->gl_ex_item1 = elm_genlist_item_append(p->genlist, &(p->itc3), (void *)i, - NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)vd); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = OUTGOING_SECURE_CONN_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc3), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); + /* Separator */ git = elm_genlist_item_append(p->genlist, &(p->itc1), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + /* Incoming settings title */ + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = INCOMING_SETTING_TITLE_LIST_ITEM; + li->p = p; + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc_title), (void *)li, NULL, + ELM_GENLIST_ITEM_GROUP, NULL, NULL); + elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); + /* incoming server type */ - i = 2; - p->gl_ex_item2 = elm_genlist_item_append(p->genlist, &(p->itc3), (void *)i, - NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)vd); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = INCOMING_SERVER_TYPE_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc3), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /* incoming server */ - i = 6; - p->gl_incoming_server_item = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = POP3_SERVER_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* incoming port */ - i = 7; - p->gl_incoming_port_item = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)i); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = POP3_PORT_LIST_ITEM; + li->p = p; + li->gl_it = item = elm_genlist_item_append(p->genlist, &(p->itc2), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_ef_sel_cb, (void *)li); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE); + p->list_items = g_slist_append(p->list_items, li); /* secure connection */ - i = 3; - p->gl_ex_item3 = elm_genlist_item_append(p->genlist, &(p->itc3), (void *)i, - NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)vd); + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = POP3_SECURE_CONN_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc3), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); - git = elm_genlist_item_append(p->genlist, &(p->itc7), NULL, NULL, + /* separator */ + git = elm_genlist_item_append(p->genlist, &(p->itc1), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - /*evas_object_smart_callback_add(p->genlist, "expand,request", _gl_exp_req_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "contract,request", _gl_con_req_cb, (void *)vd);*/ - evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); - elm_object_part_content_set(p->layout, "elm.swallow.content", p->genlist); } @@ -592,15 +688,15 @@ static int _create_account(void *data) if (error_code == EMAIL_ERROR_ALREADY_EXISTS) ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - dgettext("sys_string", "IDS_COM_POP_ALREDY_EXISTS"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_ALREADY_EXIST, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); else ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_UNABLE_TO_ADD_ACCOUNT"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_UNABLE_TO_ADD_ACCOUNT, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); } return TRUE; @@ -638,18 +734,10 @@ static void _validate_account(struct viewdata *vd, int account_id) ugd->cancel_event = 0; -/* - // remove unnessary disabling because of focus problem - elm_object_disabled_set(p->r_button, EINA_TRUE); - elm_object_disabled_set(p->l_button, EINA_TRUE); - elm_object_disabled_set(p->l_button2, EINA_TRUE); - elm_object_disabled_set(p->tool_btn, EINA_TRUE); -*/ - debug_log("Start Account Validation"); ugd->popup_validate = setting_get_pb_notify(vd, - _("IDS_EMAIL_POP_VALIDATING_ACCOUNT_ING"), 1, - dgettext("sys_string", "IDS_COM_SK_CANCEL"), + EMAIL_SETTING_STRING_VALIDATING_ACCOUNT_ING, 1, + EMAIL_SETTING_STRING_CANCEL, _popup_cancel_validation_cb, NULL, NULL); } @@ -830,12 +918,6 @@ static void _save_cb(void *data, Evas_Object *obj, void *event_info) ugd = vd->ugd; account = p->account; - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) { - ecore_imf_context_input_panel_hide(imf_context); - } - /* Save the data */ _read_all_entries(vd); debug_log("Account Structure Info\nEmail Addr:%s\nUser Dispname:%s\nUser Password:%s", @@ -854,9 +936,9 @@ static void _save_cb(void *data, Evas_Object *obj, void *event_info) if (!ret) { debug_log("empty space in account info"); ugd->popup_one = setting_get_notify(vd, - dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_PLEASE_FILL_ALL_THE_MANDATORY_FIELDS"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_FILL_MANDATORY_FIELDS, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); return; } @@ -871,15 +953,9 @@ static void _back_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) { - ecore_imf_context_input_panel_hide(imf_context); - ecore_imf_context_input_panel_event_callback_del(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_state_changed_cb); - } + if (ecore_imf_input_panel_hide()) + return; setting_back_to_prev_view(vd); } @@ -902,7 +978,7 @@ static Eina_Bool _after_validation_cb(void *data) ugd->other_vc_timer = NULL; } - status_message_post(_("IDS_EMAIL_POP_SUCCEEDED")); + status_message_post(EMAIL_SETTING_STRING_SUCCEEDED); setting_change_view(VIEW_SYNC_SETUP, ugd); @@ -953,8 +1029,6 @@ static void _popup_ok_cb(void *data, Evas_Object *obj, void *event_info) ugd->popup_validate = NULL; } - elm_object_disabled_set(p->r_button, EINA_FALSE); - elm_object_disabled_set(p->l_button, EINA_FALSE); elm_object_disabled_set(p->l_button2, EINA_FALSE); elm_object_disabled_set(p->tool_btn, EINA_FALSE); } @@ -1010,8 +1084,6 @@ static void _popup_cancel_validation_cb(void *data, Evas_Object *obj, void *even email_engine_stop_working(account_id, p->handle); email_engine_delete_account(account_id); - elm_object_disabled_set(p->r_button, EINA_FALSE); - elm_object_disabled_set(p->l_button, EINA_FALSE); elm_object_disabled_set(p->l_button2, EINA_FALSE); elm_object_disabled_set(p->tool_btn, EINA_FALSE); } @@ -1088,7 +1160,6 @@ static void _backup_input_cb(void *data, Evas_Object *obj, void *event_info) p->str_smtp_port == NULL || p->str_incoming_server == NULL || p->str_incoming_port == NULL) { - elm_object_disabled_set(p->r_button, EINA_TRUE); elm_object_disabled_set(p->tool_btn, EINA_TRUE); return; } @@ -1100,10 +1171,8 @@ static void _backup_input_cb(void *data, Evas_Object *obj, void *event_info) g_strcmp0(p->str_smtp_port, "") == 0 || g_strcmp0(p->str_incoming_server, "") == 0 || g_strcmp0(p->str_incoming_port, "") == 0) { - elm_object_disabled_set(p->r_button, EINA_TRUE); elm_object_disabled_set(p->tool_btn, EINA_TRUE); } else { - elm_object_disabled_set(p->r_button, EINA_FALSE); elm_object_disabled_set(p->tool_btn, EINA_FALSE); } } @@ -1148,102 +1217,79 @@ static void _eraser_clicked_cb(void *data, Evas_Object *obj, const char *emissio elm_entry_entry_set(data, ""); } -static void _input_panel_state_changed_cb(void *data, Ecore_IMF_Context *ctx, int value) -{ - debug_log(""); - - if (!data) { - debug_log("data is NULL"); - return; - } - - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; - - if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) { - debug_log("input panel show"); - elm_object_item_signal_emit(p->navi_it, "elm,state,sip,shown", ""); - } else if (value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) { - debug_log("input panel hide"); - elm_object_item_signal_emit(p->navi_it, "elm,state,sip,hidden", ""); - } -} - static char *_gl_text_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; - - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; email_account_t *account = p->account; if (!strcmp(part, "elm.text.1")) { - if (index == 1) { + if (li->index == OUTGOING_SECURE_CONN_LIST_ITEM) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SECURE_CONNECTION")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SECURE_CONNECTION); return g_strdup(buf); } - if (index == 2) { + if (li->index == INCOMING_SERVER_TYPE_LIST_ITEM) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_INCOMING_MAIL_SERVER_TYPE")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_INCOMING_MAIL_SERVER_TYPE); return g_strdup(buf); } - if (index == 3) { + if (li->index == POP3_SECURE_CONN_LIST_ITEM) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SECURE_CONNECTION")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SECURE_CONNECTION); return g_strdup(buf); } } if (!strcmp(part, "elm.text.2")) { - if (index == 1) { + if (li->index == OUTGOING_SECURE_CONN_LIST_ITEM) { if (account->outgoing_server_secure_connection == 0) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_OFF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_OFF); return g_strdup(buf); } if (account->outgoing_server_secure_connection == 1) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SSL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SSL); return g_strdup(buf); } if (account->outgoing_server_secure_connection == 2) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_TLS")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_TLS); return g_strdup(buf); } } - if (index == 2) { + if (li->index == INCOMING_SERVER_TYPE_LIST_ITEM) { if (account->incoming_server_type == EMAIL_SERVER_TYPE_POP3) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_POP3")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_POP3); return g_strdup(buf); } if (account->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_IMAP4")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_IMAP4); return g_strdup(buf); } } - if (index == 3) { + if (li->index == POP3_SECURE_CONN_LIST_ITEM) { if (account->incoming_server_secure_connection == 0) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_OFF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_OFF); return g_strdup(buf); } if (account->incoming_server_secure_connection == 1) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SSL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SSL); return g_strdup(buf); } if (account->incoming_server_secure_connection == 2) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_TLS")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_TLS); return g_strdup(buf); } } @@ -1255,41 +1301,20 @@ static char *_gl_text_get_cb(void *data, Evas_Object *obj, const char *part) static void _gl_ef_sel_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - int index = (int)data; - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, EINA_FALSE); - - if (index == 1) { - p->clicked_object = p->entry_account_name; - } else if (index == 2) { - p->clicked_object = p->entry_user_name; - } else if (index == 3) { - p->clicked_object = p->entry_password; - } else if (index == 4) { - p->clicked_object = p->entry_smtp_server; - } else if (index == 5) { - p->clicked_object = p->entry_smtp_port; - } else if (index == 6) { - p->clicked_object = p->entry_incoming_server; - } else if (index == 7) { - p->clicked_object = p->entry_incoming_port; - } } static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; - Ecore_IMF_Context *imf_context = NULL; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; if (!strcmp(part, "elm.icon")) { - if (index == 1) { + if (li->index == ACCOUNT_NAME_LIST_ITEM) { debug_log(""); p->ef_account_name = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_account_name, "layout", "editfield", "title"); @@ -1305,14 +1330,8 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_account_name, "unfocused", _entry_unfocused_cb, p->ef_account_name); evas_object_show(p->entry_account_name); - imf_context = elm_entry_imf_context_get(p->entry_account_name); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - elm_object_part_content_set(p->ef_account_name, "elm.swallow.content", p->entry_account_name); - elm_object_part_text_set(p->ef_account_name, "elm.text", _("IDS_EMAIL_BODY_ACCOUNT_NAME")); + elm_object_part_text_set(p->ef_account_name, "elm.text", EMAIL_SETTING_STRING_ACCOUNT_NAME); elm_object_signal_callback_add(p->ef_account_name, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_account_name); evas_object_size_hint_weight_set(p->ef_account_name, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1322,7 +1341,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_entry_entry_set(p->entry_account_name, p->str_account_name); return p->ef_account_name; - } else if (index == 2) { + } else if (li->index == USERNAME_LIST_ITEM) { debug_log(""); p->ef_user_name = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_user_name, "layout", "editfield", "title"); @@ -1338,14 +1357,8 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_user_name, "unfocused", _entry_unfocused_cb, p->ef_user_name); evas_object_show(p->entry_user_name); - imf_context = elm_entry_imf_context_get(p->entry_user_name); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - elm_object_part_content_set(p->ef_user_name, "elm.swallow.content", p->entry_user_name); - elm_object_part_text_set(p->ef_user_name, "elm.text", dgettext("sys_string", "IDS_COM_BODY_USER_NAME")); + elm_object_part_text_set(p->ef_user_name, "elm.text", EMAIL_SETTING_STRING_USER_NAME); elm_object_signal_callback_add(p->ef_user_name, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_user_name); evas_object_size_hint_weight_set(p->ef_user_name, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1355,7 +1368,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_entry_entry_set(p->entry_user_name, p->str_user_name); return p->ef_user_name; - } else if (index == 3) { + } else if (li->index == PASSWORD_LIST_ITEM) { debug_log(""); p->ef_password = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_password, "layout", "editfield", "title"); @@ -1373,14 +1386,8 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_password, "unfocused", _entry_unfocused_cb, p->ef_password); evas_object_show(p->entry_password); - imf_context = elm_entry_imf_context_get(p->entry_password); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - elm_object_part_content_set(p->ef_password, "elm.swallow.content", p->entry_password); - elm_object_part_text_set(p->ef_password, "elm.text", dgettext("sys_string", "IDS_COM_BODY_PASSWORD")); + elm_object_part_text_set(p->ef_password, "elm.text", EMAIL_SETTING_STRING_PWD); elm_object_signal_callback_add(p->ef_password, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_password); evas_object_size_hint_weight_set(p->ef_password, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1390,8 +1397,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_entry_entry_set(p->entry_password, p->str_password); return p->ef_password; - } else if (index == 4) { - /*p->icon_get_cnt1++;*/ + } else if (li->index == OUTGOING_SERVER_LIST_ITEM) { debug_log(""); p->ef_smtp_server = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_smtp_server, "layout", "editfield", "title"); @@ -1407,14 +1413,8 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_smtp_server, "unfocused", _entry_unfocused_cb, p->ef_smtp_server); evas_object_show(p->entry_smtp_server); - imf_context = elm_entry_imf_context_get(p->entry_smtp_server); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - elm_object_part_content_set(p->ef_smtp_server, "elm.swallow.content", p->entry_smtp_server); - elm_object_part_text_set(p->ef_smtp_server, "elm.text", _("IDS_EMAIL_BODY_OUTGOING_SERVER")); + elm_object_part_text_set(p->ef_smtp_server, "elm.text", EMAIL_SETTING_STRING_OUTGOING_SERVER); elm_object_signal_callback_add(p->ef_smtp_server, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_smtp_server); evas_object_size_hint_weight_set(p->ef_smtp_server, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1423,14 +1423,8 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch if (p->str_smtp_server) elm_entry_entry_set(p->entry_smtp_server, p->str_smtp_server); - /*if (p->icon_get_cnt1 < 4) { - p->clicked_object = p->entry_smtp_server; - evas_object_show(p->entry_smtp_server); - elm_object_focus_set(p->entry_smtp_server, EINA_TRUE); - }*/ - return p->ef_smtp_server; - } else if (index == 5) { + } else if (li->index == OUTGOING_PORT_LIST_ITEM) { debug_log(""); p->ef_smtp_port = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_smtp_port, "layout", "editfield", "title"); @@ -1446,14 +1440,8 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_smtp_port, "unfocused", _entry_unfocused_cb, p->ef_smtp_port); evas_object_show(p->entry_smtp_port); - imf_context = elm_entry_imf_context_get(p->entry_smtp_port); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - elm_object_part_content_set(p->ef_smtp_port, "elm.swallow.content", p->entry_smtp_port); - elm_object_part_text_set(p->ef_smtp_port, "elm.text", _("IDS_EMAIL_BODY_OUTGOING_PORT")); + elm_object_part_text_set(p->ef_smtp_port, "elm.text", EMAIL_SETTING_STRING_OUTGOING_PORT); elm_object_signal_callback_add(p->ef_smtp_port, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_smtp_port); evas_object_size_hint_weight_set(p->ef_smtp_port, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1463,7 +1451,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_entry_entry_set(p->entry_smtp_port, p->str_smtp_port); return p->ef_smtp_port; - } else if (index == 6) { + } else if (li->index == POP3_SERVER_LIST_ITEM) { debug_log(""); p->ef_incoming_server = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_incoming_server, "layout", "editfield", "title"); @@ -1479,14 +1467,8 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_incoming_server, "unfocused", _entry_unfocused_cb, p->ef_incoming_server); evas_object_show(p->entry_incoming_server); - imf_context = elm_entry_imf_context_get(p->entry_incoming_server); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - elm_object_part_content_set(p->ef_incoming_server, "elm.swallow.content", p->entry_incoming_server); - elm_object_part_text_set(p->ef_incoming_server, "elm.text", _("IDS_EMAIL_BODY_INCOMING_SERVER")); + elm_object_part_text_set(p->ef_incoming_server, "elm.text", EMAIL_SETTING_STRING_INCOMING_SERVER); elm_object_signal_callback_add(p->ef_incoming_server, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_incoming_server); evas_object_size_hint_weight_set(p->ef_incoming_server, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1496,7 +1478,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_entry_entry_set(p->entry_incoming_server, p->str_incoming_server); return p->ef_incoming_server; - } else if (index == 7) { + } else if (li->index == POP3_PORT_LIST_ITEM) { debug_log(""); p->ef_incoming_port = elm_layout_add(p->genlist); elm_layout_theme_set(p->ef_incoming_port, "layout", "editfield", "title"); @@ -1512,14 +1494,8 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch evas_object_smart_callback_add(p->entry_incoming_port, "unfocused", _entry_unfocused_cb, p->ef_incoming_port); evas_object_show(p->entry_incoming_port); - imf_context = elm_entry_imf_context_get(p->entry_incoming_port); - if (imf_context) - ecore_imf_context_input_panel_event_callback_add(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _input_panel_state_changed_cb, (void *)vd); - elm_object_part_content_set(p->ef_incoming_port, "elm.swallow.content", p->entry_incoming_port); - elm_object_part_text_set(p->ef_incoming_port, "elm.text", _("IDS_EMAIL_BODY_INCOMING_PORT")); + elm_object_part_text_set(p->ef_incoming_port, "elm.text", EMAIL_SETTING_STRING_INCOMING_PORT); elm_object_signal_callback_add(p->ef_incoming_port, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_incoming_port); evas_object_size_hint_weight_set(p->ef_incoming_port, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1544,13 +1520,33 @@ static char *_gl_ex_secure_text_get_cb(void *data, Evas_Object *obj, const char char buf[MAX_STR_LEN] = { 0, }; if (index == 0) { - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_OFF")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_OFF); } if (index == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SSL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SSL); } if (index == 2) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_TLS")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_TLS); + } + + return g_strdup(buf); + } + + return NULL; +} + +static char *_gl_sp_text_get_cb(void *data, Evas_Object *obj, const char *part) +{ + debug_log(""); + ListItemData *li = (ListItemData *)data; + + if (!g_strcmp0(part, "elm.text")) { + char buf[MAX_STR_LEN] = { 0, }; + + if (li->index == INCOMING_SETTING_TITLE_LIST_ITEM) { + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_INCOMING_SETTINGS); + } else if (li->index == OUTGOING_SETTING_TITLE_LIST_ITEM) { + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_OUTGOING_SETTINGS); } return g_strdup(buf); @@ -1590,10 +1586,10 @@ static char *_gl_ex_incoming_type_text_get_cb(void *data, Evas_Object *obj, cons char buf[MAX_STR_LEN] = { 0, }; if (index == 0) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_POP3")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_POP3); } if (index == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_IMAP4")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_IMAP4); } return g_strdup(buf); @@ -1654,16 +1650,6 @@ static void _gl_ex_sel_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; - - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) - ecore_imf_context_input_panel_hide(imf_context); - - elm_object_focus_set(p->clicked_object, EINA_FALSE); - Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, EINA_FALSE); @@ -1710,7 +1696,7 @@ static void _gl_ex_sending_secure_sel_cb(void *data, Evas_Object *obj, void *eve } elm_radio_value_set(p->sending_secure_radio_grp, index); - elm_genlist_item_update(p->gl_ex_item1); + elm_genlist_item_update(elm_genlist_item_parent_get(item)); } static void _gl_ex_incoming_type_sel_cb(void *data, Evas_Object *obj, void *event_info) @@ -1744,7 +1730,7 @@ static void _gl_ex_incoming_type_sel_cb(void *data, Evas_Object *obj, void *even } elm_radio_value_set(p->incoming_type_radio_grp, index); - elm_genlist_item_update(p->gl_ex_item2); + elm_genlist_item_update(elm_genlist_item_parent_get(item)); } static void _gl_ex_incoming_secure_sel_cb(void *data, Evas_Object *obj, void *event_info) @@ -1783,46 +1769,45 @@ static void _gl_ex_incoming_secure_sel_cb(void *data, Evas_Object *obj, void *ev } elm_radio_value_set(p->incoming_secure_radio_grp, index); - elm_genlist_item_update(p->gl_ex_item3); + elm_genlist_item_update(elm_genlist_item_parent_get(item)); } static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info) { Elm_Object_Item *it = event_info; - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; - Evas_Object *parent = NULL; + Elm_Object_Item *parent = NULL; + ListItemData *li = (ListItemData *)elm_object_item_data_get(it); parent = elm_genlist_item_parent_get(it); if (!parent) { - if (p->gl_account_name_item == it || - p->gl_smtp_server_item == it || - p->gl_ex_item2 == it) - elm_object_item_signal_emit(it, "elm,state,top", ""); - else if (p->gl_pw_item == it || - p->gl_ex_item1 == it || - p->gl_ex_item3 == it) - elm_object_item_signal_emit(it, "elm,state,bottom", ""); - else - elm_object_item_signal_emit(it, "elm,state,center", ""); + if (li) { + if (li->index == ACCOUNT_NAME_LIST_ITEM || + li->index == OUTGOING_SERVER_LIST_ITEM || + li->index == INCOMING_SERVER_TYPE_LIST_ITEM) + elm_object_item_signal_emit(it, "elm,state,top", ""); + else if (li->index == PASSWORD_LIST_ITEM || + li->index == OUTGOING_SECURE_CONN_LIST_ITEM || + li->index == POP3_SECURE_CONN_LIST_ITEM) + elm_object_item_signal_emit(it, "elm,state,bottom", ""); + else + elm_object_item_signal_emit(it, "elm,state,center", ""); + } } else { - int index = elm_object_item_data_get(it); + int index = (int)elm_object_item_data_get(it); + ListItemData *pli = elm_object_item_data_get(parent); - if (p->gl_ex_item2 != parent) - { + if (pli->index != INCOMING_SERVER_TYPE_LIST_ITEM) { if (index == 0) elm_object_item_signal_emit(it, "elm,state,top", ""); else if (index == 2) elm_object_item_signal_emit(it, "elm,state,bottom", ""); else elm_object_item_signal_emit(it, "elm,state,center", ""); - } - else - { + } else { if (index == 0) elm_object_item_signal_emit(it, "elm,state,top", ""); else if (index == 1) @@ -1841,30 +1826,26 @@ static void _gl_exp_cb(void *data, Evas_Object *obj, void *event_info) struct viewdata *vd = (struct viewdata *)data; struct priv_data *p = vd->priv; int i = 0; + ListItemData *li = (ListItemData *)elm_object_item_data_get(it); - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) - ecore_imf_context_input_panel_hide(imf_context); - - elm_object_focus_set(p->clicked_object, EINA_FALSE); - - /* sending security */ - if (it == p->gl_ex_item1) { - for (i = 0; i < 3; i++) { - elm_genlist_item_append(p->genlist, &(p->itc4), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_sending_secure_sel_cb, (void *)i); + if (li) { + /* sending security */ + if (li->index == OUTGOING_SECURE_CONN_LIST_ITEM) { + for (i = 0; i < 3; i++) { + elm_genlist_item_append(p->genlist, &(p->itc4), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_sending_secure_sel_cb, (void *)i); + } } - } - /* incoming server type */ - if (it == p->gl_ex_item2) { - for (i = 0; i < 2; i++) { - elm_genlist_item_append(p->genlist, &(p->itc5), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_incoming_type_sel_cb, (void *)i); + /* incoming server type */ + if (li->index == INCOMING_SERVER_TYPE_LIST_ITEM) { + for (i = 0; i < 2; i++) { + elm_genlist_item_append(p->genlist, &(p->itc5), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_incoming_type_sel_cb, (void *)i); + } } - } - /* incoming security */ - if (it == p->gl_ex_item3) { - for (i = 0; i < 3; i++) { - elm_genlist_item_append(p->genlist, &(p->itc6), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_incoming_secure_sel_cb, (void *)i); + /* incoming security */ + if (li->index == POP3_SECURE_CONN_LIST_ITEM) { + for (i = 0; i < 3; i++) { + elm_genlist_item_append(p->genlist, &(p->itc6), (void *)i, it, ELM_GENLIST_ITEM_NONE, _gl_ex_incoming_secure_sel_cb, (void *)i); + } } } } @@ -1876,4 +1857,30 @@ static void _gl_con_cb(void *data, Evas_Object *obj, void *event_info) elm_genlist_item_subitems_clear(item); } +static void _input_panel_state_up_cb(void *data, Evas_Object *obj, void *event_info) +{ + debug_log(""); + struct priv_data *p = (struct priv_data *)data; + struct viewdata *vd = p->vd; + EmailSettingUGD *ugd = vd->ugd; + + debug_log("input panel show"); + int rotation = elm_win_rotation_get(ugd->win); + if (abs(rotation) == 90 || abs(rotation) == 270) + elm_naviframe_item_title_visible_set(p->navi_it, EINA_TRUE); +} + +static void _input_panel_state_down_cb(void *data, Evas_Object *obj, void *event_info) +{ + debug_log(""); + struct priv_data *p = (struct priv_data *)data; + struct viewdata *vd = p->vd; + EmailSettingUGD *ugd = vd->ugd; + + debug_log("input panel hide"); + int rotation = elm_win_rotation_get(ugd->win); + if (abs(rotation) == 90 || abs(rotation) == 270) + elm_naviframe_item_title_visible_set(p->navi_it, EINA_TRUE); +} + /* EOF */ diff --git a/setting/src/email-view-setting.c b/setting/src/email-view-setting.c index 5075f96..cdfa72b 100755 --- a/setting/src/email-view-setting.c +++ b/setting/src/email-view-setting.c @@ -24,10 +24,11 @@ static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_list(struct viewdata *vd); -static void _get_default_account(struct viewdata *vd); +static void _get_default_option_value(struct viewdata *vd); static void _back_cb(void *data, Evas_Object *obj, void *event_info); static void _add_account_cb(void *data, Evas_Object *obj, void *event_info); static void _color_rect_cb(void *data, Evas_Object *obj, const char *emission, const char *source); @@ -50,48 +51,50 @@ static void _gl_account_sel_cb(void *data, Evas_Object *obj, void *event_info); static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info); static void _gl_exp_cb(void *data, Evas_Object *obj, void *event_info); static void _gl_con_cb(void *data, Evas_Object *obj, void *event_info); - static void _create_max_account_popup_create(EmailSettingUGD *ugd); static void _max_account_popup_ok_cb(void *data, Evas_Object *obj, void *event_info); static struct viewdata *g_vd = NULL; +enum { + GENERAL_SETTINGS_TITLE_LIST_ITEM = 1001, + DEFAULT_SENDING_ACCOUNT_LIST_ITEM, + MESSAGE_PREVIEW_LINE_LIST_ITEM, + TITLE_LINE_LIST_ITEM, + FONT_SIZE_LIST_ITEM, + NOTIFICATION_LIST_ITEM, + TEXT_TEMPLATE_LIST_ITEM, + FILTER_SETTINGS_TITLE_LIST_ITEM, + PRIORITY_SENDER_LIST_ITEM, + BLOCK_LIST_ITEM, + RULES_FOR_FILTERING_LIST_ITEM, + ACCOUNTS_LIST_TITLE_LIST_ITEM, + ACCOUNTS_LIST_ITEM +}; + struct priv_data { struct viewdata *vd; + GSList *list_items; + GSList *account_list_items; + int color_r; int color_g; int color_b; int color_a; + int def_acct_id; char *def_acct_addr; - Evas_Object *box; Evas_Object *layout; - Evas_Object *navi_bar; - Evas_Object *cbar; - Evas_Object *icon; Evas_Object *l_button; Evas_Object *r_button; Evas_Object *tool_btn; - Evas_Object *scroller; Evas_Object *ly; - Evas_Object *sp1; - Evas_Object *sp2; - Evas_Object *sp3; - Evas_Object *di1; - Evas_Object *di2; - Evas_Object *di3; - Evas_Object *dg1; - Evas_Object *dg2; Evas_Object *colorselector; Evas_Object *rect; - Evas_Object *color_rect; - Evas_Object *color_bar; Evas_Object *btn_color_save; Evas_Object *btn_color_cancel; - Evas_Object **pdi; - Evas_Object *onoff; Evas_Object *radio_grp; Evas_Object *genlist; @@ -102,12 +105,12 @@ struct priv_data { Elm_Genlist_Item_Class itc5; Elm_Genlist_Item_Class itc6; Elm_Genlist_Item_Class itc7; + Elm_Genlist_Item_Class itc8; + Elm_Genlist_Item_Class itc9; Elm_Genlist_Item_Class itc_temp; Elm_Genlist_Item_Class itc_sepa; - Elm_Object_Item * c_item[10]; Elm_Object_Item *color_item; - Elm_Object_Item *default_account_item; Elm_Object_Item *first_account_item; Elm_Object_Item *last_account_item; Elm_Object_Item *tmp_item[PADDING_GENLIST_MAX]; @@ -115,13 +118,20 @@ struct priv_data { Ecore_Idler *bring_in_idler; }; +typedef struct _ListItemData { + int index; + Elm_Object_Item *gl_it; + struct priv_data *p; +} ListItemData; + typedef struct { + int index; email_account_t *account_data; - Elm_Object_Item *it; Evas_Object *color_rect; Evas_Object *color_bar; + Elm_Object_Item *it; struct priv_data *p; -} ListItemData; +} AccountListItemData; void setting_init_setting_view(struct viewdata *vd) { @@ -132,6 +142,7 @@ void setting_init_setting_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_main"; } @@ -178,9 +189,9 @@ static int _update(struct viewdata *vd) vd->ugd->account_count = 0; vd->ugd->account_list = NULL; p->def_acct_id = 0; - p->def_acct_addr = g_strdup(dgettext("sys_string", "IDS_COM_BODY_NONE")); + p->def_acct_addr = g_strdup(EMAIL_SETTING_STRING_NONE); } - _get_default_account(vd); + _get_default_option_value(vd); if (p->genlist) { elm_object_part_content_unset(p->layout, "elm.swallow.content"); @@ -220,6 +231,20 @@ static int _destroy(struct viewdata *vd) p->bring_in_idler = NULL; } + GSList *l = p->list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->list_items); + + l = p->account_list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->account_list_items); + vd->ugd->popup_one = NULL; return TRUE; @@ -256,20 +281,35 @@ static int _hide(struct viewdata *vd) return TRUE; } -static void _push_naviframe(struct viewdata *vd) +static int _lang_change(struct viewdata *vd) { debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + struct priv_data *p = vd->priv; - /*p->cbar = elm_toolbar_add(vd->ugd->navi_bar); - elm_toolbar_shrink_mode_set(p->cbar, ELM_TOOLBAR_SHRINK_EXPAND); - elm_object_style_set(p->cbar, "naviframe"); - evas_object_show(p->cbar); + _get_default_option_value(vd); + + // refreshing genlist. + elm_genlist_realized_items_update(p->genlist); - p->c_item[0] = elm_toolbar_item_append(p->cbar, CBAR_ICON_ADD, - dgettext("sys_string", "IDS_COM_SK_ADD"), _add_account_cb, vd); - elm_object_item_disabled_set(elm_toolbar_item_append(p->cbar, NULL, "", NULL, NULL), EINA_TRUE); - elm_object_item_disabled_set(elm_toolbar_item_append(p->cbar, NULL, "", NULL, NULL), EINA_TRUE);*/ + // navi title + elm_object_item_part_text_set(vd->ugd->navi_main_it, "elm.text.title", EMAIL_SETTING_STRING_ADD_ACCOUNT); + + // add button + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_ADD); + + return TRUE; +} + +static void _push_naviframe(struct viewdata *vd) +{ + debug_log(""); + struct priv_data *p = vd->priv; p->l_button = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->l_button, "naviframe/back_btn/default"); @@ -278,11 +318,11 @@ static void _push_naviframe(struct viewdata *vd) p->tool_btn = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->tool_btn, "naviframe/toolbar/default"); - elm_object_text_set(p->tool_btn, dgettext("sys_string", "IDS_COM_SK_ADD")); + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_ADD); evas_object_smart_callback_add(p->tool_btn, "clicked", _add_account_cb, vd); vd->ugd->navi_main_it = elm_naviframe_item_push(vd->ugd->navi_bar, - _("IDS_EMAIL_HEADER_EMAIL_SETTINGS"), p->l_button, NULL, p->layout, NULL); + EMAIL_SETTING_STRING_EMAIL_SETTINGS, p->l_button, NULL, p->layout, NULL); elm_object_item_part_content_set(vd->ugd->navi_main_it, "toolbar_button1", p->tool_btn); evas_object_show(vd->ugd->navi_bar); @@ -301,11 +341,28 @@ static void _create_list(struct viewdata *vd) EmailSettingUGD *ugd; email_account_t *account_data = NULL; int i = 0; + ListItemData *li = NULL; + AccountListItemData *ali = NULL; + Elm_Object_Item *git = NULL; ugd = vd->ugd; p = vd->priv; - Elm_Object_Item *git = NULL; + GSList *l = p->list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->list_items); + p->list_items = NULL; + + l = p->account_list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->account_list_items); + p->account_list_items = NULL; p->radio_grp = elm_radio_add(ugd->navi_bar); elm_radio_value_set(p->radio_grp, 0); @@ -313,6 +370,9 @@ static void _create_list(struct viewdata *vd) p->genlist = elm_genlist_add(ugd->navi_bar); elm_object_style_set(p->genlist, "dialogue"); + evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); /*separator*/ p->itc_sepa.item_style = "dialogue/separator"; @@ -328,7 +388,7 @@ static void _create_list(struct viewdata *vd) p->itc.func.state_get = _gl_state_get_cb; p->itc.func.del = _gl_del_cb; - /*subitem*/ + /*subitem for accounts*/ p->itc2.item_style = "dialogue/1text.1icon/expandable2"; p->itc2.func.text_get = _gl_ex_text_get_cb; p->itc2.func.content_get = _gl_ex_content_get_cb; @@ -343,7 +403,7 @@ static void _create_list(struct viewdata *vd) p->itc3.func.del = _gl_del_cb; /*accounts*/ - p->itc4.item_style = "dialogue/2text.2icon.3.tb";//"dialogue/2text.3icon"; + p->itc4.item_style = "dialogue/2text.3icon"; p->itc4.func.text_get = _gl_account_text_get_cb; p->itc4.func.content_get = _gl_account_content_get_cb; p->itc4.func.state_get = _gl_state_get_cb; @@ -363,75 +423,91 @@ static void _create_list(struct viewdata *vd) p->itc6.func.state_get = _gl_state_get_cb; p->itc6.func.del = _gl_del_cb; - p->itc7.item_style = "dialogue/separator/end"; - p->itc7.func.text_get = NULL; - p->itc7.func.content_get = NULL; - p->itc7.func.state_get = NULL; - p->itc7.func.del = NULL; - p->itc_temp.item_style = "1icon/with_no_line"; p->itc_temp.func.text_get = NULL; p->itc_temp.func.content_get = NULL; p->itc_temp.func.state_get = NULL; p->itc_temp.func.del = NULL; - i = 1; - git = elm_genlist_item_append(p->genlist, &(p->itc5), (void *)i, NULL, + /* separator */ + git = elm_genlist_item_append(p->genlist, &(p->itc_sepa), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + + /* title */ + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = GENERAL_SETTINGS_TITLE_LIST_ITEM; + li->p = p; + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc5), (void *)li, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); - i = 2; + /* default sending account */ + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = DEFAULT_SENDING_ACCOUNT_LIST_ITEM; + li->p = p; if (ugd->account_count > 0) - p->default_account_item = elm_genlist_item_append(p->genlist, &(p->itc), (void *)i, NULL, - ELM_GENLIST_ITEM_TREE, _gl_default_sel_cb, (void *)vd); - else - { - p->default_account_item = elm_genlist_item_append(p->genlist, &(p->itc6), (void *)i, NULL, - ELM_GENLIST_ITEM_NONE, _gl_sel_cb, NULL); - elm_object_item_disabled_set(p->default_account_item, EINA_TRUE); + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc), (void *)li, NULL, + ELM_GENLIST_ITEM_TREE, _gl_default_sel_cb, (void *)li); + else { + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc6), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + elm_object_item_disabled_set(git, EINA_TRUE); } + p->list_items = g_slist_append(p->list_items, li); -/* For Text templates - i = 5; - elm_genlist_item_append(p->genlist, &(p->itc3), (void *)i, git, - ELM_GENLIST_ITEM_NONE, NULL, (void *)vd); - */ + /* separator */ git = elm_genlist_item_append(p->genlist, &(p->itc_sepa), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - i = 6; - git = elm_genlist_item_append(p->genlist, &(p->itc5), (void *)i, NULL, + /* title */ + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = ACCOUNTS_LIST_TITLE_LIST_ITEM; + li->p = p; + li->gl_it = git = elm_genlist_item_append(p->genlist, &(p->itc5), (void *)li, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + p->list_items = g_slist_append(p->list_items, li); + /* accounts */ + int is_first_account = 0; for (i = 0; i < ugd->account_count; i++) { account_data = &(ugd->account_list[i]); if (account_data) { - ListItemData *item_data = calloc(1, sizeof(ListItemData)); - item_data->p = p; - item_data->account_data = account_data; - item_data->it = elm_genlist_item_append(p->genlist, &(p->itc4), - (void *)item_data, NULL, ELM_GENLIST_ITEM_NONE, - _gl_account_sel_cb, (void *)account_data); - if (i == 0) - p->first_account_item = item_data->it; - p->last_account_item = item_data->it; + ali = calloc(1, sizeof(AccountListItemData)); + ali->index = i; + ali->p = p; + ali->account_data = account_data; + ali->it = elm_genlist_item_append(p->genlist, &(p->itc4), + (void *)ali, NULL, ELM_GENLIST_ITEM_NONE, + _gl_account_sel_cb, (void *)ali); + if (!is_first_account) { + p->first_account_item = ali->it; + is_first_account = 1; + } + p->account_list_items = g_slist_append(p->account_list_items, ali); } } - git = elm_genlist_item_append(p->genlist, &(p->itc7), NULL, NULL, + if (ali) + p->last_account_item = ali->it; + + /* separator */ + git = elm_genlist_item_append(p->genlist, &(p->itc_sepa), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); - elm_object_part_content_set(p->layout, "elm.swallow.content", p->genlist); } -static void _get_default_account(struct viewdata *vd) +static void _get_default_option_value(struct viewdata *vd) { debug_log(""); @@ -520,7 +596,7 @@ static void _add_account_cb(void *data, Evas_Object *obj, void *event_info) Eina_Bool _genlist_bring_in_idler(void *data) { debug_log(""); - ListItemData *li = (ListItemData *)data; + AccountListItemData *li = (AccountListItemData *)data; Elm_Object_Item *it = li->it; struct priv_data *p = li->p; elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_TOP); @@ -532,123 +608,128 @@ Eina_Bool _genlist_bring_in_idler(void *data) static void _show_color_rect(void *data) { + debug_log(""); struct viewdata *vd = g_vd; EmailSettingUGD *ugd = vd->ugd; struct priv_data *p = vd->priv; + + if (p->colorselector) { + evas_object_del(p->colorselector); + p->colorselector = NULL; + } - Viewtype top = ugd->view_st[ugd->view_top]; - if (top != VIEW_SETTING) { - debug_log("**double clicked**"); - return; + p->colorselector = elm_colorselector_add(p->ly); + elm_colorselector_mode_set(p->colorselector, ELM_COLORSELECTOR_PALETTE); + evas_object_size_hint_fill_set(p->colorselector, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(p->colorselector, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_smart_callback_add(p->colorselector, "color,item,selected", _colorselector_cb, vd); + + int rotation = elm_win_rotation_get(ugd->win); + if (abs(rotation) == 90 || abs(rotation) == 270) { + elm_object_style_set(p->colorselector, "landscape"); } - ListItemData *item_data = NULL; + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR1), G_MASKING(COLOR1), B_MASKING(COLOR1), A_MASKING(COLOR1)); + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR2), G_MASKING(COLOR2), B_MASKING(COLOR2), A_MASKING(COLOR2)); + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR3), G_MASKING(COLOR3), B_MASKING(COLOR3), A_MASKING(COLOR3)); + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR4), G_MASKING(COLOR4), B_MASKING(COLOR4), A_MASKING(COLOR4)); + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR5), G_MASKING(COLOR5), B_MASKING(COLOR5), A_MASKING(COLOR5)); + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR6), G_MASKING(COLOR6), B_MASKING(COLOR6), A_MASKING(COLOR6)); + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR7), G_MASKING(COLOR7), B_MASKING(COLOR7), A_MASKING(COLOR7)); + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR8), G_MASKING(COLOR8), B_MASKING(COLOR8), A_MASKING(COLOR8)); + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR9), G_MASKING(COLOR9), B_MASKING(COLOR9), A_MASKING(COLOR9)); + elm_colorselector_palette_color_add(p->colorselector, R_MASKING(COLOR10), G_MASKING(COLOR10), B_MASKING(COLOR10), A_MASKING(COLOR10)); + + elm_object_part_content_set(p->ly, "palette", p->colorselector); + evas_object_show(p->colorselector); +} + +static void _color_rect_cb(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + debug_log(""); + struct viewdata *vd = g_vd; + EmailSettingUGD *ugd = vd->ugd; + struct priv_data *p = vd->priv; + AccountListItemData *ali = NULL; email_account_t *account_data = NULL; - item_data = (ListItemData *) data; - if (item_data == NULL) { - debug_log("item_data == NULL"); + ugd->custom_rotate_cb = _show_color_rect; + ugd->custom_rotate_cb_data = data; + + Viewtype top = ugd->view_st[ugd->view_top]; + if (top != VIEW_SETTING) { + debug_log("**double clicked**"); return; } - int i = 0; - for (i = 0; i < PADDING_GENLIST_MAX; i++) { - if (p->tmp_item[i]) { - elm_object_item_del(p->tmp_item[i]); - p->tmp_item[i] = NULL; - } - p->tmp_item[i] = elm_genlist_item_append(p->genlist, &(p->itc_temp), - NULL, NULL, ELM_GENLIST_ITEM_NONE, - NULL, NULL); - elm_genlist_item_select_mode_set(p->tmp_item[i], ELM_OBJECT_SELECT_MODE_NONE); + if (ugd->popup_color) { + evas_object_del(elm_object_content_get(ugd->popup_color)); + elm_object_content_unset(ugd->popup_color); + } else { + ugd->popup_color = elm_notify_add(ugd->navi_bar); + elm_notify_align_set(ugd->popup_color, ELM_NOTIFY_ALIGN_FILL, 1.0); + evas_object_size_hint_weight_set(ugd->popup_color, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + } + + ali = (AccountListItemData *) data; + if (ali == NULL) { + debug_log("ali == NULL"); + return; } - account_data = item_data->account_data; + account_data = ali->account_data; account_user_data_t *user_data = (account_user_data_t *)account_data->user_data; unsigned int val = user_data->index_color; - int r = p->color_r = (val & 0xff000000) >> 24; - int g = p->color_g = (val & 0x00ff0000) >> 16; - int b = p->color_b = (val & 0x0000ff00) >> 8; - int a = p->color_a = val & 0x000000ff; - - if (ugd->popup_color) { - evas_object_del(elm_object_content_get(ugd->popup_color)); - elm_object_content_unset(ugd->popup_color); - } else { - ugd->popup_color = elm_notify_add(ugd->navi_bar); - elm_notify_align_set(ugd->popup_color, ELM_NOTIFY_ALIGN_FILL, 1.0); - evas_object_size_hint_weight_set(ugd->popup_color, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - } + int r = p->color_r = R_MASKING(val); + int g = p->color_g = G_MASKING(val); + int b = p->color_b = B_MASKING(val); + int a = p->color_a = A_MASKING(val); p->ly = elm_layout_add(ugd->popup_color); elm_layout_file_set(p->ly, EV_THEME_PATH, "color_palette"); evas_object_size_hint_align_set(p->ly, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(p->ly); - p->rect = evas_object_rectangle_add(evas_object_evas_get(ugd->popup_color)); + p->rect = evas_object_rectangle_add(evas_object_evas_get(p->ly)); evas_object_size_hint_fill_set(p->rect, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_color_set(p->rect, r, g, b, a); evas_object_show(p->rect); elm_object_part_content_set(p->ly, "color_rect", p->rect); - p->colorselector = elm_colorselector_add(ugd->popup_color); - elm_colorselector_mode_set(p->colorselector, ELM_COLORSELECTOR_PALETTE); - evas_object_size_hint_fill_set(p->colorselector, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(p->colorselector, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_smart_callback_add(p->colorselector, "color,item,selected", _colorselector_cb, vd); - - int rotation = elm_win_rotation_get(ugd->win); - if (abs(rotation) == 90) { - elm_object_style_set(p->colorselector, "landscape"); - } - - /* set new colors */ - elm_colorselector_palette_color_add(p->colorselector, 0x00, 0x80, 0x80, 0xff); - elm_colorselector_palette_color_add(p->colorselector, 0xff, 0xd7, 0x00, 0xff); - elm_colorselector_palette_color_add(p->colorselector, 0xad, 0xff, 0x2f, 0xff); - elm_colorselector_palette_color_add(p->colorselector, 0x00, 0x64, 0x00, 0xff); - elm_colorselector_palette_color_add(p->colorselector, 0x00, 0x00, 0xff, 0xff); - elm_colorselector_palette_color_add(p->colorselector, 0x80, 0x00, 0x80, 0xff); - elm_colorselector_palette_color_add(p->colorselector, 0x00, 0xbf, 0xff, 0xff); - elm_colorselector_palette_color_add(p->colorselector, 0x77, 0x88, 0x99, 0xff); - elm_colorselector_palette_color_add(p->colorselector, 0xdc, 0x14, 0x3c, 0xff); - elm_colorselector_palette_color_add(p->colorselector, 0x8c, 0x45, 0x13, 0xff); - - elm_object_part_content_set(p->ly, "palette", p->colorselector); + _show_color_rect(data); - p->btn_color_save = elm_button_add(ugd->popup_color); - elm_object_style_set(p->btn_color_save, "popup_button/default"); - elm_object_text_set(p->btn_color_save, dgettext("sys_string", "IDS_COM_SK_SAVE")); + p->btn_color_save = elm_button_add(p->ly); + elm_object_style_set(p->btn_color_save, "text_only/style1"); + elm_object_text_set(p->btn_color_save, EMAIL_SETTING_STRING_SAVE); elm_object_part_content_set(p->ly, "btn_save", p->btn_color_save); evas_object_smart_callback_add(p->btn_color_save, "clicked", _btn_clicked_cb, data); - p->btn_color_cancel = elm_button_add(ugd->popup_color); - elm_object_style_set(p->btn_color_cancel, "popup_button/default"); - elm_object_text_set(p->btn_color_cancel, dgettext("sys_string", "IDS_COM_SK_CANCEL")); + p->btn_color_cancel = elm_button_add(p->ly); + elm_object_style_set(p->btn_color_cancel, "text_only/style1"); + elm_object_text_set(p->btn_color_cancel, EMAIL_SETTING_STRING_CANCEL); elm_object_part_content_set(p->ly, "btn_cancel", p->btn_color_cancel); evas_object_smart_callback_add(p->btn_color_cancel, "clicked", _btn_clicked_cb, NULL); elm_object_content_set(ugd->popup_color, p->ly); evas_object_show(ugd->popup_color); -} - -static void _color_rect_cb(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - debug_log(""); - struct viewdata *vd = g_vd; - EmailSettingUGD *ugd = vd->ugd; - struct priv_data *p = vd->priv; - - ugd->custom_rotate_cb = _show_color_rect; - ugd->custom_rotate_cb_data = data; - - _show_color_rect(data); + int i = 0; + for (i = 0; i < PADDING_GENLIST_MAX; i++) { + if (p->tmp_item[i]) { + elm_object_item_del(p->tmp_item[i]); + p->tmp_item[i] = NULL; + } + p->tmp_item[i] = elm_genlist_item_append(p->genlist, &(p->itc_temp), + NULL, NULL, ELM_GENLIST_ITEM_NONE, + NULL, NULL); + elm_genlist_item_select_mode_set(p->tmp_item[i], ELM_OBJECT_SELECT_MODE_NONE); + } if (p->bring_in_idler) { ecore_idler_del(p->bring_in_idler); p->bring_in_idler = NULL; } + p->bring_in_idler = ecore_idler_add(_genlist_bring_in_idler, data); } @@ -674,7 +755,7 @@ static void _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - ListItemData *item_data = (ListItemData *) data; + AccountListItemData *ali = (AccountListItemData *) data; struct viewdata *vd = g_vd; EmailSettingUGD *ugd = vd->ugd; struct priv_data *p = vd->priv; @@ -691,7 +772,7 @@ static void _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) } elm_scroller_content_min_limit(p->genlist, EINA_TRUE, EINA_TRUE); - if (!item_data) { + if (!ali) { if (ugd->popup_color) { evas_object_del(ugd->popup_color); ugd->popup_color = NULL; @@ -699,7 +780,7 @@ static void _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) return; } - email_account_t *account_data = item_data->account_data; + email_account_t *account_data = ali->account_data; if (ugd->popup_color) { evas_object_del(ugd->popup_color); @@ -718,8 +799,8 @@ static void _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) b = p->color_b; a = p->color_a; - evas_object_color_set(item_data->color_rect, r, g, b, a); - evas_object_color_set(item_data->color_bar, r, g, b, a); + evas_object_color_set(ali->color_rect, r, g, b, a); + evas_object_color_set(ali->color_bar, r, g, b, a); r = (r << 24) & 0xff000000; g = (g << 16) & 0x00ff0000; @@ -756,55 +837,40 @@ static void _popup_ok_cb(void *data, Evas_Object *obj, void *event_info) static char *_gl_text_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - int index = (int)data; - struct viewdata *vd = g_vd; - /*EmailSettingUGD *ugd = vd->ugd;*/ - struct priv_data *p = vd->priv; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; if (!strcmp(part, "elm.text")) { - if (index == 1) { - char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_GENERAL_SETTINGS")); - return g_strdup(buf); - } - - if (index == 3) { - char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_BLOCK_EMAILS")); - return g_strdup(buf); - } - - if (index == 4) { - char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_PRIORITY_SENDERS")); - return g_strdup(buf); - } - - if (index == 5) { - char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", N_("Text templates")); - return g_strdup(buf); - } - - if (index == 6) { - char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_ACCOUNTS")); - return g_strdup(buf); + if (li->index == GENERAL_SETTINGS_TITLE_LIST_ITEM) { + return g_strdup(EMAIL_SETTING_STRING_GENERAL_SETTINGS); + } else if (li->index == BLOCK_LIST_ITEM) { + return g_strdup(EMAIL_SETTING_STRING_BLOCK); + } else if (li->index == PRIORITY_SENDER_LIST_ITEM) { + return g_strdup(EMAIL_SETTING_STRING_PRIORITY_SENDERS); + } else if (li->index == TEXT_TEMPLATE_LIST_ITEM) { + return g_strdup(EMAIL_SETTING_STRING_TEXT_TEMPLATES); + } else if (li->index == ACCOUNTS_LIST_TITLE_LIST_ITEM) { + return g_strdup(EMAIL_SETTING_STRING_ACCOUNTS); + } else if (li->index == NOTIFICATION_LIST_ITEM) { + return g_strdup(EMAIL_SETTING_STRING_NOTIFICATION_SETTINGS); + } else if (li->index == FILTER_SETTINGS_TITLE_LIST_ITEM) { + return g_strdup(EMAIL_SETTING_STRING_FILTER_SETTINGS); } + return NULL; } if (!strcmp(part, "elm.text.1")) { - if (index == 2) { - char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_DEFAULT_SENDING_ACCOUNT")); - return g_strdup(buf); + if (li->index == DEFAULT_SENDING_ACCOUNT_LIST_ITEM) { + return g_strdup(EMAIL_SETTING_STRING_DEFAULT_SENDING_ACCOUNT); } + return NULL; } if (!strcmp(part, "elm.text.2")) { - if (index == 2) { + if (li->index == DEFAULT_SENDING_ACCOUNT_LIST_ITEM) { return g_strdup(p->def_acct_addr); } + return NULL; } return NULL; @@ -829,8 +895,8 @@ static char *_gl_ex_text_get_cb(void *data, Evas_Object *obj, const char *part) static char *_gl_account_text_get_cb(void *data, Evas_Object *obj, const char *part) { debug_log(""); - ListItemData *item_data = (ListItemData *) data; - email_account_t *account_data = item_data->account_data; + AccountListItemData *ali = (AccountListItemData *) data; + email_account_t *account_data = ali->account_data; char buf[PATH_MAX] = { 0, }; if (!strcmp(part, "elm.text.1")) { @@ -878,8 +944,8 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con Evas_Object *color_bar = NULL; Evas_Object *color_rect = NULL; - ListItemData *item_data = (ListItemData *) data; - email_account_t *account_data = item_data->account_data; + AccountListItemData *ali = (AccountListItemData *) data; + email_account_t *account_data = ali->account_data; if (!strcmp(part, "elm.icon.1")) { icon = elm_icon_add(obj); @@ -891,17 +957,17 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con if (!strcmp(part, "elm.swallow.colorbar")) { account_user_data_t *user_data = (account_user_data_t *)account_data->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; + int r = R_MASKING(val); + int g = G_MASKING(val); + int b = B_MASKING(val); + int a = A_MASKING(val); debug_log("R[%d] G[%d] B[%d] A[%d]", r, g, b, a); 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); - item_data->color_bar = color_bar; + ali->color_bar = color_bar; return color_bar; } @@ -909,10 +975,10 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con if (!strcmp(part, "elm.icon.2")) { account_user_data_t *user_data = (account_user_data_t *)account_data->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; + int r = R_MASKING(val); + int g = G_MASKING(val); + int b = B_MASKING(val); + int a = A_MASKING(val); debug_log("R[%d] G[%d] B[%d] A[%d]", r, g, b, a); @@ -922,8 +988,8 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con color_rect = elm_image_add(obj); elm_image_file_set(color_rect, EMAIL_COLOR_RECT_IMG, NULL); evas_object_color_set(color_rect, r, g, b, a); - item_data->color_rect = color_rect; - edje_object_signal_callback_add(elm_layout_edje_get(rect_ly), "elm,action,color_rect_clicked", "elm", _color_rect_cb, (void *)item_data); + ali->color_rect = color_rect; + edje_object_signal_callback_add(elm_layout_edje_get(rect_ly), "elm,action,color_rect_clicked", "elm", _color_rect_cb, (void *)ali); elm_object_part_content_set(rect_ly, "color_rect", color_rect); evas_object_propagate_events_set(color_rect, EINA_FALSE); evas_object_propagate_events_set(rect_ly, EINA_FALSE); @@ -949,9 +1015,13 @@ static void _gl_del_cb(void *data, Evas_Object *obj) static void _gl_account_del_cb(void *data, Evas_Object *obj) { debug_log(""); - ListItemData *item_data = (ListItemData *) data; - if (item_data) - free(item_data); + AccountListItemData *ali = (AccountListItemData *) data; + struct priv_data *p = ali->p; + + p->account_list_items = g_slist_remove(p->account_list_items, ali); + + free(ali); + return; } @@ -985,6 +1055,7 @@ static void _gl_ex_sel_cb(void *data, Evas_Object *obj, void *event_info) EmailSettingUGD *ugd = vd->ugd; struct priv_data *p = vd->priv; Elm_Object_Item *item = (Elm_Object_Item *)event_info; + Elm_Object_Item *parent_item = elm_genlist_item_parent_get(item); email_account_t *account_data = &(ugd->account_list[index]); elm_genlist_item_selected_set(item, EINA_FALSE); @@ -996,10 +1067,11 @@ static void _gl_ex_sel_cb(void *data, Evas_Object *obj, void *event_info) if (email_engine_set_default_account(account_data->account_id)) { debug_log("new default account is %d", account_data->account_id); - _get_default_account(vd); + _get_default_option_value(vd); } - elm_genlist_item_update(p->default_account_item); + if (parent_item) + elm_genlist_item_update(parent_item); } return; @@ -1008,8 +1080,10 @@ static void _gl_ex_sel_cb(void *data, Evas_Object *obj, void *event_info) static void _gl_account_sel_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - email_account_t *account_data = (email_account_t *) data; - struct viewdata *vd = g_vd; + AccountListItemData *ail = (AccountListItemData *)data; + email_account_t *account_data = ail->account_data; + struct priv_data *p = ail->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; Elm_Object_Item *item = (Elm_Object_Item *)event_info; @@ -1027,9 +1101,9 @@ static void _gl_account_sel_cb(void *data, Evas_Object *obj, void *event_info) } if (ugd->account_count == 0) { - ugd->popup_one = setting_get_notify(vd, dgettext("sys_string", "IDS_COM_POP_WARNING"), - _("IDS_EMAIL_POP_THERE_IS_NO_ACCOUNT_CREATE_A_NEW_ACCOUNT_FIRST"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + ugd->popup_one = setting_get_notify(vd, EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_NO_ACCOUNT, 1, + EMAIL_SETTING_STRING_OK, _popup_ok_cb, NULL, NULL); } else { ugd->account_id = account_data->account_id; @@ -1044,28 +1118,60 @@ static void _gl_account_sel_cb(void *data, Evas_Object *obj, void *event_info) static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info) { - Elm_Object_Item *it = event_info; struct viewdata *vd = (struct viewdata *)data; struct priv_data *p = vd->priv; EmailSettingUGD *ugd = vd->ugd; - Evas_Object *parent = NULL; + Elm_Object_Item *parent = NULL; int account_count = ugd->account_count; parent = elm_genlist_item_parent_get(it); if (!parent) { - if ((p->first_account_item == it || p->last_account_item == it) && (account_count == 1)) - return; - if (p->default_account_item == it) + ListItemData *li = (ListItemData *)elm_object_item_data_get(it); + if (!li) return; + + if (li->index > 1000) { + if (li->index == DEFAULT_SENDING_ACCOUNT_LIST_ITEM || + li->index == PRIORITY_SENDER_LIST_ITEM) + elm_object_item_signal_emit(it, "elm,state,top", ""); + else if (li->index == BLOCK_LIST_ITEM || + li->index == NOTIFICATION_LIST_ITEM) + elm_object_item_signal_emit(it, "elm,state,bottom", ""); + else + elm_object_item_signal_emit(it, "elm,state,center", ""); + } else { + if (account_count <= 1) + return; + if (p->first_account_item == it) + elm_object_item_signal_emit(it, "elm,state,top", ""); + else if (p->last_account_item == it) + elm_object_item_signal_emit(it, "elm,state,bottom", ""); + else + elm_object_item_signal_emit(it, "elm,state,center", ""); + } } else { - if (account_count == 1) + ListItemData *pli = (ListItemData *)elm_object_item_data_get(parent); + if (!pli) return; - int index = elm_object_item_data_get(it); - if (index == 0) + + int start_index = 0; + int last_index = 0; + int index = (int)elm_object_item_data_get(it); + + if (pli->index == DEFAULT_SENDING_ACCOUNT_LIST_ITEM) { + if (account_count == 1) + return; + last_index = account_count - 1; + } + + if (start_index == last_index) + return; + + if (start_index == index) elm_object_item_signal_emit(it, "elm,state,top", ""); - else if (index == ugd->account_count - 1) + else if (last_index == index) elm_object_item_signal_emit(it, "elm,state,bottom", ""); else elm_object_item_signal_emit(it, "elm,state,center", ""); @@ -1082,6 +1188,8 @@ static void _gl_exp_cb(void *data, Evas_Object *obj, void *event_info) struct viewdata *vd = (struct viewdata *)data; struct priv_data *p = vd->priv; + ListItemData *li = (ListItemData *)elm_object_item_data_get(it); + int i = 0; int acct_cnt = 0; ugd = vd->ugd; @@ -1090,12 +1198,14 @@ static void _gl_exp_cb(void *data, Evas_Object *obj, void *event_info) acct_cnt = ugd->account_count; } - for (i = 0; i < acct_cnt; i++) { - account_data = &(ugd->account_list[i]); + if (li->index == DEFAULT_SENDING_ACCOUNT_LIST_ITEM) { + for (i = 0; i < acct_cnt; i++) { + account_data = &(ugd->account_list[i]); - if (account_data) { - elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, - it, ELM_GENLIST_ITEM_NONE, _gl_ex_sel_cb, (void *)i); + if (account_data) { + elm_genlist_item_append(p->genlist, &(p->itc2), (void *)i, + it, ELM_GENLIST_ITEM_NONE, _gl_ex_sel_cb, (void *)i); + } } } } @@ -1106,19 +1216,19 @@ static void _gl_con_cb(void *data, Evas_Object *obj, void *event_info) Elm_Object_Item *item = event_info; elm_genlist_item_subitems_clear(item); } + static void _create_max_account_popup_create(EmailSettingUGD *ugd) { debug_log(""); Evas_Object *popup = elm_popup_add(ugd->win); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(popup, N_("Maximum number of email accounts reached")); + elm_object_text_set(popup, EMAIL_SETTING_STRING_ACCOUNT_NUM_MAX); Evas_Object *btn1 = elm_button_add(popup); - elm_object_text_set(btn1, dgettext("sys_string", "IDS_COM_SK_OK")); + elm_object_text_set(btn1, EMAIL_SETTING_STRING_OK); elm_object_part_content_set(popup, "button1", btn1); evas_object_smart_callback_add(btn1, "clicked", _max_account_popup_ok_cb, popup); evas_object_show(popup); - } static void _max_account_popup_ok_cb(void *data, Evas_Object *obj, void *event_info) diff --git a/setting/src/email-view-sp-select.c b/setting/src/email-view-sp-select.c index 5dda026..5c3c578 100755 --- a/setting/src/email-view-sp-select.c +++ b/setting/src/email-view-sp-select.c @@ -22,12 +22,14 @@ static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_list(struct viewdata *vd); static void _add_account_cb(void *data, Evas_Object *obj, void *event_info); static void _back_cb(void *data, Evas_Object *obj, void *event_info); +static void _popup_ok_cb(void *data, Evas_Object *obj, void *event_info); static char *_gl_text_get_cb(void *data, Evas_Object *obj, const char *part); static Evas_Object *_gl_content_get_cb(void *data, Evas_Object *obj, const char *part); static Eina_Bool _gl_state_get_cb(void *data, Evas_Object *obj, const char *part); @@ -41,6 +43,8 @@ struct priv_data { Evas_Object *b_btn2; Evas_Object *b_btn; + Elm_Object_Item *navi_it; + Elm_Genlist_Item_Class itc1; Elm_Genlist_Item_Class itc2; Elm_Genlist_Item_Class itc3; @@ -60,6 +64,7 @@ void setting_init_sp_select_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_sp_select"; } @@ -152,6 +157,26 @@ static int _hide(struct viewdata *vd) return TRUE; } +static int _lang_change(struct viewdata *vd) +{ + debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + + struct priv_data *p = vd->priv; + + // refreshing genlist. + elm_genlist_realized_items_update(p->list); + + // navi title + elm_object_item_part_text_set(p->navi_it, "elm.text.title", EMAIL_SETTING_STRING_ADD_ACCOUNT); + + return TRUE; +} + static void _push_naviframe(struct viewdata *vd) { debug_log(""); @@ -163,7 +188,7 @@ static void _push_naviframe(struct viewdata *vd) elm_object_style_set(p->b_btn, "naviframe/back_btn/default"); evas_object_smart_callback_add(p->b_btn, "clicked", _back_cb, vd); - elm_naviframe_item_push(vd->ugd->navi_bar, _("IDS_EMAIL_HEADER_ADD_ACCOUNT"), + p->navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, EMAIL_SETTING_STRING_ADD_ACCOUNT, p->b_btn, NULL, p->layout, NULL); evas_object_show(vd->ugd->navi_bar); } @@ -291,7 +316,7 @@ static char *_gl_text_get_cb(void *data, Evas_Object *obj, const char *part) else str = g_strdup(dgettext("sys_string", desc->name_str_id)); } else { - str = g_strdup(dgettext("sys_string", "IDS_COM_BODY_OTHERS")); + str = g_strdup(EMAIL_SETTING_STRING_OTHERS); } return str; diff --git a/setting/src/email-view-sync-schedule.c b/setting/src/email-view-sync-schedule.c index ca4a9db..9c3131f 100755 --- a/setting/src/email-view-sync-schedule.c +++ b/setting/src/email-view-sync-schedule.c @@ -35,6 +35,7 @@ static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_list(struct viewdata *vd); @@ -70,13 +71,20 @@ static void _gl_con_cb(void *data, Evas_Object *obj, void *event_info); static int sync_schedule[7] = { 0, 30, 60, 180, 360, 720, 1440 }; #define SYNC_STATUS_FINISHED 0 /* BIN 00000000 */ -#define SYNC_STATUS_SYNCING 1 /* BIN 00000001 */ -#define SYNC_STATUS_HAVE_NEW_MAILS 2 /* BIN 00000010 */ +#define SYNC_STATUS_SYNCING 1 /* BIN 00000001 */ +#define SYNC_STATUS_HAVE_NEW_MAILS 2 /* BIN 00000010 */ + +enum { + ACCOUNT_LIST_ITEM = 1, + SYNC_SCHEDULE_LIST_ITEM, + SYNC_ONOFF_LIST_ITEM +}; struct priv_data { struct viewdata *vd; - Evas_Object *cbar; + GSList *list_items; + Evas_Object *onoff; Evas_Object *l_button; @@ -85,7 +93,6 @@ struct priv_data { Evas_Object *layout; Evas_Object *sync_radio_grp; - Evas_Object *account_icon; Evas_Object *genlist; Elm_Genlist_Item_Class itc_account; @@ -93,18 +100,19 @@ struct priv_data { Elm_Genlist_Item_Class itc_sync; Elm_Genlist_Item_Class itc_ex_sync; Elm_Genlist_Item_Class itc_sep; - Elm_Genlist_Item_Class itc_sep2; - Elm_Object_Item * c_item[4]; - Elm_Object_Item *gl_sync_item; - Elm_Object_Item *gl_onoff_item; - Elm_Object_Item *gl_account_item; Elm_Object_Item *navi_it; int account_deleted; int syncing; }; +typedef struct _ListItemData { + int index; + Elm_Object_Item *gl_it; + struct priv_data *p; +} ListItemData; + void setting_init_sync_schedule_view(struct viewdata *vd) { debug_log(""); @@ -114,6 +122,7 @@ void setting_init_sync_schedule_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_sync_schedule"; } @@ -140,7 +149,15 @@ void setting_schedule_sync_started(struct viewdata *vd, int account_id) p->syncing = 1; elm_object_disabled_set(p->r_button, TRUE); - elm_genlist_item_update(p->gl_account_item); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == ACCOUNT_LIST_ITEM) { + elm_genlist_item_update(_li->gl_it); + } + l = g_slist_next(l); + } } void setting_schedule_sync_finished(struct viewdata *vd, int account_id) @@ -166,7 +183,15 @@ void setting_schedule_sync_finished(struct viewdata *vd, int account_id) p->syncing = 0; elm_object_disabled_set(p->r_button, FALSE); - elm_genlist_item_update(p->gl_account_item); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == ACCOUNT_LIST_ITEM) { + elm_genlist_item_update(_li->gl_it); + } + l = g_slist_next(l); + } } static int _create(struct viewdata *vd) @@ -230,7 +255,14 @@ static int _update(struct viewdata *vd) p->syncing = 0; elm_object_disabled_set(p->r_button, FALSE); } - elm_genlist_item_update(p->gl_account_item); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == ACCOUNT_LIST_ITEM) + elm_genlist_item_update(_li->gl_it); + l = g_slist_next(l); + } } return TRUE; @@ -262,6 +294,13 @@ static int _destroy(struct viewdata *vd) account_data = NULL; } + GSList *l = p->list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->list_items); + _close_icu_formatter(); return TRUE; @@ -316,24 +355,34 @@ static int _hide(struct viewdata *vd) return TRUE; } -static void _push_naviframe(struct viewdata *vd) +static int _lang_change(struct viewdata *vd) { debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + struct priv_data *p = vd->priv; - /*p->cbar = elm_toolbar_add(vd->ugd->navi_bar); - elm_toolbar_shrink_mode_set(p->cbar, ELM_TOOLBAR_SHRINK_EXPAND); - elm_object_style_set(p->cbar, "naviframe"); - evas_object_show(p->cbar); + // refreshing genlist. + elm_genlist_realized_items_update(p->genlist); + + // delete button + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_SK_DELETE); + + return TRUE; +} - p->c_item[0] = elm_toolbar_item_append(p->cbar, NULL, - dgettext("sys_string", "IDS_COM_SK_DELETE"), _delete_cb, vd); - elm_object_item_disabled_set(elm_toolbar_item_append(p->cbar, NULL, "", NULL, NULL), EINA_TRUE); - elm_object_item_disabled_set(elm_toolbar_item_append(p->cbar, NULL, "", NULL, NULL), EINA_TRUE);*/ +static void _push_naviframe(struct viewdata *vd) +{ + debug_log(""); + struct priv_data *p = vd->priv; p->r_button = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->r_button, "naviframe/title_icon"); - /*elm_object_text_set(p->r_button, _("IDS_EMAIL_OPT_REFRESH"));*/ + /*elm_object_text_set(p->r_button, EMAIL_SETTING_STRING_REFRESH);*/ Evas_Object *ic = elm_icon_add(p->r_button); elm_image_file_set(ic, TITLE_ICON_REFRESH, NULL); elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE); @@ -353,7 +402,7 @@ static void _push_naviframe(struct viewdata *vd) p->tool_btn = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->tool_btn, "naviframe/toolbar/default"); - elm_object_text_set(p->tool_btn, dgettext("sys_string", "IDS_COM_SK_DELETE")); + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_SK_DELETE); evas_object_smart_callback_add(p->tool_btn, "clicked", _delete_cb, vd); account_user_data_t *user_data = (account_user_data_t *)account_data->user_data; @@ -365,8 +414,7 @@ static void _push_naviframe(struct viewdata *vd) } else { elm_image_file_set(title_ic, ACCOUNT_ICON_OTHERS, NULL); } - - Elm_Object_Item *navi_it = NULL; +Elm_Object_Item *navi_it = NULL; navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, account_data->account_name, p->l_button, NULL, p->layout, NULL); elm_object_item_part_content_set(navi_it, "icon", title_ic); @@ -387,9 +435,8 @@ static void _create_list(struct viewdata *vd) struct priv_data *p = vd->priv; EmailSettingUGD *ugd = vd->ugd; - Elm_Object_Item *item = NULL; Elm_Object_Item *git = NULL; - int i = 0; + ListItemData *li = NULL; p->sync_radio_grp = elm_radio_add(ugd->navi_bar); elm_radio_value_set(p->sync_radio_grp, 0); @@ -397,14 +444,17 @@ static void _create_list(struct viewdata *vd) p->genlist = elm_genlist_add(ugd->navi_bar); elm_object_style_set(p->genlist, "dialogue"); + evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); - p->itc_account.item_style = "dialogue/2text.1icon.10"; + p->itc_account.item_style = "dialogue/2text.1icon.7"; p->itc_account.func.text_get = _gl_account_text_get_cb; p->itc_account.func.content_get = _gl_account_content_get_cb; p->itc_account.func.state_get = NULL; p->itc_account.func.del = NULL; - p->itc_onoff.item_style = "dialogue/2text.1icon.10"; + p->itc_onoff.item_style = "dialogue/2text.1icon.7"; p->itc_onoff.func.text_get = _gl_onoff_text_get_cb; p->itc_onoff.func.content_get = _gl_onoff_content_get_cb; p->itc_onoff.func.state_get = NULL; @@ -428,26 +478,30 @@ static void _create_list(struct viewdata *vd) p->itc_sep.func.state_get = NULL; p->itc_sep.func.del = NULL; - p->itc_sep2.item_style = "dialogue/separator/end"; - p->itc_sep2.func.text_get = NULL; - p->itc_sep2.func.content_get = NULL; - p->itc_sep2.func.state_get = NULL; - p->itc_sep2.func.del = NULL; - /*seperator*/ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /*account*/ - item = elm_genlist_item_append(p->genlist, &(p->itc_account), NULL, NULL, - ELM_GENLIST_ITEM_NONE, _account_edit_cb, (void *)vd); - p->gl_account_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = ACCOUNT_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_account), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _account_edit_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*sync schedule*/ - item = elm_genlist_item_append(p->genlist, &(p->itc_sync), NULL, - NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)vd); - p->gl_sync_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SYNC_SCHEDULE_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_sync), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*seperator*/ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, @@ -455,19 +509,20 @@ static void _create_list(struct viewdata *vd) elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /*sync on/off*/ - item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, - NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); - p->gl_onoff_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SYNC_ONOFF_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*seperator*/ - git = elm_genlist_item_append(p->genlist, &(p->itc_sep2), NULL, NULL, + git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); - elm_object_part_content_set(p->layout, "elm.swallow.content", p->genlist); } @@ -580,7 +635,9 @@ static void _get_date_text_with_formatter(time_t time, char *formatted_str) static void _account_edit_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - struct viewdata *vd = (struct viewdata *)data; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; Elm_Object_Item *item = (Elm_Object_Item *)event_info; @@ -593,8 +650,8 @@ static void _account_edit_cb(void *data, Evas_Object *obj, void *event_info) } debug_log("Selected account id:%d", account_data->account_id); - vd->ugd->account_id = account_data->account_id; - vd->ugd->myaccount_id = account_data->account_svc_id; + ugd->account_id = account_data->account_id; + ugd->myaccount_id = account_data->account_svc_id; setting_change_view(VIEW_ACCOUNT_EDIT, ugd); } @@ -605,27 +662,36 @@ static void _onoff_cb(void *data, Evas_Object *obj, void *event_info) struct viewdata *vd = (struct viewdata *)data; struct priv_data *p = vd->priv; + Elm_Object_Item *sync_sche_it = NULL; Eina_Bool state = elm_check_state_get(obj); + GSList *l = p->list_items; + while (l) { + ListItemData *li = (ListItemData *)(l->data); + if (li->index == SYNC_SCHEDULE_LIST_ITEM) + sync_sche_it = li->gl_it; + l = g_slist_next(l); + } + if (state) { account_data->check_interval = abs(account_data->check_interval); account_data->sync_disabled = 0; - if (p->gl_sync_item) { - elm_genlist_item_update(p->gl_sync_item); - elm_object_item_disabled_set(p->gl_sync_item, EINA_FALSE); + if (sync_sche_it) { + elm_genlist_item_update(sync_sche_it); + elm_object_item_disabled_set(sync_sche_it, EINA_FALSE); } } else { account_data->check_interval = -(abs(account_data->check_interval)); account_data->sync_disabled = 1; - if (p->gl_sync_item) { - if (elm_genlist_item_expanded_get(p->gl_sync_item)) { - elm_genlist_item_expanded_set(p->gl_sync_item, 0); + if (sync_sche_it) { + if (elm_genlist_item_expanded_get(sync_sche_it)) { + elm_genlist_item_expanded_set(sync_sche_it, 0); } - elm_genlist_item_update(p->gl_sync_item); - elm_object_item_disabled_set(p->gl_sync_item, EINA_TRUE); + elm_genlist_item_update(sync_sche_it); + elm_object_item_disabled_set(sync_sche_it, EINA_TRUE); } } @@ -650,8 +716,7 @@ static void _refresh_cb(void *data, Evas_Object *obj, void *event_info) gboolean res = FALSE; 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); + if (ret != EMAIL_ERROR_NONE || mailbox == NULL) { debug_log("email_get_mailbox_by_mailbox_type failed"); return; } @@ -662,8 +727,14 @@ static void _refresh_cb(void *data, Evas_Object *obj, void *event_info) p->syncing = 1; elm_object_disabled_set(p->r_button, TRUE); - elm_genlist_item_update(p->gl_sync_item); - elm_genlist_item_update(p->gl_onoff_item); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == SYNC_SCHEDULE_LIST_ITEM || _li->index == SYNC_ONOFF_LIST_ITEM) + elm_genlist_item_update(_li->gl_it); + l = g_slist_next(l); + } } static void _delete_cb(void *data, Evas_Object *obj, void *event_info) @@ -694,10 +765,10 @@ static void _delete_cb(void *data, Evas_Object *obj, void *event_info) elm_object_disabled_set(p->l_button, EINA_TRUE); elm_object_disabled_set(p->tool_btn, EINA_TRUE); - ugd->popup_one = setting_get_notify(vd, NULL, _("IDS_EMAIL_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"), 2, - dgettext("sys_string", "IDS_COM_SK_YES"), + ugd->popup_one = setting_get_notify(vd, NULL, EMAIL_SETTING_STRING_ALL_DATA_DELETED_Q, 2, + EMAIL_SETTING_STRING_YES, _popup_delete_ok_cb, - dgettext("sys_string", "IDS_COM_SK_NO"), + EMAIL_SETTING_STRING_NO, _popup_cancel_cb); } @@ -706,7 +777,6 @@ static void _back_cb(void *data, Evas_Object *obj, void *event_info) debug_log(""); struct viewdata *vd = data; - /*struct priv_data *p = vd->priv;*/ setting_back_to_prev_view(vd); } @@ -730,7 +800,7 @@ static Eina_Bool _after_delete_cb(void *data) ugd->del_timer = NULL; } - status_message_post(dgettext("sys_string", "IDS_COM_POP_DELETED")); + status_message_post(EMAIL_SETTING_STRING_DELETED); if (vd->ugd->start_view_type != NULL && g_strcmp0(vd->ugd->start_view_type, "account-edit") == 0) { ug_destroy_me(vd->ugd->ug); @@ -802,9 +872,9 @@ static void _popup_delete_ok_cb(void *data, Evas_Object *obj, void *event_info) ugd->del_timer = ecore_timer_add(0.5, _after_delete_cb, vd); debug_log("delete success"); } else { - ugd->popup_one = setting_get_notify(vd, dgettext("sys_string", "IDS_COM_POP_WARNING"), - dgettext("sys_string", "IDS_COM_POP_UNABLE_TO_DELETE"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + ugd->popup_one = setting_get_notify(vd, EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_UNABLE_DELETE, 1, + EMAIL_SETTING_STRING_OK, _popup_cancel_cb, NULL, NULL); debug_log("delete failed"); } @@ -837,7 +907,7 @@ static char *_gl_onoff_text_get_cb(void *data, Evas_Object *obj, const char *par if (!g_strcmp0(part, "elm.text.1")) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_EMAIL_SYNC")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_EMAIL_SYNC); return g_strdup(buf); } else if (!g_strcmp0(part, "elm.text.2")) { char buf[MAX_STR_LEN] = { 0, }; @@ -866,7 +936,7 @@ static char *_gl_sync_text_get_cb(void *data, Evas_Object *obj, const char *part if (!g_strcmp0(part, "elm.text.1")) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SYNC_SCHEDULE")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SYNC_SCHEDULE); return g_strdup(buf); } @@ -877,19 +947,19 @@ static char *_gl_sync_text_get_cb(void *data, Evas_Object *obj, const char *part int period = account_data->check_interval; if (period <= sync_schedule[0]) { - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_MANUAL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_MANUAL); } else if (period == sync_schedule[1]) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_EVERY_30_MINUTES")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_E_30MIN); } else if (period == sync_schedule[2]) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_EVERY_1_HOUR")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_E_1H); } else if (period == sync_schedule[3]) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 3); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 3); } else if (period == sync_schedule[4]) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 6); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 6); } else if (period == sync_schedule[5]) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 12); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 12); } else if (period == sync_schedule[6]) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ONCE_A_DAY")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ONCE_A_DAY); } return g_strdup(buf); } @@ -906,19 +976,19 @@ static char *_gl_ex_sync_text_get_cb(void *data, Evas_Object *obj, const char *p char buf[MAX_STR_LEN] = { 0, }; if (index == 0) { - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_MANUAL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_MANUAL); } else if (index == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_EVERY_30_MINUTES")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_E_30MIN); } else if (index == 2) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_EVERY_1_HOUR")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_E_1H); } else if (index == 3) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 3); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 3); } else if (index == 4) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 6); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 6); } else if (index == 5) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 12); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 12); } else if (index == 6) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ONCE_A_DAY")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ONCE_A_DAY); } return g_strdup(buf); @@ -936,9 +1006,10 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con return NULL; } - struct viewdata *vd = g_vd; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; - struct priv_data *p = vd->priv; if (!g_strcmp0(part, "elm.icon")) { if (p->syncing) { @@ -962,26 +1033,28 @@ static Evas_Object *_gl_onoff_content_get_cb(void *data, Evas_Object *obj, const return NULL; } - struct viewdata *vd = g_vd; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; - struct priv_data *p = vd->priv; if (!g_strcmp0(part, "elm.icon")) { Evas_Object *check = elm_check_add(ugd->navi_bar); elm_object_style_set(check, "on&off"); evas_object_smart_callback_add(check, "changed", _onoff_cb, vd); evas_object_propagate_events_set(check, EINA_FALSE); - - if (account_data->sync_disabled) { - elm_check_state_set(check, EINA_FALSE); - elm_object_item_disabled_set(p->gl_sync_item, EINA_TRUE); - } else { - elm_check_state_set(check, EINA_TRUE); - elm_object_item_disabled_set(p->gl_sync_item, EINA_FALSE); + elm_check_state_set(check, account_data->sync_disabled ? EINA_FALSE : EINA_TRUE); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == SYNC_SCHEDULE_LIST_ITEM) { + elm_object_item_disabled_set(_li->gl_it, + account_data->sync_disabled ? EINA_TRUE : EINA_FALSE); + } + l = g_slist_next(l); } - p->onoff = check; - return check; } @@ -1025,38 +1098,17 @@ static void _gl_sel_cb(void *data, Evas_Object *obj, void *event_info) return; } - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, EINA_FALSE); Eina_Bool state = elm_check_state_get(p->onoff); + elm_check_state_set(p->onoff, !state); - if (state) { - account_data->check_interval = -(abs(account_data->check_interval)); - account_data->sync_disabled = 1; - elm_check_state_set(p->onoff, EINA_FALSE); - - if (p->gl_sync_item) { - if (elm_genlist_item_expanded_get(p->gl_sync_item)) { - elm_genlist_item_expanded_set(p->gl_sync_item, 0); - } - elm_genlist_item_update(p->gl_sync_item); - elm_object_item_disabled_set(p->gl_sync_item, EINA_TRUE); - } - } else { - account_data->check_interval = abs(account_data->check_interval); - account_data->sync_disabled = 0; - elm_check_state_set(p->onoff, EINA_TRUE); - - if (p->gl_sync_item) { - elm_genlist_item_update(p->gl_sync_item); - elm_object_item_disabled_set(p->gl_sync_item, EINA_FALSE); - } - } - - _update_account_info(vd); + _onoff_cb(vd, p->onoff, NULL); } static void _gl_ex_sel_cb(void *data, Evas_Object *obj, void *event_info) @@ -1102,27 +1154,37 @@ static void _gl_ex_sync_sel_cb(void *data, Evas_Object *obj, void *event_info) _update_account_info(vd); - elm_genlist_item_update(p->gl_sync_item); + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == SYNC_SCHEDULE_LIST_ITEM) { + elm_genlist_item_update(_li->gl_it); + } + l = g_slist_next(l); + } } static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info) { Elm_Object_Item *it = event_info; - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; - Evas_Object *parent = NULL; + Elm_Object_Item *parent = NULL; + ListItemData *li = elm_object_item_data_get(it); parent = elm_genlist_item_parent_get(it); - if (!parent && p->gl_onoff_item != it) { - if (p->gl_account_item == it) + if (!parent) { + if (!li) + return; + if (li->index == SYNC_ONOFF_LIST_ITEM) + return; + if (li->index == ACCOUNT_LIST_ITEM) elm_object_item_signal_emit(it, "elm,state,top", ""); - else if (p->gl_sync_item == it) + else if (li->index == SYNC_SCHEDULE_LIST_ITEM) elm_object_item_signal_emit(it, "elm,state,bottom", ""); else elm_object_item_signal_emit(it, "elm,state,center", ""); } else if (parent) { - int index = elm_object_item_data_get(it); + int index = (int)elm_object_item_data_get(it); if (index == 0) elm_object_item_signal_emit(it, "elm,state,top", ""); else if (index == 6) diff --git a/setting/src/email-view-sync-setup.c b/setting/src/email-view-sync-setup.c index cfe17a3..0e84cca 100755 --- a/setting/src/email-view-sync-setup.c +++ b/setting/src/email-view-sync-setup.c @@ -35,6 +35,7 @@ static int _update(struct viewdata *vd); static int _destroy(struct viewdata *vd); static int _show(struct viewdata *vd); static int _hide(struct viewdata *vd); +static int _lang_change(struct viewdata *vd); static void _push_naviframe(struct viewdata *vd); static void _create_list(struct viewdata *vd); @@ -73,10 +74,17 @@ static int sync_schedule[7] = { 0, 30, 60, 180, 360, 720, 1440 }; #define SYNC_STATUS_SYNCING 1 /* BIN 00000001 */ #define SYNC_STATUS_HAVE_NEW_MAILS 2 /* BIN 00000010 */ +enum { + ACCOUNT_LIST_ITEM = 1, + SYNC_SCHEDULE_LIST_ITEM, + SYNC_ONOFF_LIST_ITEM +}; + struct priv_data { struct viewdata *vd; - Evas_Object *cbar; + GSList *list_items; + Evas_Object *onoff; Evas_Object *l_button; @@ -85,7 +93,6 @@ struct priv_data { Evas_Object *layout; Evas_Object *sync_radio_grp; - Evas_Object *account_icon; Evas_Object *genlist; Elm_Genlist_Item_Class itc_account; @@ -93,18 +100,19 @@ struct priv_data { Elm_Genlist_Item_Class itc_sync; Elm_Genlist_Item_Class itc_ex_sync; Elm_Genlist_Item_Class itc_sep; - Elm_Genlist_Item_Class itc_sep2; - Elm_Object_Item * c_item[4]; - Elm_Object_Item *gl_sync_item; - Elm_Object_Item *gl_onoff_item; - Elm_Object_Item *gl_account_item; Elm_Object_Item *navi_it; int account_deleted; int syncing; }; +typedef struct _ListItemData { + int index; + Elm_Object_Item *gl_it; + struct priv_data *p; +} ListItemData; + void setting_init_sync_setup_view(struct viewdata *vd) { debug_log(""); @@ -114,6 +122,7 @@ void setting_init_sync_setup_view(struct viewdata *vd) vd->destroy = _destroy; vd->show = _show; vd->hide = _hide; + vd->lang_change = _lang_change; vd->grp_nm = "setting_sync_setup"; } @@ -140,7 +149,15 @@ void setting_setup_sync_started(struct viewdata *vd, int account_id) p->syncing = 1; elm_object_disabled_set(p->r_button, TRUE); - elm_genlist_item_update(p->gl_account_item); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == ACCOUNT_LIST_ITEM) { + elm_genlist_item_update(_li->gl_it); + } + l = g_slist_next(l); + } } void setting_setup_sync_finished(struct viewdata *vd, int account_id) @@ -166,7 +183,15 @@ void setting_setup_sync_finished(struct viewdata *vd, int account_id) p->syncing = 0; elm_object_disabled_set(p->r_button, FALSE); - elm_genlist_item_update(p->gl_account_item); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == ACCOUNT_LIST_ITEM) { + elm_genlist_item_update(_li->gl_it); + } + l = g_slist_next(l); + } } static int _create(struct viewdata *vd) @@ -230,7 +255,14 @@ static int _update(struct viewdata *vd) p->syncing = 0; elm_object_disabled_set(p->r_button, FALSE); } - elm_genlist_item_update(p->gl_account_item); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == ACCOUNT_LIST_ITEM) + elm_genlist_item_update(_li->gl_it); + l = g_slist_next(l); + } } return TRUE; @@ -262,6 +294,13 @@ static int _destroy(struct viewdata *vd) account_data = NULL; } + GSList *l = p->list_items; + while (l) { + free(l->data); + l = g_slist_next(l); + } + g_slist_free(p->list_items); + _close_icu_formatter(); return TRUE; @@ -316,24 +355,34 @@ static int _hide(struct viewdata *vd) return TRUE; } -static void _push_naviframe(struct viewdata *vd) +static int _lang_change(struct viewdata *vd) { debug_log(""); + + if (!vd) { + debug_log("vd is NULL"); + return FALSE; + } + struct priv_data *p = vd->priv; - /*p->cbar = elm_toolbar_add(vd->ugd->navi_bar); - elm_toolbar_shrink_mode_set(p->cbar, ELM_TOOLBAR_SHRINK_EXPAND); - elm_object_style_set(p->cbar, "naviframe"); - evas_object_show(p->cbar); + // refreshing genlist. + elm_genlist_realized_items_update(p->genlist); + + // delete button + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_SK_DELETE); + + return TRUE; +} - p->c_item[0] = elm_toolbar_item_append(p->cbar, NULL, - dgettext("sys_string", "IDS_COM_SK_DELETE"), _delete_cb, vd); - elm_object_item_disabled_set(elm_toolbar_item_append(p->cbar, NULL, "", NULL, NULL), EINA_TRUE); - elm_object_item_disabled_set(elm_toolbar_item_append(p->cbar, NULL, "", NULL, NULL), EINA_TRUE);*/ +static void _push_naviframe(struct viewdata *vd) +{ + debug_log(""); + struct priv_data *p = vd->priv; p->r_button = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->r_button, "naviframe/title_icon"); - /*elm_object_text_set(p->r_button, _("IDS_EMAIL_OPT_REFRESH"));*/ + /*elm_object_text_set(p->r_button, EMAIL_SETTING_STRING_REFRESH);*/ Evas_Object *ic = elm_icon_add(p->r_button); elm_image_file_set(ic, TITLE_ICON_REFRESH, NULL); elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE); @@ -353,7 +402,7 @@ static void _push_naviframe(struct viewdata *vd) p->tool_btn = elm_button_add(vd->ugd->navi_bar); elm_object_style_set(p->tool_btn, "naviframe/toolbar/default"); - elm_object_text_set(p->tool_btn, dgettext("sys_string", "IDS_COM_SK_DELETE")); + elm_object_text_set(p->tool_btn, EMAIL_SETTING_STRING_SK_DELETE); evas_object_smart_callback_add(p->tool_btn, "clicked", _delete_cb, vd); account_user_data_t *user_data = (account_user_data_t *)account_data->user_data; @@ -387,9 +436,8 @@ static void _create_list(struct viewdata *vd) struct priv_data *p = vd->priv; EmailSettingUGD *ugd = vd->ugd; - Elm_Object_Item *item = NULL; Elm_Object_Item *git = NULL; - int i = 0; + ListItemData *li = NULL; p->sync_radio_grp = elm_radio_add(ugd->navi_bar); elm_radio_value_set(p->sync_radio_grp, 0); @@ -397,14 +445,17 @@ static void _create_list(struct viewdata *vd) p->genlist = elm_genlist_add(ugd->navi_bar); elm_object_style_set(p->genlist, "dialogue"); + evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); + evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); - p->itc_account.item_style = "dialogue/2text.1icon.10"; + p->itc_account.item_style = "dialogue/2text.1icon.7"; p->itc_account.func.text_get = _gl_account_text_get_cb; p->itc_account.func.content_get = _gl_account_content_get_cb; p->itc_account.func.state_get = NULL; p->itc_account.func.del = NULL; - p->itc_onoff.item_style = "dialogue/2text.1icon.10"; + p->itc_onoff.item_style = "dialogue/2text.1icon.7"; p->itc_onoff.func.text_get = _gl_onoff_text_get_cb; p->itc_onoff.func.content_get = _gl_onoff_content_get_cb; p->itc_onoff.func.state_get = NULL; @@ -428,26 +479,30 @@ static void _create_list(struct viewdata *vd) p->itc_sep.func.state_get = NULL; p->itc_sep.func.del = NULL; - p->itc_sep2.item_style = "dialogue/separator/end"; - p->itc_sep2.func.text_get = NULL; - p->itc_sep2.func.content_get = NULL; - p->itc_sep2.func.state_get = NULL; - p->itc_sep2.func.del = NULL; - /*seperator*/ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /*account*/ - item = elm_genlist_item_append(p->genlist, &(p->itc_account), NULL, NULL, - ELM_GENLIST_ITEM_NONE, _account_edit_cb, (void *)vd); - p->gl_account_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = ACCOUNT_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_account), (void *)li, NULL, + ELM_GENLIST_ITEM_NONE, _account_edit_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*sync schedule*/ - item = elm_genlist_item_append(p->genlist, &(p->itc_sync), NULL, - NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)vd); - p->gl_sync_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SYNC_SCHEDULE_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_sync), (void *)li, + NULL, ELM_GENLIST_ITEM_TREE, _gl_ex_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*seperator*/ git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, @@ -455,19 +510,20 @@ static void _create_list(struct viewdata *vd) elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /*sync on/off*/ - item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, - NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); - p->gl_onoff_item = item; + li = (ListItemData *)calloc(1, sizeof(ListItemData)); + retm_if(!li, "memory allocation failed"); + + li->index = SYNC_ONOFF_LIST_ITEM; + li->p = p; + li->gl_it = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)li, + NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)li); + p->list_items = g_slist_append(p->list_items, li); /*seperator*/ - git = elm_genlist_item_append(p->genlist, &(p->itc_sep2), NULL, NULL, + git = elm_genlist_item_append(p->genlist, &(p->itc_sep), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - evas_object_smart_callback_add(p->genlist, "realized", _gl_realized_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "expanded", _gl_exp_cb, (void *)vd); - evas_object_smart_callback_add(p->genlist, "contracted", _gl_con_cb, (void *)vd); - elm_object_part_content_set(p->layout, "elm.swallow.content", p->genlist); } @@ -580,7 +636,9 @@ static void _get_date_text_with_formatter(time_t time, char *formatted_str) static void _account_edit_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); - struct viewdata *vd = (struct viewdata *)data; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; Elm_Object_Item *item = (Elm_Object_Item *)event_info; @@ -605,27 +663,36 @@ static void _onoff_cb(void *data, Evas_Object *obj, void *event_info) struct viewdata *vd = (struct viewdata *)data; struct priv_data *p = vd->priv; + Elm_Object_Item *sync_sche_it = NULL; Eina_Bool state = elm_check_state_get(obj); + GSList *l = p->list_items; + while (l) { + ListItemData *li = (ListItemData *)(l->data); + if (li->index == SYNC_SCHEDULE_LIST_ITEM) + sync_sche_it = li->gl_it; + l = g_slist_next(l); + } + if (state) { account_data->check_interval = abs(account_data->check_interval); account_data->sync_disabled = 0; - if (p->gl_sync_item) { - elm_genlist_item_update(p->gl_sync_item); - elm_object_item_disabled_set(p->gl_sync_item, EINA_FALSE); + if (sync_sche_it) { + elm_genlist_item_update(sync_sche_it); + elm_object_item_disabled_set(sync_sche_it, EINA_FALSE); } } else { account_data->check_interval = -(abs(account_data->check_interval)); account_data->sync_disabled = 1; - if (p->gl_sync_item) { - if (elm_genlist_item_expanded_get(p->gl_sync_item)) { - elm_genlist_item_expanded_set(p->gl_sync_item, 0); + if (sync_sche_it) { + if (elm_genlist_item_expanded_get(sync_sche_it)) { + elm_genlist_item_expanded_set(sync_sche_it, 0); } - elm_genlist_item_update(p->gl_sync_item); - elm_object_item_disabled_set(p->gl_sync_item, EINA_TRUE); + elm_genlist_item_update(sync_sche_it); + elm_object_item_disabled_set(sync_sche_it, EINA_TRUE); } } @@ -661,8 +728,14 @@ static void _refresh_cb(void *data, Evas_Object *obj, void *event_info) p->syncing = 1; elm_object_disabled_set(p->r_button, TRUE); - elm_genlist_item_update(p->gl_sync_item); - elm_genlist_item_update(p->gl_onoff_item); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == SYNC_SCHEDULE_LIST_ITEM || _li->index == SYNC_ONOFF_LIST_ITEM) + elm_genlist_item_update(_li->gl_it); + l = g_slist_next(l); + } } static void _delete_cb(void *data, Evas_Object *obj, void *event_info) @@ -693,10 +766,10 @@ static void _delete_cb(void *data, Evas_Object *obj, void *event_info) elm_object_disabled_set(p->l_button, EINA_TRUE); elm_object_disabled_set(p->tool_btn, EINA_TRUE); - ugd->popup_one = setting_get_notify(vd, NULL, _("IDS_EMAIL_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"), 2, - dgettext("sys_string", "IDS_COM_SK_YES"), + ugd->popup_one = setting_get_notify(vd, NULL, EMAIL_SETTING_STRING_ALL_DATA_DELETED_Q, 2, + EMAIL_SETTING_STRING_YES, _popup_delete_ok_cb, - dgettext("sys_string", "IDS_COM_SK_NO"), + EMAIL_SETTING_STRING_NO, _popup_cancel_cb); } @@ -747,7 +820,7 @@ static Eina_Bool _after_delete_cb(void *data) ugd->del_timer = NULL; } - status_message_post(dgettext("sys_string", "IDS_COM_POP_DELETED")); + status_message_post(EMAIL_SETTING_STRING_DELETED); if (vd->ugd->start_view_type != NULL && strcmp(vd->ugd->start_view_type, "first-setup") == 0) { @@ -829,9 +902,9 @@ static void _popup_delete_ok_cb(void *data, Evas_Object *obj, void *event_info) ugd->del_timer = ecore_timer_add(0.5, _after_delete_cb, vd); debug_log("delete success"); } else { - ugd->popup_one = setting_get_notify(vd, dgettext("sys_string", "IDS_COM_POP_WARNING"), - dgettext("sys_string", "IDS_COM_POP_UNABLE_TO_DELETE"), 1, - dgettext("sys_string", "IDS_COM_SK_OK"), + ugd->popup_one = setting_get_notify(vd, EMAIL_SETTING_STRING_WARNING, + EMAIL_SETTING_STRING_UNABLE_DELETE, 1, + EMAIL_SETTING_STRING_OK, _popup_cancel_cb, NULL, NULL); debug_log("delete failed"); } @@ -864,7 +937,7 @@ static char *_gl_onoff_text_get_cb(void *data, Evas_Object *obj, const char *par if (!g_strcmp0(part, "elm.text.1")) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_EMAIL_SYNC")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_EMAIL_SYNC); return g_strdup(buf); } else if (!g_strcmp0(part, "elm.text.2")) { char buf[MAX_STR_LEN] = { 0, }; @@ -893,7 +966,7 @@ static char *_gl_sync_text_get_cb(void *data, Evas_Object *obj, const char *part if (!g_strcmp0(part, "elm.text.1")) { char buf[MAX_STR_LEN] = { 0, }; - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SYNC_SCHEDULE")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_SYNC_SCHEDULE); return g_strdup(buf); } @@ -904,19 +977,19 @@ static char *_gl_sync_text_get_cb(void *data, Evas_Object *obj, const char *part int period = account_data->check_interval; if (period <= sync_schedule[0]) { - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_MANUAL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_MANUAL); } else if (period == sync_schedule[1]) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_EVERY_30_MINUTES")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_E_30MIN); } else if (period == sync_schedule[2]) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_EVERY_1_HOUR")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_E_1H); } else if (period == sync_schedule[3]) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 3); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 3); } else if (period == sync_schedule[4]) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 6); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 6); } else if (period == sync_schedule[5]) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 12); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 12); } else if (period == sync_schedule[6]) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ONCE_A_DAY")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ONCE_A_DAY); } return g_strdup(buf); } @@ -933,19 +1006,19 @@ static char *_gl_ex_sync_text_get_cb(void *data, Evas_Object *obj, const char *p char buf[MAX_STR_LEN] = { 0, }; if (index == 0) { - snprintf(buf, sizeof(buf), "%s", dgettext("sys_string", "IDS_COM_BODY_MANUAL")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_MANUAL); } else if (index == 1) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_EVERY_30_MINUTES")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_E_30MIN); } else if (index == 2) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_EVERY_1_HOUR")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_E_1H); } else if (index == 3) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 3); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 3); } else if (index == 4) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 6); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 6); } else if (index == 5) { - snprintf(buf, sizeof(buf), _("IDS_EMAIL_BODY_EVERY_PD_HOURS"), 12); + snprintf(buf, sizeof(buf), EMAIL_SETTING_STRING_PD_H, 12); } else if (index == 6) { - snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_ONCE_A_DAY")); + snprintf(buf, sizeof(buf), "%s", EMAIL_SETTING_STRING_ONCE_A_DAY); } return g_strdup(buf); @@ -963,9 +1036,10 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con return NULL; } - struct viewdata *vd = g_vd; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; - struct priv_data *p = vd->priv; if (!g_strcmp0(part, "elm.icon")) { if (p->syncing) { @@ -989,26 +1063,28 @@ static Evas_Object *_gl_onoff_content_get_cb(void *data, Evas_Object *obj, const return NULL; } - struct viewdata *vd = g_vd; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; EmailSettingUGD *ugd = vd->ugd; - struct priv_data *p = vd->priv; if (!g_strcmp0(part, "elm.icon")) { Evas_Object *check = elm_check_add(ugd->navi_bar); elm_object_style_set(check, "on&off"); evas_object_smart_callback_add(check, "changed", _onoff_cb, vd); evas_object_propagate_events_set(check, EINA_FALSE); - - if (account_data->sync_disabled) { - elm_check_state_set(check, EINA_FALSE); - elm_object_item_disabled_set(p->gl_sync_item, EINA_TRUE); - } else { - elm_check_state_set(check, EINA_TRUE); - elm_object_item_disabled_set(p->gl_sync_item, EINA_FALSE); + elm_check_state_set(check, account_data->sync_disabled ? EINA_FALSE : EINA_TRUE); + + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == SYNC_SCHEDULE_LIST_ITEM) { + elm_object_item_disabled_set(_li->gl_it, + account_data->sync_disabled ? EINA_TRUE : EINA_FALSE); + } + l = g_slist_next(l); } - p->onoff = check; - return check; } @@ -1052,38 +1128,17 @@ static void _gl_sel_cb(void *data, Evas_Object *obj, void *event_info) return; } - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; + ListItemData *li = (ListItemData *)data; + struct priv_data *p = li->p; + struct viewdata *vd = p->vd; Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, EINA_FALSE); Eina_Bool state = elm_check_state_get(p->onoff); + elm_check_state_set(p->onoff, !state); - if (state) { - account_data->check_interval = -(abs(account_data->check_interval)); - account_data->sync_disabled = 1; - elm_check_state_set(p->onoff, EINA_FALSE); - - if (p->gl_sync_item) { - if (elm_genlist_item_expanded_get(p->gl_sync_item)) { - elm_genlist_item_expanded_set(p->gl_sync_item, 0); - } - elm_genlist_item_update(p->gl_sync_item); - elm_object_item_disabled_set(p->gl_sync_item, EINA_TRUE); - } - } else { - account_data->check_interval = abs(account_data->check_interval); - account_data->sync_disabled = 0; - elm_check_state_set(p->onoff, EINA_TRUE); - - if (p->gl_sync_item) { - elm_genlist_item_update(p->gl_sync_item); - elm_object_item_disabled_set(p->gl_sync_item, EINA_FALSE); - } - } - - _update_account_info(vd); + _onoff_cb(vd, p->onoff, NULL); } static void _gl_ex_sel_cb(void *data, Evas_Object *obj, void *event_info) @@ -1129,27 +1184,37 @@ static void _gl_ex_sync_sel_cb(void *data, Evas_Object *obj, void *event_info) _update_account_info(vd); - elm_genlist_item_update(p->gl_sync_item); + GSList *l = p->list_items; + while (l) { + ListItemData *_li = (ListItemData *)(l->data); + if (_li->index == SYNC_SCHEDULE_LIST_ITEM) { + elm_genlist_item_update(_li->gl_it); + } + l = g_slist_next(l); + } } static void _gl_realized_cb(void *data, Evas_Object *obj, void *event_info) { Elm_Object_Item *it = event_info; - struct viewdata *vd = (struct viewdata *)data; - struct priv_data *p = vd->priv; - Evas_Object *parent = NULL; + Elm_Object_Item *parent = NULL; + ListItemData *li = elm_object_item_data_get(it); parent = elm_genlist_item_parent_get(it); - if (!parent && p->gl_onoff_item != it) { - if (p->gl_account_item == it) + if (!parent) { + if (!li) + return; + if (li->index == SYNC_ONOFF_LIST_ITEM) + return; + if (li->index == ACCOUNT_LIST_ITEM) elm_object_item_signal_emit(it, "elm,state,top", ""); - else if (p->gl_sync_item == it) + else if (li->index == SYNC_SCHEDULE_LIST_ITEM) elm_object_item_signal_emit(it, "elm,state,bottom", ""); else elm_object_item_signal_emit(it, "elm,state,center", ""); } else if (parent) { - int index = elm_object_item_data_get(it); + int index = (int)elm_object_item_data_get(it); if (index == 0) elm_object_item_signal_emit(it, "elm,state,top", ""); else if (index == 6) diff --git a/setting/theme/email-setting-theme.edc b/setting/theme/email-setting-theme.edc index b51f845..aee80a4 100755 --- a/setting/theme/email-setting-theme.edc +++ b/setting/theme/email-setting-theme.edc @@ -1,141 +1,326 @@ /* - * 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. - */ + Email Application + +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd All Rights Reserved +Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0 +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 "../include/email-setting-defines.h" #include "email-setting-theme-macro.edc" collections { - group { - name: "add_account"; - parts { - part { - name: "add_account/bg"; - type: RECT; - repeat_events: 1; - scale: 1; - description { - min: 0 650; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - color: 0 0 0 0; - align: 0.0 0.0; - } - } - part { - name: "add_account/layout"; - type: SWALLOW; - scale: 1; - description { - fixed: 1 0; - min: 0 320; - state: "default" 0.0; - rel1 { relative: 0 0; to: "add_account/bg"; } - rel2 { relative: 1 0; offset: 0 330; to: "add_account/bg"; } - color: 0 0 0 255; - } - } - part { - name: "add_account/check1"; - type: SWALLOW; - scale: 1; - description { - fixed: 1 1; - state: "default" 0.0; - rel1.relative: 0.03 1.1; - rel1.to_y: "add_account/layout"; - rel2.relative: 0.08 1.15; - rel2.to_y: "add_account/layout"; - color: 255 255 255 255; - } - } - part { - name: "add_account/text1"; - type: SWALLOW; - scale: 1; - description { - fixed: 1 1; - state: "default" 0.0; - rel1.relative: 1.0 0.2; - rel1.to_x: "add_account/check1"; - rel1.to_y: "add_account/check1"; - rel2.relative: 0.93 1.0; - rel2.to_y: "add_account/check1"; - color: 255 255 255 255; - } - } - part { - name: "add_account/check2"; - type: SWALLOW; - scale: 1; - description { - fixed: 1 1; - state: "default" 0.0; - rel1.relative: 0.03 1.3; - rel1.to_y: "add_account/layout"; - rel2.relative: 0.08 1.35; - rel2.to_y: "add_account/layout"; - color: 255 255 255 255; - } - } - part { - name: "add_account/text2"; - type: SWALLOW; - scale: 1; - description { - fixed: 1 1; - state: "default" 0.0; - rel1.relative: 1.0 0.2; - rel1.to_x: "add_account/check2"; - rel1.to_y: "add_account/check2"; - rel2.relative: 0.93 1.0; - rel2.to_y: "add_account/check2"; - color: 255 255 255 255; - } - } - part { - name: "add_account/button"; - type: SWALLOW; - scale: 1; - description { - fixed: 1 1; - state: "default" 0.0; - rel1.relative: 0.22 1.6; - rel1.to_y: "add_account/check2"; - rel2.relative: 0.78 2.6; - rel2.to_y: "add_account/check2"; - color: 0 0 0 255; - } - } - } - programs { - program { - name: "text1_clicked"; - signal: "mouse,up,1"; - source: "add_account/text1"; - action: SIGNAL_EMIT "elm,action,text1_clicked" "elm"; - } - program { - name: "text2_clicked"; - signal: "mouse,up,1"; - source: "add_account/text2"; - action: SIGNAL_EMIT "elm,action,text2_clicked" "elm"; - } - } - } + group { name: "account_add"; + parts { + part { name: "bg"; + type: RECT; + repeat_events: 1; + scale: 1; + description { state: "default" 0.0; + min: 0 703; + rel1 { relative: 0.0 0.0;} + rel2 { relative: 1.0 1.0;} + color: 0 0 0 0; + align: 0.0 0.0; + } + } + + part { name: "list"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0 0; + rel1 { relative: 0 0; to: "bg"; } + rel2 { relative: 1 0; offset: 0 345; to: "bg"; } + } + } + + part { name: "checkbox_set"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + min: 0 254; + align: 0 0; + rel1 { relative: 0 1.0; to_y: "list"; } + rel2 { relative: 1 1.0; offset: 0 254; to_y: "list"; } + } + } + + part { name: "button_set"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + min: 0 74; + align: 0 0; + rel1 { relative: 0 1.0; to_y: "checkbox_set"; } + rel2 { relative: 1 1.0; offset: 0 74; to_y: "checkbox_set"; } + } + } + } + } + group { name: "account_add_checkbox_set"; + parts { + + part { name: "base"; + type: RECT; + repeat_events: 1; + scale: 1; + description { state: "default" 0.0; + min: 0 216; + color: 0 0 0 0; + align: 0.0 0.5; + } + } + + part { name: "left_padding"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 26 0; + fixed: 1 0; + visible: 0; + rel1 { to: "base"; relative: 0 0; } + rel2 { to: "base"; relative: 0 1; } + align: 0.0 0.0; + } + } + + part { name: "right_padding"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 16 0; + fixed: 1 0; + visible: 0; + rel1 { to: "base"; relative: 1 0; } + rel2 { to: "base"; relative: 1 1; } + align: 1.0 0.0; + } + } + + part { name: "subbox.1"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 0 108; + fixed: 1 0; + visible: 0; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + to_x: "left_padding"; + to_y: "base"; + } + rel2 { + relative: 0.0 0.0; + offset: 0 108; + to_x: "right_padding"; + to_y: "base"; + } + } + } + + part { name: "subbox.2"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 0 108; + fixed: 1 0; + visible: 0; + align: 0.0 0.5; + rel1 { + relative: 1.0 1.0; + to_x: "left_padding"; + to_y: "subbox.1"; + } + rel2 { + relative: 0.0 1.0; + offset: 0 108; + to_x: "right_padding"; + to_y: "subbox.1"; + } + } + } + + part { name: "checkbox.1"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + min: 42 42; + max: 42 42; + fixed: 1 1; + align: 0.0 0.5; + visible: 1; + rel1 { + relative: 0.0 0.0; + to_x: "subbox.1"; + to_y: "subbox.1"; + } + rel2 { + relative: 1.0 1.0; + offset: 42 0; + to_x: "left_padding"; + to_y: "subbox.1"; + } + } + } + + part { name: "text.1"; + type: SWALLOW; + ignore_flags: ON_HOLD; + mouse_events: 1; + scale: 1; + description { state: "default" 0.0; + min: 0 32; + fixed: 0 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 16 38; + to_x: "checkbox.1"; + to_y: "subbox.1"; + } + rel2 { + relative: 0.0 1.0; + offset: 0 -3; + to_x: "right_padding"; + to_y: "subbox.1"; + } + } + } + + part { name: "checkbox.2"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + min: 42 42; + max: 42 42; + fixed: 1 1; + align: 0.0 0.5; + visible: 1; + rel1 { + relative: 0.0 0.0; + to_x: "subbox.2"; + to_y: "subbox.2"; + } + rel2 { + relative: 1.0 1.0; + offset: 42 0; + to_x: "left_padding"; + to_y: "subbox.2"; + } + } + } + + part { name: "text.2"; + type: SWALLOW; + ignore_flags: ON_HOLD; + mouse_events: 1; + scale: 1; + description { state: "default" 0.0; + min: 0 32; + fixed: 0 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 16 38; + to_x: "checkbox.2"; + to_y: "subbox.2"; + } + rel2 { + relative: 0.0 1.0; + offset: 0 -3; + to_x: "right_padding"; + to_y: "subbox.2"; + } + } + } + } + + programs { + program { + name: "text1_clicked"; + signal: "mouse,up,1"; + source: "text.1"; + action: SIGNAL_EMIT "elm,action,text1_clicked" "elm"; + } + + program { + name: "text2_clicked"; + signal: "mouse,up,1"; + source: "text.2"; + action: SIGNAL_EMIT "elm,action,text2_clicked" "elm"; + } + } + } + group { name: "account_add_manual_button"; + parts { + part { name: "base"; + type: RECT; + repeat_events: 1; + scale: 1; + description { state: "default" 0.0; + min: 0 74; + color: 0 0 0 0; + align: 0.0 0.5; + } + } + + part { name: "left_padding"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 16 0; + fixed: 1 0; + visible: 0; + rel1 { to: "base"; relative: 0 0; } + rel2 { to: "base"; relative: 0 1; } + align: 0.0 0.0; + } + } + + part { name: "right_padding"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 16 0; + fixed: 1 0; + visible: 0; + rel1 { to: "base"; relative: 1 0; } + rel2 { to: "base"; relative: 1 1; } + align: 1.0 0.0; + } + } + + part { name: "btn"; + type: SWALLOW; + mouse_events: 1; + scale: 1; + description { state: "default" 0.0; + min: 688 74; + fixed: 0 1; + align: 0 0; + rel1 { + relative: 1.0 0.0; + to_x: "left_padding"; + to_y: "base"; + } + rel2 { + relative: 0.0 1.0; + to_x: "right_padding"; + to_y: "base"; + } + } + } + } + } group { name: "dg_email_colorbar"; parts { @@ -661,10 +846,25 @@ collections { state: "default" 0.0; rel1 { relative: 0.0 0.0;} rel2 { relative: 1.0 1.0;} - color: 249 249 249 255; min: 0 600; + color: 241 238 233 255; } } + part { + name: "content"; + type: RECT; + scale: 1; + mouse_events: 1; + description { + state: "default" 0.0; + rel1.relative: 0.03 0.03; + rel2.relative: 0.97 0.97; + rel1.to: "bg"; + rel2.to: "bg"; + align: 0.5 0.5; + color: 241 238 233 255; + } + } part { name: "head_rect"; type: RECT; @@ -676,10 +876,45 @@ collections { fixed: 0 1; rel1.relative: 0.0 0.0; rel2.relative: 1.0 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel1.to: "content"; + rel2.to: "content"; + align: 0.0 0.0; + color: 241 238 233 255; + } + } + part{ + name: "separator_3"; + type: RECT; + scale: 1; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + min: 1 1; + max: 9999 1; + fixed: 1 1; + color: 185 184 178 255; + rel1.relative: 0.05 1.0; + rel2.relative: 0.95 1.0; + rel1.to: "head_rect"; + rel2.to: "head_rect"; + align: 0.0 0.0; + } + } + part{ + name: "separator_4"; + type: RECT; + scale: 1; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + min: 1 1; + max: 9999 1; + fixed: 1 1; + color: 255 255 255 255; + rel1.relative: 0.0 1.0; + rel1.to: "separator_3"; + rel2.to: "separator_3"; align: 0.0 0.0; - color: 108 143 165 255; } } part { @@ -715,7 +950,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 40; + min: 0 30; fixed: 0 1; rel1.relative: 0.0 1.0; rel2.relative: 1.0 1.0; @@ -731,10 +966,12 @@ collections { description { state: "default" 0.0; visible: 0; - min: 45 0; + min: 20 0; fixed: 1 0; - rel1 { to: "bg"; relative: 0 0; } - rel2 { to: "bg"; relative: 0 1; } + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + rel1.to: "content"; + rel2.to: "content"; align: 0.0 0.0; } } @@ -745,11 +982,13 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 0; + min: 20 0; fixed: 1 0; - rel1 { to: "bg"; relative: 1 0; } - rel2 { to: "bg"; relative: 1 1; } - align: 1.0 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + rel1.to: "content"; + rel2.to: "content"; + align: 0.0 0.0; } } part { @@ -758,13 +997,13 @@ collections { scale: 1; description { state: "default" 0.0; - min: 0 154; + min: 0 192; fixed: 0 1; rel1.relative: 0.2 1.0; - rel1.to_x: "bg"; + rel1.to_x: "content"; rel1.to_y: "top_padding"; rel2.relative: 0.8 1.0; - rel2.to_x: "bg"; + rel2.to_x: "content"; rel2.to_y: "top_padding"; align: 0.0 0.0; } @@ -776,127 +1015,88 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 40; + min: 0 30; fixed: 0 1; rel1.relative: 0.0 1.0; - rel1.to_x: "bg"; rel1.to_y: "color_rect"; + rel1.to_x: "content"; rel2.relative: 1.0 1.0; - rel2.to_x: "bg"; rel2.to_y: "color_rect"; + rel2.to_x: "content"; align: 0.0 0.0; + color: 241 238 233 255; } } - part { - name: "palette"; - type: SWALLOW; + part{ + name: "separator_1"; + type: RECT; scale: 1; + ignore_flags: ON_HOLD; description { state: "default" 0.0; + min: 1 1; + max: 9999 1; fixed: 1 1; - rel1 { relative: 1 1; to_x: "bg"; to_x: "left_padding"; to_y: "bottom_padding"; } - rel2 { relative: 1 1; to_x: "bg"; to_y: "bottom_padding"; } + color: 185 184 178 255; + rel1.relative: 0.05 0.5; + rel2.relative: 0.95 0.5; + rel1.to: "bottom_padding"; + rel2.to: "bottom_padding"; align: 0.0 0.0; } } - } - } - - group { - name: "email_block_noc"; - parts { - part { - name: "contents"; - type: SWALLOW; - description { - state: "default" 0.0; - } - } - } - } - - group { name: "initial_access"; - - images { - image: "M02_email_list_icon_exchange.png" COMP; - image: "M02_email_list_icon_gmail.png" COMP; - image: "M02_email_list_icon_hotmail.png" COMP; - image: "M02_email_list_icon_AOL.png" COMP; - } - - parts { - part { - name: "bg"; - type: RECT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0;} - rel2 { relative: 1.0 1.0;} - } - } - - part { - name: "top_padding"; + part{ + name: "separator_2"; type: RECT; scale: 1; - description { - state: "default" 0.0; - min: 0 50; - fixed: 0 1; - rel1 { relative: 0 0; to: "bg"; } - rel2 { relative: 1 0; to: "bg"; } - align: 0.0 0.0; - visible: 0; - } - } - - part { - name: "label"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - fixed: 0 1; - min: 0 200; - 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; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + min: 1 1; + max: 9999 1; + fixed: 1 1; + color: 255 255 255 255; + rel1.relative: 0.0 1.0; + rel1.to: "separator_1"; + rel2.to: "separator_1"; + align: 0.0 0.0; } } - part { - name: "middle_padding"; - type: RECT; + name: "palette"; + type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 0 16; - fixed: 0 1; - rel1 { relative: 0.0 1.0; to_y: "label"; } - rel2 { relative: 1.0 1.0; to_y: "label"; } - align: 0.0 0.0; - visible: 0; + rel1.relative: 1.0 1.0; + rel1.to_x: "left_padding"; + rel1.to_y: "bottom_padding"; + rel2.relative: 1.0 1.0; + rel2.to_x: "right_padding"; + rel2.to_y: "bottom_padding"; + align: 0.5 0.0; } } + } + } + group { + name: "email_block_noc"; + parts { part { - name: "list"; + name: "contents"; type: SWALLOW; - scale: 1; description { state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "middle_padding"; } - rel2 { relative: 1.0 1.0; to: "bg"; } } } } } - group { name: "initial_access_public"; + group { name: "initial_access"; images { + image: "M02_email_list_icon_exchange.png" COMP; image: "M02_email_list_icon_gmail.png" COMP; image: "M02_email_list_icon_hotmail.png" COMP; image: "M02_email_list_icon_AOL.png" COMP; @@ -972,7 +1172,7 @@ collections { } } - group { name: "initial_access_hd_public"; + group { name: "initial_access_public"; images { image: "M02_email_list_icon_gmail.png" COMP; @@ -999,7 +1199,7 @@ collections { scale: 1; description { state: "default" 0.0; - min: 0 26; + min: 0 50; fixed: 0 1; rel1 { relative: 0 0; to: "bg"; } rel2 { relative: 1 0; to: "bg"; } @@ -1015,14 +1215,13 @@ collections { description { state: "default" 0.0; fixed: 0 1; - min: 0 114; + min: 0 200; 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_padding"; type: RECT; @@ -1051,10 +1250,9 @@ collections { } } - group { name: "initial_access_hd"; + group { name: "initial_access_hd_public"; images { - image: "M02_email_list_icon_exchange.png" COMP; image: "M02_email_list_icon_gmail.png" COMP; image: "M02_email_list_icon_hotmail.png" COMP; image: "M02_email_list_icon_AOL.png" COMP; @@ -1079,7 +1277,7 @@ collections { scale: 1; description { state: "default" 0.0; - min: 0 65; + min: 0 26; fixed: 0 1; rel1 { relative: 0 0; to: "bg"; } rel2 { relative: 1 0; to: "bg"; } @@ -1109,7 +1307,7 @@ collections { scale: 1; description { state: "default" 0.0; - min: 0 30; + min: 0 16; fixed: 0 1; rel1 { relative: 0.0 1.0; to_y: "label"; } rel2 { relative: 1.0 1.0; to_y: "label"; } @@ -1131,480 +1329,182 @@ collections { } } - group { name: "account_add_checkbox_set"; - parts { - - part { name: "base"; - type: RECT; - repeat_events: 1; - scale: 1; - description { state: "default" 0.0; - min: 0 200; - color: 0 0 0 0; - align: 0.0 0.5; - } - } - - part { name: "left_padding"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 16 0; - fixed: 1 0; - visible: 0; - rel1 { to: "base"; relative: 0 0; } - rel2 { to: "base"; relative: 0 1; } - align: 0.0 0.0; - } - } - - part { name: "right_padding"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 16 0; - fixed: 1 0; - visible: 0; - rel1 { to: "base"; relative: 1 0; } - rel2 { to: "base"; relative: 1 1; } - align: 1.0 0.0; - } - } - - part { name: "subbox.1"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 100; - fixed: 1 0; - visible: 0; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - to_x: "left_padding"; - to_y: "base"; - } - rel2 { - relative: 0.0 0.0; - offset: 0 100; - to_x: "right_padding"; - to_y: "base"; - } - } - } - - part { name: "subbox.2"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 100; - fixed: 1 0; - visible: 0; - align: 0.0 0.5; - rel1 { - relative: 1.0 1.0; - to_x: "left_padding"; - to_y: "subbox.1"; - } - rel2 { - relative: 0.0 1.0; - to_x: "right_padding"; - to_y: "base"; - } - } - } - - part { name: "checkbox.1"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - min: 42 42; - max: 42 42; - fixed: 1 1; - align: 0.0 0.5; - visible: 1; - rel1 { - relative: 1.0 0.0; - to_x: "left_padding"; - to_y: "subbox.1"; - } - rel2 { - relative: 1.0 1.0; - offset: 42 0; - to_x: "left_padding"; - to_y: "subbox.1"; - } - } - } - - part { name: "text.1"; - type: SWALLOW; - ignore_flags: ON_HOLD; - mouse_events: 1; - scale: 1; - description { state: "default" 0.0; - min: 0 32; - fixed: 0 1; - align: 0.0 0.0; - rel1 { - relative: 1.0 0.0; - offset: 16 33; - to_x: "checkbox.1"; - to_y: "subbox.1"; - } - rel2 { - relative: 0.0 1.0; - offset: 0 -3; - to_x: "right_padding"; - to_y: "subbox.1"; - } - } - } - - part { name: "checkbox.2"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - min: 42 42; - max: 42 42; - fixed: 1 1; - align: 0.0 0.5; - visible: 1; - rel1 { - relative: 1.0 0.0; - to_x: "left_padding"; - to_y: "subbox.2"; - } - rel2 { - relative: 1.0 1.0; - offset: 42 0; - to_x: "left_padding"; - to_y: "subbox.2"; - } - } - } - - part { name: "text.2"; - type: SWALLOW; - ignore_flags: ON_HOLD; - mouse_events: 1; - scale: 1; - description { state: "default" 0.0; - min: 0 32; - fixed: 0 1; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: 16 34; - to_x: "checkbox.2"; - to_y: "subbox.2"; - } - rel2 { - relative: 0.0 1.0; - offset: 0 -34; - to_x: "right_padding"; - to_y: "subbox.2"; - } - } - } - } - - programs { - program { - name: "text1_clicked"; - signal: "mouse,up,1"; - source: "text.1"; - action: SIGNAL_EMIT "elm,action,text1_clicked" "elm"; - } + group { name: "initial_access_hd"; - program { - name: "text2_clicked"; - signal: "mouse,up,1"; - source: "text.2"; - action: SIGNAL_EMIT "elm,action,text2_clicked" "elm"; + images { + image: "M02_email_list_icon_exchange.png" COMP; + image: "M02_email_list_icon_gmail.png" COMP; + image: "M02_email_list_icon_hotmail.png" COMP; + image: "M02_email_list_icon_AOL.png" COMP; } - } - } - group { name: "account_add_checkbox_set_wvga"; parts { - - part { name: "base"; + part { + name: "bg"; type: RECT; - repeat_events: 1; scale: 1; - description { state: "default" 0.0; - min: 0 100; - color: 0 0 0 0; - align: 0.0 0.5; + mouse_events: 1; + description { + state: "default" 0.0; + rel1 { relative: 0.0 0.0;} + rel2 { relative: 1.0 1.0;} } } - part { name: "left_padding"; + part { + name: "top_padding"; type: RECT; scale: 1; - description { state: "default" 0.0; - min: 16 0; - fixed: 1 0; - visible: 0; - rel1 { to: "base"; relative: 0 0; } - rel2 { to: "base"; relative: 0 1; } + description { + state: "default" 0.0; + 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: "right_padding"; - type: RECT; + part { + name: "label"; + type: SWALLOW; scale: 1; - description { state: "default" 0.0; - min: 16 0; - fixed: 1 0; - visible: 0; - rel1 { to: "base"; relative: 1 0; } - rel2 { to: "base"; relative: 1 1; } - align: 1.0 0.0; + description { + state: "default" 0.0; + fixed: 0 1; + min: 0 114; + 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: "subbox.1"; + + part { + name: "middle_padding"; type: RECT; scale: 1; - description { state: "default" 0.0; - min: 0 50; - fixed: 1 0; + description { + state: "default" 0.0; + min: 0 30; + fixed: 0 1; + rel1 { relative: 0.0 1.0; to_y: "label"; } + rel2 { relative: 1.0 1.0; to_y: "label"; } + align: 0.0 0.0; visible: 0; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - to_x: "left_padding"; - to_y: "base"; - } - rel2 { - relative: 0.0 0.0; - offset: 0 50; - to_x: "right_padding"; - to_y: "base"; - } } } - part { name: "subbox.2"; - type: RECT; + part { + name: "list"; + type: SWALLOW; scale: 1; - description { state: "default" 0.0; - min: 0 50; - fixed: 1 0; - visible: 0; - align: 0.0 0.5; - rel1 { - relative: 1.0 1.0; - to_x: "left_padding"; - to_y: "subbox.1"; - } - rel2 { - relative: 0.0 1.0; - to_x: "right_padding"; - to_y: "base"; - } + description { + state: "default" 0.0; + rel1 { relative: 0.0 1.0; to: "middle_padding"; } + rel2 { relative: 1.0 1.0; to: "bg"; } } } + } + } - part { name: "checkbox.1"; - type: SWALLOW; + group { name: "other_account_add"; + parts { + part { name: "bg"; + type: RECT; + repeat_events: 1; scale: 1; description { state: "default" 0.0; - min: 42 42; - max: 42 42; - fixed: 1 1; - align: 0.0 0.5; - visible: 1; - rel1 { - relative: 1.0 0.0; - to_x: "left_padding"; - to_y: "subbox.1"; - } - rel2 { - relative: 1.0 1.0; - offset: 42 0; - to_x: "left_padding"; - to_y: "subbox.1"; - } + min: 0 803; + rel1 { relative: 0.0 0.0;} + rel2 { relative: 1.0 1.0;} + color: 0 0 0 0; + align: 0.0 0.0; } } - part { name: "text.1"; + part { name: "list"; type: SWALLOW; - ignore_flags: ON_HOLD; - mouse_events: 1; scale: 1; description { state: "default" 0.0; - min: 0 32; - fixed: 0 1; - align: 0.0 0.0; - rel1 { - relative: 1.0 0.0; - offset: 16 8; - to_x: "checkbox.1"; - to_y: "subbox.1"; - } - rel2 { - relative: 0.0 1.0; - offset: 0 0; - to_x: "right_padding"; - to_y: "subbox.1"; - } + align: 0 0; + rel1 { relative: 0 0; to: "bg"; } + rel2 { relative: 1 0; offset: 0 445; to: "bg"; } } } - part { name: "checkbox.2"; + part { name: "checkbox_set"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 42 42; - max: 42 42; - fixed: 1 1; - align: 0.0 0.5; - visible: 1; - rel1 { - relative: 1.0 0.0; - to_x: "left_padding"; - to_y: "subbox.2"; - } - rel2 { - relative: 1.0 1.0; - offset: 42 0; - to_x: "left_padding"; - to_y: "subbox.2"; - } + min: 0 200; + align: 0 0; + rel1 { relative: 0 1.0; to_y: "list"; } + rel2 { relative: 1 1.0; offset: 0 200; to_y: "list"; } } } - part { name: "text.2"; + part { name: "button_set"; type: SWALLOW; - ignore_flags: ON_HOLD; - mouse_events: 1; scale: 1; description { state: "default" 0.0; - min: 0 32; - fixed: 0 1; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: 16 8; - to_x: "checkbox.2"; - to_y: "subbox.2"; - } - rel2 { - relative: 0.0 1.0; - offset: 0 0; - to_x: "right_padding"; - to_y: "subbox.2"; - } + min: 0 158; + align: 0 0; + rel1 { relative: 0 1.0; to_y: "checkbox_set"; } + rel2 { relative: 1 1.0; offset: 0 158; to_y: "checkbox_set"; } } } } - - programs { - program { - name: "text1_clicked"; - signal: "mouse,up,1"; - source: "text.1"; - action: SIGNAL_EMIT "elm,action,text1_clicked" "elm"; - } - - program { - name: "text2_clicked"; - signal: "mouse,up,1"; - source: "text.2"; - action: SIGNAL_EMIT "elm,action,text2_clicked" "elm"; - } - } } - group { name: "account_add_manual_button"; +#define _SCALE_Y(y) (y*(800.0/1280.0)) +#define _SCALE_X(x) (x*(480.0/720.0)) + + group { name: "account_add_wvga"; parts { - part { name: "base"; + part { name: "bg"; type: RECT; repeat_events: 1; scale: 1; description { state: "default" 0.0; - min: 0 158; + min: 0 _SCALE_Y(703.0); + rel1 { relative: 0.0 0.0;} + rel2 { relative: 1.0 1.0;} color: 0 0 0 0; - align: 0.0 0.5; - } - } - - part { name: "top_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 40; - fixed: 0 1; - visible: 0; - rel1 { to: "base"; relative: 0 0; } - rel2 { to: "base"; relative: 1 0; } align: 0.0 0.0; } } - part { name: "bottom_padding"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 46; - fixed: 0 1; - visible: 0; - rel1 { to: "base"; relative: 0 1; } - rel2 { to: "base"; relative: 1 1; } - align: 0.0 1.0; - } - } - - part { name: "left_padding"; - type: RECT; + part { name: "list"; + type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 117 0; - fixed: 1 0; - visible: 0; - rel1 { to: "base"; relative: 0 0; } - rel2 { to: "base"; relative: 0 1; } - align: 0.0 0.0; + align: 0 0; + rel1 { relative: 0 0; to: "bg"; } + rel2 { relative: 1 0; offset: 0 _SCALE_Y(345.0); to: "bg"; } } } - part { name: "right_padding"; - type: RECT; + part { name: "checkbox_set"; + type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 117 0; - fixed: 1 0; - visible: 0; - rel1 { to: "base"; relative: 1 0; } - rel2 { to: "base"; relative: 1 1; } - align: 1.0 0.0; + min: 0 _SCALE_Y(254.0); + align: 0 0; + rel1 { relative: 0 1.0; to_y: "list"; } + rel2 { relative: 1 1.0; offset: 0 _SCALE_Y(254.0); to_y: "list"; } } } - part { name: "btn"; + part { name: "button_set"; type: SWALLOW; - mouse_events: 1; scale: 1; description { state: "default" 0.0; - min: 0 72; - fixed: 0 1; + min: 0 _SCALE_Y(74.0); align: 0 0; - rel1 { - relative: 1.0 1.0; - to_x: "left_padding"; - to_y: "top_padding"; - } - rel2 { - relative: 0.0 0.0; - to_x: "right_padding"; - to_y: "bottom_padding"; - } + rel1 { relative: 0 1.0; to_y: "checkbox_set"; } + rel2 { relative: 1 1.0; offset: 0 _SCALE_Y(74.0); to_y: "checkbox_set"; } } } } @@ -1617,44 +1517,17 @@ collections { repeat_events: 1; scale: 1; description { state: "default" 0.0; - min: 0 80; + min: 0 _SCALE_Y(74.0); color: 0 0 0 0; align: 0.0 0.5; } } - part { name: "top_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 15; - fixed: 0 1; - visible: 0; - rel1 { to: "base"; relative: 0 0; } - rel2 { to: "base"; relative: 1 0; } - align: 0.0 0.0; - } - } - - part { name: "bottom_padding"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 15; - fixed: 0 1; - visible: 0; - rel1 { to: "base"; relative: 0 1; } - rel2 { to: "base"; relative: 1 1; } - align: 0.0 1.0; - } - } - part { name: "left_padding"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 117 0; + min: 16 0; fixed: 1 0; visible: 0; rel1 { to: "base"; relative: 0 0; } @@ -1667,7 +1540,7 @@ collections { type: RECT; scale: 1; description { state: "default" 0.0; - min: 117 0; + min: 16 0; fixed: 1 0; visible: 0; rel1 { to: "base"; relative: 1 0; } @@ -1681,169 +1554,216 @@ collections { mouse_events: 1; scale: 1; description { state: "default" 0.0; - min: 0 50; + min: _SCALE_X(688.0) _SCALE_Y(74.0); fixed: 0 1; align: 0 0; rel1 { - relative: 1.0 1.0; + relative: 1.0 0.0; to_x: "left_padding"; - to_y: "top_padding"; + to_y: "base"; } rel2 { - relative: 0.0 0.0; + relative: 0.0 1.0; to_x: "right_padding"; - to_y: "bottom_padding"; + to_y: "base"; } } } } } - group { name: "account_add"; + group { name: "account_add_checkbox_set_wvga"; parts { - part { name: "bg"; + + part { name: "base"; type: RECT; repeat_events: 1; scale: 1; description { state: "default" 0.0; - min: 0 673; - rel1 { relative: 0.0 0.0;} - rel2 { relative: 1.0 1.0;} + min: 0 _SCALE_Y(216.0); color: 0 0 0 0; - align: 0.0 0.0; + align: 0.0 0.5; } } - part { name: "list"; - type: SWALLOW; + part { name: "left_padding"; + type: RECT; scale: 1; description { state: "default" 0.0; - align: 0 0; - rel1 { relative: 0 0; to: "bg"; } - rel2 { relative: 1 0; offset: 0 315; to: "bg"; } + min: 16 0; + fixed: 1 0; + visible: 0; + rel1 { to: "base"; relative: 0 0; } + rel2 { to: "base"; relative: 0 1; } + align: 0.0 0.0; } } - part { name: "checkbox_set"; - type: SWALLOW; + part { name: "right_padding"; + type: RECT; scale: 1; description { state: "default" 0.0; - min: 0 200; - align: 0 0; - rel1 { relative: 0 1.0; to_y: "list"; } - rel2 { relative: 1 1.0; offset: 0 200; to_y: "list"; } + min: 16 0; + fixed: 1 0; + visible: 0; + rel1 { to: "base"; relative: 1 0; } + rel2 { to: "base"; relative: 1 1; } + align: 1.0 0.0; } } - part { name: "button_set"; - type: SWALLOW; + part { name: "subbox.1"; + type: RECT; scale: 1; description { state: "default" 0.0; - min: 0 158; - align: 0 0; - rel1 { relative: 0 1.0; to_y: "checkbox_set"; } - rel2 { relative: 1 1.0; offset: 0 158; to_y: "checkbox_set"; } + min: 0 _SCALE_Y(108.0); + fixed: 1 0; + visible: 0; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + to_x: "left_padding"; + to_y: "base"; + } + rel2 { + relative: 0.0 0.0; + offset: 0 _SCALE_Y(108.0); + to_x: "right_padding"; + to_y: "base"; + } } } - } - } - group { name: "other_account_add"; - parts { - part { name: "bg"; + part { name: "subbox.2"; type: RECT; - repeat_events: 1; scale: 1; description { state: "default" 0.0; - min: 0 803; - rel1 { relative: 0.0 0.0;} - rel2 { relative: 1.0 1.0;} - color: 0 0 0 0; - align: 0.0 0.0; + min: 0 _SCALE_Y(108.0); + fixed: 1 0; + visible: 0; + align: 0.0 0.5; + rel1 { + relative: 1.0 1.0; + to_x: "left_padding"; + to_y: "subbox.1"; + } + rel2 { + relative: 0.0 1.0; + offset: 0 _SCALE_Y(108.0); + to_x: "right_padding"; + to_y: "subbox.1"; + } } } - part { name: "list"; + part { name: "checkbox.1"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - align: 0 0; - rel1 { relative: 0 0; to: "bg"; } - rel2 { relative: 1 0; offset: 0 445; to: "bg"; } + min: 42 42; + max: 42 42; + fixed: 1 1; + align: 0.0 0.5; + visible: 1; + rel1 { + relative: 1.0 0.0; + to_x: "left_padding"; + to_y: "subbox.1"; + } + rel2 { + relative: 1.0 1.0; + offset: 42 0; + to_x: "left_padding"; + to_y: "subbox.1"; + } } } - part { name: "checkbox_set"; + part { name: "text.1"; type: SWALLOW; + ignore_flags: ON_HOLD; + mouse_events: 1; scale: 1; description { state: "default" 0.0; - min: 0 200; - align: 0 0; - rel1 { relative: 0 1.0; to_y: "list"; } - rel2 { relative: 1 1.0; offset: 0 200; to_y: "list"; } + min: 0 32; + fixed: 0 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 16 _SCALE_Y(38.0); + to_x: "checkbox.1"; + to_y: "subbox.1"; + } + rel2 { + relative: 0.0 1.0; + offset: 0 -3; + to_x: "right_padding"; + to_y: "subbox.1"; + } } } - part { name: "button_set"; + part { name: "checkbox.2"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 0 158; - align: 0 0; - rel1 { relative: 0 1.0; to_y: "checkbox_set"; } - rel2 { relative: 1 1.0; offset: 0 158; to_y: "checkbox_set"; } - } - } - } - } - -#define _SCALE 0.64 - - group { name: "account_add_wvga"; - parts { - part { name: "bg"; - type: RECT; - repeat_events: 1; - scale: 1; - description { state: "default" 0.0; - min: 0 673; - rel1 { relative: 0.0 0.0;} - rel2 { relative: 1.0 1.0;} - color: 0 0 0 0; - align: 0.0 0.0; + min: 42 42; + max: 42 42; + fixed: 1 1; + align: 0.0 0.5; + visible: 1; + rel1 { + relative: 0.0 0.0; + to_x: "subbox.2"; + to_y: "subbox.2"; + } + rel2 { + relative: 1.0 1.0; + offset: 42 0; + to_x: "left_padding"; + to_y: "subbox.2"; + } } } - part { name: "list"; + part { name: "text.2"; type: SWALLOW; + ignore_flags: ON_HOLD; + mouse_events: 1; scale: 1; description { state: "default" 0.0; - align: 0 0; - rel1 { relative: 0 0; to: "bg"; } - rel2 { relative: 1 0; offset: 0 220.0*_SCALE; to: "bg"; } + min: 0 32; + fixed: 0 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 16 _SCALE_Y(38.0); + to_x: "checkbox.2"; + to_y: "subbox.2"; + } + rel2 { + relative: 0.0 1.0; + offset: 0 -3; + to_x: "right_padding"; + to_y: "subbox.2"; + } } } + } - part { name: "checkbox_set"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - min: 0 100; - align: 0 0; - rel1 { relative: 0 1.0; to_y: "list"; } - rel2 { relative: 1 1.0; offset: 0 100; to_y: "list"; } - } + programs { + program { + name: "text1_clicked"; + signal: "mouse,up,1"; + source: "text.1"; + action: SIGNAL_EMIT "elm,action,text1_clicked" "elm"; } - part { name: "button_set"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - min: 0 80; - align: 0 0; - rel1 { relative: 0 1.0; to_y: "checkbox_set"; } - rel2 { relative: 1 1.0; offset: 0 80; to_y: "checkbox_set"; } - } + program { + name: "text2_clicked"; + signal: "mouse,up,1"; + source: "text.2"; + action: SIGNAL_EMIT "elm,action,text2_clicked" "elm"; } } } @@ -2049,8 +1969,9 @@ collections { group { name: "email_color_rect"; images { - image: "M02_color_bar_outline.png" COMP; - image: "M02_color_bar_masking.png" COMP; + image: "M02_color_btn_ef.png" COMP; + image: "M02_color_btn_ef_press.png" COMP; + image: "M02_color_btn_ef_dim.png" COMP; } parts { part { @@ -2092,7 +2013,14 @@ collections { rel1 { relative: 0 0; to: "color_rect"; } rel2 { relative: 1 1; to: "color_rect"; } image { - normal: "M02_color_bar_outline.png"; + normal: "M02_color_btn_ef.png"; + } + } + description { + state: "holded" 0.0; + inherit: "default" 0.0; + image { + normal: "M02_color_btn_ef_press.png"; } } } @@ -2104,6 +2032,20 @@ collections { source: "color_rect_outline"; action: SIGNAL_EMIT "elm,action,color_rect_clicked" "elm"; } + program { + name: "color_rect_released"; + signal: "mouse,up,1"; + source: "color_rect_outline"; + action: STATE_SET "default" 0.0; + target: "color_rect_outline"; + } + program { + name: "color_rect_holded"; + signal: "mouse,down,1"; + source: "color_rect_outline"; + action: STATE_SET "holded" 0.0; + target: "color_rect_outline"; + } } } } diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt index ff19947..40bc9d6 100755 --- a/viewer/CMakeLists.txt +++ b/viewer/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE(FindPkgConfig) pkg_check_modules(pkgs-viewer REQUIRED appcore-efl ui-gadget-1 x11 elementary ecore glib-2.0 gobject-2.0 status capi-media-metadata-extractor capi-media-image-util capi-content-media-content email-service edbus capi-appfw-application vconf ewebkit2 - contacts-service2 sysman bundle dlog efreet-mime libmedia-utils calendar-service2 ethumb) + contacts-service2 sysman bundle dlog efreet-mime calendar-service2 ethumb) FOREACH(flag ${pkgs-viewer_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/viewer/src/email-viewer.c b/viewer/src/email-viewer.c index 188ce24..ed12819 100755 --- a/viewer/src/email-viewer.c +++ b/viewer/src/email-viewer.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include "email-viewer.h" @@ -3611,7 +3610,7 @@ static Eina_Bool _save_email_prog_cb(void *data) debug_log("date(%s)", date); char file_name[MAX_PATH_LEN] = { 0, }; - snprintf(file_name, sizeof(file_name), "%s/%s_%d_%d_%s.%s", DIR_DEFAULT_MEDIA_PHONE"/Saved Email", subject, ug_data->account_id, ug_data->mail_id, date, "eml"); + snprintf(file_name, sizeof(file_name), "%s/%s_%d_%d_%s.%s", DIR_DEFAULT_MEDIA_PHONE"/Saved Email", subject, ug_data->account_id, ug_data->mail_id, date, "eml"); char *output_file_path = g_strdup(file_name); debug_log("output_file_path(%s)", file_name, output_file_path); @@ -4798,10 +4797,10 @@ static void _show_attachment(EmailViewerUGD *ug_data, int index) } g_free(raw_data); - calendar_list_destroy(list, true); + if (list) + calendar_list_destroy(list, true); calendar_disconnect(); - } else - media_file_register(newpath); + } } else if (res == EMAIL_EXT_SAVE_ERR_ALREADY_EXIST && !ug_data->display_download_result) { _create_notify(ug_data, _("IDS_EMAIL_POP_ALERT"), dgettext("sys_string", "IDS_COM_POP_ALREDY_EXISTS"), 0, -- 2.7.4