[geary/wip/721326-renormalize: 17/17] Merge branch 'master' into wip/721326-renormalize

[Jim Nelson <jnelson src gnome org>]

commit 1c3e15f09695beb86ea6c2ab2f0b56908c033494
Merge: c0ef9cf f642be5
Author: Jim Nelson <jim yorba org>
Date:   Mon Jan 13 11:43:08 2014 -0800

    Merge branch 'master' into wip/721326-renormalize

 .gitignore                                         |    1 +
 CMakeLists.txt                                     |    4 -
 cmake/Gettext.cmake                                |   65 +-
 help/Makefile.am                                   |   19 +
 help/es/es.po                                      |  872 +++++++
 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                                           | 2513 ++++++++++---------
 po/pl.po                                           | 2556 +++++++++++---------
 po/pt_BR.po                                        | 2537 ++++++++++---------
 src/CMakeLists.txt                                 |    7 -
 src/client/application/geary-application.vala      |   11 +-
 src/client/components/conversation-find-bar.vala   |    4 +-
 .../conversation-viewer/conversation-viewer.vala   |   11 +-
 .../folder-list/folder-list-search-branch.vala     |    3 +-
 src/engine/rfc822/rfc822-message.vala              |   86 +-
 ui/CMakeLists.txt                                  |    4 -
 24 files changed, 10783 insertions(+), 9968 deletions(-)
---