Author: Vlad Shakhov <lumpen.intellectual@gmail.com>
Description: Rename fr_FR locale to fr
Bug-Debian: https://bugs.debian.org/336806
--- wdm.orig/Makefile.in
+++ wdm/Makefile.in
@@ -94,7 +94,7 @@
 
 all-doc: doc/wdm.man
 
-all-nls-yes: po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr_FR.mo po/ja.mo po/ru.mo
+all-nls-yes: po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr.mo po/ja.mo po/ru.mo
 
 all-nls-no:
 
@@ -102,7 +102,7 @@
 
 install-gfx: $(DESTDIR)$(GFXDIR)/Eagle.xpm $(DESTDIR)$(GFXDIR)/Earth.jpg $(DESTDIR)$(GFXDIR)/Earth200x130.xpm $(DESTDIR)$(GFXDIR)/GnuLinux-logo.jpg $(DESTDIR)$(GFXDIR)/Stars.jpg $(DESTDIR)$(GFXDIR)/StarsLogo.jpg $(DESTDIR)$(GFXDIR)/gnuLogo.xpm
 
-install-nls-yes: $(DESTDIR)$(NLSDIR)/cs/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/cy/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/de/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/en/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/es/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/fr_FR/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ja/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ru/LC_MESSAGES/wdm.mo
+install-nls-yes: $(DESTDIR)$(NLSDIR)/cs/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/cy/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/de/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/en/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/es/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/fr/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ja/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ru/LC_MESSAGES/wdm.mo
 
 install-nls-no:
 
@@ -327,12 +327,12 @@
 	$(INSTALL) -d $(@D)
 	$(INSTALL_DATA) po/es.mo $@
 
-po/fr_FR.mo: po/fr_FR.po
-	$(msgfmt) -o $@ po/fr_FR.po
+po/fr.mo: po/fr.po
+	$(msgfmt) -o $@ po/fr.po
 
-$(DESTDIR)$(NLSDIR)/fr_FR/LC_MESSAGES/wdm.mo: po/fr_FR.mo
+$(DESTDIR)$(NLSDIR)/fr/LC_MESSAGES/wdm.mo: po/fr.mo
 	$(INSTALL) -d $(@D)
-	$(INSTALL_DATA) po/fr_FR.mo $@
+	$(INSTALL_DATA) po/fr.mo $@
 
 po/ja.mo: po/ja.po
 	$(msgfmt) -o $@ po/ja.po
@@ -456,10 +456,10 @@
 
 
 clean:
-	rm -f src/TestLogin/TestLogin.o src/chooser.o src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o src/wdmChooser/chooser.o src/wdmLogin/Login.o src/wdmLogin/config.o src/wdmPrefs/prefs.o src/wdmPrefs/testPanel.o src/wdmPrefs/testPanel2.o configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr_FR.mo po/ja.mo po/ru.mo doc/wdm.man bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs bin/libwdm.a
+	rm -f src/TestLogin/TestLogin.o src/chooser.o src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o src/wdmChooser/chooser.o src/wdmLogin/Login.o src/wdmLogin/config.o src/wdmPrefs/prefs.o src/wdmPrefs/testPanel.o src/wdmPrefs/testPanel2.o configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr.mo po/ja.mo po/ru.mo doc/wdm.man bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs bin/libwdm.a
 
 distclean:
-	rm -f src/TestLogin/TestLogin.o src/chooser.o src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o src/wdmChooser/chooser.o src/wdmLogin/Login.o src/wdmLogin/config.o src/wdmPrefs/prefs.o src/wdmPrefs/testPanel.o src/wdmPrefs/testPanel2.o configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr_FR.mo po/ja.mo po/ru.mo doc/wdm.man bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs bin/libwdm.a bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs config.status config.log include/config.h include/gnuLogo.xpm Makefile
+	rm -f src/TestLogin/TestLogin.o src/chooser.o src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o src/wdmChooser/chooser.o src/wdmLogin/Login.o src/wdmLogin/config.o src/wdmPrefs/prefs.o src/wdmPrefs/testPanel.o src/wdmPrefs/testPanel2.o configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr.mo po/ja.mo po/ru.mo doc/wdm.man bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs bin/libwdm.a bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs config.status config.log include/config.h include/gnuLogo.xpm Makefile
 	if test -e bin; then rmdir bin; fi
 
 po/wdm.pot: src/TestLogin/TestLogin.c src/chooser.c src/libwdm/debug.c src/libwdm/environment.c src/libwdm/names.c src/libwdm/plcheckers.c src/wdm/Greet.c src/wdm/access.c src/wdm/auth.c src/wdm/choose.c src/wdm/daemon.c src/wdm/dm.c src/wdm/dpylist.c src/wdm/file.c src/wdm/genauth.c src/wdm/loghelpers.c src/wdm/mitauth.c src/wdm/netaddr.c src/wdm/policy.c src/wdm/protodpy.c src/wdm/reset.c src/wdm/resource.c src/wdm/server.c src/wdm/session.c src/wdm/socket.c src/wdm/util.c src/wdm/verify.c src/wdm/xdmcp.c src/wdmChooser/chooser.c src/wdmLogin/Login.c src/wdmLogin/config.c src/wdmPrefs/prefs.c src/wdmPrefs/testPanel.c src/wdmPrefs/testPanel2.c
--- /dev/null
+++ wdm/po/fr.po
@@ -0,0 +1,180 @@
+# Copyright 2003 (c), Mathieu Roy <yeupou@gnu.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+msgid ""
+msgstr ""
+"Project-Id-Version: wdm 1.25\n"
+"POT-Creation-Date: Fri, 14 Nov 2003 09:03:15 +0100\n"
+"PO-Revision-Date: Fri, 14 Nov 2003 09:03:15 +0100\n"
+"Last-Translator: Mathieu Roy\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/wdmLogin/Login.c:70
+msgid "no help available."
+msgstr ""
+"wdm is a graphical interface used to authenticate a user to the system and "
+"perform the login process.\n"
+"\n"
+"\n"
+"Enter your user name (userid) at the prompt and press <enter>.  The panel "
+"will then present a prompt to enter your password.  Enter the password and "
+"press <enter>.\n"
+"\n"
+"\n"
+"The login will then be performed and your window manager started.\n"
+"\n"
+"\n"
+"The Start WM PopUp selection specifies the parameter to pass to Xsession to "
+"start the window manager.\n"
+"\n"
+"\n"
+"NoChange will start the same window manager the user used for their last "
+"session.\n"
+"\n"
+"\n"
+"failsafe is a simple xterm session and the other listed options will start "
+"the indicated (installation specific) window manager.\n"
+"\n"
+"\n"
+"The Options PopUp selection specifies:\n"
+"\n"
+"     Login - logon to the system\n"
+"\n"
+"     Reboot - shutdown and reboot the system\n"
+"\n"
+"     Halt - shutdown the system and halt\n"
+"\n"
+"     ExitLogin - exit the display manager\n"
+"\n"
+"\n"
+"The installation may require a valid username and password or username=root "
+"and root's password to perform Reboot, Halt or Exit.\n"
+"\n"
+"\n"
+"NOTE:  ExitLogin (or, as it is sometimes refered to: exit) is intended for "
+"use primarily in wdm testing.  It will shut down the x-server but the wdm "
+"must be terminated by other means.  Starting wdm as a detached process will "
+"result that it will be very difficult  to terminate.\n"
+"\n"
+"\n"
+"ExitLogin performs the same operation as ctrl-r does for xdm.\n"
+"\n"
+"\n"
+"1. The StartOver button will erase the current login Information and begin "
+"the login process again.\n"
+"\n"
+"\n"
+"2. See the man page for additional information on configuring this package.  "
+"There are numerous options for setting the background color or pixmap, the "
+"LoginPanel logo, the selection of window managers to start, and the login "
+"verification for Reboot, halt and exit."
+
+#: src/wdmLogin/Login.c:114
+msgid "Login"
+msgstr "Ouvrir une session"
+
+#: src/wdmLogin/Login.c:114
+msgid "Reboot"
+msgstr "Redémarrer"
+
+#: src/wdmLogin/Login.c:114
+msgid "Halt"
+msgstr "Arrêter le système"
+
+#: src/wdmLogin/Login.c:115
+msgid "ExitLogin"
+msgstr ""
+
+#: src/wdmLogin/Login.c:118
+msgid "Login failed"
+msgstr "Échec de l'ouverture de session"
+
+#: src/wdmLogin/Login.c:118
+msgid "Reboot failed"
+msgstr "Échec du redémarrage"
+
+#: src/wdmLogin/Login.c:119
+msgid "Halt failed"
+msgstr "Échec de l'arrêt"
+
+#: src/wdmLogin/Login.c:119
+msgid "ExitLogin failed"
+msgstr ""
+
+#: src/wdmLogin/Login.c:279
+msgid "NoChange"
+msgstr "Habituel"
+
+#: src/wdmLogin/Login.c:298
+msgid "failsafe"
+msgstr "Sans échec"
+
+#: src/wdmLogin/Login.c:376
+msgid "ERROR"
+msgstr "Erreur"
+
+#: src/wdmLogin/Login.c:435
+msgid "Password:"
+msgstr "Mot-de-passe :"
+
+#: src/wdmLogin/Login.c:443 src/wdmLogin/Login.c:772
+msgid "Login name:"
+msgstr "Nom d'utilisateur :"
+
+#: src/wdmLogin/Login.c:474
+msgid "invalid name"
+msgstr "nom invalide"
+
+#: src/wdmLogin/Login.c:496
+msgid "validating"
+msgstr "validation"
+
+#: src/wdmLogin/Login.c:498 src/wdmLogin/Login.c:529
+msgid "exiting"
+msgstr "exit"
+
+#: src/wdmLogin/Login.c:547
+msgid "Close Help"
+msgstr "Sans aide"
+
+#: src/wdmLogin/Login.c:554 src/wdmLogin/Login.c:866
+msgid "Help"
+msgstr "Aide"
+
+#: src/wdmLogin/Login.c:720
+msgid "Login Authentication"
+msgstr "Authentification"
+
+#: src/wdmLogin/Login.c:729
+msgid "Welcome to"
+msgstr "Bienvenue sur"
+
+#: src/wdmLogin/Login.c:816
+msgid "Start WM"
+msgstr "Démarre l'environement"
+
+#: src/wdmLogin/Login.c:834
+msgid "Options"
+msgstr "Options"
+
+#: src/wdmLogin/Login.c:874
+msgid "Start Over"
+msgstr "Annuler"
+
+#: src/wdmLogin/Login.c:881
+msgid "Go!"
+msgstr "Hop !"
--- wdm.orig/po/fr_FR.po
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 2003 (c), Mathieu Roy <yeupou@gnu.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-msgid ""
-msgstr ""
-"Project-Id-Version: wdm 1.25\n"
-"POT-Creation-Date: Fri, 14 Nov 2003 09:03:15 +0100\n"
-"PO-Revision-Date: Fri, 14 Nov 2003 09:03:15 +0100\n"
-"Last-Translator: Mathieu Roy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/wdmLogin/Login.c:70
-msgid "no help available."
-msgstr ""
-"wdm is a graphical interface used to authenticate a user to the system and "
-"perform the login process.\n"
-"\n"
-"\n"
-"Enter your user name (userid) at the prompt and press <enter>.  The panel "
-"will then present a prompt to enter your password.  Enter the password and "
-"press <enter>.\n"
-"\n"
-"\n"
-"The login will then be performed and your window manager started.\n"
-"\n"
-"\n"
-"The Start WM PopUp selection specifies the parameter to pass to Xsession to "
-"start the window manager.\n"
-"\n"
-"\n"
-"NoChange will start the same window manager the user used for their last "
-"session.\n"
-"\n"
-"\n"
-"failsafe is a simple xterm session and the other listed options will start "
-"the indicated (installation specific) window manager.\n"
-"\n"
-"\n"
-"The Options PopUp selection specifies:\n"
-"\n"
-"     Login - logon to the system\n"
-"\n"
-"     Reboot - shutdown and reboot the system\n"
-"\n"
-"     Halt - shutdown the system and halt\n"
-"\n"
-"     ExitLogin - exit the display manager\n"
-"\n"
-"\n"
-"The installation may require a valid username and password or username=root "
-"and root's password to perform Reboot, Halt or Exit.\n"
-"\n"
-"\n"
-"NOTE:  ExitLogin (or, as it is sometimes refered to: exit) is intended for "
-"use primarily in wdm testing.  It will shut down the x-server but the wdm "
-"must be terminated by other means.  Starting wdm as a detached process will "
-"result that it will be very difficult  to terminate.\n"
-"\n"
-"\n"
-"ExitLogin performs the same operation as ctrl-r does for xdm.\n"
-"\n"
-"\n"
-"1. The StartOver button will erase the current login Information and begin "
-"the login process again.\n"
-"\n"
-"\n"
-"2. See the man page for additional information on configuring this package.  "
-"There are numerous options for setting the background color or pixmap, the "
-"LoginPanel logo, the selection of window managers to start, and the login "
-"verification for Reboot, halt and exit."
-
-#: src/wdmLogin/Login.c:114
-msgid "Login"
-msgstr "Ouvrir une session"
-
-#: src/wdmLogin/Login.c:114
-msgid "Reboot"
-msgstr "Redémarrer"
-
-#: src/wdmLogin/Login.c:114
-msgid "Halt"
-msgstr "Arrêter le système"
-
-#: src/wdmLogin/Login.c:115
-msgid "ExitLogin"
-msgstr ""
-
-#: src/wdmLogin/Login.c:118
-msgid "Login failed"
-msgstr "Échec de l'ouverture de session"
-
-#: src/wdmLogin/Login.c:118
-msgid "Reboot failed"
-msgstr "Échec du redémarrage"
-
-#: src/wdmLogin/Login.c:119
-msgid "Halt failed"
-msgstr "Échec de l'arrêt"
-
-#: src/wdmLogin/Login.c:119
-msgid "ExitLogin failed"
-msgstr ""
-
-#: src/wdmLogin/Login.c:279
-msgid "NoChange"
-msgstr "Habituel"
-
-#: src/wdmLogin/Login.c:298
-msgid "failsafe"
-msgstr "Sans échec"
-
-#: src/wdmLogin/Login.c:376
-msgid "ERROR"
-msgstr "Erreur"
-
-#: src/wdmLogin/Login.c:435
-msgid "Password:"
-msgstr "Mot-de-passe :"
-
-#: src/wdmLogin/Login.c:443 src/wdmLogin/Login.c:772
-msgid "Login name:"
-msgstr "Nom d'utilisateur :"
-
-#: src/wdmLogin/Login.c:474
-msgid "invalid name"
-msgstr "nom invalide"
-
-#: src/wdmLogin/Login.c:496
-msgid "validating"
-msgstr "validation"
-
-#: src/wdmLogin/Login.c:498 src/wdmLogin/Login.c:529
-msgid "exiting"
-msgstr "exit"
-
-#: src/wdmLogin/Login.c:547
-msgid "Close Help"
-msgstr "Sans aide"
-
-#: src/wdmLogin/Login.c:554 src/wdmLogin/Login.c:866
-msgid "Help"
-msgstr "Aide"
-
-#: src/wdmLogin/Login.c:720
-msgid "Login Authentication"
-msgstr "Authentification"
-
-#: src/wdmLogin/Login.c:729
-msgid "Welcome to"
-msgstr "Bienvenue sur"
-
-#: src/wdmLogin/Login.c:816
-msgid "Start WM"
-msgstr "Démarre l'environement"
-
-#: src/wdmLogin/Login.c:834
-msgid "Options"
-msgstr "Options"
-
-#: src/wdmLogin/Login.c:874
-msgid "Start Over"
-msgstr "Annuler"
-
-#: src/wdmLogin/Login.c:881
-msgid "Go!"
-msgstr "Hop !"
