1 files changed, 56 insertions, 52 deletions

diff --git a/po/de.po b/po/de.po
index ff08ba20..c17d1b08 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
Diffstat-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm3
-rw-r--r--perl-install/install/NEWS1
3 files changed, 4 insertions, 1 deletionsdiff --git a/perl-install/NEWS b/perl-install/NEWSindex aac16d1ed..5eb8c0231 100644--- a/perl-install/NEWS+++ b/perl-install/NEWS@@ -1,5 +1,6 @@ - drakboot:   o always display security settings+  o allow timeout to be '0'  Version 13.5 - 26 January 2010 diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pmindex 266df5ebd..07a770f49 100644--- a/perl-install/bootloader.pm+++ b/perl-install/bootloader.pm@@ -1711,7 +1711,8 @@ sub write_grub {     { 	my @conf; -	push @conf, map { "$_ $bootloader->{$_}" } grep { $bootloader->{$_} } qw(timeout color password serial shade terminal viewport background foreground);+	push @conf, map { "$_ $bootloader->{$_}" } grep { defined $bootloader->{$_} } qw(timeout);+	push @conf, map { "$_ $bootloader->{$_}" } grep { $bootloader->{$_} } qw(color password serial shade terminal viewport background foreground); 	push @conf, map { $_ . ' ' . $file2grub->($bootloader->{$_}) } grep { $bootloader->{$_} } qw(gfxmenu);  	eval {diff --git a/perl-install/install/NEWS b/perl-install/install/NEWSindex 26740e0c9..31679356c 100644--- a/perl-install/install/NEWS+++ b/perl-install/install/NEWS@@ -1,5 +1,6 @@ - bootloader configuration:   o always display security settings+  o allow timeout to be '0'  Version 13.8 - 3 February 2010 

Diffstat
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index aac16d1ed..5eb8c0231 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - drakboot:
   o always display security settings
+  o allow timeout to be '0'
 
 Version 13.5 - 26 January 2010
 
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 266df5ebd..07a770f49 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1711,7 +1711,8 @@ sub write_grub {
     {
 	my @conf;
 
-	push @conf, map { "$_ $bootloader->{$_}" } grep { $bootloader->{$_} } qw(timeout color password serial shade terminal viewport background foreground);
+	push @conf, map { "$_ $bootloader->{$_}" } grep { defined $bootloader->{$_} } qw(timeout);
+	push @conf, map { "$_ $bootloader->{$_}" } grep { $bootloader->{$_} } qw(color password serial shade terminal viewport background foreground);
 	push @conf, map { $_ . ' ' . $file2grub->($bootloader->{$_}) } grep { $bootloader->{$_} } qw(gfxmenu);
 
 	eval {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 26740e0c9..31679356c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
 - bootloader configuration:
   o always display security settings
+  o allow timeout to be '0'
 
 Version 13.8 - 3 February 2010
 
generated by cgit v1.2.1 (git 2.21.0) at 2024-08-21 09:50:40 +0000
 "bitte versuchen Sie es später erneut."
 
-#: mdkonline:309
+#: mdkonline:307
 msgid "Wrong password"
 msgstr "Falsches Passwort"
 
-#: mdkonline:309
+#: mdkonline:307
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -110,11 +111,11 @@ msgstr ""
 "einen Rechnernamen angeben müssen \n"
 "(nur Buchstaben sind erlaubt)."
 
-#: mdkonline:368
+#: mdkonline:366
 msgid "Welcome to MandrakeOnline"
 msgstr "Willkommen zu MandrakeOnline"
 
-#: mdkonline:369
+#: mdkonline:367
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline [1].\n"
 "This assistant will help you to upload your configuration\n"
@@ -128,36 +129,36 @@ msgstr ""
 "damit wir Sie über Sicherheitsrisiken, sowie sinnvolle Aktualisierungen\n"
 "unterrichten können.\n"
 
-#: mdkonline:386
+#: mdkonline:384
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake Datenschutz"
 
-#: mdkonline:391
+#: mdkonline:389
 msgid "Authentification"
 msgstr "Authentifizierung"
 
-#: mdkonline:392
+#: mdkonline:390
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Geben Sie Ihr MandrakeOnline Kennzeichen, Passwort und den Rechnernamen ein:"
 
-#: mdkonline:394
+#: mdkonline:392
 msgid "Login:"
 msgstr "Kennzeichen:"
 
-#: mdkonline:394
+#: mdkonline:392
 msgid "Password:"
 msgstr "Passwort:"
 
-#: mdkonline:394
+#: mdkonline:392
 msgid "Machine name:"
 msgstr "Rechnername:"
 
-#: mdkonline:398
+#: mdkonline:397
 msgid "Sending your Configuration"
 msgstr "Senden Ihrer Konfiguration"
 
-#: mdkonline:399
+#: mdkonline:398
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -194,11 +195,11 @@ msgstr ""
 "Letztendlich bekommen Sie bei Anmeldung auch einen  E-Mail Alias der\n"
 "Art: <ihr_name\\@mandrakeonline.net>"
 
-#: mdkonline:407
+#: mdkonline:406
 msgid "Error while sending informations"
 msgstr "Fehler beim Senden der Informationen"
 
-#: mdkonline:408
+#: mdkonline:407
 msgid ""
 "There was an error while sending your personal informations.\n"
 "\n"
@@ -208,15 +209,15 @@ msgstr ""
 "\n"
 "Drücken Sie die Schaltfläche „Weiter“, um es erneut zu versuchen."
 
-#: mdkonline:414
+#: mdkonline:413
 msgid "Finished"
 msgstr "Fertig"
 
-#: mdkonline:415
+#: mdkonline:414
 msgid "Your upload was successful!"
 msgstr "Ihre Daten wurden erfolgreich übertragen!"
 
-#: mdkonline:415
+#: mdkonline:414
 msgid ""
 "From now you will receive on security\n"
 "and updates announcements thanks to MandrakeOnline."
@@ -224,48 +225,48 @@ msgstr ""
 "Sie werden von nun an Hinweise über Sicherheitsaktualisierungen\n"
 "von MandrakeOnline erhalten."
 
-#: mdkonline:415
+#: mdkonline:414
 msgid "MandrakeOnline offers you the ability to automate the updates."
 msgstr ""
 "MandrakeOnline bietet Ihnen die Möglichkeit, Aktualisierungen zu "
 "automatisieren."
 
-#: mdkonline:415
+#: mdkonline:414
 msgid "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 "Ein Programm wird in regelmäßigen Abständen nach Aktualisierungen schauen\n"
 
-#: mdkonline:420
+#: mdkonline:419
 msgid "automated Upgrades"
 msgstr "automatische Aktualisierungen"
 
-#: mdkonline:431
+#: mdkonline:426
 msgid "Choose your geographical location"
 msgstr "Wählen Sie Ihre geografische Lage"
 
-#: mdkonline:463
+#: mdkonline:444
 #, fuzzy
 msgid "Reading configuration\n"
 msgstr "Senden Ihrer Konfiguration"
 
-#: mdkonline:490
+#: mdkonline:471
 #, c-format
 msgid "cannot open this file for read: %s"
 msgstr "Ich kann folgende Datei nicht zum lesen öffnen: %s"
 
-#: mdkonline:523
+#: mdkonline:511
 msgid "OK"
 msgstr "OK"
 
-#: mdkonline:529 mdkonline:555
+#: mdkonline:517 mdkonline:543
 msgid "-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: mdkonline:544
+#: mdkonline:532
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: mdkonline:553
+#: mdkonline:541
 msgid ""
 "Do you really want to abort MandrakeOnline?\n"
 "To return to the Wizard press 'Cancel',\n"
@@ -275,22 +276,25 @@ msgstr ""
 "Mit „Abbruch“ kehren Sie zum Wizard zurück,\n"
 "mit „Beenden“ verlassen sie den Wizard."
 
-#: mdkonline:557
+#: mdkonline:545
 msgid "Really abort? - MandrakeOnline"
 msgstr "Wirklich beenden? - MandrakeOnline"
 
-#: mdkonline:635
+#: mdkonline:623
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: mdkonline:636
+#: mdkonline:624
 msgid "Welcome"
 msgstr "Wilkommen"
 
-#: mdkonline:660
+#: mdkonline:648
 msgid "Close"
 msgstr "Schließen"
 
+#~ msgid "USA"
+#~ msgstr "USA"
+
 #~ msgid "I want this (local) user to get email alerts"
 #~ msgstr ""
 #~ "Folgende (lokale) Kennzeichen sollen E-Mail-Benachrichtigungen erhalten"