[evolution: 363/363] Merge branch 'express2'
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution: 363/363] Merge branch 'express2'
- Date: Wed, 26 May 2010 17:35:49 +0000 (UTC)
commit c9ec8c3f4dce2b02c91268529977770364ef87fe
Merge: 6fec6bf 9653887
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed May 26 13:09:33 2010 -0400
Merge branch 'express2'
addressbook/gui/contact-editor/contact-editor.ui | 43 +-
addressbook/gui/contact-editor/e-contact-editor.c | 29 +
calendar/gui/alarm-notify/alarm-queue.c | 40 +-
calendar/gui/alarm-notify/alarm.c | 3 +-
calendar/gui/apps_evolution_calendar.schemas.in | 26 +-
calendar/gui/calendar-config-keys.h | 5 +-
calendar/gui/dialogs/cal-prefs-dialog.c | 42 +-
calendar/gui/dialogs/cal-prefs-dialog.h | 2 -
calendar/gui/dialogs/cal-prefs-dialog.ui | 175 +-
calendar/gui/dialogs/comp-editor-util.c | 20 +-
calendar/gui/dialogs/comp-editor-util.h | 2 +
calendar/gui/dialogs/comp-editor.c | 132 +-
calendar/gui/dialogs/comp-editor.h | 8 +-
calendar/gui/dialogs/copy-source-dialog.c | 14 +-
calendar/gui/dialogs/event-editor.c | 62 +-
calendar/gui/dialogs/event-page.c | 46 +-
calendar/gui/dialogs/event-page.h | 2 +
calendar/gui/dialogs/task-editor.c | 6 +-
calendar/gui/e-cal-model.c | 15 +
calendar/gui/e-cal-model.h | 3 +
calendar/gui/e-calendar-view.c | 2 +
calendar/gui/e-day-view.c | 11 +-
calendar/gui/e-meeting-time-sel.c | 4 +
calendar/gui/e-week-view.c | 14 +-
calendar/gui/gnome-cal.c | 2 +-
capplet/settings/mail-account-view.c | 500 ++-
capplet/settings/mail-account-view.h | 1 +
capplet/settings/mail-guess-servers.c | 22 +-
composer/e-composer-actions.c | 8 -
composer/e-composer-actions.h | 2 -
composer/e-composer-from-header.c | 10 -
composer/e-composer-from-header.h | 3 -
composer/e-composer-header-table.c | 134 +-
composer/e-composer-header.c | 107 +-
composer/e-composer-header.h | 3 -
composer/e-composer-name-header.c | 32 +-
composer/e-composer-name-header.h | 8 -
composer/e-composer-private.c | 23 +-
composer/e-composer-text-header.c | 22 +-
composer/e-composer-text-header.h | 4 +-
composer/e-msg-composer.c | 41 +-
composer/e-msg-composer.h | 3 -
composer/evolution-composer.ui | 1 -
configure.ac | 21 +-
doc/reference/shell/tmpl/e-shell.sgml | 10 +
e-util/e-alert-dialog.c | 3 +-
e-util/e-config.c | 92 +-
e-util/e-dialog-utils.c | 4 +
help/C/evolution.xml | 4 +-
mail/e-mail-backend.c | 6 +
mail/e-mail-reader-utils.c | 6 +-
mail/e-mail-reader.c | 14 +-
mail/em-account-editor.c | 4 +-
mail/em-composer-utils.c | 49 +-
mail/em-composer-utils.h | 1 -
mail/em-folder-tree-model.c | 31 +
mail/em-folder-tree.c | 2 +
mail/em-inline-filter.c | 2 +-
mail/evolution-mail.schemas.in | 15 -
mail/mail-config.ui | 8 +-
modules/Makefile.am | 8 +-
modules/calendar/e-cal-config-view.c | 2 +-
modules/calendar/e-cal-shell-content.c | 146 +-
modules/calendar/e-cal-shell-settings.c | 8 +-
modules/calendar/e-cal-shell-sidebar.c | 37 +-
modules/calendar/e-cal-shell-view-actions.c | 19 +
modules/calendar/e-cal-shell-view-actions.h | 2 +
modules/calendar/e-cal-shell-view-private.c | 96 +
modules/calendar/e-cal-shell-view-private.h | 4 +
modules/calendar/e-cal-shell-view.c | 22 +-
modules/connman/evolution-connman.c | 5 +
modules/mail/e-mail-shell-content.c | 2 +-
modules/mail/e-mail-shell-sidebar.c | 26 +-
modules/mail/e-mail-shell-view-actions.c | 2 +-
modules/mail/e-mail-shell-view-actions.h | 4 +-
modules/mail/em-composer-prefs.c | 9 +
modules/mail/em-mailer-prefs.c | 10 +
plugins/bogo-junk-plugin/bf-junk-filter.c | 12 +-
plugins/sa-junk-plugin/em-junk-filter.c | 12 +-
plugins/startup-wizard/startup-wizard.c | 11 +-
po/bn.po | 72 +-
po/es.po | 73 +-
po/ko.po | 917 ++--
po/pt.po | 18 +-
po/ru.po | 4497 ++++++++--------
po/sv.po | 732 ++--
po/zh_CN.po | 5949 ++++++++-------------
shell/e-shell-meego.c | 97 +-
shell/e-shell-utils.c | 56 +
shell/e-shell-utils.h | 5 +
shell/e-shell-view.c | 22 +
shell/e-shell-window-actions.c | 37 +-
shell/e-shell-window-private.c | 4 +-
shell/e-shell-window-private.h | 1 +
shell/e-shell-window.c | 60 +-
shell/e-shell-window.h | 1 +
shell/e-shell.c | 161 +
shell/e-shell.h | 8 +
shell/main.c | 12 +
ui/evolution-calendars.ui | 7 +-
ui/evolution-mail-reader.ui | 4 +-
ui/evolution-mail.ui | 2 +-
ui/evolution-shell.ui | 1 +
widgets/misc/e-account-combo-box.c | 22 +
widgets/misc/e-account-combo-box.h | 2 +
widgets/misc/e-preferences-window.c | 90 +-
widgets/misc/e-preferences-window.h | 2 +
widgets/misc/e-web-view.c | 10 +
108 files changed, 7423 insertions(+), 7780 deletions(-)
---
diff --cc calendar/gui/dialogs/cal-prefs-dialog.c
index 559d5f8,f6ba176..914c26c
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@@ -783,13 -779,39 +779,39 @@@ calendar_prefs_dialog_construct (Calend
/* date/time format */
table = e_builder_get_widget (prefs->builder, "datetime_format_table");
- e_datetime_format_add_setup_widget (table, 0, "calendar", "table", DTFormatKindDateTime, _("Time and date:"));
- e_datetime_format_add_setup_widget (table, 1, "calendar", "table", DTFormatKindDate, _("Date only:"));
+ e_datetime_format_add_setup_widget (table, 0, "calendar", "table", DTFormatKindDateTime, _("Ti_me and date:"));
+ e_datetime_format_add_setup_widget (table, 1, "calendar", "table", DTFormatKindDate, _("_Date only:"));
+ /* Hide senseless preferences when running in Express mode */
+ e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
+ "label_second_zone",
+ "hbox_second_zone",
+ "timezone",
+ "timezone_label",
+ "hbox_use_system_timezone",
+ "hbox_time_divisions",
+ "show_end_times",
+ "month_scroll_by_week",
+ NULL);
+
+ /* HACK: GTK+ 2.18 and 2.20 has a GtkTable which includes row/column spacing even for empty rows/columns.
+ * When Evo runs in Express mode, we hide all the rows in the Time section of the calendar's General
+ * preferences page. However, due to that behavior in GTK+, we get a lot of extra spacing in that
+ * section. Since we know that in Express mode we only leave a single row visible, we'll make the
+ * table's row spacing equal to 0 in that case.
+ */
+ if (e_shell_get_express_mode (shell)) {
+ widget = e_builder_get_widget (prefs->builder, "time");
+ gtk_table_set_row_spacings (GTK_TABLE (widget), 0);
+ }
+
+ /* Hook up and add the toplevel widget */
+
+ target = e_cal_config_target_new_prefs (ec, prefs->gconf);
+ e_config_set_target ((EConfig *)ec, (EConfigTarget *) target);
+ toplevel = e_config_create_widget ((EConfig *)ec);
+ gtk_container_add (GTK_CONTAINER (prefs), toplevel);
+
show_config (prefs);
/* FIXME: weakref? */
setup_changes (prefs);
diff --cc calendar/gui/dialogs/event-editor.c
index 90fc910,7184a63..262751f
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@@ -277,9 -282,10 +286,11 @@@ event_editor_constructor (GType type
CompEditorPage *page;
EventEditorPrivate *priv;
GtkActionGroup *action_group;
+ GtkWidget *content_area;
ECal *client;
gboolean is_meeting;
+ GtkWidget *alarm_page;
+ GtkWidget *attendee_page;
/* Chain up to parent's constructor() method. */
object = G_OBJECT_CLASS (event_editor_parent_class)->constructor (
@@@ -311,16 -317,36 +322,39 @@@
priv->recur_window, "delete-event",
G_CALLBACK(gtk_widget_hide_on_delete), NULL);
+ content_area =
+ gtk_dialog_get_content_area (GTK_DIALOG (priv->recur_window));
+
priv->recur_page = recurrence_page_new (editor);
page = COMP_EDITOR_PAGE (priv->recur_page);
- gtk_container_add (
- GTK_CONTAINER (content_area),
- comp_editor_page_get_widget (page));
- gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window)));
- comp_editor_append_page (editor, page, NULL, FALSE);
+ if (!e_shell_get_express_mode(e_shell_get_default())) {
+ gtk_container_add (
+ GTK_CONTAINER ((GTK_DIALOG (priv->recur_window)->vbox)),
+ comp_editor_page_get_widget (page));
+ gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window)));
+ comp_editor_append_page (editor, page, NULL, FALSE);
+ } else {
+ comp_editor_append_page (editor, page, _("_Recurrence"), TRUE);
+ }
+
+ if (e_shell_get_express_mode(e_shell_get_default())) {
+ ENameSelector *name_selector;
+
+ priv->sched_page = schedule_page_new (priv->model, editor);
+ page = COMP_EDITOR_PAGE (priv->sched_page);
+
+ name_selector = event_page_get_name_selector (priv->event_page);
+ schedule_page_set_name_selector (priv->sched_page, name_selector);
+
+ comp_editor_append_page (editor, page, _("_Free/Busy"), TRUE);
+ schedule_page_update_free_busy (priv->sched_page);
+
+ /* Alarm page */
+ alarm_page = event_page_get_alarm_page (priv->event_page);
+ comp_editor_append_widget (editor, alarm_page, _("_Alarm"), TRUE);
+ g_object_unref(alarm_page);
+
+ }
if (is_meeting) {
diff --cc capplet/settings/mail-account-view.c
index 6e2299b,cd47ae5..5440141
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@@ -179,12 -460,10 +461,12 @@@ create_review (MailAccountView *view
gtk_table_set_row_spacings ((GtkTable *)table, 4);
label = gtk_label_new (NULL);
- gtk_label_set_markup ((GtkLabel *)label, _("<span size=\"large\" weight=\"bold\">Personal details:</span>"));
+ buff = g_strconcat ("<span size=\"large\" weight=\"bold\">", _("Personal details:"), "</span>", NULL);
+ gtk_label_set_markup ((GtkLabel *)label, buff);
+ g_free (buff);
gtk_widget_show (label);
PACK_BOXF(label)
- gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
label = gtk_label_new (_("Name:"));
gtk_widget_show (label);
diff --cc configure.ac
index b3d6e4c,5aea6ea..f9938df
--- a/configure.ac
+++ b/configure.ac
@@@ -1175,7 -1176,6 +1175,25 @@@ if test "$enable_sens" = yes; the
AC_SUBST(HAVE_SENS)
AC_SUBST(SENS_LIBS)
fi
-
++AC_MSG_CHECKING([if Windows SENS support is enabled])
++AC_MSG_RESULT([$enable_sens])
++if test "$enable_sens" = yes; then
++ SENS_LIBS="-lole32 -loleaut32 -luuid -lrpcrt4"
++ AC_CHECK_HEADER([eventsys.h],
++ [AC_DEFINE([HAVE_EVENTSYS_H], 1, [Have <eventsys.h>])],,
++ [[ #if HAVE_EVENTSYS_H
++ #include <eventsys.h>
++ #endif
++ ]])
++ AC_CHECK_HEADER([sensevts.h],
++ [AC_DEFINE([HAVE_SENSEVTS_H], 1, [Have <sensevts.h>])],,
++ [[ #if HAVE_SENSEVTS_H
++ #include <sensevts.h>
++ #endif
++ ]])
++ AC_SUBST(HAVE_SENS)
++ AC_SUBST(SENS_LIBS)
++fi
AM_CONDITIONAL([ENABLE_WINDOWS_SENS], [test "$enable_sens" = yes])
dnl ******************************
diff --cc mail/e-mail-backend.c
index 67c732d,bac1bee..7f62c46
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@@ -22,11 -22,13 +22,12 @@@
*
*/
+ #include <string.h>
#include "e-mail-backend.h"
-#include <camel/camel.h>
-
#include "e-util/e-account-utils.h"
#include "e-util/e-alert-dialog.h"
+#include "e-util/e-binding.h"
#include "misc/e-account-combo-box.h"
diff --cc mail/e-mail-reader.c
index ac36600,20448cc..4b02d69
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@@ -2303,11 -2300,13 +2303,13 @@@ mail_reader_update_actions (EMailReade
gtk_action_set_sensitive (action, sensitive);
action_name = "mail-mark-junk";
- sensitive = selection_has_not_junk_messages;
+ sensitive =
+ selection_has_not_junk_messages &&
+ !(state & E_MAIL_READER_FOLDER_IS_JUNK);
action = e_mail_reader_get_action (reader, action_name);
- gtk_action_set_sensitive (action, sensitive);
+ gtk_action_set_sensitive (action, sensitive && !(state & E_MAIL_READER_FOLDER_IS_JUNK));
- action_name = "mail-mark-notjunk";
+ action_name = "mail-mark-not-junk";
sensitive = selection_has_junk_messages;
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
diff --cc mail/em-composer-utils.c
index 82984d6,25e1761..514885c
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@@ -806,8 -794,8 +784,7 @@@ em_utils_compose_new_message_with_mailt
composer_set_no_change (composer, TRUE, url == NULL);
- if (!e_msg_composer_get_lite ())
- gtk_window_present (GTK_WINDOW (composer));
- gtk_widget_show ((GtkWidget *) composer);
- gdk_window_raise (((GtkWidget *) composer)->window);
++ gtk_window_present (GTK_WINDOW (composer));
return composer;
}
@@@ -984,10 -970,9 +961,9 @@@ edit_message (CamelMimeMessage *message
emcs_set_drafts_info (emcs, drafts, uid);
}
- composer_set_no_change (composer, TRUE, FALSE);
+ composer_set_no_change (composer, TRUE, TRUE);
- if (!e_msg_composer_get_lite())
- gtk_widget_show (GTK_WIDGET (composer));
+ gtk_widget_show (GTK_WIDGET (composer));
return (GtkWidget *)composer;
}
@@@ -1218,10 -1202,10 +1193,10 @@@ forward_non_attached (CamelFolder *fold
text = em_utils_message_to_html (message, _("-------- Forwarded Message --------"), flags, &len, NULL, NULL, &validity_found);
if (text) {
- composer = create_new_composer (subject, fromuri, FALSE);
+ composer = create_new_composer (subject, fromuri);
if (composer) {
- if (CAMEL_IS_MULTIPART(camel_medium_get_content_object((CamelMedium *)message)))
+ if (CAMEL_IS_MULTIPART(camel_medium_get_content ((CamelMedium *)message)))
e_msg_composer_add_message_attachments(composer, message, FALSE);
e_msg_composer_set_body_text (composer, text, len);
diff --cc mail/em-folder-tree-model.c
index e7262db,222c1ce..37552bb
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@@ -47,7 -52,10 +48,8 @@@
#include "em-folder-utils.h"
#include "em-event.h"
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-store.h>
-
#include "e-mail-local.h"
++#include "e-mail-store.h"
#include "shell/e-shell.h"
#define d(x)
diff --cc mail/em-folder-tree.c
index cb1e61b,371d764..219e355
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@@ -1153,10 -1162,10 +1153,12 @@@ folder_tree_new (EMFolderTree *folder_t
/* FIXME Gross hack */
tree = GTK_WIDGET (folder_tree);
- GTK_WIDGET_SET_FLAGS(tree, GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (tree, TRUE);
+
+ folder_tree->priv->selectable = NULL;
+ folder_tree->priv->selectable = NULL;
+
column = gtk_tree_view_column_new ();
gtk_tree_view_append_column ((GtkTreeView *) tree, column);
diff --cc modules/calendar/e-cal-shell-view-actions.c
index d56107a,9510f06..1981275
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@@ -1228,27 -1196,26 +1228,46 @@@ action_event_schedule_cb (GtkAction *ac
edit_event_as (cal_shell_view, TRUE);
}
+ static void
+ quit_calendar_cb (GtkAction *action,
+ ECalShellView *cal_shell_view)
+ {
+ EShellView *shell_view;
+ EShellWindow *shell_window;
+ GdkEvent *event;
+
+ shell_view = E_SHELL_VIEW (cal_shell_view);
+ shell_window = e_shell_view_get_shell_window (shell_view);
+
+ /* Synthesize a delete_event on this window. */
+ event = gdk_event_new (GDK_DELETE);
+ event->any.window = g_object_ref (((GtkWidget *) shell_window)->window);
+ event->any.send_event = TRUE;
+ gtk_main_do_event (event);
+ gdk_event_free (event);
+ }
+
static void
+quit_calendar_cb (GtkAction *action,
+ ECalShellView *cal_shell_view)
+{
+ EShellView *shell_view;
+ EShellWindow *shell_window;
+ GdkEvent *event;
+
+ shell_view = E_SHELL_VIEW (cal_shell_view);
+ shell_window = e_shell_view_get_shell_window (shell_view);
+
+ /* Synthesize a delete_event on this window. */
+ event = gdk_event_new (GDK_DELETE);
+ event->any.window = g_object_ref (gtk_widget_get_window (GTK_WIDGET (shell_window)));
+ event->any.send_event = TRUE;
+ gtk_main_do_event (event);
+ gdk_event_free (event);
+
+}
+
+static void
action_event_schedule_appointment_cb (GtkAction *action,
ECalShellView *cal_shell_view)
{
diff --cc modules/calendar/e-cal-shell-view-private.c
index a112c17,43b8ae6..11b6ec2
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@@ -598,11 -684,12 +684,16 @@@ voi
e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
{
ECalShellViewPrivate *priv = cal_shell_view->priv;
+ gint i;
+
+ /* Calling calendar's save state from here, because it is too late in its dispose */
+ if (priv->cal_shell_content)
+ e_cal_shell_content_save_state (priv->cal_shell_content);
+ /* Calling calendar's save state from here, because it is too late in its dispose */
+ if (priv->cal_shell_content)
+ e_cal_shell_content_save_state (priv->cal_shell_content);
+
DISPOSE (priv->cal_shell_backend);
DISPOSE (priv->cal_shell_content);
DISPOSE (priv->cal_shell_sidebar);
diff --cc modules/mail/em-composer-prefs.c
index c817653,49f2fda..7c0f39e
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@@ -36,7 -36,10 +36,8 @@@
#include "em-composer-prefs.h"
#include "composer/e-msg-composer.h"
+ #include "shell/e-shell-utils.h"
-#include <camel/camel-iconv.h>
-
#include <glib/gi18n.h>
#include <glib/gstdio.h>
diff --cc plugins/bogo-junk-plugin/bf-junk-filter.c
index fa917e7,4190eeb..6cc2e80
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@@ -45,7 -45,13 +45,8 @@@
#include <e-util/e-plugin.h>
#include "mail/em-config.h"
#include <mail/em-junk.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-debug.h>
#include <gconf/gconf-client.h>
+ #include "shell/e-shell.h"
#ifndef BOGOFILTER_BINARY
#define BOGOFILTER_BINARY "/usr/bin/bogofilter"
@@@ -383,10 -389,9 +384,11 @@@ convert_unicode_cb (GtkWidget *widget,
GtkWidget *
org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
{
+ EShell *shell;
GtkWidget *check;
- guint i = ((GtkTable *)data->parent)->nrows;
+ guint n_rows;
+
+ g_object_get (data->parent, "n-rows", &n_rows, NULL);
if (data->old)
return data->old;
@@@ -395,10 -400,14 +397,16 @@@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode);
g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode");
- gtk_table_attach((GtkTable *)data->parent, check, 0, 1, i, i+1, 0, 0, 0, 0);
+ gtk_table_attach (
+ GTK_TABLE (data->parent), check,
+ 0, 1, n_rows, n_rows+1, 0, 0, 0, 0);
- gtk_widget_show (check);
- return (GtkWidget *)check;
+
+ shell = e_shell_get_default ();
+ if (e_shell_get_express_mode (shell))
+ gtk_widget_hide (check);
+ else
+ gtk_widget_show (check);
+
+ return check;
}
diff --cc plugins/sa-junk-plugin/em-junk-filter.c
index f52cd8c,c8c53c6..537831a
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@@ -39,8 -46,8 +39,9 @@@
#include <e-util/e-mktemp.h>
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include "mail/em-config.h"
+ #include "shell/e-shell.h"
#include <gconf/gconf-client.h>
@@@ -920,11 -927,10 +921,12 @@@ use_remote_tests_cb (GtkWidget *widget
GtkWidget *
org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
{
+ EShell *shell;
GtkWidget *check, *vbox, *label;
gchar *text = g_strdup_printf (" <small>%s</small>", _("This will make SpamAssassin more reliable, but slower"));
- guint i = ((GtkTable *)data->parent)->nrows;
+ guint n_rows;
+
+ g_object_get (data->parent, "n-rows", &n_rows, NULL);
if (data->old)
return data->old;
@@@ -939,10 -945,14 +941,16 @@@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only);
g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only");
- gtk_table_attach((GtkTable *)data->parent, vbox, 0, 1, i, i+1, 0, 0, 0, 0);
+ gtk_table_attach (
+ GTK_TABLE (data->parent), vbox,
+ 0, 1, n_rows, n_rows+1, 0, 0, 0, 0);
- gtk_widget_show_all (vbox);
- return (GtkWidget *)vbox;
+
+ shell = e_shell_get_default ();
+ if (e_shell_get_express_mode (shell))
+ gtk_widget_hide (vbox);
+ else
+ gtk_widget_show_all (vbox);
+
+ return vbox;
}
diff --cc po/es.po
index cc813da,f4465e7..71cc7d4
--- a/po/es.po
+++ b/po/es.po
@@@ -17,8 -16,8 +17,8 @@@ msgstr "
"Project-Id-Version: evolution.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=evolution\n"
- "POT-Creation-Date: 2010-05-26 13:29+0000\n"
- "PO-Revision-Date: 2010-05-26 17:52+0200\n"
-"POT-Creation-Date: 2010-03-17 15:37+0000\n"
-"PO-Revision-Date: 2010-03-17 17:30+0100\n"
++"POT-Creation-Date: 2010-05-25 07:44+0000\n"
++"PO-Revision-Date: 2010-05-25 18:07+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"
@@@ -3995,10 -4195,6 +3995,11 @@@ msgstr "Consultar información de dispo
msgid "Appoint_ment"
msgstr "_Cita"
+#: ../calendar/gui/dialogs/event-editor.c:528
++#| msgid "Print this message"
+msgid "Print this event"
+msgstr "Imprime este acontecimiento"
+
#: ../calendar/gui/dialogs/event-page.c:751
msgid "Event cannot be edited, because the selected calendar is read only"
msgstr "El acontecimiento no se puede editar porque es de sólo lectura"
@@@ -4189,10 -4385,6 +4190,11 @@@ msgstr "hasta
msgid "Memo"
msgstr "Nota"
+#: ../calendar/gui/dialogs/memo-editor.c:156
++#| msgid "Print the list of memos"
+msgid "Print this memo"
+msgstr "Imprimir esta nota"
+
#: ../calendar/gui/dialogs/memo-page.c:350
msgid "Memo cannot be edited, because the selected memo list is read only"
msgstr "La nota no se puede editar porque es de sólo lectura"
@@@ -4576,10 -4763,6 +4578,11 @@@ msgstr "_Tarea
msgid "Task Details"
msgstr "Detalles"
+#: ../calendar/gui/dialogs/task-editor.c:368
++#| msgid "Print the list of tasks"
+msgid "Print this task"
+msgstr "Imprimir esta tarea"
+
#: ../calendar/gui/dialogs/task-page.c:336
msgid "Task cannot be edited, because the selected task list is read only"
msgstr "La tarea no se puede editar porque es de sólo lectura"
@@@ -4781,16 -4968,18 +4784,18 @@@ msgctxt "cal-task-status
msgid "None"
msgstr "Ninguna"
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
+ #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "SÃ"
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
+ #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "No"
@@@ -6374,151 -6578,6 +6379,176 @@@ msgstr "Acontecimientos de calendario
msgid "Evolution Calendar intelligent importer"
msgstr "Importador inteligente del calendario de Evolution"
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1237
++#| msgctxt "New"
++#| msgid "M_eeting"
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Reunión"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1237
++#| msgid "Events"
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Acontecimiento"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1238
++#| msgid "Task"
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Tarea"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1239
++#| msgid "Memo"
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Nota"
+
+#: ../calendar/importers/icalendar-importer.c:941
++#| msgid "It has recurrences."
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "tiene repeticiones"
+
+#: ../calendar/importers/icalendar-importer.c:946
++#| msgid "This and Prior Instances"
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "es una instancia"
+
+#: ../calendar/importers/icalendar-importer.c:951
++#| msgid "It has alarms."
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "tiene alertas"
+
+#: ../calendar/importers/icalendar-importer.c:956
++#| msgid "%s attachment"
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "tiene adjuntos"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
++#| msgid "Public"
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Pública"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
++#| msgid "Private"
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Privado"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
++#| msgid "Confidential"
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
++#| msgid "Classification"
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Clasificación"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1278
++#| msgid "Summary"
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Resumen"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
++#| msgid "Location"
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Lugar"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1274
++#| msgid "Start"
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Empieza"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
++#| msgid "Due"
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Vence"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
++#| msgid "End"
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Termina"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
++#| msgid "Categories"
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "CategorÃas"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
++#| msgid "Completed"
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Completada"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
++#| msgid "URL"
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
++#| msgid "Organizer"
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organizador"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
++#| msgid "Attendees"
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/importers/icalendar-importer.c:1114
++#| msgid "Description"
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Descripción"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1270
++#| msgid "Type"
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Tipo"
+
#.
#. *
#. * This program is free software; you can redistribute it and/or
@@@ -9080,7 -9175,7 +9110,7 @@@ msgstr "Asunto
msgid "Mailer"
msgstr "Transporte"
- #: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1218
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
++#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
msgid "-------- Forwarded Message --------"
msgstr "--------- Mensaje reenviado --------"
@@@ -10343,25 -10522,25 +10373,25 @@@ msgid "Evolution Account Assistant
msgstr "Asistente de cuentas de Evolution"
#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
- #: ../mail/em-composer-utils.c:1568
-#: ../mail/em-composer-utils.c:1578
++#: ../mail/em-composer-utils.c:1570
#, c-format
msgid "Your message to %s about \"%s\" on %s has been read."
msgstr "Su mensaje para %s acerca de «%s» se ha leÃdo el «%s»"
#. Translators: %s is the subject of the email message
- #: ../mail/em-composer-utils.c:1616
-#: ../mail/em-composer-utils.c:1626
++#: ../mail/em-composer-utils.c:1618
#, c-format
msgid "Delivery Notification for: \"%s\""
msgstr "Notificación de entrega para: «%s»"
- #: ../mail/em-composer-utils.c:1945
-#: ../mail/em-composer-utils.c:1950
++#: ../mail/em-composer-utils.c:1947
msgid "an unknown sender"
msgstr "un remitente desconocido"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
- #: ../mail/em-composer-utils.c:1992
-#: ../mail/em-composer-utils.c:1997
++#: ../mail/em-composer-utils.c:1994
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@@ -10369,15 -10548,15 +10399,15 @@@ msgstr "
"El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} escribió:"
- #: ../mail/em-composer-utils.c:2136
-#: ../mail/em-composer-utils.c:2141
++#: ../mail/em-composer-utils.c:2138
msgid "-----Original Message-----"
msgstr "-----Mensaje original-----"
- #: ../mail/em-composer-utils.c:2317
-#: ../mail/em-composer-utils.c:2322
++#: ../mail/em-composer-utils.c:2319
msgid "Posting destination"
msgstr "Destino de publicación"
- #: ../mail/em-composer-utils.c:2318
-#: ../mail/em-composer-utils.c:2323
++#: ../mail/em-composer-utils.c:2320
msgid "Choose folders to post the message to."
msgstr "Elija las carpetas en las que publicar el mensaje."
@@@ -12171,20 -12321,8 +12201,22 @@@ msgstr "Seleccionar carpeta
msgid "Select folder to import into"
msgstr "Seleccione la carpeta en la que importar"
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
++#| msgid "Subject"
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Asunto"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
++#| msgid "From"
+msgctxt "mboxImp"
+msgid "From"
+msgstr "De"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
msgid "Berkeley Mailbox (mbox)"
msgstr "Buzón Berkeley (mbox)"
@@@ -12681,11 -12784,7 +12713,12 @@@ msgstr "Configuración del servidor
msgid "Server _Type:"
msgstr "_Tipo de servidor:"
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:120
++#| msgid "Sig_ning certificate:"
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo de _firma:"
+
+#: ../mail/mail-config.ui.h:121
msgid "Sig_natures"
msgstr "_Firmas"
@@@ -12701,11 -12800,7 +12734,12 @@@ msgstr "_Firma:
msgid "Signatures"
msgstr "Firmas"
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:125
++#| msgid "Sig_ning certificate:"
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo de firma:"
+
+#: ../mail/mail-config.ui.h:126
msgid "Spell Checking"
msgstr "OrtografÃa"
@@@ -13844,12 -13944,7 +13878,15 @@@ msgstr "
"Esto marcará todos los mensajes como leÃdos en la carpeta seleccionada y sus "
"subcarpetas."
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
++#| msgid ""
++#| "This will mark all messages as read in the selected folder and its "
++#| "subfolders."
+msgid "This will mark all messages as read in the selected folder."
+msgstr ""
+"Esto marcará todos los mensajes como leÃdos en la carpeta seleccionada."
+
+#: ../mail/mail.error.xml.h:111
msgid "Unable to connect to the GroupWise server."
msgstr "No es posible conectarse con el servidor GroupWise."
@@@ -15941,21 -16301,6 +15978,22 @@@ msgstr "Cabecera de _fecha:
msgid "Show _original header value"
msgstr "Mostrar el valor _original de la cabecera"
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Comprobar si Evolution es la aplicación de correo predeterminada"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Cada vez que Evolution se inicie, comprobar si es o no el cliente de correo "
+"predeterminado."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
++#| msgid "Do you want to make Evolution your default e-mail client?"
+msgid "Do you want to make Evolution your default email client?"
+msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?"
+
#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
msgid "Hello Python"
msgstr "Hello Python"
@@@ -20568,19 -21221,7 +20605,22 @@@ msgstr "PKCS #1 MD5 con cifrado RSA
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "PKCS #1 SHA-1 con cifrado RSA"
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
++#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:642
++#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:645
++#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:672
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 cifrado RSA"
@@@ -21157,25 -21882,8 +21197,26 @@@ msgstr "
"configuración que se pueda importar. Si quiere intentarlo de nuevo, pulse el "
"botón «Atrás»."
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#: ../widgets/misc/e-import-assistant.c:874
++#| msgid "Preview the message to be printed"
+msgid "Preview data to be imported"
+msgstr "Vista previa de los datos para importar"
+
+#: ../widgets/misc/e-import-assistant.c:879
+#: ../widgets/misc/e-import-assistant.c:888
+#: ../widgets/misc/e-import-assistant.c:1265
+#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1348
+msgid "Import Data"
+msgstr "Importar datos"
+
+#. multiple importers found, be able to choose from them
+#: ../widgets/misc/e-import-assistant.c:884
+msgid "Select what type of file you want to import from the list."
+msgstr "Seleccionar qué tipo de archivo quiere importar de la lista"
+
+#: ../widgets/misc/e-import-assistant.c:1256
+#: ../widgets/misc/e-import-assistant.c:1291
msgid "Evolution Import Assistant"
msgstr "Asistente de importación de Evolution"
diff --cc shell/main.c
index f42f064,c41071a..4824cfc
--- a/shell/main.c
+++ b/shell/main.c
@@@ -49,8 -49,11 +49,9 @@@
#include "e-shell.h"
#include "e-shell-migrate.h"
+ #include "e-shell-meego.h"
-#include "e-config-upgrade.h"
#include "es-event.h"
-#include "e-util/e-bconf-map.h"
#include "e-util/e-dialog-utils.h"
#include "e-util/e-import.h"
#include "e-util/e-plugin.h"
diff --cc ui/evolution-shell.ui
index 5e249da,c161899..c051668
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@@ -94,4 -94,6 +94,5 @@@
<placeholder name='toolbar-actions'/>
</toolbar>
<toolbar name='search-toolbar'/>
+ <toolbar name='close-toolbar'/>
-
</ui>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
