diff options
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/printer.pm | 2 | ||||
| -rw-r--r-- | perl-install/share/po/no.po | 156 |
4 files changed, 81 insertions, 81 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index ff95819dc..b93caf6b7 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -1,5 +1,5 @@ VERSION = 2.2.10-BOOT -SUDO = sudo +SUDO = sudo SO_FILES = c/blib/arch/auto/c/c.so PMS = *.pm c/*.pm resize_fat/*.pm po/*.pm pci_probing/*.pm commands install2 diskdrake XFdrake ROOTDEST = /export diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 2607e48c4..69d66d7e1 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -305,7 +305,7 @@ $o = $::o = { installClass => "beginner", - base => [ qw(basesystem initscripts console-tools mkbootdisk linuxconf anacron linux_logo rhs-hwdiag utempter ldconfig chkconfig ntsysv mktemp setup setuptool filesystem MAKEDEV SysVinit ash at authconfig bash bdflush binutils console-tools crontabs dev e2fsprogs ed etcskel file fileutils findutils getty_ps gpm grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time timeconfig tmpwatch util-linux vim-minimal vixie-cron which cpio) ], + base => [ qw(basesystem initscripts console-tools mkbootdisk anacron rhs-hwdiag utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time timeconfig tmpwatch util-linux vim-minimal vixie-cron which cpio) ], # for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm # intf => [ { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } ], diff --git a/perl-install/printer.pm b/perl-install/printer.pm index 873c4d8bf..a481a9a14 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -76,7 +76,7 @@ supported printer: } Resolution: {300} {300} {} BitsPerPixel: {3} {Normal color printing with color cartridge} - BitsPerPixel: {8} {Floyd-Steinberg B&W printing for better greys} + BitsPerPixel: {8} {Floyd-Steinberg B & W printing for better greys} BitsPerPixel: {24} {Floyd-Steinberg Color printing (best, but slow)} BitsPerPixel: {32} {Sometimes provides better output than 24} EndEntry diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index ef7a3e16e..5d99370eb 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-09-04 20:41+0200\n" +"POT-Creation-Date: 1999-09-04 21:09+0200\n" "PO-Revision-Date: 1999-08-25 11:07+0200\n" "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" "Language-Team: norwegian\n" @@ -64,8 +64,8 @@ msgstr "En feil oppsto, prøv å endre noen parametere" msgid "Automatic resolutions" msgstr "Automatiske oppløsninger" -#: ../Xconfigurator.pm_.c:333 ../install_steps_graphical.pm_.c:594 -#: ../install_steps_graphical.pm_.c:595 ../install_steps_interactive.pm_.c:297 +#: ../Xconfigurator.pm_.c:333 ../install_steps_graphical.pm_.c:597 +#: ../install_steps_graphical.pm_.c:598 ../install_steps_interactive.pm_.c:297 #: ../install_steps_interactive.pm_.c:298 msgid "Resolution" msgstr "Oppløsning" @@ -516,7 +516,7 @@ msgstr "Les nøye!" msgid "all data on this partition will be lost" msgstr "alle data på denne partisjonen vil gå tapt" -#: ../diskdrake.pm_.c:136 ../install2.pm_.c:383 ../install_steps.pm_.c:76 +#: ../diskdrake.pm_.c:136 ../install2.pm_.c:384 ../install_steps.pm_.c:76 #: ../install_steps_interactive.pm_.c:33 msgid "Error" msgstr "Feil" @@ -1014,7 +1014,7 @@ msgstr "Konfigurer X" msgid "Configure printer" msgstr "Konfigurer X" -#: ../install2.pm_.c:187 ../install_steps_graphical.pm_.c:444 +#: ../install2.pm_.c:187 ../install_steps_graphical.pm_.c:447 msgid "Set root password" msgstr "Sett root passord" @@ -1054,7 +1054,7 @@ msgstr "ekspert" msgid "server" msgstr "tjener" -#: ../install2.pm_.c:393 +#: ../install2.pm_.c:394 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" @@ -1062,7 +1062,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:408 +#: ../install2.pm_.c:409 msgid "partitioning failed: no root filesystem" msgstr "partisjonering feilet: intet root filsystem" @@ -1070,203 +1070,203 @@ msgstr "partisjonering feilet: intet root filsystem" msgid "no floppy available" msgstr "" -#: ../install_steps_graphical.pm_.c:206 +#: ../install_steps_graphical.pm_.c:209 msgid "Hide" msgstr "Gjem" -#: ../install_steps_graphical.pm_.c:206 +#: ../install_steps_graphical.pm_.c:209 msgid "Show All" msgstr "Vis alle" -#: ../install_steps_graphical.pm_.c:210 +#: ../install_steps_graphical.pm_.c:213 msgid "Select All" msgstr "Velg alle" -#: ../install_steps_graphical.pm_.c:210 +#: ../install_steps_graphical.pm_.c:213 msgid "Unselect All" msgstr "Fjern alle" -#: ../install_steps_graphical.pm_.c:277 +#: ../install_steps_graphical.pm_.c:280 msgid "Choose the packages you want to install" msgstr "Velg pakker du ønsker å installere" -#: ../install_steps_graphical.pm_.c:288 +#: ../install_steps_graphical.pm_.c:291 msgid " Mb" msgstr "Mb" -#: ../install_steps_graphical.pm_.c:288 +#: ../install_steps_graphical.pm_.c:291 msgid "Total size: " msgstr "Total størrelse: " -#: ../install_steps_graphical.pm_.c:289 +#: ../install_steps_graphical.pm_.c:292 msgid "Info" msgstr "" -#: ../install_steps_graphical.pm_.c:314 +#: ../install_steps_graphical.pm_.c:317 msgid "Installing" msgstr "Installerer" -#: ../install_steps_graphical.pm_.c:320 +#: ../install_steps_graphical.pm_.c:323 msgid "Please wait, " msgstr "Vennligst vent, " -#: ../install_steps_graphical.pm_.c:322 +#: ../install_steps_graphical.pm_.c:325 msgid "Time remaining " msgstr "Tid som gjenstår " -#: ../install_steps_graphical.pm_.c:323 +#: ../install_steps_graphical.pm_.c:326 msgid "Total time " msgstr "Total tid " -#: ../install_steps_graphical.pm_.c:328 +#: ../install_steps_graphical.pm_.c:331 msgid "preparing installation" msgstr "forbereder installasjon" -#: ../install_steps_graphical.pm_.c:349 +#: ../install_steps_graphical.pm_.c:352 #, c-format msgid "installing package %s" msgstr "installerer pakke %s" -#: ../install_steps_graphical.pm_.c:380 +#: ../install_steps_graphical.pm_.c:383 #, c-format msgid "Configuring network device %s" msgstr "Konfigurerer nettverks-enhet %s" -#: ../install_steps_graphical.pm_.c:388 +#: ../install_steps_graphical.pm_.c:391 msgid "IP address:" msgstr "IP adresse:" -#: ../install_steps_graphical.pm_.c:389 +#: ../install_steps_graphical.pm_.c:392 msgid "Netmask:" msgstr "Nettmaske:" -#: ../install_steps_graphical.pm_.c:398 +#: ../install_steps_graphical.pm_.c:401 msgid "IP address should be in format 1.2.3.4" msgstr "" -#: ../install_steps_graphical.pm_.c:411 +#: ../install_steps_graphical.pm_.c:414 #, fuzzy msgid "Configuring network" msgstr "Konfigurer nettverk" -#: ../install_steps_graphical.pm_.c:419 +#: ../install_steps_graphical.pm_.c:422 #, fuzzy msgid "Host name:" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:420 +#: ../install_steps_graphical.pm_.c:423 #, fuzzy msgid "DNS server:" msgstr "tjener" -#: ../install_steps_graphical.pm_.c:421 +#: ../install_steps_graphical.pm_.c:424 msgid "Gateway:" msgstr "" -#: ../install_steps_graphical.pm_.c:422 +#: ../install_steps_graphical.pm_.c:425 msgid "Gateway device:" msgstr "" -#: ../install_steps_graphical.pm_.c:447 ../install_steps_graphical.pm_.c:655 +#: ../install_steps_graphical.pm_.c:450 ../install_steps_graphical.pm_.c:658 msgid "Password" msgstr "Passord" -#: ../install_steps_graphical.pm_.c:448 ../install_steps_graphical.pm_.c:656 +#: ../install_steps_graphical.pm_.c:451 ../install_steps_graphical.pm_.c:659 msgid "Password (again)" msgstr "Passord (igjen)" -#: ../install_steps_graphical.pm_.c:457 ../install_steps_graphical.pm_.c:671 +#: ../install_steps_graphical.pm_.c:460 ../install_steps_graphical.pm_.c:674 msgid "Please try again" msgstr "Vennligst prøv igjen" -#: ../install_steps_graphical.pm_.c:457 ../install_steps_graphical.pm_.c:671 +#: ../install_steps_graphical.pm_.c:460 ../install_steps_graphical.pm_.c:674 msgid "You must enter the same password" msgstr "Du må skrive inn det samme passordet" -#: ../install_steps_graphical.pm_.c:458 +#: ../install_steps_graphical.pm_.c:461 msgid "This password is too simple" msgstr "Dette passordet er for enkelt" -#: ../install_steps_graphical.pm_.c:467 +#: ../install_steps_graphical.pm_.c:470 #, fuzzy msgid "Printer" msgstr "Enhet: " -#: ../install_steps_graphical.pm_.c:468 +#: ../install_steps_graphical.pm_.c:471 msgid "Would you like to configure a printer?" msgstr "" -#: ../install_steps_graphical.pm_.c:476 ../install_steps_interactive.pm_.c:179 +#: ../install_steps_graphical.pm_.c:479 ../install_steps_interactive.pm_.c:179 msgid "Standard Printer Options" msgstr "" -#: ../install_steps_graphical.pm_.c:477 ../install_steps_interactive.pm_.c:180 +#: ../install_steps_graphical.pm_.c:480 ../install_steps_interactive.pm_.c:180 msgid "" "Every print queue (which print jobs are directed to) needs a \n" "\t\t\t name (often lp) and a spool directory associated with it. What \n" "\t\t\t name and directory should be used for this queue?" msgstr "" -#: ../install_steps_graphical.pm_.c:480 ../install_steps_interactive.pm_.c:183 +#: ../install_steps_graphical.pm_.c:483 ../install_steps_interactive.pm_.c:183 msgid "Name of queue:" msgstr "" -#: ../install_steps_graphical.pm_.c:480 ../install_steps_interactive.pm_.c:183 +#: ../install_steps_graphical.pm_.c:483 ../install_steps_interactive.pm_.c:183 msgid "Spool directory:" msgstr "" -#: ../install_steps_graphical.pm_.c:491 ../install_steps_interactive.pm_.c:194 +#: ../install_steps_graphical.pm_.c:494 ../install_steps_interactive.pm_.c:194 msgid "Select Printer Connection" msgstr "" -#: ../install_steps_graphical.pm_.c:492 ../install_steps_interactive.pm_.c:195 +#: ../install_steps_graphical.pm_.c:495 ../install_steps_interactive.pm_.c:195 msgid "How is the printer connected?" msgstr "" -#: ../install_steps_graphical.pm_.c:507 ../install_steps_interactive.pm_.c:210 +#: ../install_steps_graphical.pm_.c:510 ../install_steps_interactive.pm_.c:210 msgid "" "What device is your printer connected to \n" "(note that /dev/lp0 is equivalent to LPT1:)?\n" msgstr "" -#: ../install_steps_graphical.pm_.c:509 ../install_steps_interactive.pm_.c:212 +#: ../install_steps_graphical.pm_.c:512 ../install_steps_interactive.pm_.c:212 msgid "I detect :" msgstr "" -#: ../install_steps_graphical.pm_.c:513 ../install_steps_interactive.pm_.c:216 +#: ../install_steps_graphical.pm_.c:516 ../install_steps_interactive.pm_.c:216 msgid "Local Printer Device" msgstr "" -#: ../install_steps_graphical.pm_.c:515 ../install_steps_interactive.pm_.c:218 +#: ../install_steps_graphical.pm_.c:518 ../install_steps_interactive.pm_.c:218 #, fuzzy msgid "Printer Device:" msgstr "Enhet: " -#: ../install_steps_graphical.pm_.c:521 ../install_steps_interactive.pm_.c:224 +#: ../install_steps_graphical.pm_.c:524 ../install_steps_interactive.pm_.c:224 msgid "Remote lpd Printer Options" msgstr "" -#: ../install_steps_graphical.pm_.c:522 ../install_steps_interactive.pm_.c:225 +#: ../install_steps_graphical.pm_.c:525 ../install_steps_interactive.pm_.c:225 msgid "" "To use a remote lpd print queue, you need to supply \n" "the hostname of the printer server and the queue name \n" "on that server which jobs should be placed in." msgstr "" -#: ../install_steps_graphical.pm_.c:525 ../install_steps_interactive.pm_.c:228 +#: ../install_steps_graphical.pm_.c:528 ../install_steps_interactive.pm_.c:228 #, fuzzy msgid "Remote hostname:" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:525 ../install_steps_interactive.pm_.c:228 +#: ../install_steps_graphical.pm_.c:528 ../install_steps_interactive.pm_.c:228 msgid "Remote queue:" msgstr "" -#: ../install_steps_graphical.pm_.c:530 ../install_steps_interactive.pm_.c:233 +#: ../install_steps_graphical.pm_.c:533 ../install_steps_interactive.pm_.c:233 msgid "SMB/Windows 95/NT Printer Options" msgstr "" -#: ../install_steps_graphical.pm_.c:531 ../install_steps_interactive.pm_.c:234 +#: ../install_steps_graphical.pm_.c:534 ../install_steps_interactive.pm_.c:234 msgid "" "To print to a SMB printer, you need to provide the \n" "SMB host name (this is not always the same as the machines \n" @@ -1275,44 +1275,44 @@ msgid "" "applicable user name, password, and workgroup information." msgstr "" -#: ../install_steps_graphical.pm_.c:536 ../install_steps_interactive.pm_.c:239 +#: ../install_steps_graphical.pm_.c:539 ../install_steps_interactive.pm_.c:239 #, fuzzy msgid "SMB server IP:" msgstr "tjener" -#: ../install_steps_graphical.pm_.c:536 ../install_steps_interactive.pm_.c:239 +#: ../install_steps_graphical.pm_.c:539 ../install_steps_interactive.pm_.c:239 #, fuzzy msgid "SMB server host:" msgstr "tjener" -#: ../install_steps_graphical.pm_.c:537 ../install_steps_graphical.pm_.c:551 +#: ../install_steps_graphical.pm_.c:540 ../install_steps_graphical.pm_.c:554 #: ../install_steps_interactive.pm_.c:240 #: ../install_steps_interactive.pm_.c:254 #, fuzzy msgid "Password:" msgstr "Passord" -#: ../install_steps_graphical.pm_.c:537 ../install_steps_interactive.pm_.c:240 +#: ../install_steps_graphical.pm_.c:540 ../install_steps_interactive.pm_.c:240 #, fuzzy msgid "Share name:" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:537 ../install_steps_graphical.pm_.c:551 +#: ../install_steps_graphical.pm_.c:540 ../install_steps_graphical.pm_.c:554 #: ../install_steps_interactive.pm_.c:240 #: ../install_steps_interactive.pm_.c:254 #, fuzzy msgid "User name:" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:538 ../install_steps_interactive.pm_.c:241 +#: ../install_steps_graphical.pm_.c:541 ../install_steps_interactive.pm_.c:241 msgid "Workgroup:" msgstr "" -#: ../install_steps_graphical.pm_.c:545 ../install_steps_interactive.pm_.c:248 +#: ../install_steps_graphical.pm_.c:548 ../install_steps_interactive.pm_.c:248 msgid "NetWare Printer Options" msgstr "" -#: ../install_steps_graphical.pm_.c:546 ../install_steps_interactive.pm_.c:249 +#: ../install_steps_graphical.pm_.c:549 ../install_steps_interactive.pm_.c:249 msgid "" "To print to a NetWare printer, you need to provide the \n" "NetWare print server name (this is not always the same as the machines \n" @@ -1320,77 +1320,77 @@ msgid "" "wish to access and any applicable user name and password." msgstr "" -#: ../install_steps_graphical.pm_.c:550 ../install_steps_interactive.pm_.c:253 +#: ../install_steps_graphical.pm_.c:553 ../install_steps_interactive.pm_.c:253 msgid "Print Queue Name:" msgstr "" -#: ../install_steps_graphical.pm_.c:550 ../install_steps_interactive.pm_.c:253 +#: ../install_steps_graphical.pm_.c:553 ../install_steps_interactive.pm_.c:253 msgid "Printer Server:" msgstr "" -#: ../install_steps_graphical.pm_.c:572 ../install_steps_interactive.pm_.c:275 +#: ../install_steps_graphical.pm_.c:575 ../install_steps_interactive.pm_.c:275 #, fuzzy msgid "Configure Printer" msgstr "Konfigurer X" -#: ../install_steps_graphical.pm_.c:573 ../install_steps_interactive.pm_.c:276 +#: ../install_steps_graphical.pm_.c:576 ../install_steps_interactive.pm_.c:276 #, fuzzy msgid "What type of printer do you have?" msgstr "Hva slags brukertype vil du ha?" -#: ../install_steps_graphical.pm_.c:584 ../install_steps_graphical.pm_.c:585 +#: ../install_steps_graphical.pm_.c:587 ../install_steps_graphical.pm_.c:588 #: ../install_steps_interactive.pm_.c:287 #: ../install_steps_interactive.pm_.c:288 msgid "Paper Size" msgstr "" -#: ../install_steps_graphical.pm_.c:604 ../install_steps_interactive.pm_.c:307 +#: ../install_steps_graphical.pm_.c:607 ../install_steps_interactive.pm_.c:307 msgid "CRLF" msgstr "" -#: ../install_steps_graphical.pm_.c:605 ../install_steps_interactive.pm_.c:308 +#: ../install_steps_graphical.pm_.c:608 ../install_steps_interactive.pm_.c:308 msgid "Fix stair-stepping of text?" msgstr "" -#: ../install_steps_graphical.pm_.c:620 ../install_steps_interactive.pm_.c:323 +#: ../install_steps_graphical.pm_.c:623 ../install_steps_interactive.pm_.c:323 #, fuzzy msgid "Configure Uniprint Driver" msgstr "Konfigurer X" -#: ../install_steps_graphical.pm_.c:621 ../install_steps_interactive.pm_.c:324 +#: ../install_steps_graphical.pm_.c:624 ../install_steps_interactive.pm_.c:324 msgid "You may now configure the uniprint options for this printer." msgstr "" -#: ../install_steps_graphical.pm_.c:629 ../install_steps_interactive.pm_.c:332 +#: ../install_steps_graphical.pm_.c:632 ../install_steps_interactive.pm_.c:332 #, fuzzy msgid "Configure Color Depth" msgstr "Konfigurer X" -#: ../install_steps_graphical.pm_.c:630 ../install_steps_interactive.pm_.c:333 +#: ../install_steps_graphical.pm_.c:633 ../install_steps_interactive.pm_.c:333 msgid "You may now configure the color options for this printer." msgstr "" -#: ../install_steps_graphical.pm_.c:650 +#: ../install_steps_graphical.pm_.c:653 msgid "Add user" msgstr "Legg til bruker" -#: ../install_steps_graphical.pm_.c:654 +#: ../install_steps_graphical.pm_.c:657 msgid "User name" msgstr "Brukernavn" -#: ../install_steps_graphical.pm_.c:657 +#: ../install_steps_graphical.pm_.c:660 msgid "Real name" msgstr "Virkelig navn" -#: ../install_steps_graphical.pm_.c:658 +#: ../install_steps_graphical.pm_.c:661 msgid "Shell" msgstr "Skall" -#: ../install_steps_graphical.pm_.c:673 +#: ../install_steps_graphical.pm_.c:676 msgid "Please give a user name" msgstr "Vennligst oppgi et brukernavn" -#: ../install_steps_graphical.pm_.c:674 +#: ../install_steps_graphical.pm_.c:677 #, fuzzy msgid "" "The user name must contain only lower cased letters, numbers, `-' and `_'" |