more spelling fixes

2 files changed, 73 insertions, 58 deletions

diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 272138411..258f7c882 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -4,8 +4,8 @@ use common qw(:common);
       8 => __("256 colors"),
 #     15 => __("32 thousand colors"),
      16 => __("65 thousand colors"),
-     24 => __("16 millions of colors"),
-     32 => __("4 billions of colors"),
+     24 => __("16 million colors"),
+     32 => __("4 billion colors"),
 );
 @depths = ikeys(%depths);
 
@@ -27,18 +27,18 @@ $resolution_wanted = "1024x768";
 );
 
 %standard_monitors = (
-  __("Standard VGA, 640x480 in 60 Hz")                             => [ '640x480@60',      "31.5"            , "60" ],
-  __("Super VGA, 800x600 in 56 Hz") 				   => [ '800x600@56',      "31.5-35.1"       , "55-60" ],
-  __("8514 Compatible, 1024x768 in 87 Hz interlaced (no 800x600)") => [ '8514 compatible', "31.5,35.5"       , "60,70,87" ],
-  __("Super VGA, 1024x768 in 87 Hz interlaced, 800x600 in 56 Hz")  => [ '1024x768@87i',    "31.5,35.15,35.5" , "55-90" ],
-  __("Extended Super VGA, 800x600 in 60 Hz, 640x480 in 72 Hz")     => [ '800x600@60',      "31.5-37.9"       , "55-90" ],
-  __("Non-Interlaced SVGA, 1024x768 in 60 Hz, 800x600 in 72 Hz")   => [ '1024x768@60',     "31.5-48.5"       , "55-90" ],
-  __("High Frequency SVGA, 1024x768 in 70 Hz") 		           => [ '1024x768@70',     "31.5-57.0"       , "50-90" ],
-  __("Multi-frequency that can do 1280x1024 in 60 Hz") 	           => [ '1280x1024@60',    "31.5-64.3"       , "50-90" ],
-  __("Multi-frequency that can do 1280x1024 in 74 Hz") 	           => [ '1280x1024@74',    "31.5-79.0"       , "50-100" ],
-  __("Multi-frequency that can do 1280x1024 in 76 Hz") 	           => [ '1280x1024@76',    "31.5-82.0"       , "40-100" ],
-  __("Monitor that can do 1600x1200 in 70 Hz")                     => [ '1600x1200@70',    "31.5-88.0"       , "50-120" ],
-  __("Monitor that can do 1600x1200 in 76 Hz")		           => [ '1600x1200@76',    "31.5-94.0"       , "50-160" ],
+  __("Standard VGA, 640x480 at 60 Hz")                             => [ '640x480@60',      "31.5"            , "60" ],
+  __("Super VGA, 800x600 at 56 Hz") 				   => [ '800x600@56',      "31.5-35.1"       , "55-60" ],
+  __("8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)") => [ '8514 compatible', "31.5,35.5"       , "60,70,87" ],
+  __("Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz")  => [ '1024x768@87i',    "31.5,35.15,35.5" , "55-90" ],
+  __("Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz")     => [ '800x600@60',      "31.5-37.9"       , "55-90" ],
+  __("Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz")   => [ '1024x768@60',     "31.5-48.5"       , "55-90" ],
+  __("High Frequency SVGA, 1024x768 at 70 Hz") 		           => [ '1024x768@70',     "31.5-57.0"       , "50-90" ],
+  __("Multi-frequency that can do 1280x1024 at 60 Hz") 	           => [ '1280x1024@60',    "31.5-64.3"       , "50-90" ],
+  __("Multi-frequency that can do 1280x1024 at 74 Hz") 	           => [ '1280x1024@74',    "31.5-79.0"       , "50-100" ],
+  __("Multi-frequency that can do 1280x1024 at 76 Hz") 	           => [ '1280x1024@76',    "31.5-82.0"       , "40-100" ],
+  __("Monitor that can do 1600x1200 at 70 Hz")                     => [ '1600x1200@70',    "31.5-88.0"       , "50-120" ],
+  __("Monitor that can do 1600x1200 at 76 Hz")		           => [ '1600x1200@76',    "31.5-94.0"       , "50-160" ],
 );
 
 # * Screen/video card configuration. 
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 467bdd528..397712904 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: panoramix VERSION\n"
-"POT-Creation-Date: 1999-08-29 00:52+0200\n"
+"POT-Creation-Date: 1999-08-29 14:19+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -164,11 +164,11 @@ msgid "65 thousand colors"
 msgstr "65 tusen farger"
 
 #: ../Xconfigurator_consts.pm_.c:7
-msgid "16 millions of colors"
+msgid "16 million colors"
 msgstr "16 millioner farger"
 
 #: ../Xconfigurator_consts.pm_.c:8
-msgid "4 billions of colors"
+msgid "4 billion colors"
 msgstr "4 milliarder farger"
 
 #: ../Xconfigurator_consts.pm_.c:20
@@ -200,51 +200,51 @@ msgid "16 mb or more"
 msgstr "16 mb eller mer"
 
 #: ../Xconfigurator_consts.pm_.c:30
-msgid "Standard VGA, 640x480 in 60 Hz"
+msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standard VGA, 640x480 i 60 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:31
-msgid "Super VGA, 800x600 in 56 Hz"
+msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA 800x600 i 56 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:32
-msgid "8514 Compatible, 1024x768 in 87 Hz interlaced (no 800x600)"
+msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 kompatibel, 1024x768 i 87 Hz interlaced (ikke 800x600)"
 
 #: ../Xconfigurator_consts.pm_.c:33
-msgid "Super VGA, 1024x768 in 87 Hz interlaced, 800x600 in 56 Hz"
+msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 i 87 Hz interlaced, 800x600 i 56 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:34
-msgid "Extended Super VGA, 800x600 in 60 Hz, 640x480 in 72 Hz"
+msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Utvidet Super VGA, 800x600 i 60 Hz, 640x480 i 72 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:35
-msgid "Non-Interlaced SVGA, 1024x768 in 60 Hz, 800x600 in 72 Hz"
+msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Ikke-interlaced SVGA, 1024x768 i 60 Hz, 800x600 i 72 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:36
-msgid "High Frequency SVGA, 1024x768 in 70 Hz"
+msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Høyfrekvens SVGA, 1024x768 i 70 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:37
-msgid "Multi-frequency that can do 1280x1024 in 60 Hz"
+msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Flerfrekvens som kan klare 1280x1024 i 60 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:38
-msgid "Multi-frequency that can do 1280x1024 in 74 Hz"
+msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Flerfrekvens som kan klare 1280x1024 i 74 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:39
-msgid "Multi-frequency that can do 1280x1024 in 76 Hz"
+msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Flerfrekvens som kan klare 1280x1024 i 76 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:40
-msgid "Monitor that can do 1600x1200 in 70 Hz"
+msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor som kan klare 1600x1200 i 70 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:41
-msgid "Monitor that can do 1600x1200 in 76 Hz"
+msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor som kan klare 1600x1200 i 76 Hz"
 
 #: ../Xconfigurator_consts.pm_.c:46
@@ -480,7 +480,7 @@ msgid "All primary partitions are used"
 msgstr "Alle primære partisjoner er i bruk"
 
 #: ../diskdrake.pm_.c:45
-msgid "I can't add no more partition"
+msgid "I can't add any more partition"
 msgstr "Jeg kan ikke legge til flere partisjoner"
 
 #: ../diskdrake.pm_.c:45
@@ -820,8 +820,9 @@ msgid ""
 "\n"
 "If you don't know if your computer has SCSI interfaces, consult the\n"
 "original documentation delivered with the computer, or if you use\n"
-"Microsoft Windows 95/98, inspect the information available via \"Control\n"
-"panel\", \"System\", \"Peripheral manager\"."
+"Microsoft Windows 95/98, inspect the information available via the "
+"\"Control\n"
+"panel\", \"System's icon, \"Device Manager\" tab."
 msgstr ""
 "Systemet fant ikke noen SCSI-kort. Hvis du har ett (eller flere) klikk på "
 "\"Ja\" og velg modul\n"
@@ -900,7 +901,7 @@ msgstr ""
 
 #: ../install2.pm_.c:97 ../install2.pm_.c:100 ../install2.pm_.c:103
 #: ../install2.pm_.c:106 ../install2.pm_.c:109 ../install2.pm_.c:141
-#: ../install2.pm_.c:158 ../install2.pm_.c:187
+#: ../install2.pm_.c:156 ../install2.pm_.c:185
 msgid "Help"
 msgstr "Hjelp"
 
@@ -925,7 +926,7 @@ msgstr ""
 
 #: ../install2.pm_.c:129
 msgid ""
-"You can now authorize one or more people to be use your Linux\n"
+"You can now authorize one or more people to use your Linux\n"
 "system. Each user account will have their own customizable environment.\n"
 "\n"
 "It is very important that you create a regular user account, even if \n"
@@ -956,92 +957,106 @@ msgid ""
 "It is now time to configure the video card and monitor\n"
 "configuration for the X windows Graphic User Interface (GUI). First\n"
 "select your monitor. Next, you may test the configuration and change\n"
-"your\n"
-"selections if necessary."
+"your selections if necessary."
 msgstr ""
 
-#: ../install2.pm_.c:164
+#: ../install2.pm_.c:162
 msgid "Choose your language"
 msgstr "Velg språk"
 
-#: ../install2.pm_.c:165
+#: ../install2.pm_.c:163
 msgid "Choose install or upgrade"
 msgstr "Velg installering eller oppgradering"
 
-#: ../install2.pm_.c:166
+#: ../install2.pm_.c:164
 msgid "Select installation class"
 msgstr "Velg installasjonsklasse"
 
-#: ../install2.pm_.c:167
+#: ../install2.pm_.c:165
 msgid "Setup SCSI"
 msgstr "Oppsett SCSI"
 
-#: ../install2.pm_.c:168
+#: ../install2.pm_.c:166
 msgid "Setup filesystems"
 msgstr "Oppsett filsystemer"
 
-#: ../install2.pm_.c:169
+#: ../install2.pm_.c:167
 msgid "Format partitions"
 msgstr "Formater partisjoner"
 
-#: ../install2.pm_.c:170
+#: ../install2.pm_.c:168
 msgid "Choose packages to install"
 msgstr "Velg pakker for installering"
 
-#: ../install2.pm_.c:171
+#: ../install2.pm_.c:169
 msgid "Install system"
 msgstr "Installer systemet"
 
-#: ../install2.pm_.c:172
+#: ../install2.pm_.c:170
 #, fuzzy
 msgid "Configure mouse"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:173
+#: ../install2.pm_.c:171
 msgid "Configure networking"
 msgstr "Konfigurer nettverk"
 
-#: ../install2.pm_.c:177 ../install_steps_graphical.pm_.c:407
+#: ../install2.pm_.c:172
+#, fuzzy
+msgid "Configure timezone"
+msgstr "Konfigurer X"
+
+#: ../install2.pm_.c:173
+#, fuzzy
+msgid "Configure services"
+msgstr "Konfigurer X"
+
+#: ../install2.pm_.c:174
+#, fuzzy
+msgid "Configure printer"
+msgstr "Konfigurer X"
+
+#: ../install2.pm_.c:175 ../install_steps_graphical.pm_.c:407
 msgid "Set root password"
 msgstr "Sett root passord"
 
-#: ../install2.pm_.c:178
+#: ../install2.pm_.c:176
 msgid "Add a user"
 msgstr "Legg til en bruker"
 
-#: ../install2.pm_.c:179
+#: ../install2.pm_.c:177
 msgid "Create bootdisk"
 msgstr "Opprett oppstartdiskett"
 
-#: ../install2.pm_.c:180
+#: ../install2.pm_.c:178
 msgid "Install bootloader"
 msgstr "Installer oppstartslaster"
 
-#: ../install2.pm_.c:181
+#: ../install2.pm_.c:179
 msgid "Configure X"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:182
+#: ../install2.pm_.c:180
 msgid "Exit install"
 msgstr "Gå ut av installering"
 
-#: ../install2.pm_.c:196
+#: ../install2.pm_.c:194
 msgid "beginner"
 msgstr "nybegynner"
 
-#: ../install2.pm_.c:196
+#: ../install2.pm_.c:194
 msgid "developer"
 msgstr "utvikler"
 
-#: ../install2.pm_.c:196
+#: ../install2.pm_.c:194
 msgid "expert"
 msgstr "ekspert"
 
-#: ../install2.pm_.c:196
+#: ../install2.pm_.c:194
 msgid "server"
 msgstr "tjener"
 
-#: ../install2.pm_.c:277
+#: ../install2.pm_.c:275
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1049,7 +1064,7 @@ msgstr ""
 "En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye "
 "filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet"
 
-#: ../install2.pm_.c:292
+#: ../install2.pm_.c:290
 msgid "partitioning failed: no root filesystem"
 msgstr "partisjonering feilet: intet root filsystem"