[geary/wip/save-sent-713263: 12/12] Merge branch 'master' into save-sent

[Charles Lindsay <clindsay src gnome org>]

commit 707e5e10a369c3dd760b99e78793aaa00a9122fa
Merge: db43d89 954f988
Author: Charles Lindsay <chaz yorba org>
Date:   Tue Jan 28 13:36:54 2014 -0800

    Merge branch 'master' into save-sent

 bindings/vapi/unique-3.0.deps                      |    8 -
 bindings/vapi/unique-3.0.vapi                      |   95 -
 help/es/es.po                                      |  950 ++++----
 po/cs.po                                           |  183 +-
 po/gl.po                                           | 2491 ++++++++++----------
 po/he.po                                           |  118 +-
 src/client/application/geary-controller.vala       |   43 +-
 src/client/components/icon-factory.vala            |   17 +
 .../conversation-viewer/conversation-web-view.vala |    2 +-
 src/client/sidebar/sidebar-tree.vala               |    6 +-
 src/engine/api/geary-folder.vala                   |   14 +-
 src/engine/imap-db/imap-db-account.vala            |   11 +-
 .../imap-engine/imap-engine-generic-account.vala   |   20 +-
 .../imap-engine/imap-engine-generic-folder.vala    |   31 +-
 src/engine/imap/api/imap-account.vala              |   49 +-
 src/engine/imap/api/imap-folder.vala               |    4 +-
 .../imap/response/imap-mailbox-information.vala    |    9 +
 .../imap/transport/imap-client-connection.vala     |    2 +-
 .../transport/imap-client-session-manager.vala     |    2 +-
 src/engine/smtp/smtp-client-session.vala           |    5 -
 20 files changed, 2018 insertions(+), 2042 deletions(-)
---