[evolution/webkit-composer: 72/72] Merge branch 'master' into webkit-composer

[Dan VrÃtil <dvratil src gnome org>]

commit 63ba8d63715408414e765277b32c881f91372f47
Merge: 464eb5c 5b25474
Author: Dan VrÃtil <dvratil redhat com>
Date:   Tue Sep 11 10:19:18 2012 +0200

    Merge branch 'master' into webkit-composer
    
    Conflicts:
    	composer/e-composer-private.c

 COPYING                                            |   22 +-
 Makefile.am                                        |    4 -
 NEWS                                               |   42 +
 calendar/alarm-notify/alarm-notify.c               |   27 +-
 calendar/alarm-notify/config-data.c                |   15 +
 calendar/alarm-notify/notify-main.c                |   14 +
 calendar/gui/dialogs/comp-editor.c                 |   19 +-
 calendar/gui/dialogs/recurrence-page.c             |    6 +-
 calendar/gui/gnome-cal.c                           |   16 +-
 calendar/gui/print.c                               |  203 +-
 composer/e-composer-from-header.c                  |   39 +-
 composer/e-composer-private.c                      |    3 +-
 composer/e-msg-composer.c                          |   24 +-
 configure.ac                                       |   29 +-
 doc/Camel-Classes                                  |   65 -
 doc/Design                                         |  201 -
 doc/Keybindings                                    |   13 -
 doc/NAMESPACE                                      |   65 -
 e-util/e-util.c                                    |   16 +-
 evolution-shell.pc.in                              |    2 +-
 filter/e-filter-color.c                            |    6 +-
 filter/e-filter-datespec.c                         |   13 +-
 filter/e-filter-option.c                           |    8 +-
 filter/e-filter-rule.c                             |   16 +-
 filter/e-rule-context.c                            |    9 +-
 filter/e-rule-editor.c                             |   95 +-
 help/el/el.po                                      |21316 ++++++++++----------
 help/es/es.po                                      |  367 +-
 libemail-engine/e-mail-folder-utils.c              |    7 +-
 libemail-engine/e-mail-utils.c                     |   38 +-
 libemail-engine/e-mail-utils.h                     |    3 +
 libemail-engine/mail-folder-cache.c                |    9 -
 libemail-engine/mail-ops.c                         |    2 +-
 libemail-utils/mail-mt.c                           |    8 +-
 libgnomecanvas/gnome-canvas-text.c                 |  804 +-
 libgnomecanvas/gnome-canvas-widget.c               |   14 +-
 libgnomecanvas/gnome-canvas.c                      |  209 +-
 mail/e-mail-account-manager.c                      |   18 +-
 mail/e-mail-account-store.c                        |   41 +
 mail/e-mail-account-store.h                        |    3 +
 mail/e-mail-backend.c                              |  128 +-
 mail/e-mail-config-defaults-page.c                 |   23 +-
 mail/e-mail-display.c                              |   26 +-
 mail/e-mail-reader.c                               |   21 +-
 mail/e-mail-ui-session.c                           |    8 +
 mail/em-folder-tree-model.c                        |    4 +-
 mail/em-utils.c                                    |   13 +
 modules/backup-restore/evolution-backup-tool.c     |    5 +
 .../evolution-cal-config-webcal.c                  |   16 +-
 modules/calendar/Makefile.am                       |    2 +
 modules/calendar/e-cal-shell-backend.c             |   32 +
 modules/itip-formatter/e-mail-formatter-itip.c     |    4 +-
 modules/itip-formatter/e-mail-parser-itip.c        |   19 +-
 modules/itip-formatter/itip-view.c                 |   42 +-
 modules/prefer-plain/e-mail-parser-prefer-plain.c  |   26 +-
 .../vcard-inline/e-mail-formatter-vcard-inline.c   |    2 +-
 po/POTFILES.in                                     |    1 -
 po/be.po                                           | 3334 ++--
 po/de.po                                           |14278 ++++++--------
 po/el.po                                           | 2317 ++--
 po/en_GB.po                                        |20804 ++++++++++----------
 po/es.po                                           |  118 +-
 po/gl.po                                           | 1093 +-
 po/id.po                                           |  752 +-
 po/ko.po                                           |14044 ++++++-------
 po/lt.po                                           |  142 +-
 po/nb.po                                           |   86 +-
 po/pl.po                                           |13932 ++++++-------
 po/ru.po                                           |17849 +++++++++--------
 po/sl.po                                           | 7822 ++++----
 po/sr.po                                           | 1141 +-
 po/sr latin po                                     | 1141 +-
 po/sv.po                                           |16667 ++++++++--------
 po/vi.po                                           |  707 +-
 po/zh_HK.po                                        |  423 +-
 po/zh_TW.po                                        |  423 +-
 shell/Makefile.am                                  |    4 -
 shell/main.c                                       |   17 +
 shell/test/Makefile.am                             |   31 -
 shell/test/e-test-shell-backend.c                  |  203 -
 shell/test/e-test-shell-backend.h                  |   67 -
 shell/test/e-test-shell-view.c                     |  159 -
 shell/test/e-test-shell-view.h                     |   66 -
 shell/test/evolution-module-test.c                 |   41 -
 widgets/misc/e-attachment.c                        |   19 +-
 widgets/misc/e-source-config.c                     |   12 +-
 86 files changed, 69355 insertions(+), 72520 deletions(-)
---