Add the usage of xml-i18n-tools for the desktop file

Thu May 03 13:22:52 2001  George Lebl <jirka@5z.com>

	* gui/Makefile.am, gui/gdmconfig.desktop(.in), po/POTFILES.in,
	  po/*.po, configure.in, Makefile.am:  Add the usage of
	  xml-i18n-tools for the desktop file

14 files changed, 92 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 33dc34ab..6732f733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 03 13:22:52 2001  George Lebl <jirka@5z.com>
+
+	* gui/Makefile.am, gui/gdmconfig.desktop(.in), po/POTFILES.in,
+	  po/*.po, configure.in, Makefile.am:  Add the usage of
+	  xml-i18n-tools for the desktop file
+
 Wed May 02 18:08:17 2001  George Lebl <jirka@5z.com>
 
 	* gui/gdmconfig.glade: fix limits on the spinbuttons
diff --git a/Makefile.am b/Makefile.am
index 24151b75..dab2d7c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,16 @@
 SUBDIRS = config macros pixmaps intl daemon gui docs po debian
 
-EXTRA_DIST = ChangeLog README.install RELEASENOTES gdm.spec gdm.spec.in \
-             gdmconfig-pam gdmconfig-security
+EXTRA_DIST = \
+	ChangeLog		\
+	README.install		\
+	RELEASENOTES		\
+	gdm.spec		\
+	gdm.spec.in		\
+	gdmconfig-pam		\
+	gdmconfig-security	\
+	xml-i18n-extract.in	\
+	xml-i18n-merge.in	\
+	xml-i18n-update.in
 
 install-data-local:
 if CONSOLE_HELPER
@@ -12,3 +21,10 @@ if CONSOLE_HELPER
 	$(LN_S) @bindir@/consolehelper $(bindir)/gdmconfig
 endif
 
+DISTCLEANFILES = \
+	xml-i18n-extract	\
+	xml-i18n-extract.in	\
+	xml-i18n-merge		\
+	xml-i18n-merge.in	\
+	xml-i18n-update		\
+	xml-i18n-update.in
diff --git a/configure.in b/configure.in
index 4856030e..7be376cf 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,11 @@
 AC_INIT(daemon/gdm.h)
 
+dnl
+dnl Due to the sed scripts being split on 90 line
+dnl blocks, this macro needs to be right at the beggining.
+dnl
+AM_PROG_XML_I18N_TOOLS
+
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(gdm,2.2.1)
 AM_MAINTAINER_MODE
diff --git a/gui/.cvsignore b/gui/.cvsignore
index 7247bc9f..339a6c2d 100644
--- a/gui/.cvsignore
+++ b/gui/.cvsignore
@@ -6,3 +6,4 @@ gdmgreeter
 gdmlogin
 gdmchooser
 gdmconfig
+gdmconfig.desktop
diff --git a/gui/Makefile.am b/gui/Makefile.am
index ed01434b..44afbc02 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -32,7 +32,9 @@ gdmlogin_LDADD = $(GNOME_LIBDIR) $(GNOME_LIBS) $(GNOMEUI_LIBS) $(INTLLIBS) @PIXB
 gdmconfig_LDADD = $(GNOME_LIBDIR) $(GNOME_LIBS) $(GNOMEUI_LIBS) $(INTLLIBS) @LIBGLADE_LIBS@
  
 Systemdir = $(datadir)/gnome/apps/System
-System_DATA = gdmconfig.desktop
+System_in_files = gdmconfig.desktop.in
+System_DATA = $(System_in_files:.desktop.in=.desktop)
+@XML_I18N_MERGE_DESKTOP_RULE@
 
 Gladedir = $(datadir)/gdm
 Glade_DATA = gdmconfig.glade gdmchooser.glade
diff --git a/gui/gdmconfig.desktop b/gui/gdmconfig.desktop
deleted file mode 100644
index 753019f0..00000000
--- a/gui/gdmconfig.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=GDM Configurator
-Name[fr]=Configurateur de GDM
-Name[ja]=GDMÀßÄê¥Ä¡¼¥ë
-Name[no]=GDM konfigurator
-Name[sk]=Nastavenie GDM
-Name[sv]=GDM-konfigurerare
-Name[uk]=îÁÌÁÛÔÕ×ÁÎÎÑ GDM
-Comment=A graphical application for configuring the GNOME Display Manager (GDM)
-Comment[fr]=Application graphique de configuration du Gestionnaire d'Affichage GNOME (GDM)
-Comment[ja]=GNOME¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤òÀßÄꤹ¤ë¥°¥é¥Õ¥£¥Ã¥¯¥¢¥×¥ê¥±¡¼¥·¥ç¥ó
-Comment[no]=En grafisk applikasjon for konfigurasjon av GNOME Display Manager (GDM)
-Comment[sk]=Grafické rozhranie pre nastavenie GNOME Správcu displeja (GDM)
-Comment[sv]=Ett grafiskt program för att konfigurera GNOME:s displayhanterare (GDM)
-Comment[uk]=çÒÁƦÞÎÁ ÐÒÏÇÒÁÍÁ ÄÌÑ ÎÁÌÁÛÔÕ×ÁÎÎÑ íÅÎÅÄÖÅÒÁ äÉÓÐÌÅÑ GNOME (GDM)
-TryExec=gdmconfig
-Exec=gdmconfig
-Icon=gdm.xpm
-Terminal=0
-Type=Application
diff --git a/gui/gdmconfig.desktop.in b/gui/gdmconfig.desktop.in
new file mode 100644
index 00000000..e75e5b77
--- /dev/null
+++ b/gui/gdmconfig.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+_Name=GDM Configurator
+_Comment=A graphical application for configuring the GNOME Display Manager (GDM)
+TryExec=gdmconfig
+Exec=gdmconfig
+Icon=gdm.xpm
+Terminal=0
+Type=Application
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6569c6d7..69f4a081 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,3 +14,5 @@ gui/gdmlogin.c
 gui/gdmconfig.c
 gui/gdmconfig-strings.c
 gui/icon-entry-hack.c
+# files added by xml-i18n-prepare
+gui/gdmconfig.desktop.in
diff --git a/po/fr.po b/po/fr.po
index 24b5654a..85f65877 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1655,3 +1655,11 @@ msgstr ""
 #~ msgstr ""
 #~ "main: Erreur lors de la configuration de la procédure de prise en charge du "
 #~ "signal USR2"
+
+#: gui/gdmconfig.desktop.in:3
+msgid "GDM Configurator"
+msgstr "Configurateur de GDM"
+
+#: gui/gdmconfig.desktop.in:4
+msgid "A graphical application for configuring the GNOME Display Manager (GDM)"
+msgstr "Application graphique de configuration du Gestionnaire d'Affichage GNOME (GDM)"
diff --git a/po/ja.po b/po/ja.po
index 7018dba7..33e88013 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1302,3 +1302,11 @@ msgstr "(C) 2001 Lee Mallabone"
 #: gui/gdmconfig-strings.c:124
 msgid "Configure the GNOME Display Manager"
 msgstr "GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã ÀßÄê"
+
+#: gui/gdmconfig.desktop.in:3
+msgid "GDM Configurator"
+msgstr "GDMÀßÄê¥Ä¡¼¥ë"
+
+#: gui/gdmconfig.desktop.in:4
+msgid "A graphical application for configuring the GNOME Display Manager (GDM)"
+msgstr "GNOME¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤òÀßÄꤹ¤ë¥°¥é¥Õ¥£¥Ã¥¯¥¢¥×¥ê¥±¡¼¥·¥ç¥ó"
diff --git a/po/no.po b/po/no.po
index 2fcc493e..f04b8f6d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1717,3 +1717,11 @@ msgstr ""
 #: gui/icon-entry-hack.c:234
 msgid "Choose an icon"
 msgstr "Velg et ikon"
+
+#: gui/gdmconfig.desktop.in:3
+msgid "GDM Configurator"
+msgstr "GDM konfigurator"
+
+#: gui/gdmconfig.desktop.in:4
+msgid "A graphical application for configuring the GNOME Display Manager (GDM)"
+msgstr "En grafisk applikasjon for konfigurasjon av GNOME Display Manager (GDM)"
diff --git a/po/sk.po b/po/sk.po
index 0f17da11..db000786 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1659,3 +1659,11 @@ msgstr ""
 msgid "Choose an icon"
 msgstr "Vyberte ikonu"
 
+
+#: gui/gdmconfig.desktop.in:3
+msgid "GDM Configurator"
+msgstr "Nastavenie GDM"
+
+#: gui/gdmconfig.desktop.in:4
+msgid "A graphical application for configuring the GNOME Display Manager (GDM)"
+msgstr "Grafické rozhranie pre nastavenie GNOME Správcu displeja (GDM)"
diff --git a/po/sv.po b/po/sv.po
index 9a8a46a4..a99cf974 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1492,3 +1492,11 @@ msgstr ""
 
 #~ msgid "Can't read DefaultImage: %s. Suspending face browser!"
 #~ msgstr "Kan inte läsa DefaultImage: %s. Deaktiverar bildbläddraren!"
+
+#: gui/gdmconfig.desktop.in:3
+msgid "GDM Configurator"
+msgstr "GDM-konfigurerare"
+
+#: gui/gdmconfig.desktop.in:4
+msgid "A graphical application for configuring the GNOME Display Manager (GDM)"
+msgstr "Ett grafiskt program för att konfigurera GNOME:s displayhanterare (GDM)"
diff --git a/po/uk.po b/po/uk.po
index b5ac0692..b09d1d19 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1391,3 +1391,11 @@ msgstr ""
 "ëÏÎƦ­ÕÒÕ×ÁÎÎÑ íÅÎÅÄÖÅÒÁ ÄÉÓÐÌÅÑ GNOME.\n"
 "âÕÄØ ÌÁÓËÁ, צÄÓÉÌÁÊÔÅ ÐÏצÄÏÍÌÅÎÎÑ ÐÒÏ ÐÏÍÉÌËÉ ÔÁ ÐÒÏÐÏÚÉæ§ ÎÁ "
 "http://bugzilla.gnome.org ÄÏ ÐÒÏÄÕËÔÕ \"gdm\"."
+
+#: gui/gdmconfig.desktop.in:3
+msgid "GDM Configurator"
+msgstr "îÁÌÁÛÔÕ×ÁÎÎÑ GDM"
+
+#: gui/gdmconfig.desktop.in:4
+msgid "A graphical application for configuring the GNOME Display Manager (GDM)"
+msgstr "çÒÁƦÞÎÁ ÐÒÏÇÒÁÍÁ ÄÌÑ ÎÁÌÁÛÔÕ×ÁÎÎÑ íÅÎÅÄÖÅÒÁ äÉÓÐÌÅÑ GNOME (GDM)"