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

[Jim Nelson <jnelson src gnome org>]

commit dd3478ea90022492bd411a0f97f4ffa7539e3ead
Merge: bba7c38 0d82845
Author: Jim Nelson <jim yorba org>
Date:   Tue Mar 10 18:53:35 2015 -0700

    Merge branch 'master' into wip/713150-conversations

 desktop/org.yorba.geary.gschema.xml        |   18 ++
 help/cs/cs.po                              |  148 ++++++----
 po/cs.po                                   |  402 ++++++++++++++------------
 po/es.po                                   |  133 +++++----
 po/he.po                                   |  431 +++++++++++++++-------------
 po/hu.po                                   |  410 ++++++++++++++-------------
 po/pl.po                                   |  402 ++++++++++++++------------
 src/client/application/geary-config.vala   |   21 ++-
 src/client/components/main-window.vala     |   92 +++++--
 src/client/dialogs/preferences-dialog.vala |    2 +
 ui/preferences.glade                       |   21 ++-
 11 files changed, 1171 insertions(+), 909 deletions(-)
---