callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from master.

Browse Source
This commit is contained in:
Matthew Barnes
2009-05-02 00:56:55 -04:00
parent 15af330cac
commit f5ca8fdc13
8 changed files with 3853 additions and 3868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer/evolution-composer.ui
View File

@ -17,6 +17,9 @@
<placeholder name='external-editor-holder'/>
<separator/>
<separator/>
<placeholder name='external-editor-holder'/>
<separator/>
<separator/>
<menuitem action='print-preview'/>
<menuitem action='print'/>
<separator/>

13
e-util/e-util.c
View File

@ -40,6 +40,8 @@
#include <glib/gstdio.h>
#include <libgnome/gnome-init.h>
#include <camel/camel-url.h>
#ifdef G_OS_WIN32
#include <windows.h>
#endif
@ -108,6 +110,7 @@ e_show_uri (GtkWindow *parent,
GtkWidget *dialog;
GdkScreen *screen = NULL;
GError *error = NULL;
gchar *decoded_uri;
guint32 timestamp;
g_return_if_fail (uri != NULL);
@ -117,8 +120,11 @@ e_show_uri (GtkWindow *parent,
if (parent != NULL)
screen = gtk_widget_get_screen (GTK_WIDGET (parent));
if (gtk_show_uri (screen, uri, timestamp, &error))
return;
decoded_uri = g_strdup (uri);
camel_url_decode (decoded_uri);
if (gtk_show_uri (screen, decoded_uri, timestamp, &error))
goto exit;
dialog = gtk_message_dialog_new_with_markup (
parent, GTK_DIALOG_DESTROY_WITH_PARENT,
@ -133,6 +139,9 @@ e_show_uri (GtkWindow *parent,
gtk_widget_destroy (dialog);
g_error_free (error);
exit:
g_free (decoded_uri);
}
/**

28
mail/em-composer-utils.c
View File

@ -499,7 +499,7 @@ struct _save_draft_info {
};
static void
composer_set_no_change (EMsgComposer *composer, gboolean drop_undo)
composer_set_no_change (EMsgComposer *composer, gboolean drop_undo, gboolean editor_changed)
{
GtkhtmlEditor *editor;
@ -510,7 +510,9 @@ composer_set_no_change (EMsgComposer *composer, gboolean drop_undo)
if (drop_undo)
gtkhtml_editor_drop_undo (editor);
gtkhtml_editor_set_changed (editor, FALSE);
if (editor_changed)
gtkhtml_editor_set_changed (editor, FALSE);
e_composer_autosave_set_saved (composer, TRUE);
}
@ -524,7 +526,7 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i
if (!ok)
goto done;
composer_set_no_change (sdi->composer, FALSE);
composer_set_no_change (sdi->composer, FALSE, FALSE);
if ((emcs = sdi->emcs) == NULL)
emcs = emcs_new ();
@ -698,7 +700,7 @@ em_utils_compose_new_message (const char *fromuri)
if (composer == NULL)
return;
composer_set_no_change (E_MSG_COMPOSER (composer), TRUE);
composer_set_no_change (E_MSG_COMPOSER (composer), TRUE, TRUE);
gtk_widget_show (composer);
}
@ -729,7 +731,7 @@ em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri)
&& (account = mail_config_get_account_by_source_url(fromuri)))
e_composer_header_table_set_account_name (table, account->name);
composer_set_no_change (composer, TRUE);
composer_set_no_change (composer, TRUE, url == NULL);
gtk_widget_show ((GtkWidget *) composer);
gdk_window_raise (((GtkWidget *) composer)->window);
@ -771,7 +773,7 @@ em_utils_post_to_folder (CamelFolder *folder)
table, account->name);
}
composer_set_no_change (composer, TRUE);
composer_set_no_change (composer, TRUE, TRUE);
gtk_widget_show ((GtkWidget *) composer);
gdk_window_raise (((GtkWidget *) composer)->window);
@ -802,7 +804,7 @@ em_utils_post_to_url (const char *url)
g_list_free (list);
}
composer_set_no_change (composer, TRUE);
composer_set_no_change (composer, TRUE, TRUE);
gtk_widget_show ((GtkWidget *) composer);
}
@ -956,7 +958,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
emcs_set_drafts_info (emcs, drafts, uid);
}
composer_set_no_change (composer, TRUE);
composer_set_no_change (composer, TRUE, FALSE);
gtk_widget_show (GTK_WIDGET (composer));
}
@ -1087,7 +1089,7 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam
if (uids)
setup_forward_attached_callbacks (composer, folder, uids);
composer_set_no_change (composer, TRUE);
composer_set_no_change (composer, TRUE, FALSE);
gtk_widget_show (GTK_WIDGET (composer));
}
@ -1171,7 +1173,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
emcs_set_folder_info (emcs, folder, uids->pdata[i], CAMEL_MESSAGE_FORWARDED, CAMEL_MESSAGE_FORWARDED);
}
composer_set_no_change (composer, TRUE);
composer_set_no_change (composer, TRUE, FALSE);
gtk_widget_show (GTK_WIDGET (composer));
}
@ -1346,7 +1348,7 @@ em_utils_redirect_message (CamelMimeMessage *message)
gtk_widget_show (GTK_WIDGET (composer));
composer_set_no_change (composer, TRUE);
composer_set_no_change (composer, TRUE, FALSE);
}
static void
@ -2400,7 +2402,7 @@ em_utils_reply_to_message(CamelFolder *folder, const char *uid, CamelMimeMessage
emcs = g_object_get_data (G_OBJECT (composer), "emcs");
emcs_set_folder_info (emcs, folder, uid, flags, flags);
composer_set_no_change (composer, TRUE);
composer_set_no_change (composer, TRUE, FALSE);
gtk_widget_show (GTK_WIDGET (composer));
}
@ -2501,7 +2503,7 @@ post_reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *m
emcs = g_object_get_data (G_OBJECT (composer), "emcs");
emcs_set_folder_info (emcs, real_folder, real_uid, flags, flags);
composer_set_no_change (composer, TRUE);
composer_set_no_change (composer, TRUE, FALSE);
gtk_widget_show (GTK_WIDGET (composer));

17
plugins/external-editor/org-gnome-external-editor.xml
View File

@ -1,17 +0,0 @@
<Root>
<commands>
<cmd name="EPExtEditor" _label="Compose in _External Editor"
_tip="Compose messages using an external editor"
pixtype="pixmap"/>
</commands>
<menu>
<submenu name="File">
<placeholder name="FileOps">
<menuitem name="EPExtEditor" verb=""/>
</placeholder>
</submenu>
</menu>
</Root>

2
plugins/groupwise-features/Makefile.am
View File

@ -70,7 +70,7 @@ error_DATA = \
errordir = $(privdatadir)/errors
BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_i18n)
BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_DATA)
EXTRA_DIST = \
$(glade_DATA) \

1
po/POTFILES.in
View File

@ -324,7 +324,6 @@ plugins/exchange-operations/org-gnome-folder-subscription.xml
plugins/external-editor/apps-evolution-external-editor.schemas.in
plugins/external-editor/org-gnome-external-editor.eplug.xml
plugins/external-editor/org-gnome-external-editor.error.xml
plugins/external-editor/org-gnome-external-editor.xml
plugins/external-editor/external-editor.c
plugins/face/face.c
plugins/face/org-gnome-face.eplug.xml

7583
po/de.po
View File

File diff suppressed because it is too large Load Diff

74
po/es.po
View File

@ -17,7 +17,7 @@ msgstr ""
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=evolution\n"
"POT-Creation-Date: 2009-04-24 09:49+0000\n"
"PO-Revision-Date: 2009-04-24 20:29+0200\n"
"PO-Revision-Date: 2009-05-01 19:36+0200\n"
"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@ -1111,7 +1111,6 @@ msgid "<b>Searching</b>"
msgstr "<b>Búsqueda</b>"
#: ../addressbook/gui/component/ldap-config.glade.h:10
#| msgid "Using distinguished name (DN)"
msgid ""
"Anonymously\n"
"Using email address\n"
@ -1137,7 +1136,6 @@ msgid "Lo_gin:"
msgstr "_Inicio de sesión:"
#: ../addressbook/gui/component/ldap-config.glade.h:19
#| msgid "One"
msgid ""
"One\n"
"Sub"
@ -5772,7 +5770,6 @@ msgid "_Sound:"
msgstr "_Sonido:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
#| msgid "before"
msgid ""
"before\n"
"after"
@ -5785,10 +5782,6 @@ msgid "extra times every"
msgstr "veces adicionales cada"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
#| msgid ""
#| "Minutes\n"
#| "Hours\n"
#| "Days"
msgid ""
"minute(s)\n"
"hour(s)\n"
@ -5799,10 +5792,6 @@ msgstr ""
"día(s)"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
#| msgid ""
#| "Minutes\n"
#| "Hours\n"
#| "Days"
msgid ""
"minutes\n"
"hours\n"
@ -5813,7 +5802,6 @@ msgstr ""
"días"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
#| msgid "start of appointment"
msgid ""
"start of appointment\n"
"end of appointment"
@ -6784,6 +6772,9 @@ msgid ""
"1 hour before appointment\n"
"1 day before appointment"
msgstr ""
"15 minutos antes de la cita\n"
"1 hora antes de la cita\n"
"1 día antes de la cita"
#: ../calendar/gui/dialogs/event-page.glade.h:5
msgid "Attendee_s..."
@ -6831,7 +6822,6 @@ msgstr ""
"b"
#: ../calendar/gui/dialogs/event-page.glade.h:20
#| msgid "until"
msgid ""
"for\n"
"until"
@ -7068,6 +7058,10 @@ msgid ""
"month(s)\n"
"year(s)"
msgstr ""
"día(s)\n"
"semana(s)\n"
"mes(es)\n"
"año(s)"
#. TRANSLATORS: Entire string is for example:
#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
@ -7106,6 +7100,10 @@ msgid ""
"Low\n"
"Undefined"
msgstr ""
"Alta\n"
"Normal\n"
"Baja\n"
"Sin definir"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
msgid ""
@ -7114,6 +7112,10 @@ msgid ""
"Completed\n"
"Canceled"
msgstr ""
"Sin iniciar\n"
"En progreso\n"
"Completada\n"
"Cancelada"
#: ../calendar/gui/dialogs/task-details-page.glade.h:11
msgid "P_ercent complete:"
@ -8569,6 +8571,18 @@ msgid ""
"November\n"
"December"
msgstr ""
"Enero\n"
"Febrero\n"
"Marzo\n"
"Abril\n"
"Mayo\n"
"Junio\n"
"Julio\n"
"Agosto\n"
"Septiembre\n"
"Octubre\n"
"Noviembre\n"
"Diciembre"
#: ../calendar/gui/goto-dialog.glade.h:13
msgid "Select Date"
@ -11666,12 +11680,13 @@ msgstr ""
"fecha actual del momento del filtrado."
#: ../filter/filter.glade.h:12
#, fuzzy
#| msgid "in the future"
msgid ""
"ago\n"
"in the future"
msgstr "en el futuro"
msgstr ""
"hace\n"
"en el futuro"
#: ../filter/filter.glade.h:14
msgid ""
@ -11683,15 +11698,24 @@ msgid ""
"months\n"
"years"
msgstr ""
"segundos\n"
"minutos\n"
"horas\n"
"días\n"
"semanas\n"
"meses\n"
"años"
#: ../filter/filter.glade.h:21
#, fuzzy
#| msgid "a time relative to the current time"
msgid ""
"the current time\n"
"the time you specify\n"
"a time relative to the current time"
msgstr "una fecha relativa al momento actual"
msgstr ""
"el momento actual\n"
"el hora que especifique\n"
"una fecha relativa al momento actual"
#: ../filter/rule-editor.c:382
msgid "Add Rule"
@ -14491,13 +14515,15 @@ msgid "Always request rea_d receipt"
msgstr "Siempre _solicitar confirmación de lectura"
#: ../mail/mail-config.glade.h:45
#, fuzzy
#| msgid "Attachment Reminder"
msgid ""
"Attachment\n"
"Inline\n"
"Quoted"
msgstr "Recuerdo de adjuntos"
msgstr ""
"Adjunto\n"
"En línea\n"
"Citado"
#: ../mail/mail-config.glade.h:48
msgid ""
@ -14506,6 +14532,10 @@ msgid ""
"Quoted\n"
"Do not quote"
msgstr ""
"Adjunto\n"
"En línea (estilo Outlook)\n"
"Citado\n"
"No citar"
#: ../mail/mail-config.glade.h:52
msgid "Automatically insert _emoticon images"
@ -17197,6 +17227,10 @@ msgid ""
"Author (read, create)\n"
"Editor (read, create, edit)"
msgstr ""
"Ninguno\n"
"Revisor (sólo lectura)\n"
"Autor (leer, crear)\n"
"Editor (leer, crear, editar)"
#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
msgid "Permissions for"