[geary/wip/713150-conversations: 19/20] Merge branch 'master' into wip/713150-conversations

[Jim Nelson <jnelson src gnome org>]

commit 1024767acd2163dac86f53a9aa427f6427195234
Merge: c188f4d 6a39622
Author: Jim Nelson <jim yorba org>
Date:   Tue Mar 17 16:38:54 2015 -0700

    Merge branch 'master' into wip/713150-conversations

 po/LINGUAS                                         |    1 +
 po/bs.po                                           | 2088 ++++++++++++++++++++
 po/cs.po                                           |  236 ++--
 po/es.po                                           |  561 +++---
 po/kk.po                                           |  373 ++--
 po/pl.po                                           |  379 ++--
 po/sv.po                                           |  595 +++---
 src/client/components/main-toolbar.vala            |   50 -
 .../formatted-conversation-data.vala               |  102 +-
 src/client/util/util-email.vala                    |  109 -
 src/engine/api/geary-revokable.vala                |   20 +-
 .../imap-engine-revokable-committed-move.vala      |    4 +-
 .../imap-engine/imap-engine-revokable-move.vala    |   14 +-
 13 files changed, 3378 insertions(+), 1154 deletions(-)
---