[geary/wip/only-incomplete: 20/20] Merge branch 'master' into wip/only-incomplete

[Jim Nelson <jnelson src gnome org>]

commit 858ad7fe88f02a6d7ef699741799fa98cd6e1aae
Merge: 82d521c b5eed80
Author: Jim Nelson <jim yorba org>
Date:   Tue May 27 18:03:10 2014 -0700

    Merge branch 'master' into wip/only-incomplete

 configure                                          |    6 +
 debian/control                                     |    4 +-
 debian/rules                                       |    2 +-
 desktop/geary.appdata.xml                          |   13 +-
 po/es.po                                           |  209 +++++++++++---------
 po/he.po                                           |   48 +++--
 po/pl.po                                           |  197 ++++++++++--------
 src/CMakeLists.txt                                 |   12 +-
 .../accounts/account-dialog-account-list-pane.vala |    4 +-
 .../accounts/account-dialog-add-edit-pane.vala     |    4 +-
 src/client/accounts/account-dialog-pane.vala       |   13 +-
 .../account-dialog-remove-confirm-pane.vala        |    4 +-
 .../accounts/account-dialog-remove-fail-pane.vala  |    4 +-
 .../accounts/account-dialog-spinner-pane.vala      |    4 +-
 src/client/accounts/account-dialog.vala            |   33 +---
 src/client/application/geary-controller.vala       |   10 +-
 src/client/components/main-toolbar.vala            |   49 ++---
 src/client/components/main-window.vala             |   60 +++++-
 src/client/components/pill-toolbar.vala            |   80 ++------
 src/client/composer/composer-toolbar.vala          |   14 +-
 src/client/composer/composer-widget.vala           |   22 ++-
 .../folder-list/folder-list-folder-entry.vala      |    6 +
 src/engine/abstract/geary-abstract-folder.vala     |   23 ++-
 src/engine/api/geary-folder.vala                   |    9 +
 src/engine/imap/api/imap-folder.vala               |   13 +-
 src/mailer/main.vala                               |    9 +
 ui/login.glade                                     |  113 ++++++++---
 ui/preferences.glade                               |    1 +
 28 files changed, 560 insertions(+), 406 deletions(-)
---