Corrected various English typos

6 files changed, 179 insertions, 225 deletions

diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 16a011523..9ac437fce 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -14,7 +14,7 @@ my %url2land = (
 		be => _("Belgium"),
 		cz => _("Czech Republic"),
 		de => _("Germany"),
-		gr => _("Grece"),
+		gr => _("Greece"),
 		no => _("Norway"),
 		se => _("Sweden"),
 	       );
@@ -24,7 +24,7 @@ my %land2tzs = (
 		_("Belgium") => [ 'Europe/Brussels', 'Europe/Paris', 'Europe/Berlin' ],
 		_("Czech Republic") => [ 'Europe/Prague', 'Europe/Berlin' ],
 		_("Germany") => [ 'Europe/Berlin', 'Europe/Prague' ],
-		_("Grece") => [ 'Europe/Athens', 'Europe/Prague' ],
+		_("Greece") => [ 'Europe/Athens', 'Europe/Prague' ],
 		_("Norway") => [ 'Europe/Oslo', 'Europe/Stockholm' ],
 		_("Sweden") => [ 'Europe/Stockholm', 'Europe/Oslo' ],
 		_("United States") => [ 'America/New_York', 'Canada/Atlantic', 'Asia/Tokyo', 'Australia/Sydney', 'Europe/Paris' ],
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 82b64f68e..87138b37b 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -2080,7 +2080,7 @@ sub main {
 				  val => ($::expert ? _("Normal Mode") :
 					  _("Expert Mode")) } : ()),
 			  { clicked_may_quit =>
-			    sub { $menuchoice = _("\@quit"); 1; },
+			    sub { $menuchoice = "\@quit"; 1; },
 			    val => _("Quit") },
 			  ]
 		    );
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 79d12ee04..10537746b 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-28 11:04+0100\n"
+"POT-Creation-Date: 2002-01-28 18:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -539,14 +539,14 @@ msgstr ""
 msgid "Delay before booting default image"
 msgstr ""
 
-#: ../../any.pm_.c:172 ../../any.pm_.c:774
+#: ../../any.pm_.c:172 ../../any.pm_.c:776
 #: ../../install_steps_interactive.pm_.c:1088 ../../network/modem.pm_.c:48
 #: ../../printerdrake.pm_.c:490 ../../printerdrake.pm_.c:566
 #: ../../standalone/draknet_.c:624
 msgid "Password"
 msgstr ""
 
-#: ../../any.pm_.c:173 ../../any.pm_.c:775
+#: ../../any.pm_.c:173 ../../any.pm_.c:777
 #: ../../install_steps_interactive.pm_.c:1089
 msgid "Password (again)"
 msgstr ""
@@ -581,13 +581,13 @@ msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../../any.pm_.c:186 ../../any.pm_.c:751
+#: ../../any.pm_.c:186 ../../any.pm_.c:753
 #: ../../diskdrake/interactive.pm_.c:1106
 #: ../../install_steps_interactive.pm_.c:1083
 msgid "Please try again"
 msgstr ""
 
-#: ../../any.pm_.c:186 ../../any.pm_.c:751
+#: ../../any.pm_.c:186 ../../any.pm_.c:753
 #: ../../install_steps_interactive.pm_.c:1083
 msgid "The passwords do not match"
 msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: ../../any.pm_.c:245 ../../any.pm_.c:762 ../../diskdrake/hd_gtk.pm_.c:153
+#: ../../any.pm_.c:245 ../../any.pm_.c:764 ../../diskdrake/hd_gtk.pm_.c:153
 #: ../../diskdrake/removable.pm_.c:27 ../../diskdrake/smbnfs_gtk.pm_.c:82
 #: ../../interactive_http.pm_.c:153
 msgid "Done"
@@ -722,53 +722,53 @@ msgstr ""
 msgid "This label is already used"
 msgstr ""
 
-#: ../../any.pm_.c:635
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr ""
 
-#: ../../any.pm_.c:636
+#: ../../any.pm_.c:638
 msgid "Do you have another one?"
 msgstr ""
 
-#: ../../any.pm_.c:637
+#: ../../any.pm_.c:639
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr ""
 
-#: ../../any.pm_.c:639 ../../any.pm_.c:810 ../../interactive.pm_.c:121
+#: ../../any.pm_.c:641 ../../any.pm_.c:812 ../../interactive.pm_.c:121
 #: ../../my_gtk.pm_.c:994
 msgid "No"
 msgstr ""
 
-#: ../../any.pm_.c:639 ../../any.pm_.c:809 ../../interactive.pm_.c:121
+#: ../../any.pm_.c:641 ../../any.pm_.c:811 ../../interactive.pm_.c:121
 #: ../../my_gtk.pm_.c:994
 msgid "Yes"
 msgstr ""
 
-#: ../../any.pm_.c:640
+#: ../../any.pm_.c:642
 msgid "See hardware info"
 msgstr ""
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:674
+#: ../../any.pm_.c:676
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr ""
 
-#: ../../any.pm_.c:675
+#: ../../any.pm_.c:677
 #, c-format
 msgid "(module %s)"
 msgstr ""
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:688
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr ""
 
-#: ../../any.pm_.c:694
+#: ../../any.pm_.c:696
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -780,20 +780,20 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: ../../any.pm_.c:699
+#: ../../any.pm_.c:701
 msgid "Autoprobe"
 msgstr ""
 
-#: ../../any.pm_.c:699
+#: ../../any.pm_.c:701
 msgid "Specify options"
 msgstr ""
 
-#: ../../any.pm_.c:703
+#: ../../any.pm_.c:705
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr ""
 
-#: ../../any.pm_.c:709
+#: ../../any.pm_.c:711
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -801,179 +801,179 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 
-#: ../../any.pm_.c:712
+#: ../../any.pm_.c:714
 msgid "Module options:"
 msgstr ""
 
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:725
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:741
 msgid "access to X programs"
 msgstr ""
 
-#: ../../any.pm_.c:740
+#: ../../any.pm_.c:742
 msgid "access to rpm tools"
 msgstr ""
 
-#: ../../any.pm_.c:741
+#: ../../any.pm_.c:743
 msgid "allow \"su\""
 msgstr ""
 
-#: ../../any.pm_.c:742
+#: ../../any.pm_.c:744
 msgid "access to administrative files"
 msgstr ""
 
-#: ../../any.pm_.c:747
+#: ../../any.pm_.c:749
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../../any.pm_.c:752
+#: ../../any.pm_.c:754
 msgid "This password is too simple"
 msgstr ""
 
-#: ../../any.pm_.c:753
+#: ../../any.pm_.c:755
 msgid "Please give a user name"
 msgstr ""
 
-#: ../../any.pm_.c:754
+#: ../../any.pm_.c:756
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../../any.pm_.c:755
+#: ../../any.pm_.c:757
 msgid "This user name is already added"
 msgstr ""
 
-#: ../../any.pm_.c:759
+#: ../../any.pm_.c:761
 msgid "Add user"
 msgstr ""
 
-#: ../../any.pm_.c:760
+#: ../../any.pm_.c:762
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
 
-#: ../../any.pm_.c:761
+#: ../../any.pm_.c:763
 msgid "Accept user"
 msgstr ""
 
-#: ../../any.pm_.c:772
+#: ../../any.pm_.c:774
 msgid "Real name"
 msgstr ""
 
-#: ../../any.pm_.c:773 ../../printerdrake.pm_.c:489
+#: ../../any.pm_.c:775 ../../printerdrake.pm_.c:489
 #: ../../printerdrake.pm_.c:565
 msgid "User name"
 msgstr ""
 
-#: ../../any.pm_.c:776
+#: ../../any.pm_.c:778
 msgid "Shell"
 msgstr ""
 
-#: ../../any.pm_.c:778
+#: ../../any.pm_.c:780
 msgid "Icon"
 msgstr ""
 
-#: ../../any.pm_.c:806
+#: ../../any.pm_.c:808
 msgid "Autologin"
 msgstr ""
 
-#: ../../any.pm_.c:807
+#: ../../any.pm_.c:809
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
 "Do you want to use this feature?"
 msgstr ""
 
-#: ../../any.pm_.c:811
+#: ../../any.pm_.c:813
 msgid "Choose the default user:"
 msgstr ""
 
-#: ../../any.pm_.c:812
+#: ../../any.pm_.c:814
 msgid "Choose the window manager to run:"
 msgstr ""
 
-#: ../../any.pm_.c:821
+#: ../../any.pm_.c:823
 msgid "Please choose a language to use."
 msgstr ""
 
-#: ../../any.pm_.c:823
+#: ../../any.pm_.c:825
 msgid "You can choose other languages that will be available after install"
 msgstr ""
 
-#: ../../any.pm_.c:835 ../../install_steps_interactive.pm_.c:710
+#: ../../any.pm_.c:837 ../../install_steps_interactive.pm_.c:710
 msgid "All"
 msgstr ""
 
-#: ../../any.pm_.c:919
+#: ../../any.pm_.c:921
 msgid "Allow all users"
 msgstr ""
 
-#: ../../any.pm_.c:919 ../../install_steps_interactive.pm_.c:514
+#: ../../any.pm_.c:921 ../../install_steps_interactive.pm_.c:514
 msgid "Custom"
 msgstr ""
 
-#: ../../any.pm_.c:919
+#: ../../any.pm_.c:921
 msgid "No sharing"
 msgstr ""
 
-#: ../../any.pm_.c:971
+#: ../../any.pm_.c:973
 msgid "Welcome To Crackers"
 msgstr ""
 
-#: ../../any.pm_.c:972
+#: ../../any.pm_.c:974
 msgid "Poor"
 msgstr ""
 
-#: ../../any.pm_.c:973
+#: ../../any.pm_.c:975
 msgid "Low"
 msgstr ""
 
-#: ../../any.pm_.c:974
+#: ../../any.pm_.c:976
 msgid "Medium"
 msgstr ""
 
-#: ../../any.pm_.c:975
+#: ../../any.pm_.c:977
 msgid "High"
 msgstr ""
 
-#: ../../any.pm_.c:976
+#: ../../any.pm_.c:978
 msgid "Paranoid"
 msgstr ""
 
-#: ../../any.pm_.c:979
+#: ../../any.pm_.c:981
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
 "but very sensitive: it must not be used for a machine connected to others\n"
 "or to the Internet. There is no password access."
 msgstr ""
 
-#: ../../any.pm_.c:982
+#: ../../any.pm_.c:984
 msgid ""
 "Password are now enabled, but use as a networked computer is still not "
 "recommended."
 msgstr ""
 
-#: ../../any.pm_.c:983
+#: ../../any.pm_.c:985
 msgid ""
 "Few improvements for this security level, the main one is that there are\n"
 "more security warnings and checks."
 msgstr ""
 
-#: ../../any.pm_.c:985
+#: ../../any.pm_.c:987
 msgid ""
 "This is the standard security recommended for a computer that will be used\n"
 "to connect to the Internet as a client. There are now security checks. "
 msgstr ""
 
-#: ../../any.pm_.c:987
+#: ../../any.pm_.c:989
 msgid ""
 "With this security level, the use of this system as a server becomes "
 "possible.\n"
@@ -981,25 +981,25 @@ msgid ""
 "connections from many clients. "
 msgstr ""
 
-#: ../../any.pm_.c:990
+#: ../../any.pm_.c:992
 msgid ""
 "We take level 4 features, but now the system is entirely closed.\n"
 "Security features are at their maximum."
 msgstr ""
 
-#: ../../any.pm_.c:996
+#: ../../any.pm_.c:998
 msgid "Choose security level"
 msgstr ""
 
-#: ../../any.pm_.c:999
+#: ../../any.pm_.c:1001
 msgid "Security level"
 msgstr ""
 
-#: ../../any.pm_.c:1001
+#: ../../any.pm_.c:1003
 msgid "Use libsafe for servers"
 msgstr ""
 
-#: ../../any.pm_.c:1002
+#: ../../any.pm_.c:1004
 msgid ""
 "A library which defends against buffer overflow and format string attacks."
 msgstr ""
@@ -1238,7 +1238,7 @@ msgid "Germany"
 msgstr ""
 
 #: ../../crypto.pm_.c:17 ../../crypto.pm_.c:27
-msgid "Grece"
+msgid "Greece"
 msgstr ""
 
 #: ../../crypto.pm_.c:18 ../../crypto.pm_.c:28
@@ -1981,24 +1981,6 @@ msgstr ""
 msgid "click here"
 msgstr ""
 
-#: ../../diskdrake/smbnfs_gtk.pm_.c:206
-msgid "Scanning available nfs shared resource"
-msgstr ""
-
-#: ../../diskdrake/smbnfs_gtk.pm_.c:211
-#, c-format
-msgid "Scanning available nfs shared resource of server %s"
-msgstr ""
-
-#: ../../diskdrake/smbnfs_gtk.pm_.c:236
-msgid "Scanning available samba shared resource"
-msgstr ""
-
-#: ../../diskdrake/smbnfs_gtk.pm_.c:241
-#, c-format
-msgid "Scanning available samba shared resource of server %s"
-msgstr ""
-
 #: ../../fs.pm_.c:465 ../../fs.pm_.c:475 ../../fs.pm_.c:479 ../../fs.pm_.c:483
 #: ../../fs.pm_.c:487 ../../fs.pm_.c:491
 #, c-format
@@ -6465,10 +6447,6 @@ msgstr ""
 msgid "Normal Mode"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2083
-msgid "\\@quit"
-msgstr ""
-
 #: ../../printerdrake.pm_.c:2162 ../../printerdrake.pm_.c:2182
 #: ../../printerdrake.pm_.c:2365
 msgid "Do you want to configure another printer?"
@@ -7111,7 +7089,7 @@ msgid "Use incremental backup  (do not replace old backups)"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:738
-msgid "Do not include critical files (passwd, goup, fstab)"
+msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:739
@@ -7163,7 +7141,7 @@ msgid "Please enter your login"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:955
-msgid "Please enter your passord"
+msgid "Please enter your password"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:961
@@ -7215,13 +7193,14 @@ msgid "Please enter the device name to use for backup"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:1151 ../../standalone/drakbackup_.c:1195
+#: ../../standalone/drakbackup_.c:2040
 msgid ""
-"Please entrer the maximum size\n"
+"Please enter the maximum size\n"
 " allowed for Drakbackup"
 msgstr ""
 
-#: ../../standalone/drakbackup_.c:1187
-msgid "Please entrer the directory to save:"
+#: ../../standalone/drakbackup_.c:1187 ../../standalone/drakbackup_.c:2032
+msgid "Please enter the directory to save:"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:1201 ../../standalone/drakbackup_.c:2046
@@ -7459,16 +7438,6 @@ msgstr ""
 msgid "Use Hard Disk to backup"
 msgstr ""
 
-#: ../../standalone/drakbackup_.c:2032
-msgid "Please enter the directory to save:"
-msgstr ""
-
-#: ../../standalone/drakbackup_.c:2040
-msgid ""
-"Please enter the maximum size\n"
-" allowed for Drakbackup"
-msgstr ""
-
 #: ../../standalone/drakbackup_.c:2119
 msgid "Restore from Hard Disk."
 msgstr ""
@@ -7620,7 +7589,7 @@ msgid "Data list to include on CDROM."
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:2900
-msgid "Please entrer the cd writer speed"
+msgid "Please enter the cd writer speed"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:2918
@@ -8498,7 +8467,7 @@ msgid "activate now"
 msgstr ""
 
 #: ../../standalone/draknet_.c:496 ../../standalone/draknet_.c:499
-msgid "desactivate now"
+msgid "deactivate now"
 msgstr ""
 
 #: ../../standalone/draknet_.c:502
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 69c93ccef..54942d189 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2002-01-28 11:04+0100\n"
+"POT-Creation-Date: 2002-01-28 18:42+0100\n"
 "PO-Revision-Date: 2001-09-21 10:22+0200\n"
 "Last-Translator: Andreas Bergstrøm <abergstr@halden.net>\n"
 "Language-Team: Norsk\n"
@@ -570,14 +570,14 @@ msgstr "Skjermmodus"
 msgid "Delay before booting default image"
 msgstr "Forsinkelse før oppstart av standard bilde"
 
-#: ../../any.pm_.c:172 ../../any.pm_.c:774
+#: ../../any.pm_.c:172 ../../any.pm_.c:776
 #: ../../install_steps_interactive.pm_.c:1088 ../../network/modem.pm_.c:48
 #: ../../printerdrake.pm_.c:490 ../../printerdrake.pm_.c:566
 #: ../../standalone/draknet_.c:624
 msgid "Password"
 msgstr "Passord"
 
-#: ../../any.pm_.c:173 ../../any.pm_.c:775
+#: ../../any.pm_.c:173 ../../any.pm_.c:777
 #: ../../install_steps_interactive.pm_.c:1089
 msgid "Password (again)"
 msgstr "Passord (igjen)"
@@ -613,13 +613,13 @@ msgid ""
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
-#: ../../any.pm_.c:186 ../../any.pm_.c:751
+#: ../../any.pm_.c:186 ../../any.pm_.c:753
 #: ../../diskdrake/interactive.pm_.c:1106
 #: ../../install_steps_interactive.pm_.c:1083
 msgid "Please try again"
 msgstr "Vennligst prøv igjen"
 
-#: ../../any.pm_.c:186 ../../any.pm_.c:751
+#: ../../any.pm_.c:186 ../../any.pm_.c:753
 #: ../../install_steps_interactive.pm_.c:1083
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
@@ -662,7 +662,7 @@ msgstr ""
 msgid "Add"
 msgstr "Legg til"
 
-#: ../../any.pm_.c:245 ../../any.pm_.c:762 ../../diskdrake/hd_gtk.pm_.c:153
+#: ../../any.pm_.c:245 ../../any.pm_.c:764 ../../diskdrake/hd_gtk.pm_.c:153
 #: ../../diskdrake/removable.pm_.c:27 ../../diskdrake/smbnfs_gtk.pm_.c:82
 #: ../../interactive_http.pm_.c:153
 msgid "Done"
@@ -757,53 +757,53 @@ msgstr "Du må ha en vekslingspartisjon"
 msgid "This label is already used"
 msgstr "Denne etiketten er allerede i bruk"
 
-#: ../../any.pm_.c:635
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Fant %s %s grensesnitt"
 
-#: ../../any.pm_.c:636
+#: ../../any.pm_.c:638
 msgid "Do you have another one?"
 msgstr "Har du enda ett?"
 
-#: ../../any.pm_.c:637
+#: ../../any.pm_.c:639
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Har du noen %s grensesnitt?"
 
-#: ../../any.pm_.c:639 ../../any.pm_.c:810 ../../interactive.pm_.c:121
+#: ../../any.pm_.c:641 ../../any.pm_.c:812 ../../interactive.pm_.c:121
 #: ../../my_gtk.pm_.c:994
 msgid "No"
 msgstr "Nei"
 
-#: ../../any.pm_.c:639 ../../any.pm_.c:809 ../../interactive.pm_.c:121
+#: ../../any.pm_.c:641 ../../any.pm_.c:811 ../../interactive.pm_.c:121
 #: ../../my_gtk.pm_.c:994
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../any.pm_.c:640
+#: ../../any.pm_.c:642
 msgid "See hardware info"
 msgstr "Se maskinvareinfo"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:674
+#: ../../any.pm_.c:676
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Installerer driver for %s kort %s"
 
-#: ../../any.pm_.c:675
+#: ../../any.pm_.c:677
 #, c-format
 msgid "(module %s)"
 msgstr "(modul %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:688
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Hvilken %s driver skal jeg prøve?"
 
-#: ../../any.pm_.c:694
+#: ../../any.pm_.c:696
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -822,20 +822,20 @@ msgstr ""
 "burde\n"
 "ikke forårsake noen skader."
 
-#: ../../any.pm_.c:699
+#: ../../any.pm_.c:701
 msgid "Autoprobe"
 msgstr "Automatisk sondering"
 
-#: ../../any.pm_.c:699
+#: ../../any.pm_.c:701
 msgid "Specify options"
 msgstr "Spesifiser opsjoner"
 
-#: ../../any.pm_.c:703
+#: ../../any.pm_.c:705
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Du kan nå gi dens opsjoner til modul %s."
 
-#: ../../any.pm_.c:709
+#: ../../any.pm_.c:711
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -846,11 +846,11 @@ msgstr ""
 "Opsjonene er i format ``navn=verdi navn2=verdi2 ...''.\n"
 "F.eks., ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:712
+#: ../../any.pm_.c:714
 msgid "Module options:"
 msgstr "Modulopsjoner:"
 
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:725
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -859,49 +859,49 @@ msgstr ""
 "Lasting av modul %s feilet.\n"
 "Ønsker du å prøve igjen med andre parametere?"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:741
 msgid "access to X programs"
 msgstr ""
 
-#: ../../any.pm_.c:740
+#: ../../any.pm_.c:742
 msgid "access to rpm tools"
 msgstr ""
 
-#: ../../any.pm_.c:741
+#: ../../any.pm_.c:743
 msgid "allow \"su\""
 msgstr ""
 
-#: ../../any.pm_.c:742
+#: ../../any.pm_.c:744
 msgid "access to administrative files"
 msgstr ""
 
-#: ../../any.pm_.c:747
+#: ../../any.pm_.c:749
 #, c-format
 msgid "(already added %s)"
 msgstr "(allerede lagt til %s)"
 
-#: ../../any.pm_.c:752
+#: ../../any.pm_.c:754
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: ../../any.pm_.c:753
+#: ../../any.pm_.c:755
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: ../../any.pm_.c:754
+#: ../../any.pm_.c:756
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde små bokstaver, tall, `-' og `_'"
 
-#: ../../any.pm_.c:755
+#: ../../any.pm_.c:757
 msgid "This user name is already added"
 msgstr "Denne brukeren er allerede lagt til"
 
-#: ../../any.pm_.c:759
+#: ../../any.pm_.c:761
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../../any.pm_.c:760
+#: ../../any.pm_.c:762
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -910,32 +910,32 @@ msgstr ""
 "Entre en bruker\n"
 "%s"
 
-#: ../../any.pm_.c:761
+#: ../../any.pm_.c:763
 msgid "Accept user"
 msgstr "Godta bruker"
 
-#: ../../any.pm_.c:772
+#: ../../any.pm_.c:774
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../../any.pm_.c:773 ../../printerdrake.pm_.c:489
+#: ../../any.pm_.c:775 ../../printerdrake.pm_.c:489
 #: ../../printerdrake.pm_.c:565
 msgid "User name"
 msgstr "Brukernavn"
 
-#: ../../any.pm_.c:776
+#: ../../any.pm_.c:778
 msgid "Shell"
 msgstr "Skall"
 
-#: ../../any.pm_.c:778
+#: ../../any.pm_.c:780
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../any.pm_.c:806
+#: ../../any.pm_.c:808
 msgid "Autologin"
 msgstr "Autoinnlogging"
 
-#: ../../any.pm_.c:807
+#: ../../any.pm_.c:809
 #, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
@@ -944,66 +944,66 @@ msgstr ""
 "Jeg kan sette opp maskinen din til å automatisk starte X ved oppstart.\n"
 "Vil du at X skal starte når du starter maskinen på nytt?"
 
-#: ../../any.pm_.c:811
+#: ../../any.pm_.c:813
 msgid "Choose the default user:"
 msgstr "Velg standard bruker:"
 
-#: ../../any.pm_.c:812
+#: ../../any.pm_.c:814
 msgid "Choose the window manager to run:"
 msgstr "Velg vindushåndtereren som skal kjøres:"
 
-#: ../../any.pm_.c:821
+#: ../../any.pm_.c:823
 #, fuzzy
 msgid "Please choose a language to use."
 msgstr "Vennligst velg språk som skal brukes."
 
-#: ../../any.pm_.c:823
+#: ../../any.pm_.c:825
 msgid "You can choose other languages that will be available after install"
 msgstr "Du kan velge andre språk som vil være tilgjengelige etter installasjon"
 
-#: ../../any.pm_.c:835 ../../install_steps_interactive.pm_.c:710
+#: ../../any.pm_.c:837 ../../install_steps_interactive.pm_.c:710
 msgid "All"
 msgstr "Alle"
 
-#: ../../any.pm_.c:919
+#: ../../any.pm_.c:921
 #, fuzzy
 msgid "Allow all users"
 msgstr "Legg til en bruker"
 
-#: ../../any.pm_.c:919 ../../install_steps_interactive.pm_.c:514
+#: ../../any.pm_.c:921 ../../install_steps_interactive.pm_.c:514
 msgid "Custom"
 msgstr "Skreddersydd"
 
-#: ../../any.pm_.c:919
+#: ../../any.pm_.c:921
 #, fuzzy
 msgid "No sharing"
 msgstr "CUPS starter"
 
-#: ../../any.pm_.c:971
+#: ../../any.pm_.c:973
 msgid "Welcome To Crackers"
 msgstr "Velkommen til Crackers"
 
-#: ../../any.pm_.c:972
+#: ../../any.pm_.c:974
 msgid "Poor"
 msgstr "Dårlig"
 
-#: ../../any.pm_.c:973
+#: ../../any.pm_.c:975
 msgid "Low"
 msgstr "Lav"
 
-#: ../../any.pm_.c:974
+#: ../../any.pm_.c:976
 msgid "Medium"
 msgstr "Medium"
 
-#: ../../any.pm_.c:975
+#: ../../any.pm_.c:977
 msgid "High"
 msgstr "Høy"
 
-#: ../../any.pm_.c:976
+#: ../../any.pm_.c:978
 msgid "Paranoid"
 msgstr "Paranoid"
 
-#: ../../any.pm_.c:979
+#: ../../any.pm_.c:981
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
 "but very sensitive: it must not be used for a machine connected to others\n"
@@ -1013,7 +1013,7 @@ msgstr ""
 "bruke, men mer utsatt: det må ikke brukes på en maskin koblet til andre\n"
 "eller til Internett. Det er ingen adgang med passord."
 
-#: ../../any.pm_.c:982
+#: ../../any.pm_.c:984
 msgid ""
 "Password are now enabled, but use as a networked computer is still not "
 "recommended."
@@ -1021,7 +1021,7 @@ msgstr ""
 "Passord er nå aktivert, men bruk som nettverksmaskin er fortsatt ikke "
 "anbefalt."
 
-#: ../../any.pm_.c:983
+#: ../../any.pm_.c:985
 msgid ""
 "Few improvements for this security level, the main one is that there are\n"
 "more security warnings and checks."
@@ -1029,7 +1029,7 @@ msgstr ""
 "Få endringer for dette sikkerhetsnivået, hovedforskjellen er at det er\n"
 "flere advarsler og kontroller."
 
-#: ../../any.pm_.c:985
+#: ../../any.pm_.c:987
 msgid ""
 "This is the standard security recommended for a computer that will be used\n"
 "to connect to the Internet as a client. There are now security checks. "
@@ -1037,7 +1037,7 @@ msgstr ""
 "Dette er standard sikkerhet anbefalt for en maskin som vil bli brukt til\n"
 "tilkobling mot Internett som klient. Det er nå sikkerhetskontroller. "
 
-#: ../../any.pm_.c:987
+#: ../../any.pm_.c:989
 msgid ""
 "With this security level, the use of this system as a server becomes "
 "possible.\n"
@@ -1048,7 +1048,7 @@ msgstr ""
 "Sikkerheten er nå høy nok til å bruke systemet som en tjener som\n"
 "godtar oppkoblinger fra mange klienter. "
 
-#: ../../any.pm_.c:990
+#: ../../any.pm_.c:992
 msgid ""
 "We take level 4 features, but now the system is entirely closed.\n"
 "Security features are at their maximum."
@@ -1056,21 +1056,21 @@ msgstr ""
 "Vi tar funksjonene for nivå 4, men nå er systemet fullstendig stengt.\n"
 "Sikkerhetsfunksjonene er nå på maksimum."
 
-#: ../../any.pm_.c:996
+#: ../../any.pm_.c:998
 msgid "Choose security level"
 msgstr "Velg sikkerhetsnivå"
 
-#: ../../any.pm_.c:999
+#: ../../any.pm_.c:1001
 #, fuzzy
 msgid "Security level"
 msgstr "Setter sikkerhetsnivå"
 
-#: ../../any.pm_.c:1001
+#: ../../any.pm_.c:1003
 #, fuzzy
 msgid "Use libsafe for servers"
 msgstr "Velg opsjoner for tjener"
 
-#: ../../any.pm_.c:1002
+#: ../../any.pm_.c:1004
 msgid ""
 "A library which defends against buffer overflow and format string attacks."
 msgstr ""
@@ -1321,7 +1321,7 @@ msgstr "Tysk"
 
 #: ../../crypto.pm_.c:17 ../../crypto.pm_.c:27
 #, fuzzy
-msgid "Grece"
+msgid "Greece"
 msgstr "Gresk"
 
 #: ../../crypto.pm_.c:18 ../../crypto.pm_.c:28
@@ -2125,24 +2125,6 @@ msgstr "Ekspert"
 msgid "click here"
 msgstr ""
 
-#: ../../diskdrake/smbnfs_gtk.pm_.c:206
-msgid "Scanning available nfs shared resource"
-msgstr "Sjekker tilgjengelige delte nfs-ressurser"
-
-#: ../../diskdrake/smbnfs_gtk.pm_.c:211
-#, c-format
-msgid "Scanning available nfs shared resource of server %s"
-msgstr "Sjekker tilgjengelige delte nfs-ressurser på %s"
-
-#: ../../diskdrake/smbnfs_gtk.pm_.c:236
-msgid "Scanning available samba shared resource"
-msgstr "Sjekker tilgjengelige delte samba-ressurser"
-
-#: ../../diskdrake/smbnfs_gtk.pm_.c:241
-#, c-format
-msgid "Scanning available samba shared resource of server %s"
-msgstr "Sjekker tilgjengelige delte samba-ressurser på %s"
-
 #: ../../fs.pm_.c:465 ../../fs.pm_.c:475 ../../fs.pm_.c:479 ../../fs.pm_.c:483
 #: ../../fs.pm_.c:487 ../../fs.pm_.c:491
 #, c-format
@@ -7491,11 +7473,6 @@ msgstr "Konfigurer nettverk"
 msgid "Normal Mode"
 msgstr "Normalt modus"
 
-#: ../../printerdrake.pm_.c:2083
-#, fuzzy
-msgid "\\@quit"
-msgstr "Avslutt"
-
 #: ../../printerdrake.pm_.c:2162 ../../printerdrake.pm_.c:2182
 #: ../../printerdrake.pm_.c:2365
 #, fuzzy
@@ -8262,7 +8239,7 @@ msgid "Use incremental backup  (do not replace old backups)"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:738
-msgid "Do not include critical files (passwd, goup, fstab)"
+msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:739
@@ -8321,7 +8298,7 @@ msgstr "Vennligst prøv igjen"
 
 #: ../../standalone/drakbackup_.c:955
 #, fuzzy
-msgid "Please enter your passord"
+msgid "Please enter your password"
 msgstr "Vennligst prøv igjen"
 
 #: ../../standalone/drakbackup_.c:961
@@ -8380,14 +8357,16 @@ msgid "Please enter the device name to use for backup"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:1151 ../../standalone/drakbackup_.c:1195
+#: ../../standalone/drakbackup_.c:2040
 msgid ""
-"Please entrer the maximum size\n"
+"Please enter the maximum size\n"
 " allowed for Drakbackup"
 msgstr ""
 
-#: ../../standalone/drakbackup_.c:1187
-msgid "Please entrer the directory to save:"
-msgstr ""
+#: ../../standalone/drakbackup_.c:1187 ../../standalone/drakbackup_.c:2032
+#, fuzzy
+msgid "Please enter the directory to save:"
+msgstr "Vennligst test musen."
 
 #: ../../standalone/drakbackup_.c:1201 ../../standalone/drakbackup_.c:2046
 #, fuzzy
@@ -8644,17 +8623,6 @@ msgstr "Vennligst velg din musetype."
 msgid "Use Hard Disk to backup"
 msgstr "Dårlig sikkerhetskopi-fil"
 
-#: ../../standalone/drakbackup_.c:2032
-#, fuzzy
-msgid "Please enter the directory to save:"
-msgstr "Vennligst test musen."
-
-#: ../../standalone/drakbackup_.c:2040
-msgid ""
-"Please enter the maximum size\n"
-" allowed for Drakbackup"
-msgstr ""
-
 #: ../../standalone/drakbackup_.c:2119
 msgid "Restore from Hard Disk."
 msgstr ""
@@ -8822,8 +8790,9 @@ msgid "Data list to include on CDROM."
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:2900
-msgid "Please entrer the cd writer speed"
-msgstr ""
+#, fuzzy
+msgid "Please enter the cd writer speed"
+msgstr "Vennligst test musen."
 
 #: ../../standalone/drakbackup_.c:2918
 msgid "Please enter your CD Writer device name (ex: 0,1,0)"
@@ -9767,7 +9736,7 @@ msgid "activate now"
 msgstr "aktiver nå"
 
 #: ../../standalone/draknet_.c:496 ../../standalone/draknet_.c:499
-msgid "desactivate now"
+msgid "deactivate now"
 msgstr "deaktiver nå"
 
 #: ../../standalone/draknet_.c:502
@@ -10526,6 +10495,22 @@ msgstr "Multimedia - CD-brenning"
 msgid "Scientific Workstation"
 msgstr "Vitenskaplig arbeidsstasjon"
 
+#~ msgid "Scanning available nfs shared resource"
+#~ msgstr "Sjekker tilgjengelige delte nfs-ressurser"
+
+#~ msgid "Scanning available nfs shared resource of server %s"
+#~ msgstr "Sjekker tilgjengelige delte nfs-ressurser på %s"
+
+#~ msgid "Scanning available samba shared resource"
+#~ msgstr "Sjekker tilgjengelige delte samba-ressurser"
+
+#~ msgid "Scanning available samba shared resource of server %s"
+#~ msgstr "Sjekker tilgjengelige delte samba-ressurser på %s"
+
+#, fuzzy
+#~ msgid "\\@quit"
+#~ msgstr "Avslutt"
+
 #~ msgid "Removable media"
 #~ msgstr "Fjernbart media"
 
@@ -10650,8 +10635,8 @@ msgstr "Vitenskaplig arbeidsstasjon"
 #~ "Hvilken enhet er skriveren din koblet til \n"
 #~ "(merk at /dev/lp0 er det samme som LPT1:)?\n"
 
-#~ msgid "$_"
-#~ msgstr "$_"
+#~ msgid "%s"
+#~ msgstr "%s"
 
 #~ msgid ""
 #~ "Warning, the network adapter is already configured. I will reconfigure it."
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 5ba589266..54a61b787 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -735,7 +735,7 @@ sub advanced_what_sys {
 		     1, _("These options can backup and restore all files in your /etc directory.\n"),
 		     0, my $check_what_sys = new Gtk::CheckButton( _("Backup your System files. ( /etc directory )")),
 		     0, my $check_what_versions = new Gtk::CheckButton( _("Use incremental backup  (do not replace old backups)") ),
-		     0, my $check_what_critical = new Gtk::CheckButton( _("Do not include critical files (passwd, goup, fstab)") ),
+		     0, my $check_what_critical = new Gtk::CheckButton( _("Do not include critical files (passwd, group, fstab)") ),
 		     0, _("With this option you will be able to restore any version\n of your /etc directory."),
 		     1, new Gtk::VBox(0, 15),
 		     ),
@@ -952,7 +952,7 @@ sub advanced_where_net_ftp {
 		     0, gtkset_sensitive(my $login_user_entry = new Gtk::Entry(), $where_net_ftp),
 		     ),
 	 0, gtkpack_(new Gtk::HBox(0,10),
-		     0, gtkset_sensitive(new Gtk::Label(_("Please enter your passord")),  $where_net_ftp),
+		     0, gtkset_sensitive(new Gtk::Label(_("Please enter your password")),  $where_net_ftp),
 		     1, new Gtk::HBox(0,10),
 		     0, gtkset_sensitive(my $passwd_user_entry = new Gtk::Entry(), $where_net_ftp),
 		     ),
@@ -1148,7 +1148,7 @@ gtkpack($advanced_box,
 				 ),
 		 0, new Gtk::VBox(0, 6),
 		 0, gtkpack_(new Gtk::HBox(0,10),
-		  0, gtkset_sensitive(new Gtk::Label(_("Please entrer the maximum size\n allowed for Drakbackup")), $where_tape),
+		  0, gtkset_sensitive(new Gtk::Label(_("Please enter the maximum size\n allowed for Drakbackup")), $where_tape),
 		  1, new Gtk::VBox(0, 6),
 		  0, gtkset_usize(gtkset_sensitive(my $spinner = new Gtk::SpinButton( $adj, 0, 0), $where_tape ), 200, 20),
 			     ),
@@ -1184,7 +1184,7 @@ sub advanced_where_hd {
 #	 0, my $check_where_hd = new Gtk::CheckButton( _("Use Hard Disk to backup") ),
 #	 0, new Gtk::HSeparator,
 	 0, gtkpack_(new Gtk::HBox(0,10),
-		     0, gtkset_sensitive(new Gtk::Label(_("Please entrer the directory to save:")), $where_hd ),
+		     0, gtkset_sensitive(new Gtk::Label(_("Please enter the directory to save:")), $where_hd ),
 		     1, new Gtk::VBox(0, 6),
 		     0, gtkset_usize(gtkset_sensitive($save_path_entry = new Gtk::Entry(), $where_hd), 152, 20),
 		     0, gtkset_sensitive($button = gtksignal_connect(new Gtk::Button(),  clicked => sub {
@@ -1192,7 +1192,7 @@ sub advanced_where_hd {
 		     ),
 	 0, new Gtk::VBox(0, 6),
 	 0, gtkpack_(new Gtk::HBox(0,10),
-	   0, gtkset_sensitive(new Gtk::Label(_("Please entrer the maximum size\n allowed for Drakbackup")),  $where_hd ),
+	   0, gtkset_sensitive(new Gtk::Label(_("Please enter the maximum size\n allowed for Drakbackup")),  $where_hd ),
 	   1, new Gtk::VBox(0, 6),
 	   0, gtkset_usize(gtkset_sensitive(my $spinner = new Gtk::SpinButton( $adj, 0, 0), $where_hd ), 200, 20),
 		     ),
@@ -2897,7 +2897,7 @@ sub build_backup_cd_box {
 		     ),
 	 0, new Gtk::VBox(0, 5),
 	 0, gtkpack_(new Gtk::HBox(0,10),
-		     0, gtkset_sensitive(new Gtk::Label(_("Please entrer the cd writer speed")),  $where_cd ),
+		     0, gtkset_sensitive(new Gtk::Label(_("Please enter the cd writer speed")),  $where_cd ),
 		     1, new Gtk::VBox(0, 6),
 		     0, gtkset_usize(gtkset_sensitive(my $spinner = new Gtk::SpinButton( $adj, 0, 0), $where_cd ),  100, 20),
 		     ),				 
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index a5d585b9f..fa561a75d 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -493,10 +493,10 @@ Configure them first by clicking on 'Configure'")),1,1,0);
 	my $c = $_;
 	my $widget_temp;
 	if (-e "$prefix/etc/sysconfig/network-scripts/ifcfg-eth$c") {
-	    $widget_temp = gtksignal_connect(new Gtk::Button(ethisup($c) ? _("desactivate now") : _("activate now")),
+	    $widget_temp = gtksignal_connect(new Gtk::Button(ethisup($c) ? _("deactivate now") : _("activate now")),
 					     clicked => sub {
 						 system("/sbin/if".(ethisup($c)?"down":"up")." eth$c");
-						 gtkbuttonset($_[0], ethisup($c)?_("desactivate now"):_("activate now"));
+						 gtkbuttonset($_[0], ethisup($c)?_("deactivate now"):_("activate now"));
 					     });
 	} else {
 	    $widget_temp = _("This interface has not been configured yet.\nLaunch the configuration wizard in the main window");