[gnome-disk-utility] Rely on intltool >= 0.50 for gsettings translations

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 4747d8ab2cc626f5e5d0d29320ba92d5cb525fe5
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat May 23 17:36:18 2015 -0500

    Rely on intltool >= 0.50 for gsettings translations
    
    This is needed to hook up appdata files in the same subdirectory as the
    gsettings schemas, since we need INTLTOOL_XML_NOMERGE_RULE for gsettings
    but the conflicting INTLTOOL_XML_RULE for appdata.

 configure.ac                                       |    5 +----
 data/Makefile.am                                   |    3 +--
 data/org.gnome.Disks.gschema.xml                   |   10 ++++++++++
 data/org.gnome.Disks.gschema.xml.in.in             |   10 ----------
 ...nome.settings-daemon.plugins.gdu-sd.gschema.xml |   15 +++++++++++++++
 ...ettings-daemon.plugins.gdu-sd.gschema.xml.in.in |   15 ---------------
 po/POTFILES.in                                     |    4 ++--
 po/POTFILES.skip                                   |    4 ----
 8 files changed, 29 insertions(+), 37 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7bc745b..3480841 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,11 +165,10 @@ if test -z "$XSLTPROC"; then
   AC_MSG_ERROR([xsltproc is needed])
 fi
 
-IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED])
+IT_PROG_INTLTOOL([0.50.2])
 
 GETTEXT_PACKAGE=gnome-disk-utility
 AC_SUBST([GETTEXT_PACKAGE])
-AM_GLIB_GNU_GETTEXT
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
 
 AC_SUBST([AM_CPPFLAGS])
@@ -195,8 +194,6 @@ data/icons/hicolor/32x32/Makefile
 data/icons/hicolor/48x48/Makefile
 data/icons/hicolor/256x256/Makefile
 data/icons/hicolor/scalable/Makefile
-data/org.gnome.Disks.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml.in
 doc/Makefile
 doc/man/Makefile
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index 7ae2241..e21aff9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,15 +27,14 @@ gsettings_SCHEMAS =                                                 \
        $(NULL)
 
 @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST =                   \
        $(desktop_in_files)     \
+       $(gsettings_SCHEMAS)    \
        $(NULL)
 
 CLEANFILES =                   \
-       $(gsettings_SCHEMAS)    \
        $(desktop_DATA)         \
        $(dbusservice_DATA)     \
        $(NULL)
diff --git a/data/org.gnome.Disks.gschema.xml b/data/org.gnome.Disks.gschema.xml
new file mode 100644
index 0000000..35cb06c
--- /dev/null
+++ b/data/org.gnome.Disks.gschema.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema id="org.gnome.Disks" path="/org/gnome/Disks/" gettext-domain="gnome-disk-utility">
+    <key name="image-dir-uri" type="s">
+      <default>''</default>
+      <summary>Default location for the Create/Restore disk image dialogs</summary>
+      <description>Default location for the Create/Restore disk image dialogs. If blank the ~/Documents 
folder is used.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml 
b/data/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml
new file mode 100644
index 0000000..f11d05a
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="gnome-disk-utility" id="org.gnome.settings-daemon.plugins.gdu-sd" 
path="/org/gnome/settings-daemon/plugins/gdu-sd/">
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by gnome-settings-daemon or not</description>
+    </key>
+    <key name="priority" type="i">
+      <default>1</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in gnome-settings-daemon startup queue</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 76a944d..f8f90a4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,8 +4,8 @@
 data/gnome-disk-image-mounter.desktop.in
 data/gnome-disk-image-writer.desktop.in
 data/gnome-disks.desktop.in
-data/org.gnome.Disks.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml.in.in
+data/org.gnome.Disks.gschema.xml
+data/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml
 src/disk-image-mounter/main.c
 src/disks/gduapplication.c
 src/disks/gduatasmartdialog.c