[shotwell/wip/phako/enhanced-faces: 127/136] Merge branch 'master' into enhanced-faces

[Jens Georg <jensgeorg src gnome org>]

commit cd33a554e3862f1a197bbf3c77f9df9d3903b3a5
Merge: 41da9cc1 9232871f
Author: Jens Georg <mail jensge org>
Date:   Wed Oct 10 14:07:10 2018 +0200

    Merge branch 'master' into enhanced-faces

 build-aux/meson/postinstall.py         |    21 +
 data/org.gnome.Shotwell.appdata.xml.in |    13 +-
 data/org.gnome.Shotwell.gresource.xml  |     3 +-
 flatpak/org.gnome.Shotwell.json        |   222 +-
 git-hash                               |     4 -
 meson.build                            |    25 +-
 po/da.po                               |  8618 ++++++++++---------
 po/es.po                               | 14191 ++++++++++++++++---------------
 po/id.po                               |  8764 +++++++++----------
 po/pl.po                               |  9306 ++++++++++----------
 po/sv.po                               |   427 +-
 src/AppWindow.vala                     |     4 +-
 src/Dialogs.vala                       |    14 +-
 src/Resources.vala                     |     5 -
 src/camera/ImportPage.vala             |     8 +-
 src/direct/DirectPhotoPage.vala        |    13 +-
 src/direct/DirectWindow.vala           |    15 +-
 src/library/LibraryWindow.vala         |     7 +-
 src/main.vala                          |     4 +-
 src/meson.build                        |     3 +-
 vapi/version.vapi                      |     3 +
 version.h.in                           |     3 +
 22 files changed, 21046 insertions(+), 20627 deletions(-)
---