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

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

commit 6a8031ebeabf856070a81e24243434edbe07519d
Merge: 674c39f 3006d8d
Author: Dan VrÃtil <dvratil redhat com>
Date:   Thu Aug 9 11:22:23 2012 +0200

    Merge branch 'master' into webkit-composer

 NEWS                                               |   55 +
 addressbook/addressbook.error.xml                  |  262 +-
 calendar/calendar.error.xml                        |  618 +-
 calendar/gui/dialogs/event-page.c                  |   16 +-
 calendar/gui/e-day-view.c                          |    4 -
 calendar/gui/e-meeting-time-sel.c                  |   11 +-
 configure.ac                                       |    7 +-
 e-util/e-selection.c                               |   15 +-
 e-util/e-source-util.c                             |  169 +-
 e-util/e-source-util.h                             |    2 +
 e-util/e-system.error.xml                          |   15 +
 e-util/e-util.c                                    |    2 +-
 em-format/e-mail-formatter-quote-message-rfc822.c  |   15 +-
 em-format/e-mail-formatter-quote.c                 |   13 +-
 em-format/e-mail-formatter-utils.c                 |    4 +-
 filter/e-filter-option.c                           |   85 +-
 filter/e-filter-option.h                           |    7 +-
 .../calendar-meetings-replying-to-invitation.page  |    2 +-
 help/C/calendar-meetings-sending-invitation.page   |    4 +-
 help/C/calendar-usage-add-appointment.page         |    2 +-
 help/C/contacts-ldap.page                          |    2 +-
 help/C/default-browser.page                        |    4 +-
 help/C/express-mode.page                           |    2 +-
 help/C/mail-access-gmail-imap-account.page         |    2 +-
 help/C/mail-account-manage-microsoft-exchange.page |    2 +-
 help/C/mail-composer-forward-as-attachment.page    |    2 +-
 help/C/mail-composer-html-image.page               |    2 +-
 help/C/mail-composer-mail-signatures.page          |    2 +-
 help/C/mail-composer-several-recipients.page       |    2 +-
 help/C/mail-encryption-gpg-create-key.page         |    4 +-
 help/C/mail-error-no-provider-available.page       |    2 +-
 help/C/mail-filters.page                           |    8 +-
 help/C/mail-folders.page                           |    4 +-
 help/C/mail-follow-up-flag.page                    |    2 +-
 help/C/mail-imap-headers.page                      |    4 +-
 help/C/mail-moving-emails.page                     |    2 +-
 help/C/mail-save-as-pdf.page                       |   33 +
 help/C/mail-spam-groupwise-add-to-list.page        |    2 +-
 help/C/mail-two-trash-folders.page                 |    4 +-
 help/C/memos-usage-add-memo.page                   |    2 +-
 help/C/tasks-usage-add-task.page                   |    2 +-
 help/C/using-categories.page                       |    2 +-
 help/el/el.po                                      | 1806 +-
 help/es/es.po                                      |  129 +-
 libemail-engine/e-mail-utils.c                     |  211 +-
 libemail-engine/e-mail-utils.h                     |    3 +-
 libgnomecanvas/gnome-canvas.c                      |    4 -
 mail/Makefile.am                                   |    2 -
 mail/e-mail-backend.c                              |    2 +-
 mail/e-mail-display.c                              |   90 +-
 mail/e-mail-display.h                              |    3 +-
 mail/e-mail-reader.c                               |   16 +-
 mail/em-filter-source-element.c                    |  130 +-
 mail/em-folder-selection-button.c                  |    2 +
 mail/filtertypes.xml                               |   10 +-
 mail/mail-config.ui                                |   62 +-
 mail/mail.error.xml                                |   11 +-
 mail/searchtypes.xml                               |   10 +-
 mail/vfoldertypes.xml                              |    8 +-
 modules/addressbook/e-book-shell-sidebar.c         |    8 +
 modules/addressbook/e-book-shell-sidebar.h         |    4 +-
 modules/addressbook/e-book-shell-view-actions.c    |   24 +-
 modules/addressbook/e-book-shell-view.c            |    7 +-
 modules/calendar/e-cal-shell-sidebar.c             |    8 +
 modules/calendar/e-cal-shell-sidebar.h             |    6 +-
 modules/calendar/e-cal-shell-view-actions.c        |   33 +-
 modules/calendar/e-cal-shell-view.c                |    7 +-
 modules/calendar/e-memo-shell-sidebar.c            |    8 +
 modules/calendar/e-memo-shell-sidebar.h            |    6 +-
 modules/calendar/e-memo-shell-view-actions.c       |   33 +-
 modules/calendar/e-memo-shell-view.c               |    7 +-
 modules/calendar/e-task-shell-sidebar.c            |    8 +
 modules/calendar/e-task-shell-sidebar.h            |    6 +-
 modules/calendar/e-task-shell-view-actions.c       |   33 +-
 modules/calendar/e-task-shell-view.c               |    7 +-
 modules/itip-formatter/itip-view.c                 |   12 +-
 modules/itip-formatter/itip-view.h                 |    8 +-
 modules/mail-config/e-mail-config-smtp-backend.c   |    7 +
 modules/mail/e-mail-shell-backend.c                |  143 +-
 modules/mail/e-mail-shell-backend.h                |   10 +-
 modules/mail/em-mailer-prefs.c                     |   56 +
 modules/prefer-plain/e-mail-parser-prefer-plain.c  |    2 +
 plugins/mail-to-task/mail-to-task.c                |    5 +-
 plugins/publish-calendar/publish-calendar.c        |    2 -
 po/el.po                                           | 2684 +-
 po/es.po                                           | 1502 +-
 po/gu.po                                           | 1668 +-
 po/id.po                                           | 5412 ++--
 po/mr.po                                           |35170 +++++++++++---------
 po/sr.po                                           | 1381 +-
 po/sr latin po                                     | 1381 +-
 po/zh_CN.po                                        |28432 +++++++++--------
 po/zh_HK.po                                        | 1115 +-
 po/zh_TW.po                                        | 1124 +-
 shell/e-shell-view.c                               |   33 +
 shell/e-shell-view.h                               |    3 +
 smclient/eggsmclient-win32.c                       |    6 -
 smclient/eggsmclient-xsmp.c                        |    7 -
 widgets/misc/e-calendar-item.c                     |    3 -
 widgets/misc/e-calendar.c                          |    7 -
 widgets/misc/e-canvas.c                            |    4 -
 widgets/misc/e-mail-identity-combo-box.c           |    2 +-
 widgets/misc/e-mail-signature-combo-box.c          |    2 +-
 widgets/misc/e-mail-signature-tree-view.c          |    2 +-
 widgets/misc/e-map.c                               |    2 +-
 widgets/misc/e-source-config-dialog.c              |   89 +-
 widgets/misc/e-source-config.c                     |   19 +-
 widgets/misc/e-web-view.c                          |  333 +-
 widgets/misc/e-web-view.h                          |   14 -
 109 files changed, 45207 insertions(+), 39536 deletions(-)
---