[evolution/gtk3: 52/53] Synchronize with Evolution 2.91.5.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gtk3: 52/53] Synchronize with Evolution 2.91.5.
- Date: Sun, 9 Jan 2011 15:32:59 +0000 (UTC)
commit 7bbfb6a47717052fd33be412c6ec6ae31da3fcf4
Merge: 4f05d0b 7a6b767
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jan 9 10:12:49 2011 -0500
Synchronize with Evolution 2.91.5.
Conflicts:
capplet/anjal-settings-main.c
configure.ac
widgets/table/e-table.c
widgets/table/e-tree.c
NEWS | 99 +
calendar/gui/print.c | 10 +-
capplet/anjal-settings-main.c | 2 +-
composer/e-composer-actions.c | 16 +
composer/e-composer-actions.h | 2 +
composer/e-composer-private.c | 81 +-
composer/e-composer-private.h | 5 +-
composer/e-msg-composer.c | 32 +
composer/evolution-composer.ui | 6 +
configure.ac | 2 +-
doc/reference/shell/eshell-sections.txt | 3 +-
doc/reference/shell/tmpl/e-shell.sgml | 22 +-
doc/reference/shell/tmpl/eshell-unused.sgml | 23 +
doc/reference/shell/tmpl/shell-actions.sgml | 8 -
e-util/e-alert.c | 9 +-
help/C/evolution.xml | 26 +-
help/C/figures/folder_size_mapi.png | Bin 17095 -> 0 bytes
help/C/figures/folder_size_preference.png | Bin 18333 -> 0 bytes
help/es/es.po | 6174 ++--
mail/e-mail-backend.c | 21 -
mail/e-mail-migrate.c | 158 +-
mail/e-mail-store.c | 4 +-
mail/em-account-editor.c | 4 +-
mail/em-composer-utils.c | 5 +-
mail/evolution-mail.schemas.in | 28 +-
mail/mail-config.ui | 15 +
mail/mail-ops.c | 2 +-
mail/mail.error.xml | 11 +-
modules/mail/e-mail-shell-backend.c | 6 +
modules/mail/e-mail-shell-settings.c | 8 +
modules/mail/e-mail-shell-view-actions.c | 4 +-
modules/mail/em-composer-prefs.c | 7 +
modules/offline-alert/evolution-offline-alert.c | 16 +-
plugins/backup-restore/backup-restore.c | 12 +-
plugins/templates/templates.c | 13 +-
po/da.po |10050 +++---
po/es.po | 1700 +-
po/et.po | 586 +-
po/gl.po | 839 +-
po/pa.po | 845 +-
po/sv.po | 9328 +++---
po/ug.po |41292 ++++++++++++-----------
po/vi.po |32829 ++++++++++--------
po/zh_CN.po | 8171 +++---
shell/e-shell.c | 66 +
shell/e-shell.h | 3 +
widgets/misc/Makefile.am | 2 +
widgets/misc/e-picture-gallery.c | 419 +
widgets/misc/e-picture-gallery.h | 67 +
widgets/table/e-table-field-chooser-item.c | 2 +-
widgets/table/e-table-header-item.c | 4 +-
51 files changed, 59144 insertions(+), 53893 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]