[evolution-data-server/gtk3: 29/29] Merge branch 'master' into gtk3

[Milan Crha <mcrha src gnome org>]

commit cbd2ea81e8b4f1c68e9d1637a3b06cc4afdbe3ca
Merge: c3baa8f d6beed3
Author: Milan Crha <mcrha redhat com>
Date:   Thu Dec 16 19:15:13 2010 +0100

    Merge branch 'master' into gtk3

 addressbook/backends/ldap/e-book-backend-ldap.c    |    1 +
 .../backends/webdav/e-book-backend-webdav.c        |    5 +
 addressbook/libebook/e-book-view.c                 |    1 +
 addressbook/libedata-book/e-data-book-factory.c    |   32 +-
 addressbook/libedata-book/e-data-book.c            |    1 +
 calendar/backends/caldav/e-cal-backend-caldav.c    |  269 ++-
 .../backends/groupwise/e-cal-backend-groupwise.c   |   12 +-
 calendar/backends/http/e-cal-backend-http.c        |   82 +-
 calendar/libecal/e-cal-system-timezone.c           |   63 +-
 calendar/libecal/e-cal-view.c                      |    8 +-
 calendar/libecal/e-cal.c                           |    1 +
 calendar/libedata-cal/e-data-cal-factory.c         |   32 +-
 calendar/libedata-cal/e-data-cal.c                 |    1 +
 camel/camel-folder-summary.c                       |    5 +
 camel/camel-service.c                              |   14 +-
 camel/camel-smime-context.c                        |    1 +
 camel/camel-tcp-stream-raw.c                       |   16 +-
 camel/providers/imap/camel-imap-provider.c         |    2 +-
 camel/providers/imapx/camel-imapx-provider.c       |    2 +-
 camel/providers/local/camel-maildir-store.c        |   11 +-
 camel/providers/pop3/camel-pop3-provider.c         |    1 +
 camel/providers/smtp/camel-smtp-transport.c        |   11 +-
 configure.ac                                       |   34 +-
 .../calendar/libecal/libecal-sections.txt          |    1 -
 .../libecal/tmpl/e-cal-check-timezones.sgml        |    2 +
 docs/reference/camel/camel-sections.txt            |    4 +-
 .../reference/camel/tmpl/camel-cipher-context.sgml |    6 +
 docs/reference/camel/tmpl/camel-db.sgml            |   15 -
 .../reference/camel/tmpl/camel-folder-summary.sgml |   29 +-
 docs/reference/camel/tmpl/camel-unused.sgml        |   31 +
 .../libedataserver/libedataserver-docs.sgml        |    1 +
 .../libedataserver/libedataserver-sections.txt     |   86 +
 docs/reference/libedataserver/tmpl/e-sexp.sgml     |    4 +-
 .../libedataserver/tmpl/e-soap-message.sgml        |  337 +++
 .../libedataserver/tmpl/e-soap-response.sgml       |  208 ++
 docs/reference/libedataserver/tmpl/e-util.sgml     |   19 +
 libedataserver/e-categories.c                      |   46 +-
 libedataserver/e-data-server-util.h                |    3 +-
 libedataserver/e-soap-message.c                    |   66 +
 libedataserver/e-soap-response.c                   |   41 +
 libedataserver/e-source.c                          |   13 +-
 libedataserverui/e-name-selector-entry.c           |    2 +-
 libedataserverui/e-passwords.c                     |  497 +----
 po/es.po                                           |  697 ++++---
 po/et.po                                           |   64 +-
 po/gl.po                                           |  419 ++--
 po/nb.po                                           |  591 +++---
 po/zh_HK.po                                        | 2412 ++++++++++----------
 po/zh_TW.po                                        | 2412 ++++++++++----------
 49 files changed, 4862 insertions(+), 3749 deletions(-)
---