data: don't put translations into the GSettings schema file

It's actually supposed to be handled through gettext and not
put into the XML.  A lot of projects are doing it wrong, and now
glib-compile-schemas will yell at you.

https://bugzilla.gnome.org/show_bug.cgi?id=747209

3 files changed, 26 insertions, 25 deletions

diff --git a/Makefile.am b/Makefile.am
index 39433956..b82f57cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,8 @@ desktop_in_files = nm-connection-editor.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-schema_in_files = org.gnome.nm-applet.gschema.xml.in
-gsettingsschema_DATA = $(schema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml
+@GSETTINGS_RULES@
 
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
@@ -38,7 +38,6 @@ convert_DATA=nm-applet.convert
 DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
 
 EXTRA_DIST += \
-	$(schema_in_files) \
 	$(convert_DATA) \
 	$(appdata_in_files) 	\
 	$(autostart_in_files) \
@@ -48,6 +47,6 @@ CLEANFILES = \
 	$(autostart_DATA) \
 	$(desktop_DATA) \
 	$(appdata_DATA) 	\
-	$(gsettingsschema_DATA)
+	$(BUILT_SOURCES)
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
diff --git a/configure.ac b/configure.ac
index c700abd0..89e12090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_TYPE_PID_T
 dnl
 dnl translation support
 dnl
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 GETTEXT_PACKAGE=nm-applet
 AC_SUBST(GETTEXT_PACKAGE)
@@ -142,6 +142,7 @@ dnl Check for gobject introspection
 GOBJECT_INTROSPECTION_CHECK([0.9.6])
 
 GLIB_CONFIG_NMA
+GLIB_SETTINGS
 
 dnl
 dnl Compiler flags
@@ -172,5 +173,6 @@ po/Makefile.in
 man/Makefile
 man/nm-applet.1
 man/nm-connection-editor.1
+org.gnome.nm-applet.gschema.xml
 ])
 AC_OUTPUT
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
index bf3b9f40..9e2887ea 100644
--- a/org.gnome.nm-applet.gschema.xml.in
+++ b/org.gnome.nm-applet.gschema.xml.in
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schemalist gettext-domain="nm-applet">
-  <schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/">
+<schemalist>
+  <schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/" gettext-domain="@GETTEXT_PACKAGE@">
     <key name="disable-connected-notifications" type="b">
       <default>false</default>
-      <_summary>Disable connected notifications</_summary>
-      <_description>Set this to true to disable notifications when connecting to a network.</_description>
+      <summary>Disable connected notifications</summary>
+      <description>Set this to true to disable notifications when connecting to a network.</description>
     </key>
     <key name="disable-disconnected-notifications" type="b">
       <default>false</default>
-      <_summary>Disable disconnected notifications</_summary>
-      <_description>Set this to true to disable notifications when disconnecting from a network.</_description>
+      <summary>Disable disconnected notifications</summary>
+      <description>Set this to true to disable notifications when disconnecting from a network.</description>
     </key>
     <key name="disable-vpn-notifications" type="b">
       <default>false</default>
-      <_summary>Disable VPN notifications</_summary>
-      <_description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</_description>
+      <summary>Disable VPN notifications</summary>
+      <description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</description>
     </key>
     <key name="suppress-wireless-networks-available" type="b">
       <default>false</default>
-      <_summary>Suppress networks available notifications</_summary>
-      <_description>Set this to true to disable notifications when Wi-Fi networks are available.</_description>
+      <summary>Suppress networks available notifications</summary>
+      <description>Set this to true to disable notifications when Wi-Fi networks are available.</description>
     </key>
     <key name="stamp" type="i">
       <default>0</default>
-      <_summary>Stamp</_summary>
-      <_description>Used to determine whether settings should be migrated to a new version.</_description>
+      <summary>Stamp</summary>
+      <description>Used to determine whether settings should be migrated to a new version.</description>
     </key>
     <key name="disable-wifi-create" type="b">
       <default>false</default>
-      <_summary>Disable WiFi Create</_summary>
-      <_description>Set to true to disable creation of adhoc networks when using the applet.</_description>
+      <summary>Disable WiFi Create</summary>
+      <description>Set to true to disable creation of adhoc networks when using the applet.</description>
     </key>
     <key name="show-applet" type="b">
       <default>true</default>
-      <_summary>Show the applet in notification area</_summary>
-      <_description>Set to FALSE to disable displaying the applet in the notification area.</_description>
+      <summary>Show the applet in notification area</summary>
+      <description>Set to FALSE to disable displaying the applet in the notification area.</description>
     </key>
   </schema>
   <schema id="org.gnome.nm-applet.eap">
     <key name="ignore-ca-cert" type="b">
       <default>false</default>
-      <_summary>Ignore CA certificate</_summary>
-      <_description>Set this to true to disable warnings about CA certificates in EAP authentication.</_description>
+      <summary>Ignore CA certificate</summary>
+      <description>Set this to true to disable warnings about CA certificates in EAP authentication.</description>
     </key>
     <key name="ignore-phase2-ca-cert" type="b">
       <default>false</default>
-      <_summary>Ignore CA certificate</_summary>
-      <_description>Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication.</_description>
+      <summary>Ignore CA certificate</summary>
+      <description>Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication.</description>
     </key>
   </schema>
 </schemalist>