[gnome-sound-recorder/testing: 47/49] Merge branch 'master' into testing

[Margaret Ford <megford src gnome org>]

commit 12b7684a681d281c6ad7b5614cc6e9c16b11054f
Merge: 60c6055 24e7f80
Author: Meg Ford <megford gnome org>
Date:   Sun Apr 16 16:02:13 2017 -0500

    Merge branch 'master' into testing

 NEWS                |    9 ++
 autogen.sh          |   12 ++--
 configure.ac        |  104 ++++++++++++++++++++++++--
 po/ca.po            |  181 ++++++++++++++++++++++++++++-----------------
 po/cs.po            |   31 +++++---
 po/da.po            |  104 +++++++++++++++-----------
 po/de.po            |   53 +++++---------
 po/es.po            |   53 ++++++++------
 po/eu.po            |   38 +++++++---
 po/fi.po            |   29 ++++---
 po/fr.po            |   26 ++++---
 po/fur.po           |   27 ++++---
 po/gl.po            |   33 +++++---
 po/hu.po            |   63 +++++-----------
 po/id.po            |   35 +++++----
 po/it.po            |   70 ++++++++++--------
 po/kk.po            |   31 +++++---
 po/ko.po            |   27 ++++---
 po/nb.po            |   74 +++++++++++--------
 po/pl.po            |   33 +++++----
 po/pt_BR.po         |   39 ++++++----
 po/ru.po            |   45 ++++++++----
 po/sk.po            |   29 ++++---
 po/sv.po            |   29 ++++---
 po/tr.po            |  205 ++++++++++++++++++++++++++++++++------------------
 po/uk.po            |   90 +++++++++++++---------
 po/vi.po            |   29 ++++---
 po/zh_CN.po         |   36 ++++++---
 po/zh_TW.po         |   77 +++++++++++--------
 src/application.js  |    1 -
 src/audioProfile.js |   72 +++++++++----------
 src/listview.js     |   53 ++++++++-----
 src/mainWindow.js   |   26 +++---
 src/record.js       |   17 +++-
 src/waveform.js     |    7 +-
 35 files changed, 1077 insertions(+), 711 deletions(-)
---
diff --cc autogen.sh
index 313b320,4b17e16..f06d230
--- a/autogen.sh
+++ b/autogen.sh
@@@ -5,12 -5,12 +5,12 @@@ srcdir=`dirname $0
  test -z "$srcdir" && srcdir=.
  
  PKG_NAME="gnome-sound-recorder"
 -ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
 +ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS --enable-installed-tests"
  
  test -f $srcdir/configure.ac || {
-     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-     echo " top-level gnome-sound-recorder directory"
-     exit 1
+       echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+       echo " top-level gnome-sound-recorder directory"
+       exit 1
  }
  
  which gnome-autogen.sh || {
diff --cc configure.ac
index 12d3eb2,495dd99..cbb62b4
--- a/configure.ac
+++ b/configure.ac
@@@ -10,16 -10,105 +10,104 @@@ LT_INIT([disable-static]
  GETTEXT_PACKAGE=gnome-sound-recorder
  AC_SUBST(GETTEXT_PACKAGE)
  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-                    [The prefix for our gettext translation domains.])
+                   [The prefix for our gettext translation domains.])
  IT_PROG_INTLTOOL([0.26])
 -
  GLIB_GSETTINGS
- GOBJECT_INTROSPECTION_REQUIRE([1.0])
+ GOBJECT_INTROSPECTION_REQUIRE([0.9.6])
+ 
+ GLIB_MIN_VERSION=2.46
+ GTK_MIN_VERSION=3.12
+ GOBJECT_MIN_VERSION=1.31.6
  PKG_CHECK_MODULES([DEPS], [gdk-3.0
-                            gdk-pixbuf-2.0
-                            gio-2.0
-                            glib-2.0
-                            gobject-2.0
-                            gtk+-3.0 >= 3.12])
+                   gdk-pixbuf-2.0
+                   glib-2.0 >= $GLIB_MIN_VERSION
+                   gobject-introspection-1.0 >= $GOBJECT_MIN_VERSION
+                   gtk+-3.0 >= $GTK_MIN_VERSION])
+ 
+ # Check for required plugins (stolen from Totem's configure.ac)
+ gst10_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-1.0`
+ gst10_inspect="$gst10_toolsdir/gst-inspect-1.0"
+ 
+ #Give error and exit if we don't have the gst_inspect tool
+ AC_MSG_CHECKING([GStreamer 1.0 inspection tool])
+ if test -r "$gst10_inspect"; then
+       AC_MSG_RESULT([yes])
+ else
+       AC_MSG_RESULT([no])
+       AC_MSG_ERROR([
+               Cannot find required GStreamer-1.0 tool 'gst-inspect-1.0'.
+               It should be part of gstreamer-1_0-utils. Please install it.
+       ])
+ fi
+ 
+ # Check for elements from gst-plugins-base
+ # Set plugins which contain below elements
+ for base_element in playbin audioconvert uridecodebin
+ do
+       AC_MSG_CHECKING([GStreamer 1.0 $base_element element])
+       if $gst10_inspect $base_element >/dev/null 2>/dev/null; then
+               AC_MSG_RESULT([yes])
+       else
+               AC_MSG_RESULT([no])
+               AC_MSG_ERROR([
+                       Cannot find required GStreamer-1.0 plugin '$1'.
+                       It should be part of gst-plugins-base. Please install it.
+               ])
+ 
+       fi
+       shift;
+ done
+ 
+ # Check for elements from gst-plugins-good
+ # Set plugins which contain below elements
+ for good_element in flacenc flacparse qtmux qtdemux oggdemux
+ do
+       AC_MSG_CHECKING([GStreamer 1.0 $good_element element])
+       if $gst10_inspect $good_element >/dev/null 2>/dev/null; then
+               AC_MSG_RESULT([yes])
+       else
+               AC_MSG_RESULT([no])
+               AC_MSG_ERROR([
+                       Cannot find required GStreamer-1.0 plugin '$1'.
+                       It should be part of gst-plugins-good. Please install it.
+               ])
+       fi
+       shift;
+ done
+ 
+ # Do a diff check for pulseaudio since we've run into problems on deb systems
+ AC_MSG_CHECKING([GStreamer 1.0 pulseaudio element])
+ if $gst10_inspect pulseaudio >/dev/null 2>/dev/null; then
+       AC_MSG_RESULT([yes])
+ else
+       AC_MSG_RESULT([no])
+       AC_MSG_WARN([
+               Cannot find required GStreamer-1.0 plugin PulseAudio.
+               It should be part of gst-plugins-good on RPM-based distros
+               and gstreamer1.0-pulseaudio on Debian-based distros.
+               Please install it.
+       ])
+ fi
+ 
+ # Check for elements from gst-plugins-bad
+ # but don't exit if they aren't installed. Just print error.
+ # Set plugins which contain below elements
+ for bad_element in id3mux
+ do
+       AC_MSG_CHECKING([GStreamer 1.0 $bad_element element])
+       if $gst10_inspect $bad_element >/dev/null 2>/dev/null; then
+               AC_MSG_RESULT([yes])
+       else
+               AC_MSG_RESULT([no])
+               AC_MSG_WARN([
+                       Cannot find required GStreamer-1.0 plugin '$1'.
+                       It should be part of gst-plugins-bad. Please install it.
+               ])
+ 
+       fi
+       shift;
+ done
+ 
  
  AC_PATH_PROG(GJS, [gjs])
  
diff --cc src/application.js
index 2293381,671b085..7ec8e78
--- a/src/application.js
+++ b/src/application.js
@@@ -174,8 -155,6 +174,7 @@@ const Application = new Lang.Class(
      setSpeakerVolume: function(level) {
           settings.set_double("speaker-volume", level);
      },
- 
 +    /* End functions for showing the Preferences Dialog and setting preferences */
  
      _showAbout: function() {
          let aboutDialog = new Gtk.AboutDialog();