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

[Jim Nelson <jnelson src gnome org>]

commit c4ba1986768c086f2b56198d2552638b63e68f66
Merge: 025403f 9ec9913
Author: Jim Nelson <jim yorba org>
Date:   Tue Feb 10 16:00:36 2015 -0800

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

 po/POTFILES.in                              |    8 +-
 po/cs.po                                    |  239 +++++++++++----------
 po/es.po                                    |  310 ++++++++++++++-------------
 po/pl.po                                    |  302 ++++++++++++++------------
 src/client/composer/composer-box.vala       |    4 +-
 src/client/composer/composer-container.vala |    2 +-
 src/client/composer/composer-embed.vala     |    4 +-
 src/client/composer/composer-widget.vala    |    9 +-
 src/client/composer/composer-window.vala    |    5 +-
 9 files changed, 459 insertions(+), 424 deletions(-)
---