[geary/wip/713432-startup: 43/45] Merge branch 'master' into wip/713432-startup

[Jim Nelson <jnelson src gnome org>]

commit 906d4f7f1df4fb3efdd4cb8c26b96d5247084648
Merge: c9a504c 1b82855
Author: Jim Nelson <jim yorba org>
Date:   Wed Jan 15 14:07:39 2014 -0800

    Merge branch 'master' into wip/713432-startup

 .gitignore                                         |    1 +
 CMakeLists.txt                                     |    4 -
 INSTALL                                            |  131 +-
 README                                             |   33 +-
 THANKS                                             |    6 +-
 bindings/vapi/gmime-2.6.vapi                       |   22 +-
 bindings/vapi/gmime-2.6/gmime-2.6.metadata         |   10 +
 cmake/Gettext.cmake                                |   65 +-
 configure                                          |   44 +-
 desktop/geary.desktop.in                           |    3 +-
 help/C/shortcuts.page                              |   10 +-
 help/Makefile.am                                   |   19 +
 help/es/es.po                                      |  872 +++
 icons/128x128/geary.svg                            |  608 --
 icons/16x16/geary.png                              |  Bin 0 -> 742 bytes
 icons/16x16/geary.svg                              |  359 --
 icons/24x24/geary.png                              |  Bin 0 -> 1295 bytes
 icons/256x256/geary.png                            |  Bin 0 -> 24639 bytes
 icons/32x32/geary.png                              |  Bin 0 -> 1666 bytes
 icons/32x32/geary.svg                              |  635 ---
 icons/48x48/geary.png                              |  Bin 0 -> 2672 bytes
 icons/48x48/geary.svg                              |  588 --
 icons/512x512/geary.png                            |  Bin 0 -> 62570 bytes
 icons/64x64/geary.svg                              |  593 --
 icons/CMakeLists.txt                               |   11 +-
 icons/geary.svg                                    | 5816 ++++++++++++++++++++
 po/CMakeLists.txt                                  |   48 +-
 po/LINGUAS                                         |   43 +
 po/POTFILES.in                                     |  360 ++
 po/POTFILES.skip                                   |    1 +
 po/cs.po                                           | 2542 +++++----
 po/el.po                                           | 2503 +++++----
 po/es.po                                           | 2519 +++++----
 po/fr.po                                           | 2541 +++++----
 po/geary.pot                                       | 1501 -----
 po/he.po                                           | 2518 +++++----
 po/pl.po                                           | 2529 +++++----
 po/pt_BR.po                                        | 2537 +++++----
 src/CMakeLists.txt                                 |    7 -
 src/client/accounts/account-dialog.vala            |   25 +-
 src/client/application/geary-application.vala      |   26 +-
 src/client/application/geary-config.vala           |   86 +-
 src/client/application/geary-controller.vala       |  194 +-
 src/client/application/secret-mediator.vala        |   25 +-
 src/client/components/conversation-find-bar.vala   |    4 +-
 src/client/components/main-toolbar.vala            |   53 +-
 src/client/components/main-window.vala             |   41 +-
 src/client/components/pill-toolbar.vala            |    2 +-
 src/client/composer/composer-window.vala           |    3 +-
 .../conversation-list/conversation-list-store.vala |    3 +-
 .../conversation-list/conversation-list-view.vala  |    3 +-
 .../conversation-viewer/conversation-viewer.vala   |   21 +-
 .../conversation-viewer/conversation-web-view.vala |    8 +-
 src/client/dialogs/password-dialog.vala            |  113 +-
 src/client/dialogs/preferences-dialog.vala         |   88 +-
 .../folder-list/folder-list-search-branch.vala     |    3 +-
 src/client/util/util-webkit.vala                   |    5 +-
 src/engine/abstract/geary-abstract-account.vala    |    5 +-
 src/engine/api/geary-account.vala                  |    8 +
 src/engine/imap-db/imap-db-account.vala            |   13 +-
 .../gmail/imap-engine-gmail-account.vala           |    2 +-
 .../imap-engine/imap-engine-generic-account.vala   |    6 +-
 .../imap-engine/imap-engine-generic-folder.vala    |   93 +-
 .../other/imap-engine-other-account.vala           |    2 +-
 .../outlook/imap-engine-outlook-account.vala       |    2 +-
 .../replay-ops/imap-engine-replay-append.vala      |   11 +-
 .../replay-ops/imap-engine-replay-removal.vala     |    6 +-
 .../yahoo/imap-engine-yahoo-account.vala           |    2 +-
 src/engine/rfc822/rfc822-message.vala              |   86 +-
 theming/message-viewer.css                         |    2 +-
 ui/CMakeLists.txt                                  |    4 -
 ui/password-dialog.glade                           |  436 +--
 72 files changed, 17199 insertions(+), 13661 deletions(-)
---