Merge lp:~kelemeng/friendly-recovery/bug430926 into lp:ubuntu/lucid/friendly-recovery

[Gabor Kelemen]

Unmerged revisions

15. By Gabor Kelemen on 2010-04-02

Include locale information, so that it knows which locale to use. Fixes LP: 430926

14. By Gabor Kelemen on 2010-04-01

Make the netroot script translatable

13. By Gabor Kelemen on 2010-04-01

Update POTFILES.in

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2009-11-13 12:12:38 +0000
+++ po/POTFILES.in	2010-04-02 00:25:28 +0000
@@ -2,4 +2,7 @@
 ../usr/share/recovery-mode/options/dpkg
 ../usr/share/recovery-mode/options/fsck
 ../usr/share/recovery-mode/options/root
-../usr/share/recovery-mode/options/xfix
\ No newline at end of file
+../usr/share/recovery-mode/options/xfix
+../usr/share/recovery-mode/options/netroot
+../usr/share/recovery-mode/options/grub
+../usr/share/recovery-mode/options/clean

=== modified file 'usr/share/recovery-mode/l10n.sh'
--- usr/share/recovery-mode/l10n.sh	2008-04-28 13:15:13 +0000
+++ usr/share/recovery-mode/l10n.sh	2010-04-02 00:25:28 +0000
@@ -1,4 +1,14 @@
 
+# There is no environment set, as these steps are skipped, 
+# so we need to source the variables needed for localization ourselves
+if [ -r /etc/default/locale ]; then
+ . /etc/default/locale
+export LANG LANGUAGE
+elif [ -r /etc/environment ]; then
+ . /etc/environment
+export LANG LANGUAGE
+fi
+
 # default eval_gettext() to ensure that we do not fail
 # if gettext-base is not installed
 eval_gettext() {

=== modified file 'usr/share/recovery-mode/options/netroot'
--- usr/share/recovery-mode/options/netroot	2009-02-15 21:00:53 +0000
+++ usr/share/recovery-mode/options/netroot	2010-04-02 00:25:28 +0000
@@ -1,7 +1,9 @@
 #!/bin/sh
 
+. /usr/share/recovery-mode/l10n.sh
+
 if [ "$1" = "test" ]; then
-  echo "Drop to root shell prompt with networking"
+  echo $(eval_gettext "Drop to root shell prompt with networking")
   exit 0
 fi