Merge lp:~dpm/ubuntu/lucid/xorg/bug-335678 into lp:ubuntu/lucid/xorg

[David Planella]

[David Planella (dpm)]

Proposed fix for bug 335678: completing internationalisation support for failsafeXinit so that translations are used.

See https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/335678/comments/12 for more information.

=== modified file 'debian/control'
--- debian/control	2010-01-09 00:38:46 +0000
+++ debian/control	2010-01-24 14:10:26 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu X-SWAT <[e-mail]>
 XSBC-Original-Maintainer: Debian X Strike Force <[e-mail]>
 Uploaders: David Nusinow <[e-mail]>, Drew Parsons <[e-mail]>, Julien Cristau <[e-mail]>, Brice Goglin <[e-mail]>
-Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7.3.15ubuntu3)
+Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7.3.15ubuntu3), gettext
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git

=== modified file 'debian/local/Failsafe/failsafeXinit'
--- debian/local/Failsafe/failsafeXinit	2009-11-04 18:54:26 +0000
+++ debian/local/Failsafe/failsafeXinit	2010-01-24 14:10:26 +0000
@@ -37,6 +37,12 @@
 
 timestamp=$(date +%y%m%d%H%M%S)
 
+. gettext.sh
+TEXTDOMAIN=failsafexinit
+export TEXTDOMAIN
+TEXTDOMAINDIR=/usr/share/locale-langpack
+export TEXTDOMAINDIR
+
 display_main_menu() {
     zenity --list \
         --radiolist \
@@ -94,7 +100,7 @@
             zenity --error --text "$(gettext 'Your bug could not be recorded successfully.\n')"
         fi
     else
-        zenity --error --text "$(gettext 'Cannot file bug:  $apport_hook is not present.')"
+        zenity --error --text "$(eval_gettext 'Cannot file bug:  \$apport_hook is not present.')"
     fi
 }
 
@@ -168,7 +174,7 @@
     tar -cf ${xorg_backup_file} ${xorg_backup_dir}
     rm -rf ${xorg_backup_dir}
 
-    zenity --info --text "$(gettext 'Relevant configuration and log files have been saved to:\n')"$xorg_backup_file"\n$(gettext 'Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\n')"
+    zenity --info --text "$(eval_gettext 'Relevant configuration and log files have been saved to:\n')"\$xorg_backup_file"\n$(gettext 'Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\n')"
 }
 
 # Scan Xorg.0.log for errors

=== added directory 'debian/po-failsafe'
=== added file 'debian/po-failsafe/POTFILES.in'
--- debian/po-failsafe/POTFILES.in	1970-01-01 00:00:00 +0000
+++ debian/po-failsafe/POTFILES.in	2010-01-24 14:10:26 +0000
@@ -0,0 +1,1 @@
+debian/local/Failsafe/failsafeXinit

=== modified file 'debian/rules'
--- debian/rules	2009-12-07 14:53:09 +0000
+++ debian/rules	2010-01-24 14:10:26 +0000
@@ -35,6 +35,7 @@
 	dh_testdir
 	dh_clean debian/local/X debian/po/pothead
 	-rm -rf stampdir
+	-rm -f debian/po-failsafe/failsafexinit.pot
 	-debconf-updatepo
 
 
@@ -56,6 +57,7 @@
 	dh_testdir
 	# build Debian's X server wrapper
 	$(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c
+	xgettext -f debian/po-failsafe/POTFILES.in -d failsafexinit -o debian/po-failsafe/failsafexinit.pot -L Shell
 	touch $@
 
 build-arch-only: build