[geary/wip/713190-resort-2: 13/14] Merge branch 'master' into wip/713190-resort-2

[Jim Nelson <jnelson src gnome org>]

commit a0c9376bd617e7015878fe02e2222a9d40e5951e
Merge: 8b1d56a 54426fc
Author: Jim Nelson <jim yorba org>
Date:   Tue Jan 27 15:43:28 2015 -0800

    Merge branch 'master' into wip/713190-resort-2

 help/de/de.po                                      |  120 +++++-
 po/POTFILES.in                                     |   26 +-
 po/de.po                                           |  482 +++++++++++---------
 po/pl.po                                           |  381 +++++++++-------
 src/CMakeLists.txt                                 |    1 -
 src/client/application/geary-controller.vala       |   15 +-
 src/client/composer/composer-toolbar.vala          |   10 +-
 src/client/composer/composer-widget.vala           |   51 ++-
 src/engine/api/geary-credentials.vala              |    8 +-
 src/engine/api/geary-folder-supports-archive.vala  |   14 +-
 src/engine/api/geary-folder-supports-copy.vala     |    1 +
 src/engine/api/geary-folder-supports-create.vala   |    3 +-
 src/engine/api/geary-folder-supports-mark.vala     |   17 +-
 src/engine/api/geary-folder-supports-move.vala     |    1 +
 src/engine/api/geary-folder-supports-remove.vala   |   14 +-
 src/engine/api/geary-folder.vala                   |    4 +
 src/engine/app/app-conversation-monitor.vala       |   35 +-
 src/engine/app/app-draft-manager.vala              |    3 +-
 src/engine/imap-db/imap-db-folder.vala             |   35 ++
 .../imap-engine-account-synchronizer.vala          |   29 +-
 .../imap-engine/imap-engine-generic-account.vala   |    4 +-
 .../imap-engine/imap-engine-generic-folder.vala    |    6 +-
 .../imap-engine/imap-engine-minimal-folder.vala    |  359 +++++++++------
 .../imap-engine/imap-engine-replay-operation.vala  |   38 ++-
 .../imap-engine/imap-engine-replay-queue.vala      |   36 ++-
 .../imap-engine-send-replay-operation.vala         |    8 +-
 src/engine/imap-engine/imap-engine.vala            |   19 +
 .../imap-engine-abstract-list-email.vala           |    2 +-
 .../replay-ops/imap-engine-copy-email.vala         |    2 +-
 .../replay-ops/imap-engine-create-email.vala       |   23 +-
 .../replay-ops/imap-engine-empty-folder.vala       |    2 +-
 .../replay-ops/imap-engine-fetch-email.vala        |    3 +-
 .../replay-ops/imap-engine-mark-email.vala         |    8 +-
 .../replay-ops/imap-engine-move-email.vala         |   27 +-
 .../replay-ops/imap-engine-remove-email.vala       |    5 +-
 .../replay-ops/imap-engine-replay-append.vala      |   10 +-
 .../replay-ops/imap-engine-replay-disconnect.vala  |   18 +-
 .../replay-ops/imap-engine-replay-removal.vala     |    9 +-
 .../imap-engine-server-search-email.vala           |    3 +
 src/engine/imap/api/imap-account.vala              |   17 +-
 src/engine/imap/api/imap-folder.vala               |   17 +-
 src/engine/imap/command/imap-store-command.vala    |   20 +-
 src/engine/imap/imap-error.vala                    |    4 +
 .../imap/transport/imap-client-connection.vala     |   21 +-
 .../transport/imap-client-session-manager.vala     |  125 +++++-
 .../nonblocking-abstract-semaphore.vala            |   12 -
 src/engine/nonblocking/nonblocking-mailbox.vala    |    3 +-
 .../nonblocking-reporting-semaphore.vala           |    4 +-
 src/engine/smtp/smtp-abstract-authenticator.vala   |   20 -
 src/engine/smtp/smtp-authenticator.vala            |   25 +-
 src/engine/smtp/smtp-login-authenticator.vala      |   16 +-
 src/engine/smtp/smtp-plain-authenticator.vala      |   14 +-
 ui/composer.glade                                  |    4 +-
 53 files changed, 1338 insertions(+), 796 deletions(-)
---