GNOME Bugzilla – Bug 340017
The file config/gettextfoo.h is outdated in CVS
Last modified: 2006-05-02 20:54:41 UTC
Please describe the problem: The file config/gettextfoo.h is outdated in CVS. It is not the same that in released tarballs. The file config/gettextfoo.h is generated with the config/extract-shell.sh script. It extracts strings from config/XKeepsCrashing The problem exists since Tue Jul 19 07:53:41 2005 UTC http://cvs.gnome.org/viewcvs/gdm2/config/XKeepsCrashing?r1=1.20&r2=1.21&only_with_tag=gnome-2-14 The config/XKeepsCrashing file was modified, but config/gettextfoo.h was not updated. I found it because I update the french translation, and the po generated with "cd gdm-2.14.4/po/ && intltool-update fr" is not the same that http://l10n-status.gnome.org/gnome-2.14/PO/gdm2.gnome-2-14.fr.po Steps to reproduce: 1. 2. 3. Actual results: Expected results: Does this happen every time? Other information:
What should I do about this? Remove the config/gettextfoo.h file from CVS completely since it is a generated file?
config/gettextfoo.h is listed in POTFILES.in, so all the strings in the gettextfoo.h file are extracted to generate a po file. If you remove that file, all the strings will not be in the po file. I looked deeper to the code. XKeepsCrashing is a bash script which use gdmtranslate through gettextfunc function defined in the file. You have in the XKeepsCrashing file: MSG3=`gettextfunc "Failed to start the X server (your graphical interface). It is likely that it is not set up correctly. You will need to log in on a console and reconfigure the X server. Then restart GDM."` MSG4=`gettextfunc "Would you like to try to configure the X server? Note that you will need the root password for this."` ... You have in config/Makefile.am gettextfoo.h: XKeepsCrashing Xsession.in cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h The script extract-shell.sh extracts all the strings with gettextfunc in Xsession.in and XKeepsCrashing file and create a gettextfoo.h file Finaly, you have a file gettextfoo.h with translatable strings that intltool-update can "see". So you should not delete this file to the CVS, you should update it. You can do that by: cd config && cat XKeepsCrashing Xsession.in|./extract-shell.sh >gettextfoo.h and commit the file Sorry for my poor english.
Thanks. I ran the script as you suggested and committed the changes back into CVS. If I should also do this on the GDM 2.14 branch, then let me know by re-opening the bug.
Yes you should do it to gnome-2-14 branch too. The actual translated strings in all Po files are useless, because it's old english strings. And so it's the english strings which is displayed in all languages.
Fixed in 2.14 as well. Thanks...