[geary/wip/714922-multiple-addresses-2: 28/30] Merge branch 'master' into wip/714922-multiple-addresses-2

[Jim Nelson <jnelson src gnome org>]

commit 0de985527c87bf25e3a298c79849e2dbdea2554c
Merge: 941d267 3694140
Author: Jim Nelson <jim yorba org>
Date:   Tue Mar 3 17:54:08 2015 -0800

    Merge branch 'master' into wip/714922-multiple-addresses-2

 cmake/ValaPrecompile.cmake                         |    2 +-
 help/el/el.po                                      |  869 ++++++----------
 help/it/it.po                                      |  188 +++-
 po/POTFILES.in                                     |    1 +
 po/cs.po                                           |  130 ++--
 po/de.po                                           |  557 ++++++-----
 po/he.po                                           |  355 ++++---
 po/hu.po                                           |  393 ++++----
 po/it.po                                           |  598 ++++++-----
 po/lt.po                                           | 1105 +++++++++++++-------
 po/nb.po                                           |  705 ++++++++-----
 po/pl.po                                           |  133 ++--
 po/sv.po                                           |  672 +++++++-----
 po/zh_TW.po                                        |  928 ++++++++++-------
 src/CMakeLists.txt                                 |   10 +-
 src/client/application/geary-application.vala      |    4 +-
 src/client/application/geary-controller.vala       |    4 +-
 src/client/composer/composer-widget.vala           |   10 +-
 .../conversation-list/conversation-list-store.vala |   20 +-
 .../conversation-viewer/conversation-viewer.vala   |   46 +-
 .../conversation-viewer/conversation-web-view.vala |   22 +-
 src/engine/api/geary-account-information.vala      |    7 +-
 src/engine/api/geary-search-folder.vala            |  443 +--------
 src/engine/app/app-conversation-monitor.vala       |   23 +-
 src/engine/imap-db/imap-db-account.vala            |    2 +-
 src/engine/imap-db/imap-db-folder.vala             |   35 +-
 .../imap-db-search-email-identifier.vala           |   16 +-
 .../search/imap-db-search-folder-properties.vala   |   16 +
 .../imap-db/search/imap-db-search-folder-root.vala |   14 +
 .../imap-db/search/imap-db-search-folder.vala      |  404 +++++++
 .../imap-db/{ => search}/imap-db-search-query.vala |    0
 .../imap-db/{ => search}/imap-db-search-term.vala  |    0
 .../gmail/imap-engine-gmail-search-folder.vala     |    4 +-
 .../imap-engine/imap-engine-generic-account.vala   |    4 +-
 .../imap-engine/imap-engine-minimal-folder.vala    |   39 +-
 src/engine/mime/mime-content-type.vala             |    4 +-
 src/engine/mime/mime-error.vala                    |    2 +-
 src/engine/mime/mime-multipart-subtype.vala        |   73 ++
 src/engine/nonblocking/nonblocking-error.vala      |    2 +-
 src/engine/rfc822/rfc822-message.vala              |  168 ++--
 src/engine/rfc822/rfc822-utils.vala                |   37 +-
 src/engine/rfc822/rfc822.vala                      |   10 +-
 ui/find_bar.glade                                  |    2 +-
 ui/preferences.glade                               |    3 +-
 44 files changed, 4603 insertions(+), 3457 deletions(-)
---