[shotwell/wip/phako/enhanced-faces: 37/136] Merge remote-tracking branch 'origin/master' into wip/faces

[Jens Georg <jensgeorg src gnome org>]

commit d4f30bc11656023f5bc00312b7a979f636eda81e
Merge: 84412d79 78d7970c
Author: NarendraMA <narendra_m_a yahoo com>
Date:   Sun Jul 22 11:10:44 2018 +0530

    Merge remote-tracking branch 'origin/master' into wip/faces

 NEWS                                  |   58 +-
 flatpak/org.gnome.Shotwell.json       |    8 +-
 help/LINGUAS                          |    1 +
 help/fr/fr.po                         | 3340 +++++++++++++++++++++++++++++++++
 icons/sprocket.png                    |  Bin 231 -> 0 bytes
 meson.build                           |    2 +-
 org.gnome.Shotwell.gresource.xml      |    1 -
 po/cs.po                              | 1301 +++++++------
 po/de.po                              | 1429 +++++++-------
 po/es.po                              | 2079 ++++++++++----------
 po/fr.po                              | 1239 ++++++------
 src/CheckerboardLayout.vala           |   18 +
 src/MediaPage.vala                    |   81 -
 src/Page.vala                         |   18 +-
 src/Properties.vala                   |    7 +-
 src/Resources.vala                    |   28 +
 src/Thumbnail.vala                    |    7 +-
 src/camera/CameraTable.vala           |  115 +-
 src/camera/ImportPage.vala            |   14 +-
 src/events/EventDirectoryItem.vala    |   20 +-
 src/import-roll/ImportRollBranch.vala |    3 +-
 src/library/LibraryWindow.vala        |   12 +-
 src/plugins/Plugins.vala              |    4 +
 23 files changed, 6854 insertions(+), 2931 deletions(-)
---