[goobox] do not merge the translations into the gschema file

[Paolo Bacchilega <paobac src gnome org>]

commit 47b71e32f30ef144d0857106ed0747861ee38c30
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun May 8 17:48:38 2016 +0200

    do not merge the translations into the gschema file

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |   18 +------
 ...gschema.xml.in => org.gnome.Goobox.gschema.xml} |   56 ++++++++++----------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 32 insertions(+), 46 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 03192b5..9cadce8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@ AC_SUBST(SYSTEM_LIBS)
 
 dnl ===========================================================================
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.1])
 GETTEXT_PACKAGE=goobox
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
diff --git a/data/Makefile.am b/data/Makefile.am
index b553783..688060e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,23 +7,16 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-gsettingsschema_in_files = org.gnome.Goobox.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
-.PRECIOUS: $(gsettings_SCHEMAS)
-
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.Goobox.gschema.xml
 
 @GSETTINGS_RULES@
 
-%.gschema.xml: %.gschema.xml.in
-       $(AM_V_GEN) $(INTLTOOL_MERGE) -x -u --no-translations $< $@
-
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = goobox.convert
 
 EXTRA_DIST =                           \
        $(convert_DATA)                 \
-       $(gsettingsschema_in_files)     \
+       $(gsettings_SCHEMAS)            \
        $(desktop_in_in_files)          \
        $(desktop_in_files)             \
        $(desktop_DATA)                 \
@@ -34,11 +27,4 @@ DISTCLEANFILES =                     \
        $(desktop_in_files)             \
        $(desktop_DATA)
 
-CLEANFILES =                           \
-       $(gsettings_SCHEMAS)            \
-       $(NULL)
-
-dist-hook:
-       cd $(distdir); rm -f $(CLEANFILES)
-
 -include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.Goobox.gschema.xml.in b/data/org.gnome.Goobox.gschema.xml
similarity index 72%
rename from data/org.gnome.Goobox.gschema.xml.in
rename to data/org.gnome.Goobox.gschema.xml
index 8ff354e..50bfd88 100644
--- a/data/org.gnome.Goobox.gschema.xml.in
+++ b/data/org.gnome.Goobox.gschema.xml
@@ -45,98 +45,98 @@
     <child name="encoder" schema="org.gnome.Goobox.Encoder"/>
   </schema>
 
-  <schema id="org.gnome.Goobox.General" path="/org/gnome/goobox/general/">
+  <schema id="org.gnome.Goobox.General" path="/org/gnome/goobox/general/" gettext-domain="goobox">
     <key name="device" type="s">
       <default>'/dev/cdrom'</default>
-      <_summary>Device path</_summary>
+      <summary>Device path</summary>
     </key>
     <key name="volume" type="i">
       <default>100</default>
-      <_summary>Volume level</_summary>
+      <summary>Volume level</summary>
     </key>
     <key name="cover-path" type="s">
       <default>'~'</default>
-      <_summary>'Choose cover' location</_summary>
-      <_description>Default location for the 'Choose cover' dialog.</_description>
+      <summary>'Choose cover' location</summary>
+      <description>Default location for the 'Choose cover' dialog.</description>
     </key>
     <key name="use-sound-juicer" type="b">
       <default>false</default>
-      <_summary>Use Sound Juicer to rip discs</_summary>
+      <summary>Use Sound Juicer to rip discs</summary>
     </key>
     <key name="autoplay" type="b">
       <default>true</default>
-      <_summary>Autoplay</_summary>
-      <_description>Autoplay discs after insertion.</_description>
+      <summary>Autoplay</summary>
+      <description>Autoplay discs after insertion.</description>
     </key>
   </schema>
 
-  <schema id="org.gnome.Goobox.UI" path="/org/gnome/goobox/ui/">
+  <schema id="org.gnome.Goobox.UI" path="/org/gnome/goobox/ui/" gettext-domain="goobox">
     <key name="window-width" type="i">
       <default>200</default>
-      <_summary>Window width</_summary>
+      <summary>Window width</summary>
     </key>
     <key name="window-height" type="i">
       <default>400</default>
-      <_summary>Window height</_summary>
+      <summary>Window height</summary>
     </key>
   </schema>
 
-  <schema id="org.gnome.Goobox.Playlist" path="/org/gnome/goobox/playlist/">
+  <schema id="org.gnome.Goobox.Playlist" path="/org/gnome/goobox/playlist/" gettext-domain="goobox">
     <key name="play-all" type="b">
       <default>true</default>
-      <_summary>Play all tracks</_summary>
+      <summary>Play all tracks</summary>
     </key>
     <key name="shuffle" type="b">
       <default>false</default>
-      <_summary>Shuffle playlist</_summary>
+      <summary>Shuffle playlist</summary>
     </key>
     <key name="repeat" type="b">
       <default>false</default>
-      <_summary>Restart when finished</_summary>
+      <summary>Restart when finished</summary>
     </key>
     <key name="sort-method" enum="org.gnome.Goobox.SortMethod">
       <default>'number'</default>
-      <_summary>Playlist sort method</_summary>
+      <summary>Playlist sort method</summary>
     </key>
     <key name="sort-type" enum="org.gnome.Goobox.SortType">
       <default>'ascending'</default>
-      <_summary>Playlist sort type</_summary>
+      <summary>Playlist sort type</summary>
     </key>
   </schema>
 
-  <schema id="org.gnome.Goobox.Ripper" path="/org/gnome/goobox/ripper/">
+  <schema id="org.gnome.Goobox.Ripper" path="/org/gnome/goobox/ripper/" gettext-domain="goobox">
     <key name="destination" type="s">
       <default>''</default>
-      <_summary>Extraction folder</_summary>
+      <summary>Extraction folder</summary>
     </key>
     <key name="file-type" enum="org.gnome.Goobox.FileFormat">
       <default>'ogg'</default>
-      <_summary>File type</_summary>
-      <_description>Possible values are: ogg, flac, mp3, wave.</_description>
+      <summary>File type</summary>
+      <description>Possible values are: ogg, flac, mp3, wave.</description>
     </key>
     <key name="save-playlist" type="b">
       <default>true</default>
-      <_summary>Save the playlist</_summary>
-      <_description>Save the playlist of the extracted tracks.</_description>
+      <summary>Save the playlist</summary>
+      <description>Save the playlist of the extracted tracks.</description>
     </key>
     <key name="view-destination" type="b">
       <default>false</default>
-      <_summary>View the destination</_summary>
+      <summary>View the destination</summary>
     </key>
   </schema>
 
-  <schema id="org.gnome.Goobox.Encoder" path="/org/gnome/goobox/encoder/">
+  <schema id="org.gnome.Goobox.Encoder" path="/org/gnome/goobox/encoder/" gettext-domain="goobox">
     <key name="ogg-quality" type="d">
       <default>0.5</default>
-      <_summary>OGG files quality</_summary>
+      <summary>OGG files quality</summary>
     </key>
     <key name="flac-compression" type="i">
       <default>5</default>
-      <_summary>FLAC files quality</_summary>
+      <summary>FLAC files quality</summary>
     </key>
     <key name="mp3-quality" type="i">
       <default>2</default>
-      <_summary>MP3 files quality</_summary>
+      <summary>MP3 files quality</summary>
     </key>
   </schema>
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6da6197..c0931e6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,7 @@
 [encoding: UTF-8]
 data/appdata/goobox.appdata.xml.in
 data/goobox.desktop.in.in
-data/org.gnome.Goobox.gschema.xml.in
+[type: gettext/gsettings]data/org.gnome.Goobox.gschema.xml
 src/album-info.c
 src/album-info.h
 src/dlg-cover-chooser.c