[shotwell/wip/phako/enhanced-faces: 52/136] Merge branch 'master' of https://gitlab.gnome.org/GNOME/shotwell into wip/faces

[Jens Georg <jensgeorg src gnome org>]

commit d92822cfea42f33399a9ec54fff8e0eb811f1afa
Merge: eec29081 e132add6
Author: NarendraMA <narendra_m_a yahoo com>
Date:   Sun Aug 19 09:10:57 2018 +0530

    Merge branch 'master' of https://gitlab.gnome.org/GNOME/shotwell into wip/faces

 NEWS                                           |   19 +
 {debian => dist/debian}/changelog              |    0
 {debian => dist/debian}/compat                 |    0
 {debian => dist/debian}/control                |    3 +-
 {debian => dist/debian}/copyright              |    0
 {debian => dist/debian}/dirs                   |    0
 {debian => dist/debian}/docs                   |    0
 {debian => dist/debian}/menu                   |    0
 {debian => dist/debian}/rules                  |    0
 {debian => dist/debian}/shotwell.install       |    0
 {debian => dist/debian}/watch                  |    0
 flatpak/org.gnome.Shotwell.unstable.flatpakref |    8 +
 help/es/es.po                                  |  404 ++--
 meson.build                                    |    2 +-
 meson_options.txt                              |    2 +-
 po/fi.po                                       | 1417 +++++++------
 po/tr.po                                       | 2579 +++++++++++++-----------
 thumbnailer/shotwell-video-thumbnailer.vala    |   23 +
 18 files changed, 2524 insertions(+), 1933 deletions(-)
---
diff --cc thumbnailer/shotwell-video-thumbnailer.vala
index 94e24515,ac14d7da..b2c852ac
--- a/thumbnailer/shotwell-video-thumbnailer.vala
+++ b/thumbnailer/shotwell-video-thumbnailer.vala
@@@ -54,10 -54,10 +54,17 @@@ class ShotwellThumbnailer 
              // Set to PAUSED to make the first frame arrive in the sink.
              ret = pipeline.set_state(Gst.State.PAUSED);
              if (ret == Gst.StateChangeReturn.FAILURE) {
++<<<<<<< HEAD
 +                debug("Failed to play the file: couldn't set state\n");
 +                return 3;
 +            } else if (ret == Gst.StateChangeReturn.NO_PREROLL) {
 +                debug("Live sources not supported yet.\n");
++=======
+                 warning("Failed to play the file: couldn't set state\n");
+                 return 3;
+             } else if (ret == Gst.StateChangeReturn.NO_PREROLL) {
+                 warning("Live sources not supported yet.\n");
++>>>>>>> e132add61d488efcfd0017ca38f62a90730a3ff6
                  return 4;
              }
              
@@@ -66,13 -66,13 +73,21 @@@
              // better way is to run a mainloop and catch errors there.
              ret = pipeline.get_state(null, null, 5 * Gst.SECOND);
              if (ret == Gst.StateChangeReturn.FAILURE) {
++<<<<<<< HEAD
 +                debug("Failed to play the file: couldn't get state.\n");
++=======
+                 warning("Failed to play the file: couldn't get state.\n");
++>>>>>>> e132add61d488efcfd0017ca38f62a90730a3ff6
                  return 3;
              }
  
              /* get the duration */
              if (!pipeline.query_duration (Gst.Format.TIME, out duration)) {
++<<<<<<< HEAD
 +                debug("Failed to query file for duration\n");
++=======
+                 warning("Failed to query file for duration\n");
++>>>>>>> e132add61d488efcfd0017ca38f62a90730a3ff6
                  return 3;
              }
  
@@@ -86,7 -86,7 +101,11 @@@
  
              ret = pipeline.get_state(null, null, 5 * Gst.SECOND);
              if (ret == Gst.StateChangeReturn.FAILURE) {
++<<<<<<< HEAD
 +                debug("Failed to play the file: couldn't get state.\n");
++=======
+                 warning("Failed to play the file: couldn't get state.\n");
++>>>>>>> e132add61d488efcfd0017ca38f62a90730a3ff6
                  return 3;
              }
  
@@@ -100,7 -100,7 +119,11 @@@
              pipeline.set_state(Gst.State.NULL);
              
          } catch (Error e) {
++<<<<<<< HEAD
 +            debug(e.message);
++=======
+             warning(e.message);
++>>>>>>> e132add61d488efcfd0017ca38f62a90730a3ff6
              return 2;
          }