Migrate from intltool to gettext.wip/nielsdg/intltool2gettext

4 files changed, 48 insertions, 184 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 192dfa05..75a38189 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -35,9 +35,6 @@ dbusconfdir = $(DBUS_SYS_DIR)
 dbusconf_in_files = gdm.conf.in
 dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
 
-@INTLTOOL_SCHEMAS_RULE@
-@INTLTOOL_XML_NOMERGE_RULE@
-
 # dconf database and profile
 dconf_db_files = \
 	dconf/defaults/00-upstream-settings		\
@@ -57,8 +54,7 @@ gsettings_SCHEMAS = org.gnome.login-screen.gschema.xml
 schemasdir = $(pkgdatadir)
 schemas_in_files = gdm.schemas.in
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
-gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
+$(schemas_DATA): $(schemas_in_files)
 	sed	-e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
 		-e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
 		-e 's,[@]GDM_USER_PATH[@],$(GDM_USER_PATH),g' \
@@ -81,7 +77,7 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
 		-e 's,[@]logdir[@],$(logdir),g' \
 		-e 's,[@]pixmapdir[@],$(pixmapdir),g' \
 		-e 's,[@]sbindir[@],$(sbindir),g' \
-		<$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
+		<$(srcdir)/gdm.schemas.in >gdm.schemas
 
 
 EXTRA_DIST += gnome-login.session.in
@@ -168,19 +164,18 @@ EXTRA_DIST += $(srcdir)/61-gdm.rules.in
 
 EXTRA_DIST +=			\
 	$(dconf_db_files)	\
+	$(gsettings_SCHEMAS)	\
 	$(schemas_in_files)	\
 	$(schemas_DATA)		\
 	$(dbusconf_in_files)	\
 	$(localealias_DATA)	\
 	$(udevrules_DATA)	\
-	gdm.schemas.in.in	\
 	gdm.conf-custom.in 	\
 	Xsession.in 		\
 	Init.in 		\
 	PreSession.in 		\
 	PostSession.in 		\
 	PostLogin 		\
-	org.gnome.login-screen.gschema.xml.in \
 	$(NULL)
 
 CLEANFILES = 				\
@@ -189,7 +184,6 @@ CLEANFILES = 				\
 	Init				\
 	PreSession			\
 	PostSession			\
-	$(gsettings_SCHEMAS)		\
 	greeter-dconf-defaults		\
 	$(NULL)
 
diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am
index e1213ca1..948a168f 100644
--- a/data/applications/Makefile.am
+++ b/data/applications/Makefile.am
@@ -10,11 +10,14 @@ edit = sed \
 %.desktop.in: %.desktop.in.in Makefile
 	$(edit) $< >$@
 
-@INTLTOOL_DESKTOP_RULE@
 desktopdir = $(pkgdatadir)/greeter/applications
-desktop_DATA = mime-dummy-handler.desktop				\
+desktop_in_files = mime-dummy-handler.desktop				\
 	       mimeapps.list						\
 	       $(NULL)
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 
 EXTRA_DIST =								\
 	$(desktop_DATA)							\
diff --git a/data/gdm.schemas.in.in b/data/gdm.schemas.in.in
deleted file mode 100644
index 8ad20310..00000000
--- a/data/gdm.schemas.in.in
+++ /dev/null
@@ -1,133 +0,0 @@
-<gdmschemafile>
-  <schemalist>
-
-    <schema>
-      <key>chooser/Multicast</key>
-      <signature>b</signature>
-      <default>false</default>
-    </schema>
-    <schema>
-      <key>chooser/MulticastAddr</key>
-      <signature>s</signature>
-      <default>ff02::1</default>
-    </schema>
-
-    <schema>
-      <key>daemon/User</key>
-      <signature>s</signature>
-      <default>@GDM_USERNAME@</default>
-    </schema>
-    <schema>
-      <key>daemon/Group</key>
-      <signature>s</signature>
-      <default>@GDM_GROUPNAME@</default>
-    </schema>
-    <schema>
-      <key>daemon/AutomaticLoginEnable</key>
-      <signature>b</signature>
-      <default>false</default>
-    </schema>
-    <schema>
-      <key>daemon/AutomaticLogin</key>
-      <signature>s</signature>
-      <default></default>
-    </schema>
-    <schema>
-      <key>daemon/TimedLoginEnable</key>
-      <signature>b</signature>
-      <default>false</default>
-    </schema>
-    <schema>
-      <key>daemon/TimedLogin</key>
-      <signature>s</signature>
-      <default></default>
-    </schema>
-    <schema>
-      <key>daemon/TimedLoginDelay</key>
-      <signature>i</signature>
-      <default>30</default>
-    </schema>
-    <schema>
-      <key>daemon/InitialSetupEnable</key>
-      <signature>b</signature>
-      <default>true</default>
-    </schema>
-    <schema>
-      <key>daemon/WaylandEnable</key>
-      <signature>b</signature>
-      <default>true</default>
-    </schema>
-    <schema>
-      <key>security/AllowRemoteAutoLogin</key>
-      <signature>b</signature>
-      <default>false</default>
-    </schema>
-
-    <schema>
-      <key>debug/Enable</key>
-      <signature>b</signature>
-      <default>false</default>
-    </schema>
-
-    <schema>
-      <key>security/DisallowTCP</key>
-      <signature>b</signature>
-      <default>true</default>
-    </schema>
-    <schema>
-      <key>xdmcp/Enable</key>
-      <signature>b</signature>
-      <default>false</default>
-    </schema>
-    <schema>
-      <key>xdmcp/ShowLocalGreeter</key>
-      <signature>b</signature>
-      <default>true</default>
-    </schema>
-    <schema>
-      <key>xdmcp/MaxPending</key>
-      <signature>i</signature>
-      <default>4</default>
-    </schema>
-    <schema>
-      <key>xdmcp/MaxSessions</key>
-      <signature>i</signature>
-      <default>16</default>
-    </schema>
-    <schema>
-      <key>xdmcp/MaxWait</key>
-      <signature>i</signature>
-      <default>30</default>
-    </schema>
-    <schema>
-      <key>xdmcp/DisplaysPerHost</key>
-      <signature>i</signature>
-      <default>1</default>
-    </schema>
-    <schema>
-      <key>xdmcp/Port</key>
-      <signature>i</signature>
-      <default>177</default>
-    </schema>
-    <schema>
-      <key>xdmcp/HonorIndirect</key>
-      <signature>b</signature>
-      <default>true</default>
-    </schema>
-    <schema>
-      <key>xdmcp/MaxWaitIndirect</key>
-      <signature>i</signature>
-      <default>30</default>
-    </schema>
-    <schema>
-      <key>xdmcp/PingIntervalSeconds</key>
-      <signature>i</signature>
-      <default>0</default>
-    </schema>
-    <schema>
-      <key>xdmcp/Willing</key>
-      <signature>s</signature>
-      <default>@gdmconfdir@/Xwilling</default>
-    </schema>
-  </schemalist>
-</gdmschemafile>
diff --git a/data/org.gnome.login-screen.gschema.xml.in b/data/org.gnome.login-screen.gschema.xml
index aacb3046..7b5c54d1 100644
--- a/data/org.gnome.login-screen.gschema.xml.in
+++ b/data/org.gnome.login-screen.gschema.xml
@@ -3,100 +3,100 @@
   <schema id="org.gnome.login-screen" path="/org/gnome/login-screen/">
     <key name="enable-fingerprint-authentication" type="b">
       <default>true</default>
-      <_summary>
+      <summary>
         Whether or not to allow fingerprint readers for login
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         The login screen can optionally allow users who have enrolled
         their fingerprints to log in using those prints.
-      </_description>
+      </description>
     </key>
     <key name="enable-smartcard-authentication" type="b">
       <default>true</default>
-      <_summary>
+      <summary>
         Whether or not to allow smartcard readers for login
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         The login screen can optionally allow users who have smartcards
         to log in using those smartcards.
-      </_description>
+      </description>
     </key>
     <key name="enable-password-authentication" type="b">
       <default>true</default>
-      <_summary>
+      <summary>
         Whether or not to allow passwords for login
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         The login screen can be configured to disallow password authentication,
         forcing the user to use smartcard or fingerprint authentication.
-      </_description>
+      </description>
     </key>
     <key name="logo" type="s">
       <default>''</default>
-      <_summary>
+      <summary>
         Path to small image at top of user list
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         The login screen can optionally show a small image to provide site
         administrators and distributions a way to display branding.
-      </_description>
+      </description>
     </key>
     <key name="fallback-logo" type="s">
       <default>''</default>
-      <_summary>
+      <summary>
         Path to small image at top of user list
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         The fallback login screen can optionally show a small image to provide
         site administrators and distributions a way to display branding.
-      </_description>
+      </description>
     </key>
     <key name="disable-user-list" type="b">
       <default>false</default>
-      <_summary>
+      <summary>
         Avoid showing user list
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         The login screen normally shows a list of available users to log in
         as. This setting can be toggled to disable showing the user list.
-      </_description>
+      </description>
     </key>
     <key name="banner-message-enable" type="b">
       <default>false</default>
-      <_summary>
+      <summary>
         Enable showing the banner message
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         Set to true to show the banner message text.
-      </_description>
+      </description>
     </key>
     <key name="banner-message-text" type="s">
       <default>''</default>
-      <_summary>
+      <summary>
         Banner message text
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         Text banner message to show in the login window.
-      </_description>
+      </description>
     </key>
     <key name="disable-restart-buttons" type="b">
       <default>false</default>
-      <_summary>
+      <summary>
         Disable showing the restart buttons
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         Set to true to disable showing the restart buttons in the login window.
-      </_description>
+      </description>
     </key>
     <key name="allowed-failures" type="i">
       <default>3</default>
-      <_summary>
+      <summary>
         Number of allowed authentication failures
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         The number of times a user is allowed to attempt authentication, before
         giving up and going back to user selection.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>