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

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

commit c5fa35b7e8a30e801cb28f3f29f47baa71b3f999
Merge: b6006a2 94eb069
Author: Dan VrÃtil <dvratil redhat com>
Date:   Fri Nov 2 16:29:21 2012 +0100

    Merge branch 'master' into webkit-composer
    
    Conflicts:
    	widgets/misc/e-mail-signature-editor.c

 addressbook/gui/contact-editor/contact-editor.ui  |   28 +-
 addressbook/gui/contact-editor/e-contact-editor.c |   53 +-
 calendar/gui/itip-utils.c                         |    6 +-
 data/evolution.desktop.in.in                      |    1 +
 libemail-engine/e-mail-folder-utils.c             |    2 +-
 libemail-engine/e-mail-session.c                  |   12 +-
 libemail-engine/e-mail-utils.c                    |   39 +-
 libemail-engine/e-mail-utils.h                    |    3 -
 libemail-engine/mail-ops.c                        |   93 +-
 mail/e-mail-config-identity-page.c                |   77 +-
 mail/e-mail-config-identity-page.h                |    5 +
 mail/e-mail-config-notebook.c                     |    8 +
 mail/em-composer-utils.c                          |   12 +-
 mail/em-utils.c                                   |    3 +-
 modules/cal-config-caldav/e-caldav-chooser.c      |    9 +-
 modules/itip-formatter/itip-view.c                |   18 +-
 modules/mail/e-mail-shell-view-private.c          |   34 +-
 modules/mail/e-mail-shell-view.h                  |    5 -
 po/el.po                                          | 1160 +++++++-------
 po/gl.po                                          | 1845 +++++++++++----------
 po/id.po                                          | 1332 +++++++--------
 po/pl.po                                          |  881 +++++-----
 shell/e-shell-searchbar.c                         |  234 +++-
 shell/e-shell-searchbar.h                         |    4 +-
 shell/e-shell-sidebar.c                           |    6 -
 shell/e-shell-view.c                              |   30 -
 shell/e-shell-view.h                              |    1 -
 widgets/misc/e-calendar-item.c                    |    6 +-
 widgets/misc/e-mail-identity-combo-box.c          |    3 +-
 widgets/misc/e-mail-signature-manager.c           |    3 +-
 widgets/misc/e-preferences-window.c               |   58 +-
 widgets/misc/e-source-config.c                    |   31 +
 32 files changed, 3144 insertions(+), 2858 deletions(-)
---