[meego-commits] 23973: Changes to MeeGo:1.1:Netbook:Update/evolution
jieyang
no_reply at build.meego.com
Fri Sep 16 03:39:23 UTC 2011
Hi,
I have made the following changes to evolution in project MeeGo:1.1:Netbook:Update. Please review and accept ASAP.
Thank You,
jieyang
[This message was auto-generated]
---
Request #23973:
submit: MeeGo:1.1:Netbook:Update:Testing/evolution(r5)(update) -> MeeGo:1.1:Netbook:Update/evolution
Message:
forward
State: new 2011-09-15T20:29:17 jieyang
Comment: None
changes files:
--------------
--- evolution.changes
+++ evolution.changes
@@ -0,0 +1,15 @@
+* Tue May 31 2011 Yang Jie <yang.jie at intel.com> - 2.30.0~20100423
+- Add evolution-message-composer-crash-bug-11272.patch to fix bmc #11272
+
+* Thu Mar 10 2011 Hao Li <hao.h.li at intel.com> - 2.30.0~20100423
+- Add evolution-usessl-13295.patch and Update po file to fix bmc #13295
+
+* Tue Jan 25 2011 Hao Li <hao.h.li at intel.com> - 2.30.0~20100423
+- Update po file to fix bmc #1701
+
+* Thu Dec 2 2010 Hao Li <hao.h.li at intel.com> - 2.30.0~20100423
+- Add evolution-capplet-account-label-3473.patch from glin at novell.com and evolution-set-size-for-fix-long-string-2711.patch from mlin at novell.com to fix bmc #8976, #2711
+
+* Mon Nov 15 2010 Hao Li <hao.h.li at intel.com> - 2.30.0~20100423
+- Add patch and update po translation and desktop file to fix bmc #7048
+
new:
----
evolution-capplet-account-label-3473.patch
evolution-message-composer-crash-bug-11272.patch
evolution-set-size-for-fix-long-string-2711.patch
evolution-usessl-13295.patch
spec files:
-----------
--- evolution.spec
+++ evolution.spec
@@ -94,6 +94,11 @@
Patch43: evolution-send-receive-7754.patch
Patch44: evolution-Free-Busy-7758.patch
Patch45: evolution-open-appt-bug-6496.patch
+Patch47: evolution-set-size-for-fix-long-string-2711.patch
+Patch48: evolution-capplet-account-label-3473.patch
+Patch49: evolution-usessl-13295.patch
+
+Patch50: evolution-message-composer-crash-bug-11272.patch
## Dependencies ###
@@ -248,6 +253,11 @@
%patch43 -p1 -b .evolution-send-receive-7754
%patch44 -p1 -b .evolution-Free-Busy-7758
%patch45 -p0 -b .evolution-open-appt-6496
+%patch47 -p1 -b .evolution-set-size-for-fix-long-string-2711
+%patch48 -p1 -b .evolution-capplet-account-label-3473
+%patch49 -p1 -b .evolution-usessl-13295
+
+%patch50 -p1 -b .evolution-message-composer-crash-bug-11272
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
other changes:
--------------
++++++ dates.desktop
--- dates.desktop
+++ dates.desktop
@@ -1,6 +1,40 @@
[Desktop Entry]
Name=Calendar
+Name[de]=Kalender
+Name[es]=Calendario
+Name[eu]=Egutegia
+Name[fi]=Kalenteri
+Name[fr]=Calendrier
+Name[hu]=Naptár
+Name[it]=Calendario
+Name[ja]=カレンダ
+Name[ko]=달력
+Name[nl]=Agenda
+Name[pl]=Kalendarz
+Name[pt_BR]=Agenda
+Name[sl]=Koledar
+Name[sv]=Kalender
+Name[th]=ปฏิทิน
+Name[zh_CN]=日历
+Name[zh_TW]=行事曆
Comment=Your appointments
+Comment[de]=Ihre Verabredungen
+Comment[es]=Tus citas
+Comment[eu]=Zure hitzorduak
+Comment[fi]=Tapaamiset
+Comment[fr]=Vos rendez-vous
+Comment[hu]=Értekezletei
+Comment[it]=Appuntamenti
+Comment[ja]=スケジュール
+Comment[ko]=약속된 일정
+Comment[nl]=Afspraken
+Comment[pl]=Spotkania użytkownika
+Comment[pt_BR]=Sua agenda
+Comment[sl]=Vaši sestanki
+Comment[sv]=Dina möten
+Comment[th]=นัดหมายของคุณ
+Comment[zh_CN]=您的约会
+Comment[zh_TW]=您的約會
Version=1.0
Type=Application
Exec=evolution --component calendar --express
++++++ evolution-capplet-account-label-3473.patch (new)
--- evolution-capplet-account-label-3473.patch
+++ evolution-capplet-account-label-3473.patch
+diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
+index 8abbda7..22942ad 100644
+--- a/capplet/settings/mail-account-view.c
++++ b/capplet/settings/mail-account-view.c
+@@ -43,6 +43,10 @@ struct _MailAccountViewPrivate {
+ GtkWidget *gcontacts;
+ GtkWidget *gmail_info_label;
+
++ GtkWidget *account_label;
++ GtkWidget *gmail_link;
++ GtkWidget *yahoo_cal_box;
++
+ gboolean is_gmail;
+ gboolean is_yahoo;
+ gboolean do_gcontacts;
+@@ -706,16 +710,19 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
+ gtk_widget_destroy (mav->priv->gcontacts);
+ gtk_widget_destroy (mav->priv->calendar);
+ gtk_widget_destroy (mav->priv->gmail_info_label);
++ gtk_widget_destroy (mav->priv->account_label);
++ gtk_widget_destroy (mav->priv->gmail_link);
+ } else if (mav->priv->is_yahoo) {
+ gtk_widget_destroy (mav->priv->calendar);
+ gtk_widget_destroy (mav->priv->gmail_info_label);
+ gtk_widget_destroy (mav->priv->yahoo_cal_entry);
++ gtk_widget_destroy (mav->priv->account_label);
++ gtk_widget_destroy (mav->priv->yahoo_cal_box);
+ }
+
+ if (mav->original == NULL && (g_strrstr(account->source->url, "gmail") ||
+ g_strrstr(account->source->url, "googlemail"))) {
+ /* Google accounts*/
+- GtkWidget *tmp;
+ mav->priv->is_gmail = TRUE;
+
+ mav->priv->gcontacts = gtk_check_button_new_with_label (_("Setup Google contacts with Evolution"));
+@@ -731,28 +738,28 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
+ gtk_widget_show (mav->priv->calendar);
+ gtk_widget_show (mav->priv->gmail_info_label);
+
+- tmp = gtk_label_new (NULL);
+- gtk_label_set_markup ((GtkLabel *)tmp, _("<span size=\"large\" weight=\"bold\">Google account settings:</span>"));
+- gtk_widget_show(tmp);
++ mav->priv->account_label = gtk_label_new (NULL);
++ gtk_label_set_markup ((GtkLabel *)mav->priv->account_label, _("<span size=\"large\" weight=\"bold\">Google account settings:</span>"));
++ gtk_widget_show(mav->priv->account_label);
+
+ #define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); }
+
+- PACK_IN_BOX(page->box,tmp,12);
++ PACK_IN_BOX(page->box,mav->priv->account_label,12);
+ PACK_IN_BOX(page->box,mav->priv->gcontacts,24);
+ PACK_IN_BOX(page->box,mav->priv->calendar,24);
+ #undef PACK_IN_BOX
+ #define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); }
+
+- PACK_IN_BOX(page->box,mav->priv->gmail_info_label,gtk_link_button_new("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"), 24, 0);
++ mav->priv->gmail_link = gtk_link_button_new ("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop");
++
++ PACK_IN_BOX(page->box,mav->priv->gmail_info_label,mav->priv->gmail_link, 24, 0);
+ #undef PACK_IN_BOX
+ } else if (mav->original == NULL &&
+ (g_strrstr(account->source->url, "yahoo.") ||
+ g_strrstr(account->source->url, "ymail.") ||
+ g_strrstr(account->source->url, "rocketmail."))) {
+ /* Yahoo accounts*/
+- GtkWidget *tmp;
+ char *cal_name;
+- GtkWidget *tmpbox;
+
+ mav->priv->is_yahoo = TRUE;
+ printf("Google account: %s\n", account->source->url);
+@@ -769,21 +776,21 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
+ gtk_widget_show (mav->priv->calendar);
+ gtk_widget_show (mav->priv->gmail_info_label);
+
+- tmp = gtk_label_new (NULL);
+- gtk_label_set_markup ((GtkLabel *)tmp, _("<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"));
+- gtk_widget_show(tmp);
++ mav->priv->account_label = gtk_label_new (NULL);
++ gtk_label_set_markup ((GtkLabel *)mav->priv->account_label, _("<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"));
++ gtk_widget_show(mav->priv->account_label);
+
+ #define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); }
+-#define PACK_IN_BOX_AND_TEXT(txt, child,num) { GtkWidget *txtlbl = gtk_label_new (txt); tmpbox = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)tmpbox, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)tmpbox, child, FALSE, FALSE, num); gtk_widget_show_all (tmpbox);}
++#define PACK_IN_BOX_AND_TEXT(txt,box,child,num) { GtkWidget *txtlbl = gtk_label_new (txt); box = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)box, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)box, child, FALSE, FALSE, num); gtk_widget_show_all (box);}
+
+- PACK_IN_BOX(page->box,tmp,12);
++ PACK_IN_BOX(page->box,mav->priv->account_label,12);
+ PACK_IN_BOX(page->box,mav->priv->calendar,24);
+
+ mav->priv->yahoo_cal_entry = gtk_entry_new ();
+ gtk_widget_show (mav->priv->yahoo_cal_entry);
+ PACK_IN_BOX(page->box,mav->priv->gmail_info_label, 24);
+- PACK_IN_BOX_AND_TEXT(_("Yahoo Calendar name:"), mav->priv->yahoo_cal_entry, 0);
+- PACK_IN_BOX(page->box, tmpbox, 24);
++ PACK_IN_BOX_AND_TEXT(_("Yahoo Calendar name:"), mav->priv->yahoo_cal_box, mav->priv->yahoo_cal_entry, 0);
++ PACK_IN_BOX(page->box, mav->priv->yahoo_cal_box, 24);
+ cal_name = g_strdup(e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_NAME));
+ cal_name = g_strdelimit(cal_name, " ", '_');
+ gtk_entry_set_text ((GtkEntry *)mav->priv->yahoo_cal_entry, cal_name);
++++++ evolution-message-composer-crash-bug-11272.patch (new)
--- evolution-message-composer-crash-bug-11272.patch
+++ evolution-message-composer-crash-bug-11272.patch
+diff --git a/e-util/e-selection.c b/e-util/e-selection.c
+index 3561dda..3d8922a 100644
+--- a/e-util/e-selection.c
++++ b/e-util/e-selection.c
+@@ -304,6 +304,8 @@ e_selection_data_get_html (GtkSelectionData *selection_data)
+ length = gtk_selection_data_get_length (selection_data);
+ data_type = gtk_selection_data_get_data_type (selection_data);
+
++ g_return_val_if_fail (data != NULL, NULL);
++
+ /* First validate the data. Assume it's UTF-8 or UTF-16. */
+ if (g_utf8_validate ((const gchar *) data, length - 1, NULL))
+ utf8_text = g_strdup ((const gchar *) data);
++++++ evolution-set-size-for-fix-long-string-2711.patch (new)
--- evolution-set-size-for-fix-long-string-2711.patch
+++ evolution-set-size-for-fix-long-string-2711.patch
+diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
+index 8f07bed..8abbda7 100644
+--- a/capplet/settings/mail-account-view.c
++++ b/capplet/settings/mail-account-view.c
+@@ -761,6 +761,9 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
+ gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE);
+
+ mav->priv->gmail_info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct."));
++ gtk_widget_set_size_request ((GtkWidget *)mav->priv->gmail_info_label, 600, -1);
++ gtk_label_set_line_wrap ((GtkLabel *)mav->priv->gmail_info_label, TRUE);
++ gtk_label_set_line_wrap_mode ((GtkLabel *)mav->priv->gmail_info_label, PANGO_WRAP_WORD);
+ gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE);
+
+ gtk_widget_show (mav->priv->calendar);
++++++ evolution-usessl-13295.patch (new)
--- evolution-usessl-13295.patch
+++ evolution-usessl-13295.patch
+diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
+index 22942ad..e757392 100644
+--- a/capplet/settings/mail-account-view.c
++++ b/capplet/settings/mail-account-view.c
+@@ -533,7 +533,23 @@ create_review (MailAccountView *view)
+ PACK_BOX(label);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+ enc = (gchar *)camel_url_get_param(url, "use_ssl");
+- entry = gtk_label_new (enc ? enc : _("never"));
++
++ if (strcmp(enc,"when-possible") == 0)
++ {
++ enc = g_strdup(_("when-possible")); //for showing localized string in UI
++ }
++
++ if (strcmp(enc,"always") == 0)
++ {
++ enc = g_strdup(_("always")); //for showing localized string in UI
++ }
++
++ if (strcmp(enc,"never") == 0)
++ {
++ enc = g_strdup(_("never")); //for showing localized string in UI
++ }
++
++ entry = gtk_label_new (enc ? enc : _("never"));
+ gtk_widget_show(entry);
+ PACK_BOX(entry);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+@@ -566,6 +582,22 @@ create_review (MailAccountView *view)
+ gtk_table_attach ((GtkTable *)table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+
+ enc = (gchar *)camel_url_get_param(url, "use_ssl");
++
++ if (strcmp(enc,"when-possible") == 0)
++ {
++ enc = g_strdup(_("when-possible")); //for showing localized string in UI
++ }
++
++ if (strcmp(enc,"always") == 0)
++ {
++ enc = g_strdup(_("always")); //for showing localized string in UI
++ }
++
++ if (strcmp(enc,"never") == 0)
++ {
++ enc = g_strdup(_("never")); //for showing localized string in UI
++ }
++
+ entry = gtk_label_new (enc ? enc : _("never"));
+ gtk_widget_show(entry);
+ PACK_BOX(entry);
+@@ -968,15 +1000,15 @@ emae_check_servers (const gchar *email)
+ sdata->proto = provider->recv_type;
+ if (provider->recv_socket_type) {
+ if (g_ascii_strcasecmp(provider->recv_socket_type, "SSL") == 0)
+- sdata->ssl = g_strdup(_("always"));
++ sdata->ssl = g_strdup("always");
+ else if (g_ascii_strcasecmp(provider->recv_socket_type, "secure") == 0)
+- sdata->ssl = g_strdup(_("always"));
++ sdata->ssl = g_strdup("always");
+ else if (g_ascii_strcasecmp(provider->recv_socket_type, "STARTTLS") == 0)
+- sdata->ssl = g_strdup(_("when-possible"));
++ sdata->ssl = g_strdup("when-possible");
+ else if (g_ascii_strcasecmp(provider->recv_socket_type, "TLS") == 0)
+- sdata->ssl = g_strdup(_("when-possible"));
++ sdata->ssl = g_strdup("when-possible");
+ else
+- sdata->ssl = g_strdup(_("never"));
++ sdata->ssl = g_strdup("never");
+
+ }
+ sdata->send_user = provider->send_username;
++++++ po-updates.tar.bz2
--- de.po
+++ de.po
@@ -8434,8 +8434,10 @@
msgid "Use encryption:"
msgstr "Verschlüsselung verwenden:"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "Nie"
@@ -8575,6 +8577,16 @@
msgid "Yahoo Calendar name:"
msgstr "Yahoo Kalendername:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "immer"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "wenn möglich"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "Passwort:"
--- es.po
+++ es.po
@@ -8419,8 +8419,10 @@
msgid "Use encryption:"
msgstr "Usar cifrado:"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "nunca"
@@ -8560,6 +8562,16 @@
msgid "Yahoo Calendar name:"
msgstr "Nombre del calendario de Yahoo:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "siempre"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "cuando sea posible"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "Contraseña:"
--- fi.po
+++ fi.po
@@ -8413,8 +8413,10 @@
msgid "Use encryption:"
msgstr "Käytä salausta:"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "ei koskaan"
@@ -8554,6 +8556,16 @@
msgid "Yahoo Calendar name:"
msgstr "Yahoo-kalenterin nimi:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "aina"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "kun-mahdollista"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "Salasana:"
--- fr.po
+++ fr.po
@@ -8439,8 +8439,10 @@
msgid "Use encryption:"
msgstr "Utiliser le chiffrement :"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "jamais"
@@ -8580,6 +8582,16 @@
msgid "Yahoo Calendar name:"
msgstr "Choisissez un fichier de calendrier :"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "toujours"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "si possible"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "Mot de passe :"
--- it.po
+++ it.po
@@ -8586,8 +8586,10 @@
msgstr "Usare la crittografia:"
# GNOME-2.30
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "mai"
@@ -8753,6 +8755,16 @@
msgid "Yahoo Calendar name:"
msgstr "Nome del calendario di Yahoo:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "sempre"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "quando-possibile"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "Password:"
--- ja.po
+++ ja.po
@@ -8418,8 +8418,10 @@
msgstr "暗号化する:"
# Need more information about the exact meaning of this word...
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "なし"
@@ -8566,6 +8568,16 @@
msgid "Yahoo Calendar name:"
msgstr "Yahoo! カレンダー名:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "常に"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "可能な場合"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "パスワード："
--- ko.po
+++ ko.po
@@ -8561,8 +8561,10 @@
msgid "Use encryption:"
msgstr "암호화 사용:"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "사용 안 함"
@@ -8703,6 +8705,16 @@
msgid "Yahoo Calendar name:"
msgstr "야후 캘린더 이름:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "항상 허용"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "가능한 경우"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "암호:"
--- nl.po
+++ nl.po
@@ -8640,8 +8640,10 @@
msgid "Use encryption:"
msgstr "Gebruik encryptie:"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "Nooit"
@@ -8793,6 +8795,16 @@
msgid "Yahoo Calendar name:"
msgstr "Yahoo agendanaam"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "altijd"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "wanneer mogelijk"
+
# de W wordt al gebruikt voor _Wekelijks
# de A voor _Annuleren
#: ../capplet/settings/mail-account-view.c:1019
--- pl.po
+++ pl.po
@@ -8555,8 +8555,10 @@
msgid "Use encryption:"
msgstr "Używaj szyfrowania:"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "nNigdy"
@@ -8696,6 +8698,16 @@
msgid "Yahoo Calendar name:"
msgstr "Nazwa kalendarza usługi Yahoo:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "zawsze"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "gdy możliwe"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "Hasło:"
--- pt_BR.po
+++ pt_BR.po
@@ -8423,8 +8423,10 @@
msgid "Use encryption:"
msgstr "Utilizar encriptação:"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "nunca"
@@ -8564,6 +8566,16 @@
msgid "Yahoo Calendar name:"
msgstr "Nome do calendário Yahoo:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "sempre"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "quando-possível"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "Senha:"
--- ru.po
+++ ru.po
@@ -8436,8 +8436,10 @@
msgid "Use encryption:"
msgstr "Использовать шифрование:"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "никогда"
@@ -8577,6 +8579,16 @@
msgid "Yahoo Calendar name:"
msgstr "Название календаря Yahoo:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "всегда"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "когда возможно"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "Пароль:"
--- sv.po
+++ sv.po
@@ -8489,8 +8489,10 @@
msgid "Use encryption:"
msgstr "Använd kryptering:"
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "aldrig"
@@ -8630,6 +8632,16 @@
msgid "Yahoo Calendar name:"
msgstr "Namn på Yahoo-kalender:"
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "alltid"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "när möjlighet finns"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "Lösenord:"
--- zh_CN.po
+++ zh_CN.po
@@ -8394,8 +8394,10 @@
msgid "Use encryption:"
msgstr "使用加密："
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "从不"
@@ -8535,6 +8537,16 @@
msgid "Yahoo Calendar name:"
msgstr "雅虎日历名称："
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "总是"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "有可能时"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "密码："
--- zh_TW.po
+++ zh_TW.po
@@ -4993,7 +4993,7 @@
#: ../calendar/gui/e-week-view-main-item.c:222
#: ../calendar/gui/print.c:1735
msgid "%A %d %B"
-msgstr "%A %d %B"
+msgstr "%B%d日%A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
@@ -8417,8 +8417,10 @@
msgid "Use encryption:"
msgstr "使用加密："
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:601
msgid "never"
msgstr "永不"
@@ -8558,6 +8560,16 @@
msgid "Yahoo Calendar name:"
msgstr "Yahoo 行事曆名稱："
+#: ../capplet/settings/mail-account-view.c:544
+#: ../capplet/settings/mail-account-view.c:588
+msgid "always"
+msgstr "永遠"
+
+#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:583
+msgid "when-possible"
+msgstr "有可能時"
+
#: ../capplet/settings/mail-account-view.c:1019
msgid "Password:"
msgstr "密碼:"
More information about the MeeGo-commits
mailing list