diff options
49 files changed, 5271 insertions, 7847 deletions
diff --git a/docs/README b/docs/README index b298f3603..e322dae0e 100644 --- a/docs/README +++ b/docs/README @@ -80,7 +80,11 @@ Mandrake/base/depslist.ordered ! Need to be remade when Mandrake/RPMS* changes ! (with ``gendistrib --noclean --distrib .'') -Mandrake/base/compssUsers +Mandrake/base/compss + obsoletes comps. It store packages in different categories, generated + from the %{GROUP} field + ! Need to be remade when Mandrake/RPMS* changes ! + (with ``gendistrib --noclean --distrib .'') Mandrake/base/rpmsrate ranks and classify packages, so that the installer will know which @@ -113,14 +117,30 @@ Mandrake/base/rescue_stage2.bz2 there is no live system available, only the ramdisk is used. images/*.img - floppy boot images to use with DrakX. Use: - - cdrom.img for cdrom install - - network.img + network_drivers.img for ftp/nfs install (non-pcmcia devices) - - hd_grub.img for hard-disk install (see http://qa.mandrakesoft.com/hd_grub.cgi) - - pcmcia.img for pcmcia install (see ``PCMCIA install'' below for more) - -images/boot.iso - iso image to burn enabling any install (cdrom/hd/nfs/ftp) + boot images to use with DrakX. Use: + - cdrom for cdrom install + - network for ftp/nfs install (non-pcmcia devices) + - hd for hard-disk install + - pcmcia for pcmcia install (see ``PCMCIA install'' below for more) + + the following modules have been removed from: + network.img: acenic sk98lin de4x5 + cdrom.img and hd.img: BusLogic seagate fdomain g_NCR5380 dc395x_trm tmscsim + hd.img: dpt_i2o eata eata_pio eata_dma + cdrom.img: aztcd gscd isp16 mcd mcdx optcd cm206 sjcd + pcmcia.img: apa1480_cb + they are now in "other.img", + + blank.img is a blank boot image without a kernel nor initrd. this image + can be used to generate custom boot disk (to use it: + compile your custom kernel with everything needed + compiled in the kernel, not as a module (loop.o, ext3.o + if needed, usb stuff, etc) and put the "vmlinuz" on the + blank.img, then boot on it) + + if you think one of those modules is used a lot, tell me, i may find some room + to put it back on the main floppies. + ******************************************************************************** * logs ************************************************************************* diff --git a/help.msg.xml b/help.msg.xml deleted file mode 100644 index c20ea01c8..000000000 --- a/help.msg.xml +++ /dev/null @@ -1,22 +0,0 @@ -<document> - <green>Welcome to <blue>Mandrake Linux</blue> install help</green> - -In most cases, the best way to get started is to simply press the <yellow><Enter></yellow> key. -If you experience problems with standard install, try one of the following -install types (type the highlighted text and press <yellow><Enter></yellow>): - - o <white>vgalo</white> for low resolution graphical installation. - o <white>text</white> for text installation instead of the graphical one. - o <white>linux</white> for standard graphical installation at normal resolution. - o <white>expert</white> for expert graphical installation at normal resolution. - - -To repair an already installed system type <white>rescue</white> followed -by <yellow><Enter></yellow>. - -You can also pass some <white><specific kernel options></white> to the Linux kernel. -For example, try <white>linux noapic</white> if your system has trouble operating -your network adapter correctly. -<red>NOTE</red>: You cannot pass options to modules (SCSI, ethernet card) or devices -such as CD-ROM drives in this way. If you need to do so, use expert mode. -</document> diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index 613b220d7..2521e72fb 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -112,7 +112,7 @@ our %l = ( { network => [ qw(af_packet nfs lockd sunrpc) ], cdrom => [ qw(isofs) ], - loopback => [ qw(isofs loop), if_($ENV{MOVE}, qw(cryptoloop gzloop supermount)) ], + loopback => [ qw(isofs loop) ], local => [ if_(arch() =~ /^i.86|x86_64/, qw(vfat fat)), if_(arch() =~ /^ppc/, qw(hfs)), diff --git a/kernel/strip_modules b/kernel/strip_modules deleted file mode 100755 index 98e4f4496..000000000 --- a/kernel/strip_modules +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh -# -# Given a list of objects, strip all static symbols except those -# required by insmod. -# -# Copyright Keith Owens <kaos@ocs.com.au>. GPL. -# Sat Feb 1 12:52:17 EST 1997 -# -# Mainly intended for reducing the size of modules to save space -# on emergency and install disks. Be aware that removing the -# static symbols reduces the amount of diagnostic information -# available for oops. Not recommended for normal module usage. -# -# This code requires the modules use MODULE_PARM and EXPORT_. -# Do not strip modules that have not been converted to use -# MODULE_PARM or are using the old method of exporting symbols. -# In particular do not use on modules prior to 2.1.20 (approx). -# -# The objects are stripped in /tmp, only if the strip works is -# the original overwritten. If the command line to strip the -# symbols becomes too long, the strip is done in multiple passes. -# Running strip_module twice on the same object is safe (and a -# waste of time). -# - -sizeofptr="/tmp/$$.sizeofptr" -echo 'int main() { return sizeof(void *); }' | gcc -xc - -o $sizeofptr -$sizeofptr -export SIZEOF_POINTER=$? -rm -f $sizeofptr - -cat > /tmp/$$.awk <<\EOF -BEGIN { - strip = "/usr/bin/objcopy"; - nm = "/usr/bin/nm"; - cp = "/bin/cp"; - mv = "/bin/mv"; - rm = "/bin/rm"; - tmp = "/tmp"; - command_size = 400; # arbitrary but safe - - getline < "/proc/self/stat"; - pid = $1; - tmpcopy = tmp "/" pid ".object"; - nmout = tmp "/" pid ".nmout"; - - for (i = 1; i < ARGC; ++i) - strip_module(ARGV[i]); - - do_command(rm " -f " tmpcopy " " nmout); - - exit(0); -} - -function strip_module(object, - keep_symbol, to_strip, symbol, command, changed) { - do_command(cp " -a " object " " tmpcopy); - do_command(nm " " tmpcopy " > " nmout); - # delete array_name sometimes breaks, internal error, play safe - for (symbol in keep_symbol) - delete keep_symbol[symbol]; - for (symbol in to_strip) - delete to_strip[symbol]; - new_module_format = 0; - ptrskip = 2 + 2 * ENVIRON["SIZEOF_POINTER"]; - while ((getline < nmout) > 0) { - $0 = substr($0, ptrskip); - # b static variable, uninitialised - # d static variable, initialised - # r static array, initialised - # t static label/procedures - if ($1 ~ /[bdrt]/) - to_strip[$2] = ""; - else if ($2 ~ /R __ksymtab_/) - keep_symbol[substr($2, 11)] = ""; - else if ($0 ~ /R __module_parm_/) - keep_symbol[substr($2, 15)] = ""; - else if ($1 != "?") - keep_symbol[$2] = ""; - if ($2 ~ /__module/) - new_module_format = 1; - } - close(nmout); - command = ""; - changed = 0; - failure = 0; - if (new_module_format) { - for (symbol in to_strip) { - if (!(symbol in keep_symbol)) { - changed = 1; - if (length(command) > command_size) { - failure = failure || do_command(strip command " " tmpcopy); - command = ""; - } - command = command " --strip-symbol=" symbol; - } - } - } - if (command != "") { - changed = 1; - failure = failure || do_command(strip command " " tmpcopy); - } - if (changed && !failure) - do_command(mv " " tmpcopy " " object); -} - -function do_command(command) { - if ((ret = system(command)) != 0) { - giveup("command \"" command "\" failed " ret, ret); - return 1; - } - return 0; -} - -function giveup(message, ret) { - print "strip_module: " message > "/dev/stderr"; -# exit(ret); -} -EOF - -awk -f /tmp/$$.awk "$@" -ret=$? -rm -f /tmp/$$.awk -exit $ret diff --git a/kernel/update_kernel b/kernel/update_kernel index 5da807e71..772dd4a55 100755 --- a/kernel/update_kernel +++ b/kernel/update_kernel @@ -79,6 +79,7 @@ function create_modules_mar() { for i in $images; do eval "modules=\$${i}_modules_raw" modules_with_deps=`perl -I $GIBASEDIR/kernel $GIBASEDIR/kernel/dependencies.pl $version modules.dep $modules` + if [ -n "$MOVE" ]; then modules_with_deps="change_loop.o gzloop.o isofs.o zlib_inflate.o supermount.o $modules_with_deps"; fi eval "create_marfile ${i}_modules.mar $modules_with_deps" done echo @@ -163,7 +164,7 @@ for i in $ALL_KERNELS/*; do done cp -f all.modules/$main/modules.description . -l=`MOVE=$MOVE perl modules.pl images` || exit 1 +l=`perl modules.pl images` || exit 1 eval $l for i in $ALL_KERNELS/*; do diff --git a/make_boot_img b/make_boot_img deleted file mode 100755 index 4b18ad11f..000000000 --- a/make_boot_img +++ /dev/null @@ -1,811 +0,0 @@ -#!/usr/bin/perl - -use Config; -use MDK::Common; -Config->import; -my ($arch) = $Config{archname} =~ /(.*?)-/; - -# move stuff to new "kernel" directory --d 'kernel' or die "directory kernel is missing\n"; -rename 'all.kernels', 'kernel/all.kernels'; -rename 'all.modules', 'kernel/all.modules'; - -my $default_append = "ramdisk_size=128000 root=/dev/ram3"; -# full acpi support for amd64, enough acpi support for x86 ht, no acpi for others -my $default_acpi = $arch =~ /i.86/ ? "acpi=ht" : $arch =~ /x86_64/ ? "acpi=off" : "acpi=off"; -my $default_vga = "vga=788"; - -my $instdir = "mdk-stage1"; -my $tmp_mnt = '/tmp/drakx_mnt'; -my $tmp_mnt_initrd = '/tmp/drakx_mnt2'; -my $mke2fs = "/sbin/mke2fs -q -m 0 -F -s 1"; - -my $sudo; -if ($>) { - $sudo = "sudo"; - $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; -} - -sub __ { print @_, "\n"; system(@_) } -sub _ { __ @_; $? and die } - -_ "$sudo mkdir -p $tmp_mnt $tmp_mnt_initrd"; -mkdir "images"; - -chomp(my $main = `cat kernel/all.kernels/.main`); -my @kernels = grep { /^2/ } all('kernel/all.kernels'); - - -my @all_images = ( - if_($arch =~ /i.86/, 'cdrom.img', 'cdrom-changedisk.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'hd_grub.img', 'network.img', 'network_drivers.img'), - if_($arch =~ /x86_64/, 'cdrom.img', 'isolinux', 'boot.iso'), - if_($arch =~ /ia64/, 'all.img'), - ); - -my @images = @ARGV ? @ARGV : map { "images/$_" } @all_images; - -if (any { /move/ } @images) { - -e "$instdir/init-move" or die "ERROR: $instdir not built for move\n"; -} else { - -e "$instdir/init-move" and die "ERROR: $instdir built for move\n"; -} - -foreach my $img (@images) { - my ($type, $I, $extension) = $img =~ m!([^/]*)(64)?\.([^.]*)$!; - - if ($img =~ /hd_grub/) { - hd_grub($tmp_mnt, $img); - } elsif ($img =~ /isolinux/) { - isolinux($main, @kernels); - - if (my ($tftpboot) = grep { -e $_ } qw(/tftpboot /var/lib/tftpboot)) { - system("/bin/cp -f isolinux/alt0/* $tftpboot 2>/dev/null"); - } - } elsif ($img =~ /move/) { - isolinux_move($main); - - if (my ($tftpboot) = grep { -e $_ } qw(/tftpboot /var/lib/tftpboot)) { - system("/bin/cp -f move/isolinux/* $tftpboot/move 2>/dev/null"); - } - } elsif ($img =~ /boot.iso/) { - boot_iso($img); - } elsif ($img =~ /drivers/) { - drivers($type, $I, "$img-$_") foreach @kernels; - rename("$img-$main", $img); - } elsif ($extension eq 'rdz') { - initrd($tmp_mnt_initrd, $type, $I, "$img-$_") foreach @kernels; - } elsif ($extension eq 'img') { - print STDERR "calling boot_img_$arch for $img\n"; - $::{"boot_img_$arch"}->($tmp_mnt, $type, $I, "$img-$_", glob("kernel/all.kernels/$_/boot/vmlinu*")) foreach @kernels; - rename("$img-$main", $img); - } else { - die "unknown image $img"; - } -} - -sub syslinux_color { - "0" . { - default => '7', - blue => '9', - green => 'a', - red => 'c', - yellow => 'e', - white => 'f', - }->{$_[0]} || die "unknown color $_[0]\n"; -} - -sub syslinux_msg { - my ($msg_xml_file, @more_text) = @_; - - require XML::Parser; - - sub xml_tree2syslinux { - my ($current_color, $tree) = @_; - my (undef, @l) = @$tree; - join('', map { - my ($type, $val) = @$_; - if ($type eq '0') { - $val; - } else { - syslinux_color($type) . xml_tree2syslinux($type, $val) . syslinux_color($current_color); - } - } group_by2(@l)); - }; - - print "parsing $msg_xml_file\n"; - my $tree = XML::Parser->new(Style => 'Tree')->parsefile($msg_xml_file); - $tree->[0] eq 'document' or die "bad file $msg_xml_file\n"; - my $text = xml_tree2syslinux('default', $tree->[1]); - - pack("C*", 0x0E, 0x80, 0x03, 0x00) . " " - . $text . join('', @more_text) - . "\n" . syslinux_color('red') . "[F1-Help] [F2-Advanced Help] [F3-Main]" . syslinux_color('default') . "\n"; -} - -sub install_stripped { _ "strip $_[0]"; _ "$sudo install $_[0] $_[1]" } - -sub initrd { - my ($mnt, $type, $I, $img, $o_raw_stage1_tree_kind) = @_; - my $tmp = "$ENV{HOME}/tmp/initrd"; - my $tar = "$instdir/stage1-data/stage1$o_raw_stage1_tree_kind.tar.bz2"; - - __ "$sudo umount $tmp $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? ($type eq "all" ? 16386 : 16384) : ($type eq "all" ? 5000 : 2000)); - _ "$mke2fs $tmp"; - _ "$sudo mount -t ext2 $tmp $mnt -o loop"; - - _ "$sudo tar xjC $mnt -f $tar"; - symlinkf "/tmp/stage2/lib64", "$mnt/lib64" if $arch =~ /x86_64/; - - { - my $install = ${{ - network => "stage1-network", - cdrom => "stage1-cdrom", - }}{$type} || 'stage1-full'; - install_stripped("$instdir/init", "$mnt/sbin"); - install_stripped("$instdir/$install", "$mnt/sbin/stage1"); - } - - if (member($type, qw(network all))) { - install_stripped("$instdir/ppp/pppd-bin", "$mnt/sbin/pppd"); - install_stripped("$instdir/rp-pppoe/pppoe-bin", "$mnt/sbin/pppoe"); - _ "$sudo mknod $mnt/dev/ppp c 108 0"; - _ "$sudo mknod $mnt/dev/ptyp0 c 2 0"; - _ "$sudo mknod $mnt/dev/ttyp0 c 3 0"; - } - - if (member($type, qw(pcmcia all network)) && $arch !~ /ppc|ia64|x86_64/) { - _ "$sudo cp -a /etc/pcmcia $mnt/etc"; - _ "cp $mnt/etc/pcmcia/config /tmp/pcmcia_config_tmp"; - _ "tools/patch_pcmcia_config.pl /tmp/pcmcia_config_tmp kernel/all.modules/$main/modules.dep"; - _ "sudo mv /tmp/pcmcia_config_tmp $mnt/etc/pcmcia/config"; - } - my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; - my $modz = "kernel/all.modules$I/$ext"; - _ "$sudo cp -f $modz/${type}_modules.mar $mnt/modules/modules$I.mar"; - _ "$sudo cp -f $modz/modules.dep $mnt/modules/"; - _ "$sudo umount $mnt"; - -# Workaround for vfat-loop bug (quite touchy) - _ "gzip -9f $tmp"; - _ "cp -f $tmp.gz $img"; - _ "rm -f $tmp.gz"; -# _ "gzip -9 -c $tmp > $img"; -# _ "rm -f $tmp"; -} - -sub entries_append { - my ($type) = @_; - - my $automatic = $type eq "cdrom" ? 'automatic=method:cdrom' : ''; - - my @simple_entries = ( - linux => $default_vga, - vgalo => "vga=785", - vgahi => "vga=791", - vga16 => "vga16", - text => "text", - patch => "patch $default_vga", - expert => "expert $default_vga", - rescue => "rescue rw", - ); - my @entries = ( - (map { $_->[0] => "$automatic $default_acpi $_->[1]" } group_by2(@simple_entries)), - acpi => "$automatic $default_vga", - if_(member($type, "cdrom", "all"), oem => "automatic=method:cdrom $default_vga $default_acpi rescue oem rw",), - if_($type eq "all", all => "pcmcia $default_vga $default_acpi"), - ); - - map { [ $_->[0], "$default_append $_->[1]" ] } - group_by2(@entries); -} - -sub boot_img_i386 { - my ($mnt, $type, $I, $img, $kernel) = @_; - - __ "$sudo umount $mnt 2>/dev/null"; - - _ "dd if=/dev/zero of=$img bs=1k count=" . ($type eq 'all' ? 2880 : 1440); - _ "mkdosfs -f 1 -r 16 -s 2 $img"; # keep the FAT bookkeeping as small as possible - _ "$sudo syslinux-graphic $img"; - - _ "$sudo mount -t vfat -o umask=0 $img $mnt -o loop"; - _ "cat $kernel > $mnt/vmlinuz"; - bmp_to_msg('isolinux-graphic-simple.bmp', "$mnt/boot.msg", '397,190,14,6', 27, 27); - - output("$mnt/help.msg", syslinux_msg('help.msg.xml')); - output("$mnt/advanced.msg", syslinux_msg('advanced.msg.xml')); - - (my $rdz = $img) =~ s/\.img/.rdz/; - (my $initrd_type = $type) =~ s/-changedisk//; - initrd($tmp_mnt_initrd, $initrd_type, $I, $rdz); - my $short_type = substr($type, 0, 8); - eval { _ "cp -f $rdz $mnt/$short_type.rdz" }; - if ($@) { - unlink "$mnt/$short_type.rdz"; - my $avail = (split ' ', `df $mnt`)[-3]; - my $s = int((-s $rdz) / 1024); - - my ($ext) = $img =~ /\.img-(.*)/ or die "bad initrd name ($img)"; - my $dir = "kernel/all.modules/$ext"; - my $pcitable = cat_('/usr/share/ldetect-lst/pcitable'); - my @l = sort { $a <=> $b } map { - my ($name) = /(\S+)\.k?o$/ or die "bad file in .mar"; - my $gz_size = chomp_(`gzip -c $dir/$_ | wc -c`); - sprintf "%7d %6d %s\n", $gz_size, listlength($pcitable =~ /"$name"/g), $name; - } split(' ', `mdk-stage1/mar/mar -l $dir/${type}_modules.mar`); - output('.not-enough-room', "gz size - pcitable - name\n", @l); - - warn sprintf("not enough room for $rdz: need %dKB (available %dKB < needed %dKB)\n", $s - $avail, $avail, $s); - die qq(check file ".not-enough-room" to see modules size and pcitable usage\n); - } - unlink $rdz; - - my $timeout = 72; - output "$mnt/syslinux.cfg", -"default linux -prompt 1 -timeout $timeout -display boot.msg -F1 help.msg -F2 advanced.msg -F3 boot.msg -" . join('', map { -"label $_->[0] - kernel vmlinuz - append initrd=$short_type.rdz $_->[1] -" } entries_append($type)); - - _ "sync"; - _ "df $mnt"; - _ "$sudo umount $mnt"; -} - -# alias to x86 variant, slightly bigger with images though -sub boot_img_x86_64 { &boot_img_i386 } - -sub boot_img_alpha { - my ($mnt, $type, $I, $img) = @_; - - __ "$sudo umount $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$img bs=1k count=1440"; - _ "$mke2fs $img"; - _ "/sbin/e2writeboot $img /boot/bootlx"; - _ "$sudo mount -t ext2 $img $mnt -o loop"; - _ "cp -f vmlinux.gz $mnt"; - -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd($tmp_mnt_initrd, $type, $I, "$mnt/$type.rdz"); - - mkdir "$mnt/etc", 0777; - output("$mnt/etc/aboot.conf", -"0:vmlinux.gz initrd=$type.rdz rw $default_append $type -1:vmlinux.gz initrd=$type.rdz rw $default_append text $type -"); - _ "sync"; - _ "df $mnt"; -} - -sub boot_img_ia64 { - my ($mnt, $type, $_I, $img, $kernel) = @_; - my $rdz = $img; $rdz =~ s/\.img/.rdz/; - - __ "$sudo umount $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$img bs=1k count=16384"; - _ "mkdosfs $img"; - _ "$sudo mount -t vfat $img $mnt -o loop,umask=000"; - _ "$sudo cp -f $kernel $mnt/vmlinux"; - _ "cp -f $rdz $mnt/$type.rdz"; - _ "$sudo cp -f tools/ia64/elilo.efi $mnt"; - output("$mnt/elilo.conf", qq( -prompt -timeout=50 - -image=vmlinux - label=linux - root=/dev/ram3 - initrd=$type.rdz - append=" ramdisk_size=120000" - read-only - -image=vmlinux - label=rescue - root=/dev/ram3 - initrd=$type.rdz - append=" rescue ramdisk_size=120000" -")); - _ "sync"; - _ "df $mnt"; - -} - -sub boot_img_sparc { - my ($mnt, $type, $I, $_img) = @_; - if ($type =~ /^live(.*)/) { - #- hack to produce directly into /export the needed file for cdrom boot. - my $dir = "/export"; - my $boot = "boot"; #- non-absolute pathname only! - - _ "mkdir -p $dir/$boot"; - _ "cp -f /boot/cd.b /boot/second.b $dir/$boot"; - _ "cp -f vmlinux$1 $dir/$boot/vmlinux$1"; - -f "live$1.rdz" ? _ "cp -f live$1.rdz $dir/$boot" : initrd($tmp_mnt_initrd, $type, $I, "$dir/$boot/live$1.rdz"); - - output("$dir/$boot/silo.conf", qq( -partition=1 -default=linux -timeout=100 -read-write -message=/$boot/boot.msg -image="cat /$boot/boot.msg" - label=1 - single-key -image="cat /$boot/general.msg" - label=2 - single-key -image="cat /$boot/expert.msg" - label=3 - single-key -image="cat /$boot/rescue.msg" - label=4 - single-key -image="cat /$boot/kickit.msg" - label=5 - single-key -image="cat /$boot/param.msg" - label=6 - single-key -image[sun4c,sun4d,sun4m]=/$boot/vmlinux - label=linux - alias=install - initrd=/$boot/live.rdz - append="ramdisk_size=128000 root=/dev/ram3" -image[sun4c,sun4d,sun4m]=/$boot/vmlinux - label=text - initrd=/$boot/live.rdz - append="ramdisk_size=128000 text root=/dev/ram3" -image[sun4c,sun4d,sun4m]=/$boot/vmlinux - label=expert - initrd=/$boot/live.rdz - append="ramdisk_size=128000 expert root=/dev/ram3" -image[sun4c,sun4d,sun4m]=/$boot/vmlinux - label=ks - initrd=/$boot/live.rdz - append="ramdisk_size=128000 ks root=/dev/ram3" -image[sun4c,sun4d,sun4m]=/$boot/vmlinux - label=rescue - initrd=/$boot/live.rdz - append="ramdisk_size=128000 rescue rw root=/dev/ram3" -image[sun4u]=/$boot/vmlinux64 - label=linux - alias=install - initrd=/$boot/live64.rdz - append="ramdisk_size=128000 root=/dev/ram3" -image[sun4u]=/$boot/vmlinux64 - label=text - initrd=/$boot/live64.rdz - append="ramdisk_size=128000 text root=/dev/ram3" -image[sun4u]=/$boot/vmlinux64 - label=expert - initrd=/$boot/live64.rdz - append="ramdisk_size=128000 expert root=/dev/ram3" -image[sun4u]=/$boot/vmlinux64 - label=ks - initrd=/$boot/live64.rdz - append="ramdisk_size=128000 ks root=/dev/ram3" -image[sun4u]=/$boot/vmlinux64 - label=rescue - initrd=/$boot/live64.rdz - append="ramdisk_size=128000 rescue rw root=/dev/ram3" -")); - - output("$dir/$boot/README", " -To Build a Bootable CD-ROM, try: - mkisofs -R -o t.iso -s /$boot/silo.conf /export -"); - } elsif ($type =~ /^tftprd(.*)/) { - my $dir = "/export"; - my $boot = "images"; - my $setarch = $1 ? "sparc64" : "sparc32"; - - _ "mkdir -p $dir/$boot"; - -f "$type.rdz" or initrd($tmp_mnt_initrd, $type, $I, "$type.rdz"); - _ "cp -f vmlinux$1.aout $dir/$boot/$type.img"; - _ "$setarch kernel$1/src/arch/sparc$1/boot/piggyback $dir/$boot/$type.img kernel$1/boot/System.map $type.rdz"; - } elsif ($type =~ /^tftp(.*)/) { - my $dir = "/export"; - my $boot = "images"; - - _ "mkdir -p $dir/$boot"; - _ "cp -f vmlinux$1.aout $dir/$boot/$type.img"; - } else { - my $dir = "floppy"; - __ "$sudo umount $mnt 2>/dev/null"; - _ "rm -rf $dir"; - _ "mkdir -p $dir"; - _ "cp -f /boot/fd.b /boot/second.b $dir"; - _ "cp -f vmlinuz$I $dir/vmlinux$I.gz"; - -f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd($tmp_mnt_initrd, $type, $I, "$dir/$type.rdz"); - - output("$dir/boot.msg", " -Welcome to Mandrake Linux 7.1 - -Press <Enter> to install or upgrade a system 7mMandrake Linux7m -"); - - output("$dir/silo.conf", qq( -partition=1 -default=linux -timeout=100 -read-write -message=/boot.msg -image=/vmlinux$I.gz - label=linux - initrd=/$type.rdz - append="ramdisk_size=128000 $type root=/dev/ram3" -")); - _ "genromfs -d $dir -f /dev/ram -A 2048,/.. -a 512 -V 'DrakX boot disk'"; - _ "$sudo mount -t romfs /dev/ram $mnt"; - _ "silo -r $mnt -F -i /fd.b -b /second.b -C /silo.conf"; - _ "$sudo umount $mnt"; - _ "dd if=/dev/ram of=$type.img bs=1440k count=1"; - _ "sync"; - _ "$sudo mount -t romfs /dev/ram $mnt"; - _ "df $mnt"; - } -} - -sub boot_img_ppc() { - #- hack to produce directly into /export the needed file for cdrom boot. - my $dir = "/export"; - my $boot = "boot"; #- non-absolute pathname only! - _ "rm -rf $dir/$boot"; mkdir "$dir/$boot", 0777; - foreach (glob("kernel/all.kernels/*")) { - my $ext = basename($_); - if ($ext =~ /2.4/) { - _ "cp $_/boot/vmlinux $dir/$boot/vmlinux"; - _ "cp images/all.rdz-$ext $dir/$boot/all.gz"; - } - if ($ext =~ /2.2/) { - _ "cp $_/boot/vmlinux $dir/$boot/vmlinux-2.2"; - _ "cp images/all.rdz-$ext $dir/$boot/all-2.2.gz"; - } - } - _ "cp -f /usr/lib/yaboot/yaboot $dir/$boot/yaboot"; - - output("$dir/$boot/ofboot.b", '<CHRP-BOOT> -<COMPATIBLE> -MacRISC -</COMPATIBLE> -<DESCRIPTION> -Mandrake Linux PPC bootloader -</DESCRIPTION> -<BOOT-SCRIPT> -" screen" output -dev screen -" "(0000000000aa00aa0000aaaaaa0000aa00aaaa5500aaaaaa)" drop 0 8 set-colors -" "(5555555555ff55ff5555ffffff5555ff55ffffff55ffffff)" drop 8 8 set-colors -device-end -3 to foreground-color -0 to background-color -" "(0C)" fb8-write drop -" Booting Mandrake Linux PPC..." fb8-write drop 100 ms -boot cd:2,\\\\yaboot -</BOOT-SCRIPT> -<OS-BADGE-ICONS> -1010 -000000000000F8FEACF6000000000000 -0000000000F5FFFFFEFEF50000000000 -00000000002BFAFEFAFCF70000000000 -0000000000F65D5857812B0000000000 -0000000000F5350B2F88560000000000 -0000000000F6335708F8FE0000000000 -00000000005600F600F5FD8100000000 -00000000F9F8000000F5FAFFF8000000 -000000008100F5F50000F6FEFE000000 -000000F8F700F500F50000FCFFF70000 -00000088F70000F50000F5FCFF2B0000 -0000002F582A00F5000008ADE02C0000 -00090B0A35A62B0000002D3B350A0000 -000A0A0B0B3BF60000505E0B0A0B0A00 -002E350B0B2F87FAFCF45F0B2E090000 -00000007335FF82BF72B575907000000 -000000000000ACFFFF81000000000000 -000000000081FFFFFFFF810000000000 -0000000000FBFFFFFFFFAC0000000000 -000000000081DFDFDFFFFB0000000000 -000000000081DD5F83FFFD0000000000 -000000000081DDDF5EACFF0000000000 -0000000000FDF981F981FFFF00000000 -00000000FFACF9F9F981FFFFAC000000 -00000000FFF98181F9F981FFFF000000 -000000ACACF981F981F9F9FFFFAC0000 -000000FFACF9F981F9F981FFFFFB0000 -00000083DFFBF981F9F95EFFFFFC0000 -005F5F5FDDFFFBF9F9F983DDDD5F0000 -005F5F5F5FDD81F9F9E7DF5F5F5F5F00 -0083DD5F5F83FFFFFFFFDF5F835F0000 -000000FBDDDFACFBACFBDFDFFB000000 -000000000000FFFFFFFF000000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFFFF00000000 -00000000FFFFFFFFFFFFFFFFFF000000 -00000000FFFFFFFFFFFFFFFFFF000000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFF000000 -</OS-BADGE-ICONS> -</CHRP-BOOT> -'); - - output("$dir/$boot/yaboot.conf", ' -init-message = "\nWelcome to Mandrake Linux PPC!\nHit <TAB> for boot options.\n\n" -timeout = 150 -default = install-gui -message=cd:,\\\\yaboot.msg - -image = cd:,\\\\vmlinux - label = install-gui - root = /dev/ram3 - initrd = cd:,\\\\all.gz - initrd-size = 34000 - -image = cd:,\\\\vmlinux-2.2 - label = install-gui-2.2 - root = /dev/ram3 - initrd = cd:,\\\\all-2.2.gz - initrd-size = 34000 - -image = cd:,\\\\vmlinux - label = install-text - root = /dev/ram3 - initrd = cd:,\\\\all.gz - initrd-size = 34000 - append = " text video=ofonly" - -image = cd:,\\\\vmlinux-2.2 - label = install-text-2.2 - root = /dev/ram3 - initrd = cd:,\\\\all-2.2.gz - initrd-size = 34000 - append = " text video=ofonly" - -image = cd:,\\\\vmlinux - label = install-gui-old - root = /dev/ram3 - initrd = cd:,\\\\all.gz - initrd-size = 34000 - append = " gui-old video=ofonly" - -image = cd:,\\\\vmlinux-2.2 - label = install-gui-old-2.2 - root = /dev/ram3 - initrd = cd:,\\\\all-2.2.gz - initrd-size = 34000 - append = " gui-old video=ofonly" - -image = enet:0,vmlinux - label = install-net - root = /dev/ram3 - initrd = enet:0,all.gz - initrd-size = 34000 - append = " video=ofonly" - -image = enet:0,vmlinux-2.2 - label = install-net-2.2 - root = /dev/ram3 - initrd = enet:0,all-2.2.gz - initrd-size = 34000 - append = " video=ofonly" - -image = enet:0,vmlinux - label = install-net-text - root = /dev/ram3 - initrd = enet:0,all.gz - initrd-size = 34000 - append = " text video=ofonly" - -image = enet:0,vmlinux-2.2 - label = install-net-text-2.2 - root = /dev/ram3 - initrd = enet:0,all-2.2.gz - initrd-size = 34000 - append = " text video=ofonly" - -image = cd:,\\\\vmlinux - label = rescue - root = /dev/ram3 - initrd = cd:,\\\\all.gz - initrd-size = 34000 - append = " rescue video=ofonly" - -image = enet:0,vmlinux - label = rescue-net - root = /dev/ram3 - initrd = enet:0,all.gz - initrd-size = 34000 - append = " rescue video=ofonly" -'); - - output("$dir/$boot/yaboot.msg", ' -Thanks for choosing Mandrake Linux PPC. The following is a short -explanation of the various options for booting the install CD. - -All options ending with "2.2" will use the 2.2.20-9mdkBOOT kernel. -The default syntax with no suffix uses the 2.4.18-4mdkBOOT kernel. -The default if you just hit enter is "install-gui". - -install-gui: uses XFree86 fbdev mode -install-text: text based install -install-gui-old: old Xpmac gui -install-net: allows you to use a minimal boot CD, - pulling the rest of the install from - a network server -install-net-text: text mode network install -rescue: boots the rescue image -rescue-net: boots the rescue image from a network server - -'); - -} - -sub bmp_to_msg { - my ($bmp, $msg, $progress_place, $progress_color, $clear_color) = @_; - #- change here for newer picture isolinux-graphic.bmp and newer parameters. - #- for old style pictures (9.1 and previous) - # lilo-bmp2mdk mode:0x103 progress:425,173,16,7,64+21 clear:600,800,64+59 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg - #- for current 9.2 pictures. - -e $bmp and _ "lilo-bmp2mdk mode:0x103 progress:$progress_place,64+$progress_color clear:600,800,64+$clear_color pos:0,0 <$bmp >$msg" -} - -sub isolinux { - my ($main, @kernels) = @_; - @kernels = ($main, grep { $_ ne $main } @kernels); - _ "rm -rf isolinux"; mkdir "isolinux", 0777; - - each_index { - mkdir "isolinux/alt$::i", 0777; - my ($kernel) = glob("kernel/all.kernels/$_/boot/vmlinu*"); - _ "cp $kernel isolinux/alt$::i/vmlinuz"; - initrd($tmp_mnt_initrd, 'all', '', "images/all.rdz-$_"); - _ "mv images/all.rdz-$_ isolinux/alt$::i/all.rdz"; - } @kernels; - - bmp_to_msg('isolinux-graphic.bmp', 'isolinux/boot.msg', '397,190,14,6', 18, 18); - - _ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin"; - _ "install -m 644 -D /boot/memtest* isolinux/test/memtest.bin"; - output "isolinux/isolinux.cfg", " -default linux -prompt 1 -timeout 150 -display boot.msg -F1 help.msg -F2 advanced.msg -F3 boot.msg -" . join('', map { -"label $_->[0] - kernel alt0/vmlinuz - append initrd=alt0/all.rdz $_->[1] automatic=method:cdrom -" } entries_append('all')) - . join('', map_index { -"label alt$::i - kernel alt$::i/vmlinuz - append initrd=alt$::i/all.rdz $default_append $default_acpi $default_vga -" } @kernels) . -"label memtest - kernel test/memtest.bin -"; - - output("isolinux/help.msg", syslinux_msg('help.msg.xml')); - output("isolinux/advanced.msg", syslinux_msg('advanced.msg.xml', - "\nYou can choose the following kernels :\n", - map_index { " o " . syslinux_color('white') . "alt$::i" . syslinux_color('default') . " is kernel $_\n" } @kernels)); -} - -sub isolinux_move { - my ($main) = @_; - - my ($kernel) = glob("kernel/all.kernels/$main/boot/vmlinu*"); - _ "cp $kernel move/isolinux/vmlinuz"; - initrd($tmp_mnt_initrd, 'all', '', "move/isolinux/all.rdz-$main", '-with-busybox'); - rename "move/isolinux/all.rdz-$main", "move/isolinux/all.rdz"; - - bmp_to_msg('move/data/isolinux-graphic.bmp', 'move/isolinux/boot.msg', '371,144,4,4', 11, 127); - _ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin"; -} - -sub hd_grub { - my ($mnt, $img) = @_; - my $mapfile = '/tmp/device.map.tmp'; - - my @grub_files = map { "/boot/grub/$_" } qw(stage1 stage2); - my $size = 40_000 + sum(map { -s $_ } @grub_files); - - __ "$sudo umount $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$img bs=1 count=$size"; - _ "mkdosfs $img"; - _ "$sudo mount -t vfat -o umask=0 $img $mnt -o loop"; - _ "cp @grub_files $mnt"; - - output("$mnt/menu.lst", <<EOF); -timeout 0 -default 0 -fallback 1 - -title Mandrake Install - -root (hd0,0) -kernel /cooker/isolinux/alt0/vmlinuz $default_append $default_acpi $default_vga automatic=method:disk -initrd /cooker/isolinux/alt0/all.rdz - -title Help - -pause To display the help, press <space> until you reach "HELP END" -pause . -pause Please see http://qa.mandrakesoft.com/hd_grub.cgi for a friendlier solution -pause . -pause To specify the location where Mandrake Linux is copied, -pause choose "Mandrake Install", and press "e". -pause Then change "root (hd0,0)". FYI: -pause - (hd0,0) is the first partition on first bios hard drive (usually hda1) -pause - (hd0,4) is the first extended partition (usually hda5) -pause - (hd1,0) is the first partition on second bios hard drive -pause Replace /cooker to suits the directory containing Mandrake Linux -pause . -pause HELP END -EOF - - _ "$sudo umount $mnt"; - - output($mapfile, "(fd0) $img\n"); - - open(my $G, "| grub --device-map=$mapfile --batch"); - print $G <<EOF; -root (fd0) -install /stage1 d (fd0) /stage2 p /menu.lst -quit -EOF - close $G; - unlink $mapfile; -} - -sub boot_iso { - my ($iso) = @_; - - my $cfg = cat_('isolinux/isolinux.cfg') or die 'isolinux missing'; - $cfg =~ s/automatic=method:\w+,?//gm; - - eval { rm_rf('.boot_iso') }; - mkdir_p('.boot_iso/isolinux'); - _ "cd .boot_iso/isolinux ; ln -s ../../isolinux/* ."; - - my $cfg_file = '.boot_iso/isolinux/isolinux.cfg'; - unlink $cfg_file; - output($cfg_file, $cfg); - - _ "mkisofs -r -f -J -cache-inodes -V 'Mdk Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso"; - rm_rf('.boot_iso'); -} - -sub drivers { - my ($type, $I, $img) = @_; - - _ "dd if=/dev/zero of=$img bs=1k count=1440"; - _ "$mke2fs $img"; - _ "$sudo mount -t ext2 $img $tmp_mnt -o loop"; - - my ($ext) = $img =~ /img-(.*)/ or die "bad image name ($img)"; - _ "$sudo cp -f kernel/all.modules$I/$ext/${type}_modules.mar $tmp_mnt/modules$I.mar"; - - _ "sync"; - _ "df $tmp_mnt"; - - _ "$sudo umount $tmp_mnt"; -} diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c deleted file mode 100644 index 0cc70490b..000000000 --- a/mdk-stage1/stage1.c +++ /dev/null @@ -1,671 +0,0 @@ -/* - * Guillaume Cottenceau (gc@mandrakesoft.com) - * - * Copyright 2000-2001 MandrakeSoft - * - * View the homepage: http://people.mandrakesoft.com/~gc/html/stage1.html - * - * - * This software may be freely redistributed under the terms of the GNU - * public license. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -/* - * Portions from Erik Troan (ewt@redhat.com) - * - * Copyright 1996 Red Hat Software - * - */ - -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <stdio.h> -#include <sys/ioctl.h> -#include <sys/mount.h> -#include <string.h> -#include <errno.h> -#include <ctype.h> -#include <stdarg.h> -#include <signal.h> -#include <linux/unistd.h> -_syscall2(int,pivot_root,const char *,new_root,const char *,put_old) - -#include "stage1.h" - -#include "log.h" -#include "probing.h" -#include "frontend.h" -#include "modules.h" -#include "tools.h" -#include "automatic.h" -#include "mount.h" -#include "lomount.h" -#include "insmod.h" - -#ifdef ENABLE_PCMCIA -#include "pcmcia_/pcmcia.h" -#endif - -#ifndef DISABLE_CDROM -#include "cdrom.h" -#endif - -#ifndef DISABLE_NETWORK -#include "network.h" -#endif - -#ifndef DISABLE_DISK -#include "disk.h" -#endif - - -/************************************************************ - * globals */ - -char * method_name; -char * stage2_kickstart = NULL; - - -void fatal_error(char *msg) -{ - printf("FATAL ERROR IN STAGE1: %s\n\nI can't recover from this.\nYou may reboot your system.\n", msg); - while (1); -} - - -/************************************************************ - * special frontend functs - * (the principle is to not pollute frontend code with stage1-specific stuff) */ - -void stg1_error_message(char *msg, ...) -{ - va_list args; - va_start(args, msg); - log_message("unsetting automatic"); - unset_param(MODE_AUTOMATIC); - verror_message(msg, args); - va_end(args); -} - -void stg1_info_message(char *msg, ...) -{ - va_list args; - va_start(args, msg); - if (IS_AUTOMATIC) { - vlog_message(msg, args); - return; - } - vinfo_message(msg, args); - va_end(args); -} - - -#ifdef SPAWN_SHELL -static pid_t shell_pid = 0; - -/************************************************************ - * spawns a shell on console #2 */ -static void spawn_shell(void) -{ - int fd; - char * shell_name[] = { "/tmp/sh", NULL }; - - log_message("spawning a shell"); - - if (!IS_TESTING) { - fd = open("/dev/tty2", O_RDWR); - if (fd == -1) { - log_message("cannot open /dev/tty2 -- no shell will be provided"); - return; - } - else if (access(shell_name[0], X_OK)) { - log_message("cannot open shell - %s doesn't exist", shell_name[0]); - return; - } - - if (!(shell_pid = fork())) { - dup2(fd, 0); - dup2(fd, 1); - dup2(fd, 2); - - close(fd); - setsid(); - if (ioctl(0, TIOCSCTTY, NULL)) - log_perror("could not set new controlling tty"); - - execve(shell_name[0], shell_name, grab_env()); - log_message("execve of %s failed: %s", shell_name[0], strerror(errno)); - exit(-1); - } - - close(fd); - } -} -#endif - - -char * interactive_fifo = "/tmp/stage1-fifo"; -static pid_t interactive_pid = 0; - -/* spawns my small interactive on console #6 */ -static void spawn_interactive(void) -{ -#ifdef SPAWN_INTERACTIVE - int fd; - char * dev = "/dev/tty6"; - - printf("spawning my interactive on %s\n", dev); - - if (!IS_TESTING) { - fd = open(dev, O_RDWR); - if (fd == -1) { - printf("cannot open %s -- no interactive\n", dev); - return; - } - - if (mkfifo(interactive_fifo, O_RDWR)) { - printf("cannot create fifo -- no interactive\n"); - return; - } - - if (!(interactive_pid = fork())) { - int fif_out; - - dup2(fd, 0); - dup2(fd, 1); - dup2(fd, 2); - - close(fd); - setsid(); - if (ioctl(0, TIOCSCTTY, NULL)) - perror("could not set new controlling tty"); - - fif_out = open(interactive_fifo, O_WRONLY); - printf("Please enter your command (availables: [+,-] [rescue,expert]).\n"); - - while (1) { - char s[50]; - int i = 0; - printf("? "); - fflush(stdout); - read(0, &(s[i++]), 1); - fcntl(0, F_SETFL, O_NONBLOCK); - while (read(0, &(s[i++]), 1) > 0 && i < sizeof(s)); - fcntl(0, F_SETFL, 0); - write(fif_out, s, i-2); - printf("Ok.\n"); - } - } - - close(fd); - } -#endif -} - - -/************************************************************ - */ - -static void expert_third_party_modules(void) -{ - enum return_type results; - char * floppy_mount_location = "/tmp/floppy"; - char ** modules; - char final_name[500]; - char * choice; - int rc; - char * questions[] = { "Options", NULL }; - static char ** answers = NULL; - - results = ask_yes_no("If you want to insert third-party kernel modules, insert " - "a Linux (ext2fs) formatted floppy containing the modules and confirm. Otherwise, select \"no\".");; - if (results != RETURN_OK) - return; - - if (my_mount(floppy_device(), floppy_mount_location, "ext2", 0) == -1) { - stg1_error_message("I can't find a Linux ext2 floppy in first floppy drive."); - return expert_third_party_modules(); - } - - modules = list_directory(floppy_mount_location); - - if (!modules || !*modules) { - stg1_error_message("No modules found on floppy disk."); - umount(floppy_mount_location); - return expert_third_party_modules(); - } - - results = ask_from_list("Which driver would you like to insmod?", modules, &choice); - if (results != RETURN_OK) { - umount(floppy_mount_location); - return; - } - - sprintf(final_name, "%s/%s", floppy_mount_location, choice); - - results = ask_from_entries("Please enter the options:", questions, &answers, 24, NULL); - if (results != RETURN_OK) { - umount(floppy_mount_location); - return expert_third_party_modules(); - } - - rc = insmod_local_file(final_name, answers[0]); - umount(floppy_mount_location); - - if (rc) { - log_message("\tfailed"); - stg1_error_message("Insmod failed."); - } - - return expert_third_party_modules(); -} - - -#ifdef ENABLE_PCMCIA -static void handle_pcmcia(char ** pcmcia_adapter) -{ - if (kernel_version() == 2) { - stg1_error_message("We now use kernel pcmcia support and this won't work with a 2.2 kernel."); - return; - } - - *pcmcia_adapter = pcmcia_probe(); - if (!*pcmcia_adapter) { - log_message("no pcmcia adapter found"); - return; - } - my_insmod("pcmcia_core", ANY_DRIVER_TYPE, NULL, 0); - my_insmod(*pcmcia_adapter, ANY_DRIVER_TYPE, NULL, 0); - my_insmod("ds", ANY_DRIVER_TYPE, NULL, 0); - - /* call to cardmgr takes time, let's use the wait message */ - wait_message("Enabling PCMCIA extension cards..."); - log_message("cardmgr rc: %d", cardmgr_call()); - remove_wait_message(); - - if (IS_EXPERT) - expert_third_party_modules(); -} -#endif - - -/************************************************************ - */ - -static void method_select_and_prepare(void) -{ - enum return_type results; - char * choice; - char * means[10], * means_auto[10]; - int i; - -#ifndef DISABLE_DISK - char * disk_install = "Hard disk"; char * disk_install_auto = "disk"; -#endif -#ifndef DISABLE_CDROM - char * cdrom_install = "CDROM drive"; char * cdrom_install_auto = "cdrom"; -#endif -#ifndef DISABLE_NETWORK - char * network_nfs_install = "NFS server"; char * network_nfs_install_auto = "nfs"; - char * network_ftp_install = "FTP server"; char * network_ftp_install_auto = "ftp"; - char * network_http_install = "HTTP server"; char * network_http_install_auto = "http"; -#endif - - i = 0; -#ifndef DISABLE_NETWORK - means[i] = network_nfs_install; means_auto[i++] = network_nfs_install_auto; - means[i] = network_ftp_install; means_auto[i++] = network_ftp_install_auto; - means[i] = network_http_install; means_auto[i++] = network_http_install_auto; -#endif -#ifndef DISABLE_CDROM - means[i] = cdrom_install; means_auto[i++] = cdrom_install_auto; - allow_additional_modules_floppy = 0; -#endif -#ifndef DISABLE_DISK - means[i] = disk_install; means_auto[i++] = disk_install_auto; - allow_additional_modules_floppy = 0; -#endif - means[i] = NULL; - - results = ask_from_list_auto("Please choose the installation method.", means, &choice, "method", means_auto); - - if (results != RETURN_OK) - return method_select_and_prepare(); - -#ifndef DISABLE_CDROM - if (!strcmp(choice, cdrom_install)) - results = cdrom_prepare(); -#endif - -#ifndef DISABLE_DISK - if (!strcmp(choice, disk_install)) - results = disk_prepare(); -#endif - -#ifndef DISABLE_NETWORK - if (!strcmp(choice, network_nfs_install)) - results = nfs_prepare(); - - if (!strcmp(choice, network_ftp_install)) - results = ftp_prepare(); - - if (!strcmp(choice, network_http_install)) - results = http_prepare(); -#endif - - if (results != RETURN_OK) - return method_select_and_prepare(); -} - -#ifdef MANDRAKE_MOVE -int mandrake_move_pre(void) -{ - log_message("move: creating %s directory and mounting as tmpfs", SLASH_LOCATION); - - if (scall(mkdir(SLASH_LOCATION, 0755), "mkdir")) - return RETURN_ERROR; - - if (scall(mount("none", SLASH_LOCATION, "tmpfs", MS_MGC_VAL, NULL), "mount tmpfs")) - return RETURN_ERROR; - - return RETURN_OK; -} - - -static enum return_type handle_clp(char* clp, char* live, char* location_live, char* location_mount, int* is_symlink, char* clp_tmpfs) -{ - static int count = 0; - if (access(clp, R_OK)) { - log_message("no %s found (or disabled), trying to fallback on plain tree", clp); - if (!access(live, R_OK)) { - if (scall(symlink(location_live, location_mount), "symlink")) - return RETURN_ERROR; - *is_symlink = 1; - return RETURN_OK; - } else { - log_message("move: can't find %s nor %s, proceeding hoping files will be there", clp, live); - return RETURN_OK; - } - } - - if (clp_tmpfs) { - int ret; - char buf[5000]; - sprintf(buf, "Loading (part %d)...", ++count); - init_progression(buf, file_size(clp)); - ret = copy_file(clp, clp_tmpfs, update_progression); - end_progression(); - if (ret != RETURN_OK) - return ret; - clp = clp_tmpfs; - } - - if (lomount(clp, location_mount, NULL, 1)) { - stg1_error_message("Could not mount compressed loopback :(."); - return RETURN_ERROR; - } - - return RETURN_OK; -} - -int mandrake_move_post(void) -{ - FILE *f; - char buf[5000]; - int fd; - char rootdev[] = "0x0100"; - int boot__real_is_symlink_to_raw = 0; - int always__real_is_symlink_to_raw = 0; - int totem__real_is_symlink_to_raw = 0; - int main__real_is_symlink_to_raw = 0; - - if (handle_clp(IMAGE_LOCATION "/live_tree_boot.clp", IMAGE_LOCATION "/live_tree_boot/usr/bin/runstage2.pl", - IMAGE_LOCATION "/live_tree_boot", BOOT_LOCATION, - &boot__real_is_symlink_to_raw, SLASH_LOCATION "/live_tree_boot.clp") != RETURN_OK) - return RETURN_ERROR; - - if (handle_clp(IMAGE_LOCATION "/live_tree_always.clp", IMAGE_LOCATION "/live_tree_always/bin/bash", - IMAGE_LOCATION "/live_tree_always", ALWAYS_LOCATION, - &always__real_is_symlink_to_raw, SLASH_LOCATION "/live_tree_always.clp") != RETURN_OK) - return RETURN_ERROR; - - if (handle_clp(IMAGE_LOCATION "/live_tree_totem.clp", IMAGE_LOCATION "/live_tree_totem/usr/bin/totem", - IMAGE_LOCATION "/live_tree_totem", TOTEM_LOCATION, - &totem__real_is_symlink_to_raw, SLASH_LOCATION "/live_tree_totem.clp") != RETURN_OK) - return RETURN_ERROR; - - if (handle_clp(IMAGE_LOCATION "/live_tree.clp", IMAGE_LOCATION "/live_tree/etc/fstab", - IMAGE_LOCATION "/live_tree", IMAGE_LOCATION_REAL, - &main__real_is_symlink_to_raw, NULL) != RETURN_OK) - return RETURN_ERROR; - - if (scall(!(f = fopen(IMAGE_LOCATION_REAL "/move/symlinks", "rb")), "fopen[" IMAGE_LOCATION_REAL "/move/symlinks]")) - return RETURN_ERROR; - while (fgets(buf, sizeof(buf), f)) { - char oldpath[500], newpath[500]; - buf[strlen(buf)-1] = '\0'; // trim \n - sprintf(oldpath, "%s%s", LIVE_LOCATION_REL, buf); - sprintf(newpath, "%s%s", SLASH_LOCATION, buf); - log_message("move: creating symlink %s -> %s", oldpath, newpath); - if (scall(symlink(oldpath, newpath), "symlink")) - return RETURN_ERROR; - } - fclose(f); - - // in case we didn't mount any clp, because gzloop.o is not available later in /lib/modules - my_insmod("gzloop", ANY_DRIVER_TYPE, NULL, 0); - - // hardcoded :( - if (!access(TOTEM_LOCATION, R_OK)) { - if (scall(symlink("/image_totem/usr", SLASH_LOCATION "/usr"), "symlink")) - return RETURN_ERROR; - } else - // need a fallback in case we don't use image_totem.clp nor live_tree_totem, but we're in -u mode - if (scall(symlink(LIVE_LOCATION_REL "/usr", SLASH_LOCATION "/usr"), "symlink")) - return RETURN_ERROR; - - // need to create the few devices needed to start up stage2 in a decent manner, we can't symlink or they will keep CD busy - // we need only the ones before mounting /dev as devfs - if (scall(mkdir(SLASH_LOCATION "/dev", 0755), "mkdir")) - return RETURN_ERROR; - if (scall(!(f = fopen(IMAGE_LOCATION_REAL "/move/devices", "rb")), "fopen")) - return RETURN_ERROR; - while (fgets(buf, sizeof(buf), f)) { - char name[500], path[500], type; - int major, minor; - sscanf(buf, "%s %c %d %d", name, &type, &major, &minor); - sprintf(path, "%s%s", SLASH_LOCATION, name); - log_message("move: creating device %s %c %d %d", path, type, major, minor); - if (scall(mknod(path, type == 'c' ? S_IFCHR : S_IFBLK, makedev(major, minor)), "mknod")) - return RETURN_ERROR; - } - fclose(f); - - if (boot__real_is_symlink_to_raw) { - if (scall(unlink(BOOT_LOCATION), "unlink")) - return RETURN_ERROR; - if (scall(symlink(RAW_LOCATION_REL "/live_tree_boot", BOOT_LOCATION), "symlink")) - return RETURN_ERROR; - } - - if (always__real_is_symlink_to_raw) { - if (scall(unlink(ALWAYS_LOCATION), "unlink")) - return RETURN_ERROR; - if (scall(symlink(RAW_LOCATION_REL "/live_tree_always", ALWAYS_LOCATION), "symlink")) - return RETURN_ERROR; - } - - if (totem__real_is_symlink_to_raw) { - if (scall(unlink(TOTEM_LOCATION), "unlink")) - return RETURN_ERROR; - if (scall(symlink(RAW_LOCATION_REL "/live_tree_totem", TOTEM_LOCATION), "symlink")) - return RETURN_ERROR; - } - - if (main__real_is_symlink_to_raw) { - if (scall(unlink(IMAGE_LOCATION_REAL), "unlink")) - return RETURN_ERROR; - if (scall(symlink(RAW_LOCATION_REL "/live_tree", IMAGE_LOCATION_REAL), "symlink")) - return RETURN_ERROR; - } - - mkdir(SLASH_LOCATION "/etc", 0755); - copy_file("/etc/resolv.conf", SLASH_LOCATION "/etc/resolv.conf", NULL); - - if (IS_DEBUGSTAGE1) - while (1); - - log_message("move: pivot_rooting"); - // trick so that kernel won't try to mount the root device when initrd exits - if (scall((fd = open("/proc/sys/kernel/real-root-dev", O_WRONLY)) < 0, "open")) - return RETURN_ERROR; - if (scall(write(fd, rootdev, strlen(rootdev)) != (signed)strlen(rootdev), "write")) { - close(fd); - return RETURN_ERROR; - } - close(fd); - - if (scall(mkdir(SLASH_LOCATION "/stage1", 0755), "mkdir")) - return RETURN_ERROR; - - if (scall(pivot_root(SLASH_LOCATION, SLASH_LOCATION "/stage1"), "pivot_root")) - return RETURN_ERROR; - - return RETURN_OK; -} -#endif - - -int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)), char **env) -{ - char ** argptr; - char * stage2_args[30]; -#ifdef ENABLE_PCMCIA - char * pcmcia_adapter = NULL; -#endif - - if (getpid() > 50) - set_param(MODE_TESTING); - - spawn_interactive(); - - open_log(); - log_message("welcome to the " DISTRIB_NAME " install (mdk-stage1, version " VERSION " built " __DATE__ " " __TIME__")"); - process_cmdline(); - handle_env(env); -#ifdef SPAWN_SHELL - spawn_shell(); -#endif - init_modules_insmoding(); - init_frontend("Welcome to " DISTRIB_NAME -#ifdef MANDRAKE_MOVE - ", " -#else - " (" VERSION ") " -#endif - __DATE__ " " __TIME__); - - if (IS_EXPERT) - expert_third_party_modules(); - - if (IS_UPDATEMODULES) - update_modules(); - -#ifdef ENABLE_PCMCIA - if (!IS_NOAUTO) - handle_pcmcia(&pcmcia_adapter); -#endif - - // load usb interface as soon as possible, helps usb mouse detection in stage2 */ - probe_that_type(USB_CONTROLLERS, BUS_USB); - - if (IS_CHANGEDISK) - stg1_info_message("You are starting the installation with an alternate booting method. " - "Please change your disk, and insert the Installation disk."); - - if (IS_RESCUE && total_memory() < MEM_LIMIT_RESCUE) { - stg1_error_message("You are starting the rescue with a low memory configuration. " - "Our experience shows that your system may crash at any point " - "or lock up for no apparent reason. Continue at " - "your own risk. Alternatively, you may reboot your system now."); - } - -#ifdef MANDRAKE_MOVE - if (total_memory() < MEM_LIMIT_MOVE) - stg1_error_message(DISTRIB_NAME " typically needs more than %d Mbytes of memory (detected %d Mbytes). You may proceed, but the machine may crash or lock up for no apparent reason. Continue at your own risk. Alternatively, you may reboot your system now.", - MEM_LIMIT_MOVE, total_memory()); - if (mandrake_move_pre() != RETURN_OK) - stg1_error_message("Fatal error when preparing Mandrakemove."); -#endif - -#ifndef DISABLE_DISK - if (IS_RECOVERY && streq(get_auto_value("method"), "cdrom")) { - if (!process_recovery()) - method_select_and_prepare(); - } else -#endif - method_select_and_prepare(); - - if (!IS_RAMDISK) - if (symlink(IMAGE_LOCATION_REAL LIVE_LOCATION, STAGE2_LOCATION) != 0) - log_perror("symlink from " IMAGE_LOCATION_REAL LIVE_LOCATION " to " STAGE2_LOCATION " failed"); - - if (interactive_pid != 0) - kill(interactive_pid, 9); - -#ifdef MANDRAKE_MOVE - if (mandrake_move_post() != RETURN_OK) - stg1_error_message("Fatal error when launching Mandrakemove."); -#endif - - if (shell_pid != 0) { - int fd; - kill(shell_pid, 9); - fd = open("/dev/tty2", O_RDWR); - write(fd, "Killed\n", 7); - close(fd); - } - - umount("/tmp/tmpfs"); - finish_frontend(); - close_log(); - -#ifndef MANDRAKE_MOVE - if (IS_RESCUE) -#endif - return 66; - if (IS_TESTING) - return 0; - - argptr = stage2_args; - *argptr++ = "/usr/bin/runinstall2"; - *argptr++ = "--method"; - *argptr++ = method_name; -#ifdef ENABLE_PCMCIA - if (pcmcia_adapter) { - *argptr++ = "--pcmcia"; - *argptr++ = pcmcia_adapter; - } -#endif - if (stage2_kickstart) { - *argptr++ = "--kickstart"; - *argptr++ = stage2_kickstart; - } - *argptr++ = NULL; - - execve(stage2_args[0], stage2_args, grab_env()); - - printf("error in exec of stage2 :-(\n"); - printf("trying to execute '/usr/bin/runinstall2' from the installation volume,\nthe following fatal error occurred\n"); - fatal_error(strerror(errno)); - - return 0; /* shut up compiler (we can't get here anyway!) */ -} diff --git a/move/Makefile b/move/Makefile index 67aa7932a..87dbcb5d9 100644 --- a/move/Makefile +++ b/move/Makefile @@ -1,6 +1,6 @@ -DEST = /BIG/move -DEST_LIVETREE = $(DEST)/live_tree -DEST_STAGE2 = $(DEST_LIVETREE)/usr/lib/stage2 + +DEST_LIVETREE = /tmp/live_tree +DEST_STAGE2 = $(DEST_LIVETREE)/usr/bin/stage2 ISO = /BIG/mdkmove.iso @@ -24,21 +24,19 @@ endif .PHONY: iso -default: install - -get_dest_livetree: - @echo -n $(DEST_LIVETREE) +all: install -build: stage1 xwait runlevel_set +build: xwait runlevel_set isolinux/boot.msg + cd $(STAGE1) && ADDITIONAL_DEFS="-DMANDRAKE_MOVE" MOVE=1 make init stage1-full init-move sudo ./collect-directories-to-create.pl $(DEST_LIVETREE) > data/directories-to-create sudo find $(DEST_LIVETREE)/etc -type f | perl -pe 's|$(DEST_LIVETREE)||' > data/all-etcfiles $(MAKE) -C ../perl-install mo_files -stage1: - cd $(STAGE1) && ADDITIONAL_DEFS="-DMANDRAKE_MOVE" MOVE=1 make dirs init stage1-full init-move - cd .. ; ./make_boot_img move +isolinux/boot.msg: data/isolinux-graphic.bmp + lilo-bmp2mdk mode:0x103 progress:371,144,4,4,64+11 clear:600,800,64+127 pos:0,0 < $< > $@ -install: +install: build + #- todo: make_boot_img alike to create boot volume from ../mdk-stage1/stage1-cdrom (isolinux mandatory since stock kernel is so big) sudo cp -f $(STAGE1)/init-move $(DEST_LIVETREE)/sbin/init $(MAKE) -C ../perl-install/share/po install NAME=libDrakX DATADIR=$(DEST_LIVETREE)/usr/share @@ -59,10 +57,10 @@ install: sudo rm -rf $(DEST_LIVETREE)/usr/share/langs sudo mkdir -p $(DEST_LIVETREE)/usr/share/langs - sudo cp -f $(INSTALL)/pixmaps/langs/lang-*.png $(DEST_LIVETREE)/usr/share/langs + sudo cp -f $(patsubst %, $(INSTALL)/pixmaps/langs/lang-%.png, $(LANG_FILES)) $(DEST_LIVETREE)/usr/share/langs #- overwrite /usr/lib/libDrakX files of the live tree with those in CVS - (cd $(DEST_LIVETREE)/usr/lib/libDrakX ; find -name "*.pm") | egrep -v 'ctxhelp|drakfirsttime|xfree3|xfree4|xfreeX' | (cd $(INSTALL) ; sudo cpio -pLumd $(DEST_LIVETREE)/usr/lib/libDrakX/) + (cd $(DEST_LIVETREE)/usr/lib/libDrakX ; find -name "*.pm") | egrep -v 'ctxhelp|drakfirsttime' | (cd $(INSTALL) ; sudo cpio -pLumd $(DEST_LIVETREE)/usr/lib/libDrakX/) #- overwrite stuff.so of drakxtools because it doesn't contain C_DRAKX stuff sudo cp -f ../perl-install/c/blib/arch/auto/stuff/stuff.so $(DEST_LIVETREE)/usr/lib/libDrakX/auto/c/stuff @@ -88,33 +86,33 @@ install: sudo cp -f /tmp/version $(DEST_LIVETREE)/usr/share/VERSION live_tree_boot: - rm -f $(DEST)/live_tree*.clp - ./make_live_tree_boot $(DEST_LIVETREE) + rm -f /tmp/live_tree*.clp + ./make_live_tree_boot tools/fix-fc-cache.pl $(DEST_LIVETREE) - $(MAKE) $(DEST)/live_tree_always.clp - $(MAKE) $(DEST)/live_tree_boot.clp - $(MAKE) $(DEST)/live_tree_totem.clp - -$(MAKE) $(DEST)/live_tree_nvidia.clp - $(MAKE) $(patsubst %, $(DEST)/live_tree_always_i18n_%.clp, $(LANG_FILES)) + $(MAKE) /tmp/live_tree_always.clp + $(MAKE) /tmp/live_tree_boot.clp + $(MAKE) /tmp/live_tree_totem.clp + -$(MAKE) /tmp/live_tree_nvidia.clp + $(MAKE) $(patsubst %, /tmp/live_tree_always_i18n_%.clp, $(LANG_FILES)) un_live_tree_boot: - ./make_live_tree_boot -u $(DEST_LIVETREE) + ./make_live_tree_boot -u tools/fix-fc-cache.pl $(DEST_LIVETREE) -iso: un_live_tree_boot build install live_tree_boot - rm -rf $(DEST)/iso $(DEST)/live_tree.clp - mkdir $(DEST)/iso - cp -a isolinux $(DEST)/iso - rm -rf $(DEST)/iso/isolinux/CVS - $(MAKE) $(DEST)/live_tree.clp - mv $(DEST)/*.clp $(DEST)/iso +iso: un_live_tree_boot install live_tree_boot + rm -rf /tmp/iso /tmp/live_tree.clp + mkdir /tmp/iso + cp -a isolinux /tmp/iso + rm -rf /tmp/iso/isolinux/CVS + $(MAKE) /tmp/live_tree.clp + mv /tmp/*.clp /tmp/iso - touch $(DEST)/iso/isolinux/boot.cat - find $(DEST)/iso/isolinux -type f -printf '%p 100\n' > $(DEST)/iso.sort ; echo '$(DEST)/iso/live_tree_boot.clp 5' >> $(DEST)/iso.sort + touch /tmp/iso/isolinux/boot.cat + find /tmp/iso/isolinux -type f -printf '%p 100\n' > /tmp/iso.sort ; echo '/tmp/iso/live_tree_boot.clp 5' >> /tmp/iso.sort # download version: MOVE10DO # complete version: MOVE10IN - mkisofs -r -J -hide-rr-moved -nobak -cache-inodes -P MandrakeSoft -V 'MandrakeMove' -volset MOVE10IN -b isolinux/isolinux.bin -c isolinux/boot.cat -sort $(DEST)/iso.sort -no-emul-boot -boot-load-size 4 -boot-info-table -o $(ISO) $(DEST)/iso - mv $(DEST)/iso/*.clp $(DEST) + mkisofs -r -J -hide-rr-moved -nobak -cache-inodes -P MandrakeSoft -V 'MandrakeMove' -volset MOVE10IN -b isolinux/isolinux.bin -c isolinux/boot.cat -sort /tmp/iso.sort -no-emul-boot -boot-load-size 4 -boot-info-table -o $(ISO) /tmp/iso + mv /tmp/iso/*.clp /tmp mkcd --addmd5 $(ISO) # cdrecord -v -eject dev=0,0,0 blank=fast gracetime=2 speed=99 $(ISO) # ftp://a:a@leia//BIG/mdkmove.iso @@ -136,6 +134,6 @@ clean: fi check_dirs: - for i in `cat data/*.dirs`; do grep "^$$i/" data/*.list && echo "$$i"; done ||: + for i in `cat data/*.dirs`; do grep /tmp/live_tree$$i/ data/*.list; done ||: # perl tools/busy-files-accesses --no-link --no-dir --full-dirs 'data/always.dirs data/boot.dirs data/totem.dirs' --already-have data/always.list diff --git a/move/collect-directories-to-create.pl b/move/collect-directories-to-create.pl index 7a5cfd283..c6e208c57 100755 --- a/move/collect-directories-to-create.pl +++ b/move/collect-directories-to-create.pl @@ -7,9 +7,11 @@ use MDK::Common; #- in which they try to write doesn't exist. better collect them #- at build time so that drakx startup can create them. -chdir $ARGV[0]; -foreach (`find etc var -type d`) { - chomp; - my @l = stat($_); - printf "%o %d %d %s\n", $l[2] & 07777, $l[4], $l[5], $_; +my @list = map { if_(m|^\Q$ARGV[0]\E(.*)$|, $1) } `find $ARGV[0]/{etc,var} -type d`; +my @final; +foreach my $e (sort { length($b) <=> length($a) } @list) { + any { /^\Q$e\E/ } @final and next; + push @final, $e; } + +print "$_\n" foreach sort @final; diff --git a/move/data/always.list b/move/data/always.list index bf37dcee1..e1535de87 100644 --- a/move/data/always.list +++ b/move/data/always.list @@ -1,142 +1,144 @@ -/bin/bash -/bin/mount -/bin/umount -/etc/ld.so.cache -/etc/nsswitch.conf -/lib/ld-2.3.3.so -/lib/ld-linux.so.2 -/lib/libc-2.3.3.so -/lib/libc.so.6 -/lib/libdl-2.3.3.so -/lib/libdl.so.2 -/lib/libgcc_s-3.3.2.so.1 -/lib/libm-2.3.3.so -/lib/libm.so.6 -/lib/libnsl-2.3.3.so -/lib/libnss_dns-2.3.3.so -/lib/libnss_files-2.3.3.so -/lib/libnss_nis-2.3.3.so -/lib/libnss_nisplus-2.3.3.so -/lib/libpam.so.0.77 -/lib/libpam_misc.so.0.77 -/lib/libpopt.so.0.0.0 -/lib/libpthread-0.10.so -/lib/libpthread.so.0 -/lib/libresolv-2.3.3.so -/lib/librt-2.3.3.so -/lib/librt.so.1 -/lib/libtermcap.so.2 -/lib/libtermcap.so.2.0.8 -/lib/libthread_db-1.0.so -/lib/libutil-2.3.3.so -/lib/libz.so.1.2.1 -/lib/security/pam_console_apply_devfsd.so -/sbin/cardmgr -/sbin/devfsd -/sbin/init -/sbin/klogd -/sbin/losetup -/sbin/syslogd -/usr/X11R6/bin/XFree86 -/usr/X11R6/bin/X_move -/usr/X11R6/bin/xfs -/usr/X11R6/bin/xwait -/usr/X11R6/lib/X11/fonts/75dpi/helvB12-ISO8859-1.pcf.gz -/usr/X11R6/lib/X11/fonts/75dpi/helvB12.pcf.gz -/usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 -/usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 -/usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 -/usr/X11R6/lib/libGL.so.1.2 -/usr/X11R6/lib/libICE.so.6.3 -/usr/X11R6/lib/libSM.so.6.0 -/usr/X11R6/lib/libX11.so.6.2 -/usr/X11R6/lib/libXcursor.so.1.0 -/usr/X11R6/lib/libXext.so.6.4 -/usr/X11R6/lib/libXfont.so.1.4 -/usr/X11R6/lib/libXft.so.2.1.1 -/usr/X11R6/lib/libXi.so.6.0 -/usr/X11R6/lib/libXinerama.so.1.0 -/usr/X11R6/lib/libXmu.so.6.2 -/usr/X11R6/lib/libXrandr.so.2.0 -/usr/X11R6/lib/libXrender.so.1.2.2 -/usr/X11R6/lib/libXss.so.1.0 -/usr/X11R6/lib/libXt.so.6.0 -/usr/X11R6/lib/libXtst.so.6.1 -/usr/X11R6/lib/libaudio.so.2.3 -/usr/bin/artsd -/usr/bin/dnotify -/usr/bin/eject -/usr/bin/kdeinit -/usr/bin/kwrapper -/usr/bin/startkde -/usr/bin/startkde_move -/usr/bin/xwait -/usr/lib/gconv/ISO8859-1.so -/usr/lib/gconv/ISO8859-15.so -/usr/lib/gtk-2.0/2.2.0/immodules/im-cedilla.so -/usr/lib/kde3/clock_panelapplet.so -/usr/lib/kde3/dcopserver.so -/usr/lib/kde3/kded.so -/usr/lib/kde3/kded_mountwatcher.so -/usr/lib/kde3/kdesktop.so -/usr/lib/kde3/kicker.so -/usr/lib/kde3/kio_devices.so -/usr/lib/kde3/kio_file.so -/usr/lib/kde3/klauncher.so -/usr/lib/kde3/knotify.so -/usr/lib/kde3/konq_sound.so -/usr/lib/kde3/ksmserver.so -/usr/lib/kde3/kwin.so -/usr/lib/kde3/kwin3_mandrake2.so -/usr/lib/kde3/minipager_panelapplet.so -/usr/lib/kde3/plugins/styles/galaxy.so -/usr/lib/kde3/systemtray_panelapplet.so -/usr/lib/kde3/taskbar_panelapplet.so -/usr/lib/libDCOP.so.4.2.0 -/usr/lib/libart_lgpl_2.so.2.3.16 -/usr/lib/libartsflow.so.1.0.0 -/usr/lib/libartsflow_idl.so.1.0.0 -/usr/lib/libartskde.so.1.2.0 -/usr/lib/libasound.so.2.0.0 -/usr/lib/libaudiofile.so.0.0.2 -/usr/lib/libesd.so.0.2.32 -/usr/lib/libexpat.so.0.4.0 -/usr/lib/libfam.so.0.0.0 -/usr/lib/libfontconfig.so.1.0.4 -/usr/lib/libfreetype.so.6.3.5 -/usr/lib/libglib-2.0.so.0.200.3 -/usr/lib/libgmodule-2.0.so.0.200.3 -/usr/lib/libgthread-2.0.so.0.200.3 -/usr/lib/libjpeg.so.62.0.0 -/usr/lib/libkdecorations.so.1.0.0 -/usr/lib/libkdecore.so.4.2.0 -/usr/lib/libkdefx.so.4.2.0 -/usr/lib/libkdeinit_dcopserver.so -/usr/lib/libkdeinit_kded.so -/usr/lib/libkdeinit_kdesktop.so -/usr/lib/libkdeinit_kicker.so -/usr/lib/libkdeinit_klauncher.so -/usr/lib/libkdeinit_ksmserver.so -/usr/lib/libkdeinit_kwin.so -/usr/lib/libkdesu.so.4.2.0 -/usr/lib/libkdeui.so.4.2.0 -/usr/lib/libkickermain.so.1.0.0 -/usr/lib/libkio.so.4.2.0 -/usr/lib/libkmedia2_idl.so.1.0.0 -/usr/lib/libkonq.so.4.2.0 -/usr/lib/libkparts.so.2.1.0 -/usr/lib/libmad.so.0.2.0 -/usr/lib/libmcop.so.1.0.0 -/usr/lib/libmng.so.1.0.0 -/usr/lib/libogg.so.0.5.0 -/usr/lib/libpng.so.3.1.2.5 -/usr/lib/libqtmcop.so.1.0.0 -/usr/lib/libsoundserver_idl.so.1.0.0 -/usr/lib/libstdc++.so.5.0.5 -/usr/lib/libtaskbar.so.1.2.0 -/usr/lib/libtaskmanager.so.1.0.0 -/usr/lib/libvorbis.so.0.3.0 -/usr/lib/libvorbisfile.so.3.1.0 -/usr/lib/qt3/lib/libqt-mt.so.3.2.3 -/usr/share/fonts/ttf/vera/Vera.ttf -/usr/share/fonts/ttf/vera/VeraBd.ttf +/tmp/live_tree/bin/bash +/tmp/live_tree/bin/mount +/tmp/live_tree/bin/umount +/tmp/live_tree/etc/ld.so.cache +/tmp/live_tree/etc/nsswitch.conf +/tmp/live_tree/lib/libc-2.3.2.so +/tmp/live_tree/lib/libc.so.6 +/tmp/live_tree/lib/libm-2.3.2.so +/tmp/live_tree/lib/libm.so.6 +/tmp/live_tree/lib/libpthread-0.10.so +/tmp/live_tree/lib/libpthread.so.0 +/tmp/live_tree/lib/librt-2.3.2.so +/tmp/live_tree/lib/librt.so.1 +/tmp/live_tree/lib/libthread_db-1.0.so +/tmp/live_tree/lib/ld-2.3.2.so +/tmp/live_tree/lib/ld-linux.so.2 +/tmp/live_tree/lib/libdl.so.2 +/tmp/live_tree/lib/libdl-2.3.2.so +/tmp/live_tree/lib/libgcc_s-3.3.1.so.1 +/tmp/live_tree/lib/libnsl-2.3.2.so +/tmp/live_tree/lib/libnss_dns-2.3.2.so +/tmp/live_tree/lib/libnss_files-2.3.2.so +/tmp/live_tree/lib/libnss_nis-2.3.2.so +/tmp/live_tree/lib/libnss_nisplus-2.3.2.so +/tmp/live_tree/lib/libpam.so.0.77 +/tmp/live_tree/lib/libpam_misc.so.0.77 +/tmp/live_tree/lib/libpopt.so.0.0.0 +/tmp/live_tree/lib/libresolv-2.3.2.so +/tmp/live_tree/lib/libtermcap.so.2 +/tmp/live_tree/lib/libtermcap.so.2.0.8 +/tmp/live_tree/lib/libutil-2.3.2.so +/tmp/live_tree/lib/libz.so.1.1.4 +/tmp/live_tree/lib/security/pam_console_apply_devfsd.so +/tmp/live_tree/sbin/cardmgr +/tmp/live_tree/sbin/devfsd +/tmp/live_tree/sbin/init +/tmp/live_tree/sbin/klogd +/tmp/live_tree/sbin/losetup +/tmp/live_tree/sbin/syslogd +/tmp/live_tree/usr/X11R6/bin/X_move +/tmp/live_tree/usr/X11R6/bin/XFree86 +/tmp/live_tree/usr/X11R6/bin/xfs +/tmp/live_tree/usr/X11R6/bin/xwait +/tmp/live_tree/usr/X11R6/lib/X11/fonts/75dpi/helvB12-ISO8859-1.pcf.gz +/tmp/live_tree/usr/X11R6/lib/X11/fonts/75dpi/helvB12.pcf.gz +/tmp/live_tree/usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 +/tmp/live_tree/usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 +/tmp/live_tree/usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 +/tmp/live_tree/usr/X11R6/lib/libGL.so.1.2 +/tmp/live_tree/usr/X11R6/lib/libICE.so.6.3 +/tmp/live_tree/usr/X11R6/lib/libSM.so.6.0 +/tmp/live_tree/usr/X11R6/lib/libX11.so.6.2 +/tmp/live_tree/usr/X11R6/lib/libXcursor.so.1.0 +/tmp/live_tree/usr/X11R6/lib/libXext.so.6.4 +/tmp/live_tree/usr/X11R6/lib/libXfont.so.1.4 +/tmp/live_tree/usr/X11R6/lib/libXft.so.2.1 +/tmp/live_tree/usr/X11R6/lib/libXmu.so.6.2 +/tmp/live_tree/usr/X11R6/lib/libXrender.so.1.2 +/tmp/live_tree/usr/X11R6/lib/libXt.so.6.0 +/tmp/live_tree/usr/X11R6/lib/libaudio.so.2.3 +/tmp/live_tree/usr/bin/artsd +/tmp/live_tree/usr/bin/dnotify +/tmp/live_tree/usr/bin/eject +/tmp/live_tree/usr/bin/kdeinit +/tmp/live_tree/usr/bin/kwrapper +/tmp/live_tree/usr/bin/startkde +/tmp/live_tree/usr/bin/startkde_move +/tmp/live_tree/usr/bin/xwait +/tmp/live_tree/usr/lib/GConf/2/libgconfbackend-xml.so +/tmp/live_tree/usr/lib/dcopserver.so +/tmp/live_tree/usr/lib/gconfd-2 +/tmp/live_tree/usr/lib/gconv/ISO8859-1.so +/tmp/live_tree/usr/lib/gconv/ISO8859-15.so +/tmp/live_tree/usr/lib/gtk-2.0/2.2.0/immodules/im-cedilla.so +/tmp/live_tree/usr/lib/kde3/clock_panelapplet.so +/tmp/live_tree/usr/lib/kde3/kded_kinetd.so +/tmp/live_tree/usr/lib/kde3/kded_mountwatcher.so +/tmp/live_tree/usr/lib/kde3/kickermenu_recentdocs.so +/tmp/live_tree/usr/lib/kde3/kio_file.so +/tmp/live_tree/usr/lib/kde3/konq_sound.so +/tmp/live_tree/usr/lib/kde3/kwin_mandrake.so.0.0.0 +/tmp/live_tree/usr/lib/kde3/minipager_panelapplet.so +/tmp/live_tree/usr/lib/kde3/plugins/styles/galaxy.so.0.0.0 +/tmp/live_tree/usr/lib/kde3/systemtray_panelapplet.so +/tmp/live_tree/usr/lib/kde3/taskbar_panelapplet.so +/tmp/live_tree/usr/lib/kded.so +/tmp/live_tree/usr/lib/kdesktop.so +/tmp/live_tree/usr/lib/khotkeys.so +/tmp/live_tree/usr/lib/kicker.so +/tmp/live_tree/usr/lib/klauncher.so +/tmp/live_tree/usr/lib/knotify.so +/tmp/live_tree/usr/lib/ksmserver.so +/tmp/live_tree/usr/lib/kwin.so +/tmp/live_tree/usr/lib/libDCOP.so.4.1.0 +/tmp/live_tree/usr/lib/libORBit-2.so.0.0.0 +/tmp/live_tree/usr/lib/libart_lgpl_2.so.2.3.16 +/tmp/live_tree/usr/lib/libartsbuilder.so.0.0.0 +/tmp/live_tree/usr/lib/libartsflow.so.1.0.0 +/tmp/live_tree/usr/lib/libartsflow_idl.so.1.0.0 +/tmp/live_tree/usr/lib/libartskde.so.1.1.0 +/tmp/live_tree/usr/lib/libartsmidi.so.0.0.0 +/tmp/live_tree/usr/lib/libartsmidi_idl.so.0.0.0 +/tmp/live_tree/usr/lib/libasound.so.2.0.0 +/tmp/live_tree/usr/lib/libaudiofile.so.0.0.2 +/tmp/live_tree/usr/lib/libaudiofilearts.so +/tmp/live_tree/usr/lib/libexpat.so.0.4.0 +/tmp/live_tree/usr/lib/libfam.so.0.0.0 +/tmp/live_tree/usr/lib/libfontconfig.so.1.0.4 +/tmp/live_tree/usr/lib/libfreetype.so.6.3.3 +/tmp/live_tree/usr/lib/libgconf-2.so.4.1.0 +/tmp/live_tree/usr/lib/libglib-2.0.so.0.200.3 +/tmp/live_tree/usr/lib/libgmodule-2.0.so.0.200.3 +/tmp/live_tree/usr/lib/libgobject-2.0.so.0.200.3 +/tmp/live_tree/usr/lib/libgthread-2.0.so.0.200.3 +/tmp/live_tree/usr/lib/libjpeg.so.62.0.0 +/tmp/live_tree/usr/lib/libkcal.so.2.0.0 +/tmp/live_tree/usr/lib/libkdecore.so.4.1.0 +/tmp/live_tree/usr/lib/libkdefx.so.4.1.0 +/tmp/live_tree/usr/lib/libkdesu.so.4.1.0 +/tmp/live_tree/usr/lib/libkdeui.so.4.1.0 +/tmp/live_tree/usr/lib/libkickermain.so.1.0.0 +/tmp/live_tree/usr/lib/libkio.so.4.1.0 +/tmp/live_tree/usr/lib/libkmedia2_idl.so.1.0.0 +/tmp/live_tree/usr/lib/libkonq.so.4.1.0 +/tmp/live_tree/usr/lib/libkparts.so.2.1.0 +/tmp/live_tree/usr/lib/libmad.so.0.2.0 +/tmp/live_tree/usr/lib/libmcop.so.1.0.0 +/tmp/live_tree/usr/lib/libmcop_mt.so.1.0.0 +/tmp/live_tree/usr/lib/libmng.so.1.0.0 +/tmp/live_tree/usr/lib/libogg.so.0.4.0 +/tmp/live_tree/usr/lib/libpng.so.3.1.2.5 +/tmp/live_tree/usr/lib/libqtmcop.so.1.0.0 +/tmp/live_tree/usr/lib/libslp.so.1.0.0 +/tmp/live_tree/usr/lib/libsoundserver_idl.so.1.0.0 +/tmp/live_tree/usr/lib/libstdc++.so.5.0.5 +/tmp/live_tree/usr/lib/libtaskbar.so.1.1.0 +/tmp/live_tree/usr/lib/libtaskmanager.so.1.0.0 +/tmp/live_tree/usr/lib/libvorbis.so.0.2.0 +/tmp/live_tree/usr/lib/libvorbisenc.so.2.0.0 +/tmp/live_tree/usr/lib/libvorbisfile.so.3.0.0 +/tmp/live_tree/usr/lib/libxml2.so.2.5.11 +/tmp/live_tree/usr/lib/qt3/lib/libqt-mt.so.3.1.2 +/tmp/live_tree/usr/share/fonts/ttf/vera/Vera.ttf +/tmp/live_tree/usr/share/fonts/ttf/vera/VeraBd.ttf diff --git a/move/data/always_i18n.list b/move/data/always_i18n.list index 244f4fa10..0d66a80e1 100644 --- a/move/data/always_i18n.list +++ b/move/data/always_i18n.list @@ -1,30 +1,28 @@ -/usr/share/locale/__LANG__/LC_ADDRESS -/usr/share/locale/__LANG__/LC_COLLATE -/usr/share/locale/__LANG__/LC_CTYPE -/usr/share/locale/__LANG__/LC_IDENTIFICATION -/usr/share/locale/__LANG__/LC_MEASUREMENT -/usr/share/locale/__LANG__/LC_MESSAGES/GConf2.mo -/usr/share/locale/__LANG__/LC_MESSAGES/SYS_LC_MESSAGES -/usr/share/locale/__LANG__/LC_MESSAGES/glib20.mo -/usr/share/locale/__LANG__/LC_MESSAGES/gtk20.mo -/usr/share/locale/__LANG__/LC_MESSAGES/kdelibs.mo -/usr/share/locale/__LANG__/LC_MESSAGES/kdesktop.mo -/usr/share/locale/__LANG__/LC_MESSAGES/khotkeys.mo -/usr/share/locale/__LANG__/LC_MESSAGES/kicker.mo -/usr/share/locale/__LANG__/LC_MESSAGES/kio.mo -/usr/share/locale/__LANG__/LC_MESSAGES/kio_devices.mo -/usr/share/locale/__LANG__/LC_MESSAGES/knotify.mo -/usr/share/locale/__LANG__/LC_MESSAGES/ksmserver.mo -/usr/share/locale/__LANG__/LC_MESSAGES/ktaskbarapplet.mo -/usr/share/locale/__LANG__/LC_MESSAGES/kwin.mo -/usr/share/locale/__LANG__/LC_MESSAGES/libgnomeui-2.0.mo -/usr/share/locale/__LANG__/LC_MESSAGES/libkonq.mo -/usr/share/locale/__LANG__/LC_MESSAGES/libxine1.mo -/usr/share/locale/__LANG__/LC_MESSAGES/totem.mo -/usr/share/locale/__LANG__/LC_MONETARY -/usr/share/locale/__LANG__/LC_NAME -/usr/share/locale/__LANG__/LC_NUMERIC -/usr/share/locale/__LANG__/LC_PAPER -/usr/share/locale/__LANG__/LC_TELEPHONE -/usr/share/locale/__LANG__/LC_TIME -/usr/share/services/ksycoca-__LANG__ +/tmp/live_tree/usr/share/locale/__LANG__/LC_ADDRESS +/tmp/live_tree/usr/share/locale/__LANG__/LC_COLLATE +/tmp/live_tree/usr/share/locale/__LANG__/LC_CTYPE +/tmp/live_tree/usr/share/locale/__LANG__/LC_IDENTIFICATION +/tmp/live_tree/usr/share/locale/__LANG__/LC_MEASUREMENT +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/GConf2.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/SYS_LC_MESSAGES +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/glib20.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/gtk20.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/kdelibs.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/kdesktop.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/khotkeys.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/kicker.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/kio_devices.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/knotify.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/ksmserver.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/kwin.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/libgnomeui-2.0.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/libkonq.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/libxine1.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MESSAGES/totem.mo +/tmp/live_tree/usr/share/locale/__LANG__/LC_MONETARY +/tmp/live_tree/usr/share/locale/__LANG__/LC_NAME +/tmp/live_tree/usr/share/locale/__LANG__/LC_NUMERIC +/tmp/live_tree/usr/share/locale/__LANG__/LC_PAPER +/tmp/live_tree/usr/share/locale/__LANG__/LC_TELEPHONE +/tmp/live_tree/usr/share/locale/__LANG__/LC_TIME +/tmp/live_tree/usr/share/services/ksycoca-__LANG__ diff --git a/move/data/boot.dirs b/move/data/boot.dirs index 0b0e2a10d..df381c82e 100644 --- a/move/data/boot.dirs +++ b/move/data/boot.dirs @@ -1,40 +1,41 @@ /etc/X11/fs /etc/X11/xserver -/etc/dynamic/hooks /etc/gtk-2.0 /etc/pango -/etc/profile.d /lib/modutils /usr/X11R6/lib/X11/locale/C /usr/X11R6/lib/modules/drivers/linux +/usr/bin/stage2 /usr/lib/libDrakX/Xconfig /usr/lib/libDrakX/auto/c -/usr/lib/libDrakX/auto/xf86misc /usr/lib/libDrakX/c /usr/lib/libDrakX/printer /usr/lib/libDrakX/sbus_probing -/usr/lib/libDrakX/xf86misc -/usr/lib/perl5/5.8.3/Exporter -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/CORE -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/File -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/auto/File -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/auto/Socket -/usr/lib/perl5/5.8.3/warnings -/usr/lib/perl5/vendor_perl/5.8.3/MDK -/usr/lib/perl5/vendor_perl/5.8.3/i386-linux-thread-multi/Gtk2/Gdk -/usr/lib/perl5/vendor_perl/5.8.3/i386-linux-thread-multi/auto/Glib -/usr/lib/perl5/vendor_perl/5.8.3/i386-linux-thread-multi/auto/Gtk2 -/usr/lib/stage2 +/usr/lib/mcop/Arts +/usr/lib/perl5/5.8.1/Exporter +/usr/lib/perl5/5.8.1/i386-linux-thread-multi/CORE +/usr/lib/perl5/5.8.1/i386-linux-thread-multi/File +/usr/lib/perl5/5.8.1/i386-linux-thread-multi/auto/File +/usr/lib/perl5/5.8.1/i386-linux-thread-multi/auto/Socket +/usr/lib/perl5/5.8.1/warnings +/usr/lib/perl5/vendor_perl/5.8.1/i386-linux-thread-multi/Gtk2/Gdk +/usr/lib/perl5/vendor_perl/5.8.1/i386-linux-thread-multi/auto/Glib +/usr/lib/perl5/vendor_perl/5.8.1/i386-linux-thread-multi/auto/Gtk2 /usr/share/applnk-mdk +/usr/share/apps/clockapplet +/usr/share/apps/kabc/plugins +/usr/share/apps/kalarmdgui /usr/share/apps/kconf_update +/usr/share/apps/kdesktop/DesktopLinks /usr/share/apps/kdisplay/app-defaults /usr/share/apps/khtml/css /usr/share/apps/knotify /usr/share/autostart /usr/share/icons/default +/usr/share/icons/mdk-hicolor /usr/share/langs /usr/share/mimelnk -/usr/share/services/kaddressbook +/usr/share/nautilus /usr/share/servicetypes /usr/share/themes/Default/gtk-2.0 /usr/share/themes/Galaxy/gtk-2.0 diff --git a/move/data/boot.list b/move/data/boot.list index d2d5ebe61..3d1dd7887 100644 --- a/move/data/boot.list +++ b/move/data/boot.list @@ -1,883 +1,790 @@ -/bin/basename -/bin/cat -/bin/chmod -/bin/chown -/bin/cp -/bin/cut -/bin/date -/bin/egrep -/bin/env -/bin/gawk -/bin/gettext -/bin/grep -/bin/gunzip -/bin/hostname -/bin/id -/bin/loadkeys -/bin/mkdir -/bin/mktemp -/bin/mv -/bin/rm -/bin/sed -/bin/sort -/bin/touch -/bin/true -/bin/uname -/etc/DIR_COLORS -/etc/X11/Xresources -/etc/X11/Xsession -/etc/X11/fs -/etc/X11/wmsession.d/01KDE -/etc/X11/wmsession.d/07IceWM -/etc/X11/xdm/Xsession -/etc/X11/xinit.d/Mod_Meta_L_Disable -/etc/X11/xinit.d/menu -/etc/X11/xinit.d/mountloop -/etc/X11/xinit.d/numlock -/etc/X11/xinit/XIM -/etc/X11/xinit/fixkeyboard -/etc/X11/xkb/compat/accessx -/etc/X11/xkb/compat/basic -/etc/X11/xkb/compat/complete -/etc/X11/xkb/compat/iso9995 -/etc/X11/xkb/compat/misc -/etc/X11/xkb/compat/mousekeys -/etc/X11/xkb/compat/xfree86 -/etc/X11/xkb/geometry/pc -/etc/X11/xkb/keycodes/aliases -/etc/X11/xkb/keycodes/xfree86 -/etc/X11/xkb/rules/xfree86 -/etc/X11/xkb/rules/xfree86.lst -/etc/X11/xkb/symbols/en_US -/etc/X11/xkb/symbols/gb -/etc/X11/xkb/symbols/iso9995-3 -/etc/X11/xkb/symbols/srvr_ctrl -/etc/X11/xkb/symbols/us -/etc/X11/xkb/types/basic -/etc/X11/xkb/types/complete -/etc/X11/xkb/types/extra -/etc/X11/xkb/types/iso9995 -/etc/X11/xkb/types/mousekeys -/etc/X11/xkb/types/pc -/etc/X11/xkb/xkbcomp -/etc/X11/xserver -/etc/bash_completion -/etc/bash_completion.d/netprofile -/etc/bash_completion.d/urpmi -/etc/bashrc -/etc/cups/classes.conf -/etc/cups/client.conf -/etc/cups/command.types -/etc/cups/cupsd.conf -/etc/cups/mime.convs -/etc/cups/mime.types -/etc/cups/printers.conf -/etc/cups/pstoraster.convs -/etc/devfs/conf.d/dynamic.conf -/etc/devfsd.conf -/etc/dynamic/hooks -/etc/dynamic/scripts/functions.script -/etc/dynamic/scripts/lp.script -/etc/dynamic/scripts/part.script -/etc/filesystems -/etc/fonts/fonts.conf -/etc/fonts/local.conf -/etc/group -/etc/gtk-2.0 -/etc/hotplug.d/default/default.hotplug -/etc/hotplug/hotplug.functions -/etc/imrc -/etc/initlog.conf -/etc/inputrc -/etc/localtime -/etc/mandrake-release -/etc/modprobe.devfs -/etc/pam.d/other -/etc/pam.d/sudo -/etc/pam.d/system-auth -/etc/pam.d/xserver -/etc/pango -/etc/passwd -/etc/profile -/etc/profile.d -/etc/rc.d/init.d/functions -/etc/rc.d/init.d/mandrake_consmap -/etc/rc.d/init.d/netfs -/etc/rc.d/init.d/numlock -/etc/rc.d/init.d/sound -/etc/rc.d/init.d/syslog -/etc/rc.d/init.d/xfs -/etc/rc.d/rc.local -/etc/rpc -/etc/security/console.perms -/etc/security/fileshare.conf -/etc/security/pam_env.conf -/etc/services -/etc/sudoers -/etc/syslog.conf -/etc/termcap -/etc/tmdns.conf -/etc/xdg/menus/applications-merged-simplified/applications-simplified-configure.menu -/etc/xdg/menus/applications-simplified.menu -/etc/xdg/menus/kontact.menu -/etc/xdg/menus/mdk-configure-kde.menu -/lib/libblkid.so.1.0 -/lib/libcom_err.so.2.1 -/lib/libcrypt-2.3.3.so -/lib/libe2p.so.2.3 -/lib/libext2fs.so.2.4 -/lib/libintl.so.2.4.1 -/lib/libpcre.so.0.0.1 -/lib/libproc.so.3.1.15 -/lib/libuuid.so.1.2 -/lib/module-init-tools/modprobe.compat -/lib/module-init-tools/modprobe.default -/lib/security/pam_console.so -/lib/security/pam_cracklib.so -/lib/security/pam_deny.so -/lib/security/pam_env.so -/lib/security/pam_limits.so -/lib/security/pam_permit.so -/lib/security/pam_rootok.so -/lib/security/pam_stack.so -/lib/security/pam_unix.so -/move/BOOT-800-MOVE.jpg -/move/all-etcfiles -/move/directories-to-create -/move/etcfiles -/sbin/chkconfig -/sbin/consoletype -/sbin/generate-modprobe.conf -/sbin/hotplug -/sbin/initlog -/sbin/mkdosfs -/sbin/mke2fs -/sbin/modprobe-25 -/sbin/pam_console_apply -/sbin/rmmod-25 -/sbin/runlevel -/sbin/service -/sbin/sysctl -/usr/X11R6/bin/Xwrapper -/usr/X11R6/bin/enable_X11_numlock -/usr/X11R6/bin/iceauth -/usr/X11R6/bin/setxkbmap -/usr/X11R6/bin/xdpyinfo -/usr/X11R6/bin/xmodmap -/usr/X11R6/bin/xrdb -/usr/X11R6/bin/xset -/usr/X11R6/bin/xsetroot -/usr/X11R6/lib/X11/XErrorDB -/usr/X11R6/lib/X11/XKeysymDB -/usr/X11R6/lib/X11/locale/C -/usr/X11R6/lib/X11/locale/compose.dir -/usr/X11R6/lib/X11/locale/iso8859-1/Compose -/usr/X11R6/lib/X11/locale/iso8859-1/XI18N_OBJS -/usr/X11R6/lib/X11/locale/iso8859-1/XLC_LOCALE -/usr/X11R6/lib/X11/locale/locale.alias -/usr/X11R6/lib/X11/locale/locale.dir -/usr/X11R6/lib/X11/rgb.txt -/usr/X11R6/lib/libXm.so.2.0.1 -/usr/X11R6/lib/libXmuu.so.1.0 -/usr/X11R6/lib/libXp.so.6.2 -/usr/X11R6/lib/libXxf86misc.so.1.0 -/usr/X11R6/lib/libXxf86vm.so.1.0 -/usr/X11R6/lib/modules/drivers/linux -/usr/X11R6/lib/modules/fonts/libbitmap.a -/usr/X11R6/lib/modules/fonts/libfreetype.a -/usr/X11R6/lib/modules/fonts/libtype1.a -/usr/X11R6/lib/modules/input/mouse_drv.o -/usr/X11R6/lib/modules/libfb.a -/usr/X11R6/lib/modules/libpcidata.a -/usr/X11R6/lib/modules/libramdac.a -/usr/X11R6/lib/modules/libvgahw.a -/usr/bin/cpp-3.3.2 -/usr/bin/dcopserver_shutdown -/usr/bin/dircolors -/usr/bin/dumpkeys -/usr/bin/expr -/usr/bin/getent -/usr/bin/head -/usr/bin/kab2kabc -/usr/bin/killall -/usr/bin/krootwarning -/usr/bin/ksplash -/usr/bin/lnusertemp -/usr/bin/locale -/usr/bin/mandrakegalaxy -/usr/bin/mandrakegalaxy.real -/usr/bin/mdk_move_loop -/usr/bin/nspluginscan -/usr/bin/perl5.8.3 -/usr/bin/qiv -/usr/bin/runlevel_set -/usr/bin/runstage2.pl -/usr/bin/setleds -/usr/bin/sperl5.8.3 -/usr/bin/sudo -/usr/bin/test-windows-key -/usr/bin/tr -/usr/bin/tty -/usr/bin/wait4x -/usr/bin/which -/usr/bin/whoami -/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.3.2/cc1 -/usr/lib/gconv/gconv-modules -/usr/lib/gtk-2.0/2.2.0/engines/libgalaxy.so -/usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so -/usr/lib/kbd/consolefonts/lat0-16.psf.gz -/usr/lib/kbd/consoletrans/iso15.acm.gz -/usr/lib/kbd/consoletrans/iso15.sfm.gz -/usr/lib/kde3/clock_panelapplet.la -/usr/lib/kde3/dcopserver.la -/usr/lib/kde3/kabc_file.la -/usr/lib/kde3/kabc_file.so -/usr/lib/kde3/kbuildsycoca.la -/usr/lib/kde3/kbuildsycoca.so -/usr/lib/kde3/kcm_access.la -/usr/lib/kde3/kcm_access.so -/usr/lib/kde3/kcm_arts.la -/usr/lib/kde3/kcm_arts.so -/usr/lib/kde3/kcm_bell.la -/usr/lib/kde3/kcm_bell.so -/usr/lib/kde3/kcm_energy.la -/usr/lib/kde3/kcm_energy.so -/usr/lib/kde3/kcm_input.la -/usr/lib/kde3/kcm_input.so -/usr/lib/kde3/kcm_keyboard.la -/usr/lib/kde3/kcm_keyboard.so -/usr/lib/kde3/kcm_keys.la -/usr/lib/kde3/kcm_keys.so -/usr/lib/kde3/kcm_kgamma.la -/usr/lib/kde3/kcm_kgamma.so -/usr/lib/kde3/kcm_kmix.la -/usr/lib/kde3/kcm_kmix.so -/usr/lib/kde3/kcm_nsplugins.la -/usr/lib/kde3/kcm_nsplugins.so -/usr/lib/kde3/kcm_randr.la -/usr/lib/kde3/kcm_randr.so -/usr/lib/kde3/kcm_style.la -/usr/lib/kde3/kcm_style.so -/usr/lib/kde3/kcminit.la -/usr/lib/kde3/kcminit.so -/usr/lib/kde3/kconf_update.la -/usr/lib/kde3/kconf_update.so -/usr/lib/kde3/kded.la -/usr/lib/kde3/kded_mountwatcher.la -/usr/lib/kde3/kdesktop.la -/usr/lib/kde3/kgreet_classic.la -/usr/lib/kde3/kgreet_classic.so -/usr/lib/kde3/kicker.la -/usr/lib/kde3/kio_devices.la -/usr/lib/kde3/kio_file.la -/usr/lib/kde3/klauncher.la -/usr/lib/kde3/knotify.la -/usr/lib/kde3/konq_sound.la -/usr/lib/kde3/ksmserver.la -/usr/lib/kde3/ksplashmdk.la -/usr/lib/kde3/ksplashmdk.so -/usr/lib/kde3/kwin.la -/usr/lib/kde3/kwin3_mandrake2.la -/usr/lib/kde3/minipager_panelapplet.la -/usr/lib/kde3/systemtray_panelapplet.la -/usr/lib/kde3/taskbar_panelapplet.la -/usr/lib/krandrinithack.la -/usr/lib/krandrinithack.so -/usr/lib/libDrakX/Xconfig -/usr/lib/libDrakX/any.pm -/usr/lib/libDrakX/auto/c -/usr/lib/libDrakX/auto/xf86misc -/usr/lib/libDrakX/c -/usr/lib/libDrakX/c.pm -/usr/lib/libDrakX/class_discard.pm -/usr/lib/libDrakX/commands.pm -/usr/lib/libDrakX/common.pm -/usr/lib/libDrakX/detect_devices.pm -/usr/lib/libDrakX/devices.pm -/usr/lib/libDrakX/do_pkgs.pm -/usr/lib/libDrakX/fs.pm -/usr/lib/libDrakX/fsedit.pm -/usr/lib/libDrakX/handle_configs.pm -/usr/lib/libDrakX/harddrake/sound.pm -/usr/lib/libDrakX/interactive.pm -/usr/lib/libDrakX/interactive/gtk.pm -/usr/lib/libDrakX/keyboard.pm -/usr/lib/libDrakX/lang.pm -/usr/lib/libDrakX/list_modules.pm -/usr/lib/libDrakX/log.pm -/usr/lib/libDrakX/loopback.pm -/usr/lib/libDrakX/modules.pm -/usr/lib/libDrakX/modules/interactive.pm -/usr/lib/libDrakX/mouse.pm -/usr/lib/libDrakX/network/network.pm -/usr/lib/libDrakX/network/tools.pm -/usr/lib/libDrakX/partition_table.pm -/usr/lib/libDrakX/partition_table/dos.pm -/usr/lib/libDrakX/partition_table/empty.pm -/usr/lib/libDrakX/partition_table/raw.pm -/usr/lib/libDrakX/printer -/usr/lib/libDrakX/run_program.pm -/usr/lib/libDrakX/sbus_probing -/usr/lib/libDrakX/services.pm -/usr/lib/libDrakX/steps.pm -/usr/lib/libDrakX/swap.pm -/usr/lib/libDrakX/timezone.pm -/usr/lib/libDrakX/ugtk2.pm -/usr/lib/libDrakX/xf86misc -/usr/lib/libatk-1.0.so.0.400.1 -/usr/lib/libbeecrypt.so.6.2.0 -/usr/lib/libbz2.so.1.0.0 -/usr/lib/libconsole.so.0.0.0 -/usr/lib/libcrack.so.2.7 -/usr/lib/libctutils.so.0.0.0 -/usr/lib/libelf-0.89.so -/usr/lib/libgdk-1.2.so.0.9.1 -/usr/lib/libgdk-x11-2.0.so.0.200.4 -/usr/lib/libgdk_imlib.so.1.9.14 -/usr/lib/libgdk_pixbuf-2.0.so.0.200.4 -/usr/lib/libglib-1.2.so.0.0.10 -/usr/lib/libgmodule-1.2.so.0.0.10 -/usr/lib/libgobject-2.0.so.0.200.3 -/usr/lib/libgtk-1.2.so.0.9.1 -/usr/lib/libgtk-x11-2.0.so.0.200.4 -/usr/lib/libimlib-jpeg.so -/usr/lib/libkabc.so.1.2.0 -/usr/lib/libkabc_file.so.1.0.0 -/usr/lib/libkdeinit_kbuildsycoca.so -/usr/lib/libkdeinit_kcminit.so -/usr/lib/libkdeinit_kconf_update.so -/usr/lib/libkdeprint.so.4.2.0 -/usr/lib/libkhtml.so.4.2.0 -/usr/lib/libkjs.so.1.2.0 -/usr/lib/libkmid.so.0.0.95 -/usr/lib/libkonq.la -/usr/lib/libkresources.so.1.2.0 -/usr/lib/libksplashthemes.so.0.0.0 -/usr/lib/libkutils.so.1.2.0 -/usr/lib/libkwalletclient.so.1.0.0 -/usr/lib/libpango-1.0.so.0.200.5 -/usr/lib/libpangox-1.0.so.0.200.5 -/usr/lib/libpangoxft-1.0.so.0.200.5 -/usr/lib/libpcreposix.so.0.0.0 -/usr/lib/libpng12.so.0.1.2.5 -/usr/lib/librpm-4.2.so -/usr/lib/librpmdb-4.2.so -/usr/lib/librpmio-4.2.so -/usr/lib/libvcard.so.0.0.0 -/usr/lib/libxine.so.1.8.1 -/usr/lib/pango/1.2.0/modules/pango-basic-xft.so -/usr/lib/perl5/5.8.3/AutoLoader.pm -/usr/lib/perl5/5.8.3/Carp.pm -/usr/lib/perl5/5.8.3/Digest/base.pm -/usr/lib/perl5/5.8.3/Exporter -/usr/lib/perl5/5.8.3/Exporter.pm -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/CORE -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/Config.pm -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/Digest/MD5.pm -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/DynaLoader.pm -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/File -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/Socket.pm -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/XSLoader.pm -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/_h2ph_pre.ph -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/asm/unistd.ph -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/auto/Digest/MD5/MD5.so -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/auto/File -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/auto/Socket -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/bits/syscall.ph -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/lib.pm -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/sys/syscall.ph -/usr/lib/perl5/5.8.3/i386-linux-thread-multi/syscall.ph -/usr/lib/perl5/5.8.3/overload.pm -/usr/lib/perl5/5.8.3/strict.pm -/usr/lib/perl5/5.8.3/vars.pm -/usr/lib/perl5/5.8.3/warnings -/usr/lib/perl5/5.8.3/warnings.pm -/usr/lib/perl5/vendor_perl/5.8.3/MDK -/usr/lib/perl5/vendor_perl/5.8.3/i386-linux-thread-multi/Glib.pm -/usr/lib/perl5/vendor_perl/5.8.3/i386-linux-thread-multi/Gtk2.pm -/usr/lib/perl5/vendor_perl/5.8.3/i386-linux-thread-multi/Gtk2/Gdk -/usr/lib/perl5/vendor_perl/5.8.3/i386-linux-thread-multi/auto/Glib -/usr/lib/perl5/vendor_perl/5.8.3/i386-linux-thread-multi/auto/Gtk2 -/usr/lib/stage2 -/usr/sbin/chksession -/usr/sbin/ddcxinfos -/usr/sbin/fileshareset -/usr/sbin/update-alternatives -/usr/share/application-registry/gnome-vfs.applications -/usr/share/applnk-mdk -/usr/share/applnk-mdk-simplified/.hidden/.directory -/usr/share/applnk-mdk-simplified/.hidden/kontact-summary.desktop -/usr/share/applnk-mdk-simplified/Administer your system/.directory -/usr/share/applnk-mdk-simplified/Administer your system/Backup your data.desktop -/usr/share/applnk-mdk-simplified/Administer your system/Configure your computer.desktop -/usr/share/applnk-mdk-simplified/Administer your system/KControl.desktop -/usr/share/applnk-mdk-simplified/Administer your system/KFloppy.desktop -/usr/share/applnk-mdk-simplified/Administer your system/ark.desktop -/usr/share/applnk-mdk-simplified/Administer your system/kdepasswd.desktop -/usr/share/applnk-mdk-simplified/Administer your system/konsole.desktop -/usr/share/applnk-mdk-simplified/Enjoy music and video/.directory -/usr/share/applnk-mdk-simplified/Enjoy music and video/Listen to music files.desktop -/usr/share/applnk-mdk-simplified/Enjoy music and video/Mix music.desktop -/usr/share/applnk-mdk-simplified/Enjoy music and video/Record sounds.desktop -/usr/share/applnk-mdk-simplified/Enjoy music and video/Watch television.desktop -/usr/share/applnk-mdk-simplified/Enjoy music and video/Watch videos.desktop -/usr/share/applnk-mdk-simplified/Enjoy music and video/kdenlive.desktop -/usr/share/applnk-mdk-simplified/Enjoy music and video/kmix.desktop -/usr/share/applnk-mdk-simplified/Organize/.directory -/usr/share/applnk-mdk-simplified/Organize/Manage projects.desktop -/usr/share/applnk-mdk-simplified/Organize/Manage your finances.desktop -/usr/share/applnk-mdk-simplified/Organize/karm.desktop -/usr/share/applnk-mdk-simplified/Organize/kontact-knotes.desktop -/usr/share/applnk-mdk-simplified/Organize/kontact-korganizer-time.desktop -/usr/share/applnk-mdk-simplified/Organize/kontact-korganizer.desktop -/usr/share/applnk-mdk-simplified/Play games/.directory -/usr/share/applnk-mdk-simplified/Play games/ArmageTron.desktop -/usr/share/applnk-mdk-simplified/Play games/Cannon Smash.desktop -/usr/share/applnk-mdk-simplified/Play games/Chromium.desktop -/usr/share/applnk-mdk-simplified/Play games/Crack Attack! - Solo.desktop -/usr/share/applnk-mdk-simplified/Play games/Frozen-Bubble.desktop -/usr/share/applnk-mdk-simplified/Play games/LBreakout 2.desktop -/usr/share/applnk-mdk-simplified/Play games/Tuxracer.desktop -/usr/share/applnk-mdk-simplified/Surf the Internet/.directory -/usr/share/applnk-mdk-simplified/Surf the Internet/Kppp.desktop -/usr/share/applnk-mdk-simplified/Surf the Internet/Organize a video conference.desktop -/usr/share/applnk-mdk-simplified/Surf the Internet/kbear.desktop -/usr/share/applnk-mdk-simplified/Surf the Internet/konqueror.desktop -/usr/share/applnk-mdk-simplified/Surf the Internet/kontact-KMail.desktop -/usr/share/applnk-mdk-simplified/Surf the Internet/kontact-KNode.desktop -/usr/share/applnk-mdk-simplified/Surf the Internet/kopete.desktop -/usr/share/applnk-mdk-simplified/Surf the Internet/quanta.desktop -/usr/share/applnk-mdk-simplified/Use office tools/.directory -/usr/share/applnk-mdk-simplified/Use office tools/Create a drawing.desktop -/usr/share/applnk-mdk-simplified/Use office tools/Create a presentation.desktop -/usr/share/applnk-mdk-simplified/Use office tools/Create a spreadsheet.desktop -/usr/share/applnk-mdk-simplified/Use office tools/Create a text document.desktop -/usr/share/applnk-mdk-simplified/Use office tools/Create flowcharts and diagrams.desktop -/usr/share/applnk-mdk-simplified/Use office tools/kcalc.desktop -/usr/share/applnk-mdk-simplified/Use office tools/kdeprintfax.desktop -/usr/share/applnk-mdk-simplified/Use office tools/kdict.desktop -/usr/share/applnk-mdk-simplified/Use office tools/kfax.desktop -/usr/share/applnk-mdk-simplified/Use office tools/kontact-kaddressbook.desktop -/usr/share/applnk-mdk-simplified/View, modify and create graphics/.directory -/usr/share/applnk-mdk-simplified/View, modify and create graphics/Edit images and photos.desktop -/usr/share/applnk-mdk-simplified/View, modify and create graphics/View images and photos.desktop -/usr/share/applnk-mdk-simplified/View, modify and create graphics/kimdaba.desktop -/usr/share/applnk-mdk-simplified/View, modify and create graphics/kooka.desktop -/usr/share/applnk-mdk-simplified/View, modify and create graphics/ksnapshot.desktop -/usr/share/apps/kabc/formats/binary.desktop -/usr/share/apps/kconf_update -/usr/share/apps/kdesktop/directory.autostart -/usr/share/apps/kdesktop/directory.desktop -/usr/share/apps/kdesktop/directory.trash -/usr/share/apps/kdisplay/app-defaults -/usr/share/apps/khtml/css -/usr/share/apps/khtml/khtml.rc -/usr/share/apps/khtml/khtml_popupmenu.rc -/usr/share/apps/kicker/applets/clockapplet.desktop -/usr/share/apps/kicker/applets/minipagerapplet.desktop -/usr/share/apps/kicker/applets/systemtrayapplet.desktop -/usr/share/apps/kicker/applets/taskbarapplet.desktop -/usr/share/apps/kicker/default-download-apps-simplified -/usr/share/apps/kicker/pics/disk1.png -/usr/share/apps/kicker/pics/disk10.png -/usr/share/apps/kicker/pics/disk2.png -/usr/share/apps/kicker/pics/disk3.png -/usr/share/apps/kicker/pics/disk4.png -/usr/share/apps/kicker/pics/disk5.png -/usr/share/apps/kicker/pics/disk6.png -/usr/share/apps/kicker/pics/disk7.png -/usr/share/apps/kicker/pics/disk8.png -/usr/share/apps/kicker/pics/disk9.png -/usr/share/apps/knotify -/usr/share/apps/kwin/eventsrc -/usr/share/autostart -/usr/share/config/kcmdisplayrc -/usr/share/config/kcookiejarrc -/usr/share/config/kdebug.areas -/usr/share/config/kdebugrc -/usr/share/config/kdedrc -/usr/share/config/kdeglobals -/usr/share/config/kdeprintrc -/usr/share/config/kdesktoprc -/usr/share/config/kdm/kdmrc -/usr/share/config/khotkeysrc -/usr/share/config/kickerrc -/usr/share/config/klipperrc -/usr/share/config/konquerorrc -/usr/share/config/konsolerc -/usr/share/config/krootwarningrc -/usr/share/config/kwritedrc -/usr/share/config/mountwatcher.desktop -/usr/share/icons/crystalsvg/16x16/apps/desktop-mdk.png -/usr/share/icons/crystalsvg/16x16/apps/kicker.png -/usr/share/icons/crystalsvg/16x16/apps/konqueror.png -/usr/share/icons/crystalsvg/16x16/apps/kontact-mdk.png -/usr/share/icons/crystalsvg/16x16/apps/ksplash.png -/usr/share/icons/crystalsvg/16x16/apps/mandrakegalaxy.png -/usr/share/icons/crystalsvg/16x16/apps/menuk-mdk.png -/usr/share/icons/crystalsvg/16x16/mimetypes/unknown.png -/usr/share/icons/crystalsvg/32x32/apps/desktop-mdk.png -/usr/share/icons/crystalsvg/32x32/apps/konqueror.png -/usr/share/icons/crystalsvg/32x32/apps/kontact-mdk.png -/usr/share/icons/crystalsvg/32x32/apps/ksplash.png -/usr/share/icons/crystalsvg/32x32/apps/mandrakegalaxy.png -/usr/share/icons/crystalsvg/32x32/apps/menuk-mdk.png -/usr/share/icons/crystalsvg/32x32/apps/xapp.png -/usr/share/icons/crystalsvg/32x32/devices/3floppy_mount.png -/usr/share/icons/crystalsvg/32x32/devices/cdrom_mount.png -/usr/share/icons/crystalsvg/32x32/filesystems/trashcan_empty.png -/usr/share/icons/crystalsvg/index.theme -/usr/share/icons/default -/usr/share/icons/hicolor/32x32/apps/ooo_writer.xpm -/usr/share/icons/hicolor/index.theme -/usr/share/icons/totem.png -/usr/share/icons/wilbur.png -/usr/share/langs -/usr/share/ldetect-lst/Cards+ -/usr/share/ldetect-lst/MonitorsDB -/usr/share/ldetect-lst/pcitable -/usr/share/ldetect-lst/usbtable -/usr/share/mdk/backgrounds/Mandrake.png -/usr/share/mdk/faces/ic-tux1.png -/usr/share/mdk/kde/bookmarks/bookmarks-download.xml -/usr/share/mdk/mandrakegalaxy/doc.png -/usr/share/mdk/mandrakegalaxy/mcc.png -/usr/share/mdk/mandrakegalaxy/mdkclub.png -/usr/share/mdk/mandrakegalaxy/mdkexpert.png -/usr/share/mdk/mandrakegalaxy/mdkgalaxy-en.html -/usr/share/mdk/mandrakegalaxy/mdksoft.png -/usr/share/mdk/mandrakegalaxy/mdkstore.png -/usr/share/mimelnk -/usr/share/services/about.protocol -/usr/share/services/ar.protocol -/usr/share/services/ark_part.desktop -/usr/share/services/audiocd.protocol -/usr/share/services/bmp.kimgio -/usr/share/services/bzip.protocol -/usr/share/services/bzip2.protocol -/usr/share/services/cgi.protocol -/usr/share/services/chatwindow.desktop -/usr/share/services/configcolors.desktop -/usr/share/services/configfonts.desktop -/usr/share/services/configfreebusy.desktop -/usr/share/services/configgroupautomation.desktop -/usr/share/services/configgroupscheduling.desktop -/usr/share/services/configmain.desktop -/usr/share/services/configtime.desktop -/usr/share/services/configviews.desktop -/usr/share/services/cursorthumbnail.desktop -/usr/share/services/data.protocol -/usr/share/services/devices.protocol -/usr/share/services/djvuthumbnail.desktop -/usr/share/services/eps.kimgio -/usr/share/services/file.protocol -/usr/share/services/finger.protocol -/usr/share/services/fish.protocol -/usr/share/services/floppy.protocol -/usr/share/services/fonts.protocol -/usr/share/services/fontthumbnail.desktop -/usr/share/services/ftp.protocol -/usr/share/services/ghelp.protocol -/usr/share/services/gif.kimgio -/usr/share/services/gsthumbnail.desktop -/usr/share/services/gzip.protocol -/usr/share/services/help.protocol -/usr/share/services/htmlthumbnail.desktop -/usr/share/services/http.protocol -/usr/share/services/http_cache_cleaner.desktop -/usr/share/services/https.protocol -/usr/share/services/ico.kimgio -/usr/share/services/imagethumbnail.desktop -/usr/share/services/imap4.protocol -/usr/share/services/imaps.protocol -/usr/share/services/info.protocol -/usr/share/services/jpeg.kimgio -/usr/share/services/kabconfig.desktop -/usr/share/services/kabldapconfig.desktop -/usr/share/services/kaccess.desktop -/usr/share/services/kaddressbook -/usr/share/services/kamera.protocol -/usr/share/services/katedefaultproject.desktop -/usr/share/services/katepart.desktop -/usr/share/services/kbearftp.protocol -/usr/share/services/kbeargftimportfilter.desktop -/usr/share/services/kbearkrusaderimportfilter.desktop -/usr/share/services/kbearncftpimportfilter.desktop -/usr/share/services/kbearoldimportfilter.desktop -/usr/share/services/kbearwincommanderimportfilter.desktop -/usr/share/services/kbearws_ftpimportfilter.desktop -/usr/share/services/kbzip2filter.desktop -/usr/share/services/kcertpart.desktop -/usr/share/services/kcmweather.desktop -/usr/share/services/kcmweatherservice.desktop -/usr/share/services/kconfiguredialog/kopete_autoreplace_config.desktop -/usr/share/services/kconfiguredialog/kopete_cryptography_config.desktop -/usr/share/services/kconfiguredialog/kopete_highlight_config.desktop -/usr/share/services/kconfiguredialog/kopete_history_config.desktop -/usr/share/services/kconfiguredialog/kopete_msn_config.desktop -/usr/share/services/kconfiguredialog/kopete_nowlistening_config.desktop -/usr/share/services/kconfiguredialog/kopete_texteffect_config.desktop -/usr/share/services/kconfiguredialog/kopete_translator_config.desktop -/usr/share/services/kconfiguredialog/kopete_webpresence_config.desktop -/usr/share/services/kded/favicons.desktop -/usr/share/services/kded/kcookiejar.desktop -/usr/share/services/kded/kdeprintd.desktop -/usr/share/services/kded/konqy_preloader.desktop -/usr/share/services/kded/kpasswdserver.desktop -/usr/share/services/kded/kssld.desktop -/usr/share/services/kded/kwalletd.desktop -/usr/share/services/kded/mountwatcher.desktop -/usr/share/services/kded/proxyscout.desktop -/usr/share/services/kdeprint_part.desktop -/usr/share/services/kfile_au.desktop -/usr/share/services/kfile_avi.desktop -/usr/share/services/kfile_bmp.desktop -/usr/share/services/kfile_dvi.desktop -/usr/share/services/kfile_font.desktop -/usr/share/services/kfile_ico.desktop -/usr/share/services/kfile_jpeg.desktop -/usr/share/services/kfile_m3u.desktop -/usr/share/services/kfile_mp3.desktop -/usr/share/services/kfile_ogg.desktop -/usr/share/services/kfile_pcx.desktop -/usr/share/services/kfile_pdf.desktop -/usr/share/services/kfile_png.desktop -/usr/share/services/kfile_pnm.desktop -/usr/share/services/kfile_ps.desktop -/usr/share/services/kfile_tga.desktop -/usr/share/services/kfile_tiff.desktop -/usr/share/services/kfile_vcf.desktop -/usr/share/services/kfile_wav.desktop -/usr/share/services/kfile_xbm.desktop -/usr/share/services/kfilereplacepart.desktop -/usr/share/services/kfindpart.desktop -/usr/share/services/kfontviewpart.desktop -/usr/share/services/kgzipfilter.desktop -/usr/share/services/khelpcenter.desktop -/usr/share/services/khtml.desktop -/usr/share/services/khtmlimage.desktop -/usr/share/services/kio_uiserver.desktop -/usr/share/services/kjavaappletviewer.desktop -/usr/share/services/kmailservice.protocol -/usr/share/services/kmanpart.desktop -/usr/share/services/kmixctrl_restore.desktop -/usr/share/services/kmultipart.desktop -/usr/share/services/knewsservice.protocol -/usr/share/services/knotify.desktop -/usr/share/services/kntsrcfilepropsdlg.desktop -/usr/share/services/konq_aboutpage.desktop -/usr/share/services/konq_detailedlistview.desktop -/usr/share/services/konq_iconview.desktop -/usr/share/services/konq_infolistview.desktop -/usr/share/services/konq_multicolumnview.desktop -/usr/share/services/konq_sidebartng.desktop -/usr/share/services/konq_textview.desktop -/usr/share/services/konq_treeview.desktop -/usr/share/services/konqueror_config.desktop -/usr/share/services/konsole-script.desktop -/usr/share/services/konsolepart.desktop -/usr/share/services/kontact/kaddressbookplugin.desktop -/usr/share/services/kontact/kmailplugin.desktop -/usr/share/services/kontact/knodeplugin.desktop -/usr/share/services/kontact/knotesplugin.desktop -/usr/share/services/kontact/korganizerplugin.desktop -/usr/share/services/kontact/summaryplugin.desktop -/usr/share/services/kontact/todoplugin.desktop -/usr/share/services/kontact/weatherplugin.desktop -/usr/share/services/kontactconfig.desktop -/usr/share/services/kopete_accountconfig.desktop -/usr/share/services/kopete_aim.desktop -/usr/share/services/kopete_appearanceconfig.desktop -/usr/share/services/kopete_autoreplace.desktop -/usr/share/services/kopete_behaviorconfig.desktop -/usr/share/services/kopete_connectionstatus.desktop -/usr/share/services/kopete_contactnotes.desktop -/usr/share/services/kopete_cryptography.desktop -/usr/share/services/kopete_highlight.desktop -/usr/share/services/kopete_history.desktop -/usr/share/services/kopete_icq.desktop -/usr/share/services/kopete_irc.desktop -/usr/share/services/kopete_jabber.desktop -/usr/share/services/kopete_msn.desktop -/usr/share/services/kopete_nowlistening.desktop -/usr/share/services/kopete_sms.desktop -/usr/share/services/kopete_texteffect.desktop -/usr/share/services/kopete_translator.desktop -/usr/share/services/kopete_webpresence.desktop -/usr/share/services/kopete_yahoo.desktop -/usr/share/services/korganizer/birthdays.desktop -/usr/share/services/korganizer/datenums.desktop -/usr/share/services/korganizer/exchange.desktop -/usr/share/services/korganizer/hebrew.desktop -/usr/share/services/korganizer/holidays.desktop -/usr/share/services/korganizer/projectview.desktop -/usr/share/services/korganizer/webexport.desktop -/usr/share/services/kpfpropertiesdialogplugin.desktop -/usr/share/services/kresources/kabc/dir.desktop -/usr/share/services/kresources/kabc/file.desktop -/usr/share/services/kresources/kabc/imap.desktop -/usr/share/services/kresources/kabc/ldapkio.desktop -/usr/share/services/kresources/kabc/net.desktop -/usr/share/services/kresources/kcal/imap.desktop -/usr/share/services/kresources/kcal/kabc.desktop -/usr/share/services/kresources/kcal/local.desktop -/usr/share/services/kresources/kcal/localdir.desktop -/usr/share/services/kresources/kcal/remote.desktop -/usr/share/services/kshorturifilter.desktop -/usr/share/services/ksplash.desktop -/usr/share/services/ksplashdefault.desktop -/usr/share/services/ksplashmdk.desktop -/usr/share/services/ksplashredmond.desktop -/usr/share/services/ksplashstandard.desktop -/usr/share/services/ksycoca-en_US -/usr/share/services/ktexteditor_insertfile.desktop -/usr/share/services/ktexteditor_isearch.desktop -/usr/share/services/ktexteditor_kdatatool.desktop -/usr/share/services/kuriikwsfilter.desktop -/usr/share/services/kurisearchfilter.desktop -/usr/share/services/kwallet_config.desktop -/usr/share/services/kwalletmanager_show.desktop -/usr/share/services/kweatherservice.desktop -/usr/share/services/kwrited.desktop -/usr/share/services/kxkb.desktop -/usr/share/services/kxsldbg_part.desktop -/usr/share/services/ldap.protocol -/usr/share/services/ldifvcardthumbnail.desktop -/usr/share/services/localdomainurifilter.desktop -/usr/share/services/mac.protocol -/usr/share/services/man.protocol -/usr/share/services/metainfo.protocol -/usr/share/services/mms.protocol -/usr/share/services/nfs.protocol -/usr/share/services/nntp.protocol -/usr/share/services/pbm.kimgio -/usr/share/services/pcx.kimgio -/usr/share/services/pgm.kimgio -/usr/share/services/picturethumbnail.desktop -/usr/share/services/png.kimgio -/usr/share/services/pop3.protocol -/usr/share/services/pop3s.protocol -/usr/share/services/popmail-conduit.desktop -/usr/share/services/ppm.kimgio -/usr/share/services/print.protocol -/usr/share/services/printdb.protocol -/usr/share/services/programs.protocol -/usr/share/services/rdp.protocol -/usr/share/services/rlogin.protocol -/usr/share/services/rssservice.desktop -/usr/share/services/rtsp.protocol -/usr/share/services/scanservice.desktop -/usr/share/services/searchproviders/acronym.desktop -/usr/share/services/searchproviders/alexa.desktop -/usr/share/services/searchproviders/alexa_url.desktop -/usr/share/services/searchproviders/alltheweb.desktop -/usr/share/services/searchproviders/altavista.desktop -/usr/share/services/searchproviders/appsy.desktop -/usr/share/services/searchproviders/austronaut.desktop -/usr/share/services/searchproviders/bugft.desktop -/usr/share/services/searchproviders/bugno.desktop -/usr/share/services/searchproviders/call.desktop -/usr/share/services/searchproviders/citeseer.desktop -/usr/share/services/searchproviders/cpan.desktop -/usr/share/services/searchproviders/ctan.desktop -/usr/share/services/searchproviders/ctan_cat.desktop -/usr/share/services/searchproviders/de2en.desktop -/usr/share/services/searchproviders/dmoz.desktop -/usr/share/services/searchproviders/docbook.desktop -/usr/share/services/searchproviders/doi.desktop -/usr/share/services/searchproviders/en2de.desktop -/usr/share/services/searchproviders/en2es.desktop -/usr/share/services/searchproviders/en2fr.desktop -/usr/share/services/searchproviders/en2it.desktop -/usr/share/services/searchproviders/es2en.desktop -/usr/share/services/searchproviders/excite.desktop -/usr/share/services/searchproviders/feedster.desktop -/usr/share/services/searchproviders/foldoc.desktop -/usr/share/services/searchproviders/fr2en.desktop -/usr/share/services/searchproviders/freshmeat.desktop -/usr/share/services/searchproviders/froogle.desktop -/usr/share/services/searchproviders/google.desktop -/usr/share/services/searchproviders/google_advanced.desktop -/usr/share/services/searchproviders/google_groups.desktop -/usr/share/services/searchproviders/google_images.desktop -/usr/share/services/searchproviders/google_lucky.desktop -/usr/share/services/searchproviders/google_news.desktop -/usr/share/services/searchproviders/hotbot.desktop -/usr/share/services/searchproviders/hyperdictionary.desktop -/usr/share/services/searchproviders/hyperdictionary_thesaurus.desktop -/usr/share/services/searchproviders/imdb.desktop -/usr/share/services/searchproviders/it2en.desktop -/usr/share/services/searchproviders/jeeves.desktop -/usr/share/services/searchproviders/kde.desktop -/usr/share/services/searchproviders/kde_webcvs.desktop -/usr/share/services/searchproviders/leo.desktop -/usr/share/services/searchproviders/lycos.desktop -/usr/share/services/searchproviders/mamma.desktop -/usr/share/services/searchproviders/metacrawler.desktop -/usr/share/services/searchproviders/msdn.desktop -/usr/share/services/searchproviders/netcraft.desktop -/usr/share/services/searchproviders/nl-telephone.desktop -/usr/share/services/searchproviders/nl-teletekst.desktop -/usr/share/services/searchproviders/pgpkeys.desktop -/usr/share/services/searchproviders/php.desktop -/usr/share/services/searchproviders/python.desktop -/usr/share/services/searchproviders/qt.desktop -/usr/share/services/searchproviders/rae.desktop -/usr/share/services/searchproviders/rfc.desktop -/usr/share/services/searchproviders/rpmfind.desktop -/usr/share/services/searchproviders/ruby_application_archive.desktop -/usr/share/services/searchproviders/seek.desktop -/usr/share/services/searchproviders/sourceforge.desktop -/usr/share/services/searchproviders/thesaurus.desktop -/usr/share/services/searchproviders/vivisimo.desktop -/usr/share/services/searchproviders/voila.desktop -/usr/share/services/searchproviders/webster.desktop -/usr/share/services/searchproviders/whatis.desktop -/usr/share/services/searchproviders/wikipedia.desktop -/usr/share/services/searchproviders/wordref.desktop -/usr/share/services/settings.protocol -/usr/share/services/sftp.protocol -/usr/share/services/shellscript.desktop -/usr/share/services/sieve.protocol -/usr/share/services/smb.protocol -/usr/share/services/smtp.protocol -/usr/share/services/smtps.protocol -/usr/share/services/ssh.protocol -/usr/share/services/system.protocol -/usr/share/services/tar.protocol -/usr/share/services/telnet.protocol -/usr/share/services/textthumbnail.desktop -/usr/share/services/tga.kimgio -/usr/share/services/thumbnail.protocol -/usr/share/services/tiff.kimgio -/usr/share/services/useragentstrings/ie401onwinnt4.desktop -/usr/share/services/useragentstrings/ie45onwinnt5.desktop -/usr/share/services/useragentstrings/ie501onwinnt5.desktop -/usr/share/services/useragentstrings/ie50onppc.desktop -/usr/share/services/useragentstrings/ie50onwin95.desktop -/usr/share/services/useragentstrings/ie55onwin98.desktop -/usr/share/services/useragentstrings/ie55onwinnt5.desktop -/usr/share/services/useragentstrings/ie60onwinnt51.desktop -/usr/share/services/useragentstrings/lynxoncurrent.desktop -/usr/share/services/useragentstrings/mozoncurrent.desktop -/usr/share/services/useragentstrings/mozonwin2000.desktop -/usr/share/services/useragentstrings/mozonwinnt4.desktop -/usr/share/services/useragentstrings/nn301oncurrent.desktop -/usr/share/services/useragentstrings/nn475oncurrent.desktop -/usr/share/services/useragentstrings/nn475onwin95.desktop -/usr/share/services/useragentstrings/nn476onppc.desktop -/usr/share/services/useragentstrings/op403onwinnt4.desktop -/usr/share/services/useragentstrings/safari.desktop -/usr/share/services/useragentstrings/w3moncurrent.desktop -/usr/share/services/useragentstrings/wgetoncurrent.desktop -/usr/share/services/videothumbnail.desktop -/usr/share/services/webcal.protocol -/usr/share/services/webdav.protocol -/usr/share/services/webdavs.protocol -/usr/share/services/xbm.kimgio -/usr/share/services/xpm.kimgio -/usr/share/services/xv.kimgio -/usr/share/services/zip.protocol -/usr/share/servicetypes -/usr/share/themes/Default/gtk-2.0 -/usr/share/themes/Galaxy/gtk-2.0 +/tmp/live_tree/bin/bash +/tmp/live_tree/bin/chmod +/tmp/live_tree/bin/cp +/tmp/live_tree/bin/cut +/tmp/live_tree/bin/gawk +/tmp/live_tree/bin/gettext +/tmp/live_tree/bin/grep +/tmp/live_tree/bin/gzip +/tmp/live_tree/bin/id +/tmp/live_tree/bin/loadkeys +/tmp/live_tree/bin/ls +/tmp/live_tree/bin/mkdir +/tmp/live_tree/bin/rm +/tmp/live_tree/bin/sed +/tmp/live_tree/bin/touch +/tmp/live_tree/bin/uname +/tmp/live_tree/etc/DIR_COLORS +/tmp/live_tree/etc/X11/fs +/tmp/live_tree/etc/X11/xkb/compat/accessx +/tmp/live_tree/etc/X11/xkb/compat/basic +/tmp/live_tree/etc/X11/xkb/compat/complete +/tmp/live_tree/etc/X11/xkb/compat/iso9995 +/tmp/live_tree/etc/X11/xkb/compat/misc +/tmp/live_tree/etc/X11/xkb/compat/mousekeys +/tmp/live_tree/etc/X11/xkb/compat/xfree86 +/tmp/live_tree/etc/X11/xkb/geometry/pc +/tmp/live_tree/etc/X11/xkb/keycodes/aliases +/tmp/live_tree/etc/X11/xkb/keycodes/xfree86 +/tmp/live_tree/etc/X11/xkb/rules/xfree86 +/tmp/live_tree/etc/X11/xkb/rules/xfree86.lst +/tmp/live_tree/etc/X11/xkb/symbols/en_US +/tmp/live_tree/etc/X11/xkb/symbols/gb +/tmp/live_tree/etc/X11/xkb/symbols/iso9995-3 +/tmp/live_tree/etc/X11/xkb/symbols/srvr_ctrl +/tmp/live_tree/etc/X11/xkb/symbols/us +/tmp/live_tree/etc/X11/xkb/types/basic +/tmp/live_tree/etc/X11/xkb/types/complete +/tmp/live_tree/etc/X11/xkb/types/extra +/tmp/live_tree/etc/X11/xkb/types/iso9995 +/tmp/live_tree/etc/X11/xkb/types/mousekeys +/tmp/live_tree/etc/X11/xkb/types/pc +/tmp/live_tree/etc/X11/xkb/xkbcomp +/tmp/live_tree/etc/X11/xserver +/tmp/live_tree/etc/bashrc +/tmp/live_tree/etc/devfsd.conf +/tmp/live_tree/etc/fonts/fonts.conf +/tmp/live_tree/etc/fonts/local.conf +/tmp/live_tree/etc/group +/tmp/live_tree/etc/gtk-2.0 +/tmp/live_tree/etc/inputrc +/tmp/live_tree/etc/ld.so.cache +/tmp/live_tree/etc/login.defs +/tmp/live_tree/etc/modules.devfs +/tmp/live_tree/etc/nsswitch.conf +/tmp/live_tree/etc/pam.d/other +/tmp/live_tree/etc/pam.d/sudo +/tmp/live_tree/etc/pam.d/system-auth +/tmp/live_tree/etc/pam.d/xserver +/tmp/live_tree/etc/pango +/tmp/live_tree/etc/passwd +/tmp/live_tree/etc/profile.d/10lang.sh +/tmp/live_tree/etc/profile.d/alias.sh +/tmp/live_tree/etc/profile.d/configure_keyboard.sh +/tmp/live_tree/etc/profile.d/glib20.sh +/tmp/live_tree/etc/profile.d/inputrc.sh +/tmp/live_tree/etc/profile.d/kde3.sh +/tmp/live_tree/etc/profile.d/msec.sh +/tmp/live_tree/etc/profile.d/qtdir3.sh +/tmp/live_tree/etc/profile.d/screen.sh +/tmp/live_tree/etc/profile.d/ssh-client.sh +/tmp/live_tree/etc/profile.d/tmpdir.sh +/tmp/live_tree/etc/profile.d/xhost.sh +/tmp/live_tree/etc/rc.d/init.d/functions +/tmp/live_tree/etc/rc.d/init.d/syslog +/tmp/live_tree/etc/rc.d/init.d/xfs +/tmp/live_tree/etc/security/console.perms +/tmp/live_tree/etc/security/fileshare.conf +/tmp/live_tree/etc/security/pam_env.conf +/tmp/live_tree/etc/services +/tmp/live_tree/etc/shells +/tmp/live_tree/etc/sudoers +/tmp/live_tree/etc/syslog.conf +/tmp/live_tree/lib/ld-2.3.2.so +/tmp/live_tree/lib/libcom_err.so.2.1 +/tmp/live_tree/lib/libcrypt-2.3.2.so +/tmp/live_tree/lib/libdl-2.3.2.so +/tmp/live_tree/lib/libext2fs.so.2.4 +/tmp/live_tree/lib/libgcc_s-3.3.1.so.1 +/tmp/live_tree/lib/libintl.so.2.2.0 +/tmp/live_tree/lib/libnsl-2.3.2.so +/tmp/live_tree/lib/libnss_dns-2.3.2.so +/tmp/live_tree/lib/libnss_files-2.3.2.so +/tmp/live_tree/lib/libnss_nis-2.3.2.so +/tmp/live_tree/lib/libnss_nisplus-2.3.2.so +/tmp/live_tree/lib/libpam.so.0.77 +/tmp/live_tree/lib/libpam_misc.so.0.77 +/tmp/live_tree/lib/libpcre.so.0.0.1 +/tmp/live_tree/lib/libpopt.so.0.0.0 +/tmp/live_tree/lib/libresolv-2.3.2.so +/tmp/live_tree/lib/libtermcap.so.2.0.8 +/tmp/live_tree/lib/libutil-2.3.2.so +/tmp/live_tree/lib/libz.so.1.1.4 +/tmp/live_tree/lib/modutils +/tmp/live_tree/lib/security/pam_console.so +/tmp/live_tree/lib/security/pam_console_apply_devfsd.so +/tmp/live_tree/lib/security/pam_cracklib.so +/tmp/live_tree/lib/security/pam_deny.so +/tmp/live_tree/lib/security/pam_env.so +/tmp/live_tree/lib/security/pam_limits.so +/tmp/live_tree/lib/security/pam_permit.so +/tmp/live_tree/lib/security/pam_rootok.so +/tmp/live_tree/lib/security/pam_stack.so +/tmp/live_tree/lib/security/pam_unix.so +/tmp/live_tree/sbin/consoletype +/tmp/live_tree/sbin/devfsd +/tmp/live_tree/sbin/hotplug +/tmp/live_tree/sbin/ifconfig +/tmp/live_tree/sbin/init +/tmp/live_tree/sbin/initlog +/tmp/live_tree/sbin/insmod-24 +/tmp/live_tree/sbin/klogd +/tmp/live_tree/sbin/losetup +/tmp/live_tree/sbin/minilogd +/tmp/live_tree/sbin/modprobe-24 +/tmp/live_tree/sbin/pam_console_apply +/tmp/live_tree/sbin/service +/tmp/live_tree/sbin/syslogd +/tmp/live_tree/usr/X11R6/bin/XFree86 +/tmp/live_tree/usr/X11R6/bin/Xwrapper +/tmp/live_tree/usr/X11R6/bin/iceauth +/tmp/live_tree/usr/X11R6/bin/setxkbmap +/tmp/live_tree/usr/X11R6/bin/xfs +/tmp/live_tree/usr/X11R6/bin/xmodmap +/tmp/live_tree/usr/X11R6/bin/xrdb +/tmp/live_tree/usr/X11R6/bin/xset +/tmp/live_tree/usr/X11R6/bin/xsetroot +/tmp/live_tree/usr/X11R6/lib/X11/XErrorDB +/tmp/live_tree/usr/X11R6/lib/X11/XKeysymDB +/tmp/live_tree/usr/X11R6/lib/X11/locale/C +/tmp/live_tree/usr/X11R6/lib/X11/locale/compose.dir +/tmp/live_tree/usr/X11R6/lib/X11/locale/iso8859-1/Compose +/tmp/live_tree/usr/X11R6/lib/X11/locale/iso8859-1/XI18N_OBJS +/tmp/live_tree/usr/X11R6/lib/X11/locale/iso8859-1/XLC_LOCALE +/tmp/live_tree/usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 +/tmp/live_tree/usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 +/tmp/live_tree/usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 +/tmp/live_tree/usr/X11R6/lib/X11/locale/locale.alias +/tmp/live_tree/usr/X11R6/lib/X11/locale/locale.dir +/tmp/live_tree/usr/X11R6/lib/X11/rgb.txt +/tmp/live_tree/usr/X11R6/lib/libGL.so.1.2 +/tmp/live_tree/usr/X11R6/lib/libICE.so.6.3 +/tmp/live_tree/usr/X11R6/lib/libSM.so.6.0 +/tmp/live_tree/usr/X11R6/lib/libX11.so.6.2 +/tmp/live_tree/usr/X11R6/lib/libXcursor.so.1.0 +/tmp/live_tree/usr/X11R6/lib/libXext.so.6.4 +/tmp/live_tree/usr/X11R6/lib/libXfont.so.1.4 +/tmp/live_tree/usr/X11R6/lib/libXft.so.2.1 +/tmp/live_tree/usr/X11R6/lib/libXi.so.6.0 +/tmp/live_tree/usr/X11R6/lib/libXm.so.2.0.1 +/tmp/live_tree/usr/X11R6/lib/libXmu.so.6.2 +/tmp/live_tree/usr/X11R6/lib/libXmuu.so.1.0 +/tmp/live_tree/usr/X11R6/lib/libXp.so.6.2 +/tmp/live_tree/usr/X11R6/lib/libXrandr.so.2.0 +/tmp/live_tree/usr/X11R6/lib/libXrender.so.1.2 +/tmp/live_tree/usr/X11R6/lib/libXt.so.6.0 +/tmp/live_tree/usr/X11R6/lib/libXtst.so.6.1 +/tmp/live_tree/usr/X11R6/lib/libaudio.so.2.3 +/tmp/live_tree/usr/X11R6/lib/modules/drivers/linux +/tmp/live_tree/usr/X11R6/lib/modules/drivers/nv_drv.o +/tmp/live_tree/usr/X11R6/lib/modules/fonts/libbitmap.a +/tmp/live_tree/usr/X11R6/lib/modules/fonts/libfreetype.a +/tmp/live_tree/usr/X11R6/lib/modules/fonts/libtype1.a +/tmp/live_tree/usr/X11R6/lib/modules/input/mouse_drv.o +/tmp/live_tree/usr/X11R6/lib/modules/libddc.a +/tmp/live_tree/usr/X11R6/lib/modules/libfb.a +/tmp/live_tree/usr/X11R6/lib/modules/libi2c.a +/tmp/live_tree/usr/X11R6/lib/modules/libpcidata.a +/tmp/live_tree/usr/X11R6/lib/modules/libramdac.a +/tmp/live_tree/usr/X11R6/lib/modules/libvgahw.a +/tmp/live_tree/usr/X11R6/lib/modules/libxaa.a +/tmp/live_tree/usr/X11R6/lib/modules/linux/libint10.a +/tmp/live_tree/usr/bin/artsd +/tmp/live_tree/usr/bin/artswrapper +/tmp/live_tree/usr/bin/cpp-3.3.1 +/tmp/live_tree/usr/bin/dcopserver_shutdown +/tmp/live_tree/usr/bin/dircolors +/tmp/live_tree/usr/bin/dirname +/tmp/live_tree/usr/bin/dumpkeys +/tmp/live_tree/usr/bin/kab2kabc +/tmp/live_tree/usr/bin/kde-config +/tmp/live_tree/usr/bin/kdeinit +/tmp/live_tree/usr/bin/killall +/tmp/live_tree/usr/bin/krootwarning +/tmp/live_tree/usr/bin/ksplash +/tmp/live_tree/usr/bin/kwrapper +/tmp/live_tree/usr/bin/lnusertemp +/tmp/live_tree/usr/bin/locale +/tmp/live_tree/usr/bin/mandrakegalaxy +/tmp/live_tree/usr/bin/mandrakegalaxy.real +/tmp/live_tree/usr/bin/mdk_move_loop +/tmp/live_tree/usr/bin/mesg +/tmp/live_tree/usr/bin/nspluginscan +/tmp/live_tree/usr/bin/perl5.8.1 +/tmp/live_tree/usr/bin/runstage2.pl +/tmp/live_tree/usr/bin/stage2 +/tmp/live_tree/usr/bin/startkde +/tmp/live_tree/usr/bin/sudo +/tmp/live_tree/usr/bin/suidperl +/tmp/live_tree/usr/bin/test-windows-key +/tmp/live_tree/usr/bin/tty +/tmp/live_tree/usr/bin/whoami +/tmp/live_tree/usr/bin/xwait +/tmp/live_tree/usr/lib/dcopserver.la +/tmp/live_tree/usr/lib/dcopserver.so +/tmp/live_tree/usr/lib/gconv/ISO8859-1.so +/tmp/live_tree/usr/lib/gconv/ISO8859-15.so +/tmp/live_tree/usr/lib/gconv/gconv-modules +/tmp/live_tree/usr/lib/gtk-2.0/2.2.0/engines/libgalaxy.so +/tmp/live_tree/usr/lib/gtk-2.0/2.2.0/immodules/im-cedilla.so +/tmp/live_tree/usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so +/tmp/live_tree/usr/lib/kbd/consolefonts/lat0-16.psf.gz +/tmp/live_tree/usr/lib/kbd/consoletrans/iso15.acm.gz +/tmp/live_tree/usr/lib/kbd/consoletrans/iso15.sfm.gz +/tmp/live_tree/usr/lib/kbuildsycoca.la +/tmp/live_tree/usr/lib/kbuildsycoca.so +/tmp/live_tree/usr/lib/kcminit.la +/tmp/live_tree/usr/lib/kcminit.so +/tmp/live_tree/usr/lib/kconf_update.la +/tmp/live_tree/usr/lib/kconf_update.so +/tmp/live_tree/usr/lib/kde3/clock_panelapplet.la +/tmp/live_tree/usr/lib/kde3/clock_panelapplet.so +/tmp/live_tree/usr/lib/kde3/kcm_access.la +/tmp/live_tree/usr/lib/kde3/kcm_access.so +/tmp/live_tree/usr/lib/kde3/kcm_arts.la +/tmp/live_tree/usr/lib/kde3/kcm_arts.so +/tmp/live_tree/usr/lib/kde3/kcm_bell.la +/tmp/live_tree/usr/lib/kde3/kcm_bell.so +/tmp/live_tree/usr/lib/kde3/kcm_energy.la +/tmp/live_tree/usr/lib/kde3/kcm_energy.so +/tmp/live_tree/usr/lib/kde3/kcm_input.la +/tmp/live_tree/usr/lib/kde3/kcm_input.so +/tmp/live_tree/usr/lib/kde3/kcm_keyboard.la +/tmp/live_tree/usr/lib/kde3/kcm_keyboard.so +/tmp/live_tree/usr/lib/kde3/kcm_keys.la +/tmp/live_tree/usr/lib/kde3/kcm_keys.so +/tmp/live_tree/usr/lib/kde3/kcm_konqhtml.la +/tmp/live_tree/usr/lib/kde3/kcm_konqhtml.so +/tmp/live_tree/usr/lib/kde3/kcm_laptop.la +/tmp/live_tree/usr/lib/kde3/kcm_laptop.so +/tmp/live_tree/usr/lib/kde3/kcm_style.la +/tmp/live_tree/usr/lib/kde3/kcm_style.so +/tmp/live_tree/usr/lib/kde3/kded_kinetd.la +/tmp/live_tree/usr/lib/kde3/kded_kinetd.so +/tmp/live_tree/usr/lib/kde3/kded_mountwatcher.la +/tmp/live_tree/usr/lib/kde3/kded_mountwatcher.so +/tmp/live_tree/usr/lib/kde3/kio_devices.la +/tmp/live_tree/usr/lib/kde3/kio_devices.so +/tmp/live_tree/usr/lib/kde3/kio_file.la +/tmp/live_tree/usr/lib/kde3/kio_file.so +/tmp/live_tree/usr/lib/kde3/konq_sound.la +/tmp/live_tree/usr/lib/kde3/konq_sound.so +/tmp/live_tree/usr/lib/kde3/kwin_mandrake.la +/tmp/live_tree/usr/lib/kde3/kwin_mandrake.so.0.0.0 +/tmp/live_tree/usr/lib/kde3/minipager_panelapplet.la +/tmp/live_tree/usr/lib/kde3/minipager_panelapplet.so +/tmp/live_tree/usr/lib/kde3/plugins/styles/galaxy.so.0.0.0 +/tmp/live_tree/usr/lib/kde3/systemtray_panelapplet.la +/tmp/live_tree/usr/lib/kde3/systemtray_panelapplet.so +/tmp/live_tree/usr/lib/kde3/taskbar_panelapplet.la +/tmp/live_tree/usr/lib/kde3/taskbar_panelapplet.so +/tmp/live_tree/usr/lib/kded.la +/tmp/live_tree/usr/lib/kded.so +/tmp/live_tree/usr/lib/kdesktop.la +/tmp/live_tree/usr/lib/kdesktop.so +/tmp/live_tree/usr/lib/khotkeys.la +/tmp/live_tree/usr/lib/khotkeys.so +/tmp/live_tree/usr/lib/kicker.la +/tmp/live_tree/usr/lib/kicker.so +/tmp/live_tree/usr/lib/klauncher.la +/tmp/live_tree/usr/lib/klauncher.so +/tmp/live_tree/usr/lib/knotify.la +/tmp/live_tree/usr/lib/knotify.so +/tmp/live_tree/usr/lib/ksmserver.la +/tmp/live_tree/usr/lib/ksmserver.so +/tmp/live_tree/usr/lib/kwin.la +/tmp/live_tree/usr/lib/kwin.so +/tmp/live_tree/usr/lib/libDCOP.so.4.1.0 +/tmp/live_tree/usr/lib/libDrakX/Xconfig +/tmp/live_tree/usr/lib/libDrakX/any.pm +/tmp/live_tree/usr/lib/libDrakX/auto/c +/tmp/live_tree/usr/lib/libDrakX/c +/tmp/live_tree/usr/lib/libDrakX/c.pm +/tmp/live_tree/usr/lib/libDrakX/class_discard.pm +/tmp/live_tree/usr/lib/libDrakX/commands.pm +/tmp/live_tree/usr/lib/libDrakX/common.pm +/tmp/live_tree/usr/lib/libDrakX/detect_devices.pm +/tmp/live_tree/usr/lib/libDrakX/devices.pm +/tmp/live_tree/usr/lib/libDrakX/fs.pm +/tmp/live_tree/usr/lib/libDrakX/fsedit.pm +/tmp/live_tree/usr/lib/libDrakX/handle_configs.pm +/tmp/live_tree/usr/lib/libDrakX/harddrake/sound.pm +/tmp/live_tree/usr/lib/libDrakX/interactive.pm +/tmp/live_tree/usr/lib/libDrakX/interactive/gtk.pm +/tmp/live_tree/usr/lib/libDrakX/keyboard.pm +/tmp/live_tree/usr/lib/libDrakX/lang.pm +/tmp/live_tree/usr/lib/libDrakX/list_modules.pm +/tmp/live_tree/usr/lib/libDrakX/log.pm +/tmp/live_tree/usr/lib/libDrakX/loopback.pm +/tmp/live_tree/usr/lib/libDrakX/modules.pm +/tmp/live_tree/usr/lib/libDrakX/modules/interactive.pm +/tmp/live_tree/usr/lib/libDrakX/mouse.pm +/tmp/live_tree/usr/lib/libDrakX/network +/tmp/live_tree/usr/lib/libDrakX/partition_table.pm +/tmp/live_tree/usr/lib/libDrakX/partition_table/raw.pm +/tmp/live_tree/usr/lib/libDrakX/printer +/tmp/live_tree/usr/lib/libDrakX/run_program.pm +/tmp/live_tree/usr/lib/libDrakX/sbus_probing +/tmp/live_tree/usr/lib/libDrakX/services.pm +/tmp/live_tree/usr/lib/libDrakX/steps.pm +/tmp/live_tree/usr/lib/libDrakX/swap.pm +/tmp/live_tree/usr/lib/libDrakX/timezone.pm +/tmp/live_tree/usr/lib/libDrakX/ugtk2.pm +/tmp/live_tree/usr/lib/libart_lgpl_2.so.2.3.16 +/tmp/live_tree/usr/lib/libartsbuilder.la +/tmp/live_tree/usr/lib/libartsbuilder.so.0.0.0 +/tmp/live_tree/usr/lib/libartsflow.so.1.0.0 +/tmp/live_tree/usr/lib/libartsflow_idl.so.1.0.0 +/tmp/live_tree/usr/lib/libartskde.so.1.1.0 +/tmp/live_tree/usr/lib/libartsmidi.la +/tmp/live_tree/usr/lib/libartsmidi.so.0.0.0 +/tmp/live_tree/usr/lib/libartsmidi_idl.so.0.0.0 +/tmp/live_tree/usr/lib/libasound.so.2.0.0 +/tmp/live_tree/usr/lib/libatk-1.0.so.0.400.0 +/tmp/live_tree/usr/lib/libaudiofile.so.0.0.2 +/tmp/live_tree/usr/lib/libaudiofilearts.la +/tmp/live_tree/usr/lib/libaudiofilearts.so +/tmp/live_tree/usr/lib/libbz2.so.1.0.0 +/tmp/live_tree/usr/lib/libconsole.so.0.0.0 +/tmp/live_tree/usr/lib/libcrack.so.2.7 +/tmp/live_tree/usr/lib/libctutils.so.0.0.0 +/tmp/live_tree/usr/lib/libelf-0.84.so +/tmp/live_tree/usr/lib/libexpat.so.0.4.0 +/tmp/live_tree/usr/lib/libfam.so.0.0.0 +/tmp/live_tree/usr/lib/libfontconfig.so.1.0.4 +/tmp/live_tree/usr/lib/libfreetype.so.6.3.3 +/tmp/live_tree/usr/lib/libgdk-x11-2.0.so.0.200.4 +/tmp/live_tree/usr/lib/libgdk_pixbuf-2.0.so.0.200.4 +/tmp/live_tree/usr/lib/libglib-1.2.so.0.0.10 +/tmp/live_tree/usr/lib/libglib-2.0.so.0.200.3 +/tmp/live_tree/usr/lib/libgmodule-2.0.so.0.200.3 +/tmp/live_tree/usr/lib/libgobject-2.0.so.0.200.3 +/tmp/live_tree/usr/lib/libgthread-2.0.so.0.200.3 +/tmp/live_tree/usr/lib/libgtk-x11-2.0.so.0.200.4 +/tmp/live_tree/usr/lib/libjpeg.so.62.0.0 +/tmp/live_tree/usr/lib/libkabc.so.1.1.0 +/tmp/live_tree/usr/lib/libkcal.so.2.0.0 +/tmp/live_tree/usr/lib/libkdecore.so.4.1.0 +/tmp/live_tree/usr/lib/libkdefx.so.4.1.0 +/tmp/live_tree/usr/lib/libkdeprint.so.4.1.0 +/tmp/live_tree/usr/lib/libkdesu.so.4.1.0 +/tmp/live_tree/usr/lib/libkdeui.so.4.1.0 +/tmp/live_tree/usr/lib/libkhtml.so.4.1.0 +/tmp/live_tree/usr/lib/libkickermain.so.1.0.0 +/tmp/live_tree/usr/lib/libkio.so.4.1.0 +/tmp/live_tree/usr/lib/libkjs.so.1.0.0 +/tmp/live_tree/usr/lib/libkmedia2_idl.so.1.0.0 +/tmp/live_tree/usr/lib/libkmid.so.0.0.95 +/tmp/live_tree/usr/lib/libkonq.la +/tmp/live_tree/usr/lib/libkonq.so.4.1.0 +/tmp/live_tree/usr/lib/libkparts.so.2.1.0 +/tmp/live_tree/usr/lib/libkutils.so.1.1.0 +/tmp/live_tree/usr/lib/libmad.so.0.2.0 +/tmp/live_tree/usr/lib/libmcop.so.1.0.0 +/tmp/live_tree/usr/lib/libmcop_mt.so.1.0.0 +/tmp/live_tree/usr/lib/libmng.so.1.0.0 +/tmp/live_tree/usr/lib/libogg.so.0.4.0 +/tmp/live_tree/usr/lib/libpango-1.0.so.0.200.5 +/tmp/live_tree/usr/lib/libpangox-1.0.so.0.200.5 +/tmp/live_tree/usr/lib/libpangoxft-1.0.so.0.200.5 +/tmp/live_tree/usr/lib/libpcreposix.so.0.0.0 +/tmp/live_tree/usr/lib/libpng.so.3.1.2.5 +/tmp/live_tree/usr/lib/libpng12.so.0.1.2.5 +/tmp/live_tree/usr/lib/libqtmcop.so.1.0.0 +/tmp/live_tree/usr/lib/librpm-4.2.so +/tmp/live_tree/usr/lib/librpmdb-4.2.so +/tmp/live_tree/usr/lib/librpmio-4.2.so +/tmp/live_tree/usr/lib/libslp.so.1.0.0 +/tmp/live_tree/usr/lib/libsoundserver_idl.so.1.0.0 +/tmp/live_tree/usr/lib/libstdc++.so.5.0.5 +/tmp/live_tree/usr/lib/libtaskbar.so.1.1.0 +/tmp/live_tree/usr/lib/libtaskmanager.so.1.0.0 +/tmp/live_tree/usr/lib/libvcard.so.0.0.0 +/tmp/live_tree/usr/lib/libvorbis.so.0.2.0 +/tmp/live_tree/usr/lib/libvorbisenc.so.2.0.0 +/tmp/live_tree/usr/lib/libvorbisfile.so.3.0.0 +/tmp/live_tree/usr/lib/mcop/Arts +/tmp/live_tree/usr/lib/mcop/CDDAPlayObject.mcopclass +/tmp/live_tree/usr/lib/mcop/MP3PlayObject.mcopclass +/tmp/live_tree/usr/lib/mcop/NULLPlayObject.mcopclass +/tmp/live_tree/usr/lib/mcop/OGGPlayObject.mcopclass +/tmp/live_tree/usr/lib/mcop/SplayPlayObject.mcopclass +/tmp/live_tree/usr/lib/mcop/WAVPlayObject.mcopclass +/tmp/live_tree/usr/lib/mcop/artsbuilder.mcopclass +/tmp/live_tree/usr/lib/mcop/artsflow.mcopclass +/tmp/live_tree/usr/lib/mcop/artsgui.mcopclass +/tmp/live_tree/usr/lib/mcop/artsmidi.mcopclass +/tmp/live_tree/usr/lib/mcop/artsmodules.mcopclass +/tmp/live_tree/usr/lib/mcop/audiofilearts.mcopclass +/tmp/live_tree/usr/lib/mcop/kmedia2.mcopclass +/tmp/live_tree/usr/lib/mcop/soundserver.mcopclass +/tmp/live_tree/usr/lib/mcop/x11globalcomm.mcopclass +/tmp/live_tree/usr/lib/mcop/xinePlayObject.mcopclass +/tmp/live_tree/usr/lib/pango/1.2.0/modules/pango-basic-xft.so +/tmp/live_tree/usr/lib/perl5/5.8.1/AutoLoader.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/Carp.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/Exporter +/tmp/live_tree/usr/lib/perl5/5.8.1/Exporter.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/CORE +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/Config.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/DynaLoader.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/File +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/Socket.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/XSLoader.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/_h2ph_pre.ph +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/asm/unistd.ph +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/auto/File +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/auto/Socket +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/bits/syscall.ph +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/lib.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/sys/syscall.ph +/tmp/live_tree/usr/lib/perl5/5.8.1/i386-linux-thread-multi/syscall.ph +/tmp/live_tree/usr/lib/perl5/5.8.1/overload.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/strict.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/unicore/Canonical.pl +/tmp/live_tree/usr/lib/perl5/5.8.1/unicore/Exact.pl +/tmp/live_tree/usr/lib/perl5/5.8.1/unicore/To/Lower.pl +/tmp/live_tree/usr/lib/perl5/5.8.1/unicore/lib/SpacePer.pl +/tmp/live_tree/usr/lib/perl5/5.8.1/utf8.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/utf8_heavy.pl +/tmp/live_tree/usr/lib/perl5/5.8.1/vars.pm +/tmp/live_tree/usr/lib/perl5/5.8.1/warnings +/tmp/live_tree/usr/lib/perl5/5.8.1/warnings.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/MDK/Common.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/MDK/Common/DataStructure.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/MDK/Common/File.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/MDK/Common/Func.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/MDK/Common/Globals.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/MDK/Common/Math.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/MDK/Common/String.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/MDK/Common/System.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/MDK/Common/Various.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/i386-linux-thread-multi/Glib.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/i386-linux-thread-multi/Gtk2.pm +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/i386-linux-thread-multi/Gtk2/Gdk +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/i386-linux-thread-multi/auto/Glib +/tmp/live_tree/usr/lib/perl5/vendor_perl/5.8.1/i386-linux-thread-multi/auto/Gtk2 +/tmp/live_tree/usr/lib/qt3/lib/libqt-mt.so.3.1.2 +/tmp/live_tree/usr/sbin/ddcxinfos +/tmp/live_tree/usr/sbin/fileshareset +/tmp/live_tree/usr/sbin/pwconv +/tmp/live_tree/usr/share/VERSION +/tmp/live_tree/usr/share/application-registry/gnome-vfs.applications +/tmp/live_tree/usr/share/applnk-mdk +/tmp/live_tree/usr/share/applnk-mdk-simplified/.directory +/tmp/live_tree/usr/share/applnk-mdk-simplified/Administer your system/.directory +/tmp/live_tree/usr/share/applnk-mdk-simplified/Administer your system/Configure your computer.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Administer your system/KControl.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Administer your system/KFloppy.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Administer your system/kdepasswd.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Administer your system/kmix.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Administer your system/konsole.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Enjoy music & video/.directory +/tmp/live_tree/usr/share/applnk-mdk-simplified/Enjoy music & video/Listen to music files.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Enjoy music & video/Record sounds.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Enjoy music & video/Watch videos.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Home.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Kfind.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Play games/.directory +/tmp/live_tree/usr/share/applnk-mdk-simplified/Play games/Play ArmageTron.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Play games/Play Cannon Smash.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Play games/Play Chromium.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Play games/Play Frozen-Bubble.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Play games/Play LBreakout.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Play games/Play Tuxracer.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Read documentation/.directory +/tmp/live_tree/usr/share/applnk-mdk-simplified/Read documentation/Help.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Read documentation/Mandrake documentation in french.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Read documentation/Mandrake documentation in german.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Read documentation/Mandrake documentation in italian.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Read documentation/Mandrake documentation in spanish.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/.directory +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/Create a presentation.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/Create a spreadsheet.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/Create a text document.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/Create flowcharts and diagrams.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/Manage your finances.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/Manage your projects.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/kaddressbook.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/kalarm.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/kfax.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/knotes.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use office tools/korganizer.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/.directory +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/Chat using AIM, ICQ, MSN, Yahoo, Winpopup.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/Chat using IRC.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/Dialog using video conference.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/KMail.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/KNode.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/Kppp.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/kbear.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/konqbrowser.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/Use the Internet/quanta.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/View, modify, or create graphics/.directory +/tmp/live_tree/usr/share/applnk-mdk-simplified/View, modify, or create graphics/Manage, show and print your photos.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/View, modify, or create graphics/Manipulate pictures.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/View, modify, or create graphics/kooka.desktop +/tmp/live_tree/usr/share/applnk-mdk-simplified/View, modify, or create graphics/ksnapshot.desktop +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_adsr.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_atan_saturate.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_autopanner.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_brickwall.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_bus.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_capture_wav.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_cdelay.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_cflanger.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_data.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_delay.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_dtmf1.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_equalizer.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_fm.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_freeverb.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_moog.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_multi_add.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_noise.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_pitchshift.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_play_wave.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_pscale.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_pulse.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_rc.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_record.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_sequence.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_shelve_cutoff.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_sine.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_softsaw.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_square.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_stereobeep.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_tremolo.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_tri.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/example_xfade.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_chirpdrum.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_deepdrum.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_full_square.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_hihat.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_neworgan.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_nokind.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_organ2.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_simple_sin.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_simple_square.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_simple_tri.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_slide.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_slide1.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_square.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/instrument_tri.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/template_Empty_Structure.arts +/tmp/live_tree/usr/share/apps/artsbuilder/examples/template_Instrument.arts +/tmp/live_tree/usr/share/apps/clockapplet +/tmp/live_tree/usr/share/apps/kabc/plugins +/tmp/live_tree/usr/share/apps/kalarmdgui +/tmp/live_tree/usr/share/apps/kconf_update +/tmp/live_tree/usr/share/apps/kdesktop/DesktopLinks +/tmp/live_tree/usr/share/apps/kdesktop/directory.autostart +/tmp/live_tree/usr/share/apps/kdesktop/directory.desktop +/tmp/live_tree/usr/share/apps/kdesktop/directory.trash +/tmp/live_tree/usr/share/apps/kdisplay/app-defaults +/tmp/live_tree/usr/share/apps/khtml/css +/tmp/live_tree/usr/share/apps/khtml/khtml.rc +/tmp/live_tree/usr/share/apps/khtml/khtml_popupmenu.rc +/tmp/live_tree/usr/share/apps/kicker/applets/clockapplet.desktop +/tmp/live_tree/usr/share/apps/kicker/applets/minipagerapplet.desktop +/tmp/live_tree/usr/share/apps/kicker/applets/systemtrayapplet.desktop +/tmp/live_tree/usr/share/apps/kicker/applets/taskbarapplet.desktop +/tmp/live_tree/usr/share/apps/kicker/default-apps-mdk +/tmp/live_tree/usr/share/apps/kicker/pics/disk1.png +/tmp/live_tree/usr/share/apps/kicker/pics/disk10.png +/tmp/live_tree/usr/share/apps/kicker/pics/disk2.png +/tmp/live_tree/usr/share/apps/kicker/pics/disk3.png +/tmp/live_tree/usr/share/apps/kicker/pics/disk4.png +/tmp/live_tree/usr/share/apps/kicker/pics/disk5.png +/tmp/live_tree/usr/share/apps/kicker/pics/disk6.png +/tmp/live_tree/usr/share/apps/kicker/pics/disk7.png +/tmp/live_tree/usr/share/apps/kicker/pics/disk8.png +/tmp/live_tree/usr/share/apps/kicker/pics/disk9.png +/tmp/live_tree/usr/share/apps/knotify +/tmp/live_tree/usr/share/apps/ksplash/pics/splash_active_bar.png +/tmp/live_tree/usr/share/apps/ksplash/pics/splash_bottom.png +/tmp/live_tree/usr/share/apps/ksplash/pics/splash_inactive_bar.png +/tmp/live_tree/usr/share/apps/ksplash/pics/splash_top.png +/tmp/live_tree/usr/share/apps/kwin/eventsrc +/tmp/live_tree/usr/share/autostart +/tmp/live_tree/usr/share/config/kcmdisplayrc +/tmp/live_tree/usr/share/config/kcookiejarrc +/tmp/live_tree/usr/share/config/kdebug.areas +/tmp/live_tree/usr/share/config/kdebugrc +/tmp/live_tree/usr/share/config/kdedrc +/tmp/live_tree/usr/share/config/kdeglobals +/tmp/live_tree/usr/share/config/kdeprintrc +/tmp/live_tree/usr/share/config/kdesktoprc +/tmp/live_tree/usr/share/config/kdm/kdmrc +/tmp/live_tree/usr/share/config/khotkeysrc +/tmp/live_tree/usr/share/config/kickerrc +/tmp/live_tree/usr/share/config/konsolerc +/tmp/live_tree/usr/share/config/krootwarningrc +/tmp/live_tree/usr/share/config/kwritedrc +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/actions/about_kde.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/actions/configure.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/actions/contents.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/actions/exit.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/actions/history_clear.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/apps/kicker.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/apps/kmail.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/apps/kmenu.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/apps/konqueror.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/apps/korganizer.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/filesystems/desktop.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/filesystems/file_broken.png +/tmp/live_tree/usr/share/icons/crystalsvg/16x16/mimetypes/unknown.png +/tmp/live_tree/usr/share/icons/crystalsvg/32x32/apps/kmail.png +/tmp/live_tree/usr/share/icons/crystalsvg/32x32/apps/kmenu.png +/tmp/live_tree/usr/share/icons/crystalsvg/32x32/apps/konqueror.png +/tmp/live_tree/usr/share/icons/crystalsvg/32x32/apps/xapp.png +/tmp/live_tree/usr/share/icons/crystalsvg/32x32/devices/nfs_mount.png +/tmp/live_tree/usr/share/icons/crystalsvg/32x32/filesystems/desktop.png +/tmp/live_tree/usr/share/icons/crystalsvg/32x32/filesystems/trashcan_empty.png +/tmp/live_tree/usr/share/icons/crystalsvg/32x32/mimetypes/unknown.png +/tmp/live_tree/usr/share/icons/crystalsvg/index.desktop +/tmp/live_tree/usr/share/icons/default +/tmp/live_tree/usr/share/icons/hicolor/index.desktop +/tmp/live_tree/usr/share/icons/home-mdk.png +/tmp/live_tree/usr/share/icons/large/documentation-mdk.png +/tmp/live_tree/usr/share/icons/large/mandrake-club.png +/tmp/live_tree/usr/share/icons/large/mandrake-expert-mdk.png +/tmp/live_tree/usr/share/icons/large/mandrake-store-mdk.png +/tmp/live_tree/usr/share/icons/large/mcc-mdk.png +/tmp/live_tree/usr/share/icons/mandrakegalaxy.png +/tmp/live_tree/usr/share/icons/mdk-hicolor +/tmp/live_tree/usr/share/icons/mini/home-mdk.png +/tmp/live_tree/usr/share/icons/mini/ooo_calc.png +/tmp/live_tree/usr/share/icons/mini/ooo_writer.png +/tmp/live_tree/usr/share/icons/ooo_calc.png +/tmp/live_tree/usr/share/icons/ooo_writer.png +/tmp/live_tree/usr/share/langs +/tmp/live_tree/usr/share/ldetect-lst/Cards+ +/tmp/live_tree/usr/share/ldetect-lst/MonitorsDB +/tmp/live_tree/usr/share/ldetect-lst/pcitable +/tmp/live_tree/usr/share/locale/l10n/C/entry.desktop +/tmp/live_tree/usr/share/mdk/backgrounds/Mandrake.png +/tmp/live_tree/usr/share/mdk/kde/bookmarks.xml +/tmp/live_tree/usr/share/mdk/mandrakegalaxy/mdkgalaxy.html +/tmp/live_tree/usr/share/mdk/screensaver/3.png +/tmp/live_tree/usr/share/mimelnk +/tmp/live_tree/usr/share/nautilus +/tmp/live_tree/usr/share/services/about.protocol +/tmp/live_tree/usr/share/services/ark_part.desktop +/tmp/live_tree/usr/share/services/audiocd.protocol +/tmp/live_tree/usr/share/services/bmp.kimgio +/tmp/live_tree/usr/share/services/bzip.protocol +/tmp/live_tree/usr/share/services/bzip2.protocol +/tmp/live_tree/usr/share/services/cgi.protocol +/tmp/live_tree/usr/share/services/devices.protocol +/tmp/live_tree/usr/share/services/eps.kimgio +/tmp/live_tree/usr/share/services/file.protocol +/tmp/live_tree/usr/share/services/finger.protocol +/tmp/live_tree/usr/share/services/fish.protocol +/tmp/live_tree/usr/share/services/floppy.protocol +/tmp/live_tree/usr/share/services/fontthumbnail.desktop +/tmp/live_tree/usr/share/services/ftp.protocol +/tmp/live_tree/usr/share/services/ghelp.protocol +/tmp/live_tree/usr/share/services/gif.kimgio +/tmp/live_tree/usr/share/services/gsthumbnail.desktop +/tmp/live_tree/usr/share/services/gzip.protocol +/tmp/live_tree/usr/share/services/help.protocol +/tmp/live_tree/usr/share/services/htmlthumbnail.desktop +/tmp/live_tree/usr/share/services/http.protocol +/tmp/live_tree/usr/share/services/http_cache_cleaner.desktop +/tmp/live_tree/usr/share/services/https.protocol +/tmp/live_tree/usr/share/services/ico.kimgio +/tmp/live_tree/usr/share/services/imagethumbnail.desktop +/tmp/live_tree/usr/share/services/imap4.protocol +/tmp/live_tree/usr/share/services/imaps.protocol +/tmp/live_tree/usr/share/services/info.protocol +/tmp/live_tree/usr/share/services/jpeg.kimgio +/tmp/live_tree/usr/share/services/kaccess.desktop +/tmp/live_tree/usr/share/services/katepart.desktop +/tmp/live_tree/usr/share/services/kbearftp.protocol +/tmp/live_tree/usr/share/services/kbeargftimportfilter.desktop +/tmp/live_tree/usr/share/services/kbearkrusaderimportfilter.desktop +/tmp/live_tree/usr/share/services/kbearncftpimportfilter.desktop +/tmp/live_tree/usr/share/services/kbearoldimportfilter.desktop +/tmp/live_tree/usr/share/services/kbearwincommanderimportfilter.desktop +/tmp/live_tree/usr/share/services/kbearws_ftpimportfilter.desktop +/tmp/live_tree/usr/share/services/kbzip2filter.desktop +/tmp/live_tree/usr/share/services/kcertpart.desktop +/tmp/live_tree/usr/share/services/kded +/tmp/live_tree/usr/share/services/kdeprint_part.desktop +/tmp/live_tree/usr/share/services/kfile_au.desktop +/tmp/live_tree/usr/share/services/kfile_avi.desktop +/tmp/live_tree/usr/share/services/kfile_font.desktop +/tmp/live_tree/usr/share/services/kfile_m3u.desktop +/tmp/live_tree/usr/share/services/kfile_mp3.desktop +/tmp/live_tree/usr/share/services/kfile_ogg.desktop +/tmp/live_tree/usr/share/services/kfile_rfc822.desktop +/tmp/live_tree/usr/share/services/kfile_wav.desktop +/tmp/live_tree/usr/share/services/kfindpart.desktop +/tmp/live_tree/usr/share/services/kgzipfilter.desktop +/tmp/live_tree/usr/share/services/khelpcenter.desktop +/tmp/live_tree/usr/share/services/khtml.desktop +/tmp/live_tree/usr/share/services/khtmlimage.desktop +/tmp/live_tree/usr/share/services/kio_uiserver.desktop +/tmp/live_tree/usr/share/services/kjavaappletviewer.desktop +/tmp/live_tree/usr/share/services/klaptopdaemon.desktop +/tmp/live_tree/usr/share/services/kmailservice.protocol +/tmp/live_tree/usr/share/services/kmanpart.desktop +/tmp/live_tree/usr/share/services/kmixctrl_restore.desktop +/tmp/live_tree/usr/share/services/kmultipart.desktop +/tmp/live_tree/usr/share/services/knewsservice.protocol +/tmp/live_tree/usr/share/services/knotify.desktop +/tmp/live_tree/usr/share/services/kntsrcfilepropsdlg.desktop +/tmp/live_tree/usr/share/services/konq_aboutpage.desktop +/tmp/live_tree/usr/share/services/konq_detailedlistview.desktop +/tmp/live_tree/usr/share/services/konq_iconview.desktop +/tmp/live_tree/usr/share/services/konq_infolistview.desktop +/tmp/live_tree/usr/share/services/konq_multicolumnview.desktop +/tmp/live_tree/usr/share/services/konq_sidebartng.desktop +/tmp/live_tree/usr/share/services/konq_textview.desktop +/tmp/live_tree/usr/share/services/konq_treeview.desktop +/tmp/live_tree/usr/share/services/konqueror_config.desktop +/tmp/live_tree/usr/share/services/konsole-script.desktop +/tmp/live_tree/usr/share/services/konsolepart.desktop +/tmp/live_tree/usr/share/services/korganizer +/tmp/live_tree/usr/share/services/kpfpropertiesdialogplugin.desktop +/tmp/live_tree/usr/share/services/kregexpeditorgui.desktop +/tmp/live_tree/usr/share/services/krl.kimgio +/tmp/live_tree/usr/share/services/kshorturifilter.desktop +/tmp/live_tree/usr/share/services/ktexteditor_insertfile.desktop +/tmp/live_tree/usr/share/services/ktexteditor_isearch.desktop +/tmp/live_tree/usr/share/services/ktexteditor_kdatatool.desktop +/tmp/live_tree/usr/share/services/kuriikwsfilter.desktop +/tmp/live_tree/usr/share/services/kurisearchfilter.desktop +/tmp/live_tree/usr/share/services/kwrited.desktop +/tmp/live_tree/usr/share/services/kxkb.desktop +/tmp/live_tree/usr/share/services/ldap.protocol +/tmp/live_tree/usr/share/services/localdomainurifilter.desktop +/tmp/live_tree/usr/share/services/mac.protocol +/tmp/live_tree/usr/share/services/man.protocol +/tmp/live_tree/usr/share/services/metainfo.protocol +/tmp/live_tree/usr/share/services/nfs.protocol +/tmp/live_tree/usr/share/services/nntp.protocol +/tmp/live_tree/usr/share/services/pbm.kimgio +/tmp/live_tree/usr/share/services/pgm.kimgio +/tmp/live_tree/usr/share/services/picturethumbnail.desktop +/tmp/live_tree/usr/share/services/png.kimgio +/tmp/live_tree/usr/share/services/pop3.protocol +/tmp/live_tree/usr/share/services/pop3s.protocol +/tmp/live_tree/usr/share/services/ppm.kimgio +/tmp/live_tree/usr/share/services/print.protocol +/tmp/live_tree/usr/share/services/rlogin.protocol +/tmp/live_tree/usr/share/services/rtsp.protocol +/tmp/live_tree/usr/share/services/searchproviders +/tmp/live_tree/usr/share/services/sftp.protocol +/tmp/live_tree/usr/share/services/shellscript.desktop +/tmp/live_tree/usr/share/services/smb.protocol +/tmp/live_tree/usr/share/services/smtp.protocol +/tmp/live_tree/usr/share/services/smtps.protocol +/tmp/live_tree/usr/share/services/tar.protocol +/tmp/live_tree/usr/share/services/telnet.protocol +/tmp/live_tree/usr/share/services/textthumbnail.desktop +/tmp/live_tree/usr/share/services/thumbnail.protocol +/tmp/live_tree/usr/share/services/tiff.kimgio +/tmp/live_tree/usr/share/services/useragentstrings +/tmp/live_tree/usr/share/services/webcal.protocol +/tmp/live_tree/usr/share/services/webdav.protocol +/tmp/live_tree/usr/share/services/webdavs.protocol +/tmp/live_tree/usr/share/services/xbm.kimgio +/tmp/live_tree/usr/share/services/xpm.kimgio +/tmp/live_tree/usr/share/services/xv.kimgio +/tmp/live_tree/usr/share/services/zip.protocol +/tmp/live_tree/usr/share/servicetypes +/tmp/live_tree/usr/share/sounds/KDE_Startup.wav +/tmp/live_tree/usr/share/themes/Default/gtk-2.0 +/tmp/live_tree/usr/share/themes/Galaxy/gtk-2.0 diff --git a/move/data/etcfiles b/move/data/etcfiles index 50127eb32..9f3b7134c 100644 --- a/move/data/etcfiles +++ b/move/data/etcfiles @@ -14,8 +14,6 @@ # OVERWRITE files that will be overwritten /etc/modules -/etc/modprobe.preload -/etc/ntp.conf /etc/.pwd.lock /etc/inittab /etc/ppp/options diff --git a/move/data/keyfiles b/move/data/keyfiles index 27ae0bb39..6754e574b 100644 --- a/move/data/keyfiles +++ b/move/data/keyfiles @@ -2,8 +2,6 @@ /etc/group /etc/modules /etc/modules.conf -/etc/modprobe.preload -/etc/modprobe.conf /etc/passwd /etc/resolv.conf /etc/sudoers diff --git a/move/data/nvidia.list b/move/data/nvidia.list index 3cae7ff16..a8c3560f9 100644 --- a/move/data/nvidia.list +++ b/move/data/nvidia.list @@ -1,3 +1,3 @@ -/usr/lib/libGLcore.so.1 -/usr/lib/libGLcore.so.1.0.5336 -/usr/X11R6/lib/modules/extensions/libglx.so.1.0.5336 +/tmp/live_tree/usr/lib/libGLcore.so.1 +/tmp/live_tree/usr/lib/libGLcore.so.1.0.4496 +/tmp/live_tree/usr/X11R6/lib/modules/extensions/libglx.so.1.0.4496 diff --git a/move/data/totem.list b/move/data/totem.list index ab0adbbee..efb55da38 100644 --- a/move/data/totem.list +++ b/move/data/totem.list @@ -1,68 +1,57 @@ -/bin/sleep -/etc/gnome-vfs-mime-magic -/usr/X11R6/lib/libXi.so.6.0 -/usr/X11R6/lib/libXrandr.so.2.0 -/usr/X11R6/lib/libXtst.so.6.1 -/usr/bin/mdk_behind_totem -/usr/bin/totem -/usr/lib/GConf/2/libgconfbackend-xml.so -/usr/lib/gconfd-2 -/usr/lib/gnome-vfs-2.0/modules/libfile.so -/usr/lib/gtk-2.0/2.2.0/engines/libgalaxy.so -/usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so -/usr/lib/kde3/libkshorturifilter.so -/usr/lib/kde3/libkuriikwsfilter.so -/usr/lib/kde3/libkurisearchfilter.so -/usr/lib/kde3/liblocaldomainurifilter.so -/usr/lib/libSDL-1.2.so.0.7.0 -/usr/lib/libORBit-2.so.0.0.0 -/usr/lib/libORBitCosNaming-2.so.0.0.0 -/usr/lib/libartsc.so.0.0.0 -/usr/lib/libartscbackend.so.0.0.0 -/usr/lib/libatk-1.0.so.0.400.1 -/usr/lib/libbonobo-2.so.0.0.0 -/usr/lib/libbonobo-activation.so.4.0.0 -/usr/lib/libbonoboui-2.so.0.0.0 -/usr/lib/libcdio.so.0.0.0 -/usr/lib/libcrypto.so.0.9.7 -/usr/lib/libcurl.so.2.0.2 -/usr/lib/libgconf-2.so.4.1.0 -/usr/lib/libgdk-x11-2.0.so.0.200.4 -/usr/lib/libgdk_pixbuf-2.0.so.0.200.4 -/usr/lib/libglade-2.0.so.0.0.1 -/usr/lib/libglade/2.0/libbonobo.so -/usr/lib/libglade/2.0/libgnome.so -/usr/lib/libgnome-2.so.0.400.0 -/usr/lib/libgnome-desktop-2.so.2.1.9 -/usr/lib/libgnomecanvas-2.so.0.400.0 -/usr/lib/libgnomeui-2.so.0.400.0 -/usr/lib/libgnomevfs-2.so.0.400.2 -/usr/lib/libgobject-2.0.so.0.200.3 -/usr/lib/libgtk-x11-2.0.so.0.200.4 -/usr/lib/libiso9660.so.0.0.0 -/usr/lib/liblirc_client.so.0.0.0 -/usr/lib/libpango-1.0.so.0.200.5 -/usr/lib/libpangoft2-1.0.so.0.200.5 -/usr/lib/libpangox-1.0.so.0.200.5 -/usr/lib/libpangoxft-1.0.so.0.200.5 -/usr/lib/libpng12.so.0.1.2.5 -/usr/lib/libspeex.so.1.1.0 -/usr/lib/libssl.so.0.9.7 -/usr/lib/libstartup-notification-1.so.0.0.0 -/usr/lib/libvcd.so.0.0.0 -/usr/lib/libvcdinfo.so.0.0.0 -/usr/lib/libxine.so.1.8.1 -/usr/lib/libxml2.so.2.6.6 -/usr/lib/pango/1.2.0/modules/pango-basic-xft.so -/usr/lib/xine -/usr/share/alsa -/usr/share/totem -/usr/lib/gnome-vfs-2.0/modules/libcdda.so -/usr/lib/libcdda_interface.so.0 -/usr/lib/libcdda_interface.so.0.9.8 -/usr/lib/libcdda_paranoia.so.0 -/usr/lib/libcdda_paranoia.so.0.9.8 -/sbin/ifplugd -/sbin/dhcpcd -/sbin/dhclient -/sbin/zcip +/tmp/live_tree/bin/sleep +/tmp/live_tree/usr/X11R6/lib/libXi.so.6.0 +/tmp/live_tree/usr/X11R6/lib/libXrandr.so.2.0 +/tmp/live_tree/usr/X11R6/lib/libXtst.so.6.1 +/tmp/live_tree/usr/bin/mdk_behind_totem +/tmp/live_tree/usr/bin/totem +/tmp/live_tree/usr/lib/gnome-vfs-2.0/modules/libfile.so +/tmp/live_tree/usr/lib/gtk-2.0/2.2.0/engines/libgalaxy.so +/tmp/live_tree/usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so +/tmp/live_tree/usr/lib/kde3/kio_devices.so +/tmp/live_tree/usr/lib/kde3/libkshorturifilter.so +/tmp/live_tree/usr/lib/kde3/libkuriikwsfilter.so +/tmp/live_tree/usr/lib/kde3/libkurisearchfilter.so +/tmp/live_tree/usr/lib/kde3/liblocaldomainurifilter.so +/tmp/live_tree/usr/lib/libIDL-2.so.0.0.0 +/tmp/live_tree/usr/lib/libORBitCosNaming-2.so.0.0.0 +/tmp/live_tree/usr/lib/libatk-1.0.so.0.400.0 +/tmp/live_tree/usr/lib/libbonobo-2.so.0.0.0 +/tmp/live_tree/usr/lib/libbonobo-activation.so.4.0.0 +/tmp/live_tree/usr/lib/libbonoboui-2.so.0.0.0 +/tmp/live_tree/usr/lib/libcrypto.so.0.9.7 +/tmp/live_tree/usr/lib/libcurl.so.2.0.2 +/tmp/live_tree/usr/lib/libesd.so.0.2.32 +/tmp/live_tree/usr/lib/libgdk-x11-2.0.so.0.200.4 +/tmp/live_tree/usr/lib/libgdk_pixbuf-2.0.so.0.200.4 +/tmp/live_tree/usr/lib/libglade-2.0.so.0.0.1 +/tmp/live_tree/usr/lib/libglade/2.0/libbonobo.so +/tmp/live_tree/usr/lib/libglade/2.0/libgnome.so +/tmp/live_tree/usr/lib/libgnome-2.so.0.400.0 +/tmp/live_tree/usr/lib/libgnome-desktop-2.so.2.1.8 +/tmp/live_tree/usr/lib/libgnomecanvas-2.so.0.400.0 +/tmp/live_tree/usr/lib/libgnomeui-2.so.0.400.0 +/tmp/live_tree/usr/lib/libgnomevfs-2.so.0.400.0 +/tmp/live_tree/usr/lib/libgtk-x11-2.0.so.0.200.4 +/tmp/live_tree/usr/lib/liblirc_client.so.0.0.0 +/tmp/live_tree/usr/lib/libpango-1.0.so.0.200.5 +/tmp/live_tree/usr/lib/libpangoft2-1.0.so.0.200.5 +/tmp/live_tree/usr/lib/libpangox-1.0.so.0.200.5 +/tmp/live_tree/usr/lib/libpangoxft-1.0.so.0.200.5 +/tmp/live_tree/usr/lib/libpng12.so.0.1.2.5 +/tmp/live_tree/usr/lib/libspeex.so.1.1.0 +/tmp/live_tree/usr/lib/libssl.so.0.9.7 +/tmp/live_tree/usr/lib/libstartup-notification-1.so.0.0.0 +/tmp/live_tree/usr/lib/libxine.so.1.7.1 +/tmp/live_tree/usr/lib/pango/1.2.0/modules/pango-basic-xft.so +/tmp/live_tree/usr/lib/xine +/tmp/live_tree/usr/share/alsa +/tmp/live_tree/usr/share/totem +/tmp/live_tree/usr/lib/gnome-vfs-2.0/modules/libcdda.so +/tmp/live_tree/usr/lib/libcdda_interface.so.0 +/tmp/live_tree/usr/lib/libcdda_interface.so.0.9.8 +/tmp/live_tree/usr/lib/libcdda_paranoia.so.0 +/tmp/live_tree/usr/lib/libcdda_paranoia.so.0.9.8 +/tmp/live_tree/sbin/ifplugd +/tmp/live_tree/sbin/dhcpcd +/tmp/live_tree/sbin/dhclient +/tmp/live_tree/sbin/zcip diff --git a/move/hack_boot_img b/move/hack_boot_img new file mode 100755 index 000000000..1f95cce8e --- /dev/null +++ b/move/hack_boot_img @@ -0,0 +1,418 @@ +#!/usr/bin/perl + +@ARGV >= 2 or die "usage: $0 <image> all|other|cdrom|hd|network|blank|pcmcia|live|tftp|tftprd\n"; + +use Config; +Config->import; +my ($arch) = $Config{archname} =~ /(.*)-/; +my $corporate = $ENV{CORPORATE} && " corporate"; #- use this for building a corporate version. + +($img, $type) = @ARGV; + +$instdir = "../mdk-stage1/"; +$mnt = "/tmp/drakx_mnt"; +$mke2fs = "/sbin/mke2fs -q -m 0 -F -s 1"; + +if ($>) { + $sudo = "sudo"; + $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; +} + +sub __ { print @_, "\n"; system(@_); } +sub _ { __ @_; $? and die; } + +_ "$sudo mkdir $mnt" unless -e $mnt; +_ "$sudo mkdir ${mnt}2" unless -e "${mnt}2"; + +$install = $ {{ + all => "stage1-full", + other => "stage1-full", + blank => "stage1-full", + live => "stage1-full", + tftp => "stage1-full", + tftprd => "stage1-full", + pcmcia => "stage1-full", + network => "stage1-network", + usb => "stage1-usb", + cdrom => "stage1-cdrom", + hd => "stage1-disk", + live64 => "stage1-full", + tftp64 => "stage1-full", + tftprd64 => "stage1-full", + pcmcia64 => "stage1-full", + network64 => "stage1-network", + cdrom64 => "stage1-cdrom", + hd64 => "stage1-disk", +}}{$type} or die; + +chomp($main = `cat ../kernel/all.kernels/.main`); + + @kernels = $main; + +foreach (@kernels) { + if ($img =~ /rdz$/) { + initrd($mnt, "$img-$_"); + } else { + $::{"boot_img_$arch"}->($mnt, "$img-$_", glob("../kernel/all.kernels/$_/boot/vmlinu*")); + } +} +rename("$img-$main", "$img"); + +sub install_stripped { _ "$sudo install $_[0] $_[1]" } + +sub initrd { + my ($mnt, $img) = @_; + my ($ltype, $I) = $type =~ /(.*?)(64)/; $ltype ||= $type; + my $tmp = "$ENV{HOME}/tmp/initrd"; + my $tar = "$instdir/stage1-data/stage1-with-busybox.tar.bz2"; + + __ "$sudo umount $tmp $mnt 2>/dev/null"; + _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? 16386 : ($type eq "all" ? 6000 : 4000)); + _ "$mke2fs $tmp"; + _ "$sudo mount -t ext2 $tmp $mnt -o loop"; + + _ "$sudo tar xjC $mnt -f $tar"; + install_stripped("$instdir/init", "$mnt/sbin"); + install_stripped("$instdir/$install", "$mnt/sbin/stage1"); + + if ($type eq "network" || $type eq "usb" || $type eq "all" || $type eq "other" || $type eq "blank") { + install_stripped("$instdir/ppp/pppd-bin", "$mnt/sbin/pppd"); + install_stripped("$instdir/rp-pppoe/pppoe-bin", "$mnt/sbin/pppoe"); + _ "$sudo mknod $mnt/dev/ppp c 108 0"; + _ "$sudo mknod $mnt/dev/ptyp0 c 2 0"; + _ "$sudo mknod $mnt/dev/ttyp0 c 3 0"; + } + + my $ftype = $type =~ /^(all)$/ ? "pcmcia" : $type; + if ($ftype eq "pcmcia") { + _ "$sudo cp -a /etc/pcmcia $mnt/etc"; + _ "cp $mnt/etc/pcmcia/config /tmp/pcmcia_config_tmp"; + _ "../tools/patch_pcmcia_config.pl /tmp/pcmcia_config_tmp ../kernel/all.modules/$main/modules.dep"; + _ "sudo mv /tmp/pcmcia_config_tmp $mnt/etc/pcmcia/config"; + } + my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; + $modz = "../kernel/all.modules$I/$ext"; + if ($type !~ /blank/) { + _ "$sudo cp -f $modz/${ltype}_modules.mar $mnt/modules/modules$I.mar" ; + _ "$sudo cp -f $modz/modules.dep $mnt/modules/"; + } + _ "$sudo umount $mnt"; + + +# Workaround for vfat-loop bug (quite touchy) + _ "gzip -9f $tmp"; + _ "cp -f $tmp.gz $img"; + _ "rm -f $tmp.gz"; +# _ "gzip -9 -c $tmp > $img"; +# _ "rm -f $tmp"; +} + +sub boot_img_i386 { + my ($mnt, $img, $kernel) = @_; + + __ "$sudo umount $mnt 2>/dev/null"; + my $automatic = ""; + + if ($type eq "hd") { + _ "bunzip2 -c $instdir/init-data/msgboot.img.bz2 > $img"; + } elsif ($type eq "all") { + _ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo-2880.img.bz2 > $img"; + } else { + _ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo.img.bz2 > $img"; + } + + $automatic = "automatic=method:cdrom" if ($type eq "cdrom"); + $automatic = "automatic=method:disk" if ($type eq "hd"); + + _ "$sudo mount -t vfat -o umask=0 $img $mnt -o loop"; + _ "cat $kernel > $mnt/vmlinuz" if $type !~ /blank/; + + my $rdz = $img; $rdz =~ s/\.img/.rdz/; + initrd("${mnt}2", $rdz) if !-e $rdz; + eval { _ "cp -f $rdz $mnt/$type.rdz" }; + if ($@) { + unlink "$mnt/$type.rdz"; + my $avail = (split ' ', `df $mnt`)[-3]; + my $s = int((-s $rdz) / 1024); + die sprintf("not enough room for $rdz: need %dKB (available %dKB < needed %dKB)\n", $s - $avail, $avail, $s); + } + +# my $ftype = $type =~ /^(other|all)$/ ? "cdrom" : $type; + my $timeout = 72; + output("$mnt/syslinux.cfg", +"default linux +prompt 1 +timeout $timeout +display boot.msg +F1 help.msg +F2 boot.msg +label linux + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic vga=788 +label vgalo + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic vga=785 +label vgahi + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic vga=791 +label vga16 + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic vga16 +label text + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic text +label patch + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic patch vga=788 +label expert + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic expert vga=788 +label rescue + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic rescue rw +label lnx4win + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic lnx4win vga=788" . + +($type eq 'all' && +"label preinst + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz automatic=method:cdrom rescue oem rw +label oem + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz automatic=method:cdrom rescue oem rw") . + +"label auto + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz $automatic auto_install=Mandrake/base/auto_inst.cfg.pl +label all + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz pcmcia vga=788 +label ackbar + kernel vmlinuz + append ramdisk_size=32000 initrd=$type.rdz automatic=method:nfs,network:static,ip:192.168.1.205,dns:192.168.1.11,domain:mandrakesoft.com,server:ackbar,directory:/export vga=788 +"); + _ "sync"; + _ "df $mnt"; +} + +sub boot_img_alpha { + my ($mnt, $img) = @_; + + __ "$sudo umount $mnt 2>/dev/null"; + _ "dd if=/dev/zero of=$img bs=1k count=1440"; + _ "$mke2fs $img"; + _ "/sbin/e2writeboot $img /boot/bootlx"; + _ "$sudo mount -t ext2 $img $mnt -o loop"; + _ "cp -f vmlinux.gz $mnt" if $type !~ /blank/; + -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz"); + + mkdir "$mnt/etc", 0777; + output("$mnt/etc/aboot.conf", +"0:vmlinux.gz initrd=$type.rdz rw ramdisk_size=32000 $type +1:vmlinux.gz initrd=$type.rdz rw ramdisk_size=32000 text $type +"); + _ "sync"; + _ "df $mnt"; +} + +sub boot_img_sparc { + my ($mnt, $img) = @_; + if ($type =~ /^live(.*)/) { + #- hack to produce directly into /export the needed file for cdrom boot. + my $dir = "/export"; + my $boot = "boot"; #- non-absolute pathname only! + + _ "mkdir -p $dir/$boot"; + _ "cp -f /boot/cd.b /boot/second.b $dir/$boot"; + _ "cp -f vmlinux$1 $dir/$boot/vmlinux$1"; + -f "live$1.rdz" ? _ "cp -f live$1.rdz $dir/$boot" : initrd("${mnt}2", "$dir/$boot/live$1.rdz"); + + output("$dir/$boot/silo.conf", " +partition=1 +default=linux +timeout=100 +read-write +message=/$boot/boot.msg +image=\"cat /$boot/boot.msg\" + label=1 + single-key +image=\"cat /$boot/general.msg\" + label=2 + single-key +image=\"cat /$boot/expert.msg\" + label=3 + single-key +image=\"cat /$boot/rescue.msg\" + label=4 + single-key +image=\"cat /$boot/kickit.msg\" + label=5 + single-key +image=\"cat /$boot/param.msg\" + label=6 + single-key +image[sun4c,sun4d,sun4m]=/$boot/vmlinux + label=linux + alias=install + initrd=/$boot/live.rdz + append=\"ramdisk_size=32000$corporate\" +image[sun4c,sun4d,sun4m]=/$boot/vmlinux + label=text + initrd=/$boot/live.rdz + append=\"ramdisk_size=32000 text$corporate\" +image[sun4c,sun4d,sun4m]=/$boot/vmlinux + label=expert + initrd=/$boot/live.rdz + append=\"ramdisk_size=32000 expert$corporate\" +image[sun4c,sun4d,sun4m]=/$boot/vmlinux + label=ks + initrd=/$boot/live.rdz + append=\"ramdisk_size=32000 ks$corporate\" +image[sun4c,sun4d,sun4m]=/$boot/vmlinux + label=rescue + initrd=/$boot/live.rdz + append=\"ramdisk_size=32000 rescue rw root=/dev/ram3$corporate\" +image[sun4u]=/$boot/vmlinux64 + label=linux + alias=install + initrd=/$boot/live64.rdz + append=\"ramdisk_size=32000$corporate\" +image[sun4u]=/$boot/vmlinux64 + label=text + initrd=/$boot/live64.rdz + append=\"ramdisk_size=32000 text$corporate\" +image[sun4u]=/$boot/vmlinux64 + label=expert + initrd=/$boot/live64.rdz + append=\"ramdisk_size=32000 expert$corporate\" +image[sun4u]=/$boot/vmlinux64 + label=ks + initrd=/$boot/live64.rdz + append=\"ramdisk_size=32000 ks$corporate\" +image[sun4u]=/$boot/vmlinux64 + label=rescue + initrd=/$boot/live64.rdz + append=\"ramdisk_size=32000 rescue rw root=/dev/ram3$corporate\" +"); + + output("$dir/$boot/README", " +To Build a Bootable CD-ROM, try: + mkisofs -R -o t.iso -s /$boot/silo.conf /export +"); + } elsif ($type =~ /^tftprd(.*)/) { + my $dir = "/export"; + my $boot = "images"; + my $setarch = $1 ? "sparc64" : "sparc32"; + + _ "mkdir -p $dir/$boot"; + -f "$type.rdz" or initrd("${mnt}2", "$type.rdz"); + _ "cp -f vmlinux$1.aout $dir/$boot/$type.img"; + _ "$setarch kernel$1/src/arch/sparc$1/boot/piggyback $dir/$boot/$type.img kernel$1/boot/System.map $type.rdz"; + } elsif ($type =~ /^tftp(.*)/) { + my $dir = "/export"; + my $boot = "images"; + + _ "mkdir -p $dir/$boot"; + _ "cp -f vmlinux$1.aout $dir/$boot/$type.img"; + } else { + my $dir = "floppy"; + my ($ltype, $I) = $type =~ /(.*?)(64)/; $ltype ||= $type; + + __ "$sudo umount $mnt 2>/dev/null"; + _ "rm -rf $dir"; + _ "mkdir -p $dir"; + _ "cp -f /boot/fd.b /boot/second.b $dir"; + _ "cp -f vmlinuz$I $dir/vmlinux$I.gz" if $type !~ /blank/; + -f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd("${mnt}2", "$dir/$type.rdz"); + + output("$dir/boot.msg", " +Welcome to Mandrake Linux 7.1 + +Press <Enter> to install or upgrade a system 7mMandrake Linux7m +"); + + output("$dir/silo.conf", " +partition=1 +default=linux +timeout=100 +read-write +message=/boot.msg +image=/vmlinux$I.gz + label=linux + initrd=/$type.rdz + append=\"ramdisk_size=32000 $ltype$corporate\" +"); + _ "genromfs -d $dir -f /dev/ram -A 2048,/.. -a 512 -V \'DrakX boot disk\'"; + _ "$sudo mount -t romfs /dev/ram $mnt"; + _ "silo -r $mnt -F -i /fd.b -b /second.b -C /silo.conf"; + _ "$sudo umount $mnt"; + _ "dd if=/dev/ram of=$type.img bs=1440k count=1"; + _ "sync"; + _ "$sudo mount -t romfs /dev/ram $mnt"; + _ "df $mnt"; + } +} + +sub boot_img_ppc { + my ($mnt, $img, $kern, $modz) = @_; + my $dir = "/export"; + my $boot = "boot"; #- non-absolute pathname only! + my ($extension) = $modz =~ /.*\/([^\/]+)/; + _ "mkdir -p $dir/$boot"; + _ "cp -f $kern $dir/$boot/vmlinux"; + _ "cp -f all.rdz$extension $dir/boot/all.gz"; + _ "cp -f tools/ppc/yaboot $dir/boot/yaboot"; + + output("$dir/$boot/yaboot.conf", " +init-message = \"\\nWelcome to Mandrake Linux PPC!\\nHit <TAB> for boot options.\\n\\n\" +timeout = 150 +default = install-novideo + +image = cd:,\\\\\\\\vmlinux + label = install-novideo + initrd = cd:,\\\\\\\\all.gz + initrd-size = 32000 + append = \" video=ofonly\" + +image = cd:,\\\\\\\\vmlinux + label = install-atyfb + initrd = cd:,\\\\\\\\all.gz + initrd-size = 32000 + append = \" video=atyfb:vmode:17\" + +image = cd:,\\\\\\\\vmlinux + label = install-aty128fb + initrd = cd:,\\\\\\\\all.gz + initrd-size = 32000 + append = \" video=aty128fb:vmode:17\" + +image = cd:,\\\\\\\\vmlinux + label = install-text + initrd = cd:,\\\\\\\\all.gz + initrd-size = 32000 + append = \" text\" + +image = cd:,\\\\\\\\vmlinux + label = rescue + initrd = cd:,\\\\\\\\all.gz + initrd-size = 32000 + append = \" rescue\" +"); + #- seem to need 2 yaboot.conf, one in the root, and one in boot + _ "cp -f $dir/boot/yaboot.conf $dir/yaboot.conf"; + + output("$dir/$boot/README", " +To Build a Bootable CD-ROM, do: +cd /tools/ppc +./mkINSTALLCD /export ppc-cd.img +"); + +} + +sub output { + my $f = shift; + local *F; + open F, "> $f" or die "error writing to $f"; + print F join '', @_; +} diff --git a/move/isolinux/.cvsignore b/move/isolinux/.cvsignore index a7edff342..fc96f3d29 100644 --- a/move/isolinux/.cvsignore +++ b/move/isolinux/.cvsignore @@ -1,4 +1,5 @@ boot.msg all.rdz +cdrom.rdz isolinux.bin vmlinuz diff --git a/move/isolinux/isolinux.cfg b/move/isolinux/isolinux.cfg index 1b734525d..f15c0c44f 100644 --- a/move/isolinux/isolinux.cfg +++ b/move/isolinux/isolinux.cfg @@ -7,8 +7,8 @@ F2 boot.msg label linux kernel vmlinuz - append initrd=all.rdz acpi=ht quiet devfs=nomount automatic=method:cdrom + append initrd=all.rdz acpi=ht quiet automatic=method:cdrom label acpi kernel vmlinuz - append initrd=all.rdz quiet devfs=nomount automatic=method:cdrom + append initrd=all.rdz quiet automatic=method:cdrom diff --git a/move/make_live b/move/make_live index 5a092de09..39dfbb424 100755 --- a/move/make_live +++ b/move/make_live @@ -3,19 +3,21 @@ use lib "../perl-install"; use common; use pkgs; -use lang; + +my @ALLOWED_LANGS = split(' ', first(cat_('move.pm') =~ /ALLOWED_LANGS = qw\((.*)\)/)); +my @langs = map { /^../; $& } @ALLOWED_LANGS; @ARGV <= 1 or die "usage: make_live [live_location=/tmp/live_tree]\n"; my $kernel_version = do { - my @l = glob_('/export/Mandrake/RPMS/kernel-2.6*'); + my @l = glob_('/export/Mandrake/RPMS/kernel-2.*'); @l >= 1 or die "can't find kernel"; @l <= 1 or die "too many kernels"; first(`rpm -qp --qf '%{name}' $l[0]` =~ /kernel-(.*)/); }; sub installPackages { - output_p("$::prefix/etc/rpm/macros", "%_install_langs all\n"); + output_p("$::prefix/etc/rpm/macros", "%_install_langs " . join(":", @langs) . "\n"); rename '/etc/rpm/macros', '/etc/rpm/macros.'; system('cp', "$::prefix/etc/rpm/macros", '/etc/rpm/macros'); @@ -33,10 +35,6 @@ sub installPackages { open(my $F, '/export/' . install_any::relGetFile($f)) or return; $F; }; - - undef *c::kernel_version; - *c::kernel_version = sub { $kernel_version }; - install_any::setPackages(my $o = $::o = { prefix => $::prefix, meta_class => 'desktop', @@ -49,22 +47,11 @@ sub installPackages { qw(mountloop), #- crypted folders qw(dnotify), #- notification of /etc changes qw(mandrake_doc-move-en mandrake_doc-move-fr mandrake_doc-move-drakxtools-en mandrake_doc-move-drakxtools-fr), - qw(synaptics), - #- network conf: - qw(wireless-tools pcmcia-cs), - #- zeroconf: - qw(zcip dhcpcd tmdns), - #- cnx stuff: - qw(dhcp-client ppp kdenetwork-kppp ppp-pppoatm ppp-pppoe pptp-linux pptp-adsl rp-pppoe), - #- ISDN stuff: - qw(isdn4net ibod isdn4k-utils), - #- network file sharing: - qw(nfs-utils-clients samba-client), - #- network drivers and firmwares: - qw(eagle-usb speedtouch speedtouch_mgmt unicorn), + qw(zcip dhcp-client dhcpcd ppp kdenetwork-kppp rp-pppoe pptp-adsl speedtouch speedtouch_mgmt nfs-utils-clients samba-client tmdns wireless-tools adiusbadsl pcmcia-cs), #- network conf qw(cups cups-drivers foomatic-db gimpprint hpoj libnet-snmp mtools mtoolsfm nmap printer-filters printer-testpages printer-utils scli xojpanel xpp), #- printer stuff qw(ATI_GLX NVIDIA_GLX), - qw(hcfpcimodem hsflinmodem ltmodem), + "kernel-smp-$kernel_version", + qw(hcfpcimodem hsflinmodem ltmodem), "NVIDIA_nforce-$kernel_version", qw(xinput), #- for some mice qw(perl-Term-Readline-Gnu binutils emacs-X11 bash-completion), #- allow debugging move qw(openssh-askpass-gnome), #- openssh-askpass for mountloop doesn't allow to click on ok/cancel buttons @@ -77,13 +64,7 @@ sub installPackages { my %compssUsersChoice = map { $_ => 1 } map { @{$_->{flags}} } values %{$o->{compssUsers}}; $compssUsersChoice{$_} = 1 foreach 'SYSTEM', 'DVD', 'USB', 'SOUND', 'BURNER', 'UTF8', 'DOCS', 'TV', '3D', 'INSTALL'; - $compssUsersChoice{qq(LOCALES"$_")} = 1 foreach lang::list_langs(); - - #- we don't want those - foreach (qw(magicdev mdkonline)) { - my $pkg = pkgs::packageByName($o->{packages}, $_) or die "$_ not there anymore"; - $pkg->set_rate(0); - } + $compssUsersChoice{qq(LOCALES"$_")} = 1 foreach @langs; pkgs::setSelectedFromCompssList($o->{packages}, \%compssUsersChoice, 4, 0); @@ -109,16 +90,13 @@ sub config_X_proprietary_drivers { my ($full_name) = run_program::rooted_get_stdout($::prefix, 'rpm', '-ql', $_) =~ m!/usr/lib/(\Q$lib\E\..*)! or die ''; symlinkf($full_name, "$::prefix/usr/lib/$lib.$name_to_Driver{$_}"); } - - #- nvidia's libglx.so is hardwired to the tls version, change this - system("cd $::prefix/usr/X11R6/lib/modules/extensions ; ln -sf libglx.so.* libglx.so"); - #- remove the dirty hack done by NVIDIA_kernel-xxx proprietary package #- we do it by hand when needed substInFile { $_ = '' if /^nvidia$/ } "$::prefix/etc/modules"; } -$::prefix = `make get_dest_livetree`; +my $cwd = chomp_(`pwd`); +$::prefix = $ARGV[0] || '/tmp/live_tree'; print "Making live in $::prefix directory.\n"; eval { fs::umount("$::prefix/proc") }; @@ -134,8 +112,7 @@ run_program::rooted($::prefix, 'fc-cache'); #- generate cache in all directorie #- system -# de-complexify, use the default on any arch -eval { rm_rf("$::prefix$_") } foreach '/lib/i686', '/lib/tls', '/usr/lib/tls', '/usr/X11R6/lib/tls', '/usr/X11R6/lib/modules/extensions/tls'; +eval { rm_rf("$::prefix/lib/i686") }; # de-complexify, use the default on any arch eval { config_X_proprietary_drivers() }; @@ -183,6 +160,8 @@ unlink "$::prefix/usr/X11R6/bin/drakfw"; #- KDE +symlinkf('/etc/X11/ksycoca', "$::prefix/usr/share/services/ksycoca"); + unlink "$::prefix/usr/share/autostart/$_.desktop" foreach 'klipper', 'korgac', 'kalarmd.autostart'; update_gnomekderc("$::prefix/usr/share/config/kdesktoprc", ScreenSaver => (Lock => 'true')); @@ -207,24 +186,19 @@ substInFile { s!/es/Starter.html/!/en/Starter.html/!; } "$::prefix/usr/share/mdk/mandrakegalaxy/mdkgalaxy-es.html"; -{ - local $ENV{LC_ALL} = 'en_US'; #- update-menus doesn't work when there is no locale (aka locale "C") - local $ENV{HOME} = '/'; #- savekdemimetypes.pl needs this otherwise it's tmp file fails - run_program::rooted($::prefix, 'update-menus', '-n'); -} +$ENV{LC_ALL} = 'en_US'; #- update-menus doesn't work when there is no locale (aka locale "C") +run_program::rooted($::prefix, 'update-menus', '-n'); run_program::rooted($::prefix, 'nspluginscan'); #- must be run before kbuildsycoca for the ksycoca to be flash plugin aware $ENV{HELP_BROWSER} = "kfmclient openProfile webbrowsing"; $ENV{BROWSER} = "kfmclient openProfile webbrowsing"; $ENV{DESKTOP} = "kde"; -foreach my $lang (lang::list_langs()) { - local $ENV{LC_ALL} = lang::getLANGUAGE($lang); - unlink "$::prefix/usr/share/services/ksycoca"; - run_program::rooted($::prefix, 'kbuildsycoca', '--global'); - rename("$::prefix/usr/share/services/ksycoca", "$::prefix/usr/share/services/ksycoca-$lang"); +foreach (@ALLOWED_LANGS) { + $ENV{LC_ALL} = $_; + run_program::rooted($::prefix, 'kbuildsycoca'); + cp_af("$::prefix/tmp/kde-root/ksycoca", "$::prefix/usr/share/services/ksycoca-$_"); } -symlinkf('/etc/X11/ksycoca', "$::prefix/usr/share/services/ksycoca"); #- Mandrake diff --git a/move/make_live_tree_boot b/move/make_live_tree_boot index 56f52f52a..1af8d537e 100755 --- a/move/make_live_tree_boot +++ b/move/make_live_tree_boot @@ -3,11 +3,8 @@ use lib qw(../perl-install); use common; use lang; -use Getopt::Long; -GetOptions(u => \$un_build) or die ''; - -my $prefix = $ARGV[0] || `make get_dest_livetree`; +my $prefix = '/tmp/live_tree'; my @ALLOWED_LANGS = split(' ', first(cat_('move.pm') =~ /ALLOWED_LANGS = qw\((.*)\)/)); sub create_light_tree { @@ -17,9 +14,9 @@ sub create_light_tree { -e $light_prefix and die "you can't make_live_tree_boot since one already exists Maybe you should remove it first with 'make_live_tree_boot -u'\n"; - foreach my $f (@$list) { - my $dest = "$light_prefix$f"; - my $orig = "$prefix$f"; + foreach my $orig (@$list) { + my $dest = $orig; + $dest =~ s|^$prefix|$light_prefix|; mkdir_p(dirname($dest)); @@ -40,9 +37,9 @@ sub create_totem_links { my $light_prefix = $prefix . '_' . $live_name; #- creating all the dirs, even when things are in the "always" tree - foreach my $f (@$list) { - my $dest = "$light_prefix$f"; - my $orig = "$prefix$f"; + foreach my $orig (@$list) { + my $dest = $orig; + $dest =~ s|^$prefix|$light_prefix|; mkdir_p(dirname($dest)) if ! (-e $dest || -l $dest); if (-l $orig) { @@ -75,9 +72,9 @@ sub remove_light_tree { -d $light_prefix or return; - foreach my $f (@$list) { - my $dest = "$prefix$f"; - my $orig = "$light_prefix$f"; + foreach my $dest (@$list) { + my $orig = $dest; + $orig =~ s|^$prefix|$light_prefix|; if (-l $orig) { unlink $orig; @@ -139,7 +136,7 @@ foreach my $lang (@ALLOWED_LANGS) { remove_light_tree("always_i18n_$lang", []); } -if (!$un_build) { +if (!@ARGV) { create_light_tree('always', \@always_list); create_light_tree('boot', \@boot_list); create_light_tree('totem', \@totem_list); diff --git a/move/move.pm b/move/move.pm index 2d072deed..fd20c558d 100644 --- a/move/move.pm +++ b/move/move.pm @@ -30,6 +30,7 @@ use log; use lang; use Digest::MD5 qw(md5_hex); +my @ALLOWED_LANGS = qw(en_US fr es it de nl); my $key_disabled; my ($using_existing_user_config, $using_existing_host_config); @@ -64,7 +65,7 @@ sub handle_etcfiles { } -sub handle_virtual_key() { +sub handle_virtual_key { return if $key_disabled; if (my ($device, $file, $options) = cat_('/proc/cmdline') =~ /\bvirtual_key=([^,\s]+),([^,\s]+)(,\S+)?/) { log::l("using device=$device file=$file as a virtual key with options $options"); @@ -104,7 +105,6 @@ sub init { mkdir "/etc/$_" foreach qw(X11); touch '/etc/modules.conf'; - touch '/etc/modprobe.conf'; symlinkf "/proc/mounts", "/etc/mtab"; #- these files need be writable but we need a sensible first contents @@ -139,13 +139,7 @@ sub init { #- create remaining /etc and /var subdirectories if not already copied or symlinked, #- because programs most often won't try to create the missing subdir before trying #- to write a file, leading to obscure unexpected failures - foreach (cat_('/image/move/directories-to-create')) { - my ($mode, $uid, $gid, $name) = split; - next if -d $name; - mkdir($name); - chmod(oct($mode), $name); - chown($uid, $gid, $name); - } + -d $_ or mkdir_p $_ foreach chomp_(cat_('/image/move/directories-to-create')); chmod 01777, '/tmp', '/var/tmp'; #- /var/tmp -> badly needed for printing from OOo @@ -155,7 +149,7 @@ sub init { #- or O_RDWR -> in that case, they should be handled in the #- OVERWRITE section of data/etcfiles) foreach (chomp_(cat_('/image/move/all-etcfiles'))) { - -f $_ or symlinkf_short("/image$_", $_); + -f or symlinkf_short("/image$_", $_); } #- free up stage1 memory @@ -164,7 +158,6 @@ sub init { #- devfsd needed for devices accessed by old names fs::mount("none", "/dev", "devfs", 0); - fs::mount("none", "/dev/pts", "devpts", 0); run_program::run('/sbin/devfsd', '/dev'); -d '/lib/modules/' . c::kernel_version() or warn("ERROR: kernel package " . c::kernel_version() . " not installed\n"), c::_exit(1); @@ -213,6 +206,7 @@ drakx_stuff: #- don't use shadow passwords since pwconv overwrites /etc/shadow hence contents will be lost for usb key delete $o->{authentication}{shadow}; + member($_, @ALLOWED_LANGS) or delete $lang::langs{$_} foreach keys %lang::langs; } sub lomount_clp { @@ -229,7 +223,7 @@ sub lomount_clp { log::l("lomount_clp: lomounting $name"); mkdir_p($dir); - my $dev = devices::find_free_loop(); + my $dev = devices::find_free_chloop(); run_program::run('losetup', '-r', '-e', 'gz', $dev, $clp); run_program::run('mount', '-r', $dev, $dir); } @@ -280,7 +274,7 @@ sub key_umount { eval { fs::umount_part($_) foreach key_parts($o); 1 }; } -sub machine_ident() { +sub machine_ident { #- , c::get_hw_address('eth0'); before detect of network :( md5_hex(join '', (map { (split)[1] } cat_('/proc/bus/pci/devices'))); } @@ -348,7 +342,7 @@ sub key_installfiles { unlink($_), run_program::run('cp', "/image$_", $_) foreach qw(/etc/sudoers); } -sub reboot() { +sub reboot { output('/var/run/rebootctl', "reboot"); #- tell X_move to not respawn run_program::run('killall', 'X'); #- kill it ourselves to be sure that it won't lock console when killed by our init exit 0; @@ -425,8 +419,8 @@ unplug it, remove write protection, and then plug it again.")), close F; unlink '/home/.touched'; - my $_wait = $using_existing_host_config - || $o->wait_message(N("Setting up USB key"), N("Please wait, setting up system configuration files on USB key...")); + my $wait = $using_existing_host_config + || $o->wait_message(N("Setting up USB key"), N("Please wait, setting up system configuration files on USB key...")); key_installfiles('full'); setup_userconf($o); @@ -458,7 +452,7 @@ sub install2::configMove { $::noauto and goto after_autoconf; - my $_wait = $o->wait_message(N("Auto configuration"), N("Please wait, detecting and configuring devices...")); + my $wait = $o->wait_message(N("Auto configuration"), N("Please wait, detecting and configuring devices...")); #- automatic printer, timezone, network configs require install_steps_interactive; @@ -476,7 +470,7 @@ sub install2::configMove { after_autoconf: require timezone; - timezone::write($o->{timezone}); + timezone::write($o->{prefix}, $o->{timezone}); $o->{useSupermount} = 1; fs::set_removable_mntpoints($o->{all_hds}); @@ -485,7 +479,7 @@ after_autoconf: require install_any; install_any::write_fstab($o); - modules::write_conf(); + modules::write_conf(''); require mouse; mouse::write_conf($o, $o->{mouse}, 1); #- write xfree mouse conf detect_devices::install_addons(''); @@ -642,7 +636,7 @@ sub install2::startMove { if (cat_('/proc/mounts') =~ m|\s/home\s|) { output '/var/lib/machine_ident', machine_ident(); run_program::run('/usr/bin/etc-monitorer.pl', uniq map { dirname($_) } (chomp_(`find /etc -type f`), - grep { readlink($_) !~ m|^/| } chomp_(`find /etc -type l`))); + grep { readlink !~ m|^/| } chomp_(`find /etc -type l`))); run_program::raw({ detach => 1 }, '/usr/bin/dnotify', '-MCRD', '/etc', '-r', '-e', '/usr/bin/etc-monitorer.pl', '{}') or die "dnotify not found!"; } @@ -656,8 +650,8 @@ sub install2::startMove { sleep 1; log::l("DrakX waves bye-bye"); - open STDOUT, ">>/tmp/.kde-errors"; #- don't display startkde shit on first console - open STDERR, ">>/tmp/.kde-errors"; + open STDOUT, ">/dev/tty10"; #- don't display startkde shit on first console + open STDERR, ">/dev/tty10"; my (undef, undef, $uid, $gid, undef, undef, undef, $home, $shell) = getpwnam($username); $( = $) = "$gid $gid"; @@ -668,7 +662,7 @@ sub install2::startMove { $ENV{XDM_MANAGED} = '/var/run/rebootctl,maysd,mayfn,sched'; #- for reboot/halt availability of "logout" by kde $ENV{GDMSESSION} = 1; #- disable ~/.xsession-errors in Xsession (waste of usb key writes) $ENV{LD_LIBRARY_PATH} = "$home/lib"; - chdir $home; + chdir; exec 'startkde_move'; } else { exec 'xwait', '-permanent' or c::_exit(0); @@ -692,13 +686,11 @@ sub automatic_xconf { require class_discard; Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {}, { allowNVIDIA_rpms => sub { [] }, allowATI_rpms => sub { [] }, allowFB => $o->{allowFB} }); + + my $card = Xconfig::card::from_raw_X($o->{raw_X}); } - modules::load_category('various/agpgart'); - - my $file = '/etc/X11/XF86Config'; - $file = "$file-4" if -e "$file-4"; - my ($Driver) = cat_($file) =~ /Section "Device".*Driver\s*"(.*?)"/s; + my ($Driver) = cat_('/etc/X11/XF86Config-4') =~ /Section "Device".*Driver\s*"(.*?)"/s; if ($Driver eq 'nvidia') { modules::load('nvidia'); lomount_clp('nvidia', '/usr/lib/libGLcore.so.1'); diff --git a/move/runstage2 b/move/runstage2 index 9afe3d9f4..373ebace4 100755 --- a/move/runstage2 +++ b/move/runstage2 @@ -16,7 +16,7 @@ #- along with this program; if not, write to the Free Software #- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -use lib qw(../perl-install /usr/lib/stage2 /usr/lib/libDrakX); +use lib qw(../perl-install /usr/bin/stage2 /usr/lib/libDrakX); use install2; $::isStandalone = 0; diff --git a/move/tools/kernel-nfsd.patch b/move/tools/kernel-nfsd.patch index a169edb14..8f56eb697 100644 --- a/move/tools/kernel-nfsd.patch +++ b/move/tools/kernel-nfsd.patch @@ -1,6 +1,6 @@ ---- linux-2.6.3/fs/nfsd/vfs.c.pix 2004-02-18 04:57:29.000000000 +0100 -+++ linux-2.6.3/fs/nfsd/vfs.c 2004-04-05 15:56:35.423508058 +0200 -@@ -444,6 +444,41 @@ +--- linux-2.4.22/fs/nfsd/vfs.c.pix 2003-10-17 16:27:36.000000000 +0200 ++++ linux-2.4.22/fs/nfsd/vfs.c 2003-10-24 17:36:58.000000000 +0200 +@@ -418,6 +418,41 @@ @@ -42,16 +42,16 @@ /* * Open an existing file or directory. * The access argument indicates the type of open (read/write/lock) -@@ -502,6 +537,8 @@ - } else if (access & MAY_WRITE) - put_write_access(inode); - +@@ -489,6 +524,8 @@ + atomic_dec(&filp->f_count); + } + } + if (err == 0) printk_debug_file_access(rqstp, dentry); + out_nfserr: if (err) err = nfserrno(err); -@@ -1156,6 +1193,7 @@ +@@ -1101,6 +1138,7 @@ goto out_nfserr; *lenp = err; err = 0; diff --git a/move/tools/nfs-accesses b/move/tools/nfs-accesses index f27de0d37..fed4aa181 100755 --- a/move/tools/nfs-accesses +++ b/move/tools/nfs-accesses @@ -13,7 +13,6 @@ GetOptions('no-link' => \ (my $no_link), 'log-file=s' => \$log_file, 'first-file=s' => \ (my $first_file), 'from-time=s', => \ (my $from_time), - 'already-have=s', \ (my $already_have), ); my @skipped_dirs = ( @@ -31,10 +30,6 @@ if ($full_dirs) { my @l = chomp_(map { MDK::Common::File::cat_or_die($_) } split(' ', $full_dirs)); $full_dirs = '/tmp/live_tree(' . join('|', map { quotemeta } @l) . ')/'; } -if ($already_have) { - my @l = map { chomp_(MDK::Common::File::cat_or_die($_)) } split(' ', $already_have); - $already_have = '(' . join('|', map { quotemeta } @l) . ')'; -} open(my $F, "tac $log_file |"); @@ -53,8 +48,6 @@ while (<$F>) { last if $file =~ m!/tmp/live_tree/move/(devices|symlinks)!; last if $from_time && $time le $from_time; - $already_have && $file =~ /^$already_have$/ and next; - if ($file !~ /^$skipped_dirs/) { if (-l $file ? !$no_link : -d $file ? !$no_dir : 1) { my $s = $full_dirs && $file =~ /^$full_dirs/ ? "/tmp/live_tree$1" : $file; diff --git a/move/tree/alsa_default.pl b/move/tree/alsa_default.pl index d95400f67..0ad89c264 100755 --- a/move/tree/alsa_default.pl +++ b/move/tree/alsa_default.pl @@ -1,19 +1,19 @@ -#!/usr/bin/perl -pi +#!/usr/bin/perl # state machine: if (/\s*control\./) { ($min, $max) = (0, 0); } elsif (/\s*name '/) { - # skip masks and blacklist sb live and the like: - $ignore = /\s*name '.*(3D Control|AC97 Playback Volume|Audigy Analog\/Digital Output Jack|External Amplifier Power Down|Exchange DAC|IEC958 input monitor|IEC958 Capture Monitor|IEC958 Playback Switch|mask|Output Jack|Surround down mix)/i; + # skip masks + $ignore = /\s*name '.*(3D Control|mask|Exchange DAC|Output Jack)/; } elsif (!$ignore) { if (/s*comment.range '(\d+) - (\d+)'/) { ($min, $max) = ($1, $2); } elsif (/s*value/) { - # enable switches: + # enable switches (we should really blacklist sb live and the like): s/(value\w*\S*)\s* false/\1 true/; - # set volume to 80%: - my $val = int($max*0.8); + # set volume to 67%: + my $val = int($max*0.6); s/(value\w*\S*)\s* 0/\1 $val/ } } diff --git a/move/tree/mdk_move_loop b/move/tree/mdk_move_loop index b98c4a417..76aca6dbe 100755 --- a/move/tree/mdk_move_loop +++ b/move/tree/mdk_move_loop @@ -8,8 +8,8 @@ sub name2file { sub get_file2loop { my %file2loop; foreach (0 .. 9) { - my ($file) = `sudo losetup /dev/loop$_ 2>/dev/null` =~ m!\([^)]*/([^)]*)\)! or last; - $file2loop{$file} = "loop$_"; + my ($file) = `sudo losetup /dev/chloop$_ 2>/dev/null` =~ m!\([^)]*/([^)]*)\)! or last; + $file2loop{$file} = "chloop$_"; } %file2loop; } diff --git a/move/tree/sound.initscript b/move/tree/sound.initscript index 8fbd5d317..756f22398 100755 --- a/move/tree/sound.initscript +++ b/move/tree/sound.initscript @@ -21,8 +21,8 @@ function start_mixer () { if [ -d /proc/asound ] && [ -x /usr/sbin/alsactl ];then MIXER_SETTINGS=/root/tmp/asound.state_tmp alsactl -f $MIXER_SETTINGS store - # set some sane default volume and unmute needed channels: - /etc/rc.d/rc.alsa_default $MIXER_SETTINGS + # set sensible defaults: + perl -pi /usr/bin/alsa_default.pl $MIXER_SETTINGS action "Setting mixer settings" alsactl -f $MIXER_SETTINGS restore rm -f $MIXER_SETTINGS return 0 diff --git a/move/tree/wait4x b/move/tree/wait4x index a3158f1bd..40655e94c 100755 --- a/move/tree/wait4x +++ b/move/tree/wait4x @@ -2,7 +2,7 @@ use MDK::Common; use lib qw(/usr/lib/libDrakX); -use xf86misc::main; +use c; my $nb = 0; $| = 1; @@ -11,7 +11,7 @@ foreach (1..30) { print "."; sleep 1; print("no X server :(\n"), exit 1 if !fuzzy_pidofs(qr/\bX_move\b/); - $nb++ if xf86misc::main::Xtest(':0'); + $nb++ if c::Xtest(':0'); if ($nb > 2) { #- one succeeded test is not enough :-( print "found\n"; exit 0; diff --git a/perl-install/Xconfig/FILES b/perl-install/Xconfig/FILES index f6352dedf..deefdedec 100644 --- a/perl-install/Xconfig/FILES +++ b/perl-install/Xconfig/FILES @@ -1,6 +1,8 @@ - -parse --- xfree ---- default ------------------ main - \--- card -------------------/ test - \-- monitor ---------------/ various - \- screen ---------------/ proprietary - \ resolution_and_depth-/ + + xfree3 + / \ +parse - -- xfreeX -- xfree ---- default ------------------ main + \ / \--- card -------------------/ test + xfree4 \-- monitor ---------------/ various + \- screen ---------------/ proprietary + \ resolution_and_depth-/ diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 7c858589b..f7ed0fe8c 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -9,6 +9,9 @@ use common; use log; +my $force_xf4 = 1; + + my %VideoRams = ( 256 => N_("256 kB"), 512 => N_("512 kB"), @@ -21,22 +24,74 @@ my %VideoRams = ( 65536 => N_("64 MB or more"), ); +our %serversdriver = arch() =~ /^sparc/ ? ( + 'Mach64' => "accel", + '3DLabs' => "accel", + 'Sun' => "fbdev", + 'Sun24' => "fbdev", + 'SunMono' => "fbdev", + 'VGA16' => "vga16", + 'FBDev' => "fbdev", +) : ( + 'SVGA' => "svga", + 'S3' => "accel", + 'Mach32' => "accel", + 'Mach8' => "accel", + '8514' => "accel", + 'P9000' => "accel", + 'AGX' => "accel", + 'W32' => "accel", + 'Mach64' => "accel", + 'I128' => "accel", + 'S3V' => "accel", + '3DLabs' => "accel", + 'VGA16' => "vga16", + 'FBDev' => "fbdev", +); +my @allbutfbservers = grep { arch() =~ /^sparc/ || $serversdriver{$_} ne "fbdev" } keys(%serversdriver); +my @allservers = keys(%serversdriver); + my @xfree4_Drivers = ((arch() =~ /^sparc/ ? qw(sunbw2 suncg14 suncg3 suncg6 sunffb sunleo suntcx) : qw(apm ark chips cirrus cyrix glide i128 i740 i810 imstt mga neomagic newport nv rendition r128 radeon vesa s3 s3virge savage siliconmotion sis tdfx tga trident tseng vmware)), qw(ati glint vga fbdev)); + +#- using XF4 if {Driver} && !{prefer_xf3} otherwise using XF3 +#- error if $force_xf4 && !{Driver} || !{Driver} && !{server} +#- internal error if $force_xf4 && {prefer_xf3} || {prefer_xf3} && !{server} + +sub using_xf4 { + my ($card) = @_; + $card->{Driver} && !$card->{prefer_xf3}; +} + +sub server_binary { + my ($card) = @_; + "/usr/X11R6/bin/" . + (using_xf4($card) ? 'XFree86' : + $card->{server} =~ /Sun(.*)/ ? "Xsun$1" : + $card->{server} eq 'Xpmac' ? 'Xpmac' : + "XF86_$card->{server}"); +} + sub from_raw_X { my ($raw_X) = @_; my $device = $raw_X->get_device or die "no card configured"; + my ($xfree3_server) = readlink("$::prefix/etc/X11/X") =~ /XF86_(.*)/; + my $card = { - use_DRI_GLX => eval { any { /dri/ } $raw_X->get_modules }, + use_UTAH_GLX => eval { any { /glx/ } $raw_X->{xfree3}->get_modules }, + use_DRI_GLX => eval { any { /dri/ } $raw_X->{xfree4}->get_modules }, + server => $xfree3_server, + prefer_xf3 => $xfree3_server && !$force_xf4, %$device, }; add_to_card__using_Cards($card, $card->{BoardName}); + $card->{prog} = server_binary($card); $card; } @@ -51,21 +106,23 @@ sub to_raw_X { $raw_X->set_devices($card, @{$card->{cards} || []}); - $raw_X->get_ServerLayout->{Xinerama} = { commented => !$card->{Xinerama}, Option => 1 } + $raw_X->{xfree4}->get_ServerLayout->{Xinerama} = { commented => !$card->{Xinerama}, Option => 1 } if defined $card->{Xinerama}; - $raw_X->set_load_module('glx', !$card->{DRI_GLX_SPECIAL}); #- glx for everyone, except proprietary nvidia - $raw_X->set_load_module('dri', $card->{use_DRI_GLX} && !$card->{DRI_GLX_SPECIAL}); + $raw_X->{xfree3}->set_load_module('glx-3.so', $card->{use_UTAH_GLX}); #- glx.so may clash with server version 4. + + $raw_X->{xfree4}->set_load_module('glx', !$card->{DRI_GLX_SPECIAL}); #- glx for everyone, except proprietary nvidia + $raw_X->{xfree4}->set_load_module('dri', $card->{use_DRI_GLX} && !$card->{DRI_GLX_SPECIAL}); # This loads the NVIDIA GLX extension module. # IT IS IMPORTANT TO KEEP NAME AS FULL PATH TO libglx.so ELSE # IT WILL LOAD XFree86 glx module and the server will crash. - $raw_X->set_load_module('/usr/X11R6/lib/modules/extensions/libglx.so', $card->{DRI_GLX_SPECIAL}); + $raw_X->{xfree4}->set_load_module('/usr/X11R6/lib/modules/extensions/libglx.so', $card->{DRI_GLX_SPECIAL}); - $raw_X->remove_Section('DRI'); - $raw_X->add_Section('DRI', { Mode => { val => '0666' } }) if $card->{use_DRI_GLX}; + $raw_X->{xfree4}->remove_Section('DRI'); + $raw_X->{xfree4}->add_Section('DRI', { Mode => { val => '0666' } }) if $card->{use_DRI_GLX}; - $raw_X->remove_load_module('v4l') if $card->{use_DRI_GLX} && $card->{Driver} eq 'r128'; + $raw_X->{xfree4}->remove_load_module('v4l') if $card->{use_DRI_GLX} && $card->{Driver} eq 'r128'; } sub default_ATI_fglrx_config() { our $default_ATI_fglrx_config } @@ -83,11 +140,12 @@ sub probe() { BusID => "PCI:$_->{pci_bus}:$_->{pci_device}:$_->{pci_function}", }; if ($_->{driver} =~ /Card:(.*)/) { $card->{BoardName} = $1; add_to_card__using_Cards($card, $1) } + elsif ($_->{driver} =~ /Server:(.*)/) { $card->{server} = $1 } elsif ($_->{driver} =~ /Driver:(.*)/) { $card->{Driver} = $1 } else { internal_error() } $_->{VideoRam} = 4096 if $_->{Driver} eq 'i810'; - $_->{Options}{UseFBDev} = undef if arch() =~ /ppc/ && $_->{Driver} eq 'r128'; + $_->{Options_xfree4}{UseFBDev} = undef if arch() =~ /ppc/ && $_->{Driver} eq 'r128'; $card; } @c; @@ -141,9 +199,11 @@ sub card_config__not_listed { ); my $cards = readCardsDB("$ENV{SHARE_PATH}/ldetect-lst/Cards+"); + my @xf3 = $options->{allowFB} ? @allservers : @allbutfbservers; my @xf4 = grep { $options->{allowFB} || $_ ne 'fbdev' } @xfree4_Drivers; my @list = ( (map { 'Vendor|' . $_ } keys %$cards), + if_(!$force_xf4, map { 'XFree 3|' . $_ } @xf3), (map { 'XFree 4|' . $_ } @xf4), ); @@ -165,6 +225,8 @@ sub card_config__not_listed { %$card = (); if ($kind eq 'Vendor') { add_to_card__using_Cards($card, $s); + } elsif ($kind eq 'XFree 3') { + $card->{server} = $s; } else { $card->{Driver} = $s; } @@ -178,9 +240,7 @@ sub multi_head_choose { my @choices = multi_head_choices('', @cards); my $tc = $choices[0]; - if ($auto) { - @choices == 1 or return; - } else { + if (!$auto) { $tc = $in->ask_from_listf(N("Multi-head configuration"), N("Your system supports multiple head configuration. What do you want to do?"), sub { $_[0]{text} }, \@choices) or return; @@ -197,15 +257,15 @@ sub configure_auto_install { if ($card->{card_name}) { #- try to get info from given card_name add_to_card__using_Cards($card, $card->{card_name}); - undef $card->{card_name} if !$card->{Driver}; #- bad card_name as we can't find the driver + undef $card->{card_name} if !$card->{server} && !$card->{Driver}; #- bad card_name as we can't find the server } - return if $card->{Driver}; + return if $card->{server} || $card->{Driver}; } my @cards = probe(); my ($choice) = multi_head_choices($old_X->{Xinerama}, @cards); my $card = $choice ? $choice->{code}() : do { - log::l('no graphic card probed, try providing one using $o->{card}{Driver} or $o->{card}{card_name}. Defaulting...'); + log::l('no graphic card probed, try providing one using $o->{card}{Driver} or $o->{card}{server} or $o->{card}{card_name}. Defaulting...'); { Driver => ($options->{allowFB} ? 'fbdev' : 'vesa') }; }; @@ -214,7 +274,7 @@ sub configure_auto_install { $glx_choice->{code}(); set_glx_restrictions($card); - install_server($card, $options, $do_pkgs); + $card->{prog} = install_server($card, $options, $do_pkgs); if ($card->{needVideoRam} && !$card->{VideoRam}) { $card->{VideoRam} = $options->{VideoRam_probed} || 4096; log::l("argh, I need to know VideoRam! Taking " . ($options->{probed_VideoRam} ? "the probed" : "a default") . " value: VideoRam = $card->{VideoRam}"); @@ -229,7 +289,7 @@ sub configure { my @cards = probe(); @cards or @cards = {}; - if (!$cards[0]{Driver}) { + if (!$cards[0]{server} && !$cards[0]{Driver}) { if ($options->{allowFB}) { $cards[0]{Driver} = 'fbdev'; } elsif ($auto) { @@ -246,11 +306,12 @@ sub configure { xfree_and_glx_choose($in, $card, $auto) or return; - eval { install_server($card, $options, $do_pkgs) }; - if ($@) { + eval { + $card->{prog} = install_server($card, $options, $do_pkgs); + } or do { $in->ask_warn('', N("Can't install XFree package: %s", $@)); goto card_config__not_listed; - } + }; if ($card->{needVideoRam} && !$card->{VideoRam}) { if ($auto) { @@ -273,10 +334,10 @@ sub configure { sub install_server { my ($card, $_options, $do_pkgs) = @_; - my $prog = "$::prefix/usr/X11R6/bin/XFree86"; + my $prog = server_binary($card); my @packages; - push @packages, 'XFree86-server' if ! -x $prog; + push @packages, using_xf4($card) ? 'XFree86-server' : "XFree86-$card->{server}" if ! -x "$::prefix$prog"; #- additional packages to install according available card. #- add XFree86-libs-DRI here if using DRI (future split of XFree86 TODO) @@ -285,6 +346,9 @@ sub install_server { push @packages, 'Glide_V3-DRI' if member($card->{card_name}, 'Voodoo3 (generic)', 'Voodoo Banshee (generic)'); push @packages, 'XFree86-glide-module' if $card->{card_name} =~ /Voodoo/; } + if ($card->{use_UTAH_GLX}) { + push @packages, 'Mesa'; + } my %proprietary_Driver2 = ( nvidia => [ 'NVIDIA_kernel', 'NVIDIA_GLX' ], #- using NVIDIA driver (TNT, TN2 and GeForce cards only). @@ -297,7 +361,7 @@ sub install_server { } $do_pkgs->install(@packages) if @packages; - -x $prog or die "server not available (should be in $prog)"; + -x "$::prefix$prog" or die "server $card->{server} is not available (should be in $::prefix$prog)"; #- make sure everything is correct at this point, packages have really been installed #- and driver and GLX extension is present. @@ -307,7 +371,7 @@ sub install_server { log::l("Using specific NVIDIA driver and GLX extensions"); $card->{Driver} = 'nvidia'; $card->{DRI_GLX_SPECIAL} = 1; - $card->{Options}{IgnoreEDID} = 1; + $card->{Options_xfree4}{IgnoreEDID} = 1; } if ($card->{Driver2} eq 'fglrx' && -e "$::prefix/usr/X11R6/lib/modules/dri/fglrx_dri.so" && @@ -320,6 +384,8 @@ sub install_server { require Xconfig::proprietary; Xconfig::proprietary::install_matrox_hal($::prefix); } + + $prog; } sub xfree_and_glx_choose { @@ -359,6 +425,7 @@ sub multi_head_choices { map_index { { Screen => $::i, %$_ } } ($_) x ($_->{MULTI_HEAD} || 1); } @cards; + delete $_->{server} foreach @cards; #- XFree 3 doesn't handle multi head (?) my $card = shift @cards; #- assume good default. $card->{cards} = \@cards; $card->{Xinerama} = $_[0]; @@ -378,19 +445,53 @@ sub multi_head_choices { #- XFree version available, it would be better to parse available package and get version from it. sub xfree4_version() { '4.3' } +sub xfree3_version() { '3.3.6' } sub xfree_and_glx_choices { my ($card) = @_; - my @choices = if_($card->{Driver}, { text => N("XFree %s", xfree4_version()), code => sub {} }); + my $xf3 = if_($card->{server} && !$force_xf4, + { text => N("XFree %s", xfree3_version()), code => sub { $card->{prefer_xf3} = 1 } }); + my $xf4 = if_($card->{Driver}, + { text => N("XFree %s", xfree4_version()), code => sub { $card->{prefer_xf3} = 0 } }); + + #- no XFree3 with multi-head + my @choices = grep { $_ } ($card->{cards} ? $xf4 : $card->{prefer_xf3} ? ($xf3, $xf4) : ($xf4, $xf3)); #- no GLX with Xinerama return @choices if $card->{Xinerama}; + #- try to figure if 3D acceleration is supported + #- by XFree 3.3 but not XFree 4 then ask user to keep XFree 3.3 ? + if ($card->{UTAH_GLX} && !$force_xf4) { + my $e = { text => N("XFree %s with 3D hardware acceleration", xfree3_version()), + code => sub { $card->{prefer_xf3} = 1; $card->{use_UTAH_GLX} = 1 }, + more_messages => ($card->{Driver} && !$card->{DRI_GLX} ? +N("Your card can have 3D hardware acceleration support but only with XFree %s. +Your card is supported by XFree %s which may have a better support in 2D.", xfree3_version(), xfree4_version()) : +N("Your card can have 3D hardware acceleration support with XFree %s.", xfree3_version())), + }; + $card->{prefer_xf3} ? unshift(@choices, $e) : push(@choices, $e); + } + + #- an expert user may want to try to use an EXPERIMENTAL 3D acceleration, currenlty + #- this is with Utah GLX and so, it can provide a way of testing. + if ($card->{UTAH_GLX_EXPERIMENTAL} && $::expert && !$force_xf4) { + push @choices, { text => N("XFree %s with EXPERIMENTAL 3D hardware acceleration", xfree3_version()), + code => sub { $card->{prefer_xf3} = 1; $card->{use_UTAH_GLX} = 1 }, + more_messages => (using_xf4($card) && !$card->{DRI_GLX} ? +N("Your card can have 3D hardware acceleration support but only with XFree %s, +NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER. +Your card is supported by XFree %s which may have a better support in 2D.", xfree3_version(), xfree4_version()) : +N("Your card can have 3D hardware acceleration support with XFree %s, +NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", xfree3_version())), + }; + } + #- ask the expert or any user on second pass user to enable or not hardware acceleration support. if ($card->{DRI_GLX}) { unshift @choices, { text => N("XFree %s with 3D hardware acceleration", xfree4_version()), - code => sub { $card->{use_DRI_GLX} = 1 }, + code => sub { $card->{prefer_xf3} = 0; $card->{use_DRI_GLX} = 1 }, more_messages => N("Your card can have 3D hardware acceleration support with XFree %s.", xfree4_version()), }; } @@ -398,17 +499,36 @@ sub xfree_and_glx_choices { #- an expert user may want to try to use an EXPERIMENTAL 3D acceleration. if ($card->{DRI_GLX_EXPERIMENTAL} && $::expert) { push @choices, { text => N("XFree %s with EXPERIMENTAL 3D hardware acceleration", xfree4_version()), - code => sub { $card->{use_DRI_GLX} = 1 }, + code => sub { $card->{prefer_xf3} = 0; $card->{use_DRI_GLX} = 1 }, more_messages => N("Your card can have 3D hardware acceleration support with XFree %s, NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", xfree4_version()), }; } + + if (arch() =~ /ppc/ && $ENV{DISPLAY}) { + push @choices, { text => N("Xpmac (installation display driver)"), code => sub { + #- HACK: re-allowing XFree 3 + $force_xf4 = 0; + $card->{server} = "Xpmac"; + $card->{prefer_xf3} = 1; + } }; + } @choices; } sub set_glx_restrictions { my ($card) = @_; + #- hack for ATI Mach64 cards where two options should be used if using Utah-GLX. + if (member($card->{card_name}, 'ATI Mach64 Utah', 'ATI Rage Mobility')) { + $card->{Options_xfree3}{no_font_cache} = undef if $card->{use_UTAH_GLX}; + $card->{Options_xfree3}{no_pixmap_cache} = undef if $card->{use_UTAH_GLX}; + } + #- hack for SiS cards where an option should be used if using Utah-GLX. + if (member($card->{card_name}, 'SiS 6326', 'SiS 630')) { + $card->{Options_xfree3}{no_pixmap_cache} = undef if $card->{use_UTAH_GLX}; + } + #- 3D acceleration configuration for XFree 4 using DRI, this is enabled by default #- but for some there is a need to specify VideoRam (else it won't run). if ($card->{use_DRI_GLX}) { @@ -419,7 +539,7 @@ sub set_glx_restrictions { #- hack for ATI Rage 128 card using a bttv or peripheral with PCI bus mastering exchange #- AND using DRI at the same time. if (member($card->{card_name}, 'ATI Rage 128', 'ATI Rage 128 TVout', 'ATI Rage 128 Mobility')) { - $card->{Options}{UseCCEFor2D} = bool2text(modules::probe_category('multimedia/tv')); + $card->{Options_xfree4}{UseCCEFor2D} = bool2text(modules::probe_category('multimedia/tv')); } } @@ -437,15 +557,21 @@ sub add_to_card__using_Cards { add2hash($card, $cards->{$name}); $card->{BoardName} = $card->{card_name}; + delete @$card{'server'} if $force_xf4; + + delete @$card{'UTAH_GLX', 'UTAH_GLX_EXPERIMENTAL'} + if $force_xf4 || availableRamMB() > 800; #- no Utah GLX if more than 800 Mb (server, or kernel-enterprise, Utha GLX does not work with latest). + $card; } #- needed for bad cards not restoring cleanly framebuffer, according to which version of XFree are used. sub check_bad_card { my ($card) = @_; - my $bad_card = $card->{BAD_FB_RESTORE}; + my $bad_card = using_xf4($card) ? $card->{BAD_FB_RESTORE} : $card->{BAD_FB_RESTORE_XF3}; $bad_card ||= $card->{Driver} eq 'i810' || $card->{Driver} eq 'fbdev'; $bad_card ||= member($card->{Driver}, 'nvidia', 'vmware') if !$::isStandalone; #- avoid testing during install at any price. + $bad_card ||= $card->{server} =~ /FBDev|Sun/ if !using_xf4($card); log::l("the graphics card does not like X in framebuffer") if $bad_card; @@ -470,13 +596,17 @@ sub readCardsDB { }, LINE => sub { $val =~ s/^\s*//; $card->{raw_LINES} .= "$val\n" }, CHIPSET => sub { $card->{Chipset} = $val }, + SERVER => sub { $card->{server} = $val }, DRIVER => sub { $card->{Driver} = $val }, DRIVER2 => sub { $card->{Driver2} = $val }, NEEDVIDEORAM => sub { $card->{needVideoRam} = 1 }, DRI_GLX => sub { $card->{DRI_GLX} = 1 if $card->{Driver} }, + UTAH_GLX => sub { $card->{UTAH_GLX} = 1 if $card->{server} }, DRI_GLX_EXPERIMENTAL => sub { $card->{DRI_GLX_EXPERIMENTAL} = 1 if $card->{Driver} }, + UTAH_GLX_EXPERIMENTAL => sub { $card->{UTAH_GLX_EXPERIMENTAL} = 1 if $card->{server} }, MULTI_HEAD => sub { $card->{MULTI_HEAD} = $val if $card->{Driver} }, BAD_FB_RESTORE => sub { $card->{BAD_FB_RESTORE} = 1 }, + BAD_FB_RESTORE_XF3 => sub { $card->{BAD_FB_RESTORE_XF3} = 1 }, FB_TVOUT => sub { $card->{FB_TVOUT} = 1 }, UNSUPPORTED => sub { delete $card->{Driver} }, diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm index 9d317fc3a..e1cd2e1b8 100644 --- a/perl-install/Xconfig/default.pm +++ b/perl-install/Xconfig/default.pm @@ -22,7 +22,7 @@ sub configure { my $raw_X = Xconfig::xfree->empty_config; - $raw_X->add_load_module($_) foreach qw(dbe v4l extmod type1 freetype); + $raw_X->{xfree4}->add_load_module($_) foreach qw(dbe v4l extmod type1 freetype); config_keyboard($raw_X, $keyboard); config_mouse($raw_X, $mouse); diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm index cab241fae..1e11b2b49 100644 --- a/perl-install/Xconfig/main.pm +++ b/perl-install/Xconfig/main.pm @@ -17,7 +17,7 @@ sub configure_monitor { my ($in, $raw_X) = @_; my $before = $raw_X->prepare_write; - Xconfig::monitor::configure($in, $raw_X, int($raw_X->get_devices)) or return; + Xconfig::monitor::configure($in, $raw_X) or return; if ($raw_X->prepare_write ne $before) { $raw_X->write; 'config_changed'; @@ -30,9 +30,9 @@ sub configure_resolution { my ($in, $raw_X) = @_; my $card = Xconfig::card::from_raw_X($raw_X); - my $monitors = [ $raw_X->get_monitors ]; + my $monitor = Xconfig::monitor::from_raw_X($raw_X); my $before = $raw_X->prepare_write; - Xconfig::resolution_and_depth::configure($in, $raw_X, $card, $monitors) or return; + Xconfig::resolution_and_depth::configure($in, $raw_X, $card, $monitor) or return; if ($raw_X->prepare_write ne $before) { $raw_X->write; 'config_changed'; @@ -45,11 +45,11 @@ sub configure_resolution { sub configure_everything_auto_install { my ($raw_X, $do_pkgs, $old_X, $options) = @_; my $X = {}; - $X->{monitors} = Xconfig::monitor::configure_auto_install($raw_X, $old_X) or return; - $options->{VideoRam_probed} = $X->{monitors}[0]{VideoRam_probed}; + $X->{monitor} = Xconfig::monitor::configure_auto_install($raw_X, $old_X) or return; + $options->{VideoRam_probed} = $X->{monitor}{VideoRam_probed}; $X->{card} = Xconfig::card::configure_auto_install($raw_X, $do_pkgs, $old_X, $options) or return; - Xconfig::screen::configure($raw_X) or return; - $X->{resolution} = Xconfig::resolution_and_depth::configure_auto_install($raw_X, $X->{card}, $X->{monitors}, $old_X); + Xconfig::screen::configure($raw_X, $X->{card}) or return; + $X->{resolution} = Xconfig::resolution_and_depth::configure_auto_install($raw_X, $X->{card}, $X->{monitor}, $old_X); &write($raw_X, $X); @@ -61,13 +61,11 @@ sub configure_everything { my ($in, $raw_X, $do_pkgs, $auto, $options) = @_; my $X = {}; my $ok = 1; - - my $ddc_info = Xconfig::monitor::getinfoFromDDC(); - $options->{VideoRam_probed} = $ddc_info->{VideoRam_probed}; + $ok &&= $X->{monitor} = Xconfig::monitor::configure($in, $raw_X, $auto); + $options->{VideoRam_probed} = $X->{monitor}{VideoRam_probed}; $ok &&= $X->{card} = Xconfig::card::configure($in, $raw_X, $do_pkgs, $auto, $options); - $ok &&= $X->{monitors} = Xconfig::monitor::configure($in, $raw_X, int($raw_X->get_devices), $ddc_info, $auto); - $ok &&= Xconfig::screen::configure($raw_X); - $ok &&= $X->{resolution} = Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitors}, $auto); + $ok &&= Xconfig::screen::configure($raw_X, $X->{card}); + $ok &&= $X->{resolution} = Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitor}, $auto); $ok &&= Xconfig::test::test($in, $raw_X, $X->{card}, '', 'skip_badcard') if !$auto; if (!$ok) { @@ -88,7 +86,7 @@ sub configure_chooser_raw { my $update_texts = sub { $texts{card} = $X->{card} && $X->{card}{BoardName} || N("Custom"); - $texts{monitors} = $X->{monitors} && $X->{monitors}[0]{ModelName} || N("Custom"); + $texts{monitor} = $X->{monitor} && $X->{monitor}{ModelName} || N("Custom"); $texts{resolution} = Xconfig::resolution_and_depth::to_string($X->{resolution}); $texts{$_} =~ s/(.{20}).*/$1.../ foreach keys %texts; #- ensure not too long @@ -103,8 +101,8 @@ sub configure_chooser_raw { $b_modified = 1; $update_texts->(); - if (member($field, 'card', 'monitors')) { - Xconfig::screen::configure($raw_X); + if (member($field, 'card', 'monitor')) { + Xconfig::screen::configure($raw_X, $X->{card}); $raw_X->set_resolution($X->{resolution}) if $X->{resolution}; } } @@ -117,15 +115,15 @@ sub configure_chooser_raw { { label => N("Graphic Card"), val => \$texts{card}, clicked => sub { $may_set->('card', Xconfig::card::configure($in, $raw_X, $do_pkgs, 0, $options)); } }, - { label => N("Monitor"), val => \$texts{monitors}, clicked => sub { - $may_set->('monitors', Xconfig::monitor::configure($in, $raw_X, int($raw_X->get_devices))); + { label => N("Monitor"), val => \$texts{monitor}, clicked => sub { + $may_set->('monitor', Xconfig::monitor::configure($in, $raw_X)); } }, - { label => N("Resolution"), val => \$texts{resolution}, disabled => sub { !$X->{card} || !$X->{monitors} }, + { label => N("Resolution"), val => \$texts{resolution}, disabled => sub { !$X->{card} || !$X->{monitor} }, clicked => sub { - $may_set->('resolution', Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitors})); + $may_set->('resolution', Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitor})); } }, if_(Xconfig::card::check_bad_card($X->{card}) || $::isStandalone, - { val => N("Test"), disabled => sub { !$X->{card} || !$X->{monitors} }, + { val => N("Test"), disabled => sub { !$X->{card} || !$X->{monitor} }, clicked => sub { $ok = Xconfig::test::test($in, $raw_X, $X->{card}, 'auto', 0); } }, @@ -143,7 +141,7 @@ sub configure_chooser { my $X = { card => scalar eval { Xconfig::card::from_raw_X($raw_X) }, - monitors => [ $raw_X->get_monitors ], + monitor => $raw_X->get_monitors && Xconfig::monitor::from_raw_X($raw_X), resolution => scalar eval { $raw_X->get_resolution }, }; my $before = $raw_X->prepare_write; @@ -160,12 +158,17 @@ sub configure_chooser { sub configure_everything_or_configure_chooser { my ($in, $options, $auto, $o_keyboard, $o_mouse) = @_; my $raw_X = Xconfig::xfree->read; + my $default = Xconfig::default::configure($o_keyboard, $o_mouse); + my $has_conf = @{$raw_X->{xfree3}} || @{$raw_X->{xfree4}}; + $raw_X->{xfree3} = $default->{xfree3} if !@{$raw_X->{xfree3}}; + $raw_X->{xfree4} = $default->{xfree4} if !@{$raw_X->{xfree4}}; - if (is_empty_array_ref($raw_X)) { - $raw_X = Xconfig::default::configure($o_keyboard, $o_mouse); - Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options) or return; + return $raw_X if $has_conf && $auto; + + if ($has_conf) { + Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, $options) or return; } else { - Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, $options) or return if !$auto; + Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options) or return; } $raw_X; } @@ -188,7 +191,7 @@ sub write { export_to_install_X($X); $raw_X->write; Xconfig::various::check_XF86Config_symlink(); - symlinkf "../../usr/X11R6/bin/XFree86", "$::prefix/etc/X11/X"; + symlinkf "../..$X->{card}{prog}", "$::prefix/etc/X11/X" if $X->{card}{server} !~ /Xpmac/; } @@ -200,8 +203,8 @@ sub export_to_install_X { $::o->{X}{resolution_wanted} = $X->{resolution}{X}; $::o->{X}{default_depth} = $X->{resolution}{Depth}; $::o->{X}{bios_vga_mode} = $X->{resolution}{bios}; - $::o->{X}{monitors} = $X->{monitors} if $X->{monitors}[0]{manually_chosen} && $X->{monitors}[0]{vendor} ne "Plug'n Play"; - $::o->{X}{card} = $X->{card} if $X->{card}{manually_chosen}; + $::o->{X}{monitor} = $X->{monitor} if $X->{monitor}{manually_chosen} && $X->{monitor}{vendor} ne "Plug'n Play"; + $::o->{X}{card} = $X->{monitor} if $X->{card}{manually_chosen}; $::o->{X}{Xinerama} = 1 if $X->{card}{Xinerama}; } diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm index 008e0aef8..38fa8b3d9 100644 --- a/perl-install/Xconfig/monitor.pm +++ b/perl-install/Xconfig/monitor.pm @@ -30,63 +30,57 @@ my @HorizSync_ranges = ( "31.5-94.0", ); -sub configure { - my ($in, $raw_X, $nb_monitors, $o_ddc_info, $b_auto) = @_; - my $monitors = [ $raw_X->get_or_new_monitors($nb_monitors) ]; - if ($o_ddc_info) { - put_in_hash($monitors->[0], $o_ddc_info); - } - my $head_nb = 1; - foreach my $monitor (@$monitors) { - choose($in, $monitor, @$monitors > 1 ? $head_nb++ : 0, $b_auto) or return; +sub from_raw_X { + my ($raw_X) = @_; + + my $monitor = $raw_X->get_monitor; + if (!$monitor->{HorizSync}) { + put_in_hash($monitor, getinfoFromDDC()); } - $raw_X->set_monitors(@$monitors); - $monitors; + $monitor; +} + +sub configure { + my ($in, $raw_X, $b_auto) = @_; + + my $monitor = from_raw_X($raw_X); + choose($in, $monitor, $b_auto) or return; + $raw_X->set_monitors($monitor); + $monitor; } sub configure_auto_install { my ($raw_X, $old_X) = @_; - if ($old_X->{monitor}) { - #- keep compatibility - $old_X->{monitor}{VertRefresh} = $old_X->{monitor}{vsyncrange}; - $old_X->{monitor}{HorizSync} = $old_X->{monitor}{hsyncrange}; - - #- new name - $old_X->{monitors} = [ delete $old_X->{monitor} ]; + my $old_monitor = $old_X->{monitor} || {}; + my %rename = (vsyncrange => 'VertRefresh', hsyncrange => 'HorizSync'); + foreach (keys %rename) { + my $v = $old_monitor->{$_} or next; + $old_monitor->{$rename{$_}} = $v; } - my $monitors = [ $raw_X->get_or_new_monitors($old_X->{monitors} ? @{$old_X->{monitors}} : 1) ]; - mapn { - my ($monitor, $auto_install_monitor) = @_; - put_in_hash($monitor, $auto_install_monitor); - } $monitors, $old_X->{monitors} if $old_X->{monitors}; + my $monitor = from_raw_X($raw_X); + put_in_hash($monitor, $old_monitor); - if (!$monitors->[0]{HorizSync}) { - put_in_hash($monitors->[0], getinfoFromDDC()); - } - - my $monitors_db = monitors_db(); - foreach my $monitor (@$monitors) { - configure_automatic($monitor, $monitors_db) or put_in_hash($monitor, { HorizSync => '31.5-35.1', VertRefresh => '50-61' }); - } - $raw_X->set_monitors(@$monitors); - $monitors; + my $monitors = monitors(); + configure_automatic($monitor, $monitors) or put_in_hash($monitor, { HorizSync => '31.5-35.1', VertRefresh => '50-61' }); + $raw_X->set_monitors($monitor); + $monitor; } sub choose { - my ($in, $monitor, $head_nb, $b_auto) = @_; + my ($in, $monitor, $b_auto) = @_; - my $monitors_db = monitors_db(); + my $monitors = monitors(); - my $ok = configure_automatic($monitor, $monitors_db); + my $ok = configure_automatic($monitor, $monitors); if ($b_auto) { log::l("Xconfig::monitor: auto failed") if !$ok; return $ok; } - my %h_monitors = map {; "$_->{VendorName}|$_->{ModelName}" => $_ } @$monitors_db; + my %h_monitors = map {; "$_->{VendorName}|$_->{ModelName}" => $_ } @$monitors; ask_monitor: my $merged_name = do { @@ -104,7 +98,7 @@ sub choose { }; $in->ask_from_({ title => N("Monitor"), - messages => $head_nb ? N("Choose a monitor for head #%d", $head_nb) : N("Choose a monitor"), + messages => N("Choose a monitor"), interactive_help_id => 'configureX_monitor' }, [ { val => \$merged_name, separator => '|', @@ -118,8 +112,8 @@ sub choose { if ($merged_name eq "Plug'n Play") { local $::noauto = 0; #- hey, you asked for plug'n play, so i do probe! delete @$monitor{'VendorName', 'ModelName', 'EISA_ID'}; - put_in_hash($monitor, getinfoFromDDC()) if $head_nb <= 1; - if ($head_nb > 1 || configure_automatic($monitor, $monitors_db)) { + put_in_hash($monitor, getinfoFromDDC()); + if (configure_automatic($monitor, $monitors)) { $monitor->{VendorName} = "Plug'n Play"; } else { $in->ask_warn('', N("Plug'n Play probing failed. Please select the correct monitor")); @@ -145,11 +139,11 @@ that is beyond the capabilities of your monitor: you may damage your monitor. } sub configure_automatic { - my ($monitor, $monitors_db) = @_; + my ($monitor, $monitors) = @_; if ($monitor->{EISA_ID}) { log::l("EISA_ID: $monitor->{EISA_ID}"); - if (my $mon = find { lc($_->{EISA_ID}) eq $monitor->{EISA_ID} } @$monitors_db) { + if (my $mon = find { lc($_->{EISA_ID}) eq $monitor->{EISA_ID} } @$monitors) { add2hash($monitor, $mon); log::l("EISA_ID corresponds to: $monitor->{ModelName}"); } elsif (!$monitor->{HorizSync} || !$monitor->{VertRefresh}) { @@ -157,7 +151,7 @@ sub configure_automatic { delete @$monitor{'VendorName', 'ModelName', 'EISA_ID'}; } } else { - if (my $mon = find { $_->{VendorName} eq $monitor->{VendorName} && $_->{ModelName} eq $monitor->{ModelName} } @$monitors_db) { + if (my $mon = find { $_->{VendorName} eq $monitor->{VendorName} && $_->{ModelName} eq $monitor->{ModelName} } @$monitors) { put_in_hash($monitor, $mon); } } @@ -189,13 +183,13 @@ sub getinfoFromDDC() { }; } -sub monitors_db() { +sub monitors() { readMonitorsDB("$ENV{SHARE_PATH}/ldetect-lst/MonitorsDB"); } sub readMonitorsDB { my ($file) = @_; - my @monitors_db; + my @monitors; my $F = openFileMaybeCompressed($file); local $_; my $lineno = 0; while (<$F>) { @@ -206,9 +200,9 @@ sub readMonitorsDB { my @fields = qw(VendorName ModelName EISA_ID HorizSync VertRefresh dpms); my %l; @l{@fields} = split /\s*;\s*/; - push @monitors_db, \%l; + push @monitors, \%l; } - \@monitors_db; + \@monitors; } diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm index 436228d04..95c892f17 100644 --- a/perl-install/Xconfig/resolution_and_depth.pm +++ b/perl-install/Xconfig/resolution_and_depth.pm @@ -13,6 +13,7 @@ our %depth2text = ( 15 => N_("32 thousand colors (15 bits)"), 16 => N_("65 thousand colors (16 bits)"), 24 => N_("16 million colors (24 bits)"), + 32 => N_("4 billion colors (32 bits)"), ); our @depths_available = ikeys(%depth2text); @@ -83,21 +84,33 @@ sub allowed { my ($prefered_depth, @depths, @resolutions, @resolution_and_depth); - if ($card->{Driver} eq 'fbdev') { + my $using_xf4 = Xconfig::card::using_xf4($card); + + if ($using_xf4 ? $card->{Driver} eq 'fbdev' : $card->{server} eq 'FBDev') { push @resolution_and_depth, grep { $_->{Depth} == 16 } @bios_vga_modes; - } elsif ($card->{Driver} eq 'fglrx') { + } elsif ($using_xf4 && $card->{Driver} eq 'fglrx') { $prefered_depth = 24; push @depths, 24; - } else { + } elsif ($using_xf4) { if ($card->{use_DRI_GLX}) { $prefered_depth = 16; push @depths, 16, 24; } if ($card->{BoardName} eq 'RIVA128') { @depths = qw(8 15 24) } #- X doesn't even start in 16bpp for RIVA128 + } elsif ($card->{use_UTAH_GLX}) { + $prefered_depth = 16; + push @depths, 16; + } else { + if ($card->{server} eq 'Sun24') { push @depths, 24, 8, 2 } + elsif ($card->{server} eq 'Sun') { push @depths, 8, 2 } + elsif ($card->{server} eq 'SunMono') { push @depths, 2 } + elsif ($card->{server} eq 'VGA16') { push @depths, 8; push @resolutions, '640x480' } + elsif ($card->{BoardName} =~ /SiS/) { push @depths, 24, 16, 8 } + elsif ($card->{BoardName} eq 'S3 Trio3D') { push @depths, 24, 16, 8 } } if (!@resolution_and_depth || @depths || @resolutions) { - @depths = our @depths_available if !@depths; - @resolutions = @Xconfig::xfree::resolutions if !@resolutions; + @depths = grep { !($using_xf4 && /32/) } (our @depths_available) if !@depths; + @resolutions = @Xconfig::xfreeX::resolutions if !@resolutions; push @resolution_and_depth, map { @@ -136,16 +149,16 @@ sub choose { sub choices { - my ($_raw_X, $resolution_wanted, $card, $monitors) = @_; + my ($_raw_X, $resolution_wanted, $card, $monitor) = @_; $resolution_wanted ||= {}; my ($prefered_depth, @resolutions) = allowed($card); - @resolutions = filter_using_HorizSync($monitors->[0]{HorizSync}, @resolutions) if $monitors->[0]{HorizSync}; + @resolutions = filter_using_HorizSync($monitor->{HorizSync}, @resolutions) if $monitor->{HorizSync}; @resolutions = filter_using_VideoRam($card->{VideoRam}, @resolutions) if $card->{VideoRam}; my $x_res = do { - my $res = $resolution_wanted->{X} || ($monitors->[0]{ModelName} =~ /^Flat Panel (\d+x\d+)$/ ? $1 : size2default_resolution($monitors->[0]{size} || 14)); + my $res = $resolution_wanted->{X} || ($monitor->{ModelName} =~ /^Flat Panel (\d+x\d+)$/ ? $1 : size2default_resolution($monitor->{size} || 14)); my $x_res = first(split 'x', $res); #- take the first available resolution <= the wanted resolution max map { if_($_->{X} <= $x_res, $_->{X}) } @resolutions; @@ -167,13 +180,13 @@ sub choices { } sub configure { - my ($in, $raw_X, $card, $monitors, $b_auto) = @_; + my ($in, $raw_X, $card, $monitor, $b_auto) = @_; - my ($default_resolution, @resolutions) = choices($raw_X, $raw_X->get_resolution, $card, $monitors); + my ($default_resolution, @resolutions) = choices($raw_X, $raw_X->get_resolution, $card, $monitor); if ($b_auto) { #- use $default_resolution - if ($card->{Driver} eq 'fglrx') { + if (Xconfig::card::using_xf4($card) && $card->{Driver} eq 'fglrx') { $default_resolution = first(find { $default_resolution->{Y} eq $_->{Y} && $_->{Depth} == 24 } $default_resolution, @resolutions); $default_resolution ||= first(find { $_->{Depth} == 24 } $default_resolution, @resolutions); @@ -189,11 +202,11 @@ sub configure { } sub configure_auto_install { - my ($raw_X, $card, $monitors, $old_X) = @_; + my ($raw_X, $card, $monitor, $old_X) = @_; my $resolution_wanted = { X => $old_X->{resolution_wanted}, Depth => $old_X->{default_depth} }; - my ($default_resolution) = choices($raw_X, $resolution_wanted, $card, $monitors); + my ($default_resolution) = choices($raw_X, $resolution_wanted, $card, $monitor); $default_resolution or die "you selected an unusable depth"; $raw_X->set_resolution($default_resolution); diff --git a/perl-install/Xconfig/screen.pm b/perl-install/Xconfig/screen.pm index 89e416a4d..761c5defd 100644 --- a/perl-install/Xconfig/screen.pm +++ b/perl-install/Xconfig/screen.pm @@ -7,7 +7,7 @@ use common; sub configure { - my ($raw_X) = @_; + my ($raw_X, $card) = @_; my @devices = $raw_X->get_devices; my @monitors = $raw_X->get_monitors; @@ -17,12 +17,25 @@ sub configure { @monitors = $raw_X->get_monitors; } - my @sections = mapn { - my ($device, $monitor) = @_; - { Device => $device->{Identifier}, Monitor => $monitor->{Identifier} } - } \@devices, \@monitors; + if ($card->{server}) { + $raw_X->{xfree3}->set_screens({ Device => $devices[0]{Identifier}, Monitor => $monitors[0]{Identifier}, + Driver => $Xconfig::card::serversdriver{$card->{server}} || internal_error("bad XFree3 server $card->{server}"), + }); + } else { + @{$raw_X->{xfree3}} = (); + } + + if ($card->{Driver}) { + my @sections = mapn { + my ($device, $monitor) = @_; + { Device => $device->{Identifier}, Monitor => $monitor->{Identifier} } + } \@devices, \@monitors; + + $raw_X->{xfree4}->set_screens(@sections); + } else { + @{$raw_X->{xfree4}} = (); + } - $raw_X->set_screens(@sections); 1; } diff --git a/perl-install/Xconfig/test.pm b/perl-install/Xconfig/test.pm index e2ac0505a..8a2ecc632 100644 --- a/perl-install/Xconfig/test.pm +++ b/perl-install/Xconfig/test.pm @@ -48,7 +48,7 @@ sub test { fuzzy_pidofs(qr/\bxfs\b/) or die "xfs is not running"; my $f = $::testing ? $tmpconfig : "/etc/X11/XF86Config.test"; - $raw_X->write("$::prefix/$f"); + $raw_X->{Xconfig::card::using_xf4($card) ? 'xfree4' : 'xfree3'}->write("$::prefix/$f"); my $f_err = common::secured_file($::prefix . ($ENV{TMPDIR} || "$ENV{HOME}/tmp") . '/.drakx.Xoutput'); @@ -57,7 +57,9 @@ sub test { system("xauth add :9 . `mcookie`"); open STDERR, ">$f_err"; chroot $::prefix if $::prefix; - exec 'XFree86', '-xf86config', $f, ":9" or c::_exit(0); + exec $card->{prog}, + if_($card->{prog} !~ /Xsun/, "-xf86config", $f), + ":9" or c::_exit(0); } do { sleep 1 } until xtest(":9") || waitpid($pid, c::WNOHANG()); @@ -74,12 +76,26 @@ sub test { local $_; i: while (<$F>) { - if (/^\(EE\)/ && !/Disabling/ || /^Fatal\b/) { - my @msg = !/error/ && $_; - local $_; - while (<$F>) { - /reporting a problem/ and last; - $warn_error->(join(@msg, $_)); + if (Xconfig::card::using_xf4($card)) { + if (/^\(EE\)/ && !/Disabling/ || /^Fatal\b/) { + my @msg = !/error/ && $_; + local $_; + while (<$F>) { + /reporting a problem/ and last; + $warn_error->(join(@msg, $_)); + return 0; + } + } + } else { + if (/\b(error|not supported)\b/i) { + my @msg = !/error/ && $_; + local $_; + while (<$F>) { + /not fatal/ and last i; + /^$/ and last; + push @msg, $_; + } + $warn_error->(join(@msg)); return 0; } } diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm index d3d49ee08..5849a1c17 100644 --- a/perl-install/Xconfig/various.pm +++ b/perl-install/Xconfig/various.pm @@ -18,28 +18,27 @@ sub to_string { sub info { my ($raw_X, $card) = @_; my $info; - my $xf_ver = Xconfig::card::xfree4_version(); - my $title = $card->{use_DRI_GLX} ? N("XFree %s with 3D hardware acceleration", $xf_ver) : - N("XFree %s", $xf_ver); + my $xf_ver = Xconfig::card::using_xf4($card) ? Xconfig::card::xfree4_version() : Xconfig::card::xfree3_version(); + my $title = $card->{use_DRI_GLX} || $card->{use_UTAH_GLX} ? + N("XFree %s with 3D hardware acceleration", $xf_ver) : N("XFree %s", $xf_ver); my $keyboard = eval { $raw_X->get_keyboard } || {}; - my @monitors = eval { $raw_X->get_monitors }; + my $monitor = eval { $raw_X->get_monitor } || {}; my $device = eval { $raw_X->get_device } || {}; my $mouse = eval { first($raw_X->get_mice) } || {}; $info .= N("Keyboard layout: %s\n", $keyboard->{XkbLayout}); $info .= N("Mouse type: %s\n", $mouse->{Protocol}); $info .= N("Mouse device: %s\n", $mouse->{Device}) if $::expert; - foreach my $monitor (@monitors) { - $info .= N("Monitor: %s\n", $monitor->{ModelName}); - $info .= N("Monitor HorizSync: %s\n", $monitor->{HorizSync}) if $::expert; - $info .= N("Monitor VertRefresh: %s\n", $monitor->{VertRefresh}) if $::expert; - } + $info .= N("Monitor: %s\n", $monitor->{ModelName}); + $info .= N("Monitor HorizSync: %s\n", $monitor->{HorizSync}) if $::expert; + $info .= N("Monitor VertRefresh: %s\n", $monitor->{VertRefresh}) if $::expert; $info .= N("Graphics card: %s\n", $device->{VendorName} . ' ' . $device->{BoardName}); $info .= N("Graphics memory: %s kB\n", $device->{VideoRam}) if $device->{VideoRam}; if (my $resolution = eval { $raw_X->get_resolution }) { $info .= N("Color depth: %s\n", translate($Xconfig::resolution_and_depth::depth2text{$resolution->{Depth}})); $info .= N("Resolution: %s\n", join('x', @$resolution{'X', 'Y'})); } + $info .= N("XFree86 server: %s\n", $card->{server}) if $card->{server}; $info .= N("XFree86 driver: %s\n", $device->{Driver}) if $device->{Driver}; "$title\n\n$info"; } @@ -67,7 +66,7 @@ sub choose_xdm { my ($in, $b_auto) = @_; my $xdm = $::isStandalone ? runlevel() == 5 : 1; - if (!$b_auto) { + if (!$b_auto || $::isStandalone) { $xdm = $in->ask_yesorno_({ title => N("Graphical interface at startup"), messages => @@ -82,7 +81,7 @@ Would you like XFree to start when you reboot?"), sub tvout { my ($in, $card, $options) = @_; - $card->{FB_TVOUT} && $options->{allowFB} or return; + $card->{FB_TVOUT} && Xconfig::card::using_xf4($card) && $options->{allowFB} or return; $in->ask_yesorno('', N("Your graphic card seems to have a TV-OUT connector. It can be configured to work using frame-buffer. @@ -105,25 +104,26 @@ sub configure_FB_TVOUT { my ($use_FB_TVOUT) = @_; my $raw_X = Xconfig::default::configure(); - return if is_empty_array_ref($raw_X); + my $xfree4 = $raw_X->{xfree4}; + return if is_empty_array_ref($xfree4); - $raw_X->set_monitors({ HorizSync => '30-50', VertRefresh => ($use_FB_TVOUT->{norm} eq 'NTSC' ? 60 : 50) }); - first($raw_X->get_Sections('Monitor'))->{ModeLine} = [ + $xfree4->set_monitors({ HorizSync => '30-50', VertRefresh => ($use_FB_TVOUT->{norm} eq 'NTSC' ? 60 : 50) }); + first($xfree4->get_monitor_sections)->{ModeLine} = [ { val => '"640x480" 29.50 640 675 678 944 480 530 535 625', pre_comment => "# PAL\n" }, { val => '"800x600" 36.00 800 818 820 960 600 653 655 750' }, { val => '"640x480" 28.195793 640 656 658 784 480 520 525 600', pre_comment => "# NTSC\n" }, { val => '"800x600" 38.769241 800 812 814 880 600 646 649 735' }, ]; - $raw_X->set_devices({ Driver => 'fbdev' }); + $xfree4->set_devices({ Driver => 'fbdev' }); - my ($device) = $raw_X->get_devices; - my ($monitor) = $raw_X->get_monitors; - $raw_X->set_screens({ Device => $device->{Identifier}, Monitor => $monitor->{Identifier} }); + my ($device) = $xfree4->get_devices; + my ($monitor) = $xfree4->get_monitors; + $xfree4->set_screens({ Device => $device->{Identifier}, Monitor => $monitor->{Identifier} }); - my $Screen = $raw_X->get_default_screen; + my $Screen = $xfree4->get_default_screen; $Screen->{Display} = [ map { { l => { Depth => { val => $_ } } } } 8, 16 ]; - $raw_X->write("$::prefix/etc/X11/XF86Config.tvout"); + $xfree4->write("$::prefix/etc/X11/XF86Config-4.tvout"); check_XF86Config_symlink(); diff --git a/perl-install/Xconfig/xfree.pm b/perl-install/Xconfig/xfree.pm index 33600f9c0..df6c0d3e0 100644 --- a/perl-install/Xconfig/xfree.pm +++ b/perl-install/Xconfig/xfree.pm @@ -5,476 +5,111 @@ use strict; use common; use Xconfig::parse; +use Xconfig::xfree3; +use Xconfig::xfree4; +use log; -#- mostly internal only -sub new { - my ($class, $val) = @_; - bless $val, $class; -} -################################################################################ -# I/O ########################################################################## -################################################################################ sub read { - my ($class) = @_; - my $file = "$::prefix/etc/X11/XF86Config"; - $file = "$file-4" if -e "$file-4"; #- prefer XF86Config-4 when there is one. Writing will take care of keeping only the new name - $class->new(Xconfig::parse::read_XF86Config($file)); + my ($class, $o_xfree3_file, $o_xfree4_file) = @_; + bless { xfree3 => eval { Xconfig::xfree3->read($o_xfree3_file) } || [], + xfree4 => eval { Xconfig::xfree4->read($o_xfree4_file) } || [] }, $class; } sub write { - my ($raw_X) = @_; - my $file = "$::prefix/etc/X11/XF86Config"; - rename $file, "$file.old"; - rename "$file-4", "$file-4.old"; #- there won't be any XF86Config-4 anymore, we want this! - Xconfig::parse::write_XF86Config($raw_X, $file); + my ($both, $o_xfree3_file, $o_xfree4_file) = @_; + $both->{xfree3} ? $both->{xfree3}->write($o_xfree3_file) : unlink($o_xfree3_file); + $both->{xfree4} ? $both->{xfree4}->write($o_xfree4_file) : unlink($o_xfree4_file); } sub prepare_write { - my ($raw_X) = @_; - join('', Xconfig::parse::prepare_write_XF86Config($raw_X)); + my ($both) = @_; + ($both->{xfree4} || $both->{xfree3})->prepare_write; } + sub empty_config { my ($class) = @_; - $class->new(Xconfig::parse::read_XF86Config_from_string(our $default_header)); -} - -################################################################################ -# keyboard ##################################################################### -################################################################################ -my @keyboard_fields = qw(XkbLayout XkbModel XkbDisable XkbOptions XkbCompat); -sub get_keyboard { - my ($raw_X) = @_; - my $raw_kbd = $raw_X->get_Section('Keyboard') or die "no keyboard section"; - raw_export_section($raw_kbd, \@keyboard_fields); -} -sub set_keyboard { - my ($raw_X, $kbd) = @_; - my $raw_kbd = $raw_X->get_Section('Keyboard') || _new_keyboard_section($raw_X); - raw_import_section($raw_kbd, $kbd); - _set_Option('keyboard', $raw_kbd, keys %$kbd); -} -sub _new_keyboard_section { - my ($raw_X) = @_; - my $raw_kbd = { Identifier => { val => 'Keyboard1' }, Driver => { val => 'Keyboard' } }; - $raw_X->add_Section('InputDevice', $raw_kbd); - - my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= []; - push @$layout, { val => '"Keyboard1" "CoreKeyboard"' }; - - $raw_kbd; -} - - -################################################################################ -# mouse ######################################################################## -################################################################################ -#- example: { Protocol => 'IMPS/2', Device => '/dev/psaux', Emulate3Buttons => undef, Emulate3Timeout => 50, ZAxisMapping => [ '4 5', '6 7' ] } -my @mouse_fields = qw(Protocol Device ZAxisMapping Emulate3Buttons Emulate3Timeout); #-); -sub get_mice { - my ($raw_X) = @_; - my @raw_mice = $raw_X->get_InputDevices('mouse'); - map { raw_export_section($_, \@mouse_fields) } @raw_mice; -} -sub set_mice { - my ($raw_X, @mice) = @_; - my @raw_mice = _new_mouse_sections($raw_X, int @mice); - mapn { - my ($raw_mouse, $mouse) = @_; - raw_import_section($raw_mouse, $mouse); - _set_Option('mouse', $raw_mouse, keys %$mouse); - } \@raw_mice, \@mice; -} -sub _new_mouse_sections { - my ($raw_X, $nb_new) = @_; - $raw_X->remove_InputDevices('mouse'); - - my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= []; - @$layout = grep { $_->{val} !~ /^"Mouse/ } @$layout; - - $nb_new or return; - - my @l = map { - my $h = { Identifier => { val => "Mouse$_" }, Driver => { val => 'mouse' } }; - $raw_X->add_Section('InputDevice', $h); - } (1 .. $nb_new); - - push @$layout, { val => qq("Mouse1" "CorePointer") }; - push @$layout, { val => qq("Mouse$_" "SendCoreEvents") } foreach 2 .. $nb_new; - - @l; -} - - -################################################################################ -# resolution ################################################################### -################################################################################ -sub get_resolution { - my ($raw_X, $o_Screen) = @_; - my $Screen = $o_Screen || $raw_X->get_default_screen or return {}; - - my $depth = val($Screen->{DefaultColorDepth}); - my $Display = find { !$depth || val($_->{l}{Depth}) eq $depth } @{$Screen->{Display} || []} or return {}; - $Display->{l}{Virtual} && val($Display->{l}{Virtual}) =~ /(\d+)\s+(\d+)/ or - val($Display->{l}{Modes}) =~ /(\d+)x(\d+)/ or return {}; - { X => $1, Y => $2, Depth => val($Display->{l}{Depth}) }; -} -sub set_resolution { - my ($raw_X, $resolution, $o_Screen_) = @_; - - foreach my $Screen ($o_Screen_ ? $o_Screen_ : $raw_X->get_Sections('Screen')) { - $Screen ||= $raw_X->get_default_screen or internal_error('no screen'); - - $Screen->{DefaultColorDepth} = { val => $resolution->{Depth} eq '32' ? 24 : $resolution->{Depth} }; - $Screen->{Display} = [ map { - { l => { Depth => { val => $_ }, Virtual => { val => join(' ', @$resolution{'X', 'Y'}) } } }; - } 8, 15, 16, 24 ]; - } -} - - -################################################################################ -# device ####################################################################### -################################################################################ -my @device_fields = qw(VendorName BoardName Driver VideoRam Screen BusID); #-); -sub get_device { - my ($raw_X) = @_; - first(get_devices($raw_X)); + bless { xfree3 => Xconfig::xfree3->empty_config, + xfree4 => Xconfig::xfree4->empty_config }, $class; } -sub get_devices { - my ($raw_X) = @_; - my @raw_devices = $raw_X->get_Sections('Device'); - map { - my $raw_device = $_; - my $device = raw_export_section($raw_device, [ 'Identifier', @device_fields ]); - $device->{Options} = raw_export_section($raw_device, [ grep { (deref_array($raw_device->{$_}))[0]->{Option} } keys %$raw_device ]); - $device; - } @raw_devices; -} -sub set_devices { - my ($raw_X, @devices) = @_; - my @raw_devices = _new_device_sections($raw_X, int @devices); - mapn { - my ($raw_device, $device) = @_; - my %Options = %{$device->{Options} || {}}; - raw_import_section($raw_device, $device, \@device_fields); - raw_import_section($raw_device, \%Options); - $_->{Option} = 1 foreach map { deref_array($raw_device->{$_}) } keys %Options; - $raw_device->{''} = [ { post_comment => $device->{raw_LINES} } ] if $device->{raw_LINES}; - } \@raw_devices, \@devices; -} -sub _new_device_sections { - my ($raw_X, $nb_new) = @_; - $raw_X->remove_Section('Device'); - map { $raw_X->add_Section('Device', { Identifier => { val => "device$_" }, DPMS => { Option => 1 } }) } (1 .. $nb_new); -} - - -################################################################################ -# wacoms ####################################################################### -################################################################################ -sub set_wacoms { - my ($raw_X, @wacoms) = @_; - $raw_X->remove_InputDevices('wacom'); - - my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= []; - @$layout = grep { $_->{val} !~ /^"(Stylus|Eraser|Cursor)/ } @$layout; - - @wacoms or return; - - my %Modes = (Stylus => 'Absolute', Eraser => 'Absolute', Cursor => 'Relative'); - - each_index { - my $wacom = $_; - foreach (keys %Modes) { - my $identifier = $_ . ($::i + 1); - my $h = { Identifier => { val => $identifier }, - Driver => { val => 'wacom' }, - Type => { val => lc $_, Option => 1 }, - Device => { val => $wacom->{Device}, Option => 1 }, - Mode => { val => $Modes{$_}, Option => 1 }, - if_($wacom->{USB}, USB => { Option => 1 }) - }; - $raw_X->add_Section('InputDevice', $h); - push @$layout, { val => qq("$identifier" "AlwaysCore") }; - } - } @wacoms; -} - - -################################################################################ -# monitor ###################################################################### -################################################################################ -my @monitor_fields = qw(VendorName ModelName HorizSync VertRefresh); -sub get_monitors { - my ($raw_X) = @_; - my @raw_monitors = $raw_X->get_Sections('Monitor'); - map { raw_export_section($_, [ 'Identifier', @monitor_fields ]) } @raw_monitors; -} -sub set_monitors { - my ($raw_X, @monitors) = @_; - my @raw_monitors = _new_monitor_sections($raw_X, int @monitors); - mapn { - my ($raw_monitor, $monitor) = @_; - raw_import_section($raw_monitor, $monitor, \@monitor_fields); - } \@raw_monitors, \@monitors; -} -sub get_or_new_monitors { - my ($raw_X, $nb_new) = @_; - my @monitors = $raw_X->get_monitors; - #- ensure we have exactly $nb_new monitors; - if ($nb_new > @monitors) { - @monitors, ({}) x ($nb_new - @monitors); - } else { - splice(@monitors, 0, $nb_new); - } -} -sub _new_monitor_sections { - my ($raw_X, $nb_new) = @_; - my $ModeLine = ModeLine_from_string(qq(Section "Monitor"\n) . (our $default_ModeLine) . qq(EndSection\n)); - $raw_X->remove_Section('Monitor'); - map { $raw_X->add_Section('Monitor', { Identifier => { val => "monitor$_" }, ModeLine => $ModeLine }) } (1 .. $nb_new); -} +sub get_keyboard { get_both('get_keyboard', @_) } +sub set_keyboard { set_both('set_keyboard', @_) } +sub get_mice { get_both('get_mice', @_) } +sub set_mice { set_both('set_mice', @_) } +sub get_resolution { get_both('get_resolution', @_) } +sub set_resolution { set_both('set_resolution', @_) } -################################################################################ -# screens ###################################################################### -################################################################################ -sub get_default_screen { - my ($raw_X) = @_; - my @l = $raw_X->get_Sections('Screen'); - (find { $_->{Identifier} && val($_->{Identifier}) eq 'screen1' || - $_->{Driver} && val($_->{Driver}) =~ /svga|accel/ } @l) || $l[0]; -} -sub set_screens { - my ($raw_X, @screens) = @_; - my @raw_screens = _new_screen_sections($raw_X, int @screens); - mapn { - my ($raw_screen, $screen) = @_; - raw_import_section($raw_screen, $screen); - } \@raw_screens, \@screens; -} -sub _new_screen_sections { - my ($raw_X, $nb_new) = @_; - $raw_X->remove_Section('Screen'); - my @l = map { $raw_X->add_Section('Screen', { Identifier => { val => "screen$_" } }) } (1 .. $nb_new); - - get_ServerLayout($raw_X)->{Screen} = [ - { val => qq("screen1") }, - map { { val => sprintf('"screen%d" RightOf "screen%d"', $_, $_ - 1) } } (2 .. $nb_new) - ]; - @l; -} -sub is_fbdev { - my ($raw_X, $o_Screen) = @_; - - my $Screen = $o_Screen || $raw_X->get_default_screen or return; - - my $Device = $raw_X->get_Section_by_Identifier('Device', val($Screen->{Device})) or internal_error("no device named $Screen->{Device}"); - val($Device->{Driver}) eq 'fbdev'; -} +sub get_device { get_both('get_device', @_) } +sub get_devices { get_both('get_devices', @_) } +sub set_devices { set_both('set_devices', @_) } +sub set_wacoms { set_both('set_wacoms', @_) } +sub get_monitor { get_both('get_monitor', @_) } +sub get_monitors { get_both('get_monitors', @_) } +sub set_monitors { set_both('set_monitors', @_) } - -################################################################################ -# modules ###################################################################### -################################################################################ -sub get_modules { - my ($raw_X) = @_; - my $raw_Module = $raw_X->get_Section('Module') or return; - my $Module = raw_export_section($raw_Module, ['Load']); - @{$Module->{Load} || []}; -} -sub add_load_module { - my ($raw_X, $module) = @_; - my $raw_Module = $raw_X->get_Section('Module') || $raw_X->add_Section('Module', {}); - - my %load_modules_comment = ( - dbe => 'Double-Buffering Extension', - v4l => 'Video for Linux', - dri => 'direct rendering', - glx => '3D layer', - 'glx-3.so' => '3D layer', - ); - my $comment = $load_modules_comment{$module}; - push @{$raw_Module->{Load}}, { val => $module, - comment_on_line => $comment && " # $comment", - } if !member($module, $raw_X->get_modules); -} -sub remove_load_module { - my ($raw_X, $module) = @_; - my $raw_Module = $raw_X->get_Section('Module') or return; - if (my @l = grep { $_->{val} ne $module } @{$raw_Module->{Load}}) { - $raw_Module->{Load} = \@l; - } else { - $raw_X->remove_Section('Module'); - } -} -sub set_load_module { - my ($raw_X, $module, $bool) = @_; - $bool ? add_load_module($raw_X, $module) : remove_load_module($raw_X, $module); -} - - -#-############################################################################## -#- helpers -#-############################################################################## -sub _set_Option { - my ($category, $node, @names) = @_; - - if (member($category, 'keyboard', 'mouse')) { - #- everything we export is an Option - $_->{Option} = 1 foreach map { deref_array($node->{$_}) } @names; - } -} - -sub get_InputDevices { - my ($raw_X, $Driver) = @_; - $raw_X->get_Sections('InputDevice', sub { val($_[0]{Driver}) eq $Driver }); -} -sub remove_InputDevices { - my ($raw_X, $Driver) = @_; - $raw_X->remove_Section('InputDevice', sub { val($_[0]{Driver}) ne $Driver }); -} - -sub get_ServerLayout { - my ($raw_X) = @_; - $raw_X->get_Section('ServerLayout') || - $raw_X->add_Section('ServerLayout', { Identifier => { val => 'layout1' } }); -} +sub is_fbdev { get_both('is_fbdev', @_) } #-############################################################################## #- helpers #-############################################################################## -sub raw_export_section { - my ($section, $fields) = @_; - - my $export_name = sub { - my ($name) = @_; - my $h = $section->{$name} or return; - - my @l = map { if_(!$_->{commented}, $_->{val}) } deref_array($h) or return; - $name => (ref($h) eq 'ARRAY' ? \@l : $l[0]); - }; +sub get_both { + my ($getter, $both) = @_; - my %h = map { $export_name->($_) } @$fields; - \%h; -} - -sub raw_import_section { - my ($section, $h, $o_fields) = @_; - foreach ($o_fields ? grep { exists $h->{$_} } @$o_fields : keys %$h) { - my @l = map { ref($_) eq 'HASH' ? $_ : { val => $_ } } deref_array($h->{$_}); - $section->{$_} = (ref($h->{$_}) eq 'ARRAY' ? \@l : $l[0]); + if (is_empty_array_ref($both->{xfree3})) { + $both->{xfree4}->$getter; + } elsif (is_empty_array_ref($both->{xfree4})) { + $both->{xfree3}->$getter; + } else { + my @l3 = $both->{xfree3}->$getter; + my @l4 = $both->{xfree4}->$getter; + merge_values(\@l3, \@l4); } } +sub set_both { + my ($setter, $both, @l) = @_; + + $both->{xfree3}->$setter(@l) if !is_empty_array_ref($both->{xfree3}); + $both->{xfree4}->$setter(@l) if !is_empty_array_ref($both->{xfree4}); +} + +sub merge_values { + my ($l3, $l4) = @_; + + sub merge_values__hashes { + my ($h3, $h4) = @_; + $h3 || $h4 or return; + $h3 or return $h4; + $h4 or return $h3; + + my %h = %$h4; + foreach (keys %$h3) { + if (exists $h{$_}) { + if (ref($h{$_}) eq 'HASH' && ref($h3->{$_}) eq 'HASH') { + #- needed for "Options" of Devices + $h{$_} = +{ %{$h3->{$_}}, %{$h{$_}} }; + } else { + my $s4 = join(", ", deref_array($h{$_})); + my $s3 = join(", ", deref_array($h3->{$_})); + my $s3_ = join(", ", map { qq("$_") } deref_array($h3->{$_})); + if ($s4 eq $s3_) { + #- keeping the non-double-quoted value + $h{$_} = $h3->{$_}; + } else { + $s4 eq $s3 or log::l(qq(XFree: conflicting value for $_, "$s4" and "$s3" are different)); + } + } + } else { + $h{$_} = $h3->{$_}; + } + } + \%h; + } -sub add_Section { - my ($raw_X, $Section, $h) = @_; - my @suggested_ordering = qw(Files ServerFlags Module DRI Keyboard Pointer XInput InputDevice Monitor Device Screen ServerLayout); - my %order = map_index { { lc($_) => $::i } } @suggested_ordering; - my $e = { name => $Section, l => $h }; - my $added; - @$raw_X = map { - if ($order{lc $_->{name}} > $order{lc $Section} && !$added) { - $added = 1; - ($e, $_); - } else { $_ } - } @$raw_X; - push @$raw_X, $e if !$added; - $h; -} -sub remove_Section { - my ($raw_X, $Section, $o_when) = @_; - @$raw_X = grep { $_->{name} ne $Section || $o_when && $o_when->($_->{l}) } @$raw_X; - $raw_X; -} -sub get_Sections { - my ($raw_X, $Section, $o_when) = @_; - map { if_($_->{name} eq $Section && (!$o_when || $o_when->($_->{l})), $_->{l}) } @$raw_X; -} -sub get_Section { - my ($raw_X, $Section, $o_when) = @_; - my @l = get_Sections($raw_X, $Section, $o_when); - @l > 1 and log::l("Xconfig: found more than one Section $Section"); - $l[0]; -} -sub get_Section_by_Identifier { - my ($raw_X, $Section, $Identifier) = @_; - my @l = get_Sections($raw_X, $Section, sub { val($_[0]{Identifier}) eq $Identifier }); - @l > 1 and die "more than one Section $Section has Identifier $Identifier"; - $l[0]; -} - -sub val { - my ($ref) = @_; - $ref && $ref->{val}; -} - + my @r = mapn_(\&merge_values__hashes, $l3, $l4); -sub ModeLine_from_string { - my ($s) = @_; - my $raw_X_for_ModeLine = Xconfig::parse::read_XF86Config_from_string($s); - get_Section($raw_X_for_ModeLine, 'Monitor')->{ModeLine}; + @r == 1 ? $r[0] : @r; } - - -our @resolutions = ('640x480', '800x600', '1024x768', if_(arch() =~ /ppc/, '1152x768'), '1152x864', '1280x960', '1280x1024', '1400x1050', '1600x1200', '1920x1440', '2048x1536'); - -our $default_header = <<'END'; -# File generated by XFdrake. - -# ********************************************************************** -# Refer to the XF86Config man page for details about the format of -# this file. -# ********************************************************************** - -Section "Files" - # Multiple FontPath entries are allowed (they are concatenated together) - # By default, Mandrake 6.0 and later now use a font server independent of - # the X server to render fonts. - FontPath "unix/:-1" -EndSection - -Section "ServerFlags" - #DontZap # disable <Crtl><Alt><BS> (server abort) - #DontZoom # disable <Crtl><Alt><KP_+>/<KP_-> (resolution switching) - AllowMouseOpenFail # allows the server to start up even if the mouse doesn't work -EndSection -END - -our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END'; - # Apple iMac modes - ModeLine "1024x768" 78.525 1024 1049 1145 1312 768 769 772 800 +hsync +vsync - ModeLine "800x600" 62.357 800 821 901 1040 600 601 604 632 +hsync +vsync - ModeLine "640x480" 49.886 640 661 725 832 480 481 484 514 +hsync +vsync - # Apple monitors tend to do 832x624 - ModeLine "832x624" 57 832 876 940 1152 624 625 628 667 -hsync -vsync - # Apple PowerBook G3 - ModeLine "800x600" 100 800 816 824 840 600 616 624 640 -hsync -vsync - # Apple TI Powerbook - ModeLine "1152x768" 78.741 1152 1173 1269 1440 768 769 772 800 +vsync +vsync - # Pismo Firewire G3 - ModeLine "1024x768" 65 1024 1032 1176 1344 768 771 777 806 -hsync -vsync - # iBook2 - ModeLine "1024x768" 65 1024 1048 1184 1344 768 771 777 806 -hsync -vsync - # 17" Apple Studio Display - ModeLine "1024x768" 112.62 1024 1076 1248 1420 768 768 780 808 +hsync +vsync - # HiRes Apple Studio Display - ModeLine "1280x1024" 135 1280 1288 1392 1664 1024 1027 1030 1064 - # Another variation - ModeLine "1280x1024" 134.989 1280 1317 1429 1688 1024 1025 1028 1066 +hsync +vsync -END_PPC - # Sony Vaio C1(X,XS,VE,VN)? - # 1024x480 @ 85.6 Hz, 48 kHz hsync - ModeLine "1024x480" 65.00 1024 1032 1176 1344 480 488 494 563 -hsync -vsync - - # TV fullscreen mode or DVD fullscreen output. - # 768x576 @ 79 Hz, 50 kHz hsync - ModeLine "768x576" 50.00 768 832 846 1000 576 590 595 630 - # 768x576 @ 100 Hz, 61.6 kHz hsync - ModeLine "768x576" 63.07 768 800 960 1024 576 578 590 616 -END - 1; diff --git a/perl-install/Xconfig/xfree3.pm b/perl-install/Xconfig/xfree3.pm new file mode 100644 index 000000000..2c753f148 --- /dev/null +++ b/perl-install/Xconfig/xfree3.pm @@ -0,0 +1,281 @@ +package Xconfig::xfree3; # $Id$ + +use diagnostics; +use strict; + +use common; +use Xconfig::parse; +use Xconfig::xfreeX; + +our @ISA = 'Xconfig::xfreeX'; + +sub name { 'xfree3' } +sub config_file { '/etc/X11/XF86Config' } + + +sub get_keyboard_section { + my ($raw_X) = @_; + return $raw_X->get_Section('Keyboard') or die "no keyboard section"; +} +sub new_keyboard_section { + my ($raw_X) = @_; + return $raw_X->add_Section('Keyboard', { Protocol => { val => 'Standard' } }); +} + +sub get_mouse_sections { + my ($raw_X) = @_; + my $main = $raw_X->get_Section('Pointer') or die "no mouse section"; + my $XInput = $raw_X->get_Section('XInput'); + $main, if_($XInput, map { $_->{l} } @{$XInput->{Mouse} || []}); +} + +sub new_mouse_sections { + my ($raw_X, $nb_new) = @_; + + $raw_X->remove_Section('Pointer'); + my $XInput = $raw_X->get_Section('XInput'); + delete $XInput->{Mouse} if $XInput; + $raw_X->remove_Section('XInput') if $nb_new <= 1 && $XInput && !%$XInput; + + $nb_new or return; + + my $main = $raw_X->add_Section('Pointer', {}); + + if ($nb_new == 1) { + $main; + } else { + my @l = map { { AlwaysCore => {} } } (2 .. $nb_new); + $XInput ||= $raw_X->add_Section('XInput', {}); + $XInput->{Mouse} = [ map { { l => $_ } } @l ]; + $main, @l; + } +} + +sub set_mice { + my ($raw_X, @mice) = @_; + @mice = map { + my %h = %$_; + put_in_hash(\%h, { Protocol => 'IMPS/2', ZAxisMapping => '4 5' }) if $h{Protocol} eq 'ExplorerPS/2'; + \%h; + } @mice; + $raw_X->SUPER::set_mice(@mice); +} + +sub set_wacoms { + my ($raw_X, @wacoms) = @_; + + my %Modes = (Stylus => 'Absolute', Eraser => 'Absolute', Cursor => 'Relative'); + + my $XInput = $raw_X->get_Section('XInput'); + if ($XInput) { + delete $XInput->{"Wacom$_"} foreach keys %Modes; + $raw_X->remove_Section('XInput') if !@wacoms && $XInput && !%$XInput; + } + #- only wacom is handled in XFree 3 + my ($wacom) = @wacoms or return; + + $XInput ||= $raw_X->add_Section('XInput', {}); + foreach (keys %Modes) { + $XInput->{"Wacom$_"} = [ { l => { Port => { val => qq("$wacom->{Device}") }, + Mode => { val => $Modes{$_} }, + if_($wacom->{USB}, USB => {}), + AlwaysCore => {} } } ]; + } +} + +sub depths { 8, 15, 16, 24, 32 } + +sub set_resolution { + my ($raw_X, $resolution, $o_Screen_) = @_; + + foreach my $Screen ($o_Screen_ ? $o_Screen_ : $raw_X->get_screens) { + $Screen ||= $raw_X->get_default_screen or internal_error('no screen'); + + $Screen->{DefaultColorDepth} = { val => $resolution->{Depth} }; + $Screen->{Display} = [ map { + my $modes = do { + if ($raw_X->is_fbdev($Screen)) { + '"default"'; + } else { + my @Modes = grep { + if_(m/(\d+)x(\d+)/, + $1 <= $resolution->{X} && (!$resolution->{Y} || $2 <= $resolution->{Y})); + } reverse @Xconfig::xfreeX::resolutions; + join(" ", map { qq("$_") } @Modes); + } + }; + { l => { Depth => { val => $_ }, Modes => { val => $modes } } }; + } $raw_X->depths ]; + } +} + +sub get_device_section_fields { + qw(VendorName BoardName Chipset VideoRam); #-); +} + +sub default_ModeLine { + my ($raw_X) = @_; + $raw_X->SUPER::default_ModeLine . (our $default_ModeLine); +} + +sub new_device_sections { + my ($raw_X, $nb_new) = @_; + my @l = $raw_X->SUPER::new_device_sections($nb_new); + $_->{power_saver} = { Option => 1 } foreach @l; + @l; +} + +sub is_fbdev { + my ($raw_X, $o_Screen) = @_; + + my $Screen = $o_Screen || $raw_X->get_default_screen or return; + + val($Screen->{Server}) eq 'FBDev'; +} + +sub set_Option { + my ($_raw_X, $_category, $_node, @_names) = @_; +} + + +sub val { + my ($ref) = @_; + $ref && $ref->{val}; +} + +our $default_ModeLine = <<'END'; + # This is a set of standard mode timings. Modes that are out of monitor spec + # are automatically deleted by the server (provided the HorizSync and + # VertRefresh lines are correct), so there's no immediate need to + # delete mode timings (unless particular mode timings don't work on your + # monitor). With these modes, the best standard mode that your monitor + # and video card can support for a given resolution is automatically + # used. + + # 640x400 @ 70 Hz, 31.5 kHz hsync + ModeLine "640x400" 25.175 640 664 760 800 400 409 411 450 + # 640x480 @ 60 Hz, 31.5 kHz hsync + ModeLine "640x480" 25.175 640 664 760 800 480 491 493 525 + # 800x600 @ 56 Hz, 35.15 kHz hsync + ModeLine "800x600" 36 800 824 896 1024 600 601 603 625 + # 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync + ModeLine "1024x768" 44.9 1024 1048 1208 1264 768 776 784 817 Interlace + + # 640x400 @ 85 Hz, 37.86 kHz hsync + ModeLine "640x400" 31.5 640 672 736 832 400 401 404 445 -HSync +VSync + # 640x480 @ 75 Hz, 37.50 kHz hsync + ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -HSync -VSync + # 800x600 @ 60 Hz, 37.8 kHz hsync + ModeLine "800x600" 40 800 840 968 1056 600 601 605 628 +hsync +vsync + + # 640x480 @ 85 Hz, 43.27 kHz hsync + ModeLine "640x480" 36 640 696 752 832 480 481 484 509 -HSync -VSync + # 1152x864 @ 89 Hz interlaced, 44 kHz hsync + ModeLine "1152x864" 65 1152 1168 1384 1480 864 865 875 985 Interlace + + # 800x600 @ 72 Hz, 48.0 kHz hsync + ModeLine "800x600" 50 800 856 976 1040 600 637 643 666 +hsync +vsync + # 1024x768 @ 60 Hz, 48.4 kHz hsync + ModeLine "1024x768" 65 1024 1032 1176 1344 768 771 777 806 -hsync -vsync + + # 640x480 @ 100 Hz, 53.01 kHz hsync + ModeLine "640x480" 45.8 640 672 768 864 480 488 494 530 -HSync -VSync + # 1152x864 @ 60 Hz, 53.5 kHz hsync + ModeLine "1152x864" 89.9 1152 1216 1472 1680 864 868 876 892 -HSync -VSync + # 800x600 @ 85 Hz, 55.84 kHz hsync + ModeLine "800x600" 60.75 800 864 928 1088 600 616 621 657 -HSync -VSync + + # 1024x768 @ 70 Hz, 56.5 kHz hsync + ModeLine "1024x768" 75 1024 1048 1184 1328 768 771 777 806 -hsync -vsync + # 1280x1024 @ 87 Hz interlaced, 51 kHz hsync + ModeLine "1280x1024" 80 1280 1296 1512 1568 1024 1025 1037 1165 Interlace + + # 800x600 @ 100 Hz, 64.02 kHz hsync + ModeLine "800x600" 69.65 800 864 928 1088 600 604 610 640 -HSync -VSync + # 1024x768 @ 76 Hz, 62.5 kHz hsync + ModeLine "1024x768" 85 1024 1032 1152 1360 768 784 787 823 + # 1152x864 @ 70 Hz, 62.4 kHz hsync + ModeLine "1152x864" 92 1152 1208 1368 1474 864 865 875 895 + # 1280x1024 @ 61 Hz, 64.2 kHz hsync + ModeLine "1280x1024" 110 1280 1328 1512 1712 1024 1025 1028 1054 + # 1400x1050 @ 60 Hz, 65.5 kHz + ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +HSync +VSync + + # 1024x768 @ 85 Hz, 70.24 kHz hsync + ModeLine "1024x768" 98.9 1024 1056 1216 1408 768 782 788 822 -HSync -VSync + # 1152x864 @ 78 Hz, 70.8 kHz hsync + ModeLine "1152x864" 110 1152 1240 1324 1552 864 864 876 908 + + # 1280x1024 @ 70 Hz, 74.59 kHz hsync + ModeLine "1280x1024" 126.5 1280 1312 1472 1696 1024 1032 1040 1068 -HSync -VSync + # 1600x1200 @ 60Hz, 75.00 kHz hsync + ModeLine "1600x1200" 162 1600 1664 1856 2160 1200 1201 1204 1250 +HSync +VSync + # 1152x864 @ 84 Hz, 76.0 kHz hsync + ModeLine "1152x864" 135 1152 1464 1592 1776 864 864 876 908 + + # 1280x1024 @ 75 Hz, 79.98 kHz hsync + ModeLine "1280x1024" 135 1280 1296 1440 1688 1024 1025 1028 1066 +HSync +VSync + + # 1024x768 @ 100Hz, 80.21 kHz hsync + ModeLine "1024x768" 115.5 1024 1056 1248 1440 768 771 781 802 -HSync -VSync + # 1400x1050 @ 75 Hz, 82.2 kHz hsync + ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +HSync +VSync + + # 1600x1200 @ 70 Hz, 87.50 kHz hsync + ModeLine "1600x1200" 189 1600 1664 1856 2160 1200 1201 1204 1250 -HSync -VSync + # 1152x864 @ 100 Hz, 89.62 kHz hsync + ModeLine "1152x864" 137.65 1152 1184 1312 1536 864 866 885 902 -HSync -VSync + # 1280x1024 @ 85 Hz, 91.15 kHz hsync + ModeLine "1280x1024" 157.5 1280 1344 1504 1728 1024 1025 1028 1072 +HSync +VSync + # 1600x1200 @ 75 Hz, 93.75 kHz hsync + ModeLine "1600x1200" 202.5 1600 1664 1856 2160 1200 1201 1204 1250 +HSync +VSync + # 1600x1200 @ 85 Hz, 105.77 kHz hsync + ModeLine "1600x1200" 220 1600 1616 1808 2080 1200 1204 1207 1244 +HSync +VSync + # 1600x1200 @ 85 Hz, 106.3 kHz hsync + ModeLine "1600x1200" 229.5 1600 1664 1856 2160 1200 1201 1204 1250 +HSync +VSync + # 1280x1024 @ 100 Hz, 107.16 kHz hsync + ModeLine "1280x1024" 181.75 1280 1312 1440 1696 1024 1031 1046 1072 -HSync -VSync + + # 1800x1440 @ 64Hz, 96.15 kHz hsync + ModeLine "1800X1440" 230 1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync + # 1800x1440 @ 70Hz, 104.52 kHz hsync + ModeLine "1800X1440" 250 1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync + + # 1920x1440 @ 60 Hz, 90.0 kHz hsync + ModeLine "1920x1440" 234.0 1920 2048 2256 2600 1440 1441 1444 1500 -HSync +VSync + # 1920x1440 @ 75 Hz, 112.5kHz hsync + ModeLine "1920x1440" 297.0 1920 2064 2288 2640 1440 1441 1444 1500 -HSync +VSync + + # 512x384 @ 78 Hz, 31.50 kHz hsync + ModeLine "512x384" 20.160 512 528 592 640 384 385 388 404 -HSync -VSync + # 512x384 @ 85 Hz, 34.38 kHz hsync + ModeLine "512x384" 22 512 528 592 640 384 385 388 404 -HSync -VSync + + + # Low-res Doublescan modes + # If your chipset does not support doublescan, you get a 'squashed' + # resolution like 320x400. + + # 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio + ModeLine "320x200" 12.588 320 336 384 400 200 204 205 225 Doublescan + # 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio + ModeLine "320x240" 12.588 320 336 384 400 240 245 246 262 Doublescan + # 320x240 @ 72 Hz, 36.5 kHz hsync + ModeLine "320x240" 15.750 320 336 384 400 240 244 246 262 Doublescan + # 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio + ModeLine "400x300" 18 400 416 448 512 300 301 302 312 Doublescan + # 400x300 @ 60 Hz, 37.8 kHz hsync + ModeLine "400x300" 20 400 416 480 528 300 301 303 314 Doublescan + # 400x300 @ 72 Hz, 48.0 kHz hsync + ModeLine "400x300" 25 400 424 488 520 300 319 322 333 Doublescan + # 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio + ModeLine "480x300" 21.656 480 496 536 616 300 301 302 312 Doublescan + # 480x300 @ 60 Hz, 37.8 kHz hsync + ModeLine "480x300" 23.890 480 496 576 632 300 301 303 314 Doublescan + # 480x300 @ 63 Hz, 39.6 kHz hsync + ModeLine "480x300" 25 480 496 576 632 300 301 303 314 Doublescan + # 480x300 @ 72 Hz, 48.0 kHz hsync + ModeLine "480x300" 29.952 480 504 584 624 300 319 322 333 Doublescan +END + +1; diff --git a/perl-install/Xconfig/xfree4.pm b/perl-install/Xconfig/xfree4.pm new file mode 100644 index 000000000..5c2d23286 --- /dev/null +++ b/perl-install/Xconfig/xfree4.pm @@ -0,0 +1,165 @@ +package Xconfig::xfree4; # $Id$ + +use diagnostics; +use strict; + +use common; +use Xconfig::parse; +use Xconfig::xfree; + +our @ISA = 'Xconfig::xfreeX'; + +sub name { 'xfree4' } +sub config_file { '/etc/X11/XF86Config-4' } + + +sub get_keyboard_section { + my ($raw_X) = @_; + my ($raw_kbd) = get_InputDevices($raw_X, 'Keyboard') or die "no keyboard section"; + $raw_kbd; +} + +sub new_keyboard_section { + my ($raw_X) = @_; + my $raw_kbd = { Identifier => { val => 'Keyboard1' }, Driver => { val => 'Keyboard' } }; + $raw_X->add_Section('InputDevice', $raw_kbd); + + my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= []; + push @$layout, { val => '"Keyboard1" "CoreKeyboard"' }; + + $raw_kbd; +} + +sub get_mouse_sections { + my ($raw_X) = @_; + get_InputDevices($raw_X, 'mouse'); +} +sub new_mouse_sections { + my ($raw_X, $nb_new) = @_; + $raw_X->remove_InputDevices('mouse'); + + my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= []; + @$layout = grep { $_->{val} !~ /^"Mouse/ } @$layout; + + $nb_new or return; + + my @l = map { + my $h = { Identifier => { val => "Mouse$_" }, Driver => { val => 'mouse' } }; + $raw_X->add_Section('InputDevice', $h); + } (1 .. $nb_new); + + push @$layout, { val => qq("Mouse1" "CorePointer") }; + push @$layout, { val => qq("Mouse$_" "SendCoreEvents") } foreach 2 .. $nb_new; + + @l; +} + +sub set_wacoms { + my ($raw_X, @wacoms) = @_; + $raw_X->remove_InputDevices('wacom'); + + my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= []; + @$layout = grep { $_->{val} !~ /^"(Stylus|Eraser|Cursor)/ } @$layout; + + @wacoms or return; + + my %Modes = (Stylus => 'Absolute', Eraser => 'Absolute', Cursor => 'Relative'); + + each_index { + my $wacom = $_; + foreach (keys %Modes) { + my $identifier = $_ . ($::i + 1); + my $h = { Identifier => { val => $identifier }, + Driver => { val => 'wacom' }, + Type => { val => lc $_, Option => 1 }, + Device => { val => $wacom->{Device}, Option => 1 }, + Mode => { val => $Modes{$_}, Option => 1 }, + if_($wacom->{USB}, USB => { Option => 1 }) + }; + $raw_X->add_Section('InputDevice', $h); + push @$layout, { val => qq("$identifier" "AlwaysCore") }; + } + } @wacoms; +} + +sub depths { 8, 15, 16, 24 } +sub set_resolution { + my ($raw_X, $resolution, $o_Screen_) = @_; + + foreach my $Screen ($o_Screen_ ? $o_Screen_ : $raw_X->get_screens) { + $Screen ||= $raw_X->get_default_screen or internal_error('no screen'); + + $Screen->{DefaultColorDepth} = { val => $resolution->{Depth} eq '32' ? 24 : $resolution->{Depth} }; + $Screen->{Display} = [ map { + { l => { Depth => { val => $_ }, Virtual => { val => join(' ', @$resolution{'X', 'Y'}) } } }; + } $raw_X->depths ]; + } +} + +sub get_device_section_fields { + qw(VendorName BoardName Driver VideoRam Screen BusID); #-); +} + +sub new_device_sections { + my ($raw_X, $nb_new) = @_; + my @l = $raw_X->SUPER::new_device_sections($nb_new); + $_->{DPMS} = { Option => 1 } foreach @l; + @l; +} + +sub new_screen_sections { + my ($raw_X, $nb_new) = @_; + my @l = $raw_X->SUPER::new_screen_sections($nb_new); + each_index { $_->{Identifier} = { val => "screen" . ($::i+1) } } @l; + + get_ServerLayout($raw_X)->{Screen} = [ + { val => qq("screen1") }, #-) + map { { val => sprintf('"screen%d" RightOf "screen%d"', $_, $_ - 1) } } (2 .. $nb_new) + ]; + + @l; +} + +sub is_fbdev { + my ($raw_X, $Screen) = @_; + + my $Screen_ = $Screen || $raw_X->get_default_screen or return; + + my $Device = $raw_X->get_Section_by_Identifier('Device', val($Screen_->{Device})) or internal_error("no device named $Screen_->{Device}"); + val($Device->{Driver}) eq 'fbdev'; +} + +sub set_Option { + my ($_raw_X, $category, $node, @names) = @_; + + if (member($category, 'keyboard', 'mouse')) { + #- everything we export is an Option + $_->{Option} = 1 foreach map { deref_array($node->{$_}) } @names; + } +} + + +#-############################################################################## +#- helpers +#-############################################################################## +sub get_InputDevices { + my ($raw_X, $Driver) = @_; + $raw_X->get_Sections('InputDevice', sub { val($_[0]{Driver}) eq $Driver }); +} +sub remove_InputDevices { + my ($raw_X, $Driver) = @_; + $raw_X->remove_Section('InputDevice', sub { val($_[0]{Driver}) ne $Driver }); +} + +sub get_ServerLayout { + my ($raw_X) = @_; + $raw_X->get_Section('ServerLayout') || + $raw_X->add_Section('ServerLayout', { Identifier => { val => 'layout1' } }); +} + +sub val { + my ($ref) = @_; + $ref && $ref->{val}; +} + +1; diff --git a/perl-install/Xconfig/xfreeX.pm b/perl-install/Xconfig/xfreeX.pm new file mode 100644 index 000000000..7d830ddee --- /dev/null +++ b/perl-install/Xconfig/xfreeX.pm @@ -0,0 +1,357 @@ +package Xconfig::xfreeX; # $Id$ + +use diagnostics; +use strict; + +use Xconfig::parse; +use common; +use log; + + +sub empty_config { + my ($class) = @_; + my $raw_X = Xconfig::parse::read_XF86Config_from_string(our $default_header); + bless $raw_X, $class; +} + +sub read { + my ($class, $o_file) = @_; + my $file = $o_file || ($::prefix || '') . (bless {}, $class)->config_file; + my $raw_X = Xconfig::parse::read_XF86Config($file); + bless $raw_X, $class; +} +sub write { + my ($raw_X, $o_file) = @_; + my $file = $o_file || ($::prefix || '') . $raw_X->config_file; + rename $file, "$file.old"; + Xconfig::parse::write_XF86Config($raw_X, $file); +} +sub prepare_write { + my ($raw_X) = @_; + join('', Xconfig::parse::prepare_write_XF86Config($raw_X)); +} + + +my @monitor_fields = qw(VendorName ModelName HorizSync VertRefresh); +sub get_monitors { + my ($raw_X) = @_; + my @raw_monitors = $raw_X->get_monitor_sections; + map { raw_export_section($_, [ 'Identifier', @monitor_fields ]) } @raw_monitors; +} +sub set_monitors { + my ($raw_X, @monitors) = @_; + my @raw_monitors = $raw_X->new_monitor_sections(int @monitors); + mapn { + my ($raw_monitor, $monitor) = @_; + raw_import_section($raw_monitor, $monitor, \@monitor_fields); + } \@raw_monitors, \@monitors; +} +sub get_monitor { + my ($raw_X) = @_; + my @l = $raw_X->get_monitors; + if (!@l) { + $raw_X->new_monitor_sections(1); + @l = $raw_X->get_monitors; + } + $l[0] +} + +my @keyboard_fields = qw(XkbLayout XkbModel XkbDisable XkbOptions XkbCompat); +sub get_keyboard { + my ($raw_X) = @_; + my $raw_kbd = $raw_X->get_keyboard_section; + raw_export_section($raw_kbd, \@keyboard_fields); +} +sub set_keyboard { + my ($raw_X, $kbd) = @_; + my $raw_kbd = eval { $raw_X->get_keyboard_section } || $raw_X->new_keyboard_section; + raw_import_section($raw_kbd, $kbd); + $raw_X->set_Option('keyboard', $raw_kbd, keys %$kbd); +} + +#- example: { Protocol => 'IMPS/2', Device => '/dev/psaux', Emulate3Buttons => undef, Emulate3Timeout => 50, ZAxisMapping => [ '4 5', '6 7' ] } +my @mouse_fields = qw(Protocol Device ZAxisMapping Emulate3Buttons Emulate3Timeout); #-); +sub get_mice { + my ($raw_X) = @_; + my @raw_mice = $raw_X->get_mouse_sections; + map { raw_export_section($_, \@mouse_fields) } @raw_mice; +} +sub set_mice { + my ($raw_X, @mice) = @_; + my @raw_mice = $raw_X->new_mouse_sections(int @mice); + mapn { + my ($raw_mouse, $mouse) = @_; + raw_import_section($raw_mouse, $mouse); + $raw_X->set_Option('mouse', $raw_mouse, keys %$mouse); + } \@raw_mice, \@mice; +} + +sub get_devices { + my ($raw_X) = @_; + my @raw_devices = $raw_X->get_device_sections; + map { + my $raw_device = $_; + my $device = raw_export_section($raw_device, [ 'Identifier', $raw_X->get_device_section_fields ]); + $device->{Options} = raw_export_section($raw_device, [ grep { (deref_array($raw_device->{$_}))[0]->{Option} } keys %$raw_device ]); + $device; + } @raw_devices; +} +sub set_devices { + my ($raw_X, @devices) = @_; + my @raw_devices = $raw_X->new_device_sections(int @devices); + mapn { + my ($raw_device, $device) = @_; + my %Options = %{$device->{Options} || {}}; + add2hash(\%Options, $device->{'Options_' . $raw_X->name}); + raw_import_section($raw_device, $device, [ $raw_X->get_device_section_fields ]); + raw_import_section($raw_device, \%Options); + $_->{Option} = 1 foreach map { deref_array($raw_device->{$_}) } keys %Options; + $raw_device->{''} = [ { post_comment => $device->{raw_LINES} } ] if $device->{raw_LINES}; + } \@raw_devices, \@devices; +} + +sub get_device { + my ($raw_X) = @_; + first(get_devices($raw_X)); +} + +sub get_screens { + my ($raw_X) = @_; + $raw_X->get_Sections('Screen'); +} +sub get_default_screen { + my ($raw_X) = @_; + my @l = get_screens($raw_X); + (find { $_->{Identifier} && val($_->{Identifier}) eq 'screen1' || + $_->{Driver} && val($_->{Driver}) =~ /svga|accel/ } @l) || $l[0]; +} +sub set_screens { + my ($raw_X, @screens) = @_; + my @raw_screens = $raw_X->new_screen_sections(int @screens); + mapn { + my ($raw_screen, $screen) = @_; + raw_import_section($raw_screen, $screen); + } \@raw_screens, \@screens; +} + +sub get_modules { + my ($raw_X) = @_; + my $raw_Module = $raw_X->get_Section('Module') or return; + my $Module = raw_export_section($raw_Module, ['Load']); + @{$Module->{Load} || []}; +} +sub add_load_module { + my ($raw_X, $module) = @_; + my $raw_Module = $raw_X->get_Section('Module') || $raw_X->new_module_section; + + my %load_modules_comment = ( + dbe => 'Double-Buffering Extension', + v4l => 'Video for Linux', + dri => 'direct rendering', + glx => '3D layer', + 'glx-3.so' => '3D layer', + ); + my $comment = $load_modules_comment{$module}; + push @{$raw_Module->{Load}}, { val => $module, + comment_on_line => $comment && " # $comment", + } if !member($module, $raw_X->get_modules); +} +sub remove_load_module { + my ($raw_X, $module) = @_; + my $raw_Module = $raw_X->get_Section('Module') or return; + if (my @l = grep { $_->{val} ne $module } @{$raw_Module->{Load}}) { + $raw_Module->{Load} = \@l; + } else { + $raw_X->remove_Section('Module'); + } +} +sub set_load_module { + my ($raw_X, $module, $bool) = @_; + $bool ? add_load_module($raw_X, $module) : remove_load_module($raw_X, $module); +} + +sub get_resolution { + my ($raw_X, $o_Screen) = @_; + my $Screen = $o_Screen || $raw_X->get_default_screen or return {}; + + my $depth = val($Screen->{DefaultColorDepth}); + my $Display = find { !$depth || val($_->{l}{Depth}) eq $depth } @{$Screen->{Display} || []} or return {}; + $Display->{l}{Virtual} && val($Display->{l}{Virtual}) =~ /(\d+)\s+(\d+)/ or + val($Display->{l}{Modes}) =~ /(\d+)x(\d+)/ or return {}; + { X => $1, Y => $2, Depth => val($Display->{l}{Depth}) }; +} + +#-############################################################################## +#- common to xfree3 and xfree4 +#-############################################################################## +sub default_ModeLine { our $default_ModeLine } + + +sub get_device_sections { + my ($raw_X) = @_; + $raw_X->get_Sections('Device'); +} +sub new_device_sections { + my ($raw_X, $nb_new) = @_; + $raw_X->remove_Section('Device'); + map { $raw_X->add_Section('Device', { Identifier => { val => "device$_" } }) } (1 .. $nb_new); +} + +sub get_monitor_sections { + my ($raw_X) = @_; + $raw_X->get_Sections('Monitor'); +} +sub new_monitor_sections { + my ($raw_X, $nb_new) = @_; + my $ModeLine = ModeLine_from_string(qq(Section "Monitor"\n) . $raw_X->default_ModeLine . qq(EndSection\n)); + $raw_X->remove_Section('Monitor'); + map { $raw_X->add_Section('Monitor', { Identifier => { val => "monitor$_" }, ModeLine => $ModeLine }) } (1 .. $nb_new); +} + +sub new_screen_sections { + my ($raw_X, $nb_new) = @_; + $raw_X->remove_Section('Screen'); + map { $raw_X->add_Section('Screen', {}) } (1 .. $nb_new); +} + +sub new_module_section { + my ($raw_X) = @_; + return $raw_X->add_Section('Module', {}); +} + + +#-############################################################################## +#- helpers +#-############################################################################## +sub raw_export_section { + my ($section, $fields) = @_; + + my $export_name = sub { + my ($name) = @_; + my $h = $section->{$name} or return; + + my @l = map { if_(!$_->{commented}, $_->{val}) } deref_array($h) or return; + $name => (ref($h) eq 'ARRAY' ? \@l : $l[0]); + }; + + my %h = map { $export_name->($_) } @$fields; + \%h; +} + +sub raw_import_section { + my ($section, $h, $o_fields) = @_; + foreach ($o_fields ? grep { exists $h->{$_} } @$o_fields : keys %$h) { + my @l = map { ref($_) eq 'HASH' ? $_ : { val => $_ } } deref_array($h->{$_}); + $section->{$_} = (ref($h->{$_}) eq 'ARRAY' ? \@l : $l[0]); + } +} + +sub add_Section { + my ($raw_X, $Section, $h) = @_; + my @suggested_ordering = qw(Files ServerFlags Module DRI Keyboard Pointer XInput InputDevice Monitor Device Screen ServerLayout); + my %order = map_index { { lc($_) => $::i } } @suggested_ordering; + my $e = { name => $Section, l => $h }; + my $added; + @$raw_X = map { + if ($order{lc $_->{name}} > $order{lc $Section} && !$added) { + $added = 1; + ($e, $_); + } else { $_ } + } @$raw_X; + push @$raw_X, $e if !$added; + $h; +} +sub remove_Section { + my ($raw_X, $Section, $o_when) = @_; + @$raw_X = grep { $_->{name} ne $Section || $o_when && $o_when->($_->{l}) } @$raw_X; + $raw_X; +} +sub get_Sections { + my ($raw_X, $Section, $o_when) = @_; + map { if_($_->{name} eq $Section && (!$o_when || $o_when->($_->{l})), $_->{l}) } @$raw_X; +} +sub get_Section { + my ($raw_X, $Section, $o_when) = @_; + my @l = get_Sections($raw_X, $Section, $o_when); + @l > 1 and log::l("Xconfig: found more than one Section $Section"); + $l[0]; +} +sub get_Section_by_Identifier { + my ($raw_X, $Section, $Identifier) = @_; + my @l = get_Sections($raw_X, $Section, sub { val($_[0]{Identifier}) eq $Identifier }); + @l > 1 and die "more than one Section $Section has Identifier $Identifier"; + $l[0]; +} + +sub val { + my ($ref) = @_; + $ref && $ref->{val}; +} + +sub ModeLine_from_string { + my ($s) = @_; + my $raw_X_for_ModeLine = Xconfig::parse::read_XF86Config_from_string($s); + get_Section($raw_X_for_ModeLine, 'Monitor')->{ModeLine}; +} + + + +our @resolutions = ('640x480', '800x600', '1024x768', if_(arch() =~ /ppc/, '1152x768'), '1152x864', '1280x960', '1280x1024', '1400x1050', '1600x1200', '1920x1440', '2048x1536'); + +our $default_header = <<'END'; +# File generated by XFdrake. + +# ********************************************************************** +# Refer to the XF86Config man page for details about the format of +# this file. +# ********************************************************************** + +Section "Files" + # Multiple FontPath entries are allowed (they are concatenated together) + # By default, Mandrake 6.0 and later now use a font server independent of + # the X server to render fonts. + FontPath "unix/:-1" +EndSection + +Section "ServerFlags" + #DontZap # disable <Crtl><Alt><BS> (server abort) + #DontZoom # disable <Crtl><Alt><KP_+>/<KP_-> (resolution switching) + AllowMouseOpenFail # allows the server to start up even if the mouse doesn't work +EndSection +END + +our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END'; + # Apple iMac modes + ModeLine "1024x768" 78.525 1024 1049 1145 1312 768 769 772 800 +hsync +vsync + ModeLine "800x600" 62.357 800 821 901 1040 600 601 604 632 +hsync +vsync + ModeLine "640x480" 49.886 640 661 725 832 480 481 484 514 +hsync +vsync + # Apple monitors tend to do 832x624 + ModeLine "832x624" 57 832 876 940 1152 624 625 628 667 -hsync -vsync + # Apple PowerBook G3 + ModeLine "800x600" 100 800 816 824 840 600 616 624 640 -hsync -vsync + # Apple TI Powerbook + ModeLine "1152x768" 78.741 1152 1173 1269 1440 768 769 772 800 +vsync +vsync + # Pismo Firewire G3 + ModeLine "1024x768" 65 1024 1032 1176 1344 768 771 777 806 -hsync -vsync + # iBook2 + ModeLine "1024x768" 65 1024 1048 1184 1344 768 771 777 806 -hsync -vsync + # 17" Apple Studio Display + ModeLine "1024x768" 112.62 1024 1076 1248 1420 768 768 780 808 +hsync +vsync + # HiRes Apple Studio Display + ModeLine "1280x1024" 135 1280 1288 1392 1664 1024 1027 1030 1064 + # Another variation + ModeLine "1280x1024" 134.989 1280 1317 1429 1688 1024 1025 1028 1066 +hsync +vsync +END_PPC + # Sony Vaio C1(X,XS,VE,VN)? + # 1024x480 @ 85.6 Hz, 48 kHz hsync + ModeLine "1024x480" 65.00 1024 1032 1176 1344 480 488 494 563 -hsync -vsync + + # TV fullscreen mode or DVD fullscreen output. + # 768x576 @ 79 Hz, 50 kHz hsync + ModeLine "768x576" 50.00 768 832 846 1000 576 590 595 630 + # 768x576 @ 100 Hz, 61.6 kHz hsync + ModeLine "768x576" 63.07 768 800 960 1024 576 578 590 616 +END + +1; + diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index da7ed6aac..14e0ca2c7 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: 2004-04-01 15:07+0200\n" +"POT-Creation-Date: 2004-02-16 23:07+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" @@ -76,7 +76,7 @@ msgid "" "plug the key again, and launch Mandrake Move again." msgstr "" -#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1312 +#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1310 #, c-format msgid "Reboot" msgstr "" @@ -118,7 +118,7 @@ msgstr "" msgid "Please wait, detecting and configuring devices..." msgstr "" -#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563 ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:215 diskdrake/interactive.pm:228 diskdrake/interactive.pm:369 diskdrake/interactive.pm:384 diskdrake/interactive.pm:505 diskdrake/interactive.pm:510 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:253 install_steps.pm:82 install_steps_interactive.pm:40 interactive/http.pm:118 interactive/http.pm:119 network/netconnect.pm:944 network/netconnect.pm:947 network/netconnect.pm:992 network/netconnect.pm:996 network/netconnect.pm:1063 network/netconnect.pm:1113 network/netconnect.pm:1118 network/netconnect.pm:1133 network/netconnect.pm:1336 printer/printerdrake.pm:213 printer/printerdrake.pm:220 printer/printerdrake.pm:245 printer/printerdrake.pm:393 printer/printerdrake.pm:398 printer/printerdrake.pm:411 printer/printerdrake.pm:421 printer/printerdrake.pm:1067 printer/printerdrake.pm:1114 printer/printerdrake.pm:1151 printer/printerdrake.pm:1195 printer/printerdrake.pm:1199 printer/printerdrake.pm:1213 printer/printerdrake.pm:1303 printer/printerdrake.pm:1383 printer/printerdrake.pm:1387 printer/printerdrake.pm:1391 printer/printerdrake.pm:1440 printer/printerdrake.pm:1497 printer/printerdrake.pm:1501 printer/printerdrake.pm:1515 printer/printerdrake.pm:1625 printer/printerdrake.pm:1629 printer/printerdrake.pm:1666 printer/printerdrake.pm:1731 printer/printerdrake.pm:1749 printer/printerdrake.pm:1758 printer/printerdrake.pm:1767 printer/printerdrake.pm:1778 printer/printerdrake.pm:1840 printer/printerdrake.pm:2285 printer/printerdrake.pm:2551 printer/printerdrake.pm:2557 printer/printerdrake.pm:3010 printer/printerdrake.pm:3014 printer/printerdrake.pm:3018 printer/printerdrake.pm:3421 printer/printerdrake.pm:3664 printer/printerdrake.pm:3677 printer/printerdrake.pm:3817 printer/printerdrake.pm:3909 standalone/drakTermServ:416 standalone/drakTermServ:769 standalone/drakTermServ:776 standalone/drakTermServ:971 standalone/drakTermServ:1416 standalone/drakTermServ:1421 standalone/drakTermServ:1428 standalone/drakTermServ:1439 standalone/drakTermServ:1459 standalone/drakauth:36 standalone/drakbackup:581 standalone/drakbackup:694 standalone/drakbackup:1187 standalone/drakbackup:1220 standalone/drakbackup:1735 standalone/drakbackup:1898 standalone/drakbackup:2513 standalone/drakbackup:4286 standalone/drakbackup:4509 standalone/drakboot:255 standalone/drakbug:267 standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:608 standalone/drakconnect:611 standalone/drakconnect:632 standalone/drakfloppy:301 standalone/drakfloppy:305 standalone/drakfloppy:311 standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21 standalone/drakxtv:105 standalone/logdrake:170 standalone/logdrake:467 standalone/logdrake:472 standalone/scannerdrake:58 standalone/scannerdrake:200 standalone/scannerdrake:259 standalone/scannerdrake:683 standalone/scannerdrake:694 standalone/scannerdrake:833 standalone/scannerdrake:844 standalone/scannerdrake:914 wizards.pm:95 wizards.pm:99 wizards.pm:121 +#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563 ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:215 diskdrake/interactive.pm:228 diskdrake/interactive.pm:369 diskdrake/interactive.pm:384 diskdrake/interactive.pm:505 diskdrake/interactive.pm:510 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:252 install_steps.pm:82 install_steps_interactive.pm:40 interactive/http.pm:118 interactive/http.pm:119 network/netconnect.pm:753 network/netconnect.pm:846 network/netconnect.pm:849 network/netconnect.pm:894 network/netconnect.pm:898 network/netconnect.pm:965 network/netconnect.pm:1014 network/netconnect.pm:1019 network/netconnect.pm:1034 printer/printerdrake.pm:213 printer/printerdrake.pm:220 printer/printerdrake.pm:245 printer/printerdrake.pm:393 printer/printerdrake.pm:398 printer/printerdrake.pm:411 printer/printerdrake.pm:421 printer/printerdrake.pm:1048 printer/printerdrake.pm:1095 printer/printerdrake.pm:1170 printer/printerdrake.pm:1174 printer/printerdrake.pm:1345 printer/printerdrake.pm:1349 printer/printerdrake.pm:1353 printer/printerdrake.pm:1453 printer/printerdrake.pm:1457 printer/printerdrake.pm:1574 printer/printerdrake.pm:1578 printer/printerdrake.pm:1664 printer/printerdrake.pm:1751 printer/printerdrake.pm:2149 printer/printerdrake.pm:2415 printer/printerdrake.pm:2421 printer/printerdrake.pm:2838 printer/printerdrake.pm:2842 printer/printerdrake.pm:2846 printer/printerdrake.pm:3237 standalone/drakTermServ:399 standalone/drakTermServ:730 standalone/drakTermServ:737 standalone/drakTermServ:931 standalone/drakTermServ:1330 standalone/drakTermServ:1335 standalone/drakTermServ:1342 standalone/drakTermServ:1353 standalone/drakTermServ:1372 standalone/drakauth:36 standalone/drakbackup:766 standalone/drakbackup:881 standalone/drakbackup:1461 standalone/drakbackup:1494 standalone/drakbackup:2011 standalone/drakbackup:2183 standalone/drakbackup:2742 standalone/drakbackup:2809 standalone/drakbackup:4830 standalone/drakboot:235 standalone/drakbug:267 standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:563 standalone/drakconnect:565 standalone/drakconnect:581 standalone/drakfloppy:301 standalone/drakfloppy:305 standalone/drakfloppy:311 standalone/drakfont:208 standalone/drakfont:221 standalone/drakfont:257 standalone/drakfont:597 standalone/draksplash:21 standalone/logdrake:171 standalone/logdrake:415 standalone/logdrake:420 standalone/scannerdrake:52 standalone/scannerdrake:194 standalone/scannerdrake:253 standalone/scannerdrake:676 standalone/scannerdrake:687 standalone/scannerdrake:826 standalone/scannerdrake:837 standalone/scannerdrake:902 wizards.pm:95 wizards.pm:99 wizards.pm:121 #, c-format msgid "Error" msgstr "" @@ -341,12 +341,12 @@ msgstr "" msgid "Xpmac (installation display driver)" msgstr "" -#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:830 +#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:810 #, c-format msgid "Custom" msgstr "" -#: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14 install_steps_interactive.pm:83 printer/printerdrake.pm:608 printer/printerdrake.pm:4076 standalone/draksplash:120 standalone/harddrake2:188 standalone/logdrake:175 standalone/scannerdrake:445 +#: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14 install_steps_interactive.pm:83 printer/printerdrake.pm:3862 standalone/draksplash:114 standalone/harddrake2:182 standalone/logdrake:176 standalone/scannerdrake:438 #, c-format msgid "Quit" msgstr "" @@ -371,7 +371,7 @@ msgstr "" msgid "Test" msgstr "" -#: Xconfig/main.pm:131 diskdrake/dav.pm:67 diskdrake/interactive.pm:410 diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80 standalone/drakconnect:263 standalone/drakconnect:272 standalone/drakconnect:292 standalone/drakconnect:298 standalone/drakconnect:404 standalone/drakconnect:405 standalone/drakconnect:576 standalone/drakfont:494 standalone/drakfont:554 standalone/harddrake2:185 +#: Xconfig/main.pm:131 diskdrake/dav.pm:67 diskdrake/interactive.pm:410 diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80 standalone/drakconnect:253 standalone/drakconnect:258 standalone/drakconnect:272 standalone/drakconnect:278 standalone/drakconnect:376 standalone/drakconnect:377 standalone/drakconnect:535 standalone/drakfont:491 standalone/drakfont:551 standalone/harddrake2:180 #, c-format msgid "Options" msgstr "" @@ -400,7 +400,7 @@ msgstr "" msgid "Generic" msgstr "" -#: Xconfig/monitor.pm:109 standalone/drakconnect:556 standalone/harddrake2:68 standalone/harddrake2:69 +#: Xconfig/monitor.pm:109 standalone/drakconnect:515 standalone/harddrake2:68 standalone/harddrake2:69 #, c-format msgid "Vendor" msgstr "" @@ -472,17 +472,17 @@ msgstr "" msgid "Graphics card: %s" msgstr "" -#: Xconfig/resolution_and_depth.pm:289 interactive.pm:403 interactive/gtk.pm:759 interactive/http.pm:103 interactive/http.pm:157 interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:4045 standalone/drakbackup:4075 standalone/drakbackup:4162 standalone/drakbackup:4175 standalone/drakbackup:4247 standalone/drakconnect:165 standalone/drakconnect:786 standalone/drakconnect:873 standalone/drakconnect:972 standalone/drakups:194 standalone/net_monitor:303 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1075 ugtk2.pm:1098 +#: Xconfig/resolution_and_depth.pm:289 interactive.pm:403 interactive/gtk.pm:734 interactive/http.pm:103 interactive/http.pm:157 interactive/newt.pm:300 interactive/newt.pm:402 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:4324 standalone/drakbackup:4356 standalone/drakbackup:4449 standalone/drakbackup:4466 standalone/drakbackup:4567 standalone/drakconnect:161 standalone/drakconnect:726 standalone/drakconnect:813 standalone/drakconnect:956 standalone/net_monitor:303 ugtk2.pm:412 ugtk2.pm:510 ugtk2.pm:1051 ugtk2.pm:1074 #, c-format msgid "Ok" msgstr "" -#: Xconfig/resolution_and_depth.pm:289 any.pm:870 diskdrake/smbnfs_gtk.pm:81 help.pm:197 help.pm:457 install_steps_gtk.pm:490 install_steps_interactive.pm:781 interactive.pm:404 interactive/gtk.pm:763 interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307 interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3088 standalone/drakautoinst:217 standalone/drakbackup:4009 standalone/drakbackup:4035 standalone/drakbackup:4058 standalone/drakbackup:4089 standalone/drakbackup:4113 standalone/drakbackup:4137 standalone/drakbackup:4189 standalone/drakbackup:4216 standalone/drakbackup:4241 standalone/drakconnect:164 standalone/drakconnect:871 standalone/drakconnect:971 standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201 standalone/logdrake:175 standalone/net_monitor:299 ugtk2.pm:407 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1075 +#: Xconfig/resolution_and_depth.pm:289 any.pm:850 diskdrake/smbnfs_gtk.pm:81 help.pm:197 help.pm:457 install_steps_gtk.pm:489 install_steps_interactive.pm:787 interactive.pm:404 interactive/gtk.pm:738 interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:299 interactive/newt.pm:406 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:2916 standalone/drakautoinst:200 standalone/drakbackup:4288 standalone/drakbackup:4315 standalone/drakbackup:4340 standalone/drakbackup:4373 standalone/drakbackup:4399 standalone/drakbackup:4425 standalone/drakbackup:4482 standalone/drakbackup:4508 standalone/drakbackup:4538 standalone/drakbackup:4562 standalone/drakconnect:160 standalone/drakconnect:811 standalone/drakconnect:965 standalone/drakfont:657 standalone/drakfont:734 standalone/logdrake:176 standalone/net_monitor:299 ugtk2.pm:406 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1051 #, c-format msgid "Cancel" msgstr "" -#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154 install_steps_gtk.pm:269 install_steps_gtk.pm:670 interactive.pm:498 interactive/gtk.pm:623 interactive/gtk.pm:625 standalone/drakTermServ:316 standalone/drakbackup:4010 standalone/drakbackup:4039 standalone/drakbackup:4062 standalone/drakbackup:4093 standalone/drakbackup:4117 standalone/drakbackup:4141 standalone/drakbackup:4174 standalone/drakbackup:4193 standalone/drakbackup:4220 standalone/drakbackup:4245 standalone/drakbackup:4264 standalone/drakbug:157 standalone/drakconnect:160 standalone/drakconnect:236 standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296 standalone/harddrake2:184 ugtk2.pm:1188 ugtk2.pm:1189 +#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154 install_steps_gtk.pm:267 install_steps_gtk.pm:668 interactive.pm:498 interactive/gtk.pm:620 interactive/gtk.pm:622 standalone/drakTermServ:313 standalone/drakbackup:4285 standalone/drakbackup:4312 standalone/drakbackup:4337 standalone/drakbackup:4370 standalone/drakbackup:4396 standalone/drakbackup:4422 standalone/drakbackup:4463 standalone/drakbackup:4479 standalone/drakbackup:4505 standalone/drakbackup:4534 standalone/drakbackup:4559 standalone/drakbackup:4584 standalone/drakbug:157 standalone/drakconnect:156 standalone/drakconnect:226 standalone/drakfont:509 standalone/drakperm:134 standalone/draksec:285 standalone/harddrake2:181 ugtk2.pm:1159 ugtk2.pm:1160 #, c-format msgid "Help" msgstr "" @@ -633,17 +633,17 @@ msgstr "" msgid "What norm is your TV using?" msgstr "" -#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259 standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90 standalone/drakxtv:90 standalone/harddrake2:134 standalone/service_harddrake:107 +#: any.pm:98 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259 standalone/drakconnect:163 standalone/drakxtv:90 standalone/harddrake2:133 standalone/service_harddrake:94 #, c-format msgid "Please wait" msgstr "" -#: any.pm:103 +#: any.pm:98 #, c-format msgid "Bootloader installation in progress" msgstr "" -#: any.pm:142 +#: any.pm:137 #, c-format msgid "" "You decided to install the bootloader on a partition.\n" @@ -652,454 +652,449 @@ msgid "" "On which drive are you booting?" msgstr "" -#: any.pm:165 any.pm:197 help.pm:800 +#: any.pm:160 any.pm:192 help.pm:800 #, c-format msgid "First sector of drive (MBR)" msgstr "" -#: any.pm:166 +#: any.pm:161 #, c-format msgid "First sector of the root partition" msgstr "" -#: any.pm:168 +#: any.pm:163 #, c-format msgid "On Floppy" msgstr "" -#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418 +#: any.pm:165 help.pm:768 help.pm:800 printer/printerdrake.pm:3234 #, c-format msgid "Skip" msgstr "" -#: any.pm:175 +#: any.pm:170 #, c-format msgid "SILO Installation" msgstr "" -#: any.pm:175 +#: any.pm:170 #, c-format msgid "LILO/grub Installation" msgstr "" -#: any.pm:176 +#: any.pm:171 #, c-format msgid "Where do you want to install the bootloader?" msgstr "" -#: any.pm:197 +#: any.pm:192 #, c-format msgid "First sector of boot partition" msgstr "" -#: any.pm:209 +#: any.pm:204 any.pm:239 #, c-format -msgid "Boot Style Configuration" +msgid "Bootloader main options" msgstr "" -#: any.pm:211 any.pm:248 +#: any.pm:205 #, c-format -msgid "Bootloader main options" +msgid "Boot Style Configuration" msgstr "" -#: any.pm:215 +#: any.pm:209 #, c-format msgid "Give the ram size in MB" msgstr "" -#: any.pm:217 +#: any.pm:211 #, c-format msgid "Option ``Restrict command line options'' is of no use without a password" msgstr "" -#: any.pm:218 any.pm:531 install_steps_interactive.pm:1156 +#: any.pm:212 any.pm:519 install_steps_interactive.pm:1158 #, c-format msgid "The passwords do not match" msgstr "" -#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1255 install_steps_interactive.pm:1156 +#: any.pm:212 any.pm:519 diskdrake/interactive.pm:1255 install_steps_interactive.pm:1158 #, c-format msgid "Please try again" msgstr "" -#: any.pm:223 any.pm:251 help.pm:768 +#: any.pm:217 any.pm:242 help.pm:768 #, c-format msgid "Bootloader to use" msgstr "" -#: any.pm:225 +#: any.pm:219 #, c-format msgid "Bootloader installation" msgstr "" -#: any.pm:227 any.pm:253 help.pm:768 +#: any.pm:221 any.pm:244 help.pm:768 #, c-format msgid "Boot device" msgstr "" -#: any.pm:229 +#: any.pm:223 #, c-format msgid "Delay before booting default image" msgstr "" -#: any.pm:230 help.pm:768 +#: any.pm:224 help.pm:768 #, c-format msgid "Enable ACPI" msgstr "" -#: any.pm:232 help.pm:768 -#, c-format -msgid "Force no APIC" -msgstr "" - -#: any.pm:234 +#: any.pm:225 #, c-format -msgid "Force No Local APIC" +msgid "Force No APIC" msgstr "" -#: any.pm:236 any.pm:558 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1161 network/netconnect.pm:575 printer/printerdrake.pm:1374 printer/printerdrake.pm:1494 standalone/drakbackup:1717 standalone/drakbackup:3592 standalone/drakups:278 +#: any.pm:227 any.pm:546 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1163 network/netconnect.pm:491 printer/printerdrake.pm:1336 printer/printerdrake.pm:1450 standalone/drakbackup:1997 standalone/drakbackup:3879 standalone/drakconnect:908 standalone/drakconnect:936 #, c-format msgid "Password" msgstr "" -#: any.pm:237 any.pm:559 install_steps_interactive.pm:1162 +#: any.pm:228 any.pm:547 install_steps_interactive.pm:1164 #, c-format msgid "Password (again)" msgstr "" -#: any.pm:238 +#: any.pm:229 #, c-format msgid "Restrict command line options" msgstr "" -#: any.pm:238 +#: any.pm:229 #, c-format msgid "restrict" msgstr "" -#: any.pm:240 +#: any.pm:231 #, c-format msgid "Clean /tmp at each boot" msgstr "" -#: any.pm:241 +#: any.pm:232 #, c-format msgid "Precise RAM size if needed (found %d MB)" msgstr "" -#: any.pm:243 +#: any.pm:234 #, c-format msgid "Enable multiple profiles" msgstr "" -#: any.pm:252 +#: any.pm:243 #, c-format msgid "Init Message" msgstr "" -#: any.pm:254 +#: any.pm:245 #, c-format msgid "Open Firmware Delay" msgstr "" -#: any.pm:255 +#: any.pm:246 #, c-format msgid "Kernel Boot Timeout" msgstr "" -#: any.pm:256 +#: any.pm:247 #, c-format msgid "Enable CD Boot?" msgstr "" -#: any.pm:257 +#: any.pm:248 #, c-format msgid "Enable OF Boot?" msgstr "" -#: any.pm:258 +#: any.pm:249 #, c-format msgid "Default OS?" msgstr "" -#: any.pm:302 +#: any.pm:290 #, c-format msgid "Image" msgstr "" -#: any.pm:303 any.pm:312 +#: any.pm:291 any.pm:300 #, c-format msgid "Root" msgstr "" -#: any.pm:304 any.pm:325 +#: any.pm:292 any.pm:313 #, c-format msgid "Append" msgstr "" -#: any.pm:306 +#: any.pm:294 #, c-format msgid "Video mode" msgstr "" -#: any.pm:308 +#: any.pm:296 #, c-format msgid "Initrd" msgstr "" -#: any.pm:317 any.pm:322 any.pm:324 +#: any.pm:305 any.pm:310 any.pm:312 #, c-format msgid "Label" msgstr "" -#: any.pm:319 any.pm:329 harddrake/v4l.pm:255 standalone/drakfloppy:88 standalone/drakfloppy:94 +#: any.pm:307 any.pm:317 harddrake/v4l.pm:236 standalone/drakfloppy:88 standalone/drakfloppy:94 #, c-format msgid "Default" msgstr "" -#: any.pm:326 +#: any.pm:314 #, c-format msgid "Initrd-size" msgstr "" -#: any.pm:328 +#: any.pm:316 #, c-format msgid "NoVideo" msgstr "" -#: any.pm:339 +#: any.pm:327 #, c-format msgid "Empty label not allowed" msgstr "" -#: any.pm:340 +#: any.pm:328 #, c-format msgid "You must specify a kernel image" msgstr "" -#: any.pm:340 +#: any.pm:328 #, c-format msgid "You must specify a root partition" msgstr "" -#: any.pm:341 +#: any.pm:329 #, c-format msgid "This label is already used" msgstr "" -#: any.pm:354 +#: any.pm:342 #, c-format msgid "Which type of entry do you want to add?" msgstr "" -#: any.pm:355 +#: any.pm:343 standalone/drakbackup:1911 #, c-format msgid "Linux" msgstr "" -#: any.pm:355 +#: any.pm:343 #, c-format msgid "Other OS (SunOS...)" msgstr "" -#: any.pm:356 +#: any.pm:344 #, c-format msgid "Other OS (MacOS...)" msgstr "" -#: any.pm:356 +#: any.pm:344 #, c-format msgid "Other OS (windows...)" msgstr "" -#: any.pm:384 +#: any.pm:372 #, c-format msgid "" "Here are the entries on your boot menu so far.\n" "You can create additional entries or change the existing ones." msgstr "" -#: any.pm:516 +#: any.pm:504 #, c-format msgid "access to X programs" msgstr "" -#: any.pm:517 +#: any.pm:505 #, c-format msgid "access to rpm tools" msgstr "" -#: any.pm:518 +#: any.pm:506 #, c-format msgid "allow \"su\"" msgstr "" -#: any.pm:519 +#: any.pm:507 #, c-format msgid "access to administrative files" msgstr "" -#: any.pm:520 +#: any.pm:508 #, c-format msgid "access to network tools" msgstr "" -#: any.pm:521 +#: any.pm:509 #, c-format msgid "access to compilation tools" msgstr "" -#: any.pm:527 +#: any.pm:515 #, c-format msgid "(already added %s)" msgstr "" -#: any.pm:532 +#: any.pm:520 #, c-format msgid "This password is too simple" msgstr "" -#: any.pm:533 +#: any.pm:521 #, c-format msgid "Please give a user name" msgstr "" -#: any.pm:534 +#: any.pm:522 #, c-format msgid "The user name must contain only lower cased letters, numbers, `-' and `_'" msgstr "" -#: any.pm:535 +#: any.pm:523 #, c-format msgid "The user name is too long" msgstr "" -#: any.pm:536 +#: any.pm:524 #, c-format msgid "This user name has already been added" msgstr "" -#: any.pm:540 +#: any.pm:528 #, c-format msgid "Add user" msgstr "" -#: any.pm:541 +#: any.pm:529 #, c-format msgid "" "Enter a user\n" "%s" msgstr "" -#: any.pm:544 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158 diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544 interactive/http.pm:152 printer/printerdrake.pm:165 printer/printerdrake.pm:352 printer/printerdrake.pm:4076 standalone/drakbackup:2802 standalone/scannerdrake:636 standalone/scannerdrake:786 +#: any.pm:532 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158 diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544 interactive/http.pm:152 printer/printerdrake.pm:165 printer/printerdrake.pm:352 printer/printerdrake.pm:3862 standalone/drakbackup:3098 standalone/scannerdrake:629 standalone/scannerdrake:779 #, c-format msgid "Done" msgstr "" -#: any.pm:545 help.pm:52 +#: any.pm:533 help.pm:52 #, c-format msgid "Accept user" msgstr "" -#: any.pm:556 +#: any.pm:544 #, c-format msgid "Real name" msgstr "" -#: any.pm:557 help.pm:52 printer/printerdrake.pm:1373 printer/printerdrake.pm:1493 +#: any.pm:545 help.pm:52 printer/printerdrake.pm:1335 printer/printerdrake.pm:1449 #, c-format msgid "User name" msgstr "" -#: any.pm:560 +#: any.pm:548 #, c-format msgid "Shell" msgstr "" -#: any.pm:562 +#: any.pm:550 #, c-format msgid "Icon" msgstr "" -#: any.pm:603 security/l10n.pm:14 +#: any.pm:591 security/l10n.pm:14 #, c-format msgid "Autologin" msgstr "" -#: any.pm:604 +#: any.pm:592 #, c-format msgid "I can set up your computer to automatically log on one user." msgstr "" -#: any.pm:605 help.pm:52 +#: any.pm:593 help.pm:52 #, c-format msgid "Do you want to use this feature?" msgstr "" -#: any.pm:606 +#: any.pm:594 #, c-format msgid "Choose the default user:" msgstr "" -#: any.pm:607 +#: any.pm:595 #, c-format msgid "Choose the window manager to run:" msgstr "" -#: any.pm:619 +#: any.pm:607 #, c-format msgid "Please choose a language to use." msgstr "" -#: any.pm:640 +#: any.pm:627 #, c-format msgid "" -"Mandrakelinux can support multiple languages. Select\n" +"Mandrake Linux can support multiple languages. Select\n" "the languages you would like to install. They will be available\n" "when your installation is complete and you restart your system." msgstr "" -#: any.pm:658 help.pm:660 +#: any.pm:638 help.pm:660 #, c-format msgid "Use Unicode by default" msgstr "" -#: any.pm:659 help.pm:660 +#: any.pm:639 help.pm:660 #, c-format msgid "All languages" msgstr "" -#: any.pm:695 help.pm:581 help.pm:991 install_steps_interactive.pm:901 +#: any.pm:675 help.pm:581 help.pm:991 install_steps_interactive.pm:907 #, c-format msgid "Country / Region" msgstr "" -#: any.pm:696 +#: any.pm:676 #, c-format msgid "Please choose your country." msgstr "" -#: any.pm:698 +#: any.pm:678 #, c-format msgid "Here is the full list of available countries" msgstr "" -#: any.pm:699 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621 help.pm:991 install_steps_interactive.pm:114 +#: any.pm:679 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621 help.pm:991 install_steps_interactive.pm:114 #, c-format msgid "More" msgstr "" -#: any.pm:830 +#: any.pm:810 #, c-format msgid "No sharing" msgstr "" -#: any.pm:830 +#: any.pm:810 #, c-format msgid "Allow all users" msgstr "" -#: any.pm:834 +#: any.pm:814 #, c-format msgid "" "Would you like to allow users to share some of their directories?\n" @@ -1109,22 +1104,22 @@ msgid "" "" msgstr "" -#: any.pm:850 +#: any.pm:830 #, c-format msgid "You can export using NFS or Samba. Please select which you'd like to use." msgstr "" -#: any.pm:858 +#: any.pm:838 #, c-format msgid "The package %s is going to be removed." msgstr "" -#: any.pm:870 +#: any.pm:850 #, c-format msgid "Launch userdrake" msgstr "" -#: any.pm:872 +#: any.pm:852 #, c-format msgid "" "The per-user sharing uses the group \"fileshare\". \n" @@ -1212,7 +1207,7 @@ msgid "Can't use broadcast with no NIS domain" msgstr "" #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) -#: bootloader.pm:532 +#: bootloader.pm:540 #, c-format msgid "" "Welcome to the operating system chooser!\n" @@ -1223,54 +1218,54 @@ msgid "" "" msgstr "" -#: bootloader.pm:663 +#: bootloader.pm:672 #, c-format msgid "SILO" msgstr "" -#: bootloader.pm:665 help.pm:768 +#: bootloader.pm:674 help.pm:768 #, c-format msgid "LILO with graphical menu" msgstr "" -#: bootloader.pm:666 help.pm:768 +#: bootloader.pm:675 help.pm:768 #, c-format msgid "LILO with text menu" msgstr "" -#: bootloader.pm:668 +#: bootloader.pm:677 #, c-format msgid "Grub" msgstr "" -#: bootloader.pm:670 +#: bootloader.pm:679 #, c-format msgid "Yaboot" msgstr "" -#: bootloader.pm:1143 +#: bootloader.pm:1148 #, c-format msgid "not enough room in /boot" msgstr "" -#: bootloader.pm:1171 +#: bootloader.pm:1176 #, c-format msgid "" "You can't install the bootloader on a %s partition\n" "" msgstr "" -#: bootloader.pm:1215 +#: bootloader.pm:1216 #, c-format msgid "Your bootloader configuration must be updated because partition has been renumbered" msgstr "" -#: bootloader.pm:1222 +#: bootloader.pm:1223 #, c-format msgid "The bootloader can't be installed correctly. You have to boot rescue and choose \"%s\"" msgstr "" -#: bootloader.pm:1223 +#: bootloader.pm:1224 #, c-format msgid "Re-install Boot Loader" msgstr "" @@ -1310,82 +1305,82 @@ msgstr "" msgid "%d seconds" msgstr "" -#: common.pm:197 +#: common.pm:196 #, c-format msgid "Can't make screenshots before partitioning" msgstr "" -#: common.pm:204 +#: common.pm:203 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" -#: common.pm:269 +#: common.pm:268 #, c-format msgid "kdesu missing" msgstr "" -#: common.pm:272 +#: common.pm:271 #, c-format msgid "consolehelper missing" msgstr "" -#: crypto.pm:14 crypto.pm:28 lang.pm:238 network/adsl_consts.pm:44 network/adsl_consts.pm:55 network/adsl_consts.pm:65 network/adsl_consts.pm:75 network/adsl_consts.pm:86 network/adsl_consts.pm:97 network/adsl_consts.pm:107 network/adsl_consts.pm:117 network/adsl_consts.pm:264 network/adsl_consts.pm:264 network/netconnect.pm:46 +#: crypto.pm:14 crypto.pm:28 lang.pm:231 network/adsl_consts.pm:37 network/adsl_consts.pm:48 network/adsl_consts.pm:58 network/adsl_consts.pm:68 network/adsl_consts.pm:79 network/adsl_consts.pm:90 network/adsl_consts.pm:100 network/adsl_consts.pm:110 network/netconnect.pm:46 #, c-format msgid "France" msgstr "" -#: crypto.pm:15 lang.pm:214 +#: crypto.pm:15 lang.pm:207 #, c-format msgid "Costa Rica" msgstr "" -#: crypto.pm:16 crypto.pm:29 lang.pm:186 network/adsl_consts.pm:26 network/adsl_consts.pm:36 network/netconnect.pm:49 +#: crypto.pm:16 crypto.pm:29 lang.pm:179 network/adsl_consts.pm:20 network/adsl_consts.pm:30 network/netconnect.pm:49 #, c-format msgid "Belgium" msgstr "" -#: crypto.pm:17 crypto.pm:30 lang.pm:219 +#: crypto.pm:17 crypto.pm:30 lang.pm:212 #, c-format msgid "Czech Republic" msgstr "" -#: crypto.pm:18 crypto.pm:31 lang.pm:220 network/adsl_consts.pm:134 network/adsl_consts.pm:142 +#: crypto.pm:18 crypto.pm:31 lang.pm:213 network/adsl_consts.pm:126 network/adsl_consts.pm:134 #, c-format msgid "Germany" msgstr "" -#: crypto.pm:19 crypto.pm:32 lang.pm:251 +#: crypto.pm:19 crypto.pm:32 lang.pm:244 #, c-format msgid "Greece" msgstr "" -#: crypto.pm:20 crypto.pm:33 lang.pm:324 +#: crypto.pm:20 crypto.pm:33 lang.pm:317 #, c-format msgid "Norway" msgstr "" -#: crypto.pm:21 crypto.pm:34 lang.pm:353 network/adsl_consts.pm:240 +#: crypto.pm:21 crypto.pm:34 lang.pm:346 network/adsl_consts.pm:230 #, c-format msgid "Sweden" msgstr "" -#: crypto.pm:22 crypto.pm:36 lang.pm:323 network/adsl_consts.pm:178 network/netconnect.pm:47 +#: crypto.pm:22 crypto.pm:36 lang.pm:316 network/adsl_consts.pm:170 network/netconnect.pm:47 #, c-format msgid "Netherlands" msgstr "" -#: crypto.pm:23 crypto.pm:37 lang.pm:271 network/adsl_consts.pm:158 network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:45 +#: crypto.pm:23 crypto.pm:37 lang.pm:264 network/adsl_consts.pm:150 network/adsl_consts.pm:160 network/netconnect.pm:48 standalone/drakxtv:48 #, c-format msgid "Italy" msgstr "" -#: crypto.pm:24 crypto.pm:38 lang.pm:179 network/adsl_consts.pm:20 +#: crypto.pm:24 crypto.pm:38 lang.pm:172 #, c-format msgid "Austria" msgstr "" -#: crypto.pm:35 crypto.pm:65 lang.pm:387 network/netconnect.pm:50 +#: crypto.pm:35 crypto.pm:61 lang.pm:380 network/netconnect.pm:50 #, c-format msgid "United States" msgstr "" @@ -1462,7 +1457,7 @@ msgstr "" #: diskdrake/hd_gtk.pm:99 #, c-format msgid "" -"If you plan to use aboot, be careful to leave a free space (2048 sectors is enough)\n" +"If you plan to use aboot, be carefull to leave a free space (2048 sectors is enough)\n" "at the beginning of the disk" msgstr "" @@ -1489,7 +1484,7 @@ msgstr "" msgid "Please click on a partition" msgstr "" -#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:477 standalone/drakbackup:3040 standalone/drakbackup:3102 +#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:476 #, c-format msgid "Details" msgstr "" @@ -1529,7 +1524,7 @@ msgstr "" msgid "Windows" msgstr "" -#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:329 mouse.pm:167 services.pm:164 standalone/drakbackup:1673 standalone/drakperm:250 +#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:327 mouse.pm:167 services.pm:164 standalone/drakbackup:1954 standalone/drakperm:250 #, c-format msgid "Other" msgstr "" @@ -1646,7 +1641,7 @@ msgstr "" #: diskdrake/interactive.pm:330 #, c-format -msgid "I can't add any more partitions" +msgid "I can't add any more partition" msgstr "" #: diskdrake/interactive.pm:331 @@ -1691,7 +1686,7 @@ msgid "" "Still continue?" msgstr "" -#: diskdrake/interactive.pm:378 harddrake/sound.pm:226 keyboard.pm:314 network/netconnect.pm:338 network/netconnect.pm:451 network/netconnect.pm:470 network/netconnect.pm:655 printer/printerdrake.pm:936 printer/printerdrake.pm:1891 printer/printerdrake.pm:1953 printer/printerdrake.pm:1987 printer/printerdrake.pm:2291 printer/printerdrake.pm:3149 printer/printerdrake.pm:3426 printer/printerdrake.pm:3545 printer/printerdrake.pm:4543 standalone/drakTermServ:352 standalone/drakTermServ:1083 standalone/drakTermServ:1139 standalone/drakTermServ:1802 standalone/drakbackup:580 standalone/drakbackup:678 standalone/drakboot:156 standalone/drakclock:212 standalone/drakconnect:908 standalone/drakfloppy:295 standalone/drakups:27 standalone/scannerdrake:50 standalone/scannerdrake:908 +#: diskdrake/interactive.pm:378 harddrake/sound.pm:222 keyboard.pm:311 network/netconnect.pm:353 printer/printerdrake.pm:2155 printer/printerdrake.pm:3242 printer/printerdrake.pm:4329 standalone/drakTermServ:1040 standalone/drakTermServ:1715 standalone/drakbackup:765 standalone/drakbackup:865 standalone/drakboot:137 standalone/drakclock:200 standalone/drakconnect:848 standalone/drakfloppy:295 #, c-format msgid "Warning" msgstr "" @@ -2069,7 +2064,7 @@ msgstr "" msgid "Type: " msgstr "" -#: diskdrake/interactive.pm:1159 install_steps_gtk.pm:341 +#: diskdrake/interactive.pm:1159 install_steps_gtk.pm:339 #, c-format msgid "Name: " msgstr "" @@ -2258,7 +2253,7 @@ msgstr "" msgid "The encryption keys do not match" msgstr "" -#: diskdrake/interactive.pm:1258 network/netconnect.pm:987 standalone/drakconnect:393 +#: diskdrake/interactive.pm:1258 network/netconnect.pm:889 standalone/drakconnect:365 #, c-format msgid "Encryption key" msgstr "" @@ -2298,7 +2293,7 @@ msgstr "" msgid "Please enter your username, password and domain name to access this host." msgstr "" -#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591 +#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3878 #, c-format msgid "Username" msgstr "" @@ -2328,36 +2323,36 @@ msgstr "" msgid "Mandatory package %s is missing" msgstr "" -#: do_pkgs.pm:143 +#: do_pkgs.pm:136 #, c-format msgid "Installing packages..." msgstr "" -#: do_pkgs.pm:217 +#: do_pkgs.pm:210 #, c-format msgid "Removing packages..." msgstr "" -#: fs.pm:409 +#: fs.pm:399 #, c-format msgid "" "Do not update inode access times on this file system\n" "(e.g, for faster access on the news spool to speed up news servers)." msgstr "" -#: fs.pm:412 +#: fs.pm:402 #, c-format msgid "" "Can only be mounted explicitly (i.e.,\n" "the -a option will not cause the file system to be mounted)." msgstr "" -#: fs.pm:415 +#: fs.pm:405 #, c-format msgid "Do not interpret character or block special devices on the file system." msgstr "" -#: fs.pm:417 +#: fs.pm:407 #, c-format msgid "" "Do not allow execution of any binaries on the mounted\n" @@ -2365,7 +2360,7 @@ msgid "" "containing binaries for architectures other than its own." msgstr "" -#: fs.pm:421 +#: fs.pm:411 #, c-format msgid "" "Do not allow set-user-identifier or set-group-identifier\n" @@ -2373,17 +2368,17 @@ msgid "" "have suidperl(1) installed.)" msgstr "" -#: fs.pm:425 +#: fs.pm:415 #, c-format msgid "Mount the file system read-only." msgstr "" -#: fs.pm:427 +#: fs.pm:417 #, c-format msgid "All I/O to the file system should be done synchronously." msgstr "" -#: fs.pm:431 +#: fs.pm:421 #, c-format msgid "" "Allow an ordinary user to mount the file system. The\n" @@ -2393,57 +2388,52 @@ msgid "" "user,exec,dev,suid )." msgstr "" -#: fs.pm:439 +#: fs.pm:429 #, c-format msgid "Give write access to ordinary users" msgstr "" -#: fs.pm:441 -#, c-format -msgid "Give read-only access to ordinary users" -msgstr "" - -#: fs.pm:581 fs.pm:591 fs.pm:595 fs.pm:599 fs.pm:603 fs.pm:607 swap.pm:12 +#: fs.pm:565 fs.pm:575 fs.pm:579 fs.pm:583 fs.pm:587 fs.pm:591 swap.pm:12 #, c-format msgid "%s formatting of %s failed" msgstr "" -#: fs.pm:648 +#: fs.pm:628 #, c-format msgid "I don't know how to format %s in type %s" msgstr "" -#: fs.pm:655 fs.pm:662 +#: fs.pm:635 fs.pm:642 #, c-format msgid "Formatting partition %s" msgstr "" -#: fs.pm:659 +#: fs.pm:639 #, c-format msgid "Creating and formatting file %s" msgstr "" -#: fs.pm:719 fs.pm:772 +#: fs.pm:705 fs.pm:758 #, c-format msgid "Mounting partition %s" msgstr "" -#: fs.pm:720 fs.pm:773 +#: fs.pm:706 fs.pm:759 #, c-format msgid "mounting partition %s in directory %s failed" msgstr "" -#: fs.pm:740 fs.pm:748 +#: fs.pm:726 fs.pm:734 #, c-format msgid "Checking %s" msgstr "" -#: fs.pm:789 partition_table.pm:638 +#: fs.pm:775 partition_table.pm:636 #, c-format msgid "error unmounting %s: %s" msgstr "" -#: fs.pm:821 +#: fs.pm:807 #, c-format msgid "Enabling swap partition %s" msgstr "" @@ -2463,7 +2453,7 @@ msgstr "" msgid "server" msgstr "" -#: fsedit.pm:254 +#: fsedit.pm:253 #, c-format msgid "" "I can't read the partition table of device %s, it's too corrupted for me :(\n" @@ -2517,45 +2507,37 @@ msgstr "" #: fsedit.pm:542 #, c-format -msgid "" -"You've selected a LVM Logical Volume as root (/).\n" -"The bootloader is not able to handle this without a /boot partition.\n" -"Please be sure to add a /boot partition" -msgstr "" - -#: fsedit.pm:545 -#, c-format msgid "You may not be able to install lilo (since lilo doesn't handle a LV on multiple PVs)" msgstr "" -#: fsedit.pm:548 fsedit.pm:550 +#: fsedit.pm:545 fsedit.pm:547 #, c-format msgid "This directory should remain within the root filesystem" msgstr "" -#: fsedit.pm:552 +#: fsedit.pm:549 #, c-format msgid "" "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n" "" msgstr "" -#: fsedit.pm:554 +#: fsedit.pm:551 #, c-format msgid "You can't use an encrypted file system for mount point %s" msgstr "" -#: fsedit.pm:615 +#: fsedit.pm:612 #, c-format msgid "Not enough free space for auto-allocating" msgstr "" -#: fsedit.pm:617 +#: fsedit.pm:614 #, c-format msgid "Nothing to do" msgstr "" -#: fsedit.pm:713 +#: fsedit.pm:710 #, c-format msgid "Error opening %s for writing: %s" msgstr "" @@ -2590,7 +2572,7 @@ msgstr "" msgid "DVD-ROM" msgstr "" -#: harddrake/data.pm:59 standalone/drakbackup:2116 +#: harddrake/data.pm:59 standalone/drakbackup:2412 #, c-format msgid "Tape" msgstr "" @@ -2630,37 +2612,32 @@ msgstr "" msgid "ISDN adapters" msgstr "" -#: harddrake/data.pm:70 +#: harddrake/data.pm:71 #, c-format msgid "Ethernetcard" msgstr "" -#: harddrake/data.pm:78 network/netconnect.pm:465 standalone/drakconnect:272 standalone/drakconnect:292 standalone/drakconnect:472 standalone/drakconnect:473 standalone/drakconnect:576 +#: harddrake/data.pm:79 network/netconnect.pm:366 standalone/drakconnect:272 standalone/drakconnect:442 standalone/drakconnect:443 standalone/drakconnect:535 #, c-format msgid "Modem" msgstr "" -#: harddrake/data.pm:79 +#: harddrake/data.pm:80 #, c-format msgid "ADSL adapters" msgstr "" -#: harddrake/data.pm:81 -#, c-format -msgid "AGP controllers" -msgstr "" - #: harddrake/data.pm:82 #, c-format msgid "Bridges and system controllers" msgstr "" -#: harddrake/data.pm:83 help.pm:203 help.pm:991 install_steps_interactive.pm:933 printer/printerdrake.pm:687 printer/printerdrake.pm:4175 +#: harddrake/data.pm:83 help.pm:203 help.pm:991 install_steps_interactive.pm:935 printer/printerdrake.pm:676 printer/printerdrake.pm:3961 #, c-format msgid "Printer" msgstr "" -#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:926 +#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:928 #, c-format msgid "Mouse" msgstr "" @@ -2675,67 +2652,67 @@ msgstr "" msgid "(E)IDE/ATA controllers" msgstr "" -#: harddrake/data.pm:94 +#: harddrake/data.pm:93 #, c-format msgid "Firewire controllers" msgstr "" -#: harddrake/data.pm:95 +#: harddrake/data.pm:94 #, c-format msgid "SCSI controllers" msgstr "" -#: harddrake/data.pm:96 +#: harddrake/data.pm:95 #, c-format msgid "USB controllers" msgstr "" -#: harddrake/data.pm:97 +#: harddrake/data.pm:96 #, c-format msgid "SMBus controllers" msgstr "" -#: harddrake/data.pm:98 +#: harddrake/data.pm:97 #, c-format msgid "Scanner" msgstr "" -#: harddrake/data.pm:100 standalone/harddrake2:319 +#: harddrake/data.pm:99 standalone/harddrake2:309 #, c-format msgid "Unknown/Others" msgstr "" -#: harddrake/data.pm:114 +#: harddrake/data.pm:113 #, c-format msgid "cpu # " msgstr "" -#: harddrake/sound.pm:150 standalone/drakconnect:169 +#: harddrake/sound.pm:150 standalone/drakconnect:165 #, c-format msgid "Please Wait... Applying the configuration" msgstr "" -#: harddrake/sound.pm:186 +#: harddrake/sound.pm:182 #, c-format msgid "No alternative driver" msgstr "" -#: harddrake/sound.pm:187 +#: harddrake/sound.pm:183 #, c-format msgid "There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\"" msgstr "" -#: harddrake/sound.pm:193 +#: harddrake/sound.pm:189 #, c-format msgid "Sound configuration" msgstr "" -#: harddrake/sound.pm:195 +#: harddrake/sound.pm:191 #, c-format msgid "Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s)." msgstr "" -#: harddrake/sound.pm:197 +#: harddrake/sound.pm:193 #, c-format msgid "" "\n" @@ -2743,7 +2720,7 @@ msgid "" "Your card currently use the %s\"%s\" driver (default driver for your card is \"%s\")" msgstr "" -#: harddrake/sound.pm:199 +#: harddrake/sound.pm:195 #, c-format msgid "" "OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API.\n" @@ -2760,17 +2737,17 @@ msgid "" "" msgstr "" -#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134 +#: harddrake/sound.pm:209 harddrake/sound.pm:289 #, c-format msgid "Driver:" msgstr "" -#: harddrake/sound.pm:218 +#: harddrake/sound.pm:214 #, c-format msgid "Trouble shooting" msgstr "" -#: harddrake/sound.pm:226 +#: harddrake/sound.pm:222 #, c-format msgid "" "The old \"%s\" driver is blacklisted.\n" @@ -2780,42 +2757,42 @@ msgid "" "The new \"%s\" driver'll only be used on next bootstrap." msgstr "" -#: harddrake/sound.pm:234 +#: harddrake/sound.pm:230 #, c-format msgid "No open source driver" msgstr "" -#: harddrake/sound.pm:235 +#: harddrake/sound.pm:231 #, c-format msgid "There's no free driver for your sound card (%s), but there's a proprietary driver at \"%s\"." msgstr "" -#: harddrake/sound.pm:238 +#: harddrake/sound.pm:234 #, c-format msgid "No known driver" msgstr "" -#: harddrake/sound.pm:239 +#: harddrake/sound.pm:235 #, c-format msgid "There's no known driver for your sound card (%s)" msgstr "" -#: harddrake/sound.pm:243 +#: harddrake/sound.pm:239 #, c-format msgid "Unknown driver" msgstr "" -#: harddrake/sound.pm:244 +#: harddrake/sound.pm:240 #, c-format msgid "Error: The \"%s\" driver for your sound card is unlisted" msgstr "" -#: harddrake/sound.pm:257 +#: harddrake/sound.pm:253 #, c-format msgid "Sound trouble shooting" msgstr "" -#: harddrake/sound.pm:258 +#: harddrake/sound.pm:254 #, c-format msgid "" "The classic bug sound tester is to run the following commands:\n" @@ -2840,17 +2817,17 @@ msgid "" "" msgstr "" -#: harddrake/sound.pm:284 +#: harddrake/sound.pm:280 #, c-format msgid "Let me pick any driver" msgstr "" -#: harddrake/sound.pm:287 +#: harddrake/sound.pm:283 #, c-format msgid "Choosing an arbitrary driver" msgstr "" -#: harddrake/sound.pm:288 +#: harddrake/sound.pm:284 #, c-format msgid "" "If you really think that you know which driver is the right one for your card\n" @@ -2859,64 +2836,64 @@ msgid "" "The current driver for your \"%s\" sound card is \"%s\" " msgstr "" -#: harddrake/v4l.pm:14 +#: harddrake/v4l.pm:14 harddrake/v4l.pm:66 #, c-format msgid "Auto-detect" msgstr "" -#: harddrake/v4l.pm:69 harddrake/v4l.pm:227 +#: harddrake/v4l.pm:67 harddrake/v4l.pm:219 #, c-format msgid "Unknown|Generic" msgstr "" -#: harddrake/v4l.pm:102 +#: harddrake/v4l.pm:100 #, c-format msgid "Unknown|CPH05X (bt878) [many vendors]" msgstr "" -#: harddrake/v4l.pm:103 +#: harddrake/v4l.pm:101 #, c-format msgid "Unknown|CPH06X (bt878) [many vendors]" msgstr "" -#: harddrake/v4l.pm:289 +#: harddrake/v4l.pm:245 #, c-format msgid "" "For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.\n" "If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed." msgstr "" -#: harddrake/v4l.pm:292 +#: harddrake/v4l.pm:248 #, c-format msgid "Card model:" msgstr "" -#: harddrake/v4l.pm:293 +#: harddrake/v4l.pm:249 #, c-format msgid "Tuner type:" msgstr "" -#: harddrake/v4l.pm:294 +#: harddrake/v4l.pm:250 #, c-format msgid "Number of capture buffers:" msgstr "" -#: harddrake/v4l.pm:294 +#: harddrake/v4l.pm:250 #, c-format msgid "number of capture buffers for mmap'ed capture" msgstr "" -#: harddrake/v4l.pm:296 +#: harddrake/v4l.pm:252 #, c-format msgid "PLL setting:" msgstr "" -#: harddrake/v4l.pm:297 +#: harddrake/v4l.pm:253 #, c-format msgid "Radio support:" msgstr "" -#: harddrake/v4l.pm:297 +#: harddrake/v4l.pm:253 #, c-format msgid "enable radio support" msgstr "" @@ -2925,12 +2902,12 @@ msgstr "" #, c-format msgid "" "Before continuing, you should carefully read the terms of the license. It\n" -"covers the entire Mandrakelinux distribution. If you do agree with all the\n" +"covers the entire Mandrake Linux distribution. If you do agree with all the\n" "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n" "will reboot your computer." msgstr "" -#: help.pm:14 install_steps_gtk.pm:598 install_steps_interactive.pm:88 install_steps_interactive.pm:690 standalone/drakautoinst:216 +#: help.pm:14 install_steps_gtk.pm:597 install_steps_interactive.pm:88 install_steps_interactive.pm:697 standalone/drakautoinst:199 #, c-format msgid "Accept" msgstr "" @@ -2976,7 +2953,7 @@ msgid "" "not interested in this feature, uncheck the \"%s\" box." msgstr "" -#: help.pm:52 help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005 help.pm:1005 install_steps_gtk.pm:277 interactive.pm:403 interactive/newt.pm:308 network/netconnect.pm:271 network/tools.pm:206 printer/printerdrake.pm:3090 standalone/drakTermServ:409 standalone/drakbackup:4199 standalone/drakbackup:4229 standalone/drakbackup:4251 ugtk2.pm:510 +#: help.pm:52 help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005 help.pm:1005 install_steps_gtk.pm:275 interactive.pm:403 interactive/newt.pm:300 network/netconnect.pm:242 network/tools.pm:208 printer/printerdrake.pm:2918 standalone/drakTermServ:392 standalone/drakbackup:4491 standalone/drakbackup:4517 standalone/drakbackup:4547 standalone/drakbackup:4571 ugtk2.pm:510 #, c-format msgid "Next" msgstr "" @@ -3023,7 +3000,7 @@ msgstr "" #: help.pm:86 #, c-format msgid "" -"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n" +"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n" "selected package is located on another CD-ROM, DrakX will eject the current\n" "CD and ask you to insert the correct CD as required." msgstr "" @@ -3032,12 +3009,12 @@ msgstr "" #, c-format msgid "" "It is now time to specify which programs you wish to install on your\n" -"system. There are thousands of packages available for Mandrakelinux, and\n" +"system. There are thousands of packages available for Mandrake Linux, and\n" "to make it simpler to manage the packages have been placed into groups of\n" "similar applications.\n" "\n" "Packages are sorted into groups corresponding to a particular use of your\n" -"machine. Mandrakelinux sorts packages groups in four categories. You can\n" +"machine. Mandrake Linux sorts packages groups in four categories. You can\n" "mix and match applications from the various categories, so a\n" "``Workstation'' installation can still have applications from the\n" "``Development'' category installed.\n" @@ -3095,7 +3072,7 @@ msgstr "" msgid "Graphical Environment" msgstr "" -#: help.pm:137 install_steps_interactive.pm:552 +#: help.pm:137 install_steps_interactive.pm:559 #, c-format msgid "With X" msgstr "" @@ -3110,7 +3087,7 @@ msgstr "" msgid "Truly minimal install" msgstr "" -#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598 +#: help.pm:137 install_steps_gtk.pm:270 install_steps_interactive.pm:605 #, c-format msgid "Individual package selection" msgstr "" @@ -3134,10 +3111,10 @@ msgid "" "!! If a server package has been selected, either because you specifically\n" "chose the individual package or because it was part of a group of packages,\n" "you will be asked to confirm that you really want those servers to be\n" -"installed. By default Mandrakelinux will automatically start any installed\n" +"installed. By default Mandrake Linux will automatically start any installed\n" "services at boot time. Even if they are safe and have no known issues at\n" "the time the distribution was shipped, it is entirely possible that that\n" -"security holes were discovered after this version of Mandrakelinux was\n" +"security holes were discovered after this version of Mandrake Linux was\n" "finalized. If you do not know what a particular service is supposed to do\n" "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n" "install the listed services and they will be started automatically by\n" @@ -3158,12 +3135,12 @@ msgid "" "create such a floppy." msgstr "" -#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:413 interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:219 ugtk2.pm:1074 wizards.pm:156 +#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:422 interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:212 ugtk2.pm:1050 wizards.pm:156 #, c-format msgid "No" msgstr "" -#: help.pm:172 help.pm:301 help.pm:457 help.pm:457 install_any.pm:413 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:288 standalone/drakgw:289 standalone/drakgw:297 standalone/drakgw:307 standalone/harddrake2:218 ugtk2.pm:1074 wizards.pm:156 +#: help.pm:172 help.pm:301 help.pm:457 help.pm:457 install_any.pm:422 interactive.pm:149 modules/interactive.pm:71 standalone/drakgw:280 standalone/drakgw:281 standalone/drakgw:289 standalone/drakgw:299 standalone/harddrake2:211 ugtk2.pm:1050 wizards.pm:156 #, c-format msgid "Yes" msgstr "" @@ -3178,7 +3155,7 @@ msgstr "" msgid "" "You will now set up your Internet/network connection. If you wish to\n" "connect your computer to the Internet or to a local network, click \"%s\".\n" -"Mandrakelinux will attempt to auto-detect network devices and modems. If\n" +"Mandrake Linux will attempt to auto-detect network devices and modems. If\n" "this detection fails, uncheck the \"%s\" box. You may also choose not to\n" "configure the network, or to do it later, in which case clicking the \"%s\"\n" "button will take you to the next step.\n" @@ -3193,7 +3170,7 @@ msgid "" "\n" "About Winmodem Connection. Winmodems are special integrated low-end modems\n" "that require additional software to work compared to Normal modems. Some of\n" -"those modems actually work under Mandrakelinux, some others do not. You\n" +"those modems actually work under Mandrake Linux, some others do not. You\n" "can consult the list of supported modems at LinModems.\n" "\n" "You can consult the ``Starter Guide'' chapter about Internet connections\n" @@ -3215,7 +3192,7 @@ msgid "" "similar to the one used during installation." msgstr "" -#: help.pm:203 help.pm:581 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 install_steps_gtk.pm:648 standalone/drakbackup:2406 standalone/drakbackup:2414 standalone/drakbackup:2422 standalone/drakbackup:2430 +#: help.pm:203 help.pm:581 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 install_steps_gtk.pm:647 standalone/drakbackup:2684 standalone/drakbackup:2694 standalone/drakbackup:2704 standalone/drakbackup:2714 #, c-format msgid "Configure" msgstr "" @@ -3258,7 +3235,7 @@ msgid "" "other machines on your local network as well." msgstr "" -#: help.pm:235 install_steps_interactive.pm:828 +#: help.pm:235 install_steps_interactive.pm:834 #, c-format msgid "Hardware clock set to GMT" msgstr "" @@ -3287,7 +3264,7 @@ msgstr "" msgid "" "X (for X Window System) is the heart of the GNU/Linux graphical interface\n" "on which all the graphical environments (KDE, GNOME, AfterStep,\n" -"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n" +"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n" "\n" "You will be presented with a list of different parameters to change to get\n" "an optimal graphical display: Graphic Card\n" @@ -3388,7 +3365,7 @@ msgid "" "if an existing operating system is using all the available space you will\n" "have to partition the drive. Basically, partitioning a hard drive consists\n" "of logically dividing it to create the space needed to install your new\n" -"Mandrakelinux system.\n" +"Mandrake Linux system.\n" "\n" "Because the process of partitioning a hard drive is usually irreversible\n" "and can lead to lost data if there is an existing operating system already\n" @@ -3415,7 +3392,7 @@ msgid "" "FAT or NTFS partition. Resizing can be performed without the loss of any\n" "data, provided you have previously defragmented the Windows partition.\n" "Backing up your data is strongly recommended.. Using this option is\n" -"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n" +"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n" "the same computer.\n" "\n" " Before choosing this option, please understand that after this\n" @@ -3424,7 +3401,7 @@ msgid "" "Windows to store your data or to install new software.\n" "\n" " * \"%s\": if you want to delete all data and all partitions present on\n" -"your hard drive and replace them with your new Mandrakelinux system,\n" +"your hard drive and replace them with your new Mandrake Linux system,\n" "choose this option. Be careful, because you will not be able to undo your\n" "choice after you confirm.\n" "\n" @@ -3510,17 +3487,17 @@ msgstr "" msgid "Generate auto-install floppy" msgstr "" -#: help.pm:418 install_steps_interactive.pm:1322 +#: help.pm:418 install_steps_interactive.pm:1320 #, c-format msgid "Replay" msgstr "" -#: help.pm:418 install_steps_interactive.pm:1322 +#: help.pm:418 install_steps_interactive.pm:1320 #, c-format msgid "Automated" msgstr "" -#: help.pm:418 install_steps_interactive.pm:1325 +#: help.pm:418 install_steps_interactive.pm:1323 #, c-format msgid "Save packages selection" msgstr "" @@ -3548,13 +3525,13 @@ msgid "" "Click on \"%s\" when you are ready to format the partitions.\n" "\n" "Click on \"%s\" if you want to choose another partition for your new\n" -"Mandrakelinux operating system installation.\n" +"Mandrake Linux operating system installation.\n" "\n" "Click on \"%s\" if you wish to select partitions that will be checked for\n" "bad blocks on the disk." msgstr "" -#: help.pm:444 help.pm:1005 install_steps_gtk.pm:433 interactive.pm:404 interactive/newt.pm:307 printer/printerdrake.pm:3088 standalone/drakTermServ:388 standalone/drakbackup:4012 standalone/drakbackup:4041 standalone/drakbackup:4095 standalone/drakbackup:4119 standalone/drakbackup:4143 standalone/drakbackup:4195 standalone/drakbackup:4225 standalone/drakbackup:4247 ugtk2.pm:508 +#: help.pm:444 help.pm:1005 install_steps_gtk.pm:432 interactive.pm:404 interactive/newt.pm:299 printer/printerdrake.pm:2916 standalone/drakTermServ:371 standalone/drakbackup:4292 standalone/drakbackup:4320 standalone/drakbackup:4378 standalone/drakbackup:4404 standalone/drakbackup:4430 standalone/drakbackup:4487 standalone/drakbackup:4513 standalone/drakbackup:4543 standalone/drakbackup:4567 ugtk2.pm:508 #, c-format msgid "Previous" msgstr "" @@ -3562,7 +3539,7 @@ msgstr "" #: help.pm:447 #, c-format msgid "" -"At the time you are installing Mandrakelinux, it is likely that some\n" +"At the time you are installing Mandrake Linux, it is likely that some\n" "packages will have been updated since the initial release. Bugs may have\n" "been fixed, security issues resolved. To allow you to benefit from these\n" "updates, you are now able to download them from the Internet. Check \"%s\"\n" @@ -3575,7 +3552,7 @@ msgid "" "selected package(s), or \"%s\" to abort." msgstr "" -#: help.pm:457 help.pm:602 install_steps_gtk.pm:432 install_steps_interactive.pm:148 standalone/drakbackup:4279 +#: help.pm:457 help.pm:602 install_steps_gtk.pm:431 install_steps_interactive.pm:148 standalone/drakbackup:4606 #, c-format msgid "Install" msgstr "" @@ -3607,7 +3584,7 @@ msgstr "" #, c-format msgid "" "At this point, you need to choose which partition(s) will be used for the\n" -"installation of your Mandrakelinux system. If partitions have already been\n" +"installation of your Mandrake Linux system. If partitions have already been\n" "defined, either from a previous installation of GNU/Linux or by another\n" "partitioning tool, you can use existing partitions. Otherwise, hard drive\n" "partitions must be defined.\n" @@ -3693,7 +3670,7 @@ msgstr "" msgid "" "More than one Microsoft partition has been detected on your hard drive.\n" "Please choose the one which you want to resize in order to install your new\n" -"Mandrakelinux operating system.\n" +"Mandrake Linux operating system.\n" "\n" "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n" "\"Capacity\".\n" @@ -3738,7 +3715,7 @@ msgid "" "found on your machine.\n" "\n" "DrakX now needs to know if you want to perform a new install or an upgrade\n" -"of an existing Mandrakelinux system:\n" +"of an existing Mandrake Linux system:\n" "\n" " * \"%s\": For the most part, this completely wipes out the old system. If\n" "you wish to change how your hard drives are partitioned, or change the file\n" @@ -3746,13 +3723,13 @@ msgid "" "scheme, you can prevent some of your existing data from being over-written.\n" "\n" " * \"%s\": this installation class allows you to update the packages\n" -"currently installed on your Mandrakelinux system. Your current\n" +"currently installed on your Mandrake Linux system. Your current\n" "partitioning scheme and user data is not altered. Most of other\n" "configuration steps remain available, similar to a standard installation.\n" "\n" -"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n" +"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n" "running version \"8.1\" or later. Performing an Upgrade on versions prior\n" -"to Mandrakelinux version \"8.1\" is not recommended." +"to Mandrake Linux version \"8.1\" is not recommended." msgstr "" #: help.pm:605 @@ -3792,7 +3769,7 @@ msgid "" "\n" "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n" "cover all existing languages. Though full support for it in GNU/Linux is\n" -"still under development. For that reason, Mandrakelinux will be using it\n" +"still under development. For that reason, Mandrake Linux will be using it\n" "or not depending on the user choices:\n" "\n" " * If you choose a languages with a strong legacy encoding (latin1\n" @@ -3917,7 +3894,7 @@ msgid "authentication" msgstr "" #. -PO: keep this short or else the buttons will not fit in the window -#: help.pm:733 install_steps_interactive.pm:1152 +#: help.pm:733 install_steps_interactive.pm:1154 #, c-format msgid "No password" msgstr "" @@ -3952,7 +3929,7 @@ msgid "" "checking this box.\n" "\n" "!! Be aware that if you choose not to install a bootloader (by selecting\n" -"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n" +"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n" "system! Be sure you know what you are doing before changing any of the\n" "options. !!\n" "\n" @@ -3985,6 +3962,11 @@ msgstr "" msgid "Delay before booting the default image" msgstr "" +#: help.pm:768 +#, c-format +msgid "Force no APIC" +msgstr "" + #: help.pm:771 #, c-format msgid "" @@ -4004,7 +3986,7 @@ msgid "" "operating systems!" msgstr "" -#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakbackup:1604 standalone/drakfont:589 standalone/drakfont:655 standalone/drakups:280 standalone/drakups:329 standalone/drakups:349 standalone/drakvpn:333 standalone/drakvpn:694 +#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakbackup:1850 standalone/drakfont:586 standalone/drakfont:649 standalone/drakvpn:325 standalone/drakvpn:708 #, c-format msgid "Add" msgstr "" @@ -4014,7 +3996,7 @@ msgstr "" msgid "Modify" msgstr "" -#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakups:282 standalone/drakups:331 standalone/drakups:351 standalone/drakvpn:333 standalone/drakvpn:694 +#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakvpn:325 standalone/drakvpn:708 #, c-format msgid "Remove" msgstr "" @@ -4042,7 +4024,7 @@ msgstr "" #, c-format msgid "" "Now, it's time to select a printing system for your computer. Other OSs may\n" -"offer you one, but Mandrakelinux offers two. Each of the printing systems\n" +"offer you one, but Mandrake Linux offers two. Each of the printing systems\n" "is best suited to particular types of configuration.\n" "\n" " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n" @@ -4072,7 +4054,7 @@ msgstr "" msgid "pdq" msgstr "" -#: help.pm:826 help.pm:826 printer/cups.pm:115 printer/data.pm:83 +#: help.pm:826 help.pm:826 printer/cups.pm:99 printer/data.pm:82 #, c-format msgid "CUPS" msgstr "" @@ -4192,7 +4174,7 @@ msgid "" "driver." msgstr "" -#: help.pm:929 help.pm:991 install_steps_interactive.pm:960 install_steps_interactive.pm:977 +#: help.pm:929 help.pm:991 install_steps_interactive.pm:962 install_steps_interactive.pm:979 #, c-format msgid "Sound card" msgstr "" @@ -4262,12 +4244,12 @@ msgid "" "idea to review this setup." msgstr "" -#: help.pm:991 install_steps_interactive.pm:110 install_steps_interactive.pm:893 standalone/keyboarddrake:23 +#: help.pm:991 install_steps_interactive.pm:110 install_steps_interactive.pm:899 standalone/keyboarddrake:23 #, c-format msgid "Keyboard" msgstr "" -#: help.pm:991 install_steps_interactive.pm:919 standalone/drakclock:75 +#: help.pm:991 install_steps_interactive.pm:921 #, c-format msgid "Timezone" msgstr "" @@ -4277,7 +4259,7 @@ msgstr "" msgid "Graphical Interface" msgstr "" -#: help.pm:991 install_steps_interactive.pm:993 +#: help.pm:991 install_steps_interactive.pm:995 #, c-format msgid "TV card" msgstr "" @@ -4287,27 +4269,27 @@ msgstr "" msgid "ISDN card" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1011 standalone/drakbackup:2101 +#: help.pm:991 install_steps_interactive.pm:1013 standalone/drakbackup:2397 #, c-format msgid "Network" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1037 +#: help.pm:991 install_steps_interactive.pm:1039 #, c-format msgid "Security Level" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1051 +#: help.pm:991 install_steps_interactive.pm:1053 #, c-format msgid "Firewall" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1065 +#: help.pm:991 install_steps_interactive.pm:1067 #, c-format msgid "Bootloader" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1075 services.pm:195 +#: help.pm:991 install_steps_interactive.pm:1077 services.pm:195 #, c-format msgid "Services" msgstr "" @@ -4316,7 +4298,7 @@ msgstr "" #, c-format msgid "" "Choose the hard drive you want to erase in order to install your new\n" -"Mandrakelinux partition. Be careful, all data on this drive will be lost\n" +"Mandrake Linux partition. Be careful, all data on this drive will be lost\n" "and will not be recoverable!" msgstr "" @@ -4342,7 +4324,7 @@ msgstr "" msgid "You must also format %s" msgstr "" -#: install_any.pm:404 +#: install_any.pm:413 #, c-format msgid "" "You have selected the following server(s): %s\n" @@ -4357,7 +4339,7 @@ msgid "" "" msgstr "" -#: install_any.pm:425 +#: install_any.pm:434 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -4367,27 +4349,27 @@ msgid "" "" msgstr "" -#: install_any.pm:820 +#: install_any.pm:812 #, c-format msgid "Insert a FAT formatted floppy in drive %s" msgstr "" -#: install_any.pm:824 +#: install_any.pm:816 #, c-format msgid "This floppy is not FAT formatted" msgstr "" -#: install_any.pm:836 +#: install_any.pm:828 #, c-format msgid "To use this saved packages selection, boot installation with ``linux defcfg=floppy''" msgstr "" -#: install_any.pm:864 partition_table.pm:847 +#: install_any.pm:851 partition_table.pm:845 #, c-format msgid "Error reading file %s" msgstr "" -#: install_any.pm:988 +#: install_any.pm:968 #, c-format msgid "An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem" msgstr "" @@ -4494,7 +4476,7 @@ msgstr "" #: install_interactive.pm:163 #, c-format -msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrakelinux installation." +msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrake Linux installation." msgstr "" #: install_interactive.pm:164 @@ -4594,10 +4576,10 @@ msgstr "" msgid "" "Introduction\n" "\n" -"The operating system and the different components available in the Mandrakelinux distribution \n" +"The operating system and the different components available in the Mandrake Linux distribution \n" "shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n" "restricted to, the set of programs, methods, rules and documentation related to the operating \n" -"system and the different components of the Mandrakelinux distribution.\n" +"system and the different components of the Mandrake Linux distribution.\n" "\n" "\n" "1. License Agreement\n" @@ -4632,7 +4614,7 @@ msgid "" "limitation damages for loss of business, interruption of business, financial loss, legal fees \n" "and penalties resulting from a court judgment, or any other consequential loss) arising out \n" "of the possession and use of software components or arising out of downloading software components \n" -"from one of Mandrakelinux sites which are prohibited or restricted in some countries by local laws.\n" +"from one of Mandrake Linux sites which are prohibited or restricted in some countries by local laws.\n" "This limited liability applies to, but is not restricted to, the strong cryptography components \n" "included in the Software Products.\n" "\n" @@ -4656,7 +4638,7 @@ msgid "" "protected by intellectual property and copyright laws applicable to software programs.\n" "MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n" "parts, by all means and for all purposes.\n" -"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of MandrakeSoft S.A. \n" +"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of MandrakeSoft S.A. \n" "\n" "\n" "5. Governing Laws \n" @@ -4722,7 +4704,7 @@ msgid "" "Remove the boot media and press return to reboot.\n" "\n" "\n" -"For information on fixes which are available for this release of Mandrakelinux,\n" +"For information on fixes which are available for this release of Mandrake Linux,\n" "consult the Errata available from:\n" "\n" "\n" @@ -4730,7 +4712,7 @@ msgid "" "\n" "\n" "Information on configuring your system is available in the post\n" -"install chapter of the Official Mandrakelinux User's Guide." +"install chapter of the Official Mandrake Linux User's Guide." msgstr "" #: install_messages.pm:141 @@ -4743,7 +4725,7 @@ msgstr "" msgid "Duplicate mount point %s" msgstr "" -#: install_steps.pm:406 +#: install_steps.pm:410 #, c-format msgid "" "Some important packages didn't get installed properly.\n" @@ -4752,7 +4734,7 @@ msgid "" "" msgstr "" -#: install_steps.pm:535 +#: install_steps.pm:541 #, c-format msgid "No floppy drive available" msgstr "" @@ -4768,175 +4750,175 @@ msgstr "" #, c-format msgid "" "Your system is low on resources. You may have some problem installing\n" -"Mandrakelinux. If that occurs, you can try a text install instead. For this,\n" +"Mandrake Linux. If that occurs, you can try a text install instead. For this,\n" "press `F1' when booting on CDROM, then enter `text'." msgstr "" -#: install_steps_gtk.pm:232 install_steps_interactive.pm:580 +#: install_steps_gtk.pm:232 install_steps_interactive.pm:587 #, c-format msgid "Package Group Selection" msgstr "" -#: install_steps_gtk.pm:294 install_steps_interactive.pm:519 +#: install_steps_gtk.pm:292 install_steps_interactive.pm:519 #, c-format msgid "Total size: %d / %d MB" msgstr "" -#: install_steps_gtk.pm:340 +#: install_steps_gtk.pm:338 #, c-format msgid "Bad package" msgstr "" -#: install_steps_gtk.pm:342 +#: install_steps_gtk.pm:340 #, c-format msgid "Version: " msgstr "" -#: install_steps_gtk.pm:343 +#: install_steps_gtk.pm:341 #, c-format msgid "Size: " msgstr "" -#: install_steps_gtk.pm:343 +#: install_steps_gtk.pm:341 #, c-format msgid "" "%d KB\n" "" msgstr "" -#: install_steps_gtk.pm:344 +#: install_steps_gtk.pm:342 #, c-format msgid "Importance: " msgstr "" -#: install_steps_gtk.pm:377 +#: install_steps_gtk.pm:375 #, c-format msgid "You can't select/unselect this package" msgstr "" -#: install_steps_gtk.pm:381 +#: install_steps_gtk.pm:379 #, c-format msgid "due to missing %s" msgstr "" -#: install_steps_gtk.pm:382 +#: install_steps_gtk.pm:380 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: install_steps_gtk.pm:383 +#: install_steps_gtk.pm:381 #, c-format msgid "trying to promote %s" msgstr "" -#: install_steps_gtk.pm:384 +#: install_steps_gtk.pm:382 #, c-format msgid "in order to keep %s" msgstr "" -#: install_steps_gtk.pm:389 +#: install_steps_gtk.pm:387 #, c-format msgid "You can't select this package as there is not enough space left to install it" msgstr "" -#: install_steps_gtk.pm:392 +#: install_steps_gtk.pm:390 #, c-format msgid "The following packages are going to be installed" msgstr "" -#: install_steps_gtk.pm:393 +#: install_steps_gtk.pm:391 #, c-format msgid "The following packages are going to be removed" msgstr "" -#: install_steps_gtk.pm:417 +#: install_steps_gtk.pm:416 #, c-format msgid "This is a mandatory package, it can't be unselected" msgstr "" -#: install_steps_gtk.pm:419 +#: install_steps_gtk.pm:418 #, c-format msgid "You can't unselect this package. It is already installed" msgstr "" -#: install_steps_gtk.pm:422 +#: install_steps_gtk.pm:421 #, c-format msgid "" "This package must be upgraded.\n" "Are you sure you want to deselect it?" msgstr "" -#: install_steps_gtk.pm:425 +#: install_steps_gtk.pm:424 #, c-format msgid "You can't unselect this package. It must be upgraded" msgstr "" -#: install_steps_gtk.pm:430 +#: install_steps_gtk.pm:429 #, c-format msgid "Show automatically selected packages" msgstr "" -#: install_steps_gtk.pm:435 +#: install_steps_gtk.pm:434 #, c-format msgid "Load/Save on floppy" msgstr "" -#: install_steps_gtk.pm:436 +#: install_steps_gtk.pm:435 #, c-format msgid "Updating package selection" msgstr "" -#: install_steps_gtk.pm:441 +#: install_steps_gtk.pm:440 #, c-format msgid "Minimal install" msgstr "" -#: install_steps_gtk.pm:455 install_steps_interactive.pm:427 +#: install_steps_gtk.pm:454 install_steps_interactive.pm:427 #, c-format msgid "Choose the packages you want to install" msgstr "" -#: install_steps_gtk.pm:471 install_steps_interactive.pm:666 +#: install_steps_gtk.pm:470 install_steps_interactive.pm:673 #, c-format msgid "Installing" msgstr "" -#: install_steps_gtk.pm:477 +#: install_steps_gtk.pm:476 #, c-format msgid "No details" msgstr "" -#: install_steps_gtk.pm:478 +#: install_steps_gtk.pm:477 #, c-format msgid "Estimating" msgstr "" -#: install_steps_gtk.pm:484 +#: install_steps_gtk.pm:483 #, c-format msgid "Time remaining " msgstr "" -#: install_steps_gtk.pm:496 +#: install_steps_gtk.pm:495 #, c-format msgid "Please wait, preparing installation..." msgstr "" -#: install_steps_gtk.pm:557 +#: install_steps_gtk.pm:556 #, c-format msgid "%d packages" msgstr "" -#: install_steps_gtk.pm:562 +#: install_steps_gtk.pm:561 #, c-format msgid "Installing package %s" msgstr "" -#: install_steps_gtk.pm:598 install_steps_interactive.pm:88 install_steps_interactive.pm:690 +#: install_steps_gtk.pm:597 install_steps_interactive.pm:88 install_steps_interactive.pm:697 #, c-format msgid "Refuse" msgstr "" -#: install_steps_gtk.pm:599 install_steps_interactive.pm:691 +#: install_steps_gtk.pm:598 install_steps_interactive.pm:698 #, c-format msgid "" "Change your Cd-Rom!\n" @@ -4945,22 +4927,22 @@ msgid "" "If you don't have it, press Cancel to avoid installation from this Cd-Rom." msgstr "" -#: install_steps_gtk.pm:614 install_steps_interactive.pm:703 +#: install_steps_gtk.pm:613 install_steps_interactive.pm:710 #, c-format msgid "There was an error ordering packages:" msgstr "" -#: install_steps_gtk.pm:614 install_steps_gtk.pm:618 install_steps_interactive.pm:703 install_steps_interactive.pm:707 +#: install_steps_gtk.pm:613 install_steps_gtk.pm:617 install_steps_interactive.pm:710 install_steps_interactive.pm:714 #, c-format msgid "Go on anyway?" msgstr "" -#: install_steps_gtk.pm:618 install_steps_interactive.pm:707 +#: install_steps_gtk.pm:617 install_steps_interactive.pm:714 #, c-format msgid "There was an error installing packages:" msgstr "" -#: install_steps_gtk.pm:658 install_steps_interactive.pm:875 install_steps_interactive.pm:1027 +#: install_steps_gtk.pm:657 install_steps_interactive.pm:881 install_steps_interactive.pm:1029 #, c-format msgid "not configured" msgstr "" @@ -5055,7 +5037,7 @@ msgstr "" msgid "Configuring IDE" msgstr "" -#: install_steps_interactive.pm:248 network/tools.pm:195 +#: install_steps_interactive.pm:248 network/tools.pm:197 #, c-format msgid "No partition available" msgstr "" @@ -5154,37 +5136,45 @@ msgstr "" #: install_steps_interactive.pm:533 #, c-format +msgid "" +"Due to incompatibilities of the 2.6 series kernel with the LSB runtime\n" +"tests, the 2.4 series kernel will be installed as the default to insure\n" +"compliance under the \"LSB\" group selection." +msgstr "" + +#: install_steps_interactive.pm:540 +#, c-format msgid "Selected size is larger than available space" msgstr "" -#: install_steps_interactive.pm:548 +#: install_steps_interactive.pm:555 #, c-format msgid "Type of install" msgstr "" -#: install_steps_interactive.pm:549 +#: install_steps_interactive.pm:556 #, c-format msgid "" "You haven't selected any group of packages.\n" "Please choose the minimal installation you want:" msgstr "" -#: install_steps_interactive.pm:553 +#: install_steps_interactive.pm:560 #, c-format msgid "With basic documentation (recommended!)" msgstr "" -#: install_steps_interactive.pm:554 +#: install_steps_interactive.pm:561 #, c-format msgid "Truly minimal install (especially no urpmi)" msgstr "" -#: install_steps_interactive.pm:597 standalone/drakxtv:50 +#: install_steps_interactive.pm:604 standalone/drakxtv:53 #, c-format msgid "All" msgstr "" -#: install_steps_interactive.pm:641 +#: install_steps_interactive.pm:648 #, c-format msgid "" "If you have all the CDs in the list below, click Ok.\n" @@ -5192,39 +5182,39 @@ msgid "" "If only some CDs are missing, unselect them, then click Ok." msgstr "" -#: install_steps_interactive.pm:646 +#: install_steps_interactive.pm:653 #, c-format msgid "Cd-Rom labeled \"%s\"" msgstr "" -#: install_steps_interactive.pm:666 +#: install_steps_interactive.pm:673 #, c-format msgid "Preparing installation" msgstr "" -#: install_steps_interactive.pm:675 +#: install_steps_interactive.pm:682 #, c-format msgid "" "Installing package %s\n" "%d%%" msgstr "" -#: install_steps_interactive.pm:721 +#: install_steps_interactive.pm:728 #, c-format msgid "Post-install configuration" msgstr "" -#: install_steps_interactive.pm:727 +#: install_steps_interactive.pm:734 #, c-format msgid "Please insert the Boot floppy used in drive %s" msgstr "" -#: install_steps_interactive.pm:733 +#: install_steps_interactive.pm:740 #, c-format msgid "Please insert the Update Modules floppy in drive %s" msgstr "" -#: install_steps_interactive.pm:754 +#: install_steps_interactive.pm:761 #, c-format msgid "" "You now have the opportunity to download updated packages. These packages\n" @@ -5237,168 +5227,168 @@ msgid "" "Do you want to install the updates ?" msgstr "" -#: install_steps_interactive.pm:775 +#: install_steps_interactive.pm:782 #, c-format -msgid "Contacting Mandrakelinux web site to get the list of available mirrors..." +msgid "Contacting Mandrake Linux web site to get the list of available mirrors..." msgstr "" -#: install_steps_interactive.pm:780 +#: install_steps_interactive.pm:786 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: install_steps_interactive.pm:794 +#: install_steps_interactive.pm:800 #, c-format msgid "Contacting the mirror to get the list of available packages..." msgstr "" -#: install_steps_interactive.pm:798 +#: install_steps_interactive.pm:804 #, c-format msgid "Unable to contact mirror %s" msgstr "" -#: install_steps_interactive.pm:798 +#: install_steps_interactive.pm:804 #, c-format msgid "Would you like to try again?" msgstr "" -#: install_steps_interactive.pm:824 standalone/drakclock:45 +#: install_steps_interactive.pm:830 standalone/drakclock:42 #, c-format msgid "Which is your timezone?" msgstr "" -#: install_steps_interactive.pm:829 +#: install_steps_interactive.pm:835 #, c-format msgid "Automatic time synchronization (using NTP)" msgstr "" -#: install_steps_interactive.pm:837 +#: install_steps_interactive.pm:843 #, c-format msgid "NTP Server" msgstr "" -#: install_steps_interactive.pm:879 steps.pm:30 +#: install_steps_interactive.pm:885 steps.pm:30 #, c-format msgid "Summary" msgstr "" -#: install_steps_interactive.pm:892 install_steps_interactive.pm:900 install_steps_interactive.pm:918 install_steps_interactive.pm:925 install_steps_interactive.pm:1074 services.pm:135 standalone/drakbackup:1663 +#: install_steps_interactive.pm:898 install_steps_interactive.pm:906 install_steps_interactive.pm:920 install_steps_interactive.pm:927 install_steps_interactive.pm:1076 services.pm:135 standalone/drakbackup:1944 #, c-format msgid "System" msgstr "" -#: install_steps_interactive.pm:932 install_steps_interactive.pm:959 install_steps_interactive.pm:976 install_steps_interactive.pm:992 install_steps_interactive.pm:1003 +#: install_steps_interactive.pm:934 install_steps_interactive.pm:961 install_steps_interactive.pm:978 install_steps_interactive.pm:994 install_steps_interactive.pm:1005 #, c-format msgid "Hardware" msgstr "" -#: install_steps_interactive.pm:938 install_steps_interactive.pm:947 +#: install_steps_interactive.pm:940 install_steps_interactive.pm:949 #, c-format msgid "Remote CUPS server" msgstr "" -#: install_steps_interactive.pm:938 +#: install_steps_interactive.pm:940 #, c-format msgid "No printer" msgstr "" -#: install_steps_interactive.pm:980 +#: install_steps_interactive.pm:982 #, c-format msgid "Do you have an ISA sound card?" msgstr "" -#: install_steps_interactive.pm:982 +#: install_steps_interactive.pm:984 #, c-format msgid "Run \"sndconfig\" after installation to configure your sound card" msgstr "" -#: install_steps_interactive.pm:984 +#: install_steps_interactive.pm:986 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: install_steps_interactive.pm:1004 +#: install_steps_interactive.pm:1006 #, c-format msgid "Graphical interface" msgstr "" -#: install_steps_interactive.pm:1010 install_steps_interactive.pm:1025 +#: install_steps_interactive.pm:1012 install_steps_interactive.pm:1027 #, c-format msgid "Network & Internet" msgstr "" -#: install_steps_interactive.pm:1026 +#: install_steps_interactive.pm:1028 #, c-format msgid "Proxies" msgstr "" -#: install_steps_interactive.pm:1027 +#: install_steps_interactive.pm:1029 #, c-format msgid "configured" msgstr "" -#: install_steps_interactive.pm:1036 install_steps_interactive.pm:1050 steps.pm:20 +#: install_steps_interactive.pm:1038 install_steps_interactive.pm:1052 steps.pm:20 #, c-format msgid "Security" msgstr "" -#: install_steps_interactive.pm:1055 +#: install_steps_interactive.pm:1057 #, c-format msgid "activated" msgstr "" -#: install_steps_interactive.pm:1055 +#: install_steps_interactive.pm:1057 #, c-format msgid "disabled" msgstr "" -#: install_steps_interactive.pm:1064 +#: install_steps_interactive.pm:1066 #, c-format msgid "Boot" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: install_steps_interactive.pm:1068 +#: install_steps_interactive.pm:1070 #, c-format msgid "%s on %s" msgstr "" -#: install_steps_interactive.pm:1079 services.pm:177 +#: install_steps_interactive.pm:1081 services.pm:177 #, c-format msgid "Services: %d activated for %d registered" msgstr "" -#: install_steps_interactive.pm:1089 +#: install_steps_interactive.pm:1091 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: install_steps_interactive.pm:1147 +#: install_steps_interactive.pm:1149 #, c-format msgid "Set root password and network authentication methods" msgstr "" -#: install_steps_interactive.pm:1148 +#: install_steps_interactive.pm:1150 #, c-format msgid "Set root password" msgstr "" -#: install_steps_interactive.pm:1158 +#: install_steps_interactive.pm:1160 #, c-format msgid "This password is too short (it must be at least %d characters long)" msgstr "" -#: install_steps_interactive.pm:1163 network/netconnect.pm:576 standalone/drakauth:26 standalone/drakconnect:451 +#: install_steps_interactive.pm:1165 network/netconnect.pm:492 standalone/drakauth:26 standalone/drakconnect:423 standalone/drakconnect:909 #, c-format msgid "Authentication" msgstr "" -#: install_steps_interactive.pm:1194 +#: install_steps_interactive.pm:1196 #, c-format msgid "Preparing bootloader..." msgstr "" -#: install_steps_interactive.pm:1204 +#: install_steps_interactive.pm:1206 #, c-format msgid "" "You appear to have an OldWorld or Unknown\n" @@ -5407,29 +5397,29 @@ msgid "" " need to use BootX or some other means to boot your machine" msgstr "" -#: install_steps_interactive.pm:1210 +#: install_steps_interactive.pm:1212 #, c-format msgid "Do you want to use aboot?" msgstr "" -#: install_steps_interactive.pm:1213 +#: install_steps_interactive.pm:1215 #, c-format msgid "" "Error installing aboot, \n" "try to force installation even if that destroys the first partition?" msgstr "" -#: install_steps_interactive.pm:1224 +#: install_steps_interactive.pm:1226 #, c-format msgid "Installing bootloader" msgstr "" -#: install_steps_interactive.pm:1231 +#: install_steps_interactive.pm:1233 #, c-format msgid "Installation of bootloader failed. The following error occured:" msgstr "" -#: install_steps_interactive.pm:1236 +#: install_steps_interactive.pm:1238 #, c-format msgid "" "You may need to change your Open Firmware boot-device to\n" @@ -5440,27 +5430,22 @@ msgid "" "At your next boot you should see the bootloader prompt." msgstr "" -#: install_steps_interactive.pm:1249 +#: install_steps_interactive.pm:1251 #, c-format msgid "In this security level, access to the files in the Windows partition is restricted to the administrator." msgstr "" -#: install_steps_interactive.pm:1281 standalone/drakautoinst:76 +#: install_steps_interactive.pm:1283 standalone/drakautoinst:75 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "" -#: install_steps_interactive.pm:1286 -#, c-format -msgid "Please insert another floppy for drivers disk" -msgstr "" - -#: install_steps_interactive.pm:1288 +#: install_steps_interactive.pm:1287 #, c-format msgid "Creating auto install floppy..." msgstr "" -#: install_steps_interactive.pm:1300 +#: install_steps_interactive.pm:1298 #, c-format msgid "" "Some steps are not completed.\n" @@ -5468,12 +5453,12 @@ msgid "" "Do you really want to quit now?" msgstr "" -#: install_steps_interactive.pm:1315 +#: install_steps_interactive.pm:1313 #, c-format msgid "Generate auto install floppy" msgstr "" -#: install_steps_interactive.pm:1317 +#: install_steps_interactive.pm:1315 #, c-format msgid "" "The auto install can be fully automated if wanted,\n" @@ -5486,7 +5471,7 @@ msgstr "" #: install_steps_newt.pm:20 #, c-format -msgid "Mandrakelinux Installation %s" +msgid "Mandrake Linux Installation %s" msgstr "" #: install_steps_newt.pm:33 @@ -5504,7 +5489,7 @@ msgstr "" msgid "Basic" msgstr "" -#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510 +#: interactive.pm:403 interactive/newt.pm:300 ugtk2.pm:510 #, c-format msgid "Finish" msgstr "" @@ -5615,7 +5600,7 @@ msgstr "" msgid "French" msgstr "" -#: keyboard.pm:143 keyboard.pm:220 +#: keyboard.pm:143 keyboard.pm:217 #, c-format msgid "Norwegian" msgstr "" @@ -5625,22 +5610,22 @@ msgstr "" msgid "Polish" msgstr "" -#: keyboard.pm:145 keyboard.pm:229 +#: keyboard.pm:145 keyboard.pm:226 #, c-format msgid "Russian" msgstr "" -#: keyboard.pm:147 keyboard.pm:233 +#: keyboard.pm:147 keyboard.pm:230 #, c-format msgid "Swedish" msgstr "" -#: keyboard.pm:148 keyboard.pm:252 +#: keyboard.pm:148 keyboard.pm:249 #, c-format msgid "UK keyboard" msgstr "" -#: keyboard.pm:149 keyboard.pm:253 +#: keyboard.pm:149 keyboard.pm:250 #, c-format msgid "US keyboard" msgstr "" @@ -5835,312 +5820,312 @@ msgstr "" msgid "Inuktitut" msgstr "" -#: keyboard.pm:200 +#: keyboard.pm:197 #, c-format msgid "Japanese 106 keys" msgstr "" -#: keyboard.pm:201 +#: keyboard.pm:198 #, c-format msgid "Kannada" msgstr "" -#: keyboard.pm:204 +#: keyboard.pm:201 #, c-format msgid "Korean keyboard" msgstr "" -#: keyboard.pm:205 +#: keyboard.pm:202 #, c-format msgid "Latin American" msgstr "" -#: keyboard.pm:206 +#: keyboard.pm:203 #, c-format msgid "Laotian" msgstr "" -#: keyboard.pm:207 +#: keyboard.pm:204 #, c-format msgid "Lithuanian AZERTY (old)" msgstr "" -#: keyboard.pm:209 +#: keyboard.pm:206 #, c-format msgid "Lithuanian AZERTY (new)" msgstr "" -#: keyboard.pm:210 +#: keyboard.pm:207 #, c-format msgid "Lithuanian \"number row\" QWERTY" msgstr "" -#: keyboard.pm:211 +#: keyboard.pm:208 #, c-format msgid "Lithuanian \"phonetic\" QWERTY" msgstr "" -#: keyboard.pm:212 +#: keyboard.pm:209 #, c-format msgid "Latvian" msgstr "" -#: keyboard.pm:213 +#: keyboard.pm:210 #, c-format msgid "Malayalam" msgstr "" -#: keyboard.pm:214 +#: keyboard.pm:211 #, c-format msgid "Macedonian" msgstr "" -#: keyboard.pm:215 +#: keyboard.pm:212 #, c-format msgid "Myanmar (Burmese)" msgstr "" -#: keyboard.pm:216 +#: keyboard.pm:213 #, c-format msgid "Mongolian (cyrillic)" msgstr "" -#: keyboard.pm:217 +#: keyboard.pm:214 #, c-format msgid "Maltese (UK)" msgstr "" -#: keyboard.pm:218 +#: keyboard.pm:215 #, c-format msgid "Maltese (US)" msgstr "" -#: keyboard.pm:219 +#: keyboard.pm:216 #, c-format msgid "Dutch" msgstr "" -#: keyboard.pm:221 +#: keyboard.pm:218 #, c-format msgid "Oriya" msgstr "" -#: keyboard.pm:222 +#: keyboard.pm:219 #, c-format msgid "Polish (qwerty layout)" msgstr "" -#: keyboard.pm:223 +#: keyboard.pm:220 #, c-format msgid "Polish (qwertz layout)" msgstr "" -#: keyboard.pm:224 +#: keyboard.pm:221 #, c-format msgid "Portuguese" msgstr "" -#: keyboard.pm:225 +#: keyboard.pm:222 #, c-format msgid "Canadian (Quebec)" msgstr "" -#: keyboard.pm:227 +#: keyboard.pm:224 #, c-format msgid "Romanian (qwertz)" msgstr "" -#: keyboard.pm:228 +#: keyboard.pm:225 #, c-format msgid "Romanian (qwerty)" msgstr "" -#: keyboard.pm:230 +#: keyboard.pm:227 #, c-format msgid "Russian (Phonetic)" msgstr "" -#: keyboard.pm:231 +#: keyboard.pm:228 #, c-format msgid "Saami (norwegian)" msgstr "" -#: keyboard.pm:232 +#: keyboard.pm:229 #, c-format msgid "Saami (swedish/finnish)" msgstr "" -#: keyboard.pm:234 +#: keyboard.pm:231 #, c-format msgid "Slovenian" msgstr "" -#: keyboard.pm:235 +#: keyboard.pm:232 #, c-format msgid "Slovakian (QWERTZ)" msgstr "" -#: keyboard.pm:236 +#: keyboard.pm:233 #, c-format msgid "Slovakian (QWERTY)" msgstr "" -#: keyboard.pm:238 +#: keyboard.pm:235 #, c-format msgid "Serbian (cyrillic)" msgstr "" -#: keyboard.pm:239 +#: keyboard.pm:236 #, c-format msgid "Syriac" msgstr "" -#: keyboard.pm:240 +#: keyboard.pm:237 #, c-format msgid "Syriac (phonetic)" msgstr "" -#: keyboard.pm:241 +#: keyboard.pm:238 #, c-format msgid "Telugu" msgstr "" -#: keyboard.pm:243 +#: keyboard.pm:240 #, c-format msgid "Tamil (ISCII-layout)" msgstr "" -#: keyboard.pm:244 +#: keyboard.pm:241 #, c-format msgid "Tamil (Typewriter-layout)" msgstr "" -#: keyboard.pm:245 +#: keyboard.pm:242 #, c-format msgid "Thai keyboard" msgstr "" -#: keyboard.pm:247 +#: keyboard.pm:244 #, c-format msgid "Tajik keyboard" msgstr "" -#: keyboard.pm:248 +#: keyboard.pm:245 #, c-format msgid "Turkish (traditional \"F\" model)" msgstr "" -#: keyboard.pm:249 +#: keyboard.pm:246 #, c-format msgid "Turkish (modern \"Q\" model)" msgstr "" -#: keyboard.pm:251 +#: keyboard.pm:248 #, c-format msgid "Ukrainian" msgstr "" -#: keyboard.pm:254 +#: keyboard.pm:251 #, c-format msgid "US keyboard (international)" msgstr "" -#: keyboard.pm:255 +#: keyboard.pm:252 #, c-format msgid "Uzbek (cyrillic)" msgstr "" -#: keyboard.pm:256 +#: keyboard.pm:253 #, c-format msgid "Vietnamese \"numeric row\" QWERTY" msgstr "" -#: keyboard.pm:257 +#: keyboard.pm:254 #, c-format msgid "Yugoslavian (latin)" msgstr "" -#: keyboard.pm:264 +#: keyboard.pm:261 #, c-format msgid "Right Alt key" msgstr "" -#: keyboard.pm:265 +#: keyboard.pm:262 #, c-format msgid "Both Shift keys simultaneously" msgstr "" -#: keyboard.pm:266 +#: keyboard.pm:263 #, c-format msgid "Control and Shift keys simultaneously" msgstr "" -#: keyboard.pm:267 +#: keyboard.pm:264 #, c-format msgid "CapsLock key" msgstr "" -#: keyboard.pm:268 +#: keyboard.pm:265 #, c-format msgid "Ctrl and Alt keys simultaneously" msgstr "" -#: keyboard.pm:269 +#: keyboard.pm:266 #, c-format msgid "Alt and Shift keys simultaneously" msgstr "" -#: keyboard.pm:270 +#: keyboard.pm:267 #, c-format msgid "\"Menu\" key" msgstr "" -#: keyboard.pm:271 +#: keyboard.pm:268 #, c-format msgid "Left \"Windows\" key" msgstr "" -#: keyboard.pm:272 +#: keyboard.pm:269 #, c-format msgid "Right \"Windows\" key" msgstr "" -#: keyboard.pm:273 +#: keyboard.pm:270 #, c-format msgid "Both Control keys simultaneously" msgstr "" -#: keyboard.pm:274 +#: keyboard.pm:271 #, c-format msgid "Both Alt keys simultaneously" msgstr "" -#: keyboard.pm:275 +#: keyboard.pm:272 #, c-format msgid "Left Shift key" msgstr "" -#: keyboard.pm:276 +#: keyboard.pm:273 #, c-format msgid "Right Shift key" msgstr "" -#: keyboard.pm:277 +#: keyboard.pm:274 #, c-format msgid "Left Alt key" msgstr "" -#: keyboard.pm:278 +#: keyboard.pm:275 #, c-format msgid "Left Control key" msgstr "" -#: keyboard.pm:279 +#: keyboard.pm:276 #, c-format msgid "Right Control key" msgstr "" -#: keyboard.pm:310 +#: keyboard.pm:307 #, c-format msgid "" "Here you can choose the key or key combination that will \n" @@ -6148,7 +6133,7 @@ msgid "" "(eg: latin and non latin)" msgstr "" -#: keyboard.pm:315 +#: keyboard.pm:312 #, c-format msgid "" "This setting will be activated after the installation.\n" @@ -6156,1142 +6141,1142 @@ msgid "" "key to switch between the different keyboard layouts." msgstr "" -#: lang.pm:151 +#: lang.pm:144 #, c-format msgid "default:LTR" msgstr "" -#: lang.pm:167 +#: lang.pm:160 #, c-format msgid "Afghanistan" msgstr "" -#: lang.pm:168 +#: lang.pm:161 #, c-format msgid "Andorra" msgstr "" -#: lang.pm:169 +#: lang.pm:162 #, c-format msgid "United Arab Emirates" msgstr "" -#: lang.pm:170 +#: lang.pm:163 #, c-format msgid "Antigua and Barbuda" msgstr "" -#: lang.pm:171 +#: lang.pm:164 #, c-format msgid "Anguilla" msgstr "" -#: lang.pm:172 +#: lang.pm:165 #, c-format msgid "Albania" msgstr "" -#: lang.pm:173 +#: lang.pm:166 #, c-format msgid "Armenia" msgstr "" -#: lang.pm:174 +#: lang.pm:167 #, c-format msgid "Netherlands Antilles" msgstr "" -#: lang.pm:175 +#: lang.pm:168 #, c-format msgid "Angola" msgstr "" -#: lang.pm:176 +#: lang.pm:169 #, c-format msgid "Antarctica" msgstr "" -#: lang.pm:177 standalone/drakxtv:48 +#: lang.pm:170 standalone/drakxtv:51 #, c-format msgid "Argentina" msgstr "" -#: lang.pm:178 +#: lang.pm:171 #, c-format msgid "American Samoa" msgstr "" -#: lang.pm:180 standalone/drakxtv:46 +#: lang.pm:173 standalone/drakxtv:49 #, c-format msgid "Australia" msgstr "" -#: lang.pm:181 +#: lang.pm:174 #, c-format msgid "Aruba" msgstr "" -#: lang.pm:182 +#: lang.pm:175 #, c-format msgid "Azerbaijan" msgstr "" -#: lang.pm:183 +#: lang.pm:176 #, c-format msgid "Bosnia and Herzegovina" msgstr "" -#: lang.pm:184 +#: lang.pm:177 #, c-format msgid "Barbados" msgstr "" -#: lang.pm:185 +#: lang.pm:178 #, c-format msgid "Bangladesh" msgstr "" -#: lang.pm:187 +#: lang.pm:180 #, c-format msgid "Burkina Faso" msgstr "" -#: lang.pm:188 +#: lang.pm:181 #, c-format msgid "Bulgaria" msgstr "" -#: lang.pm:189 +#: lang.pm:182 #, c-format msgid "Bahrain" msgstr "" -#: lang.pm:190 +#: lang.pm:183 #, c-format msgid "Burundi" msgstr "" -#: lang.pm:191 +#: lang.pm:184 #, c-format msgid "Benin" msgstr "" -#: lang.pm:192 +#: lang.pm:185 #, c-format msgid "Bermuda" msgstr "" -#: lang.pm:193 +#: lang.pm:186 #, c-format msgid "Brunei Darussalam" msgstr "" -#: lang.pm:194 +#: lang.pm:187 #, c-format msgid "Bolivia" msgstr "" -#: lang.pm:195 +#: lang.pm:188 #, c-format msgid "Brazil" msgstr "" -#: lang.pm:196 +#: lang.pm:189 #, c-format msgid "Bahamas" msgstr "" -#: lang.pm:197 +#: lang.pm:190 #, c-format msgid "Bhutan" msgstr "" -#: lang.pm:198 +#: lang.pm:191 #, c-format msgid "Bouvet Island" msgstr "" -#: lang.pm:199 +#: lang.pm:192 #, c-format msgid "Botswana" msgstr "" -#: lang.pm:200 +#: lang.pm:193 #, c-format msgid "Belarus" msgstr "" -#: lang.pm:201 +#: lang.pm:194 #, c-format msgid "Belize" msgstr "" -#: lang.pm:202 +#: lang.pm:195 #, c-format msgid "Canada" msgstr "" -#: lang.pm:203 +#: lang.pm:196 #, c-format msgid "Cocos (Keeling) Islands" msgstr "" -#: lang.pm:204 +#: lang.pm:197 #, c-format msgid "Congo (Kinshasa)" msgstr "" -#: lang.pm:205 +#: lang.pm:198 #, c-format msgid "Central African Republic" msgstr "" -#: lang.pm:206 +#: lang.pm:199 #, c-format msgid "Congo (Brazzaville)" msgstr "" -#: lang.pm:207 +#: lang.pm:200 #, c-format msgid "Switzerland" msgstr "" -#: lang.pm:208 +#: lang.pm:201 #, c-format msgid "Cote d'Ivoire" msgstr "" -#: lang.pm:209 +#: lang.pm:202 #, c-format msgid "Cook Islands" msgstr "" -#: lang.pm:210 +#: lang.pm:203 #, c-format msgid "Chile" msgstr "" -#: lang.pm:211 +#: lang.pm:204 #, c-format msgid "Cameroon" msgstr "" -#: lang.pm:212 +#: lang.pm:205 #, c-format msgid "China" msgstr "" -#: lang.pm:213 +#: lang.pm:206 #, c-format msgid "Colombia" msgstr "" -#: lang.pm:215 +#: lang.pm:208 #, c-format msgid "Cuba" msgstr "" -#: lang.pm:216 +#: lang.pm:209 #, c-format msgid "Cape Verde" msgstr "" -#: lang.pm:217 +#: lang.pm:210 #, c-format msgid "Christmas Island" msgstr "" -#: lang.pm:218 +#: lang.pm:211 #, c-format msgid "Cyprus" msgstr "" -#: lang.pm:221 +#: lang.pm:214 #, c-format msgid "Djibouti" msgstr "" -#: lang.pm:222 +#: lang.pm:215 #, c-format msgid "Denmark" msgstr "" -#: lang.pm:223 +#: lang.pm:216 #, c-format msgid "Dominica" msgstr "" -#: lang.pm:224 +#: lang.pm:217 #, c-format msgid "Dominican Republic" msgstr "" -#: lang.pm:225 +#: lang.pm:218 #, c-format msgid "Algeria" msgstr "" -#: lang.pm:226 +#: lang.pm:219 #, c-format msgid "Ecuador" msgstr "" -#: lang.pm:227 +#: lang.pm:220 #, c-format msgid "Estonia" msgstr "" -#: lang.pm:228 +#: lang.pm:221 #, c-format msgid "Egypt" msgstr "" -#: lang.pm:229 +#: lang.pm:222 #, c-format msgid "Western Sahara" msgstr "" -#: lang.pm:230 +#: lang.pm:223 #, c-format msgid "Eritrea" msgstr "" -#: lang.pm:231 network/adsl_consts.pm:202 network/adsl_consts.pm:210 network/adsl_consts.pm:219 network/adsl_consts.pm:230 +#: lang.pm:224 network/adsl_consts.pm:193 network/adsl_consts.pm:200 network/adsl_consts.pm:209 network/adsl_consts.pm:220 #, c-format msgid "Spain" msgstr "" -#: lang.pm:232 +#: lang.pm:225 #, c-format msgid "Ethiopia" msgstr "" -#: lang.pm:233 network/adsl_consts.pm:127 +#: lang.pm:226 network/adsl_consts.pm:119 #, c-format msgid "Finland" msgstr "" -#: lang.pm:234 +#: lang.pm:227 #, c-format msgid "Fiji" msgstr "" -#: lang.pm:235 +#: lang.pm:228 #, c-format msgid "Falkland Islands (Malvinas)" msgstr "" -#: lang.pm:236 +#: lang.pm:229 #, c-format msgid "Micronesia" msgstr "" -#: lang.pm:237 +#: lang.pm:230 #, c-format msgid "Faroe Islands" msgstr "" -#: lang.pm:239 +#: lang.pm:232 #, c-format msgid "Gabon" msgstr "" -#: lang.pm:240 network/adsl_consts.pm:247 network/adsl_consts.pm:255 network/netconnect.pm:51 +#: lang.pm:233 network/adsl_consts.pm:237 network/adsl_consts.pm:244 network/netconnect.pm:51 #, c-format msgid "United Kingdom" msgstr "" -#: lang.pm:241 +#: lang.pm:234 #, c-format msgid "Grenada" msgstr "" -#: lang.pm:242 +#: lang.pm:235 #, c-format msgid "Georgia" msgstr "" -#: lang.pm:243 +#: lang.pm:236 #, c-format msgid "French Guiana" msgstr "" -#: lang.pm:244 +#: lang.pm:237 #, c-format msgid "Ghana" msgstr "" -#: lang.pm:245 +#: lang.pm:238 #, c-format msgid "Gibraltar" msgstr "" -#: lang.pm:246 +#: lang.pm:239 #, c-format msgid "Greenland" msgstr "" -#: lang.pm:247 +#: lang.pm:240 #, c-format msgid "Gambia" msgstr "" -#: lang.pm:248 +#: lang.pm:241 #, c-format msgid "Guinea" msgstr "" -#: lang.pm:249 +#: lang.pm:242 #, c-format msgid "Guadeloupe" msgstr "" -#: lang.pm:250 +#: lang.pm:243 #, c-format msgid "Equatorial Guinea" msgstr "" -#: lang.pm:252 +#: lang.pm:245 #, c-format msgid "South Georgia and the South Sandwich Islands" msgstr "" -#: lang.pm:253 +#: lang.pm:246 #, c-format msgid "Guatemala" msgstr "" -#: lang.pm:254 +#: lang.pm:247 #, c-format msgid "Guam" msgstr "" -#: lang.pm:255 +#: lang.pm:248 #, c-format msgid "Guinea-Bissau" msgstr "" -#: lang.pm:256 +#: lang.pm:249 #, c-format msgid "Guyana" msgstr "" -#: lang.pm:257 +#: lang.pm:250 #, c-format msgid "China (Hong Kong)" msgstr "" -#: lang.pm:258 +#: lang.pm:251 #, c-format msgid "Heard and McDonald Islands" msgstr "" -#: lang.pm:259 +#: lang.pm:252 #, c-format msgid "Honduras" msgstr "" -#: lang.pm:260 +#: lang.pm:253 #, c-format msgid "Croatia" msgstr "" -#: lang.pm:261 +#: lang.pm:254 #, c-format msgid "Haiti" msgstr "" -#: lang.pm:262 network/adsl_consts.pm:152 +#: lang.pm:255 network/adsl_consts.pm:144 #, c-format msgid "Hungary" msgstr "" -#: lang.pm:263 +#: lang.pm:256 #, c-format msgid "Indonesia" msgstr "" -#: lang.pm:264 standalone/drakxtv:45 +#: lang.pm:257 standalone/drakxtv:48 #, c-format msgid "Ireland" msgstr "" -#: lang.pm:265 +#: lang.pm:258 #, c-format msgid "Israel" msgstr "" -#: lang.pm:266 +#: lang.pm:259 #, c-format msgid "India" msgstr "" -#: lang.pm:267 +#: lang.pm:260 #, c-format msgid "British Indian Ocean Territory" msgstr "" -#: lang.pm:268 +#: lang.pm:261 #, c-format msgid "Iraq" msgstr "" -#: lang.pm:269 +#: lang.pm:262 #, c-format msgid "Iran" msgstr "" -#: lang.pm:270 +#: lang.pm:263 #, c-format msgid "Iceland" msgstr "" -#: lang.pm:272 +#: lang.pm:265 #, c-format msgid "Jamaica" msgstr "" -#: lang.pm:273 +#: lang.pm:266 #, c-format msgid "Jordan" msgstr "" -#: lang.pm:274 +#: lang.pm:267 #, c-format msgid "Japan" msgstr "" -#: lang.pm:275 +#: lang.pm:268 #, c-format msgid "Kenya" msgstr "" -#: lang.pm:276 +#: lang.pm:269 #, c-format msgid "Kyrgyzstan" msgstr "" -#: lang.pm:277 +#: lang.pm:270 #, c-format msgid "Cambodia" msgstr "" -#: lang.pm:278 +#: lang.pm:271 #, c-format msgid "Kiribati" msgstr "" -#: lang.pm:279 +#: lang.pm:272 #, c-format msgid "Comoros" msgstr "" -#: lang.pm:280 +#: lang.pm:273 #, c-format msgid "Saint Kitts and Nevis" msgstr "" -#: lang.pm:281 +#: lang.pm:274 #, c-format msgid "Korea (North)" msgstr "" -#: lang.pm:282 +#: lang.pm:275 #, c-format msgid "Korea" msgstr "" -#: lang.pm:283 +#: lang.pm:276 #, c-format msgid "Kuwait" msgstr "" -#: lang.pm:284 +#: lang.pm:277 #, c-format msgid "Cayman Islands" msgstr "" -#: lang.pm:285 +#: lang.pm:278 #, c-format msgid "Kazakhstan" msgstr "" -#: lang.pm:286 +#: lang.pm:279 #, c-format msgid "Laos" msgstr "" -#: lang.pm:287 +#: lang.pm:280 #, c-format msgid "Lebanon" msgstr "" -#: lang.pm:288 +#: lang.pm:281 #, c-format msgid "Saint Lucia" msgstr "" -#: lang.pm:289 +#: lang.pm:282 #, c-format msgid "Liechtenstein" msgstr "" -#: lang.pm:290 +#: lang.pm:283 #, c-format msgid "Sri Lanka" msgstr "" -#: lang.pm:291 +#: lang.pm:284 #, c-format msgid "Liberia" msgstr "" -#: lang.pm:292 +#: lang.pm:285 #, c-format msgid "Lesotho" msgstr "" -#: lang.pm:293 +#: lang.pm:286 #, c-format msgid "Lithuania" msgstr "" -#: lang.pm:294 +#: lang.pm:287 #, c-format msgid "Luxembourg" msgstr "" -#: lang.pm:295 +#: lang.pm:288 #, c-format msgid "Latvia" msgstr "" -#: lang.pm:296 +#: lang.pm:289 #, c-format msgid "Libya" msgstr "" -#: lang.pm:297 +#: lang.pm:290 #, c-format msgid "Morocco" msgstr "" -#: lang.pm:298 +#: lang.pm:291 #, c-format msgid "Monaco" msgstr "" -#: lang.pm:299 +#: lang.pm:292 #, c-format msgid "Moldova" msgstr "" -#: lang.pm:300 +#: lang.pm:293 #, c-format msgid "Madagascar" msgstr "" -#: lang.pm:301 +#: lang.pm:294 #, c-format msgid "Marshall Islands" msgstr "" -#: lang.pm:302 +#: lang.pm:295 #, c-format msgid "Macedonia" msgstr "" -#: lang.pm:303 +#: lang.pm:296 #, c-format msgid "Mali" msgstr "" -#: lang.pm:304 +#: lang.pm:297 #, c-format msgid "Myanmar" msgstr "" -#: lang.pm:305 +#: lang.pm:298 #, c-format msgid "Mongolia" msgstr "" -#: lang.pm:306 +#: lang.pm:299 #, c-format msgid "Northern Mariana Islands" msgstr "" -#: lang.pm:307 +#: lang.pm:300 #, c-format msgid "Martinique" msgstr "" -#: lang.pm:308 +#: lang.pm:301 #, c-format msgid "Mauritania" msgstr "" -#: lang.pm:309 +#: lang.pm:302 #, c-format msgid "Montserrat" msgstr "" -#: lang.pm:310 +#: lang.pm:303 #, c-format msgid "Malta" msgstr "" -#: lang.pm:311 +#: lang.pm:304 #, c-format msgid "Mauritius" msgstr "" -#: lang.pm:312 +#: lang.pm:305 #, c-format msgid "Maldives" msgstr "" -#: lang.pm:313 +#: lang.pm:306 #, c-format msgid "Malawi" msgstr "" -#: lang.pm:314 +#: lang.pm:307 #, c-format msgid "Mexico" msgstr "" -#: lang.pm:315 +#: lang.pm:308 #, c-format msgid "Malaysia" msgstr "" -#: lang.pm:316 +#: lang.pm:309 #, c-format msgid "Mozambique" msgstr "" -#: lang.pm:317 +#: lang.pm:310 #, c-format msgid "Namibia" msgstr "" -#: lang.pm:318 +#: lang.pm:311 #, c-format msgid "New Caledonia" msgstr "" -#: lang.pm:319 +#: lang.pm:312 #, c-format msgid "Niger" msgstr "" -#: lang.pm:320 +#: lang.pm:313 #, c-format msgid "Norfolk Island" msgstr "" -#: lang.pm:321 +#: lang.pm:314 #, c-format msgid "Nigeria" msgstr "" -#: lang.pm:322 +#: lang.pm:315 #, c-format msgid "Nicaragua" msgstr "" -#: lang.pm:325 +#: lang.pm:318 #, c-format msgid "Nepal" msgstr "" -#: lang.pm:326 +#: lang.pm:319 #, c-format msgid "Nauru" msgstr "" -#: lang.pm:327 +#: lang.pm:320 #, c-format msgid "Niue" msgstr "" -#: lang.pm:328 +#: lang.pm:321 #, c-format msgid "New Zealand" msgstr "" -#: lang.pm:329 +#: lang.pm:322 #, c-format msgid "Oman" msgstr "" -#: lang.pm:330 +#: lang.pm:323 #, c-format msgid "Panama" msgstr "" -#: lang.pm:331 +#: lang.pm:324 #, c-format msgid "Peru" msgstr "" -#: lang.pm:332 +#: lang.pm:325 #, c-format msgid "French Polynesia" msgstr "" -#: lang.pm:333 +#: lang.pm:326 #, c-format msgid "Papua New Guinea" msgstr "" -#: lang.pm:334 +#: lang.pm:327 #, c-format msgid "Philippines" msgstr "" -#: lang.pm:335 +#: lang.pm:328 #, c-format msgid "Pakistan" msgstr "" -#: lang.pm:336 network/adsl_consts.pm:186 +#: lang.pm:329 network/adsl_consts.pm:177 #, c-format msgid "Poland" msgstr "" -#: lang.pm:337 +#: lang.pm:330 #, c-format msgid "Saint Pierre and Miquelon" msgstr "" -#: lang.pm:338 +#: lang.pm:331 #, c-format msgid "Pitcairn" msgstr "" -#: lang.pm:339 +#: lang.pm:332 #, c-format msgid "Puerto Rico" msgstr "" -#: lang.pm:340 +#: lang.pm:333 #, c-format msgid "Palestine" msgstr "" -#: lang.pm:341 network/adsl_consts.pm:196 +#: lang.pm:334 network/adsl_consts.pm:187 #, c-format msgid "Portugal" msgstr "" -#: lang.pm:342 +#: lang.pm:335 #, c-format msgid "Paraguay" msgstr "" -#: lang.pm:343 +#: lang.pm:336 #, c-format msgid "Palau" msgstr "" -#: lang.pm:344 +#: lang.pm:337 #, c-format msgid "Qatar" msgstr "" -#: lang.pm:345 +#: lang.pm:338 #, c-format msgid "Reunion" msgstr "" -#: lang.pm:346 +#: lang.pm:339 #, c-format msgid "Romania" msgstr "" -#: lang.pm:347 +#: lang.pm:340 #, c-format msgid "Russia" msgstr "" -#: lang.pm:348 +#: lang.pm:341 #, c-format msgid "Rwanda" msgstr "" -#: lang.pm:349 +#: lang.pm:342 #, c-format msgid "Saudi Arabia" msgstr "" -#: lang.pm:350 +#: lang.pm:343 #, c-format msgid "Solomon Islands" msgstr "" -#: lang.pm:351 +#: lang.pm:344 #, c-format msgid "Seychelles" msgstr "" -#: lang.pm:352 +#: lang.pm:345 #, c-format msgid "Sudan" msgstr "" -#: lang.pm:354 +#: lang.pm:347 #, c-format msgid "Singapore" msgstr "" -#: lang.pm:355 +#: lang.pm:348 #, c-format msgid "Saint Helena" msgstr "" -#: lang.pm:356 +#: lang.pm:349 #, c-format msgid "Slovenia" msgstr "" -#: lang.pm:357 +#: lang.pm:350 #, c-format msgid "Svalbard and Jan Mayen Islands" msgstr "" -#: lang.pm:358 +#: lang.pm:351 #, c-format msgid "Slovakia" msgstr "" -#: lang.pm:359 +#: lang.pm:352 #, c-format msgid "Sierra Leone" msgstr "" -#: lang.pm:360 +#: lang.pm:353 #, c-format msgid "San Marino" msgstr "" -#: lang.pm:361 +#: lang.pm:354 #, c-format msgid "Senegal" msgstr "" -#: lang.pm:362 +#: lang.pm:355 #, c-format msgid "Somalia" msgstr "" -#: lang.pm:363 +#: lang.pm:356 #, c-format msgid "Suriname" msgstr "" -#: lang.pm:364 +#: lang.pm:357 #, c-format msgid "Sao Tome and Principe" msgstr "" -#: lang.pm:365 +#: lang.pm:358 #, c-format msgid "El Salvador" msgstr "" -#: lang.pm:366 +#: lang.pm:359 #, c-format msgid "Syria" msgstr "" -#: lang.pm:367 +#: lang.pm:360 #, c-format msgid "Swaziland" msgstr "" -#: lang.pm:368 +#: lang.pm:361 #, c-format msgid "Turks and Caicos Islands" msgstr "" -#: lang.pm:369 +#: lang.pm:362 #, c-format msgid "Chad" msgstr "" -#: lang.pm:370 +#: lang.pm:363 #, c-format msgid "French Southern Territories" msgstr "" -#: lang.pm:371 +#: lang.pm:364 #, c-format msgid "Togo" msgstr "" -#: lang.pm:372 +#: lang.pm:365 #, c-format msgid "Thailand" msgstr "" -#: lang.pm:373 +#: lang.pm:366 #, c-format msgid "Tajikistan" msgstr "" -#: lang.pm:374 +#: lang.pm:367 #, c-format msgid "Tokelau" msgstr "" -#: lang.pm:375 +#: lang.pm:368 #, c-format msgid "East Timor" msgstr "" -#: lang.pm:376 +#: lang.pm:369 #, c-format msgid "Turkmenistan" msgstr "" -#: lang.pm:377 +#: lang.pm:370 #, c-format msgid "Tunisia" msgstr "" -#: lang.pm:378 +#: lang.pm:371 #, c-format msgid "Tonga" msgstr "" -#: lang.pm:379 +#: lang.pm:372 #, c-format msgid "Turkey" msgstr "" -#: lang.pm:380 +#: lang.pm:373 #, c-format msgid "Trinidad and Tobago" msgstr "" -#: lang.pm:381 +#: lang.pm:374 #, c-format msgid "Tuvalu" msgstr "" -#: lang.pm:382 +#: lang.pm:375 #, c-format msgid "Taiwan" msgstr "" -#: lang.pm:383 +#: lang.pm:376 #, c-format msgid "Tanzania" msgstr "" -#: lang.pm:384 +#: lang.pm:377 #, c-format msgid "Ukraine" msgstr "" -#: lang.pm:385 +#: lang.pm:378 #, c-format msgid "Uganda" msgstr "" -#: lang.pm:386 +#: lang.pm:379 #, c-format msgid "United States Minor Outlying Islands" msgstr "" -#: lang.pm:388 +#: lang.pm:381 #, c-format msgid "Uruguay" msgstr "" -#: lang.pm:389 +#: lang.pm:382 #, c-format msgid "Uzbekistan" msgstr "" -#: lang.pm:390 +#: lang.pm:383 #, c-format msgid "Vatican" msgstr "" -#: lang.pm:391 +#: lang.pm:384 #, c-format msgid "Saint Vincent and the Grenadines" msgstr "" -#: lang.pm:392 +#: lang.pm:385 #, c-format msgid "Venezuela" msgstr "" -#: lang.pm:393 +#: lang.pm:386 #, c-format msgid "Virgin Islands (British)" msgstr "" -#: lang.pm:394 +#: lang.pm:387 #, c-format msgid "Virgin Islands (U.S.)" msgstr "" -#: lang.pm:395 +#: lang.pm:388 #, c-format msgid "Vietnam" msgstr "" -#: lang.pm:396 +#: lang.pm:389 #, c-format msgid "Vanuatu" msgstr "" -#: lang.pm:397 +#: lang.pm:390 #, c-format msgid "Wallis and Futuna" msgstr "" -#: lang.pm:398 +#: lang.pm:391 #, c-format msgid "Samoa" msgstr "" -#: lang.pm:399 +#: lang.pm:392 #, c-format msgid "Yemen" msgstr "" -#: lang.pm:400 +#: lang.pm:393 #, c-format msgid "Mayotte" msgstr "" -#: lang.pm:401 +#: lang.pm:394 #, c-format msgid "Serbia & Montenegro" msgstr "" -#: lang.pm:402 standalone/drakxtv:47 +#: lang.pm:395 standalone/drakxtv:50 #, c-format msgid "South Africa" msgstr "" -#: lang.pm:403 +#: lang.pm:396 #, c-format msgid "Zambia" msgstr "" -#: lang.pm:404 +#: lang.pm:397 #, c-format msgid "Zimbabwe" msgstr "" -#: lang.pm:985 +#: lang.pm:967 #, c-format msgid "Welcome to %s" msgstr "" @@ -7310,7 +7295,7 @@ msgid "" "" msgstr "" -#: modules/interactive.pm:21 standalone/drakconnect:969 +#: modules/interactive.pm:21 standalone/drakconnect:954 #, c-format msgid "Parameters" msgstr "" @@ -7465,7 +7450,7 @@ msgstr "" msgid "GlidePoint" msgstr "" -#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/modem.pm:58 network/modem.pm:72 network/modem.pm:77 network/modem.pm:108 network/netconnect.pm:587 network/netconnect.pm:592 network/netconnect.pm:604 network/netconnect.pm:609 network/netconnect.pm:625 network/netconnect.pm:627 +#: mouse.pm:36 network/modem.pm:23 network/modem.pm:37 network/modem.pm:42 network/modem.pm:73 network/netconnect.pm:481 network/netconnect.pm:482 network/netconnect.pm:483 network/netconnect.pm:503 network/netconnect.pm:508 network/netconnect.pm:520 network/netconnect.pm:525 network/netconnect.pm:541 network/netconnect.pm:543 #, c-format msgid "Automatic" msgstr "" @@ -7610,7 +7595,7 @@ msgstr "" msgid "Any PS/2 & USB mice" msgstr "" -#: mouse.pm:92 standalone/drakvpn:1140 +#: mouse.pm:92 #, c-format msgid "none" msgstr "" @@ -7620,17 +7605,17 @@ msgstr "" msgid "No mouse" msgstr "" -#: mouse.pm:515 +#: mouse.pm:512 #, c-format msgid "Please test the mouse" msgstr "" -#: mouse.pm:517 +#: mouse.pm:514 #, c-format msgid "To activate the mouse," msgstr "" -#: mouse.pm:518 +#: mouse.pm:515 #, c-format msgid "MOVE YOUR WHEEL!" msgstr "" @@ -7670,12 +7655,12 @@ msgstr "" msgid "Sagem (using dhcp) usb" msgstr "" -#: network/adsl.pm:35 network/netconnect.pm:769 +#: network/adsl.pm:35 network/netconnect.pm:679 #, c-format msgid "Connect to the Internet" msgstr "" -#: network/adsl.pm:36 network/netconnect.pm:770 +#: network/adsl.pm:36 network/netconnect.pm:680 #, c-format msgid "" "The most common way to connect with adsl is pppoe.\n" @@ -7683,7 +7668,7 @@ msgid "" "If you don't know, choose 'use pppoe'" msgstr "" -#: network/adsl.pm:41 network/netconnect.pm:774 +#: network/adsl.pm:41 network/netconnect.pm:684 #, c-format msgid "ADSL connection type :" msgstr "" @@ -7748,7 +7733,7 @@ msgstr "" msgid "" "drakfirewall configurator\n" "\n" -"This configures a personal firewall for this Mandrakelinux machine.\n" +"This configures a personal firewall for this Mandrake Linux machine.\n" "For a powerful and dedicated firewall solution, please look to the\n" "specialized MandrakeSecurity Firewall distribution." msgstr "" @@ -7771,7 +7756,7 @@ msgstr "" #, c-format msgid "" "You can enter miscellaneous ports. \n" -"Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n" +"Valid examples are: 139/tcp 139/udp.\n" "Have a look at /etc/services for information." msgstr "" @@ -7795,265 +7780,307 @@ msgstr "" msgid "Other ports" msgstr "" -#: network/isdn.pm:115 network/netconnect.pm:437 +#: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157 network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183 network/netconnect.pm:332 #, c-format -msgid "Unlisted - edit manually" +msgid "ISDN Configuration" msgstr "" -#: network/isdn.pm:157 network/netconnect.pm:389 +#: network/isdn.pm:127 #, c-format -msgid "ISA / PCMCIA" +msgid "" +"Select your provider.\n" +"If it isn't listed, choose Unlisted." msgstr "" -#: network/isdn.pm:157 network/netconnect.pm:389 +#: network/isdn.pm:140 standalone/drakconnect:498 #, c-format -msgid "I don't know" +msgid "European protocol (EDSS1)" +msgstr "" + +#: network/isdn.pm:140 +#, c-format +msgid "European protocol" +msgstr "" + +#: network/isdn.pm:142 standalone/drakconnect:499 +#, c-format +msgid "" +"Protocol for the rest of the world\n" +"No D-Channel (leased lines)" +msgstr "" + +#: network/isdn.pm:142 +#, c-format +msgid "Protocol for the rest of the world" +msgstr "" + +#: network/isdn.pm:146 +#, c-format +msgid "Which protocol do you want to use?" +msgstr "" + +#: network/isdn.pm:157 +#, c-format +msgid "Found \"%s\" interface do you want to use it ?" msgstr "" -#: network/isdn.pm:158 network/netconnect.pm:389 +#: network/isdn.pm:164 +#, c-format +msgid "What kind of card do you have?" +msgstr "" + +#: network/isdn.pm:165 +#, c-format +msgid "ISA / PCMCIA" +msgstr "" + +#: network/isdn.pm:165 #, c-format msgid "PCI" msgstr "" -#: network/isdn.pm:159 network/netconnect.pm:389 +#: network/isdn.pm:165 #, c-format msgid "USB" msgstr "" -#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/netconnect.pm:592 network/netconnect.pm:609 network/netconnect.pm:625 +#: network/isdn.pm:165 #, c-format -msgid "Manual" +msgid "I don't know" +msgstr "" + +#: network/isdn.pm:174 +#, c-format +msgid "" +"\n" +"If you have an ISA card, the values on the next screen should be right.\n" +"\n" +"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.\n" +"" msgstr "" -#: network/netconnect.pm:88 network/netconnect.pm:466 network/netconnect.pm:476 network/netconnect.pm:837 network/netconnect.pm:842 +#: network/isdn.pm:178 #, c-format -msgid "Manual choice" +msgid "Continue" msgstr "" -#: network/netconnect.pm:88 +#: network/isdn.pm:178 #, c-format -msgid "Internal ISDN card" +msgid "Abort" msgstr "" -#: network/netconnect.pm:97 +#: network/isdn.pm:184 +#, c-format +msgid "Which of the following is your ISDN card?" +msgstr "" + +#: network/netconnect.pm:95 #, c-format msgid "Ad-hoc" msgstr "" -#: network/netconnect.pm:98 +#: network/netconnect.pm:96 #, c-format msgid "Managed" msgstr "" -#: network/netconnect.pm:99 +#: network/netconnect.pm:97 #, c-format msgid "Master" msgstr "" -#: network/netconnect.pm:100 +#: network/netconnect.pm:98 #, c-format msgid "Repeater" msgstr "" -#: network/netconnect.pm:101 +#: network/netconnect.pm:99 #, c-format msgid "Secondary" msgstr "" -#: network/netconnect.pm:102 +#: network/netconnect.pm:100 #, c-format msgid "Auto" msgstr "" -#: network/netconnect.pm:105 printer/printerdrake.pm:1133 standalone/drakups:64 +#: network/netconnect.pm:103 printer/printerdrake.pm:1114 #, c-format msgid "Manual configuration" msgstr "" -#: network/netconnect.pm:106 +#: network/netconnect.pm:104 #, c-format msgid "Automatic IP (BOOTP/DHCP)" msgstr "" -#: network/netconnect.pm:108 +#: network/netconnect.pm:106 #, c-format msgid "Automatic IP (BOOTP/DHCP/Zeroconf)" msgstr "" -#: network/netconnect.pm:111 -#, c-format -msgid "Protocol for the rest of the world" -msgstr "" - -#: network/netconnect.pm:113 standalone/drakconnect:528 -#, c-format -msgid "European protocol (EDSS1)" -msgstr "" - -#: network/netconnect.pm:114 standalone/drakconnect:529 +#: network/netconnect.pm:156 #, c-format -msgid "" -"Protocol for the rest of the world\n" -"No D-Channel (leased lines)" +msgid "Alcatel speedtouch USB modem" msgstr "" -#: network/netconnect.pm:146 +#: network/netconnect.pm:157 #, c-format -msgid "Alcatel speedtouch USB modem" +msgid "Sagem USB modem" msgstr "" -#: network/netconnect.pm:147 +#: network/netconnect.pm:158 #, c-format -msgid "Sagem USB modem" +msgid "Bewan USB modem" msgstr "" -#: network/netconnect.pm:148 +#: network/netconnect.pm:159 #, c-format -msgid "Bewan modem" +msgid "Bewan PCI modem" msgstr "" -#: network/netconnect.pm:149 +#: network/netconnect.pm:160 #, c-format msgid "ECI Hi-Focus modem" msgstr "" -#: network/netconnect.pm:153 +#: network/netconnect.pm:164 #, c-format msgid "Dynamic Host Configuration Protocol (DHCP)" msgstr "" -#: network/netconnect.pm:154 +#: network/netconnect.pm:165 #, c-format msgid "Manual TCP/IP configuration" msgstr "" -#: network/netconnect.pm:155 +#: network/netconnect.pm:166 #, c-format msgid "Point to Point Tunneling Protocol (PPTP)" msgstr "" -#: network/netconnect.pm:156 +#: network/netconnect.pm:167 #, c-format msgid "PPP over Ethernet (PPPoE)" msgstr "" -#: network/netconnect.pm:157 +#: network/netconnect.pm:168 #, c-format msgid "PPP over ATM (PPPoA)" msgstr "" -#: network/netconnect.pm:161 +#: network/netconnect.pm:172 #, c-format msgid "Bridged Ethernet LLC" msgstr "" -#: network/netconnect.pm:162 +#: network/netconnect.pm:173 #, c-format msgid "Bridged Ethernet VC" msgstr "" -#: network/netconnect.pm:163 +#: network/netconnect.pm:174 #, c-format msgid "Routed IP LLC" msgstr "" -#: network/netconnect.pm:164 +#: network/netconnect.pm:175 #, c-format msgid "Routed IP VC" msgstr "" -#: network/netconnect.pm:165 +#: network/netconnect.pm:176 #, c-format msgid "PPPOA LLC" msgstr "" -#: network/netconnect.pm:166 +#: network/netconnect.pm:177 #, c-format msgid "PPPOA VC" msgstr "" -#: network/netconnect.pm:170 standalone/drakconnect:466 +#: network/netconnect.pm:181 standalone/drakconnect:438 standalone/drakconnect:909 #, c-format msgid "Script-based" msgstr "" -#: network/netconnect.pm:171 standalone/drakconnect:466 +#: network/netconnect.pm:182 standalone/drakconnect:438 standalone/drakconnect:909 #, c-format msgid "PAP" msgstr "" -#: network/netconnect.pm:172 standalone/drakconnect:466 +#: network/netconnect.pm:183 standalone/drakconnect:438 standalone/drakconnect:909 #, c-format msgid "Terminal-based" msgstr "" -#: network/netconnect.pm:173 standalone/drakconnect:466 +#: network/netconnect.pm:184 standalone/drakconnect:438 standalone/drakconnect:909 #, c-format msgid "CHAP" msgstr "" -#: network/netconnect.pm:174 standalone/drakconnect:466 +#: network/netconnect.pm:185 #, c-format msgid "PAP/CHAP" msgstr "" -#: network/netconnect.pm:228 standalone/drakconnect:55 +#: network/netconnect.pm:199 standalone/drakconnect:53 #, c-format msgid "Network & Internet Configuration" msgstr "" -#: network/netconnect.pm:234 +#: network/netconnect.pm:205 #, c-format msgid "(detected on port %s)" msgstr "" #. -PO: here, "(detected)" string will be appended to eg "ADSL connection" -#: network/netconnect.pm:236 +#: network/netconnect.pm:207 #, c-format msgid "(detected %s)" msgstr "" -#: network/netconnect.pm:236 +#: network/netconnect.pm:207 #, c-format msgid "(detected)" msgstr "" -#: network/netconnect.pm:238 +#: network/netconnect.pm:209 #, c-format msgid "Modem connection" msgstr "" -#: network/netconnect.pm:239 +#: network/netconnect.pm:210 #, c-format msgid "ISDN connection" msgstr "" -#: network/netconnect.pm:240 +#: network/netconnect.pm:211 #, c-format msgid "ADSL connection" msgstr "" -#: network/netconnect.pm:241 +#: network/netconnect.pm:212 #, c-format msgid "Cable connection" msgstr "" -#: network/netconnect.pm:242 +#: network/netconnect.pm:213 #, c-format msgid "LAN connection" msgstr "" -#: network/netconnect.pm:243 network/netconnect.pm:257 +#: network/netconnect.pm:214 network/netconnect.pm:228 #, c-format msgid "Wireless connection" msgstr "" -#: network/netconnect.pm:253 +#: network/netconnect.pm:224 #, c-format msgid "Choose the connection you want to configure" msgstr "" -#: network/netconnect.pm:270 +#: network/netconnect.pm:241 #, c-format msgid "" "We are now going to configure the %s connection.\n" @@ -8062,286 +8089,254 @@ msgid "" "Press \"%s\" to continue." msgstr "" -#: network/netconnect.pm:278 network/netconnect.pm:796 +#: network/netconnect.pm:249 network/netconnect.pm:710 #, c-format msgid "Connection Configuration" msgstr "" -#: network/netconnect.pm:279 network/netconnect.pm:797 +#: network/netconnect.pm:250 network/netconnect.pm:711 #, c-format msgid "Please fill or check the field below" msgstr "" -#: network/netconnect.pm:286 standalone/drakconnect:519 +#: network/netconnect.pm:256 standalone/drakconnect:489 standalone/drakconnect:891 #, c-format msgid "Card IRQ" msgstr "" -#: network/netconnect.pm:287 standalone/drakconnect:520 +#: network/netconnect.pm:257 standalone/drakconnect:490 standalone/drakconnect:892 #, c-format msgid "Card mem (DMA)" msgstr "" -#: network/netconnect.pm:288 standalone/drakconnect:521 +#: network/netconnect.pm:258 standalone/drakconnect:491 standalone/drakconnect:893 #, c-format msgid "Card IO" msgstr "" -#: network/netconnect.pm:289 standalone/drakconnect:522 +#: network/netconnect.pm:259 standalone/drakconnect:492 standalone/drakconnect:894 #, c-format msgid "Card IO_0" msgstr "" -#: network/netconnect.pm:290 +#: network/netconnect.pm:260 standalone/drakconnect:895 #, c-format msgid "Card IO_1" msgstr "" -#: network/netconnect.pm:291 +#: network/netconnect.pm:261 standalone/drakconnect:896 #, c-format msgid "Your personal phone number" msgstr "" -#: network/netconnect.pm:292 network/netconnect.pm:800 +#: network/netconnect.pm:262 network/netconnect.pm:714 standalone/drakconnect:897 #, c-format msgid "Provider name (ex provider.net)" msgstr "" -#: network/netconnect.pm:293 standalone/drakconnect:463 +#: network/netconnect.pm:263 standalone/drakconnect:435 standalone/drakconnect:898 #, c-format msgid "Provider phone number" msgstr "" -#: network/netconnect.pm:294 +#: network/netconnect.pm:264 #, c-format msgid "Provider DNS 1 (optional)" msgstr "" -#: network/netconnect.pm:295 +#: network/netconnect.pm:265 #, c-format msgid "Provider DNS 2 (optional)" msgstr "" -#: network/netconnect.pm:296 standalone/drakconnect:419 +#: network/netconnect.pm:266 standalone/drakconnect:391 standalone/drakconnect:457 standalone/drakconnect:903 #, c-format msgid "Dialing mode" msgstr "" -#: network/netconnect.pm:297 standalone/drakconnect:424 standalone/drakconnect:484 +#: network/netconnect.pm:267 standalone/drakconnect:396 standalone/drakconnect:454 standalone/drakconnect:915 #, c-format msgid "Connection speed" msgstr "" -#: network/netconnect.pm:298 standalone/drakconnect:429 +#: network/netconnect.pm:268 standalone/drakconnect:401 standalone/drakconnect:916 #, c-format msgid "Connection timeout (in sec)" msgstr "" -#: network/netconnect.pm:301 network/netconnect.pm:803 standalone/drakconnect:461 +#: network/netconnect.pm:271 network/netconnect.pm:717 standalone/drakconnect:433 standalone/drakconnect:901 #, c-format msgid "Account Login (user name)" msgstr "" -#: network/netconnect.pm:302 network/netconnect.pm:804 standalone/drakconnect:462 +#: network/netconnect.pm:272 network/netconnect.pm:718 standalone/drakconnect:434 standalone/drakconnect:902 standalone/drakconnect:936 #, c-format msgid "Account Password" msgstr "" -#: network/netconnect.pm:332 network/netconnect.pm:650 network/netconnect.pm:835 +#: network/netconnect.pm:300 #, c-format -msgid "Select the network interface to configure:" +msgid "What kind is your ISDN connection?" msgstr "" -#: network/netconnect.pm:334 network/netconnect.pm:379 network/netconnect.pm:651 network/netconnect.pm:837 network/shorewall.pm:84 standalone/drakconnect:643 standalone/drakgw:225 standalone/drakvpn:221 +#: network/netconnect.pm:301 #, c-format -msgid "Net Device" +msgid "Internal ISDN card" msgstr "" -#: network/netconnect.pm:335 network/netconnect.pm:347 +#: network/netconnect.pm:301 #, c-format msgid "External ISDN modem" msgstr "" -#: network/netconnect.pm:338 network/netconnect.pm:470 network/netconnect.pm:655 standalone/drakgw:113 standalone/drakvpn:51 -#, c-format -msgid "Sorry, we support only 2.4 and above kernels." -msgstr "" - -#: network/netconnect.pm:378 standalone/harddrake2:115 +#: network/netconnect.pm:332 #, c-format -msgid "Select a device !" +msgid "Do you want to start a new configuration ?" msgstr "" -#: network/netconnect.pm:387 network/netconnect.pm:397 network/netconnect.pm:407 network/netconnect.pm:423 network/netconnect.pm:434 +#: network/netconnect.pm:335 #, c-format -msgid "ISDN Configuration" +msgid "I have detected an ISDN PCI card, but I don't know its type. Please select a PCI card on the next screen." msgstr "" -#: network/netconnect.pm:388 +#: network/netconnect.pm:344 #, c-format -msgid "What kind of card do you have?" +msgid "No ISDN PCI card found. Please select one on the next screen." msgstr "" -#: network/netconnect.pm:398 +#: network/netconnect.pm:353 #, c-format msgid "" -"\n" -"If you have an ISA card, the values on the next screen should be right.\n" -"\n" -"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.\n" -"" -msgstr "" - -#: network/netconnect.pm:402 -#, c-format -msgid "Continue" -msgstr "" - -#: network/netconnect.pm:402 -#, c-format -msgid "Abort" -msgstr "" - -#: network/netconnect.pm:408 -#, c-format -msgid "Which of the following is your ISDN card?" +"Your modem isn't supported by the system.\n" +"Take a look at http://www.linmodems.org" msgstr "" -#: network/netconnect.pm:423 +#: network/netconnect.pm:364 #, c-format -msgid "Which protocol do you want to use?" +msgid "Select the modem to configure:" msgstr "" -#: network/netconnect.pm:425 standalone/drakconnect:116 standalone/drakconnect:527 standalone/drakvpn:1142 +#: network/netconnect.pm:403 #, c-format -msgid "Protocol" +msgid "Please choose which serial port your modem is connected to." msgstr "" -#: network/netconnect.pm:434 +#: network/netconnect.pm:427 #, c-format -msgid "" -"Select your provider.\n" -"If it isn't listed, choose Unlisted." +msgid "Select your provider:" msgstr "" -#: network/netconnect.pm:436 network/netconnect.pm:542 network/netconnect.pm:690 +#: network/netconnect.pm:429 network/netconnect.pm:599 #, c-format msgid "Provider:" msgstr "" -#: network/netconnect.pm:451 +#: network/netconnect.pm:481 network/netconnect.pm:482 network/netconnect.pm:483 network/netconnect.pm:508 network/netconnect.pm:525 network/netconnect.pm:541 #, c-format -msgid "" -"Your modem isn't supported by the system.\n" -"Take a look at http://www.linmodems.org" -msgstr "" - -#: network/netconnect.pm:463 -#, c-format -msgid "Select the modem to configure:" -msgstr "" - -#: network/netconnect.pm:511 -#, c-format -msgid "Please choose which serial port your modem is connected to." -msgstr "" - -#: network/netconnect.pm:540 -#, c-format -msgid "Select your provider:" +msgid "Manual" msgstr "" -#: network/netconnect.pm:569 +#: network/netconnect.pm:485 #, c-format msgid "Dialup: account options" msgstr "" -#: network/netconnect.pm:572 +#: network/netconnect.pm:488 standalone/drakconnect:905 #, c-format msgid "Connection name" msgstr "" -#: network/netconnect.pm:573 +#: network/netconnect.pm:489 standalone/drakconnect:906 #, c-format msgid "Phone number" msgstr "" -#: network/netconnect.pm:574 +#: network/netconnect.pm:490 standalone/drakconnect:907 #, c-format msgid "Login ID" msgstr "" -#: network/netconnect.pm:589 network/netconnect.pm:622 +#: network/netconnect.pm:505 network/netconnect.pm:538 #, c-format msgid "Dialup: IP parameters" msgstr "" -#: network/netconnect.pm:592 +#: network/netconnect.pm:508 #, c-format msgid "IP parameters" msgstr "" -#: network/netconnect.pm:593 network/netconnect.pm:927 printer/printerdrake.pm:431 standalone/drakconnect:116 standalone/drakconnect:325 standalone/drakconnect:816 standalone/drakups:266 +#: network/netconnect.pm:509 network/netconnect.pm:829 printer/printerdrake.pm:431 standalone/drakconnect:112 standalone/drakconnect:301 standalone/drakconnect:756 #, c-format msgid "IP address" msgstr "" -#: network/netconnect.pm:594 +#: network/netconnect.pm:510 #, c-format msgid "Subnet mask" msgstr "" -#: network/netconnect.pm:606 +#: network/netconnect.pm:522 #, c-format msgid "Dialup: DNS parameters" msgstr "" -#: network/netconnect.pm:609 +#: network/netconnect.pm:525 #, c-format msgid "DNS" msgstr "" -#: network/netconnect.pm:610 +#: network/netconnect.pm:526 standalone/drakconnect:910 #, c-format msgid "Domain name" msgstr "" -#: network/netconnect.pm:611 network/netconnect.pm:801 standalone/drakconnect:934 +#: network/netconnect.pm:527 network/netconnect.pm:715 standalone/drakconnect:911 #, c-format msgid "First DNS Server (optional)" msgstr "" -#: network/netconnect.pm:612 network/netconnect.pm:802 standalone/drakconnect:935 +#: network/netconnect.pm:528 network/netconnect.pm:716 standalone/drakconnect:912 #, c-format msgid "Second DNS Server (optional)" msgstr "" -#: network/netconnect.pm:613 +#: network/netconnect.pm:529 #, c-format msgid "Set hostname from IP" msgstr "" -#: network/netconnect.pm:625 standalone/drakconnect:336 +#: network/netconnect.pm:541 standalone/drakconnect:312 standalone/drakconnect:904 #, c-format msgid "Gateway" msgstr "" -#: network/netconnect.pm:626 +#: network/netconnect.pm:542 #, c-format msgid "Gateway IP address" msgstr "" -#: network/netconnect.pm:650 +#: network/netconnect.pm:567 #, c-format msgid "ADSL configuration" msgstr "" -#: network/netconnect.pm:688 +#: network/netconnect.pm:567 network/netconnect.pm:746 +#, c-format +msgid "Select the network interface to configure:" +msgstr "" + +#: network/netconnect.pm:568 network/netconnect.pm:748 network/shorewall.pm:77 standalone/drakconnect:596 standalone/drakgw:218 standalone/drakvpn:215 +#, c-format +msgid "Net Device" +msgstr "" + +#: network/netconnect.pm:597 #, c-format msgid "Please choose your ADSL provider" msgstr "" -#: network/netconnect.pm:706 +#: network/netconnect.pm:616 #, c-format msgid "" "You need the Alcatel microcode.\n" @@ -8349,32 +8344,32 @@ msgid "" "or skip and do it later." msgstr "" -#: network/netconnect.pm:710 network/netconnect.pm:715 +#: network/netconnect.pm:620 network/netconnect.pm:625 #, c-format msgid "Use a floppy" msgstr "" -#: network/netconnect.pm:710 network/netconnect.pm:719 +#: network/netconnect.pm:620 network/netconnect.pm:629 #, c-format msgid "Use my Windows partition" msgstr "" -#: network/netconnect.pm:710 network/netconnect.pm:723 +#: network/netconnect.pm:620 network/netconnect.pm:633 #, c-format msgid "Do it later" msgstr "" -#: network/netconnect.pm:730 +#: network/netconnect.pm:640 #, c-format msgid "Firmware copy failed, file %s not found" msgstr "" -#: network/netconnect.pm:737 +#: network/netconnect.pm:647 #, c-format msgid "Firmware copy succeeded" msgstr "" -#: network/netconnect.pm:752 +#: network/netconnect.pm:662 #, c-format msgid "" "You need the Alcatel microcode.\n" @@ -8383,22 +8378,22 @@ msgid "" "and copy the mgmt.o in /usr/share/speedtouch" msgstr "" -#: network/netconnect.pm:805 +#: network/netconnect.pm:719 #, c-format msgid "Virtual Path ID (VPI):" msgstr "" -#: network/netconnect.pm:806 +#: network/netconnect.pm:720 #, c-format msgid "Virtual Circuit ID (VCI):" msgstr "" -#: network/netconnect.pm:808 +#: network/netconnect.pm:721 #, c-format msgid "Encapsulation :" msgstr "" -#: network/netconnect.pm:825 +#: network/netconnect.pm:736 #, c-format msgid "" "The ECI Hi-Focus modem cannot be supported due to binary driver distribution problem.\n" @@ -8406,38 +8401,40 @@ msgid "" "You can find a driver on http://eciadsl.flashtux.org/" msgstr "" -#: network/netconnect.pm:852 +#: network/netconnect.pm:753 #, c-format -msgid "" -"WARNING: this device has been previously configured to connect to the Internet.\n" -"Simply accept to keep this device configured.\n" -"Modifying the fields below will override this configuration." +msgid "No wireless network adapter on your system!" +msgstr "" + +#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137 +#, c-format +msgid "No network adapter on your system!" msgstr "" -#: network/netconnect.pm:865 network/netconnect.pm:1231 +#: network/netconnect.pm:766 #, c-format msgid "" -"Congratulations, the network and Internet configuration is finished.\n" -"\n" -"" +"WARNING: this device has been previously configured to connect to the Internet.\n" +"Simply accept to keep this device configured.\n" +"Modifying the fields below will override this configuration." msgstr "" -#: network/netconnect.pm:879 +#: network/netconnect.pm:784 #, c-format msgid "Zeroconf hostname resolution" msgstr "" -#: network/netconnect.pm:880 network/netconnect.pm:914 +#: network/netconnect.pm:785 network/netconnect.pm:816 #, c-format msgid "Configuring network device %s (driver %s)" msgstr "" -#: network/netconnect.pm:881 +#: network/netconnect.pm:786 #, c-format msgid "The following protocols can be used to configure an ethernet connection. Please choose the one you want to use" msgstr "" -#: network/netconnect.pm:915 +#: network/netconnect.pm:817 #, c-format msgid "" "Please enter the IP configuration for this machine.\n" @@ -8445,102 +8442,102 @@ msgid "" "notation (for example, 1.2.3.4)." msgstr "" -#: network/netconnect.pm:922 +#: network/netconnect.pm:824 #, c-format msgid "Assign host name from DHCP address" msgstr "" -#: network/netconnect.pm:923 +#: network/netconnect.pm:825 #, c-format msgid "DHCP host name" msgstr "" -#: network/netconnect.pm:928 standalone/drakconnect:330 standalone/drakconnect:817 standalone/drakgw:321 +#: network/netconnect.pm:830 standalone/drakconnect:306 standalone/drakconnect:757 standalone/drakgw:313 #, c-format msgid "Netmask" msgstr "" -#: network/netconnect.pm:930 standalone/drakconnect:412 +#: network/netconnect.pm:832 standalone/drakconnect:384 #, c-format msgid "Track network card id (useful for laptops)" msgstr "" -#: network/netconnect.pm:931 standalone/drakconnect:413 +#: network/netconnect.pm:833 standalone/drakconnect:385 #, c-format msgid "Network Hotplugging" msgstr "" -#: network/netconnect.pm:932 standalone/drakconnect:407 +#: network/netconnect.pm:834 standalone/drakconnect:379 #, c-format msgid "Start at boot" msgstr "" -#: network/netconnect.pm:934 standalone/drakconnect:820 +#: network/netconnect.pm:836 standalone/drakconnect:760 #, c-format msgid "DHCP client" msgstr "" -#: network/netconnect.pm:944 printer/printerdrake.pm:1383 standalone/drakconnect:608 +#: network/netconnect.pm:846 printer/printerdrake.pm:1345 standalone/drakconnect:563 #, c-format msgid "IP address should be in format 1.2.3.4" msgstr "" -#: network/netconnect.pm:947 +#: network/netconnect.pm:849 #, c-format msgid "Warning : IP address %s is usually reserved !" msgstr "" -#: network/netconnect.pm:977 network/netconnect.pm:1006 +#: network/netconnect.pm:879 network/netconnect.pm:908 #, c-format msgid "Please enter the wireless parameters for this card:" msgstr "" -#: network/netconnect.pm:980 standalone/drakconnect:378 +#: network/netconnect.pm:882 standalone/drakconnect:350 #, c-format msgid "Operating Mode" msgstr "" -#: network/netconnect.pm:982 standalone/drakconnect:379 +#: network/netconnect.pm:884 standalone/drakconnect:351 #, c-format msgid "Network name (ESSID)" msgstr "" -#: network/netconnect.pm:983 standalone/drakconnect:380 +#: network/netconnect.pm:885 standalone/drakconnect:352 #, c-format msgid "Network ID" msgstr "" -#: network/netconnect.pm:984 standalone/drakconnect:381 +#: network/netconnect.pm:886 standalone/drakconnect:353 #, c-format msgid "Operating frequency" msgstr "" -#: network/netconnect.pm:985 standalone/drakconnect:382 +#: network/netconnect.pm:887 standalone/drakconnect:354 #, c-format msgid "Sensitivity threshold" msgstr "" -#: network/netconnect.pm:986 standalone/drakconnect:383 +#: network/netconnect.pm:888 standalone/drakconnect:355 #, c-format msgid "Bitrate (in b/s)" msgstr "" -#: network/netconnect.pm:992 +#: network/netconnect.pm:894 #, c-format msgid "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough '0' (zeroes)." msgstr "" -#: network/netconnect.pm:996 +#: network/netconnect.pm:898 #, c-format msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)." msgstr "" -#: network/netconnect.pm:1009 standalone/drakconnect:394 +#: network/netconnect.pm:911 standalone/drakconnect:366 #, c-format msgid "RTS/CTS" msgstr "" -#: network/netconnect.pm:1010 +#: network/netconnect.pm:912 #, c-format msgid "" "RTS/CTS adds a handshake before each packet transmission to make sure that the\n" @@ -8551,17 +8548,17 @@ msgid "" "or off." msgstr "" -#: network/netconnect.pm:1017 standalone/drakconnect:395 +#: network/netconnect.pm:919 standalone/drakconnect:367 #, c-format msgid "Fragmentation" msgstr "" -#: network/netconnect.pm:1018 standalone/drakconnect:396 +#: network/netconnect.pm:920 standalone/drakconnect:368 #, c-format msgid "Iwconfig command extra arguments" msgstr "" -#: network/netconnect.pm:1019 +#: network/netconnect.pm:921 #, c-format msgid "" "Here, one can configure some extra wireless parameters such as:\n" @@ -8571,12 +8568,12 @@ msgid "" msgstr "" #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one -#: network/netconnect.pm:1026 standalone/drakconnect:397 +#: network/netconnect.pm:928 standalone/drakconnect:369 #, c-format msgid "Iwspy command extra arguments" msgstr "" -#: network/netconnect.pm:1027 +#: network/netconnect.pm:929 #, c-format msgid "" "Iwspy is used to set a list of addresses in a wireless network\n" @@ -8588,12 +8585,12 @@ msgid "" "See iwpspy(8) man page for further information." msgstr "" -#: network/netconnect.pm:1035 standalone/drakconnect:398 +#: network/netconnect.pm:937 standalone/drakconnect:370 #, c-format msgid "Iwpriv command extra arguments" msgstr "" -#: network/netconnect.pm:1036 +#: network/netconnect.pm:938 #, c-format msgid "" "Iwpriv enable to set up optionals (private) parameters of a wireless network\n" @@ -8608,24 +8605,24 @@ msgid "" "See iwpriv(8) man page for further information." msgstr "" -#: network/netconnect.pm:1063 +#: network/netconnect.pm:965 #, c-format msgid "" "No ethernet network adapter has been detected on your system.\n" "I cannot set up this connection type." msgstr "" -#: network/netconnect.pm:1067 standalone/drakgw:261 standalone/drakpxe:142 +#: network/netconnect.pm:969 standalone/drakgw:254 standalone/drakpxe:142 #, c-format msgid "Choose the network interface" msgstr "" -#: network/netconnect.pm:1068 +#: network/netconnect.pm:970 #, c-format msgid "Please choose which network adapter you want to use to connect to Internet." msgstr "" -#: network/netconnect.pm:1089 +#: network/netconnect.pm:991 #, c-format msgid "" "Please enter your host name.\n" @@ -8634,82 +8631,82 @@ msgid "" "You may also enter the IP address of the gateway if you have one." msgstr "" -#: network/netconnect.pm:1093 +#: network/netconnect.pm:995 #, c-format msgid "Last but not least you can also type in your DNS server IP addresses." msgstr "" -#: network/netconnect.pm:1095 standalone/drakconnect:933 +#: network/netconnect.pm:997 #, c-format msgid "Host name (optional)" msgstr "" -#: network/netconnect.pm:1095 +#: network/netconnect.pm:997 #, c-format msgid "Host name" msgstr "" -#: network/netconnect.pm:1097 +#: network/netconnect.pm:998 #, c-format msgid "DNS server 1" msgstr "" -#: network/netconnect.pm:1098 +#: network/netconnect.pm:999 #, c-format msgid "DNS server 2" msgstr "" -#: network/netconnect.pm:1099 +#: network/netconnect.pm:1000 #, c-format msgid "DNS server 3" msgstr "" -#: network/netconnect.pm:1100 +#: network/netconnect.pm:1001 #, c-format msgid "Search domain" msgstr "" -#: network/netconnect.pm:1101 +#: network/netconnect.pm:1002 #, c-format msgid "By default search domain will be set from the fully-qualified host name" msgstr "" -#: network/netconnect.pm:1102 +#: network/netconnect.pm:1003 #, c-format msgid "Gateway (e.g. %s)" msgstr "" -#: network/netconnect.pm:1104 +#: network/netconnect.pm:1005 #, c-format msgid "Gateway device" msgstr "" -#: network/netconnect.pm:1113 +#: network/netconnect.pm:1014 #, c-format msgid "DNS server address should be in format 1.2.3.4" msgstr "" -#: network/netconnect.pm:1118 standalone/drakconnect:611 +#: network/netconnect.pm:1019 standalone/drakconnect:565 #, c-format msgid "Gateway address should be in format 1.2.3.4" msgstr "" -#: network/netconnect.pm:1129 +#: network/netconnect.pm:1030 #, c-format msgid "Enter a Zeroconf host name which will be the one that your machine will get back to other machines on the network:" msgstr "" -#: network/netconnect.pm:1130 +#: network/netconnect.pm:1031 #, c-format msgid "Zeroconf Host name" msgstr "" -#: network/netconnect.pm:1133 +#: network/netconnect.pm:1034 #, c-format msgid "Zeroconf host name must not contain a ." msgstr "" -#: network/netconnect.pm:1143 +#: network/netconnect.pm:1044 #, c-format msgid "" "You have configured multiple ways to connect to the Internet.\n" @@ -8718,32 +8715,32 @@ msgid "" "" msgstr "" -#: network/netconnect.pm:1145 +#: network/netconnect.pm:1046 #, c-format msgid "Internet connection" msgstr "" -#: network/netconnect.pm:1153 +#: network/netconnect.pm:1054 #, c-format msgid "Configuration is complete, do you want to apply settings ?" msgstr "" -#: network/netconnect.pm:1163 +#: network/netconnect.pm:1070 #, c-format msgid "Do you want to start the connection at boot?" msgstr "" -#: network/netconnect.pm:1175 +#: network/netconnect.pm:1094 #, c-format msgid "The network needs to be restarted. Do you want to restart it ?" msgstr "" -#: network/netconnect.pm:1182 network/netconnect.pm:1247 +#: network/netconnect.pm:1100 network/netconnect.pm:1165 #, c-format msgid "Network Configuration" msgstr "" -#: network/netconnect.pm:1183 +#: network/netconnect.pm:1101 #, c-format msgid "" "A problem occured while restarting the network: \n" @@ -8751,46 +8748,54 @@ msgid "" "%s" msgstr "" -#: network/netconnect.pm:1191 +#: network/netconnect.pm:1110 #, c-format msgid "Do you want to try to connect to the Internet now?" msgstr "" -#: network/netconnect.pm:1199 standalone/drakconnect:965 +#: network/netconnect.pm:1118 standalone/drakconnect:950 #, c-format msgid "Testing your connection..." msgstr "" -#: network/netconnect.pm:1215 +#: network/netconnect.pm:1134 #, c-format msgid "The system is now connected to the Internet." msgstr "" -#: network/netconnect.pm:1216 +#: network/netconnect.pm:1135 #, c-format msgid "For security reasons, it will be disconnected now." msgstr "" -#: network/netconnect.pm:1217 +#: network/netconnect.pm:1136 #, c-format msgid "" "The system doesn't seem to be connected to the Internet.\n" "Try to reconfigure your connection." msgstr "" -#: network/netconnect.pm:1234 +#: network/netconnect.pm:1150 +#, c-format +msgid "" +"Congratulations, the network and Internet configuration is finished.\n" +"\n" +"" +msgstr "" + +#: network/netconnect.pm:1153 #, c-format msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems." msgstr "" -#: network/netconnect.pm:1235 +#: network/netconnect.pm:1154 #, c-format msgid "" "Problems occured during configuration.\n" "Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration." msgstr "" -#: network/netconnect.pm:1248 +#: network/netconnect.pm:1166 #, c-format msgid "" "Because you are doing a network installation, your network is already configured.\n" @@ -8798,108 +8803,101 @@ msgid "" "" msgstr "" -#: network/netconnect.pm:1336 -#, c-format -msgid "" -"An unexpected error has happened:\n" -"%s" -msgstr "" - -#: network/network.pm:315 +#: network/network.pm:314 #, c-format msgid "Proxies configuration" msgstr "" -#: network/network.pm:316 +#: network/network.pm:315 #, c-format msgid "HTTP proxy" msgstr "" -#: network/network.pm:317 +#: network/network.pm:316 #, c-format msgid "FTP proxy" msgstr "" -#: network/network.pm:320 +#: network/network.pm:319 #, c-format msgid "Proxy should be http://..." msgstr "" -#: network/network.pm:321 +#: network/network.pm:320 #, c-format msgid "URL should begin with 'ftp:' or 'http:'" msgstr "" -#: network/shorewall.pm:28 +#: network/shorewall.pm:26 #, c-format msgid "Firewalling configuration detected!" msgstr "" -#: network/shorewall.pm:29 +#: network/shorewall.pm:27 #, c-format msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation." msgstr "" -#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214 +#: network/shorewall.pm:70 #, c-format msgid "" -"Please enter the name of the interface connected to the internet.\n" -"\n" +"Please enter the name of the interface connected to the internet. \n" +" \n" "Examples:\n" -"\t\tppp+ for modem or DSL connections, \n" -"\t\teth0, or eth1 for cable connection, \n" -"\t\tippp+ for a isdn connection.\n" +" ppp+ for modem or DSL connections, \n" +" eth0, or eth1 for cable connection, \n" +" ippp+ for a isdn connection.\n" "" msgstr "" -#: network/tools.pm:205 +#: network/tools.pm:207 #, c-format msgid "Insert floppy" msgstr "" -#: network/tools.pm:206 +#: network/tools.pm:208 #, c-format msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s" msgstr "" -#: network/tools.pm:207 +#: network/tools.pm:209 #, c-format msgid "Floppy access error, unable to mount device %s" msgstr "" -#: partition_table.pm:644 +#: partition_table.pm:642 #, c-format msgid "mount failed: " msgstr "" -#: partition_table.pm:749 +#: partition_table.pm:747 #, c-format msgid "Extended partition not supported on this platform" msgstr "" -#: partition_table.pm:767 +#: partition_table.pm:765 #, c-format msgid "" "You have a hole in your partition table but I can't use it.\n" "The only solution is to move your primary partitions to have the hole next to the extended partitions." msgstr "" -#: partition_table.pm:854 +#: partition_table.pm:852 #, c-format msgid "Restoring from file %s failed: %s" msgstr "" -#: partition_table.pm:856 +#: partition_table.pm:854 #, c-format msgid "Bad backup file" msgstr "" -#: partition_table.pm:876 +#: partition_table.pm:874 #, c-format msgid "Error writing to file %s" msgstr "" -#: partition_table/raw.pm:187 +#: partition_table/raw.pm:181 #, c-format msgid "" "Something bad is happening on your drive. \n" @@ -8932,67 +8930,67 @@ msgstr "" msgid "maybe" msgstr "" -#: printer/cups.pm:103 +#: printer/cups.pm:87 #, c-format msgid "(on %s)" msgstr "" -#: printer/cups.pm:103 +#: printer/cups.pm:87 #, c-format msgid "(on this machine)" msgstr "" -#: printer/cups.pm:115 standalone/printerdrake:197 +#: printer/cups.pm:99 standalone/printerdrake:197 #, c-format msgid "Configured on other machines" msgstr "" -#: printer/cups.pm:117 +#: printer/cups.pm:101 #, c-format msgid "On CUPS server \"%s\"" msgstr "" -#: printer/cups.pm:117 printer/printerdrake.pm:3989 printer/printerdrake.pm:3998 printer/printerdrake.pm:4139 printer/printerdrake.pm:4150 printer/printerdrake.pm:4362 +#: printer/cups.pm:101 printer/printerdrake.pm:3778 printer/printerdrake.pm:3787 printer/printerdrake.pm:3925 printer/printerdrake.pm:3936 printer/printerdrake.pm:4148 #, c-format msgid " (Default)" msgstr "" -#: printer/data.pm:22 +#: printer/data.pm:21 #, c-format msgid "PDQ - Print, Don't Queue" msgstr "" -#: printer/data.pm:23 +#: printer/data.pm:22 #, c-format msgid "PDQ" msgstr "" -#: printer/data.pm:34 +#: printer/data.pm:33 #, c-format msgid "LPD - Line Printer Daemon" msgstr "" -#: printer/data.pm:35 +#: printer/data.pm:34 #, c-format msgid "LPD" msgstr "" -#: printer/data.pm:56 +#: printer/data.pm:55 #, c-format msgid "LPRng - LPR New Generation" msgstr "" -#: printer/data.pm:57 +#: printer/data.pm:56 #, c-format msgid "LPRng" msgstr "" -#: printer/data.pm:82 +#: printer/data.pm:81 #, c-format msgid "CUPS - Common Unix Printing System" msgstr "" -#: printer/detect.pm:148 printer/detect.pm:226 printer/detect.pm:428 printer/detect.pm:465 printer/printerdrake.pm:686 +#: printer/detect.pm:143 printer/detect.pm:221 printer/detect.pm:423 printer/detect.pm:460 printer/printerdrake.pm:675 #, c-format msgid "Unknown Model" msgstr "" @@ -9012,7 +9010,7 @@ msgstr "" msgid "Printer on remote CUPS server" msgstr "" -#: printer/main.pm:31 printer/printerdrake.pm:1406 +#: printer/main.pm:31 printer/printerdrake.pm:1368 #, c-format msgid "Printer on remote lpd server" msgstr "" @@ -9032,7 +9030,7 @@ msgstr "" msgid "Printer on NetWare server" msgstr "" -#: printer/main.pm:35 printer/printerdrake.pm:1410 +#: printer/main.pm:35 printer/printerdrake.pm:1372 #, c-format msgid "Enter a printer device URI" msgstr "" @@ -9042,7 +9040,7 @@ msgstr "" msgid "Pipe job into a command" msgstr "" -#: printer/main.pm:306 printer/main.pm:574 printer/main.pm:1544 printer/main.pm:2228 printer/main.pm:2239 printer/printerdrake.pm:1866 printer/printerdrake.pm:4396 +#: printer/main.pm:306 printer/main.pm:574 printer/main.pm:1544 printer/main.pm:2217 printer/printerdrake.pm:1777 printer/printerdrake.pm:4182 #, c-format msgid "Unknown model" msgstr "" @@ -9052,12 +9050,12 @@ msgstr "" msgid "Configured on this machine" msgstr "" -#: printer/main.pm:337 printer/printerdrake.pm:963 +#: printer/main.pm:337 printer/printerdrake.pm:944 #, c-format msgid " on parallel port #%s" msgstr "" -#: printer/main.pm:340 printer/printerdrake.pm:965 +#: printer/main.pm:340 printer/printerdrake.pm:946 #, c-format msgid ", USB printer #%s" msgstr "" @@ -9127,7 +9125,7 @@ msgstr "" msgid "Parallel port #%s" msgstr "" -#: printer/main.pm:391 printer/printerdrake.pm:979 printer/printerdrake.pm:1002 printer/printerdrake.pm:1020 +#: printer/main.pm:391 printer/printerdrake.pm:960 printer/printerdrake.pm:983 printer/printerdrake.pm:1001 #, c-format msgid "USB printer #%s" msgstr "" @@ -9197,7 +9195,7 @@ msgstr "" msgid "URI: %s" msgstr "" -#: printer/main.pm:571 printer/printerdrake.pm:732 printer/printerdrake.pm:2463 +#: printer/main.pm:571 printer/printerdrake.pm:721 printer/printerdrake.pm:2327 #, c-format msgid "Raw printer (No driver)" msgstr "" @@ -9241,7 +9239,7 @@ msgstr "" #: printer/printerdrake.pm:63 #, c-format -msgid "Here you can choose whether the printers connected to this machine should be accessible by remote machines and by which remote machines." +msgid "Here you can choose whether the printers connected to this machine should be accessable by remote machines and by which remote machines." msgstr "" #: printer/printerdrake.pm:64 @@ -9269,7 +9267,7 @@ msgstr "" msgid "Custom configuration" msgstr "" -#: printer/printerdrake.pm:78 standalone/scannerdrake:561 standalone/scannerdrake:578 +#: printer/printerdrake.pm:78 standalone/scannerdrake:554 standalone/scannerdrake:571 #, c-format msgid "No remote machines" msgstr "" @@ -9426,7 +9424,7 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629 +#: printer/printerdrake.pm:411 printer/printerdrake.pm:1578 #, c-format msgid "The port number should be an integer!" msgstr "" @@ -9438,12 +9436,12 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650 standalone/drakups:233 standalone/harddrake2:64 +#: printer/printerdrake.pm:433 printer/printerdrake.pm:1599 standalone/harddrake2:64 #, c-format msgid "Port" msgstr "" -#: printer/printerdrake.pm:478 printer/printerdrake.pm:545 printer/printerdrake.pm:610 printer/printerdrake.pm:628 printer/printerdrake.pm:711 printer/printerdrake.pm:768 printer/printerdrake.pm:794 printer/printerdrake.pm:1703 printer/printerdrake.pm:1886 printer/printerdrake.pm:1902 printer/printerdrake.pm:1945 printer/printerdrake.pm:1982 printer/printerdrake.pm:2024 printer/printerdrake.pm:2061 printer/printerdrake.pm:2071 printer/printerdrake.pm:2314 printer/printerdrake.pm:2319 printer/printerdrake.pm:2458 printer/printerdrake.pm:2568 printer/printerdrake.pm:3069 printer/printerdrake.pm:3134 printer/printerdrake.pm:3177 printer/printerdrake.pm:3180 printer/printerdrake.pm:3299 printer/printerdrake.pm:3364 printer/printerdrake.pm:3436 printer/printerdrake.pm:3457 printer/printerdrake.pm:3466 printer/printerdrake.pm:3557 printer/printerdrake.pm:3655 printer/printerdrake.pm:3661 printer/printerdrake.pm:3674 printer/printerdrake.pm:3726 printer/printerdrake.pm:3766 printer/printerdrake.pm:3778 printer/printerdrake.pm:3789 printer/printerdrake.pm:3798 printer/printerdrake.pm:3811 printer/printerdrake.pm:3888 printer/printerdrake.pm:3945 printer/printerdrake.pm:4010 printer/printerdrake.pm:4270 printer/printerdrake.pm:4313 printer/printerdrake.pm:4459 printer/printerdrake.pm:4517 printer/printerdrake.pm:4546 standalone/printerdrake:65 standalone/printerdrake:85 standalone/printerdrake:515 +#: printer/printerdrake.pm:478 printer/printerdrake.pm:541 printer/printerdrake.pm:601 printer/printerdrake.pm:617 printer/printerdrake.pm:700 printer/printerdrake.pm:757 printer/printerdrake.pm:783 printer/printerdrake.pm:1796 printer/printerdrake.pm:1804 printer/printerdrake.pm:1826 printer/printerdrake.pm:1853 printer/printerdrake.pm:1888 printer/printerdrake.pm:1925 printer/printerdrake.pm:1935 printer/printerdrake.pm:2178 printer/printerdrake.pm:2183 printer/printerdrake.pm:2322 printer/printerdrake.pm:2432 printer/printerdrake.pm:2897 printer/printerdrake.pm:2962 printer/printerdrake.pm:2996 printer/printerdrake.pm:2999 printer/printerdrake.pm:3118 printer/printerdrake.pm:3180 printer/printerdrake.pm:3252 printer/printerdrake.pm:3273 printer/printerdrake.pm:3470 printer/printerdrake.pm:3476 printer/printerdrake.pm:3483 printer/printerdrake.pm:3529 printer/printerdrake.pm:3569 printer/printerdrake.pm:3581 printer/printerdrake.pm:3592 printer/printerdrake.pm:3601 printer/printerdrake.pm:3614 printer/printerdrake.pm:3684 printer/printerdrake.pm:3735 printer/printerdrake.pm:3799 printer/printerdrake.pm:4056 printer/printerdrake.pm:4099 printer/printerdrake.pm:4245 printer/printerdrake.pm:4303 printer/printerdrake.pm:4332 standalone/printerdrake:65 standalone/printerdrake:85 standalone/printerdrake:515 #, c-format msgid "Printerdrake" msgstr "" @@ -9453,51 +9451,44 @@ msgstr "" msgid "Restarting CUPS..." msgstr "" -#: printer/printerdrake.pm:502 +#: printer/printerdrake.pm:500 #, c-format msgid "Select Printer Connection" msgstr "" -#: printer/printerdrake.pm:503 +#: printer/printerdrake.pm:501 #, c-format msgid "How is the printer connected?" msgstr "" -#: printer/printerdrake.pm:505 +#: printer/printerdrake.pm:503 #, c-format msgid "" "\n" "Printers on remote CUPS servers do not need to be configured here; these printers will be automatically detected." msgstr "" -#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012 +#: printer/printerdrake.pm:511 #, c-format -msgid "" -"\n" -"WARNING: No local network connection active, remote printers can neither be detected nor tested!" +msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)" msgstr "" -#: printer/printerdrake.pm:515 -#, c-format -msgid "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)" -msgstr "" - -#: printer/printerdrake.pm:545 +#: printer/printerdrake.pm:541 #, c-format msgid "Checking your system..." msgstr "" -#: printer/printerdrake.pm:561 +#: printer/printerdrake.pm:556 #, c-format msgid "and one unknown printer" msgstr "" -#: printer/printerdrake.pm:563 +#: printer/printerdrake.pm:558 #, c-format msgid "and %d unknown printers" msgstr "" -#: printer/printerdrake.pm:567 +#: printer/printerdrake.pm:562 #, c-format msgid "" "The following printers\n" @@ -9506,7 +9497,7 @@ msgid "" "are directly connected to your system" msgstr "" -#: printer/printerdrake.pm:569 +#: printer/printerdrake.pm:564 #, c-format msgid "" "The following printer\n" @@ -9515,7 +9506,7 @@ msgid "" "are directly connected to your system" msgstr "" -#: printer/printerdrake.pm:570 +#: printer/printerdrake.pm:565 #, c-format msgid "" "The following printer\n" @@ -9524,106 +9515,106 @@ msgid "" "is directly connected to your system" msgstr "" -#: printer/printerdrake.pm:574 +#: printer/printerdrake.pm:569 #, c-format msgid "" "\n" "There is one unknown printer directly connected to your system" msgstr "" -#: printer/printerdrake.pm:575 +#: printer/printerdrake.pm:570 #, c-format msgid "" "\n" "There are %d unknown printers directly connected to your system" msgstr "" -#: printer/printerdrake.pm:578 +#: printer/printerdrake.pm:573 #, c-format msgid "There are no printers found which are directly connected to your machine" msgstr "" -#: printer/printerdrake.pm:581 +#: printer/printerdrake.pm:576 #, c-format msgid "" " (Make sure that all your printers are connected and turned on).\n" "" msgstr "" -#: printer/printerdrake.pm:594 +#: printer/printerdrake.pm:589 #, c-format msgid "" "Do you want to enable printing on the printers mentioned above or on printers in the local network?\n" "" msgstr "" -#: printer/printerdrake.pm:595 +#: printer/printerdrake.pm:590 #, c-format msgid "" "Do you want to enable printing on printers in the local network?\n" "" msgstr "" -#: printer/printerdrake.pm:597 +#: printer/printerdrake.pm:592 #, c-format msgid "" "Do you want to enable printing on the printers mentioned above?\n" "" msgstr "" -#: printer/printerdrake.pm:598 +#: printer/printerdrake.pm:593 #, c-format msgid "" "Are you sure that you want to set up printing on this machine?\n" "" msgstr "" -#: printer/printerdrake.pm:599 +#: printer/printerdrake.pm:594 #, c-format msgid "NOTE: Depending on the printer model and the printing system up to %d MB of additional software will be installed." msgstr "" -#: printer/printerdrake.pm:629 +#: printer/printerdrake.pm:618 #, c-format msgid "Searching for new printers..." msgstr "" -#: printer/printerdrake.pm:713 +#: printer/printerdrake.pm:702 #, c-format msgid "Configuring printer ..." msgstr "" -#: printer/printerdrake.pm:714 printer/printerdrake.pm:769 printer/printerdrake.pm:3790 +#: printer/printerdrake.pm:703 printer/printerdrake.pm:758 printer/printerdrake.pm:3593 #, c-format msgid "Configuring printer \"%s\"..." msgstr "" -#: printer/printerdrake.pm:734 +#: printer/printerdrake.pm:723 #, c-format msgid "(" msgstr "" -#: printer/printerdrake.pm:735 +#: printer/printerdrake.pm:724 #, c-format msgid " on " msgstr "" -#: printer/printerdrake.pm:736 standalone/scannerdrake:136 +#: printer/printerdrake.pm:725 standalone/scannerdrake:130 #, c-format msgid ")" msgstr "" -#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470 +#: printer/printerdrake.pm:730 printer/printerdrake.pm:2334 #, c-format msgid "Printer model selection" msgstr "" -#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471 +#: printer/printerdrake.pm:731 printer/printerdrake.pm:2335 #, c-format msgid "Which printer model do you have?" msgstr "" -#: printer/printerdrake.pm:743 +#: printer/printerdrake.pm:732 #, c-format msgid "" "\n" @@ -9631,22 +9622,22 @@ msgid "" "Printerdrake could not determine which model your printer %s is. Please choose the correct model from the list." msgstr "" -#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476 +#: printer/printerdrake.pm:735 printer/printerdrake.pm:2340 #, c-format msgid "If your printer is not listed, choose a compatible (see printer manual) or a similar one." msgstr "" -#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779 printer/printerdrake.pm:3946 printer/printerdrake.pm:4271 printer/printerdrake.pm:4314 printer/printerdrake.pm:4518 +#: printer/printerdrake.pm:784 printer/printerdrake.pm:3582 printer/printerdrake.pm:3736 printer/printerdrake.pm:4057 printer/printerdrake.pm:4100 printer/printerdrake.pm:4304 #, c-format msgid "Configuring applications..." msgstr "" -#: printer/printerdrake.pm:831 printer/printerdrake.pm:843 printer/printerdrake.pm:901 printer/printerdrake.pm:1872 printer/printerdrake.pm:4028 printer/printerdrake.pm:4211 +#: printer/printerdrake.pm:820 printer/printerdrake.pm:832 printer/printerdrake.pm:890 printer/printerdrake.pm:1783 printer/printerdrake.pm:3816 printer/printerdrake.pm:3997 #, c-format msgid "Add a new printer" msgstr "" -#: printer/printerdrake.pm:832 +#: printer/printerdrake.pm:821 #, c-format msgid "" "\n" @@ -9657,7 +9648,7 @@ msgid "" "It asks you for all necessary information to set up the printer and gives you access to all available printer drivers, driver options, and printer connection types." msgstr "" -#: printer/printerdrake.pm:845 +#: printer/printerdrake.pm:834 #, c-format msgid "" "\n" @@ -9672,7 +9663,7 @@ msgid "" " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now." msgstr "" -#: printer/printerdrake.pm:854 +#: printer/printerdrake.pm:843 #, c-format msgid "" "\n" @@ -9685,7 +9676,7 @@ msgid "" " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now." msgstr "" -#: printer/printerdrake.pm:862 +#: printer/printerdrake.pm:851 #, c-format msgid "" "\n" @@ -9700,7 +9691,7 @@ msgid "" " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now." msgstr "" -#: printer/printerdrake.pm:871 +#: printer/printerdrake.pm:860 #, c-format msgid "" "\n" @@ -9713,22 +9704,22 @@ msgid "" " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now." msgstr "" -#: printer/printerdrake.pm:880 +#: printer/printerdrake.pm:869 #, c-format msgid "Auto-detect printers connected to this machine" msgstr "" -#: printer/printerdrake.pm:883 +#: printer/printerdrake.pm:872 #, c-format msgid "Auto-detect printers connected directly to the local network" msgstr "" -#: printer/printerdrake.pm:886 +#: printer/printerdrake.pm:875 #, c-format msgid "Auto-detect printers connected to machines running Microsoft Windows" msgstr "" -#: printer/printerdrake.pm:902 +#: printer/printerdrake.pm:891 #, c-format msgid "" "\n" @@ -9739,272 +9730,257 @@ msgid "" "If you want to add, remove, or rename a printer, or if you want to change the default option settings (paper input tray, printout quality, ...), select \"Printer\" in the \"Hardware\" section of the %s Control Center." msgstr "" -#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152 printer/printerdrake.pm:1214 printer/printerdrake.pm:1304 printer/printerdrake.pm:1441 printer/printerdrake.pm:1516 printer/printerdrake.pm:1667 printer/printerdrake.pm:1750 printer/printerdrake.pm:1759 printer/printerdrake.pm:1768 printer/printerdrake.pm:1779 printer/printerdrake.pm:1892 printer/printerdrake.pm:1954 printer/printerdrake.pm:1988 -#, c-format -msgid "Could not install the %s packages!" -msgstr "" - -#: printer/printerdrake.pm:939 -#, c-format -msgid "Skipping Windows/SMB server auto-detection" -msgstr "" - -#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075 printer/printerdrake.pm:1310 printer/printerdrake.pm:1563 +#: printer/printerdrake.pm:926 printer/printerdrake.pm:1056 printer/printerdrake.pm:1272 printer/printerdrake.pm:1512 #, c-format msgid "Printer auto-detection" msgstr "" -#: printer/printerdrake.pm:945 +#: printer/printerdrake.pm:926 #, c-format msgid "Detecting devices..." msgstr "" -#: printer/printerdrake.pm:967 +#: printer/printerdrake.pm:948 #, c-format msgid ", network printer \"%s\", port %s" msgstr "" -#: printer/printerdrake.pm:969 +#: printer/printerdrake.pm:950 #, c-format msgid ", printer \"%s\" on SMB/Windows server \"%s\"" msgstr "" -#: printer/printerdrake.pm:973 +#: printer/printerdrake.pm:954 #, c-format msgid "Detected %s" msgstr "" -#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000 printer/printerdrake.pm:1017 +#: printer/printerdrake.pm:958 printer/printerdrake.pm:981 printer/printerdrake.pm:998 #, c-format msgid "Printer on parallel port #%s" msgstr "" -#: printer/printerdrake.pm:981 +#: printer/printerdrake.pm:962 #, c-format msgid "Network printer \"%s\", port %s" msgstr "" -#: printer/printerdrake.pm:983 +#: printer/printerdrake.pm:964 #, c-format msgid "Printer \"%s\" on SMB/Windows server \"%s\"" msgstr "" -#: printer/printerdrake.pm:1062 +#: printer/printerdrake.pm:1043 #, c-format msgid "Local Printer" msgstr "" -#: printer/printerdrake.pm:1063 +#: printer/printerdrake.pm:1044 #, c-format msgid "No local printer found! To manually install a printer enter a device name/file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)." msgstr "" -#: printer/printerdrake.pm:1067 +#: printer/printerdrake.pm:1048 #, c-format msgid "You must enter a device or file name!" msgstr "" -#: printer/printerdrake.pm:1076 +#: printer/printerdrake.pm:1057 #, c-format msgid "No printer found!" msgstr "" -#: printer/printerdrake.pm:1084 +#: printer/printerdrake.pm:1065 #, c-format msgid "Local Printers" msgstr "" -#: printer/printerdrake.pm:1085 +#: printer/printerdrake.pm:1066 #, c-format msgid "Available printers" msgstr "" -#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098 +#: printer/printerdrake.pm:1070 printer/printerdrake.pm:1079 #, c-format msgid "The following printer was auto-detected. " msgstr "" -#: printer/printerdrake.pm:1091 +#: printer/printerdrake.pm:1072 #, c-format msgid "If it is not the one you want to configure, enter a device name/file name in the input line" msgstr "" -#: printer/printerdrake.pm:1092 +#: printer/printerdrake.pm:1073 #, c-format msgid "Alternatively, you can specify a device name/file name in the input line" msgstr "" -#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102 +#: printer/printerdrake.pm:1074 printer/printerdrake.pm:1083 #, c-format msgid "Here is a list of all auto-detected printers. " msgstr "" -#: printer/printerdrake.pm:1095 +#: printer/printerdrake.pm:1076 #, c-format msgid "Please choose the printer you want to set up or enter a device name/file name in the input line" msgstr "" -#: printer/printerdrake.pm:1096 +#: printer/printerdrake.pm:1077 #, c-format msgid "Please choose the printer to which the print jobs should go or enter a device name/file name in the input line" msgstr "" -#: printer/printerdrake.pm:1100 +#: printer/printerdrake.pm:1081 #, c-format msgid "The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\"." msgstr "" -#: printer/printerdrake.pm:1101 +#: printer/printerdrake.pm:1082 #, c-format msgid "Currently, no alternative possibility is available" msgstr "" -#: printer/printerdrake.pm:1104 +#: printer/printerdrake.pm:1085 #, c-format msgid "Please choose the printer you want to set up. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\"." msgstr "" -#: printer/printerdrake.pm:1105 +#: printer/printerdrake.pm:1086 #, c-format msgid "Please choose the printer to which the print jobs should go." msgstr "" -#: printer/printerdrake.pm:1107 +#: printer/printerdrake.pm:1088 #, c-format msgid "Please choose the port that your printer is connected to or enter a device name/file name in the input line" msgstr "" -#: printer/printerdrake.pm:1108 +#: printer/printerdrake.pm:1089 #, c-format msgid "Please choose the port that your printer is connected to." msgstr "" -#: printer/printerdrake.pm:1110 +#: printer/printerdrake.pm:1091 #, c-format msgid " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)." msgstr "" -#: printer/printerdrake.pm:1114 +#: printer/printerdrake.pm:1095 #, c-format msgid "You must choose/enter a printer/device!" msgstr "" -#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216 printer/printerdrake.pm:1306 printer/printerdrake.pm:1443 printer/printerdrake.pm:1518 printer/printerdrake.pm:1669 printer/printerdrake.pm:1752 printer/printerdrake.pm:1761 printer/printerdrake.pm:1770 printer/printerdrake.pm:1781 -#, c-format -msgid "Aborting" -msgstr "" - -#: printer/printerdrake.pm:1189 +#: printer/printerdrake.pm:1164 #, c-format msgid "Remote lpd Printer Options" msgstr "" -#: printer/printerdrake.pm:1190 +#: printer/printerdrake.pm:1165 #, c-format msgid "To use a remote lpd printer, you need to supply the hostname of the printer server and the printer name on that server." msgstr "" -#: printer/printerdrake.pm:1191 +#: printer/printerdrake.pm:1166 #, c-format msgid "Remote host name" msgstr "" -#: printer/printerdrake.pm:1192 +#: printer/printerdrake.pm:1167 #, c-format msgid "Remote printer name" msgstr "" -#: printer/printerdrake.pm:1195 +#: printer/printerdrake.pm:1170 #, c-format msgid "Remote host name missing!" msgstr "" -#: printer/printerdrake.pm:1199 +#: printer/printerdrake.pm:1174 #, c-format msgid "Remote printer name missing!" msgstr "" -#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799 standalone/drakTermServ:466 standalone/drakTermServ:764 standalone/drakTermServ:780 standalone/drakTermServ:1418 standalone/drakTermServ:1426 standalone/drakTermServ:1437 standalone/drakbackup:582 standalone/drakbackup:687 standalone/drakbackup:722 standalone/drakbackup:840 standalone/drakconnect:263 standalone/drakconnect:298 standalone/drakconnect:542 standalone/drakconnect:552 standalone/drakconnect:576 standalone/harddrake2:160 +#: printer/printerdrake.pm:1196 printer/printerdrake.pm:1710 standalone/drakTermServ:442 standalone/drakTermServ:725 standalone/drakTermServ:741 standalone/drakTermServ:1332 standalone/drakTermServ:1340 standalone/drakTermServ:1351 standalone/drakbackup:767 standalone/drakbackup:874 standalone/drakbackup:908 standalone/drakbackup:1027 standalone/drakbackup:1898 standalone/drakbackup:1902 standalone/drakconnect:253 standalone/drakconnect:278 standalone/drakconnect:507 standalone/drakconnect:511 standalone/drakconnect:535 standalone/harddrake2:159 #, c-format msgid "Information" msgstr "" -#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799 +#: printer/printerdrake.pm:1196 printer/printerdrake.pm:1710 #, c-format msgid "Detected model: %s %s" msgstr "" -#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563 +#: printer/printerdrake.pm:1272 printer/printerdrake.pm:1512 #, c-format msgid "Scanning network..." msgstr "" -#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342 +#: printer/printerdrake.pm:1283 printer/printerdrake.pm:1304 #, c-format msgid ", printer \"%s\" on server \"%s\"" msgstr "" -#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345 +#: printer/printerdrake.pm:1286 printer/printerdrake.pm:1307 #, c-format msgid "Printer \"%s\" on server \"%s\"" msgstr "" -#: printer/printerdrake.pm:1366 +#: printer/printerdrake.pm:1328 #, c-format msgid "SMB (Windows 9x/NT) Printer Options" msgstr "" -#: printer/printerdrake.pm:1367 +#: printer/printerdrake.pm:1329 #, c-format msgid "To print to a SMB printer, you need to provide the SMB host name (Note! It may be different from its TCP/IP hostname!) and possibly the IP address of the print server, as well as the share name for the printer you wish to access and any applicable user name, password, and workgroup information." msgstr "" -#: printer/printerdrake.pm:1368 +#: printer/printerdrake.pm:1330 #, c-format msgid " If the desired printer was auto-detected, simply choose it from the list and then add user name, password, and/or workgroup if needed." msgstr "" -#: printer/printerdrake.pm:1370 +#: printer/printerdrake.pm:1332 #, c-format msgid "SMB server host" msgstr "" -#: printer/printerdrake.pm:1371 +#: printer/printerdrake.pm:1333 #, c-format msgid "SMB server IP" msgstr "" -#: printer/printerdrake.pm:1372 +#: printer/printerdrake.pm:1334 #, c-format msgid "Share name" msgstr "" -#: printer/printerdrake.pm:1375 +#: printer/printerdrake.pm:1337 #, c-format msgid "Workgroup" msgstr "" -#: printer/printerdrake.pm:1377 +#: printer/printerdrake.pm:1339 #, c-format msgid "Auto-detected" msgstr "" -#: printer/printerdrake.pm:1387 +#: printer/printerdrake.pm:1349 #, c-format msgid "Either the server name or the server's IP must be given!" msgstr "" -#: printer/printerdrake.pm:1391 +#: printer/printerdrake.pm:1353 #, c-format msgid "Samba share name missing!" msgstr "" -#: printer/printerdrake.pm:1397 +#: printer/printerdrake.pm:1359 #, c-format msgid "SECURITY WARNING!" msgstr "" -#: printer/printerdrake.pm:1398 +#: printer/printerdrake.pm:1360 #, c-format msgid "" "You are about to set up printing to a Windows account with password. Due to a fault in the architecture of the Samba client software the password is put in clear text into the command line of the Samba client used to transmit the print job to the Windows server. So it is possible for every user on this machine to display the password on the screen by issuing commands as \"ps auxwww\".\n" @@ -10018,7 +9994,7 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:1408 +#: printer/printerdrake.pm:1370 #, c-format msgid "" "Set up your Windows server to make the printer available under the IPP protocol and set up printing from this machine with the \"%s\" connection type in Printerdrake.\n" @@ -10026,7 +10002,7 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:1411 +#: printer/printerdrake.pm:1373 #, c-format msgid "" "Connect your printer to a Linux server and let your Windows machine(s) connect to it as a client.\n" @@ -10034,219 +10010,199 @@ msgid "" "Do you really want to continue setting up this printer as you are doing now?" msgstr "" -#: printer/printerdrake.pm:1489 +#: printer/printerdrake.pm:1445 #, c-format msgid "NetWare Printer Options" msgstr "" -#: printer/printerdrake.pm:1490 +#: printer/printerdrake.pm:1446 #, c-format msgid "To print on a NetWare printer, you need to provide the NetWare print server name (Note! it may be different from its TCP/IP hostname!) as well as the print queue name for the printer you wish to access and any applicable user name and password." msgstr "" -#: printer/printerdrake.pm:1491 +#: printer/printerdrake.pm:1447 #, c-format msgid "Printer Server" msgstr "" -#: printer/printerdrake.pm:1492 +#: printer/printerdrake.pm:1448 #, c-format msgid "Print Queue Name" msgstr "" -#: printer/printerdrake.pm:1497 +#: printer/printerdrake.pm:1453 #, c-format msgid "NCP server name missing!" msgstr "" -#: printer/printerdrake.pm:1501 +#: printer/printerdrake.pm:1457 #, c-format msgid "NCP queue name missing!" msgstr "" -#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594 +#: printer/printerdrake.pm:1523 printer/printerdrake.pm:1543 #, c-format msgid ", host \"%s\", port %s" msgstr "" -#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597 +#: printer/printerdrake.pm:1526 printer/printerdrake.pm:1546 #, c-format msgid "Host \"%s\", port %s" msgstr "" -#: printer/printerdrake.pm:1618 +#: printer/printerdrake.pm:1567 #, c-format msgid "TCP/Socket Printer Options" msgstr "" -#: printer/printerdrake.pm:1620 +#: printer/printerdrake.pm:1569 #, c-format msgid "Choose one of the auto-detected printers from the list or enter the hostname or IP and the optional port number (default is 9100) in the input fields." msgstr "" -#: printer/printerdrake.pm:1621 +#: printer/printerdrake.pm:1570 #, c-format msgid "To print to a TCP or socket printer, you need to provide the host name or IP of the printer and optionally the port number (default is 9100). On HP JetDirect servers the port number is usually 9100, on other servers it can vary. See the manual of your hardware." msgstr "" -#: printer/printerdrake.pm:1625 +#: printer/printerdrake.pm:1574 #, c-format msgid "Printer host name or IP missing!" msgstr "" -#: printer/printerdrake.pm:1648 +#: printer/printerdrake.pm:1597 #, c-format msgid "Printer host name or IP" msgstr "" -#: printer/printerdrake.pm:1704 -#, c-format -msgid "Refreshing Device URI list..." -msgstr "" - -#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709 +#: printer/printerdrake.pm:1645 printer/printerdrake.pm:1647 #, c-format msgid "Printer Device URI" msgstr "" -#: printer/printerdrake.pm:1708 +#: printer/printerdrake.pm:1646 #, c-format msgid "You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Note that not all URI types are supported by all the spoolers." msgstr "" -#: printer/printerdrake.pm:1731 +#: printer/printerdrake.pm:1664 #, c-format msgid "A valid URI must be entered!" msgstr "" -#: printer/printerdrake.pm:1834 +#: printer/printerdrake.pm:1745 #, c-format msgid "Pipe into command" msgstr "" -#: printer/printerdrake.pm:1835 +#: printer/printerdrake.pm:1746 #, c-format msgid "Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer." msgstr "" -#: printer/printerdrake.pm:1836 +#: printer/printerdrake.pm:1747 #, c-format msgid "Command line" msgstr "" -#: printer/printerdrake.pm:1840 +#: printer/printerdrake.pm:1751 #, c-format msgid "A command line must be entered!" msgstr "" -#: printer/printerdrake.pm:1873 +#: printer/printerdrake.pm:1784 #, c-format msgid "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?" msgstr "" -#: printer/printerdrake.pm:1887 +#: printer/printerdrake.pm:1797 #, c-format msgid "Installing HPOJ package..." msgstr "" -#: printer/printerdrake.pm:1894 -#, c-format -msgid "Only printing will be possible on the %s." -msgstr "" - -#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025 +#: printer/printerdrake.pm:1805 printer/printerdrake.pm:1889 #, c-format msgid "Checking device and configuring HPOJ..." msgstr "" -#: printer/printerdrake.pm:1946 +#: printer/printerdrake.pm:1827 #, c-format msgid "Installing SANE packages..." msgstr "" -#: printer/printerdrake.pm:1956 -#, c-format -msgid "Scanning on the %s will not be possible." -msgstr "" - -#: printer/printerdrake.pm:1983 +#: printer/printerdrake.pm:1854 #, c-format msgid "Installing mtools packages..." msgstr "" -#: printer/printerdrake.pm:1990 -#, c-format -msgid "Photo memory card access on the %s will not be possible." -msgstr "" - -#: printer/printerdrake.pm:2005 +#: printer/printerdrake.pm:1869 #, c-format msgid "Scanning on your HP multi-function device" msgstr "" -#: printer/printerdrake.pm:2013 +#: printer/printerdrake.pm:1877 #, c-format msgid "Photo memory card access on your HP multi-function device" msgstr "" -#: printer/printerdrake.pm:2062 +#: printer/printerdrake.pm:1926 #, c-format msgid "Making printer port available for CUPS..." msgstr "" -#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315 printer/printerdrake.pm:2459 +#: printer/printerdrake.pm:1935 printer/printerdrake.pm:2179 printer/printerdrake.pm:2323 #, c-format msgid "Reading printer database..." msgstr "" -#: printer/printerdrake.pm:2281 +#: printer/printerdrake.pm:2145 #, c-format msgid "Enter Printer Name and Comments" msgstr "" -#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421 +#: printer/printerdrake.pm:2149 printer/printerdrake.pm:3237 #, c-format msgid "Name of printer should contain only letters, numbers and the underscore" msgstr "" -#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426 +#: printer/printerdrake.pm:2155 printer/printerdrake.pm:3242 #, c-format msgid "" "The printer \"%s\" already exists,\n" "do you really want to overwrite its configuration?" msgstr "" -#: printer/printerdrake.pm:2300 +#: printer/printerdrake.pm:2164 #, c-format msgid "Every printer needs a name (for example \"printer\"). The Description and Location fields do not need to be filled in. They are comments for the users." msgstr "" -#: printer/printerdrake.pm:2301 +#: printer/printerdrake.pm:2165 #, c-format msgid "Name of printer" msgstr "" -#: printer/printerdrake.pm:2302 standalone/drakconnect:557 standalone/harddrake2:40 standalone/printerdrake:212 standalone/printerdrake:219 +#: printer/printerdrake.pm:2166 standalone/drakconnect:516 standalone/harddrake2:40 standalone/printerdrake:212 standalone/printerdrake:219 #, c-format msgid "Description" msgstr "" -#: printer/printerdrake.pm:2303 standalone/printerdrake:212 standalone/printerdrake:219 +#: printer/printerdrake.pm:2167 standalone/printerdrake:212 standalone/printerdrake:219 #, c-format msgid "Location" msgstr "" -#: printer/printerdrake.pm:2320 +#: printer/printerdrake.pm:2184 #, c-format msgid "Preparing printer database..." msgstr "" -#: printer/printerdrake.pm:2438 +#: printer/printerdrake.pm:2302 #, c-format msgid "Your printer model" msgstr "" -#: printer/printerdrake.pm:2439 +#: printer/printerdrake.pm:2303 #, c-format msgid "" "Printerdrake has compared the model name resulting from the printer auto-detection with the models listed in its printer database to find the best match. This choice can be wrong, especially when your printer is not listed at all in the database. So check whether the choice is correct and click \"The model is correct\" if so and if not, click \"Select model manually\" so that you can choose your printer model manually on the next screen.\n" @@ -10256,17 +10212,17 @@ msgid "" "%s" msgstr "" -#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447 +#: printer/printerdrake.pm:2308 printer/printerdrake.pm:2311 #, c-format msgid "The model is correct" msgstr "" -#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446 printer/printerdrake.pm:2449 +#: printer/printerdrake.pm:2309 printer/printerdrake.pm:2310 printer/printerdrake.pm:2313 #, c-format msgid "Select model manually" msgstr "" -#: printer/printerdrake.pm:2472 +#: printer/printerdrake.pm:2336 #, c-format msgid "" "\n" @@ -10274,124 +10230,114 @@ msgid "" "Please check whether Printerdrake did the auto-detection of your printer model correctly. Find the correct model in the list when a wrong model or \"Raw printer\" is highlighted." msgstr "" -#: printer/printerdrake.pm:2491 +#: printer/printerdrake.pm:2355 #, c-format msgid "Install a manufacturer-supplied PPD file" msgstr "" -#: printer/printerdrake.pm:2522 +#: printer/printerdrake.pm:2386 #, c-format msgid "Every PostScript printer is delivered with a PPD file which describes the printer's options and features." msgstr "" -#: printer/printerdrake.pm:2523 +#: printer/printerdrake.pm:2387 #, c-format msgid "This file is usually somewhere on the CD with the Windows and Mac drivers delivered with the printer." msgstr "" -#: printer/printerdrake.pm:2524 +#: printer/printerdrake.pm:2388 #, c-format msgid "You can find the PPD files also on the manufacturer's web sites." msgstr "" -#: printer/printerdrake.pm:2525 +#: printer/printerdrake.pm:2389 #, c-format msgid "If you have Windows installed on your machine, you can find the PPD file on your Windows partition, too." msgstr "" -#: printer/printerdrake.pm:2526 +#: printer/printerdrake.pm:2390 #, c-format msgid "Installing the printer's PPD file and using it when setting up the printer makes all options of the printer available which are provided by the printer's hardware" msgstr "" -#: printer/printerdrake.pm:2527 +#: printer/printerdrake.pm:2391 #, c-format msgid "Here you can choose the PPD file to be installed on your machine, it will then be used for the setup of your printer." msgstr "" -#: printer/printerdrake.pm:2529 +#: printer/printerdrake.pm:2393 #, c-format msgid "Install PPD file from" msgstr "" -#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538 standalone/scannerdrake:180 standalone/scannerdrake:188 standalone/scannerdrake:239 standalone/scannerdrake:246 +#: printer/printerdrake.pm:2395 printer/printerdrake.pm:2402 standalone/scannerdrake:174 standalone/scannerdrake:182 standalone/scannerdrake:233 standalone/scannerdrake:240 #, c-format msgid "CD-ROM" msgstr "" -#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540 standalone/scannerdrake:181 standalone/scannerdrake:190 standalone/scannerdrake:240 standalone/scannerdrake:248 +#: printer/printerdrake.pm:2396 printer/printerdrake.pm:2404 standalone/scannerdrake:175 standalone/scannerdrake:184 standalone/scannerdrake:234 standalone/scannerdrake:242 #, c-format msgid "Floppy Disk" msgstr "" -#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542 standalone/scannerdrake:182 standalone/scannerdrake:192 standalone/scannerdrake:241 standalone/scannerdrake:250 +#: printer/printerdrake.pm:2397 printer/printerdrake.pm:2406 standalone/scannerdrake:176 standalone/scannerdrake:186 standalone/scannerdrake:235 standalone/scannerdrake:244 #, c-format msgid "Other place" msgstr "" -#: printer/printerdrake.pm:2548 +#: printer/printerdrake.pm:2412 #, c-format msgid "Select PPD file" msgstr "" -#: printer/printerdrake.pm:2552 +#: printer/printerdrake.pm:2416 #, c-format msgid "The PPD file %s does not exist or is unreadable!" msgstr "" -#: printer/printerdrake.pm:2558 +#: printer/printerdrake.pm:2422 #, c-format msgid "The PPD file %s does not conform with the PPD specifications!" msgstr "" -#: printer/printerdrake.pm:2569 +#: printer/printerdrake.pm:2433 #, c-format msgid "Installing PPD file..." msgstr "" -#: printer/printerdrake.pm:2682 +#: printer/printerdrake.pm:2535 #, c-format msgid "OKI winprinter configuration" msgstr "" -#: printer/printerdrake.pm:2683 +#: printer/printerdrake.pm:2536 #, c-format msgid "" "You are configuring an OKI laser winprinter. These printers\n" "use a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver." msgstr "" -#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736 +#: printer/printerdrake.pm:2560 printer/printerdrake.pm:2589 #, c-format msgid "Lexmark inkjet configuration" msgstr "" -#: printer/printerdrake.pm:2708 +#: printer/printerdrake.pm:2561 #, c-format msgid "The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to." msgstr "" -#: printer/printerdrake.pm:2737 +#: printer/printerdrake.pm:2590 #, c-format msgid "To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program." msgstr "" -#: printer/printerdrake.pm:2746 -#, c-format -msgid "Lexmark X125 configuration" -msgstr "" - -#: printer/printerdrake.pm:2747 -#, c-format -msgid "The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes. Please connect your printer to a local USB port or configure it on the machine where it is connected to." -msgstr "" - -#: printer/printerdrake.pm:2765 +#: printer/printerdrake.pm:2593 #, c-format msgid "Firmware-Upload for HP LaserJet 1000" msgstr "" -#: printer/printerdrake.pm:2878 +#: printer/printerdrake.pm:2706 #, c-format msgid "" "Printer default settings\n" @@ -10399,96 +10345,86 @@ msgid "" "You should make sure that the page size and the ink type/printing mode (if available) and also the hardware configuration of laser printers (memory, duplex unit, extra trays) are set correctly. Note that with a very high printout quality/resolution printing can get substantially slower." msgstr "" -#: printer/printerdrake.pm:3003 +#: printer/printerdrake.pm:2831 #, c-format msgid "Printer default settings" msgstr "" -#: printer/printerdrake.pm:3010 +#: printer/printerdrake.pm:2838 #, c-format msgid "Option %s must be an integer number!" msgstr "" -#: printer/printerdrake.pm:3014 +#: printer/printerdrake.pm:2842 #, c-format msgid "Option %s must be a number!" msgstr "" -#: printer/printerdrake.pm:3018 +#: printer/printerdrake.pm:2846 #, c-format msgid "Option %s out of range!" msgstr "" -#: printer/printerdrake.pm:3069 +#: printer/printerdrake.pm:2897 #, c-format msgid "" "Do you want to set this printer (\"%s\")\n" "as the default printer?" msgstr "" -#: printer/printerdrake.pm:3084 +#: printer/printerdrake.pm:2912 #, c-format msgid "Test pages" msgstr "" -#: printer/printerdrake.pm:3085 +#: printer/printerdrake.pm:2913 #, c-format msgid "" "Please select the test pages you want to print.\n" "Note: the photo test page can take a rather long time to get printed and on laser printers with too low memory it can even not come out. In most cases it is enough to print the standard test page." msgstr "" -#: printer/printerdrake.pm:3089 +#: printer/printerdrake.pm:2917 #, c-format msgid "No test pages" msgstr "" -#: printer/printerdrake.pm:3090 +#: printer/printerdrake.pm:2918 #, c-format msgid "Print" msgstr "" -#: printer/printerdrake.pm:3115 +#: printer/printerdrake.pm:2943 #, c-format msgid "Standard test page" msgstr "" -#: printer/printerdrake.pm:3118 +#: printer/printerdrake.pm:2946 #, c-format msgid "Alternative test page (Letter)" msgstr "" -#: printer/printerdrake.pm:3121 +#: printer/printerdrake.pm:2949 #, c-format msgid "Alternative test page (A4)" msgstr "" -#: printer/printerdrake.pm:3123 +#: printer/printerdrake.pm:2951 #, c-format msgid "Photo test page" msgstr "" -#: printer/printerdrake.pm:3127 +#: printer/printerdrake.pm:2955 #, c-format msgid "Do not print any test page" msgstr "" -#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300 +#: printer/printerdrake.pm:2963 printer/printerdrake.pm:3119 #, c-format msgid "Printing test page(s)..." msgstr "" -#: printer/printerdrake.pm:3150 -#, c-format -msgid "Could not install the %s package!" -msgstr "" - -#: printer/printerdrake.pm:3152 -#, c-format -msgid "Skipping photo test page." -msgstr "" - -#: printer/printerdrake.pm:3169 +#: printer/printerdrake.pm:2988 #, c-format msgid "" "Test page(s) have been sent to the printer.\n" @@ -10499,7 +10435,7 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:3173 +#: printer/printerdrake.pm:2992 #, c-format msgid "" "Test page(s) have been sent to the printer.\n" @@ -10507,38 +10443,38 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:3180 +#: printer/printerdrake.pm:2999 #, c-format msgid "Did it work properly?" msgstr "" -#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397 +#: printer/printerdrake.pm:3020 printer/printerdrake.pm:4183 #, c-format msgid "Raw printer" msgstr "" -#: printer/printerdrake.pm:3231 +#: printer/printerdrake.pm:3050 #, c-format msgid "" "To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily.\n" "" msgstr "" -#: printer/printerdrake.pm:3233 +#: printer/printerdrake.pm:3052 #, c-format msgid "" "These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application.\n" "" msgstr "" -#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253 printer/printerdrake.pm:3263 +#: printer/printerdrake.pm:3055 printer/printerdrake.pm:3072 printer/printerdrake.pm:3082 #, c-format msgid "" "\n" "The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". " msgstr "" -#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279 +#: printer/printerdrake.pm:3058 printer/printerdrake.pm:3098 #, c-format msgid "" "To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s\n" @@ -10546,7 +10482,7 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:3243 +#: printer/printerdrake.pm:3062 #, c-format msgid "" "Here is a list of the available printing options for the current printer:\n" @@ -10554,33 +10490,33 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258 +#: printer/printerdrake.pm:3067 printer/printerdrake.pm:3077 #, c-format msgid "" "To print a file from the command line (terminal window) use the command \"%s <file>\".\n" "" msgstr "" -#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260 printer/printerdrake.pm:3270 +#: printer/printerdrake.pm:3069 printer/printerdrake.pm:3079 printer/printerdrake.pm:3089 #, c-format msgid "" "This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.\n" "" msgstr "" -#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265 +#: printer/printerdrake.pm:3074 printer/printerdrake.pm:3084 #, c-format msgid "To get a list of the options available for the current printer click on the \"Print option list\" button." msgstr "" -#: printer/printerdrake.pm:3268 +#: printer/printerdrake.pm:3087 #, c-format msgid "" "To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\".\n" "" msgstr "" -#: printer/printerdrake.pm:3272 +#: printer/printerdrake.pm:3091 #, c-format msgid "" "You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs.\n" @@ -10588,7 +10524,7 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:3276 +#: printer/printerdrake.pm:3095 #, c-format msgid "" "\n" @@ -10596,37 +10532,37 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:3286 +#: printer/printerdrake.pm:3105 #, c-format msgid "Printing/Scanning/Photo Cards on \"%s\"" msgstr "" -#: printer/printerdrake.pm:3287 +#: printer/printerdrake.pm:3106 #, c-format msgid "Printing/Scanning on \"%s\"" msgstr "" -#: printer/printerdrake.pm:3289 +#: printer/printerdrake.pm:3108 #, c-format msgid "Printing/Photo Card Access on \"%s\"" msgstr "" -#: printer/printerdrake.pm:3290 +#: printer/printerdrake.pm:3109 #, c-format msgid "Printing on the printer \"%s\"" msgstr "" -#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296 printer/printerdrake.pm:3297 printer/printerdrake.pm:3298 printer/printerdrake.pm:4384 standalone/drakTermServ:325 standalone/drakbackup:4265 standalone/drakbug:177 standalone/drakfont:500 standalone/drakfont:591 standalone/net_monitor:106 standalone/printerdrake:508 +#: printer/printerdrake.pm:3112 printer/printerdrake.pm:3115 printer/printerdrake.pm:3116 printer/printerdrake.pm:3117 printer/printerdrake.pm:4170 standalone/drakTermServ:321 standalone/drakbackup:4587 standalone/drakbug:177 standalone/drakfont:497 standalone/drakfont:588 standalone/net_monitor:106 standalone/printerdrake:508 #, c-format msgid "Close" msgstr "" -#: printer/printerdrake.pm:3296 +#: printer/printerdrake.pm:3115 #, c-format msgid "Print option list" msgstr "" -#: printer/printerdrake.pm:3317 +#: printer/printerdrake.pm:3136 #, c-format msgid "" "Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information.\n" @@ -10634,22 +10570,22 @@ msgid "" "Do not use \"scannerdrake\" for this device!" msgstr "" -#: printer/printerdrake.pm:3343 +#: printer/printerdrake.pm:3159 #, c-format msgid "Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists." msgstr "" -#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767 +#: printer/printerdrake.pm:3181 printer/printerdrake.pm:3570 #, c-format msgid "Reading printer data..." msgstr "" -#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412 printer/printerdrake.pm:3447 +#: printer/printerdrake.pm:3201 printer/printerdrake.pm:3228 printer/printerdrake.pm:3263 #, c-format msgid "Transfer printer configuration" msgstr "" -#: printer/printerdrake.pm:3386 +#: printer/printerdrake.pm:3202 #, c-format msgid "" "You can copy the printer configuration which you have done for the spooler %s to %s, your current spooler. All the configuration data (printer name, description, location, connection type, and default option settings) is overtaken, but jobs will not be transferred.\n" @@ -10657,40 +10593,40 @@ msgid "" "" msgstr "" -#: printer/printerdrake.pm:3389 +#: printer/printerdrake.pm:3205 #, c-format msgid "" "CUPS does not support printers on Novell servers or printers sending the data into a free-formed command.\n" "" msgstr "" -#: printer/printerdrake.pm:3391 +#: printer/printerdrake.pm:3207 #, c-format msgid "" "PDQ only supports local printers, remote LPD printers, and Socket/TCP printers.\n" "" msgstr "" -#: printer/printerdrake.pm:3393 +#: printer/printerdrake.pm:3209 #, c-format msgid "" "LPD and LPRng do not support IPP printers.\n" "" msgstr "" -#: printer/printerdrake.pm:3395 +#: printer/printerdrake.pm:3211 #, c-format msgid "In addition, queues not created with this program or \"foomatic-configure\" cannot be transferred." msgstr "" -#: printer/printerdrake.pm:3396 +#: printer/printerdrake.pm:3212 #, c-format msgid "" "\n" "Also printers configured with the PPD files provided by their manufacturers or with native CUPS drivers cannot be transferred." msgstr "" -#: printer/printerdrake.pm:3397 +#: printer/printerdrake.pm:3213 #, c-format msgid "" "\n" @@ -10698,17 +10634,17 @@ msgid "" "\"Transfer\"." msgstr "" -#: printer/printerdrake.pm:3400 +#: printer/printerdrake.pm:3216 #, c-format msgid "Do not transfer printers" msgstr "" -#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417 +#: printer/printerdrake.pm:3217 printer/printerdrake.pm:3233 #, c-format msgid "Transfer" msgstr "" -#: printer/printerdrake.pm:3413 +#: printer/printerdrake.pm:3229 #, c-format msgid "" "A printer named \"%s\" already exists under %s. \n" @@ -10716,97 +10652,102 @@ msgid "" "You can also type a new name or skip this printer." msgstr "" -#: printer/printerdrake.pm:3434 +#: printer/printerdrake.pm:3250 #, c-format msgid "New printer name" msgstr "" -#: printer/printerdrake.pm:3437 +#: printer/printerdrake.pm:3253 #, c-format msgid "Transferring %s..." msgstr "" -#: printer/printerdrake.pm:3448 +#: printer/printerdrake.pm:3264 #, c-format msgid "You have transferred your former default printer (\"%s\"), Should it be also the default printer under the new printing system %s?" msgstr "" -#: printer/printerdrake.pm:3458 +#: printer/printerdrake.pm:3274 #, c-format msgid "Refreshing printer data..." msgstr "" -#: printer/printerdrake.pm:3467 +#: printer/printerdrake.pm:3282 printer/printerdrake.pm:3360 printer/printerdrake.pm:3372 +#, c-format +msgid "Configuration of a remote printer" +msgstr "" + +#: printer/printerdrake.pm:3283 #, c-format msgid "Starting network..." msgstr "" -#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512 printer/printerdrake.pm:3514 +#: printer/printerdrake.pm:3324 printer/printerdrake.pm:3328 printer/printerdrake.pm:3330 #, c-format msgid "Configure the network now" msgstr "" -#: printer/printerdrake.pm:3509 +#: printer/printerdrake.pm:3325 #, c-format msgid "Network functionality not configured" msgstr "" -#: printer/printerdrake.pm:3510 +#: printer/printerdrake.pm:3326 #, c-format msgid "You are going to configure a remote printer. This needs working network access, but your network is not configured yet. If you go on without network configuration, you will not be able to use the printer which you are configuring now. How do you want to proceed?" msgstr "" -#: printer/printerdrake.pm:3513 +#: printer/printerdrake.pm:3329 #, c-format msgid "Go on without configuring the network" msgstr "" -#: printer/printerdrake.pm:3547 +#: printer/printerdrake.pm:3362 #, c-format -msgid "The network configuration done during the installation cannot be started now. Please check whether the network is accessible after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\"" +msgid "The network configuration done during the installation cannot be started now. Please check whether the network is accessable after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\"" msgstr "" -#: printer/printerdrake.pm:3548 +#: printer/printerdrake.pm:3363 #, c-format msgid "The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again." msgstr "" -#: printer/printerdrake.pm:3558 +#: printer/printerdrake.pm:3373 #, c-format msgid "Restarting printing system..." msgstr "" -#: printer/printerdrake.pm:3597 +#: printer/printerdrake.pm:3412 #, c-format msgid "high" msgstr "" -#: printer/printerdrake.pm:3597 +#: printer/printerdrake.pm:3412 #, c-format msgid "paranoid" msgstr "" -#: printer/printerdrake.pm:3598 +#: printer/printerdrake.pm:3413 #, c-format msgid "Installing a printing system in the %s security level" msgstr "" -#: printer/printerdrake.pm:3599 +#: printer/printerdrake.pm:3414 #, c-format msgid "" "You are about to install the printing system %s on a system running in the %s security level.\n" "\n" -"This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessible by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level.\n" +"This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessable by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level.\n" "\n" "Do you really want to configure printing on this machine?" msgstr "" -#: printer/printerdrake.pm:3633 +#: printer/printerdrake.pm:3448 #, c-format msgid "Starting the printing system at boot time" msgstr "" -#: printer/printerdrake.pm:3634 +#: printer/printerdrake.pm:3449 #, c-format msgid "" "The printing system (%s) will not be started automatically when the machine is booted.\n" @@ -10816,224 +10757,204 @@ msgid "" "Do you want to have the automatic starting of the printing system turned on again?" msgstr "" -#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889 +#: printer/printerdrake.pm:3470 printer/printerdrake.pm:3685 #, c-format msgid "Checking installed software..." msgstr "" -#: printer/printerdrake.pm:3661 +#: printer/printerdrake.pm:3476 #, c-format msgid "Removing %s ..." msgstr "" -#: printer/printerdrake.pm:3665 -#, c-format -msgid "Could not remove the %s printing system!" -msgstr "" - -#: printer/printerdrake.pm:3674 +#: printer/printerdrake.pm:3483 #, c-format msgid "Installing %s ..." msgstr "" -#: printer/printerdrake.pm:3678 -#, c-format -msgid "Could not install the %s printing system!" -msgstr "" - -#: printer/printerdrake.pm:3727 +#: printer/printerdrake.pm:3530 #, c-format msgid "Setting Default Printer..." msgstr "" -#: printer/printerdrake.pm:3747 +#: printer/printerdrake.pm:3550 #, c-format msgid "Select Printer Spooler" msgstr "" -#: printer/printerdrake.pm:3748 +#: printer/printerdrake.pm:3551 #, c-format msgid "Which printing system (spooler) do you want to use?" msgstr "" -#: printer/printerdrake.pm:3799 +#: printer/printerdrake.pm:3602 #, c-format msgid "Failed to configure printer \"%s\"!" msgstr "" -#: printer/printerdrake.pm:3812 +#: printer/printerdrake.pm:3615 #, c-format msgid "Installing Foomatic..." msgstr "" -#: printer/printerdrake.pm:3818 -#, c-format -msgid "Could not install %s packages, %s cannot be started!" -msgstr "" - -#: printer/printerdrake.pm:3910 +#: printer/printerdrake.pm:3800 #, c-format -msgid "Could not install necessary packages, %s cannot be started!" +msgid "The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it." msgstr "" -#: printer/printerdrake.pm:4011 -#, c-format -msgid "The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it. " -msgstr "" - -#: printer/printerdrake.pm:4039 +#: printer/printerdrake.pm:3827 #, c-format msgid "Display all available remote CUPS printers" msgstr "" -#: printer/printerdrake.pm:4040 +#: printer/printerdrake.pm:3828 #, c-format msgid "Refresh printer list (to display all available remote CUPS printers)" msgstr "" -#: printer/printerdrake.pm:4050 +#: printer/printerdrake.pm:3836 #, c-format msgid "CUPS configuration" msgstr "" -#: printer/printerdrake.pm:4062 +#: printer/printerdrake.pm:3848 #, c-format msgid "Change the printing system" msgstr "" -#: printer/printerdrake.pm:4071 +#: printer/printerdrake.pm:3857 #, c-format msgid "Normal Mode" msgstr "" -#: printer/printerdrake.pm:4072 +#: printer/printerdrake.pm:3858 #, c-format msgid "Expert Mode" msgstr "" -#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398 printer/printerdrake.pm:4479 printer/printerdrake.pm:4489 +#: printer/printerdrake.pm:4129 printer/printerdrake.pm:4184 printer/printerdrake.pm:4265 printer/printerdrake.pm:4275 #, c-format msgid "Printer options" msgstr "" -#: printer/printerdrake.pm:4379 +#: printer/printerdrake.pm:4165 #, c-format msgid "Modify printer configuration" msgstr "" -#: printer/printerdrake.pm:4381 +#: printer/printerdrake.pm:4167 #, c-format msgid "" "Printer %s\n" "What do you want to modify on this printer?" msgstr "" -#: printer/printerdrake.pm:4385 +#: printer/printerdrake.pm:4171 #, c-format msgid "Do it!" msgstr "" -#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448 +#: printer/printerdrake.pm:4176 printer/printerdrake.pm:4234 #, c-format msgid "Printer connection type" msgstr "" -#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452 +#: printer/printerdrake.pm:4177 printer/printerdrake.pm:4238 #, c-format msgid "Printer name, description, location" msgstr "" -#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471 +#: printer/printerdrake.pm:4179 printer/printerdrake.pm:4257 #, c-format msgid "Printer manufacturer, model, driver" msgstr "" -#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472 +#: printer/printerdrake.pm:4180 printer/printerdrake.pm:4258 #, c-format msgid "Printer manufacturer, model" msgstr "" -#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483 +#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4269 #, c-format msgid "Set this printer as the default" msgstr "" -#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490 +#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4276 #, c-format msgid "Add this printer to Star Office/OpenOffice.org/GIMP" msgstr "" -#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495 +#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4281 #, c-format msgid "Remove this printer from Star Office/OpenOffice.org/GIMP" msgstr "" -#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500 +#: printer/printerdrake.pm:4190 printer/printerdrake.pm:4286 #, c-format msgid "Print test pages" msgstr "" -#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502 +#: printer/printerdrake.pm:4191 printer/printerdrake.pm:4288 #, c-format msgid "Learn how to use this printer" msgstr "" -#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504 +#: printer/printerdrake.pm:4192 printer/printerdrake.pm:4290 #, c-format msgid "Remove printer" msgstr "" -#: printer/printerdrake.pm:4460 +#: printer/printerdrake.pm:4246 #, c-format msgid "Removing old printer \"%s\"..." msgstr "" -#: printer/printerdrake.pm:4491 +#: printer/printerdrake.pm:4277 #, c-format msgid "Adding printer to Star Office/OpenOffice.org/GIMP" msgstr "" -#: printer/printerdrake.pm:4493 +#: printer/printerdrake.pm:4279 #, c-format msgid "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP." msgstr "" -#: printer/printerdrake.pm:4494 +#: printer/printerdrake.pm:4280 #, c-format msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP." msgstr "" -#: printer/printerdrake.pm:4496 +#: printer/printerdrake.pm:4282 #, c-format msgid "Removing printer from Star Office/OpenOffice.org/GIMP" msgstr "" -#: printer/printerdrake.pm:4498 +#: printer/printerdrake.pm:4284 #, c-format msgid "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/GIMP." msgstr "" -#: printer/printerdrake.pm:4499 +#: printer/printerdrake.pm:4285 #, c-format msgid "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP." msgstr "" -#: printer/printerdrake.pm:4543 +#: printer/printerdrake.pm:4329 #, c-format msgid "Do you really want to remove the printer \"%s\"?" msgstr "" -#: printer/printerdrake.pm:4547 +#: printer/printerdrake.pm:4333 #, c-format msgid "Removing printer \"%s\"..." msgstr "" -#: printer/printerdrake.pm:4571 +#: printer/printerdrake.pm:4357 #, c-format msgid "Default printer" msgstr "" -#: printer/printerdrake.pm:4572 +#: printer/printerdrake.pm:4358 #, c-format msgid "The printer \"%s\" is set as the default printer now." msgstr "" @@ -11065,32 +10986,27 @@ msgstr "" msgid "Could not create directory /usr/share/sane/firmware!" msgstr "" -#: scanner.pm:107 -#, c-format -msgid "Could not create link /usr/share/sane/%s!" -msgstr "" - -#: scanner.pm:114 +#: scanner.pm:102 #, c-format msgid "Could not copy firmware file %s to /usr/share/sane/firmware!" msgstr "" -#: scanner.pm:121 +#: scanner.pm:109 #, c-format msgid "Could not set permissions of firmware file %s!" msgstr "" -#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69 standalone/scannerdrake:77 standalone/scannerdrake:339 standalone/scannerdrake:414 standalone/scannerdrake:458 standalone/scannerdrake:462 standalone/scannerdrake:484 standalone/scannerdrake:549 +#: scanner.pm:188 standalone/scannerdrake:59 standalone/scannerdrake:63 standalone/scannerdrake:71 standalone/scannerdrake:333 standalone/scannerdrake:407 standalone/scannerdrake:451 standalone/scannerdrake:455 standalone/scannerdrake:477 standalone/scannerdrake:542 #, c-format msgid "Scannerdrake" msgstr "" -#: scanner.pm:201 standalone/scannerdrake:915 +#: scanner.pm:189 standalone/scannerdrake:903 #, c-format msgid "Could not install the packages needed to share your scanner(s)." msgstr "" -#: scanner.pm:202 +#: scanner.pm:190 #, c-format msgid "Your scanner(s) will not be available for non-root users." msgstr "" @@ -12040,7 +11956,7 @@ msgid "" "about this service, sorry." msgstr "" -#: services.pm:226 ugtk2.pm:1167 +#: services.pm:226 ugtk2.pm:1138 #, c-format msgid "Info" msgstr "" @@ -12067,20 +11983,20 @@ msgstr "" #: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13 share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13 #, c-format -msgid "<b>Congratulations for choosing Mandrakelinux!</b>" +msgid "<b>Congratulations for choosing Mandrake Linux!</b>" msgstr "" -#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15 share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15 +#: share/advertising/dis-01.pl:15 share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15 #, c-format msgid "Welcome to the Open Source world!" msgstr "" #: share/advertising/dis-01.pl:17 #, c-format -msgid "Your new Mandrakelinux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world." +msgid "Your new Mandrake Linux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world." msgstr "" -#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19 share/advertising/ppp-01.pl:19 +#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:17 share/advertising/ppp-01.pl:19 #, c-format msgid "We would like to thank everyone who participated in the development of this latest release." msgstr "" @@ -12252,7 +12168,7 @@ msgstr "" #: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18 share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18 #, c-format -msgid "\t- Voting for software to put in Mandrakelinux" +msgid "\t- Voting for software to put in Mandrake Linux" msgstr "" #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19 share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19 @@ -12285,14 +12201,14 @@ msgstr "" msgid "If you have Linux questions, subscribe to MandrakeExpert at <b>www.mandrakeexpert.com</b>" msgstr "" -#: share/advertising/dwd-01.pl:17 +#: share/advertising/dwd-01.pl:15 #, c-format -msgid "Mandrakelinux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrakelinux contributors." +msgid "Mandrake Linux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrake Linux contributors." msgstr "" #: share/advertising/dwd-02.pl:13 #, c-format -msgid "<b>Join the Mandrakelinux community!</b>" +msgid "<b>Join the Mandrake Linux community!</b>" msgstr "" #: share/advertising/dwd-02.pl:15 @@ -12307,22 +12223,22 @@ msgstr "" #: share/advertising/dwd-03.pl:13 #, c-format -msgid "<b>What is Mandrakelinux?</b>" +msgid "<b>What is Mandrake Linux?</b>" msgstr "" #: share/advertising/dwd-03.pl:15 #, c-format -msgid "Mandrakelinux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrakelinux is one of the most widely used Linux distributions worldwide!" +msgid "Mandrake Linux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrake Linux is one of the most widely used Linux distributions worldwide!" msgstr "" #: share/advertising/dwd-03.pl:17 #, c-format -msgid "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications." +msgid "Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications." msgstr "" #: share/advertising/dwd-04.pl:13 #, c-format -msgid "Mandrakelinux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution." +msgid "Mandrake Linux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution." msgstr "" #: share/advertising/dwd-04.pl:15 @@ -12332,7 +12248,7 @@ msgstr "" #: share/advertising/dwd-04.pl:16 #, c-format -msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>" +msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>" msgstr "" #: share/advertising/dwd-04.pl:17 @@ -12367,7 +12283,7 @@ msgstr "" #: share/advertising/dwd-05.pl:19 #, c-format -msgid "<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrakelinux distribution. A unique blend for incomparable HPC performance." +msgid "<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrake Linux distribution. A unique blend for incomparable HPC performance." msgstr "" #: share/advertising/dwd-06.pl:15 @@ -12402,17 +12318,17 @@ msgstr "" #: share/advertising/dwd-09.pl:18 #, c-format -msgid "This is the Mandrakelinux <b>Download version</b>." +msgid "This is the Mandrake Linux <b>Download version</b>." msgstr "" #: share/advertising/dwd-09.pl:20 #, c-format -msgid "The free download version does not include commercial software, and therefore may not work with certain modems (such as some ADSL and RTC) and video cards (such as ATI® and NVIDIA®)." +msgid "The free download version does not include commercial software, and therefore may not work with certain modems (such as some ADSL and RTC ones) and video cards (such as ATI® and NVIDIA® ones)." msgstr "" #: share/advertising/ppp-01.pl:17 #, c-format -msgid "Your new Mandrakelinux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world." +msgid "Your new Mandrake Linux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world." msgstr "" #: share/advertising/ppp-02.pl:13 @@ -12427,7 +12343,7 @@ msgstr "" #: share/advertising/ppp-02.pl:17 #, c-format -msgid "It is the only Mandrakelinux product that includes the groupware solution." +msgid "It is the only Mandrake Linux product that includes the groupware solution." msgstr "" #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13 @@ -12437,12 +12353,12 @@ msgstr "" #: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15 #, c-format -msgid "When you log into your Mandrakelinux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others." +msgid "When you log into your Mandrake Linux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others." msgstr "" #: share/advertising/ppp-04.pl:13 #, c-format -msgid "In the Mandrakelinux menu you will find easy-to-use applications for all tasks:" +msgid "In the Mandrake Linux menu you will find easy-to-use applications for all tasks:" msgstr "" #: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15 @@ -12572,7 +12488,7 @@ msgstr "" #: share/advertising/pwp-01.pl:17 #, c-format -msgid "Your new Mandrakelinux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world." +msgid "Your new Mandrake Linux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world." msgstr "" #: share/advertising/pwp-01.pl:19 @@ -12592,7 +12508,7 @@ msgstr "" #: share/advertising/pwp-04.pl:13 #, c-format -msgid "In the Mandrakelinux menu you will find easy-to-use applications for all of your tasks:" +msgid "In the Mandrake Linux menu you will find easy-to-use applications for all of your tasks:" msgstr "" #: share/advertising/pwp-04.pl:16 @@ -12804,100 +12720,100 @@ msgstr "" msgid "You need to log out and back in again for changes to take effect" msgstr "" -#: standalone/drakTermServ:77 +#: standalone/drakTermServ:71 #, c-format msgid "Useless without Terminal Server" msgstr "" -#: standalone/drakTermServ:114 standalone/drakTermServ:121 +#: standalone/drakTermServ:101 standalone/drakTermServ:108 #, c-format msgid "" "%s: %s requires a username...\n" "" msgstr "" -#: standalone/drakTermServ:134 +#: standalone/drakTermServ:121 #, c-format msgid "" "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, 0/1 for Local Config...\n" "" msgstr "" -#: standalone/drakTermServ:141 +#: standalone/drakTermServ:128 #, c-format msgid "" "%s: %s requires hostname...\n" "" msgstr "" -#: standalone/drakTermServ:153 +#: standalone/drakTermServ:140 #, c-format msgid "" "You must be root to read configuration file. \n" "" msgstr "" -#: standalone/drakTermServ:238 standalone/drakTermServ:512 standalone/drakfont:575 +#: standalone/drakTermServ:219 standalone/drakTermServ:488 standalone/drakfont:572 #, c-format msgid "OK" msgstr "" -#: standalone/drakTermServ:249 standalone/drakTermServ:252 +#: standalone/drakTermServ:235 #, c-format msgid "Terminal Server Configuration" msgstr "" -#: standalone/drakTermServ:267 +#: standalone/drakTermServ:240 +#, c-format +msgid "DrakTermServ" +msgstr "" + +#: standalone/drakTermServ:264 #, c-format msgid "Enable Server" msgstr "" -#: standalone/drakTermServ:273 +#: standalone/drakTermServ:270 #, c-format msgid "Disable Server" msgstr "" -#: standalone/drakTermServ:281 +#: standalone/drakTermServ:278 #, c-format msgid "Start Server" msgstr "" -#: standalone/drakTermServ:287 +#: standalone/drakTermServ:284 #, c-format msgid "Stop Server" msgstr "" -#: standalone/drakTermServ:295 +#: standalone/drakTermServ:292 #, c-format msgid "Etherboot Floppy/ISO" msgstr "" -#: standalone/drakTermServ:299 +#: standalone/drakTermServ:296 #, c-format msgid "Net Boot Images" msgstr "" -#: standalone/drakTermServ:305 +#: standalone/drakTermServ:302 #, c-format msgid "Add/Del Users" msgstr "" -#: standalone/drakTermServ:309 +#: standalone/drakTermServ:306 #, c-format msgid "Add/Del Clients" msgstr "" -#: standalone/drakTermServ:320 standalone/drakbug:54 +#: standalone/drakTermServ:317 standalone/drakbug:54 #, c-format msgid "First Time Wizard" msgstr "" -#: standalone/drakTermServ:352 standalone/drakTermServ:353 -#, c-format -msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$" -msgstr "" - -#: standalone/drakTermServ:359 +#: standalone/drakTermServ:342 #, c-format msgid "" "\n" @@ -12917,65 +12833,60 @@ msgid "" "" msgstr "" -#: standalone/drakTermServ:404 +#: standalone/drakTermServ:387 #, c-format msgid "Cancel Wizard" msgstr "" -#: standalone/drakTermServ:416 +#: standalone/drakTermServ:399 #, c-format msgid "Please save dhcpd config!" msgstr "" -#: standalone/drakTermServ:444 -#, c-format -msgid "Use thin clients." -msgstr "" - -#: standalone/drakTermServ:446 +#: standalone/drakTermServ:427 #, c-format msgid "" -"Please select default client type.\n" +"Please select client type.\n" " 'Thin' clients run everything off the server's CPU/RAM, using the client display.\n" " 'Fat' clients use their own CPU/RAM but the server's filesystem." msgstr "" -#: standalone/drakTermServ:458 standalone/drakTermServ:1072 +#: standalone/drakTermServ:433 #, c-format -msgid "Sync client X keyboard settings with server." +msgid "Allow thin clients." msgstr "" -#: standalone/drakTermServ:465 +#: standalone/drakTermServ:441 #, c-format msgid "Creating net boot images for all kernels" msgstr "" -#: standalone/drakTermServ:466 standalone/drakTermServ:764 standalone/drakTermServ:780 +#: standalone/drakTermServ:442 standalone/drakTermServ:725 standalone/drakTermServ:741 #, c-format msgid "This will take a few minutes." msgstr "" -#: standalone/drakTermServ:470 standalone/drakTermServ:490 +#: standalone/drakTermServ:446 standalone/drakTermServ:466 #, c-format msgid "Done!" msgstr "" -#: standalone/drakTermServ:476 +#: standalone/drakTermServ:452 #, c-format msgid "Syncing server user list with client list, including root." msgstr "" -#: standalone/drakTermServ:496 +#: standalone/drakTermServ:472 #, c-format msgid "In order to enable changes made for thin clients, the display manager must be restarted. Restart now?" msgstr "" -#: standalone/drakTermServ:531 +#: standalone/drakTermServ:507 #, c-format -msgid "Terminal Server Overview" +msgid "drakTermServ Overview" msgstr "" -#: standalone/drakTermServ:532 +#: standalone/drakTermServ:508 #, c-format msgid "" " - Create Etherboot Enabled Boot Images:\n" @@ -12986,7 +12897,7 @@ msgid "" " \tdhcpd.conf, you should create the etherboot images for at least one full kernel." msgstr "" -#: standalone/drakTermServ:538 +#: standalone/drakTermServ:514 #, c-format msgid "" " - Maintain /etc/dhcpd.conf:\n" @@ -13001,7 +12912,7 @@ msgid "" " \tA typical dhcpd.conf stanza to support a diskless client looks like:" msgstr "" -#: standalone/drakTermServ:556 +#: standalone/drakTermServ:532 #, c-format msgid "" " While you can use a pool of IP addresses, rather than setup a specific entry for\n" @@ -13026,7 +12937,7 @@ msgid "" " Note: You must stop/start the server after adding or changing clients." msgstr "" -#: standalone/drakTermServ:576 +#: standalone/drakTermServ:552 #, c-format msgid "" " - Maintain /etc/exports:\n" @@ -13042,7 +12953,7 @@ msgid "" " \tWith SUBNET/MASK being defined for your network." msgstr "" -#: standalone/drakTermServ:588 +#: standalone/drakTermServ:564 #, c-format msgid "" " - Maintain %s:\n" @@ -13051,7 +12962,7 @@ msgid "" " \thelps in this respect by adding or removing system users from this file." msgstr "" -#: standalone/drakTermServ:592 +#: standalone/drakTermServ:568 #, c-format msgid "" " - Per client %s:\n" @@ -13060,7 +12971,7 @@ msgid "" " \tdrakTermServ will help create these files." msgstr "" -#: standalone/drakTermServ:597 +#: standalone/drakTermServ:573 #, c-format msgid "" " - Per client system configuration files:\n" @@ -13074,7 +12985,7 @@ msgid "" " turned back off, retaining the configuration files, once the client machine is configured." msgstr "" -#: standalone/drakTermServ:606 +#: standalone/drakTermServ:582 #, c-format msgid "" " - /etc/xinetd.d/tftp:\n" @@ -13100,7 +13011,7 @@ msgid "" " \tputs its images." msgstr "" -#: standalone/drakTermServ:627 +#: standalone/drakTermServ:603 #, c-format msgid "" " - Create etherboot floppies/CDs:\n" @@ -13115,62 +13026,57 @@ msgid "" " \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0" msgstr "" -#: standalone/drakTermServ:662 +#: standalone/drakTermServ:638 #, c-format msgid "Boot Floppy" msgstr "" -#: standalone/drakTermServ:664 +#: standalone/drakTermServ:640 #, c-format msgid "Boot ISO" msgstr "" -#: standalone/drakTermServ:666 +#: standalone/drakTermServ:642 #, c-format msgid "PXE Image" msgstr "" -#: standalone/drakTermServ:735 -#, c-format -msgid "Default kernel version" -msgstr "" - -#: standalone/drakTermServ:762 +#: standalone/drakTermServ:723 #, c-format msgid "Build Whole Kernel -->" msgstr "" -#: standalone/drakTermServ:769 +#: standalone/drakTermServ:730 #, c-format msgid "No kernel selected!" msgstr "" -#: standalone/drakTermServ:772 +#: standalone/drakTermServ:733 #, c-format msgid "Build Single NIC -->" msgstr "" -#: standalone/drakTermServ:776 +#: standalone/drakTermServ:737 #, c-format msgid "No NIC selected!" msgstr "" -#: standalone/drakTermServ:779 +#: standalone/drakTermServ:740 #, c-format msgid "Build All Kernels -->" msgstr "" -#: standalone/drakTermServ:787 +#: standalone/drakTermServ:747 #, c-format msgid "<-- Delete" msgstr "" -#: standalone/drakTermServ:794 +#: standalone/drakTermServ:754 #, c-format msgid "Delete All NBIs" msgstr "" -#: standalone/drakTermServ:881 +#: standalone/drakTermServ:841 #, c-format msgid "" "!!! Indicates the password in the system database is different than\n" @@ -13178,161 +13084,151 @@ msgid "" "Delete/re-add the user to the Terminal Server to enable login." msgstr "" -#: standalone/drakTermServ:886 +#: standalone/drakTermServ:846 #, c-format msgid "Add User -->" msgstr "" -#: standalone/drakTermServ:892 +#: standalone/drakTermServ:852 #, c-format msgid "<-- Del User" msgstr "" -#: standalone/drakTermServ:928 +#: standalone/drakTermServ:888 #, c-format msgid "type: %s" msgstr "" -#: standalone/drakTermServ:932 +#: standalone/drakTermServ:892 #, c-format msgid "local config: %s" msgstr "" -#: standalone/drakTermServ:962 +#: standalone/drakTermServ:922 #, c-format msgid "" "Allow local hardware\n" "configuration." msgstr "" -#: standalone/drakTermServ:971 +#: standalone/drakTermServ:931 #, c-format msgid "No net boot images created!" msgstr "" -#: standalone/drakTermServ:989 +#: standalone/drakTermServ:949 #, c-format msgid "Thin Client" msgstr "" -#: standalone/drakTermServ:993 +#: standalone/drakTermServ:953 #, c-format msgid "Allow Thin Clients" msgstr "" -#: standalone/drakTermServ:994 +#: standalone/drakTermServ:954 #, c-format msgid "Add Client -->" msgstr "" -#: standalone/drakTermServ:1008 +#: standalone/drakTermServ:968 #, c-format msgid "type: fat" msgstr "" -#: standalone/drakTermServ:1009 +#: standalone/drakTermServ:969 #, c-format msgid "type: thin" msgstr "" -#: standalone/drakTermServ:1016 +#: standalone/drakTermServ:976 #, c-format msgid "local config: false" msgstr "" -#: standalone/drakTermServ:1017 +#: standalone/drakTermServ:977 #, c-format msgid "local config: true" msgstr "" -#: standalone/drakTermServ:1025 +#: standalone/drakTermServ:985 #, c-format msgid "<-- Edit Client" msgstr "" -#: standalone/drakTermServ:1051 +#: standalone/drakTermServ:1011 #, c-format msgid "Disable Local Config" msgstr "" -#: standalone/drakTermServ:1058 +#: standalone/drakTermServ:1018 #, c-format msgid "Delete Client" msgstr "" -#: standalone/drakTermServ:1067 +#: standalone/drakTermServ:1027 #, c-format msgid "dhcpd Config..." msgstr "" -#: standalone/drakTermServ:1083 +#: standalone/drakTermServ:1040 #, c-format msgid "" "Need to restart the Display Manager for full changes to take effect. \n" "(service dm restart - at the console)" msgstr "" -#: standalone/drakTermServ:1123 -#, c-format -msgid "Thin clients won't work with autologin. Disable autologin?" -msgstr "" - -#: standalone/drakTermServ:1139 -#, c-format -msgid "All clients will use %s" -msgstr "" - -#: standalone/drakTermServ:1169 +#: standalone/drakTermServ:1084 #, c-format msgid "Subnet:" msgstr "" -#: standalone/drakTermServ:1176 +#: standalone/drakTermServ:1091 #, c-format msgid "Netmask:" msgstr "" -#: standalone/drakTermServ:1183 +#: standalone/drakTermServ:1098 #, c-format msgid "Routers:" msgstr "" -#: standalone/drakTermServ:1190 +#: standalone/drakTermServ:1105 #, c-format msgid "Subnet Mask:" msgstr "" -#: standalone/drakTermServ:1197 +#: standalone/drakTermServ:1112 #, c-format msgid "Broadcast Address:" msgstr "" -#: standalone/drakTermServ:1204 +#: standalone/drakTermServ:1119 #, c-format msgid "Domain Name:" msgstr "" -#: standalone/drakTermServ:1212 +#: standalone/drakTermServ:1127 #, c-format msgid "Name Servers:" msgstr "" -#: standalone/drakTermServ:1223 +#: standalone/drakTermServ:1138 #, c-format msgid "IP Range Start:" msgstr "" -#: standalone/drakTermServ:1224 +#: standalone/drakTermServ:1139 #, c-format msgid "IP Range End:" msgstr "" -#: standalone/drakTermServ:1276 +#: standalone/drakTermServ:1191 #, c-format msgid "dhcpd Server Configuration" msgstr "" -#: standalone/drakTermServ:1277 +#: standalone/drakTermServ:1192 #, c-format msgid "" "Most of these values were extracted\n" @@ -13340,148 +13236,148 @@ msgid "" "You can modify as needed." msgstr "" -#: standalone/drakTermServ:1280 +#: standalone/drakTermServ:1195 #, c-format msgid "Dynamic IP Address Pool:" msgstr "" -#: standalone/drakTermServ:1293 +#: standalone/drakTermServ:1208 #, c-format msgid "Write Config" msgstr "" -#: standalone/drakTermServ:1412 +#: standalone/drakTermServ:1326 #, c-format msgid "Please insert floppy disk:" msgstr "" -#: standalone/drakTermServ:1416 +#: standalone/drakTermServ:1330 #, c-format msgid "Couldn't access the floppy!" msgstr "" -#: standalone/drakTermServ:1418 +#: standalone/drakTermServ:1332 #, c-format msgid "Floppy can be removed now" msgstr "" -#: standalone/drakTermServ:1421 +#: standalone/drakTermServ:1335 #, c-format msgid "No floppy drive available!" msgstr "" -#: standalone/drakTermServ:1426 +#: standalone/drakTermServ:1340 #, c-format msgid "PXE image is %s/%s" msgstr "" -#: standalone/drakTermServ:1428 +#: standalone/drakTermServ:1342 #, c-format msgid "Error writing %s/%s" msgstr "" -#: standalone/drakTermServ:1437 +#: standalone/drakTermServ:1351 #, c-format msgid "Etherboot ISO image is %s" msgstr "" -#: standalone/drakTermServ:1439 +#: standalone/drakTermServ:1353 #, c-format msgid "Something went wrong! - Is mkisofs installed?" msgstr "" -#: standalone/drakTermServ:1459 +#: standalone/drakTermServ:1372 #, c-format msgid "Need to create /etc/dhcpd.conf first!" msgstr "" -#: standalone/drakTermServ:1620 +#: standalone/drakTermServ:1533 #, c-format msgid "" "%s passwd bad in Terminal Server - rewriting...\n" "" msgstr "" -#: standalone/drakTermServ:1638 +#: standalone/drakTermServ:1551 #, c-format msgid "" "%s is not a user..\n" "" msgstr "" -#: standalone/drakTermServ:1639 +#: standalone/drakTermServ:1552 #, c-format msgid "" "%s is already a Terminal Server user\n" "" msgstr "" -#: standalone/drakTermServ:1641 +#: standalone/drakTermServ:1554 #, c-format msgid "" "Addition of %s to Terminal Server failed!\n" "" msgstr "" -#: standalone/drakTermServ:1643 +#: standalone/drakTermServ:1556 #, c-format msgid "" "%s added to Terminal Server\n" "" msgstr "" -#: standalone/drakTermServ:1695 +#: standalone/drakTermServ:1608 #, c-format msgid "" "Deleted %s...\n" "" msgstr "" -#: standalone/drakTermServ:1697 standalone/drakTermServ:1774 +#: standalone/drakTermServ:1610 standalone/drakTermServ:1687 #, c-format msgid "" "%s not found...\n" "" msgstr "" -#: standalone/drakTermServ:1719 standalone/drakTermServ:1720 standalone/drakTermServ:1721 +#: standalone/drakTermServ:1632 standalone/drakTermServ:1633 standalone/drakTermServ:1634 #, c-format msgid "" "%s already in use\n" "" msgstr "" -#: standalone/drakTermServ:1745 +#: standalone/drakTermServ:1658 #, c-format msgid "Can't open %s!" msgstr "" -#: standalone/drakTermServ:1802 +#: standalone/drakTermServ:1715 #, c-format msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed" msgstr "" -#: standalone/drakTermServ:1959 +#: standalone/drakTermServ:1872 #, c-format msgid "Configuration changed - restart clusternfs/dhcpd?" msgstr "" -#: standalone/drakautoinst:38 +#: standalone/drakautoinst:37 #, c-format msgid "Error!" msgstr "" -#: standalone/drakautoinst:39 +#: standalone/drakautoinst:38 #, c-format msgid "I can't find needed image file `%s'." msgstr "" -#: standalone/drakautoinst:41 +#: standalone/drakautoinst:40 #, c-format msgid "Auto Install Configurator" msgstr "" -#: standalone/drakautoinst:42 +#: standalone/drakautoinst:41 #, c-format msgid "" "You are about to configure an Auto Install floppy. This feature is somewhat dangerous and must be used circumspectly.\n" @@ -13493,42 +13389,32 @@ msgid "" "Press ok to continue." msgstr "" -#: standalone/drakautoinst:60 +#: standalone/drakautoinst:59 #, c-format msgid "replay" msgstr "" -#: standalone/drakautoinst:60 standalone/drakautoinst:69 +#: standalone/drakautoinst:59 standalone/drakautoinst:68 #, c-format msgid "manual" msgstr "" -#: standalone/drakautoinst:64 +#: standalone/drakautoinst:63 #, c-format msgid "Automatic Steps Configuration" msgstr "" -#: standalone/drakautoinst:65 +#: standalone/drakautoinst:64 #, c-format msgid "Please choose for each step whether it will replay like your install, or it will be manual" msgstr "" -#: standalone/drakautoinst:77 standalone/drakautoinst:78 standalone/drakautoinst:92 +#: standalone/drakautoinst:76 standalone/drakautoinst:77 #, c-format msgid "Creating auto install floppy" msgstr "" -#: standalone/drakautoinst:90 -#, c-format -msgid "Insert another blank floppy in drive %s (for drivers disk)" -msgstr "" - -#: standalone/drakautoinst:91 -#, c-format -msgid "Creating auto install floppy (drivers disk)" -msgstr "" - -#: standalone/drakautoinst:158 +#: standalone/drakautoinst:141 #, c-format msgid "" "\n" @@ -13537,29 +13423,29 @@ msgid "" "The parameters of the auto-install are available in the sections on the left" msgstr "" -#: standalone/drakautoinst:252 standalone/drakgw:598 standalone/drakvpn:902 standalone/scannerdrake:374 +#: standalone/drakautoinst:235 standalone/drakgw:583 standalone/drakvpn:918 standalone/scannerdrake:367 #, c-format msgid "Congratulations!" msgstr "" -#: standalone/drakautoinst:253 +#: standalone/drakautoinst:236 #, c-format msgid "" "The floppy has been successfully generated.\n" "You may now replay your installation." msgstr "" -#: standalone/drakautoinst:289 +#: standalone/drakautoinst:272 #, c-format msgid "Auto Install" msgstr "" -#: standalone/drakautoinst:358 +#: standalone/drakautoinst:341 #, c-format msgid "Add an item" msgstr "" -#: standalone/drakautoinst:365 +#: standalone/drakautoinst:348 #, c-format msgid "Remove the last item" msgstr "" @@ -13574,111 +13460,106 @@ msgstr "" msgid "tape" msgstr "" -#: standalone/drakbackup:112 +#: standalone/drakbackup:159 #, c-format msgid "No devices found" msgstr "" -#: standalone/drakbackup:154 +#: standalone/drakbackup:196 #, c-format msgid "Expect is an extension to the Tcl scripting language that allows interactive sessions without user intervention." msgstr "" -#: standalone/drakbackup:155 +#: standalone/drakbackup:197 #, c-format msgid "Store the password for this system in drakbackup configuration." msgstr "" -#: standalone/drakbackup:156 +#: standalone/drakbackup:198 #, c-format msgid "For a multisession CD, only the first session will erase the cdrw. Otherwise the cdrw is erased before each backup." msgstr "" -#: standalone/drakbackup:157 +#: standalone/drakbackup:199 +#, c-format +msgid "This uses the same syntax as the command line program 'cdrecord'. 'cdrecord -scanbus' would also show you the device number." +msgstr "" + +#: standalone/drakbackup:200 #, c-format msgid "This option will save files that have changed. Exact behavior depends on whether incremental or differential mode is used." msgstr "" -#: standalone/drakbackup:158 +#: standalone/drakbackup:201 #, c-format msgid "Incremental backups only save files that have changed or are new since the last backup." msgstr "" -#: standalone/drakbackup:159 +#: standalone/drakbackup:202 #, c-format msgid "Differential backups only save files that have changed or are new since the original 'base' backup." msgstr "" -#: standalone/drakbackup:160 +#: standalone/drakbackup:203 #, c-format msgid "This should be a local user or email addresse that you want the backup results sent to. You will need to define a functioning mail server." msgstr "" -#: standalone/drakbackup:161 +#: standalone/drakbackup:204 #, c-format msgid "Files or wildcards listed in a .backupignore file at the top of a directory tree will not be backed up." msgstr "" -#: standalone/drakbackup:162 +#: standalone/drakbackup:205 #, c-format msgid "For backups to other media, files are still created on the hard drive, then moved to the other media. Enabling this option will remove the hard drive tar files after the backup." msgstr "" -#: standalone/drakbackup:163 +#: standalone/drakbackup:206 #, c-format msgid "Some protocols, like rsync, may be configured at the server end. Rather than using a directory path, you would use the 'module' name for the service path." msgstr "" -#: standalone/drakbackup:164 +#: standalone/drakbackup:207 #, c-format msgid "Custom allows you to specify your own day and time. The other options use run-parts in /etc/crontab." msgstr "" -#: standalone/drakbackup:396 -#, c-format -msgid "No media selected for cron operation." -msgstr "" - -#: standalone/drakbackup:400 -#, c-format -msgid "No interval selected for cron operation." -msgstr "" - -#: standalone/drakbackup:447 +#: standalone/drakbackup:604 #, c-format msgid "Interval cron not available as non-root" msgstr "" -#: standalone/drakbackup:532 standalone/logdrake:467 +#: standalone/drakbackup:715 standalone/logdrake:415 #, c-format msgid "\"%s\" neither is a valid email nor is an existing local user!" msgstr "" -#: standalone/drakbackup:536 standalone/logdrake:472 +#: standalone/drakbackup:719 standalone/logdrake:420 #, c-format msgid "\"%s\" is a local user, but you did not select a local smtp, so you must use a complete email address!" msgstr "" -#: standalone/drakbackup:545 +#: standalone/drakbackup:728 #, c-format msgid "Valid user list changed, rewriting config file." msgstr "" -#: standalone/drakbackup:547 +#: standalone/drakbackup:730 #, c-format msgid "" "Old user list:\n" "" msgstr "" -#: standalone/drakbackup:549 +#: standalone/drakbackup:732 #, c-format msgid "" "New user list:\n" "" msgstr "" -#: standalone/drakbackup:594 +#: standalone/drakbackup:779 #, c-format msgid "" "\n" @@ -13686,7 +13567,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:595 +#: standalone/drakbackup:780 #, c-format msgid "" "\n" @@ -13694,7 +13575,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:601 +#: standalone/drakbackup:786 #, c-format msgid "" "\n" @@ -13704,12 +13585,12 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:625 standalone/drakbackup:696 standalone/drakbackup:752 +#: standalone/drakbackup:810 standalone/drakbackup:883 standalone/drakbackup:939 #, c-format msgid "Total progress" msgstr "" -#: standalone/drakbackup:678 +#: standalone/drakbackup:865 #, c-format msgid "" "%s exists, delete?\n" @@ -13718,42 +13599,42 @@ msgid "" " need to purge the entry from authorized_keys on the server." msgstr "" -#: standalone/drakbackup:687 +#: standalone/drakbackup:874 #, c-format msgid "This may take a moment to generate the keys." msgstr "" -#: standalone/drakbackup:694 +#: standalone/drakbackup:881 #, c-format msgid "Cannot spawn %s." msgstr "" -#: standalone/drakbackup:711 +#: standalone/drakbackup:898 #, c-format msgid "No password prompt on %s at port %s" msgstr "" -#: standalone/drakbackup:712 +#: standalone/drakbackup:899 #, c-format msgid "Bad password on %s" msgstr "" -#: standalone/drakbackup:713 +#: standalone/drakbackup:900 #, c-format msgid "Permission denied transferring %s to %s" msgstr "" -#: standalone/drakbackup:714 +#: standalone/drakbackup:901 #, c-format msgid "Can't find %s on %s" msgstr "" -#: standalone/drakbackup:718 +#: standalone/drakbackup:904 #, c-format msgid "%s not responding" msgstr "" -#: standalone/drakbackup:722 +#: standalone/drakbackup:908 #, c-format msgid "" "Transfer successful\n" @@ -13764,84 +13645,84 @@ msgid "" "without being prompted for a password." msgstr "" -#: standalone/drakbackup:766 +#: standalone/drakbackup:953 #, c-format msgid "WebDAV remote site already in sync!" msgstr "" -#: standalone/drakbackup:770 +#: standalone/drakbackup:957 #, c-format msgid "WebDAV transfer failed!" msgstr "" -#: standalone/drakbackup:791 +#: standalone/drakbackup:978 #, c-format msgid "No CD-R/DVD-R in drive!" msgstr "" -#: standalone/drakbackup:795 +#: standalone/drakbackup:982 #, c-format msgid "Does not appear to be recordable media!" msgstr "" -#: standalone/drakbackup:799 +#: standalone/drakbackup:986 #, c-format msgid "Not erasable media!" msgstr "" -#: standalone/drakbackup:840 +#: standalone/drakbackup:1027 #, c-format msgid "This may take a moment to erase the media." msgstr "" -#: standalone/drakbackup:898 +#: standalone/drakbackup:1103 #, c-format msgid "Permission problem accessing CD." msgstr "" -#: standalone/drakbackup:925 +#: standalone/drakbackup:1130 #, c-format msgid "No tape in %s!" msgstr "" -#: standalone/drakbackup:1025 +#: standalone/drakbackup:1232 #, c-format msgid "" "Backup quota exceeded!\n" "%d MB used vs %d MB allocated." msgstr "" -#: standalone/drakbackup:1044 standalone/drakbackup:1077 +#: standalone/drakbackup:1251 standalone/drakbackup:1307 #, c-format msgid "Backup system files..." msgstr "" -#: standalone/drakbackup:1078 standalone/drakbackup:1119 +#: standalone/drakbackup:1308 standalone/drakbackup:1372 #, c-format msgid "Hard Disk Backup files..." msgstr "" -#: standalone/drakbackup:1118 +#: standalone/drakbackup:1371 #, c-format msgid "Backup User files..." msgstr "" -#: standalone/drakbackup:1153 +#: standalone/drakbackup:1427 #, c-format msgid "Backup Other files..." msgstr "" -#: standalone/drakbackup:1154 +#: standalone/drakbackup:1428 #, c-format msgid "Hard Disk Backup Progress..." msgstr "" -#: standalone/drakbackup:1159 +#: standalone/drakbackup:1433 #, c-format msgid "No changes to backup!" msgstr "" -#: standalone/drakbackup:1177 standalone/drakbackup:1201 +#: standalone/drakbackup:1451 standalone/drakbackup:1475 #, c-format msgid "" "\n" @@ -13850,7 +13731,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:1186 +#: standalone/drakbackup:1460 #, c-format msgid "" "\n" @@ -13858,19 +13739,19 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:1187 +#: standalone/drakbackup:1461 #, c-format msgid "Error during sending file via FTP. Please correct your FTP configuration." msgstr "" -#: standalone/drakbackup:1189 +#: standalone/drakbackup:1463 #, c-format msgid "" "file list sent by FTP: %s\n" "" msgstr "" -#: standalone/drakbackup:1206 +#: standalone/drakbackup:1480 #, c-format msgid "" "\n" @@ -13879,7 +13760,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:1211 +#: standalone/drakbackup:1485 #, c-format msgid "" "\n" @@ -13888,29 +13769,39 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:1220 +#: standalone/drakbackup:1494 #, c-format msgid "Error sending mail. Your report mail was not sent." msgstr "" -#: standalone/drakbackup:1221 +#: standalone/drakbackup:1495 #, c-format msgid "" " Error while sending mail. \n" "" msgstr "" -#: standalone/drakbackup:1249 +#: standalone/drakbackup:1524 #, c-format msgid "Can't create catalog!" msgstr "" -#: standalone/drakbackup:1455 +#: standalone/drakbackup:1646 +#, c-format +msgid "Can't create log file!" +msgstr "" + +#: standalone/drakbackup:1663 standalone/drakbackup:1674 standalone/drakfont:584 +#, c-format +msgid "File Selection" +msgstr "" + +#: standalone/drakbackup:1702 #, c-format msgid "Select the files or directories and click on 'OK'" msgstr "" -#: standalone/drakbackup:1484 +#: standalone/drakbackup:1730 #, c-format msgid "" "\n" @@ -13918,513 +13809,525 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:1485 +#: standalone/drakbackup:1731 #, c-format msgid "" "These options can backup and restore all files in your /etc directory.\n" "" msgstr "" -#: standalone/drakbackup:1486 +#: standalone/drakbackup:1732 #, c-format msgid "Backup your System files. (/etc directory)" msgstr "" -#: standalone/drakbackup:1487 standalone/drakbackup:1551 standalone/drakbackup:1617 +#: standalone/drakbackup:1733 standalone/drakbackup:1797 standalone/drakbackup:1863 #, c-format msgid "Use Incremental/Differential Backups (do not replace old backups)" msgstr "" -#: standalone/drakbackup:1489 standalone/drakbackup:1553 standalone/drakbackup:1619 +#: standalone/drakbackup:1735 standalone/drakbackup:1799 standalone/drakbackup:1865 #, c-format msgid "Use Incremental Backups" msgstr "" -#: standalone/drakbackup:1489 standalone/drakbackup:1553 standalone/drakbackup:1619 +#: standalone/drakbackup:1735 standalone/drakbackup:1799 standalone/drakbackup:1865 #, c-format msgid "Use Differential Backups" msgstr "" -#: standalone/drakbackup:1491 +#: standalone/drakbackup:1737 #, c-format msgid "Do not include critical files (passwd, group, fstab)" msgstr "" -#: standalone/drakbackup:1492 +#: standalone/drakbackup:1738 #, c-format msgid "" "With this option you will be able to restore any version\n" " of your /etc directory." msgstr "" -#: standalone/drakbackup:1523 +#: standalone/drakbackup:1769 #, c-format msgid "Please check all users that you want to include in your backup." msgstr "" -#: standalone/drakbackup:1550 +#: standalone/drakbackup:1796 #, c-format msgid "Do not include the browser cache" msgstr "" -#: standalone/drakbackup:1605 standalone/drakfont:656 +#: standalone/drakbackup:1851 standalone/drakfont:650 #, c-format msgid "Remove Selected" msgstr "" -#: standalone/drakbackup:1668 +#: standalone/drakbackup:1898 standalone/drakbackup:1902 +#, c-format +msgid "Under Devel ... please wait." +msgstr "" + +#: standalone/drakbackup:1916 +#, c-format +msgid "Windows (FAT32)" +msgstr "" + +#: standalone/drakbackup:1949 #, c-format msgid "Users" msgstr "" -#: standalone/drakbackup:1688 +#: standalone/drakbackup:1968 #, c-format msgid "Use network connection to backup" msgstr "" -#: standalone/drakbackup:1690 +#: standalone/drakbackup:1970 #, c-format msgid "Net Method:" msgstr "" -#: standalone/drakbackup:1694 +#: standalone/drakbackup:1974 #, c-format msgid "Use Expect for SSH" msgstr "" -#: standalone/drakbackup:1695 +#: standalone/drakbackup:1975 #, c-format msgid "Create/Transfer backup keys for SSH" msgstr "" -#: standalone/drakbackup:1697 +#: standalone/drakbackup:1977 #, c-format msgid "Transfer Now" msgstr "" -#: standalone/drakbackup:1699 +#: standalone/drakbackup:1979 #, c-format msgid "Other (not drakbackup) keys in place already" msgstr "" -#: standalone/drakbackup:1702 +#: standalone/drakbackup:1982 #, c-format msgid "Host name or IP." msgstr "" -#: standalone/drakbackup:1707 +#: standalone/drakbackup:1987 #, c-format msgid "Directory (or module) to put the backup on this host." msgstr "" -#: standalone/drakbackup:1712 +#: standalone/drakbackup:1992 #, c-format msgid "Login name" msgstr "" -#: standalone/drakbackup:1719 +#: standalone/drakbackup:1999 #, c-format msgid "Remember this password" msgstr "" -#: standalone/drakbackup:1735 +#: standalone/drakbackup:2011 #, c-format msgid "Need hostname, username and password!" msgstr "" -#: standalone/drakbackup:1833 +#: standalone/drakbackup:2112 #, c-format msgid "Use CD-R/DVD-R to backup" msgstr "" -#: standalone/drakbackup:1836 +#: standalone/drakbackup:2115 #, c-format msgid "Choose your CD/DVD device" msgstr "" -#: standalone/drakbackup:1841 +#: standalone/drakbackup:2120 #, c-format msgid "Choose your CD/DVD media size" msgstr "" -#: standalone/drakbackup:1848 +#: standalone/drakbackup:2127 #, c-format msgid "Multisession CD" msgstr "" -#: standalone/drakbackup:1850 +#: standalone/drakbackup:2129 #, c-format msgid "CDRW media" msgstr "" -#: standalone/drakbackup:1856 +#: standalone/drakbackup:2134 #, c-format msgid "Erase your RW media (1st Session)" msgstr "" -#: standalone/drakbackup:1857 +#: standalone/drakbackup:2135 #, c-format msgid " Erase Now " msgstr "" -#: standalone/drakbackup:1863 +#: standalone/drakbackup:2142 #, c-format msgid "DVD+RW media" msgstr "" -#: standalone/drakbackup:1865 +#: standalone/drakbackup:2144 #, c-format msgid "DVD-R media" msgstr "" -#: standalone/drakbackup:1867 +#: standalone/drakbackup:2146 #, c-format msgid "DVDRAM device" msgstr "" -#: standalone/drakbackup:1898 +#: standalone/drakbackup:2151 +#, c-format +msgid "" +"Enter your CD Writer device name\n" +" ex: 0,1,0" +msgstr "" + +#: standalone/drakbackup:2183 #, c-format msgid "No CD device defined!" msgstr "" -#: standalone/drakbackup:1945 +#: standalone/drakbackup:2232 #, c-format msgid "Use tape to backup" msgstr "" -#: standalone/drakbackup:1948 +#: standalone/drakbackup:2235 #, c-format msgid "Device name to use for backup" msgstr "" -#: standalone/drakbackup:1954 +#: standalone/drakbackup:2242 #, c-format msgid "Don't rewind tape after backup" msgstr "" -#: standalone/drakbackup:1960 +#: standalone/drakbackup:2248 #, c-format msgid "Erase tape before backup" msgstr "" -#: standalone/drakbackup:1966 +#: standalone/drakbackup:2254 #, c-format msgid "Eject tape after the backup" msgstr "" -#: standalone/drakbackup:2033 +#: standalone/drakbackup:2321 #, c-format msgid "Enter the directory to save to:" msgstr "" -#: standalone/drakbackup:2037 -#, c-format -msgid "Directory to save to" -msgstr "" - -#: standalone/drakbackup:2042 +#: standalone/drakbackup:2330 #, c-format msgid "" "Maximum size\n" " allowed for Drakbackup (MB)" msgstr "" -#: standalone/drakbackup:2106 +#: standalone/drakbackup:2402 #, c-format msgid "CD-R / DVD-R" msgstr "" -#: standalone/drakbackup:2111 +#: standalone/drakbackup:2407 #, c-format msgid "HardDrive / NFS" msgstr "" -#: standalone/drakbackup:2127 standalone/drakbackup:2132 standalone/drakbackup:2137 +#: standalone/drakbackup:2423 standalone/drakbackup:2428 standalone/drakbackup:2433 #, c-format msgid "hourly" msgstr "" -#: standalone/drakbackup:2128 standalone/drakbackup:2133 standalone/drakbackup:2137 +#: standalone/drakbackup:2424 standalone/drakbackup:2429 standalone/drakbackup:2433 #, c-format msgid "daily" msgstr "" -#: standalone/drakbackup:2129 standalone/drakbackup:2134 standalone/drakbackup:2137 +#: standalone/drakbackup:2425 standalone/drakbackup:2430 standalone/drakbackup:2433 #, c-format msgid "weekly" msgstr "" -#: standalone/drakbackup:2130 standalone/drakbackup:2135 standalone/drakbackup:2137 +#: standalone/drakbackup:2426 standalone/drakbackup:2431 standalone/drakbackup:2433 #, c-format msgid "monthly" msgstr "" -#: standalone/drakbackup:2131 standalone/drakbackup:2136 standalone/drakbackup:2137 +#: standalone/drakbackup:2427 standalone/drakbackup:2432 standalone/drakbackup:2433 #, c-format msgid "custom" msgstr "" -#: standalone/drakbackup:2142 +#: standalone/drakbackup:2438 #, c-format msgid "January" msgstr "" -#: standalone/drakbackup:2142 +#: standalone/drakbackup:2438 #, c-format msgid "February" msgstr "" -#: standalone/drakbackup:2142 +#: standalone/drakbackup:2438 #, c-format msgid "March" msgstr "" -#: standalone/drakbackup:2143 +#: standalone/drakbackup:2439 #, c-format msgid "April" msgstr "" -#: standalone/drakbackup:2143 +#: standalone/drakbackup:2439 #, c-format msgid "May" msgstr "" -#: standalone/drakbackup:2143 +#: standalone/drakbackup:2439 #, c-format msgid "June" msgstr "" -#: standalone/drakbackup:2143 +#: standalone/drakbackup:2439 #, c-format msgid "July" msgstr "" -#: standalone/drakbackup:2143 +#: standalone/drakbackup:2439 #, c-format msgid "August" msgstr "" -#: standalone/drakbackup:2143 +#: standalone/drakbackup:2439 #, c-format msgid "September" msgstr "" -#: standalone/drakbackup:2144 +#: standalone/drakbackup:2440 #, c-format msgid "October" msgstr "" -#: standalone/drakbackup:2144 +#: standalone/drakbackup:2440 #, c-format msgid "November" msgstr "" -#: standalone/drakbackup:2144 +#: standalone/drakbackup:2440 #, c-format msgid "December" msgstr "" -#: standalone/drakbackup:2149 +#: standalone/drakbackup:2445 #, c-format msgid "Sunday" msgstr "" -#: standalone/drakbackup:2149 +#: standalone/drakbackup:2445 #, c-format msgid "Monday" msgstr "" -#: standalone/drakbackup:2149 +#: standalone/drakbackup:2445 #, c-format msgid "Tuesday" msgstr "" -#: standalone/drakbackup:2150 +#: standalone/drakbackup:2446 #, c-format msgid "Wednesday" msgstr "" -#: standalone/drakbackup:2150 +#: standalone/drakbackup:2446 #, c-format msgid "Thursday" msgstr "" -#: standalone/drakbackup:2150 +#: standalone/drakbackup:2446 #, c-format msgid "Friday" msgstr "" -#: standalone/drakbackup:2150 +#: standalone/drakbackup:2446 #, c-format msgid "Saturday" msgstr "" -#: standalone/drakbackup:2185 +#: standalone/drakbackup:2481 #, c-format msgid "Use daemon" msgstr "" -#: standalone/drakbackup:2190 +#: standalone/drakbackup:2486 #, c-format msgid "Please choose the time interval between each backup" msgstr "" -#: standalone/drakbackup:2196 +#: standalone/drakbackup:2492 #, c-format msgid "Custom setup/crontab entry:" msgstr "" -#: standalone/drakbackup:2201 +#: standalone/drakbackup:2497 #, c-format msgid "Minute" msgstr "" -#: standalone/drakbackup:2205 +#: standalone/drakbackup:2501 #, c-format msgid "Hour" msgstr "" -#: standalone/drakbackup:2209 +#: standalone/drakbackup:2505 #, c-format msgid "Day" msgstr "" -#: standalone/drakbackup:2213 +#: standalone/drakbackup:2509 #, c-format msgid "Month" msgstr "" -#: standalone/drakbackup:2217 +#: standalone/drakbackup:2513 #, c-format msgid "Weekday" msgstr "" -#: standalone/drakbackup:2223 +#: standalone/drakbackup:2519 #, c-format msgid "Please choose the media for backup." msgstr "" -#: standalone/drakbackup:2230 +#: standalone/drakbackup:2526 #, c-format msgid "Please be sure that the cron daemon is included in your services." msgstr "" -#: standalone/drakbackup:2231 +#: standalone/drakbackup:2527 #, c-format msgid "Note that currently all 'net' media also use the hard drive." msgstr "" -#: standalone/drakbackup:2281 +#: standalone/drakbackup:2574 #, c-format -msgid "Please choose the compression type" +msgid "Use tar and bzip2 (rather than tar and gzip)" msgstr "" -#: standalone/drakbackup:2285 +#: standalone/drakbackup:2575 #, c-format msgid "Use .backupignore files" msgstr "" -#: standalone/drakbackup:2287 +#: standalone/drakbackup:2577 #, c-format msgid "Send mail report after each backup to:" msgstr "" -#: standalone/drakbackup:2293 +#: standalone/drakbackup:2583 #, c-format msgid "SMTP server for mail:" msgstr "" -#: standalone/drakbackup:2298 +#: standalone/drakbackup:2588 #, c-format msgid "Delete Hard Drive tar files after backup to other media." msgstr "" -#: standalone/drakbackup:2338 +#: standalone/drakbackup:2627 #, c-format msgid "What" msgstr "" -#: standalone/drakbackup:2343 +#: standalone/drakbackup:2632 #, c-format msgid "Where" msgstr "" -#: standalone/drakbackup:2348 +#: standalone/drakbackup:2637 #, c-format msgid "When" msgstr "" -#: standalone/drakbackup:2353 +#: standalone/drakbackup:2642 #, c-format msgid "More Options" msgstr "" -#: standalone/drakbackup:2366 -#, c-format -msgid "Backup destination not configured..." -msgstr "" - -#: standalone/drakbackup:2385 standalone/drakbackup:4413 +#: standalone/drakbackup:2663 standalone/drakbackup:4735 #, c-format msgid "Drakbackup Configuration" msgstr "" -#: standalone/drakbackup:2402 +#: standalone/drakbackup:2680 #, c-format msgid "Please choose where you want to backup" msgstr "" -#: standalone/drakbackup:2404 +#: standalone/drakbackup:2682 #, c-format msgid "Hard Drive used to prepare backups for all media" msgstr "" -#: standalone/drakbackup:2412 +#: standalone/drakbackup:2692 #, c-format msgid "Across Network" msgstr "" -#: standalone/drakbackup:2420 +#: standalone/drakbackup:2702 #, c-format msgid "On CD-R" msgstr "" -#: standalone/drakbackup:2428 +#: standalone/drakbackup:2712 #, c-format msgid "On Tape Device" msgstr "" -#: standalone/drakbackup:2468 +#: standalone/drakbackup:2742 +#, c-format +msgid "Please select media for backup..." +msgstr "" + +#: standalone/drakbackup:2764 #, c-format msgid "Backup Users" msgstr "" -#: standalone/drakbackup:2469 +#: standalone/drakbackup:2765 #, c-format msgid " (Default is all users)" msgstr "" -#: standalone/drakbackup:2481 +#: standalone/drakbackup:2777 #, c-format msgid "Please choose what you want to backup" msgstr "" -#: standalone/drakbackup:2482 +#: standalone/drakbackup:2778 #, c-format msgid "Backup System" msgstr "" -#: standalone/drakbackup:2484 +#: standalone/drakbackup:2780 #, c-format msgid "Select user manually" msgstr "" -#: standalone/drakbackup:2513 +#: standalone/drakbackup:2809 #, c-format msgid "Please select data to backup..." msgstr "" -#: standalone/drakbackup:2585 +#: standalone/drakbackup:2883 #, c-format msgid "" "\n" @@ -14432,7 +14335,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2586 +#: standalone/drakbackup:2884 #, c-format msgid "" "\n" @@ -14440,7 +14343,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2588 +#: standalone/drakbackup:2886 #, c-format msgid "" "\n" @@ -14448,7 +14351,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2590 +#: standalone/drakbackup:2888 #, c-format msgid "" "\n" @@ -14456,7 +14359,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2592 +#: standalone/drakbackup:2890 #, c-format msgid "" "\n" @@ -14464,14 +14367,14 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2593 +#: standalone/drakbackup:2891 #, c-format msgid "" "\tLimit disk usage to %s MB\n" "" msgstr "" -#: standalone/drakbackup:2596 +#: standalone/drakbackup:2894 #, c-format msgid "" "\n" @@ -14479,51 +14382,51 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2600 +#: standalone/drakbackup:2898 #, c-format msgid "NO" msgstr "" -#: standalone/drakbackup:2601 +#: standalone/drakbackup:2899 #, c-format msgid "YES" msgstr "" -#: standalone/drakbackup:2602 +#: standalone/drakbackup:2900 #, c-format msgid "" "\n" "- Burn to CD" msgstr "" -#: standalone/drakbackup:2603 +#: standalone/drakbackup:2901 #, c-format msgid "RW" msgstr "" -#: standalone/drakbackup:2604 +#: standalone/drakbackup:2902 #, c-format msgid " on device: %s" msgstr "" -#: standalone/drakbackup:2605 +#: standalone/drakbackup:2903 #, c-format msgid " (multi-session)" msgstr "" -#: standalone/drakbackup:2606 +#: standalone/drakbackup:2904 #, c-format msgid "" "\n" "- Save to Tape on device: %s" msgstr "" -#: standalone/drakbackup:2607 +#: standalone/drakbackup:2905 #, c-format msgid "\t\tErase=%s" msgstr "" -#: standalone/drakbackup:2610 +#: standalone/drakbackup:2908 #, c-format msgid "" "\n" @@ -14531,7 +14434,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2611 +#: standalone/drakbackup:2909 #, c-format msgid "" "\t\t user name: %s\n" @@ -14539,7 +14442,7 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2612 +#: standalone/drakbackup:2910 #, c-format msgid "" "\n" @@ -14547,56 +14450,49 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2613 +#: standalone/drakbackup:2911 #, c-format msgid "" "\tDo not include System Files\n" "" msgstr "" -#: standalone/drakbackup:2615 +#: standalone/drakbackup:2914 #, c-format msgid "" "\tBackups use tar and bzip2\n" "" msgstr "" -#: standalone/drakbackup:2616 +#: standalone/drakbackup:2916 #, c-format msgid "" "\tBackups use tar and gzip\n" "" msgstr "" -#: standalone/drakbackup:2617 -#, c-format -msgid "" -"\tBackups use tar only\n" -"" -msgstr "" - -#: standalone/drakbackup:2619 +#: standalone/drakbackup:2919 #, c-format msgid "" "\tUse .backupignore files\n" "" msgstr "" -#: standalone/drakbackup:2620 +#: standalone/drakbackup:2920 #, c-format msgid "" "\tSend mail to %s\n" "" msgstr "" -#: standalone/drakbackup:2621 +#: standalone/drakbackup:2921 #, c-format msgid "" "\tUsing SMTP server %s\n" "" msgstr "" -#: standalone/drakbackup:2623 +#: standalone/drakbackup:2923 #, c-format msgid "" "\n" @@ -14604,63 +14500,63 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2624 +#: standalone/drakbackup:2924 #, c-format msgid "" "\t-Hard drive.\n" "" msgstr "" -#: standalone/drakbackup:2625 +#: standalone/drakbackup:2925 #, c-format msgid "" "\t-CD-R.\n" "" msgstr "" -#: standalone/drakbackup:2626 +#: standalone/drakbackup:2926 #, c-format msgid "" "\t-Tape \n" "" msgstr "" -#: standalone/drakbackup:2627 +#: standalone/drakbackup:2927 #, c-format msgid "" "\t-Network by FTP.\n" "" msgstr "" -#: standalone/drakbackup:2628 +#: standalone/drakbackup:2928 #, c-format msgid "" "\t-Network by SSH.\n" "" msgstr "" -#: standalone/drakbackup:2629 +#: standalone/drakbackup:2929 #, c-format msgid "" "\t-Network by rsync.\n" "" msgstr "" -#: standalone/drakbackup:2630 +#: standalone/drakbackup:2930 #, c-format msgid "" "\t-Network by webdav.\n" "" msgstr "" -#: standalone/drakbackup:2632 +#: standalone/drakbackup:2932 #, c-format msgid "" "No configuration, please click Wizard or Advanced.\n" "" msgstr "" -#: standalone/drakbackup:2637 +#: standalone/drakbackup:2937 #, c-format msgid "" "List of data to restore:\n" @@ -14668,35 +14564,35 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2639 +#: standalone/drakbackup:2939 #, c-format msgid "" "- Restore System Files.\n" "" msgstr "" -#: standalone/drakbackup:2641 standalone/drakbackup:2651 +#: standalone/drakbackup:2941 standalone/drakbackup:2951 #, c-format msgid "" " - from date: %s %s\n" "" msgstr "" -#: standalone/drakbackup:2644 +#: standalone/drakbackup:2944 #, c-format msgid "" "- Restore User Files: \n" "" msgstr "" -#: standalone/drakbackup:2649 +#: standalone/drakbackup:2949 #, c-format msgid "" "- Restore Other Files: \n" "" msgstr "" -#: standalone/drakbackup:2830 +#: standalone/drakbackup:3125 #, c-format msgid "" "List of data corrupted:\n" @@ -14704,490 +14600,482 @@ msgid "" "" msgstr "" -#: standalone/drakbackup:2832 +#: standalone/drakbackup:3127 #, c-format msgid "Please uncheck or remove it on next time." msgstr "" -#: standalone/drakbackup:2842 +#: standalone/drakbackup:3137 #, c-format msgid "Backup files are corrupted" msgstr "" -#: standalone/drakbackup:2863 +#: standalone/drakbackup:3158 #, c-format msgid " All of your selected data have been " msgstr "" -#: standalone/drakbackup:2864 +#: standalone/drakbackup:3159 #, c-format msgid " Successfuly Restored on %s " msgstr "" -#: standalone/drakbackup:2987 +#: standalone/drakbackup:3274 #, c-format msgid " Restore Configuration " msgstr "" -#: standalone/drakbackup:3015 +#: standalone/drakbackup:3302 #, c-format msgid "OK to restore the other files." msgstr "" -#: standalone/drakbackup:3031 +#: standalone/drakbackup:3320 #, c-format msgid "User list to restore (only the most recent date per user is important)" msgstr "" -#: standalone/drakbackup:3098 +#: standalone/drakbackup:3386 #, c-format msgid "Please choose the date to restore:" msgstr "" -#: standalone/drakbackup:3135 +#: standalone/drakbackup:3424 #, c-format msgid "Restore from Hard Disk." msgstr "" -#: standalone/drakbackup:3137 +#: standalone/drakbackup:3426 #, c-format msgid "Enter the directory where backups are stored" msgstr "" -#: standalone/drakbackup:3141 -#, c-format -msgid "Directory with backups" -msgstr "" - -#: standalone/drakbackup:3194 +#: standalone/drakbackup:3482 #, c-format msgid "Select another media to restore from" msgstr "" -#: standalone/drakbackup:3196 +#: standalone/drakbackup:3484 #, c-format msgid "Other Media" msgstr "" -#: standalone/drakbackup:3201 +#: standalone/drakbackup:3489 #, c-format msgid "Restore system" msgstr "" -#: standalone/drakbackup:3202 +#: standalone/drakbackup:3490 #, c-format msgid "Restore Users" msgstr "" -#: standalone/drakbackup:3203 +#: standalone/drakbackup:3491 #, c-format msgid "Restore Other" msgstr "" -#: standalone/drakbackup:3205 -#, c-format -msgid "Select path to restore (instead of /)" -msgstr "" - -#: standalone/drakbackup:3209 standalone/drakbackup:3490 +#: standalone/drakbackup:3493 #, c-format -msgid "Path To Restore To" +msgid "select path to restore (instead of /)" msgstr "" -#: standalone/drakbackup:3212 +#: standalone/drakbackup:3497 #, c-format msgid "Do new backup before restore (only for incremental backups.)" msgstr "" -#: standalone/drakbackup:3214 +#: standalone/drakbackup:3499 #, c-format msgid "Remove user directories before restore." msgstr "" -#: standalone/drakbackup:3298 +#: standalone/drakbackup:3579 #, c-format msgid "Filename text substring to search for (empty string matches all):" msgstr "" -#: standalone/drakbackup:3301 +#: standalone/drakbackup:3582 #, c-format msgid "Search Backups" msgstr "" -#: standalone/drakbackup:3320 +#: standalone/drakbackup:3601 #, c-format msgid "No matches found..." msgstr "" -#: standalone/drakbackup:3324 +#: standalone/drakbackup:3605 #, c-format msgid "Restore Selected" msgstr "" -#: standalone/drakbackup:3458 +#: standalone/drakbackup:3739 #, c-format msgid "" "Click date/time to see backup files.\n" "Ctrl-Click files to select multiple files." msgstr "" -#: standalone/drakbackup:3464 +#: standalone/drakbackup:3745 #, c-format msgid "" "Restore Selected\n" "Catalog Entry" msgstr "" -#: standalone/drakbackup:3473 +#: standalone/drakbackup:3754 #, c-format msgid "" "Restore Selected\n" "Files" msgstr "" -#: standalone/drakbackup:3550 +#: standalone/drakbackup:3770 +#, c-format +msgid "" +"Change\n" +"Restore Path" +msgstr "" + +#: standalone/drakbackup:3837 #, c-format msgid "Backup files not found at %s." msgstr "" -#: standalone/drakbackup:3563 +#: standalone/drakbackup:3850 #, c-format msgid "Restore From CD" msgstr "" -#: standalone/drakbackup:3563 +#: standalone/drakbackup:3850 #, c-format msgid "" "Insert the CD with volume label %s\n" " in the CD drive under mount point /mnt/cdrom" msgstr "" -#: standalone/drakbackup:3565 +#: standalone/drakbackup:3852 #, c-format msgid "Not the correct CD label. Disk is labelled %s." msgstr "" -#: standalone/drakbackup:3575 +#: standalone/drakbackup:3862 #, c-format msgid "Restore From Tape" msgstr "" -#: standalone/drakbackup:3575 +#: standalone/drakbackup:3862 #, c-format msgid "" "Insert the tape with volume label %s\n" " in the tape drive device %s" msgstr "" -#: standalone/drakbackup:3577 +#: standalone/drakbackup:3864 #, c-format msgid "Not the correct tape label. Tape is labelled %s." msgstr "" -#: standalone/drakbackup:3588 +#: standalone/drakbackup:3875 #, c-format msgid "Restore Via Network" msgstr "" -#: standalone/drakbackup:3588 +#: standalone/drakbackup:3875 #, c-format msgid "Restore Via Network Protocol: %s" msgstr "" -#: standalone/drakbackup:3589 +#: standalone/drakbackup:3876 #, c-format msgid "Host Name" msgstr "" -#: standalone/drakbackup:3590 +#: standalone/drakbackup:3877 #, c-format msgid "Host Path or Module" msgstr "" -#: standalone/drakbackup:3597 +#: standalone/drakbackup:3884 #, c-format msgid "Password required" msgstr "" -#: standalone/drakbackup:3603 +#: standalone/drakbackup:3890 #, c-format msgid "Username required" msgstr "" -#: standalone/drakbackup:3606 +#: standalone/drakbackup:3893 #, c-format msgid "Hostname required" msgstr "" -#: standalone/drakbackup:3611 +#: standalone/drakbackup:3898 #, c-format msgid "Path or Module required" msgstr "" -#: standalone/drakbackup:3624 +#: standalone/drakbackup:3911 #, c-format msgid "Files Restored..." msgstr "" -#: standalone/drakbackup:3627 +#: standalone/drakbackup:3914 #, c-format msgid "Restore Failed..." msgstr "" -#: standalone/drakbackup:3737 standalone/drakbackup:3754 +#: standalone/drakbackup:4019 standalone/drakbackup:4035 #, c-format msgid "%s not retrieved..." msgstr "" -#: standalone/drakbackup:3880 standalone/drakbackup:3953 +#: standalone/drakbackup:4159 standalone/drakbackup:4232 #, c-format msgid "Search for files to restore" msgstr "" -#: standalone/drakbackup:3885 +#: standalone/drakbackup:4164 #, c-format msgid "Restore all backups" msgstr "" -#: standalone/drakbackup:3894 +#: standalone/drakbackup:4173 #, c-format msgid "Custom Restore" msgstr "" -#: standalone/drakbackup:3899 standalone/drakbackup:3949 +#: standalone/drakbackup:4178 standalone/drakbackup:4228 #, c-format msgid "Restore From Catalog" msgstr "" -#: standalone/drakbackup:3921 +#: standalone/drakbackup:4200 #, c-format msgid "" "Unable to find backups to restore...\n" "" msgstr "" -#: standalone/drakbackup:3922 +#: standalone/drakbackup:4201 #, c-format msgid "Verify that %s is the correct path" msgstr "" -#: standalone/drakbackup:3923 +#: standalone/drakbackup:4202 #, c-format msgid " and the CD is in the drive" msgstr "" -#: standalone/drakbackup:3925 +#: standalone/drakbackup:4204 #, c-format msgid "Backups on unmountable media - Use Catalog to restore" msgstr "" -#: standalone/drakbackup:3941 +#: standalone/drakbackup:4220 #, c-format msgid "CD in place - continue." msgstr "" -#: standalone/drakbackup:3946 +#: standalone/drakbackup:4225 #, c-format msgid "Browse to new restore repository." msgstr "" -#: standalone/drakbackup:3947 -#, c-format -msgid "Directory To Restore From" -msgstr "" - -#: standalone/drakbackup:3986 +#: standalone/drakbackup:4262 #, c-format msgid "Restore Progress" msgstr "" -#: standalone/drakbackup:4016 standalone/drakbackup:4123 standalone/logdrake:174 +#: standalone/drakbackup:4296 standalone/drakbackup:4408 standalone/logdrake:175 #, c-format msgid "Save" msgstr "" -#: standalone/drakbackup:4099 +#: standalone/drakbackup:4382 #, c-format msgid "Build Backup" msgstr "" -#: standalone/drakbackup:4147 standalone/drakbackup:4512 +#: standalone/drakbackup:4434 standalone/drakbackup:4833 #, c-format msgid "Restore" msgstr "" -#: standalone/drakbackup:4277 +#: standalone/drakbackup:4604 #, c-format msgid "" "The following packages need to be installed:\n" "" msgstr "" -#: standalone/drakbackup:4304 +#: standalone/drakbackup:4626 #, c-format msgid "Please select data to restore..." msgstr "" -#: standalone/drakbackup:4344 +#: standalone/drakbackup:4666 #, c-format msgid "Backup system files" msgstr "" -#: standalone/drakbackup:4347 +#: standalone/drakbackup:4669 #, c-format msgid "Backup user files" msgstr "" -#: standalone/drakbackup:4350 +#: standalone/drakbackup:4672 #, c-format msgid "Backup other files" msgstr "" -#: standalone/drakbackup:4353 standalone/drakbackup:4389 +#: standalone/drakbackup:4675 standalone/drakbackup:4711 #, c-format msgid "Total Progress" msgstr "" -#: standalone/drakbackup:4381 +#: standalone/drakbackup:4703 #, c-format msgid "Sending files by FTP" msgstr "" -#: standalone/drakbackup:4384 +#: standalone/drakbackup:4706 #, c-format msgid "Sending files..." msgstr "" -#: standalone/drakbackup:4455 +#: standalone/drakbackup:4776 #, c-format msgid "Backup Now from configuration file" msgstr "" -#: standalone/drakbackup:4460 +#: standalone/drakbackup:4781 #, c-format msgid "View Backup Configuration." msgstr "" -#: standalone/drakbackup:4486 +#: standalone/drakbackup:4807 #, c-format msgid "Wizard Configuration" msgstr "" -#: standalone/drakbackup:4491 +#: standalone/drakbackup:4812 #, c-format msgid "Advanced Configuration" msgstr "" -#: standalone/drakbackup:4496 +#: standalone/drakbackup:4817 #, c-format msgid "View Configuration" msgstr "" -#: standalone/drakbackup:4500 +#: standalone/drakbackup:4821 #, c-format msgid "View Last Log" msgstr "" -#: standalone/drakbackup:4505 +#: standalone/drakbackup:4826 #, c-format msgid "Backup Now" msgstr "" -#: standalone/drakbackup:4509 +#: standalone/drakbackup:4830 #, c-format msgid "" "No configuration file found \n" "please click Wizard or Advanced." msgstr "" -#: standalone/drakbackup:4530 standalone/drakbackup:4533 +#: standalone/drakbackup:4862 standalone/drakbackup:4869 #, c-format msgid "Drakbackup" msgstr "" -#: standalone/drakboot:58 +#: standalone/drakboot:56 #, c-format msgid "Graphical boot theme selection" msgstr "" -#: standalone/drakboot:58 +#: standalone/drakboot:56 #, c-format msgid "System mode" msgstr "" -#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:97 standalone/harddrake2:98 standalone/logdrake:71 standalone/printerdrake:150 standalone/printerdrake:151 standalone/printerdrake:152 +#: standalone/drakboot:66 standalone/drakfloppy:46 standalone/harddrake2:97 standalone/harddrake2:98 standalone/logdrake:70 standalone/printerdrake:150 standalone/printerdrake:151 standalone/printerdrake:152 #, c-format msgid "/_File" msgstr "" -#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77 +#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/logdrake:76 #, c-format msgid "/File/_Quit" msgstr "" -#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:98 standalone/logdrake:77 standalone/printerdrake:152 +#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/harddrake2:98 standalone/logdrake:76 standalone/printerdrake:152 #, c-format msgid "<control>Q" msgstr "" -#: standalone/drakboot:139 +#: standalone/drakboot:118 #, c-format msgid "Install themes" msgstr "" -#: standalone/drakboot:140 +#: standalone/drakboot:119 #, c-format msgid "Create new theme" msgstr "" -#: standalone/drakboot:152 +#: standalone/drakboot:133 #, c-format msgid "Use graphical boot" msgstr "" -#: standalone/drakboot:157 +#: standalone/drakboot:138 #, c-format msgid "Your system bootloader is not in framebuffer mode. To activate graphical boot, select a graphic video mode from the bootloader configuration tool." msgstr "" -#: standalone/drakboot:164 +#: standalone/drakboot:145 #, c-format msgid "Theme" msgstr "" -#: standalone/drakboot:167 +#: standalone/drakboot:147 #, c-format msgid "" "Display theme\n" "under console" msgstr "" -#: standalone/drakboot:176 +#: standalone/drakboot:156 #, c-format msgid "Launch the graphical environment when your system starts" msgstr "" -#: standalone/drakboot:184 +#: standalone/drakboot:164 #, c-format -msgid "No, I don't want autologin" +msgid "Yes, I want autologin with this (user, desktop)" msgstr "" -#: standalone/drakboot:185 +#: standalone/drakboot:165 #, c-format -msgid "Yes, I want autologin with this (user, desktop)" +msgid "No, I don't want autologin" msgstr "" -#: standalone/drakboot:191 +#: standalone/drakboot:171 #, c-format msgid "Default user" msgstr "" -#: standalone/drakboot:192 +#: standalone/drakboot:172 #, c-format msgid "Default desktop" msgstr "" -#: standalone/drakboot:256 +#: standalone/drakboot:236 #, c-format msgid "Installation of %s failed. The following error occured:" msgstr "" @@ -15385,59 +15273,54 @@ msgstr "" msgid "DrakClock" msgstr "" -#: standalone/drakclock:39 -#, c-format -msgid "not defined" -msgstr "" - -#: standalone/drakclock:41 +#: standalone/drakclock:36 #, c-format msgid "Change Time Zone" msgstr "" -#: standalone/drakclock:45 +#: standalone/drakclock:42 #, c-format msgid "Timezone - DrakClock" msgstr "" -#: standalone/drakclock:47 +#: standalone/drakclock:44 #, c-format msgid "GMT - DrakClock" msgstr "" -#: standalone/drakclock:47 +#: standalone/drakclock:44 #, c-format msgid "Is your hardware clock set to GMT?" msgstr "" -#: standalone/drakclock:79 +#: standalone/drakclock:71 #, c-format msgid "Network Time Protocol" msgstr "" -#: standalone/drakclock:81 +#: standalone/drakclock:73 #, c-format msgid "" "Your computer can synchronize its clock\n" " with a remote time server using NTP" msgstr "" -#: standalone/drakclock:82 +#: standalone/drakclock:74 #, c-format msgid "Enable Network Time Protocol" msgstr "" -#: standalone/drakclock:90 +#: standalone/drakclock:82 #, c-format msgid "Server:" msgstr "" -#: standalone/drakclock:137 standalone/drakclock:149 +#: standalone/drakclock:125 standalone/drakclock:137 #, c-format msgid "Reset" msgstr "" -#: standalone/drakclock:212 +#: standalone/drakclock:200 #, c-format msgid "" "We need to install ntp package\n" @@ -15446,192 +15329,204 @@ msgid "" "Do you want to install ntp ?" msgstr "" -#: standalone/drakconnect:81 +#: standalone/drakconnect:77 #, c-format msgid "Network configuration (%d adapters)" msgstr "" -#: standalone/drakconnect:92 standalone/drakconnect:738 +#: standalone/drakconnect:88 standalone/drakconnect:678 #, c-format msgid "Gateway:" msgstr "" -#: standalone/drakconnect:92 standalone/drakconnect:738 +#: standalone/drakconnect:88 standalone/drakconnect:678 #, c-format msgid "Interface:" msgstr "" -#: standalone/drakconnect:96 standalone/net_monitor:105 +#: standalone/drakconnect:92 standalone/net_monitor:105 #, c-format msgid "Wait please" msgstr "" -#: standalone/drakconnect:116 +#: standalone/drakconnect:112 #, c-format msgid "Interface" msgstr "" -#: standalone/drakconnect:116 standalone/drakups:233 +#: standalone/drakconnect:112 standalone/drakconnect:497 standalone/drakvpn:547 standalone/drakvpn:656 +#, c-format +msgid "Protocol" +msgstr "" + +#: standalone/drakconnect:112 #, c-format msgid "Driver" msgstr "" -#: standalone/drakconnect:116 +#: standalone/drakconnect:112 #, c-format msgid "State" msgstr "" -#: standalone/drakconnect:133 +#: standalone/drakconnect:129 #, c-format msgid "Hostname: " msgstr "" -#: standalone/drakconnect:135 +#: standalone/drakconnect:131 #, c-format msgid "Configure hostname..." msgstr "" -#: standalone/drakconnect:149 standalone/drakconnect:779 +#: standalone/drakconnect:145 standalone/drakconnect:719 #, c-format msgid "LAN configuration" msgstr "" -#: standalone/drakconnect:154 +#: standalone/drakconnect:150 #, c-format msgid "Configure Local Area Network..." msgstr "" -#: standalone/drakconnect:162 standalone/drakconnect:237 standalone/drakconnect:241 +#: standalone/drakconnect:158 standalone/drakconnect:227 standalone/drakconnect:231 #, c-format msgid "Apply" msgstr "" -#: standalone/drakconnect:197 -#, c-format -msgid "Manage connections" -msgstr "" - -#: standalone/drakconnect:263 standalone/drakconnect:272 standalone/drakconnect:292 standalone/drakconnect:298 standalone/drakconnect:308 standalone/drakconnect:309 standalone/drakconnect:576 +#: standalone/drakconnect:253 standalone/drakconnect:258 standalone/drakconnect:272 standalone/drakconnect:278 standalone/drakconnect:288 standalone/drakconnect:289 standalone/drakconnect:535 #, c-format msgid "TCP/IP" msgstr "" -#: standalone/drakconnect:263 standalone/drakconnect:272 standalone/drakconnect:292 standalone/drakconnect:444 standalone/drakconnect:448 standalone/drakconnect:576 +#: standalone/drakconnect:253 standalone/drakconnect:258 standalone/drakconnect:272 standalone/drakconnect:416 standalone/drakconnect:420 standalone/drakconnect:535 #, c-format msgid "Account" msgstr "" -#: standalone/drakconnect:298 standalone/drakconnect:370 standalone/drakconnect:371 standalone/drakconnect:576 +#: standalone/drakconnect:278 standalone/drakconnect:342 standalone/drakconnect:343 standalone/drakconnect:535 #, c-format msgid "Wireless" msgstr "" -#: standalone/drakconnect:344 +#: standalone/drakconnect:320 #, c-format msgid "DNS servers" msgstr "" -#: standalone/drakconnect:351 +#: standalone/drakconnect:327 #, c-format msgid "Search Domain" msgstr "" -#: standalone/drakconnect:359 +#: standalone/drakconnect:333 #, c-format msgid "static" msgstr "" -#: standalone/drakconnect:359 +#: standalone/drakconnect:333 #, c-format -msgid "DHCP" +msgid "dhcp" msgstr "" -#: standalone/drakconnect:482 +#: standalone/drakconnect:452 #, c-format msgid "Flow control" msgstr "" -#: standalone/drakconnect:483 +#: standalone/drakconnect:453 #, c-format msgid "Line termination" msgstr "" -#: standalone/drakconnect:493 +#: standalone/drakconnect:458 +#, c-format +msgid "Tone dialing" +msgstr "" + +#: standalone/drakconnect:458 +#, c-format +msgid "Pulse dialing" +msgstr "" + +#: standalone/drakconnect:463 #, c-format msgid "Use lock file" msgstr "" -#: standalone/drakconnect:496 +#: standalone/drakconnect:466 #, c-format msgid "Modem timeout" msgstr "" -#: standalone/drakconnect:500 +#: standalone/drakconnect:470 #, c-format msgid "Wait for dialup tone before dialing" msgstr "" -#: standalone/drakconnect:503 +#: standalone/drakconnect:473 #, c-format msgid "Busy wait" msgstr "" -#: standalone/drakconnect:507 +#: standalone/drakconnect:477 #, c-format msgid "Modem sound" msgstr "" -#: standalone/drakconnect:508 +#: standalone/drakconnect:478 #, c-format msgid "Enable" msgstr "" -#: standalone/drakconnect:508 +#: standalone/drakconnect:478 #, c-format msgid "Disable" msgstr "" -#: standalone/drakconnect:558 standalone/harddrake2:58 +#: standalone/drakconnect:517 standalone/harddrake2:58 #, c-format msgid "Media class" msgstr "" -#: standalone/drakconnect:559 standalone/drakfloppy:140 +#: standalone/drakconnect:518 standalone/drakfloppy:140 #, c-format msgid "Module name" msgstr "" -#: standalone/drakconnect:560 +#: standalone/drakconnect:519 #, c-format msgid "Mac Address" msgstr "" -#: standalone/drakconnect:561 standalone/harddrake2:21 +#: standalone/drakconnect:520 standalone/harddrake2:21 #, c-format msgid "Bus" msgstr "" -#: standalone/drakconnect:562 standalone/harddrake2:29 +#: standalone/drakconnect:521 standalone/harddrake2:29 #, c-format msgid "Location on the bus" msgstr "" -#: standalone/drakconnect:632 standalone/drakgw:248 standalone/drakpxe:138 +#: standalone/drakconnect:581 #, c-format -msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool." +msgid "" +"An unexpected error has happened:\n" +"%s" msgstr "" -#: standalone/drakconnect:638 +#: standalone/drakconnect:591 #, c-format msgid "Remove a network interface" msgstr "" -#: standalone/drakconnect:642 +#: standalone/drakconnect:595 #, c-format msgid "Select the network interface to remove:" msgstr "" -#: standalone/drakconnect:666 +#: standalone/drakconnect:611 #, c-format msgid "" "An error occured while deleting the \"%s\" network interface:\n" @@ -15639,133 +15534,148 @@ msgid "" "%s" msgstr "" -#: standalone/drakconnect:668 +#: standalone/drakconnect:613 #, c-format msgid "Congratulations, the \"%s\" network interface has been succesfully deleted" msgstr "" -#: standalone/drakconnect:685 +#: standalone/drakconnect:630 #, c-format msgid "No Ip" msgstr "" -#: standalone/drakconnect:686 +#: standalone/drakconnect:631 #, c-format msgid "No Mask" msgstr "" -#: standalone/drakconnect:687 standalone/drakconnect:850 +#: standalone/drakconnect:632 standalone/drakconnect:790 #, c-format msgid "up" msgstr "" -#: standalone/drakconnect:687 standalone/drakconnect:850 +#: standalone/drakconnect:632 standalone/drakconnect:790 #, c-format msgid "down" msgstr "" -#: standalone/drakconnect:728 standalone/net_monitor:415 +#: standalone/drakconnect:669 standalone/net_monitor:415 #, c-format msgid "Connected" msgstr "" -#: standalone/drakconnect:728 standalone/net_monitor:415 +#: standalone/drakconnect:669 standalone/net_monitor:415 #, c-format msgid "Not connected" msgstr "" -#: standalone/drakconnect:730 +#: standalone/drakconnect:670 #, c-format msgid "Disconnect..." msgstr "" -#: standalone/drakconnect:730 +#: standalone/drakconnect:670 #, c-format msgid "Connect..." msgstr "" -#: standalone/drakconnect:759 +#: standalone/drakconnect:699 #, c-format msgid "Warning, another Internet connection has been detected, maybe using your network" msgstr "" -#: standalone/drakconnect:775 +#: standalone/drakconnect:715 #, c-format msgid "Deactivate now" msgstr "" -#: standalone/drakconnect:775 +#: standalone/drakconnect:715 #, c-format msgid "Activate now" msgstr "" -#: standalone/drakconnect:783 +#: standalone/drakconnect:723 #, c-format msgid "" "You don't have any configured interface.\n" "Configure them first by clicking on 'Configure'" msgstr "" -#: standalone/drakconnect:797 +#: standalone/drakconnect:737 #, c-format msgid "LAN Configuration" msgstr "" -#: standalone/drakconnect:809 +#: standalone/drakconnect:749 #, c-format msgid "Adapter %s: %s" msgstr "" -#: standalone/drakconnect:818 +#: standalone/drakconnect:758 #, c-format msgid "Boot Protocol" msgstr "" -#: standalone/drakconnect:819 +#: standalone/drakconnect:759 #, c-format msgid "Started on boot" msgstr "" -#: standalone/drakconnect:855 +#: standalone/drakconnect:795 #, c-format msgid "" "This interface has not been configured yet.\n" "Run the \"Add an interface\" assistant from the Mandrake Control Center" msgstr "" -#: standalone/drakconnect:910 +#: standalone/drakconnect:850 #, c-format msgid "" "You don't have any configured Internet connection.\n" "Please run \"Internet access\" in control center." msgstr "" -#: standalone/drakconnect:918 +#: standalone/drakconnect:858 #, c-format msgid "Internet connection configuration" msgstr "" -#: standalone/drakconnect:936 +#: standalone/drakconnect:899 +#, c-format +msgid "Provider dns 1 (optional)" +msgstr "" + +#: standalone/drakconnect:900 +#, c-format +msgid "Provider dns 2 (optional)" +msgstr "" + +#: standalone/drakconnect:913 +#, c-format +msgid "Ethernet Card" +msgstr "" + +#: standalone/drakconnect:914 #, c-format -msgid "Third DNS server (optional)" +msgid "DHCP Client" msgstr "" -#: standalone/drakconnect:958 +#: standalone/drakconnect:943 #, c-format msgid "Internet Connection Configuration" msgstr "" -#: standalone/drakconnect:959 +#: standalone/drakconnect:944 #, c-format msgid "Internet access" msgstr "" -#: standalone/drakconnect:961 standalone/net_monitor:87 +#: standalone/drakconnect:946 standalone/net_monitor:87 #, c-format msgid "Connection type: " msgstr "" -#: standalone/drakconnect:964 +#: standalone/drakconnect:949 #, c-format msgid "Status:" msgstr "" @@ -15900,109 +15810,109 @@ msgid "" "<span foreground=\"Red\"><tt>%s</tt></span>" msgstr "" -#: standalone/drakfont:183 +#: standalone/drakfont:181 #, c-format msgid "Search installed fonts" msgstr "" -#: standalone/drakfont:185 +#: standalone/drakfont:183 #, c-format msgid "Unselect fonts installed" msgstr "" -#: standalone/drakfont:208 +#: standalone/drakfont:206 #, c-format msgid "parse all fonts" msgstr "" -#: standalone/drakfont:210 +#: standalone/drakfont:208 #, c-format msgid "No fonts found" msgstr "" -#: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325 standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392 standalone/drakfont:410 standalone/drakfont:424 +#: standalone/drakfont:216 standalone/drakfont:256 standalone/drakfont:323 standalone/drakfont:356 standalone/drakfont:364 standalone/drakfont:390 standalone/drakfont:408 standalone/drakfont:422 #, c-format msgid "done" msgstr "" -#: standalone/drakfont:223 +#: standalone/drakfont:221 #, c-format msgid "Could not find any font in your mounted partitions" msgstr "" -#: standalone/drakfont:256 +#: standalone/drakfont:254 #, c-format msgid "Reselect correct fonts" msgstr "" -#: standalone/drakfont:259 +#: standalone/drakfont:257 #, c-format msgid "" "Could not find any font.\n" "" msgstr "" -#: standalone/drakfont:269 +#: standalone/drakfont:267 #, c-format msgid "Search for fonts in installed list" msgstr "" -#: standalone/drakfont:294 +#: standalone/drakfont:292 #, c-format msgid "%s fonts conversion" msgstr "" -#: standalone/drakfont:323 +#: standalone/drakfont:321 #, c-format msgid "Fonts copy" msgstr "" -#: standalone/drakfont:326 +#: standalone/drakfont:324 #, c-format msgid "True Type fonts installation" msgstr "" -#: standalone/drakfont:333 +#: standalone/drakfont:331 #, c-format msgid "please wait during ttmkfdir..." msgstr "" -#: standalone/drakfont:334 +#: standalone/drakfont:332 #, c-format msgid "True Type install done" msgstr "" -#: standalone/drakfont:340 standalone/drakfont:355 +#: standalone/drakfont:338 standalone/drakfont:353 #, c-format msgid "type1inst building" msgstr "" -#: standalone/drakfont:349 +#: standalone/drakfont:347 #, c-format msgid "Ghostscript referencing" msgstr "" -#: standalone/drakfont:359 +#: standalone/drakfont:357 #, c-format msgid "Suppress Temporary Files" msgstr "" -#: standalone/drakfont:362 +#: standalone/drakfont:360 #, c-format msgid "Restart XFS" msgstr "" -#: standalone/drakfont:408 standalone/drakfont:418 +#: standalone/drakfont:406 standalone/drakfont:416 #, c-format msgid "Suppress Fonts Files" msgstr "" -#: standalone/drakfont:420 +#: standalone/drakfont:418 #, c-format msgid "xfs restart" msgstr "" -#: standalone/drakfont:428 +#: standalone/drakfont:426 #, c-format msgid "" "Before installing any fonts, be sure that you have the right to use and install them on your system.\n" @@ -16010,32 +15920,32 @@ msgid "" "-You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server." msgstr "" -#: standalone/drakfont:477 standalone/drakfont:486 +#: standalone/drakfont:474 #, c-format msgid "DrakFont" msgstr "" -#: standalone/drakfont:487 +#: standalone/drakfont:484 #, c-format msgid "Font List" msgstr "" -#: standalone/drakfont:493 +#: standalone/drakfont:490 #, c-format msgid "About" msgstr "" -#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725 +#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719 #, c-format msgid "Uninstall" msgstr "" -#: standalone/drakfont:496 +#: standalone/drakfont:493 #, c-format msgid "Import" msgstr "" -#: standalone/drakfont:512 +#: standalone/drakfont:509 #, c-format msgid "" "Copyright (C) 2001-2002 by MandrakeSoft \n" @@ -16048,7 +15958,7 @@ msgid "" " VIGNAUD Thierry <tvignaud@mandrakesoft.com>" msgstr "" -#: standalone/drakfont:521 +#: standalone/drakfont:518 #, c-format msgid "" "This program is free software; you can redistribute it and/or modify\n" @@ -16068,7 +15978,7 @@ msgid "" " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." msgstr "" -#: standalone/drakfont:537 +#: standalone/drakfont:534 #, c-format msgid "" "Thanks:\n" @@ -16087,12 +15997,12 @@ msgid "" "" msgstr "" -#: standalone/drakfont:556 +#: standalone/drakfont:553 #, c-format msgid "Choose the applications that will support the fonts:" msgstr "" -#: standalone/drakfont:557 +#: standalone/drakfont:554 #, c-format msgid "" "Before installing any fonts, be sure that you have the right to use and install them on your system.\n" @@ -16100,185 +16010,185 @@ msgid "" "You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server." msgstr "" -#: standalone/drakfont:567 +#: standalone/drakfont:564 #, c-format msgid "Ghostscript" msgstr "" -#: standalone/drakfont:568 +#: standalone/drakfont:565 #, c-format msgid "StarOffice" msgstr "" -#: standalone/drakfont:569 +#: standalone/drakfont:566 #, c-format msgid "Abiword" msgstr "" -#: standalone/drakfont:570 +#: standalone/drakfont:567 #, c-format msgid "Generic Printers" msgstr "" -#: standalone/drakfont:586 +#: standalone/drakfont:583 #, c-format msgid "Select the font file or directory and click on 'Add'" msgstr "" -#: standalone/drakfont:587 -#, c-format -msgid "File Selection" -msgstr "" - -#: standalone/drakfont:600 +#: standalone/drakfont:597 #, c-format msgid "You've not selected any font" msgstr "" -#: standalone/drakfont:652 +#: standalone/drakfont:646 #, c-format msgid "Import fonts" msgstr "" -#: standalone/drakfont:657 +#: standalone/drakfont:651 #, c-format msgid "Install fonts" msgstr "" -#: standalone/drakfont:692 +#: standalone/drakfont:686 #, c-format msgid "click here if you are sure." msgstr "" -#: standalone/drakfont:694 +#: standalone/drakfont:688 #, c-format msgid "here if no." msgstr "" -#: standalone/drakfont:733 +#: standalone/drakfont:727 #, c-format msgid "Unselected All" msgstr "" -#: standalone/drakfont:736 +#: standalone/drakfont:730 #, c-format msgid "Selected All" msgstr "" -#: standalone/drakfont:739 +#: standalone/drakfont:733 #, c-format msgid "Remove List" msgstr "" -#: standalone/drakfont:750 standalone/drakfont:769 +#: standalone/drakfont:744 standalone/drakfont:763 #, c-format msgid "Importing fonts" msgstr "" -#: standalone/drakfont:754 standalone/drakfont:774 +#: standalone/drakfont:748 standalone/drakfont:768 #, c-format msgid "Initial tests" msgstr "" -#: standalone/drakfont:755 +#: standalone/drakfont:749 #, c-format msgid "Copy fonts on your system" msgstr "" -#: standalone/drakfont:756 +#: standalone/drakfont:750 #, c-format msgid "Install & convert Fonts" msgstr "" -#: standalone/drakfont:757 +#: standalone/drakfont:751 #, c-format msgid "Post Install" msgstr "" -#: standalone/drakfont:775 +#: standalone/drakfont:769 #, c-format msgid "Remove fonts on your system" msgstr "" -#: standalone/drakfont:776 +#: standalone/drakfont:770 #, c-format msgid "Post Uninstall" msgstr "" -#: standalone/drakgw:58 standalone/drakgw:193 +#: standalone/drakgw:59 standalone/drakgw:190 #, c-format msgid "Internet Connection Sharing" msgstr "" -#: standalone/drakgw:124 +#: standalone/drakgw:117 standalone/drakvpn:49 #, c-format -msgid "Internet Connection Sharing currently disabled" +msgid "Sorry, we support only 2.4 and above kernels." msgstr "" -#: standalone/drakgw:125 +#: standalone/drakgw:128 +#, c-format +msgid "Internet Connection Sharing currently enabled" +msgstr "" + +#: standalone/drakgw:129 #, c-format msgid "" -"The setup of Internet connection sharing has already been done.\n" -"It's currently disabled.\n" +"The setup of Internet Connection Sharing has already been done.\n" +"It's currently enabled.\n" "\n" "What would you like to do?" msgstr "" -#: standalone/drakgw:129 standalone/drakvpn:127 +#: standalone/drakgw:133 standalone/drakvpn:97 #, c-format -msgid "enable" +msgid "disable" msgstr "" -#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101 standalone/drakvpn:127 +#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:97 standalone/drakvpn:123 #, c-format msgid "reconfigure" msgstr "" -#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101 standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735 +#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:97 standalone/drakvpn:123 standalone/drakvpn:370 standalone/drakvpn:749 #, c-format msgid "dismiss" msgstr "" #: standalone/drakgw:136 #, c-format -msgid "Enabling servers..." +msgid "Disabling servers..." msgstr "" -#: standalone/drakgw:148 +#: standalone/drakgw:150 #, c-format -msgid "Internet Connection Sharing is now enabled." +msgid "Internet Connection Sharing is now disabled." msgstr "" -#: standalone/drakgw:151 +#: standalone/drakgw:157 #, c-format -msgid "Internet Connection Sharing currently enabled" +msgid "Internet Connection Sharing currently disabled" msgstr "" -#: standalone/drakgw:152 +#: standalone/drakgw:158 #, c-format msgid "" -"The setup of Internet Connection Sharing has already been done.\n" -"It's currently enabled.\n" +"The setup of Internet connection sharing has already been done.\n" +"It's currently disabled.\n" "\n" "What would you like to do?" msgstr "" -#: standalone/drakgw:156 standalone/drakvpn:101 +#: standalone/drakgw:162 standalone/drakvpn:123 #, c-format -msgid "disable" +msgid "enable" msgstr "" -#: standalone/drakgw:159 +#: standalone/drakgw:169 #, c-format -msgid "Disabling servers..." +msgid "Enabling servers..." msgstr "" -#: standalone/drakgw:174 +#: standalone/drakgw:175 #, c-format -msgid "Internet Connection Sharing is now disabled." +msgid "Internet Connection Sharing is now enabled." msgstr "" -#: standalone/drakgw:194 +#: standalone/drakgw:191 #, c-format msgid "" "You are about to configure your computer to share its Internet connection.\n" @@ -16289,27 +16199,39 @@ msgid "" "Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN)." msgstr "" -#: standalone/drakgw:237 +#: standalone/drakgw:211 standalone/drakvpn:208 +#, c-format +msgid "" +"Please enter the name of the interface connected to the internet.\n" +"\n" +"Examples:\n" +"\t\tppp+ for modem or DSL connections, \n" +"\t\teth0, or eth1 for cable connection, \n" +"\t\tippp+ for a isdn connection.\n" +"" +msgstr "" + +#: standalone/drakgw:230 #, c-format msgid "Interface %s (using module %s)" msgstr "" -#: standalone/drakgw:238 +#: standalone/drakgw:231 #, c-format msgid "Interface %s" msgstr "" -#: standalone/drakgw:247 standalone/drakpxe:137 +#: standalone/drakgw:241 standalone/drakpxe:138 #, c-format -msgid "No network adapter on your system!" +msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool." msgstr "" -#: standalone/drakgw:254 +#: standalone/drakgw:247 #, c-format msgid "Network interface" msgstr "" -#: standalone/drakgw:255 +#: standalone/drakgw:248 #, c-format msgid "" "There is only one configured network adapter on your system:\n" @@ -16319,17 +16241,17 @@ msgid "" "I am about to setup your Local Area Network with that adapter." msgstr "" -#: standalone/drakgw:262 +#: standalone/drakgw:255 #, c-format msgid "Please choose what network adapter will be connected to your Local Area Network." msgstr "" -#: standalone/drakgw:291 +#: standalone/drakgw:283 #, c-format msgid "Network interface already configured" msgstr "" -#: standalone/drakgw:292 +#: standalone/drakgw:284 #, c-format msgid "" "Warning, the network adapter (%s) is already configured.\n" @@ -16339,27 +16261,27 @@ msgid "" "You can do it manually but you need to know what you're doing." msgstr "" -#: standalone/drakgw:297 +#: standalone/drakgw:289 #, c-format msgid "Automatic reconfiguration" msgstr "" -#: standalone/drakgw:297 +#: standalone/drakgw:289 #, c-format msgid "No (experts only)" msgstr "" -#: standalone/drakgw:298 +#: standalone/drakgw:290 #, c-format msgid "Show current interface configuration" msgstr "" -#: standalone/drakgw:299 +#: standalone/drakgw:291 #, c-format msgid "Current interface configuration" msgstr "" -#: standalone/drakgw:300 +#: standalone/drakgw:292 #, c-format msgid "" "Current configuration of `%s':\n" @@ -16370,7 +16292,7 @@ msgid "" "Driver: %s" msgstr "" -#: standalone/drakgw:313 +#: standalone/drakgw:305 #, c-format msgid "" "I can keep your current configuration and assume you already set up a DHCP server; in that case please verify I correctly read the Network that you use for your local network; I will not reconfigure it and I will not touch your DHCP server configuration.\n" @@ -16382,12 +16304,12 @@ msgid "" "" msgstr "" -#: standalone/drakgw:320 +#: standalone/drakgw:312 #, c-format msgid "Local Network adress" msgstr "" -#: standalone/drakgw:324 +#: standalone/drakgw:316 #, c-format msgid "" "DHCP Server Configuration.\n" @@ -16396,74 +16318,74 @@ msgid "" "If you don't know the meaning of an option, simply leave it as it is." msgstr "" -#: standalone/drakgw:328 +#: standalone/drakgw:320 #, c-format msgid "(This) DHCP Server IP" msgstr "" -#: standalone/drakgw:329 +#: standalone/drakgw:321 #, c-format msgid "The DNS Server IP" msgstr "" -#: standalone/drakgw:330 +#: standalone/drakgw:322 #, c-format msgid "The internal domain name" msgstr "" -#: standalone/drakgw:331 +#: standalone/drakgw:323 #, c-format msgid "The DHCP start range" msgstr "" -#: standalone/drakgw:332 +#: standalone/drakgw:324 #, c-format msgid "The DHCP end range" msgstr "" -#: standalone/drakgw:333 +#: standalone/drakgw:325 #, c-format msgid "The default lease (in seconds)" msgstr "" -#: standalone/drakgw:334 +#: standalone/drakgw:326 #, c-format msgid "The maximum lease (in seconds)" msgstr "" -#: standalone/drakgw:335 +#: standalone/drakgw:327 #, c-format msgid "Re-configure interface and DHCP server" msgstr "" -#: standalone/drakgw:342 +#: standalone/drakgw:334 #, c-format msgid "The Local Network did not finish with `.0', bailing out." msgstr "" -#: standalone/drakgw:352 +#: standalone/drakgw:344 #, c-format msgid "" "Potential LAN address conflict found in current config of %s!\n" "" msgstr "" -#: standalone/drakgw:362 +#: standalone/drakgw:354 #, c-format msgid "Configuring..." msgstr "" -#: standalone/drakgw:363 +#: standalone/drakgw:355 #, c-format msgid "Configuring scripts, installing software, starting servers..." msgstr "" -#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278 +#: standalone/drakgw:391 standalone/drakpxe:231 standalone/drakvpn:272 #, c-format msgid "Problems installing package %s" msgstr "" -#: standalone/drakgw:599 +#: standalone/drakgw:584 #, c-format msgid "" "Everything has been configured.\n" @@ -16536,7 +16458,7 @@ msgstr "" msgid "Editable" msgstr "" -#: standalone/drakperm:48 standalone/drakperm:314 +#: standalone/drakperm:48 standalone/drakperm:315 #, c-format msgid "Path" msgstr "" @@ -16551,7 +16473,7 @@ msgstr "" msgid "Group" msgstr "" -#: standalone/drakperm:48 standalone/drakperm:326 +#: standalone/drakperm:48 standalone/drakperm:327 #, c-format msgid "Permissions" msgstr "" @@ -16605,7 +16527,7 @@ msgstr "" msgid "Delete selected rule" msgstr "" -#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330 standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694 standalone/printerdrake:229 +#: standalone/drakperm:125 standalone/drakvpn:325 standalone/drakvpn:708 standalone/printerdrake:229 #, c-format msgid "Edit" msgstr "" @@ -16682,7 +16604,7 @@ msgstr "" msgid "Use group id for execution" msgstr "" -#: standalone/drakperm:283 standalone/drakxtv:87 +#: standalone/drakperm:283 #, c-format msgid "User :" msgstr "" @@ -16702,12 +16624,12 @@ msgstr "" msgid "When checked, owner and group won't be changed" msgstr "" -#: standalone/drakperm:300 +#: standalone/drakperm:301 #, c-format msgid "Path selection" msgstr "" -#: standalone/drakperm:320 +#: standalone/drakperm:321 #, c-format msgid "Property" msgstr "" @@ -16814,7 +16736,7 @@ msgstr "" msgid "LOCAL" msgstr "" -#: standalone/draksec:44 standalone/draksec:44 standalone/drakvpn:1146 +#: standalone/draksec:44 standalone/draksec:44 #, c-format msgid "default" msgstr "" @@ -16834,7 +16756,7 @@ msgstr "" msgid "yes" msgstr "" -#: standalone/draksec:81 +#: standalone/draksec:70 #, c-format msgid "" "Here, you can setup the security level and administrator of your machine.\n" @@ -16873,32 +16795,32 @@ msgid "" "maximum" msgstr "" -#: standalone/draksec:129 +#: standalone/draksec:118 #, c-format msgid "(default value: %s)" msgstr "" -#: standalone/draksec:170 +#: standalone/draksec:159 #, c-format msgid "Security Level:" msgstr "" -#: standalone/draksec:173 +#: standalone/draksec:162 #, c-format msgid "Security Alerts:" msgstr "" -#: standalone/draksec:177 +#: standalone/draksec:166 #, c-format msgid "Security Administrator:" msgstr "" -#: standalone/draksec:179 +#: standalone/draksec:168 #, c-format msgid "Basic options" msgstr "" -#: standalone/draksec:192 +#: standalone/draksec:181 #, c-format msgid "" "The following options can be set to customize your\n" @@ -16906,27 +16828,27 @@ msgid "" "" msgstr "" -#: standalone/draksec:194 +#: standalone/draksec:183 #, c-format msgid "Network Options" msgstr "" -#: standalone/draksec:194 +#: standalone/draksec:183 #, c-format msgid "System Options" msgstr "" -#: standalone/draksec:240 +#: standalone/draksec:229 #, c-format msgid "Periodic Checks" msgstr "" -#: standalone/draksec:258 +#: standalone/draksec:247 #, c-format msgid "Please wait, setting security level..." msgstr "" -#: standalone/draksec:264 +#: standalone/draksec:253 #, c-format msgid "Please wait, setting security options..." msgstr "" @@ -16964,324 +16886,165 @@ msgid "" "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit" msgstr "" -#: standalone/draksplash:68 +#: standalone/draksplash:67 #, c-format msgid "first step creation" msgstr "" -#: standalone/draksplash:71 +#: standalone/draksplash:70 #, c-format msgid "final resolution" msgstr "" -#: standalone/draksplash:72 +#: standalone/draksplash:71 standalone/draksplash:165 #, c-format msgid "choose image file" msgstr "" -#: standalone/draksplash:73 +#: standalone/draksplash:72 #, c-format msgid "Theme name" msgstr "" -#: standalone/draksplash:78 +#: standalone/draksplash:77 #, c-format msgid "Browse" msgstr "" -#: standalone/draksplash:93 standalone/draksplash:158 +#: standalone/draksplash:87 standalone/draksplash:153 #, c-format msgid "Configure bootsplash picture" msgstr "" -#: standalone/draksplash:96 +#: standalone/draksplash:90 #, c-format msgid "" "x coordinate of text box\n" "in number of characters" msgstr "" -#: standalone/draksplash:97 +#: standalone/draksplash:91 #, c-format msgid "" "y coordinate of text box\n" "in number of characters" msgstr "" -#: standalone/draksplash:98 +#: standalone/draksplash:92 #, c-format msgid "text width" msgstr "" -#: standalone/draksplash:99 +#: standalone/draksplash:93 #, c-format msgid "text box height" msgstr "" -#: standalone/draksplash:100 +#: standalone/draksplash:94 #, c-format msgid "" "the progress bar x coordinate\n" "of its upper left corner" msgstr "" -#: standalone/draksplash:101 +#: standalone/draksplash:95 #, c-format msgid "" "the progress bar y coordinate\n" "of its upper left corner" msgstr "" -#: standalone/draksplash:102 +#: standalone/draksplash:96 #, c-format msgid "the width of the progress bar" msgstr "" -#: standalone/draksplash:103 +#: standalone/draksplash:97 #, c-format msgid "the height of the progress bar" msgstr "" -#: standalone/draksplash:104 +#: standalone/draksplash:98 #, c-format msgid "the color of the progress bar" msgstr "" -#: standalone/draksplash:119 +#: standalone/draksplash:113 #, c-format msgid "Preview" msgstr "" -#: standalone/draksplash:121 +#: standalone/draksplash:115 #, c-format msgid "Save theme" msgstr "" -#: standalone/draksplash:122 +#: standalone/draksplash:116 #, c-format msgid "Choose color" msgstr "" -#: standalone/draksplash:125 +#: standalone/draksplash:119 #, c-format msgid "Display logo on Console" msgstr "" -#: standalone/draksplash:126 +#: standalone/draksplash:120 #, c-format msgid "Make kernel message quiet by default" msgstr "" -#: standalone/draksplash:161 standalone/draksplash:319 standalone/draksplash:462 +#: standalone/draksplash:156 standalone/draksplash:320 standalone/draksplash:448 #, c-format msgid "Notice" msgstr "" -#: standalone/draksplash:161 standalone/draksplash:319 +#: standalone/draksplash:156 standalone/draksplash:320 #, c-format msgid "This theme does not yet have a bootsplash in %s !" msgstr "" -#: standalone/draksplash:167 +#: standalone/draksplash:162 #, c-format msgid "choose image" msgstr "" -#: standalone/draksplash:209 +#: standalone/draksplash:204 #, c-format msgid "saving Bootsplash theme..." msgstr "" -#: standalone/draksplash:443 +#: standalone/draksplash:428 #, c-format msgid "ProgressBar color selection" msgstr "" -#: standalone/draksplash:462 +#: standalone/draksplash:448 #, c-format msgid "You must choose an image file first!" msgstr "" -#: standalone/draksplash:467 +#: standalone/draksplash:453 #, c-format msgid "Generating preview ..." msgstr "" -#: standalone/draksplash:512 +#: standalone/draksplash:499 #, c-format msgid "%s BootSplash (%s) preview" msgstr "" -#: standalone/drakups:63 -#, c-format -msgid "Connected through a serial port or an usb cable" -msgstr "" - -#: standalone/drakups:69 -#, c-format -msgid "Add an UPS device" -msgstr "" - -#: standalone/drakups:72 -#, c-format -msgid "" -"Welcome to the UPS configuration utility.\n" -"\n" -"Here, you'll be add a new UPS to your system.\n" -"" -msgstr "" - -#: standalone/drakups:79 -#, c-format -msgid "" -"We're going to add an UPS device.\n" -"\n" -"Do you prefer autodetect UPS devices connected to this machine or ?" -msgstr "" - -#: standalone/drakups:82 -#, c-format -msgid "Autodetection" -msgstr "" - -#: standalone/drakups:90 standalone/harddrake2:134 -#, c-format -msgid "Detection in progress" -msgstr "" - -#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479 standalone/logdrake:485 -#, c-format -msgid "Congratulations" -msgstr "" - -#: standalone/drakups:109 -#, c-format -msgid "The wizard successfully added the following UPS devices:" -msgstr "" - -#: standalone/drakups:111 -#, c-format -msgid "No new UPS devices was found" -msgstr "" - -#: standalone/drakups:116 standalone/drakups:128 -#, c-format -msgid "UPS driver configuration" -msgstr "" - -#: standalone/drakups:116 -#, c-format -msgid "Please select your UPS model." -msgstr "" - -#: standalone/drakups:117 -#, c-format -msgid "Manufacturer / Model:" -msgstr "" - -#: standalone/drakups:128 -#, c-format -msgid "" -"We are configuring the \"%s\" UPS from \"%s\".\n" -"Please fill in its name, its driver and its port." -msgstr "" - -#: standalone/drakups:133 -#, c-format -msgid "Name:" -msgstr "" - -#: standalone/drakups:133 -#, c-format -msgid "The name of your ups" -msgstr "" - -#: standalone/drakups:134 -#, c-format -msgid "The driver that manage your ups" -msgstr "" - -#: standalone/drakups:135 -#, c-format -msgid "Port:" -msgstr "" - -#: standalone/drakups:137 -#, c-format -msgid "The port on which is connected your ups" -msgstr "" - -#: standalone/drakups:144 -#, c-format -msgid "The wizard successfully configured the new \"%s\" UPS device." -msgstr "" - -#: standalone/drakups:232 -#, c-format -msgid "UPS devices" -msgstr "" - -#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266 standalone/harddrake2:63 -#, c-format -msgid "Name" -msgstr "" - -#: standalone/drakups:250 -#, c-format -msgid "UPS users" -msgstr "" - -#: standalone/drakups:265 -#, c-format -msgid "Access Control Lists" -msgstr "" - -#: standalone/drakups:266 -#, c-format -msgid "IP mask" -msgstr "" - -#: standalone/drakups:277 -#, c-format -msgid "Rules" -msgstr "" - -#: standalone/drakups:278 -#, c-format -msgid "Action" -msgstr "" - -#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:57 -#, c-format -msgid "Level" -msgstr "" - -#: standalone/drakups:278 -#, c-format -msgid "ACL name" -msgstr "" - -#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310 -#, c-format -msgid "DrakUPS" -msgstr "" - -#: standalone/drakups:307 -#, c-format -msgid "Welcome to the UPS configuration tools" -msgstr "" - -#: standalone/drakvpn:73 +#: standalone/drakvpn:69 #, c-format msgid "DrakVPN" msgstr "" -#: standalone/drakvpn:95 +#: standalone/drakvpn:91 #, c-format msgid "The VPN connection is enabled." msgstr "" -#: standalone/drakvpn:96 +#: standalone/drakvpn:92 #, c-format msgid "" "The setup of a VPN connection has already been done.\n" @@ -17291,22 +17054,22 @@ msgid "" "What would you like to do ?" msgstr "" -#: standalone/drakvpn:105 +#: standalone/drakvpn:101 #, c-format msgid "Disabling VPN..." msgstr "" -#: standalone/drakvpn:114 +#: standalone/drakvpn:110 #, c-format msgid "The VPN connection is now disabled." msgstr "" -#: standalone/drakvpn:121 +#: standalone/drakvpn:117 #, c-format msgid "VPN connection currently disabled" msgstr "" -#: standalone/drakvpn:122 +#: standalone/drakvpn:118 #, c-format msgid "" "The setup of a VPN connection has already been done.\n" @@ -17316,28 +17079,28 @@ msgid "" "What would you like to do ?" msgstr "" -#: standalone/drakvpn:135 +#: standalone/drakvpn:131 #, c-format msgid "Enabling VPN..." msgstr "" -#: standalone/drakvpn:141 +#: standalone/drakvpn:137 #, c-format msgid "The VPN connection is now enabled." msgstr "" -#: standalone/drakvpn:155 standalone/drakvpn:183 +#: standalone/drakvpn:151 standalone/drakvpn:177 #, c-format msgid "Simple VPN setup." msgstr "" -#: standalone/drakvpn:156 +#: standalone/drakvpn:152 #, c-format msgid "" "You are about to configure your computer to use a VPN connection.\n" "\n" "With this feature, computers on your local private network and computers\n" -"on some other remote private networks, can share resources, through\n" +"on some other remote private networks, can share ressources, through\n" "their respective firewalls, over the Internet, in a secure manner. \n" "\n" "The communication over the Internet is encrypted. The local and remote\n" @@ -17347,7 +17110,7 @@ msgid "" "drakconnect before going any further." msgstr "" -#: standalone/drakvpn:184 +#: standalone/drakvpn:178 #, c-format msgid "" "VPN connection.\n" @@ -17363,12 +17126,12 @@ msgid "" "before going any further." msgstr "" -#: standalone/drakvpn:196 +#: standalone/drakvpn:190 #, c-format msgid "Kernel module." msgstr "" -#: standalone/drakvpn:197 +#: standalone/drakvpn:191 #, c-format msgid "" "The kernel need to have ipsec support.\n" @@ -17378,35 +17141,28 @@ msgid "" "This kernel has '%s' support." msgstr "" -#: standalone/drakvpn:292 -#, c-format -msgid "Security Policies" -msgstr "" - -#: standalone/drakvpn:292 +#: standalone/drakvpn:286 standalone/drakvpn:286 #, c-format -msgid "IKE daemon racoon" +msgid "configure %s" msgstr "" -#: standalone/drakvpn:295 standalone/drakvpn:306 +#: standalone/drakvpn:289 standalone/drakvpn:298 #, c-format msgid "Configuration file" msgstr "" -#: standalone/drakvpn:296 +#: standalone/drakvpn:290 #, c-format msgid "" -"Configuration step !\n" +"Welcome to the configuration files step !\n" "\n" -"You need to define the Security Policies and then to \n" -"configure the automatic key exchange (IKE) daemon. \n" -"The KAME IKE daemon we're using is called 'racoon'.\n" +"You can now configure the sections of these files.\n" "\n" -"What would you like to configure ?\n" +"Which file would you like to configure ?\n" "" msgstr "" -#: standalone/drakvpn:307 +#: standalone/drakvpn:299 #, c-format msgid "" "Next, we will configure the %s file.\n" @@ -17416,12 +17172,12 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:325 standalone/drakvpn:685 +#: standalone/drakvpn:317 standalone/drakvpn:699 #, c-format msgid "%s entries" msgstr "" -#: standalone/drakvpn:326 +#: standalone/drakvpn:318 #, c-format msgid "" "The %s file contents\n" @@ -17436,26 +17192,22 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:333 standalone/drakvpn:694 +#: standalone/drakvpn:325 standalone/drakvpn:708 #, c-format -msgid "" -"_:display here is a verb\n" -"Display" +msgid "Display" msgstr "" -#: standalone/drakvpn:333 standalone/drakvpn:694 +#: standalone/drakvpn:325 standalone/drakvpn:708 #, c-format msgid "Commit" msgstr "" -#: standalone/drakvpn:347 standalone/drakvpn:351 standalone/drakvpn:709 standalone/drakvpn:713 +#: standalone/drakvpn:341 standalone/drakvpn:345 standalone/drakvpn:723 standalone/drakvpn:727 #, c-format -msgid "" -"_:display here is a verb\n" -"Display configuration" +msgid "Display configuration" msgstr "" -#: standalone/drakvpn:352 +#: standalone/drakvpn:346 #, c-format msgid "" "The %s file does not exist.\n" @@ -17466,12 +17218,12 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:368 +#: standalone/drakvpn:362 #, c-format msgid "ipsec.conf entries" msgstr "" -#: standalone/drakvpn:369 +#: standalone/drakvpn:363 #, c-format msgid "" "The %s file contains different sections.\n" @@ -17487,27 +17239,27 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:376 +#: standalone/drakvpn:370 #, c-format msgid "config setup" msgstr "" -#: standalone/drakvpn:376 +#: standalone/drakvpn:370 #, c-format msgid "conn %default" msgstr "" -#: standalone/drakvpn:376 +#: standalone/drakvpn:370 #, c-format msgid "normal conn" msgstr "" -#: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510 +#: standalone/drakvpn:376 standalone/drakvpn:417 standalone/drakvpn:504 standalone/drakvpn:557 #, c-format msgid "Exists !" msgstr "" -#: standalone/drakvpn:383 standalone/drakvpn:424 +#: standalone/drakvpn:377 standalone/drakvpn:418 #, c-format msgid "" "A section with this name already exists.\n" @@ -17518,7 +17270,7 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:400 +#: standalone/drakvpn:394 #, c-format msgid "" "This section has to be on top of your\n" @@ -17531,37 +17283,37 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:405 +#: standalone/drakvpn:399 #, c-format msgid "interfaces" msgstr "" -#: standalone/drakvpn:406 +#: standalone/drakvpn:400 #, c-format msgid "klipsdebug" msgstr "" -#: standalone/drakvpn:407 +#: standalone/drakvpn:401 #, c-format msgid "plutodebug" msgstr "" -#: standalone/drakvpn:408 +#: standalone/drakvpn:402 #, c-format msgid "plutoload" msgstr "" -#: standalone/drakvpn:409 +#: standalone/drakvpn:403 #, c-format msgid "plutostart" msgstr "" -#: standalone/drakvpn:410 +#: standalone/drakvpn:404 #, c-format msgid "uniqueids" msgstr "" -#: standalone/drakvpn:444 +#: standalone/drakvpn:438 #, c-format msgid "" "This is the first section after the config\n" @@ -17575,52 +17327,52 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:451 +#: standalone/drakvpn:445 #, c-format -msgid "PFS" +msgid "pfs" msgstr "" -#: standalone/drakvpn:452 +#: standalone/drakvpn:446 #, c-format msgid "keyingtries" msgstr "" -#: standalone/drakvpn:453 +#: standalone/drakvpn:447 #, c-format msgid "compress" msgstr "" -#: standalone/drakvpn:454 +#: standalone/drakvpn:448 #, c-format msgid "disablearrivalcheck" msgstr "" -#: standalone/drakvpn:455 standalone/drakvpn:494 +#: standalone/drakvpn:449 standalone/drakvpn:488 #, c-format msgid "left" msgstr "" -#: standalone/drakvpn:456 standalone/drakvpn:495 +#: standalone/drakvpn:450 standalone/drakvpn:489 #, c-format msgid "leftcert" msgstr "" -#: standalone/drakvpn:457 standalone/drakvpn:496 +#: standalone/drakvpn:451 standalone/drakvpn:490 #, c-format msgid "leftrsasigkey" msgstr "" -#: standalone/drakvpn:458 standalone/drakvpn:497 +#: standalone/drakvpn:452 standalone/drakvpn:491 #, c-format msgid "leftsubnet" msgstr "" -#: standalone/drakvpn:459 standalone/drakvpn:498 +#: standalone/drakvpn:453 standalone/drakvpn:492 #, c-format msgid "leftnexthop" msgstr "" -#: standalone/drakvpn:488 +#: standalone/drakvpn:482 standalone/drakvpn:537 #, c-format msgid "" "Your %s file has several sections, or connections.\n" @@ -17630,47 +17382,47 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:491 +#: standalone/drakvpn:485 #, c-format msgid "section name" msgstr "" -#: standalone/drakvpn:492 +#: standalone/drakvpn:486 #, c-format msgid "authby" msgstr "" -#: standalone/drakvpn:493 +#: standalone/drakvpn:487 #, c-format msgid "auto" msgstr "" -#: standalone/drakvpn:499 +#: standalone/drakvpn:493 #, c-format msgid "right" msgstr "" -#: standalone/drakvpn:500 +#: standalone/drakvpn:494 #, c-format msgid "rightcert" msgstr "" -#: standalone/drakvpn:501 +#: standalone/drakvpn:495 #, c-format msgid "rightrsasigkey" msgstr "" -#: standalone/drakvpn:502 +#: standalone/drakvpn:496 #, c-format msgid "rightsubnet" msgstr "" -#: standalone/drakvpn:503 +#: standalone/drakvpn:497 #, c-format msgid "rightnexthop" msgstr "" -#: standalone/drakvpn:511 +#: standalone/drakvpn:505 standalone/drakvpn:558 #, c-format msgid "" "A section with this name already exists.\n" @@ -17681,23 +17433,62 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:543 +#: standalone/drakvpn:540 standalone/drakvpn:649 #, c-format -msgid "" -"Add a Security Policy.\n" -"\n" -"You can now add a Security Policy.\n" -"\n" -"Choose continue when you are done to write the data.\n" -"" +msgid "Secure policy" +msgstr "" + +#: standalone/drakvpn:541 standalone/drakvpn:650 +#, c-format +msgid "Source IP range" +msgstr "" + +#: standalone/drakvpn:542 standalone/drakvpn:651 +#, c-format +msgid "Destination IP range" msgstr "" -#: standalone/drakvpn:576 standalone/drakvpn:826 +#: standalone/drakvpn:543 standalone/drakvpn:652 +#, c-format +msgid "Upper-layer protocol" +msgstr "" + +#: standalone/drakvpn:544 standalone/drakvpn:653 +#, c-format +msgid "Flag" +msgstr "" + +#: standalone/drakvpn:545 standalone/drakvpn:654 +#, c-format +msgid "Direction" +msgstr "" + +#: standalone/drakvpn:546 standalone/drakvpn:655 +#, c-format +msgid "IPsec policy" +msgstr "" + +#: standalone/drakvpn:548 standalone/drakvpn:657 +#, c-format +msgid "Mode" +msgstr "" + +#: standalone/drakvpn:549 standalone/drakvpn:658 +#, c-format +msgid "Source/destination" +msgstr "" + +#: standalone/drakvpn:550 standalone/drakvpn:659 standalone/harddrake2:57 +#, c-format +msgid "Level" +msgstr "" + +#: standalone/drakvpn:577 standalone/drakvpn:842 #, c-format msgid "Edit section" msgstr "" -#: standalone/drakvpn:577 +#: standalone/drakvpn:578 #, c-format msgid "" "Your %s file has several sections or connections.\n" @@ -17707,17 +17498,17 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:580 standalone/drakvpn:660 standalone/drakvpn:831 standalone/drakvpn:877 +#: standalone/drakvpn:581 standalone/drakvpn:674 standalone/drakvpn:847 standalone/drakvpn:893 #, c-format msgid "Section names" msgstr "" -#: standalone/drakvpn:590 +#: standalone/drakvpn:591 #, c-format msgid "Can't edit !" msgstr "" -#: standalone/drakvpn:591 +#: standalone/drakvpn:592 #, c-format msgid "" "You cannot edit this section.\n" @@ -17725,11 +17516,11 @@ msgid "" "This section is mandatory for Freswan 2.X.\n" "One has to specify version 2.0 on the top\n" "of the %s file, and eventually, disable or\n" -"enable the oportunistic encryption.\n" +"enable the oportunistic ecryption.\n" "" msgstr "" -#: standalone/drakvpn:600 +#: standalone/drakvpn:601 #, c-format msgid "" "Your %s file has several sections.\n" @@ -17739,7 +17530,7 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:611 +#: standalone/drakvpn:612 #, c-format msgid "" "Your %s file has several sections or connections.\n" @@ -17749,7 +17540,7 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:624 +#: standalone/drakvpn:625 #, c-format msgid "" "Your %s file has several sections or connections.\n" @@ -17760,33 +17551,32 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:645 +#: standalone/drakvpn:646 #, c-format msgid "" -"Edit a Security Policy.\n" -"\n" -"You can now add a Security Policy.\n" +"Your %s file has several sections, or connections.\n" "\n" +"You can now edit the chosen section.\n" "Choose continue when you are done to write the data.\n" "" msgstr "" -#: standalone/drakvpn:656 standalone/drakvpn:873 +#: standalone/drakvpn:670 standalone/drakvpn:889 #, c-format msgid "Remove section" msgstr "" -#: standalone/drakvpn:657 standalone/drakvpn:874 +#: standalone/drakvpn:671 standalone/drakvpn:890 #, c-format msgid "" -"Your %s file has several sections or connections.\n" +"Your %s file has several or sections or connections.\n" "\n" "You can choose here below the one you want to remove\n" "and then click on next.\n" "" msgstr "" -#: standalone/drakvpn:686 +#: standalone/drakvpn:700 #, c-format msgid "" "The racoon.conf file configuration.\n" @@ -17800,7 +17590,7 @@ msgid "" " - commit \t\t (writes the changes to the real file)" msgstr "" -#: standalone/drakvpn:714 +#: standalone/drakvpn:728 #, c-format msgid "" "The %s file does not exist\n" @@ -17811,12 +17601,12 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:728 +#: standalone/drakvpn:742 #, c-format msgid "racoonf.conf entries" msgstr "" -#: standalone/drakvpn:729 +#: standalone/drakvpn:743 #, c-format msgid "" "The 'add' sections step.\n" @@ -17830,22 +17620,22 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:735 +#: standalone/drakvpn:749 #, c-format msgid "path" msgstr "" -#: standalone/drakvpn:735 +#: standalone/drakvpn:749 standalone/drakvpn:956 #, c-format msgid "remote" msgstr "" -#: standalone/drakvpn:735 +#: standalone/drakvpn:749 #, c-format msgid "sainfo" msgstr "" -#: standalone/drakvpn:743 +#: standalone/drakvpn:757 #, c-format msgid "" "The 'add path' section step.\n" @@ -17855,41 +17645,45 @@ msgid "" "Put your mouse over the certificate entry to obtain online help." msgstr "" -#: standalone/drakvpn:746 +#: standalone/drakvpn:760 #, c-format msgid "path type" msgstr "" -#: standalone/drakvpn:750 +#: standalone/drakvpn:764 #, c-format msgid "" -"path include path : specifies a path to include\n" -"a file. See File Inclusion.\n" -"\tExample: path include '/etc/racoon'\n" +"Path Specification\n" +" path include path;\n" +"\tspecifies a path to include a file. See File Inclusion.\n" +" Example: path include '/etc/racoon'\n" "\n" -"path pre_shared_key file : specifies a file containing\n" -"pre-shared key(s) for various ID(s). See Pre-shared key File.\n" -"\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n" +" path pre_shared_key file;\n" +"\tspecifies a file containing pre-shared key(s)\n" +"\tfor various ID(s). See Pre-shared key File.\n" +" Example: path pre_shared_key '/etc/racoon/psk.txt' ;\n" "\n" -"path certificate path : racoon(8) will search this directory\n" -"if a certificate or certificate request is received.\n" -"\tExample: path certificate '/etc/cert' ;\n" +" path certificate path;\n" +" \tracoon(8) will search this directory if a certificate or\n" +"\t certificate request is received.\n" +" Example: path certificate '/etc/cert' ;\n" "\n" -"File Inclusion : include file \n" -"other configuration files can be included.\n" -"\tExample: include \"remote.conf\" ;\n" +"File Inclusion\n" +" include file\n" +"\tother configuration files can be included.\n" "\n" -"Pre-shared key File : Pre-shared key file defines a pair\n" -"of the identifier and the shared secret key which are used at\n" -"Pre-shared key authentication method in phase 1." +"Pre-shared key File\n" +" Pre-shared key file defines a pair of the identifier and the\n" +" shared secret key which are used at Pre-shared key authentication\n" +" method in phase 1." msgstr "" -#: standalone/drakvpn:770 standalone/drakvpn:863 +#: standalone/drakvpn:788 #, c-format msgid "real file" msgstr "" -#: standalone/drakvpn:793 +#: standalone/drakvpn:811 #, c-format msgid "" "Make sure you already have the path sections\n" @@ -17900,18 +17694,19 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:810 +#: standalone/drakvpn:828 #, c-format msgid "" "Make sure you already have the path sections\n" "on the top of your %s file.\n" "\n" +"\n" "You can now choose the sainfo settings.\n" "Choose continue or previous when you are done.\n" "" msgstr "" -#: standalone/drakvpn:827 +#: standalone/drakvpn:843 #, c-format msgid "" "Your %s file has several sections or connections.\n" @@ -17921,7 +17716,7 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:838 +#: standalone/drakvpn:854 #, c-format msgid "" "Your %s file has several sections.\n" @@ -17933,17 +17728,18 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:847 +#: standalone/drakvpn:863 #, c-format msgid "" "Your %s file has several sections.\n" "\n" "You can now edit the sainfo section entries.\n" "\n" -"Choose continue when you are done to write the data." +"Choose continue when you are done to write the data.\n" +"" msgstr "" -#: standalone/drakvpn:855 +#: standalone/drakvpn:871 #, c-format msgid "" "This section has to be on top of your\n" @@ -17958,576 +17754,221 @@ msgid "" "" msgstr "" -#: standalone/drakvpn:862 +#: standalone/drakvpn:878 #, c-format msgid "path_type" msgstr "" -#: standalone/drakvpn:903 +#: standalone/drakvpn:879 +#, c-format +msgid "real_file" +msgstr "" + +#: standalone/drakvpn:919 #, c-format msgid "" "Everything has been configured.\n" "\n" -"You may now share resources through the Internet,\n" +"You may now share ressources through the Internet,\n" "in a secure way, using a VPN connection.\n" "\n" "You should make sure that that the tunnels shorewall\n" "section is configured." msgstr "" -#: standalone/drakvpn:923 +#: standalone/drakvpn:939 #, c-format -msgid "Sainfo source address" +msgid "sainfo_source_address" msgstr "" -#: standalone/drakvpn:924 +#: standalone/drakvpn:940 #, c-format -msgid "" -"sainfo (source_id destination_id | anonymous) { statements }\n" -"defines the parameters of the IKE phase 2\n" -"(IPsec-SA establishment).\n" -"\n" -"source_id and destination_id are constructed like:\n" -"\n" -"\taddress address [/ prefix] [[port]] ul_proto\n" -"\n" -"Examples : \n" -"\n" -"sainfo anonymous (accepts connections from anywhere)\n" -"\tleave blank this entry if you want anonymous\n" -"\n" -"sainfo address 203.178.141.209 any address 203.178.141.218 any\n" -"\t203.178.141.209 is the source address\n" -"\n" -"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n" -"\t172.16.1.0/24 is the source address" +msgid "sainfo_source_proto" msgstr "" #: standalone/drakvpn:941 #, c-format -msgid "Sainfo source protocol" +msgid "sainfo_dest_address" msgstr "" #: standalone/drakvpn:942 #, c-format -msgid "" -"sainfo (source_id destination_id | anonymous) { statements }\n" -"defines the parameters of the IKE phase 2\n" -"(IPsec-SA establishment).\n" -"\n" -"source_id and destination_id are constructed like:\n" -"\n" -"\taddress address [/ prefix] [[port]] ul_proto\n" -"\n" -"Examples : \n" -"\n" -"sainfo anonymous (accepts connections from anywhere)\n" -"\tleave blank this entry if you want anonymous\n" -"\n" -"sainfo address 203.178.141.209 any address 203.178.141.218 any\n" -"\tthe first 'any' allows any protocol for the source" -msgstr "" - -#: standalone/drakvpn:956 -#, c-format -msgid "Sainfo destination address" -msgstr "" - -#: standalone/drakvpn:957 -#, c-format -msgid "" -"sainfo (source_id destination_id | anonymous) { statements }\n" -"defines the parameters of the IKE phase 2\n" -"(IPsec-SA establishment).\n" -"\n" -"source_id and destination_id are constructed like:\n" -"\n" -"\taddress address [/ prefix] [[port]] ul_proto\n" -"\n" -"Examples : \n" -"\n" -"sainfo anonymous (accepts connections from anywhere)\n" -"\tleave blank this entry if you want anonymous\n" -"\n" -"sainfo address 203.178.141.209 any address 203.178.141.218 any\n" -"\t203.178.141.218 is the destination address\n" -"\n" -"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n" -"\t172.16.2.0/24 is the destination address" -msgstr "" - -#: standalone/drakvpn:974 -#, c-format -msgid "Sainfo destination protocol" +msgid "sainfo_dest_proto" msgstr "" -#: standalone/drakvpn:975 -#, c-format -msgid "" -"sainfo (source_id destination_id | anonymous) { statements }\n" -"defines the parameters of the IKE phase 2\n" -"(IPsec-SA establishment).\n" -"\n" -"source_id and destination_id are constructed like:\n" -"\n" -"\taddress address [/ prefix] [[port]] ul_proto\n" -"\n" -"Examples : \n" -"\n" -"sainfo anonymous (accepts connections from anywhere)\n" -"\tleave blank this entry if you want anonymous\n" -"\n" -"sainfo address 203.178.141.209 any address 203.178.141.218 any\n" -"\tthe last 'any' allows any protocol for the destination" -msgstr "" - -#: standalone/drakvpn:989 +#: standalone/drakvpn:943 #, c-format msgid "PFS group" msgstr "" -#: standalone/drakvpn:991 -#, c-format -msgid "" -"define the group of Diffie-Hellman exponentiations.\n" -"If you do not require PFS then you can omit this directive.\n" -"Any proposal will be accepted if you do not specify one.\n" -"group is one of following: modp768, modp1024, modp1536.\n" -"Or you can define 1, 2, or 5 as the DH group number." -msgstr "" - -#: standalone/drakvpn:996 +#: standalone/drakvpn:945 #, c-format msgid "Lifetime number" msgstr "" -#: standalone/drakvpn:997 -#, c-format -msgid "" -"define a lifetime of a certain time which will be pro-\n" -"posed in the phase 1 negotiations. Any proposal will be\n" -"accepted, and the attribute(s) will be not proposed to\n" -"the peer if you do not specify it(them). They can be\n" -"individually specified in each proposal.\n" -"\n" -"Examples : \n" -"\n" -" lifetime time 1 min; # sec,min,hour\n" -" lifetime time 1 min; # sec,min,hour\n" -" lifetime time 30 sec;\n" -" lifetime time 30 sec;\n" -" lifetime time 60 sec;\n" -"\tlifetime time 12 hour;\n" -"\n" -"So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n" -"" -msgstr "" - -#: standalone/drakvpn:1013 +#: standalone/drakvpn:946 #, c-format msgid "Lifetime unit" msgstr "" -#: standalone/drakvpn:1015 -#, c-format -msgid "" -"define a lifetime of a certain time which will be pro-\n" -"posed in the phase 1 negotiations. Any proposal will be\n" -"accepted, and the attribute(s) will be not proposed to\n" -"the peer if you do not specify it(them). They can be\n" -"individually specified in each proposal.\n" -"\n" -"Examples : \n" -"\n" -" lifetime time 1 min; # sec,min,hour\n" -" lifetime time 1 min; # sec,min,hour\n" -" lifetime time 30 sec;\n" -" lifetime time 30 sec;\n" -" lifetime time 60 sec;\n" -"\tlifetime time 12 hour ;\n" -"\n" -"So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and 'hour'.\n" -"" -msgstr "" - -#: standalone/drakvpn:1031 standalone/drakvpn:1116 +#: standalone/drakvpn:947 standalone/drakvpn:968 #, c-format msgid "Encryption algorithm" msgstr "" -#: standalone/drakvpn:1033 +#: standalone/drakvpn:948 #, c-format msgid "Authentication algorithm" msgstr "" -#: standalone/drakvpn:1035 +#: standalone/drakvpn:949 #, c-format msgid "Compression algorithm" msgstr "" -#: standalone/drakvpn:1036 -#, c-format -msgid "deflate" -msgstr "" - -#: standalone/drakvpn:1043 -#, c-format -msgid "Remote" -msgstr "" - -#: standalone/drakvpn:1044 -#, c-format -msgid "" -"remote (address | anonymous) [[port]] { statements }\n" -"specifies the parameters for IKE phase 1 for each remote node.\n" -"The default port is 500. If anonymous is specified, the state-\n" -"ments apply to all peers which do not match any other remote\n" -"directive.\n" -"\n" -"Examples : \n" -"\n" -"remote anonymous\n" -"remote ::1 [8000]" -msgstr "" - -#: standalone/drakvpn:1052 -#, c-format -msgid "Exchange mode" -msgstr "" - -#: standalone/drakvpn:1054 -#, c-format -msgid "" -"defines the exchange mode for phase 1 when racoon is the\n" -"initiator. Also it means the acceptable exchange mode\n" -"when racoon is responder. More than one mode can be\n" -"specified by separating them with a comma. All of the\n" -"modes are acceptable. The first exchange mode is what\n" -"racoon uses when it is the initiator.\n" -"" -msgstr "" - -#: standalone/drakvpn:1060 -#, c-format -msgid "Generate policy" -msgstr "" - -#: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090 -#, c-format -msgid "off" -msgstr "" - -#: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090 -#, c-format -msgid "on" -msgstr "" - -#: standalone/drakvpn:1062 -#, c-format -msgid "" -"This directive is for the responder. Therefore you\n" -"should set passive on in order that racoon(8) only\n" -"becomes a responder. If the responder does not have any\n" -"policy in SPD during phase 2 negotiation, and the direc-\n" -"tive is set on, then racoon(8) will choice the first pro-\n" -"posal in the SA payload from the initiator, and generate\n" -"policy entries from the proposal. It is useful to nego-\n" -"tiate with the client which is allocated IP address\n" -"dynamically. Note that inappropriate policy might be\n" -"installed into the responder's SPD by the initiator. So\n" -"that other communication might fail if such policies\n" -"installed due to some policy mismatches between the ini-\n" -"tiator and the responder. This directive is ignored in\n" -"the initiator case. The default value is off." -msgstr "" - -#: standalone/drakvpn:1076 -#, c-format -msgid "Passive" -msgstr "" - -#: standalone/drakvpn:1078 -#, c-format -msgid "" -"If you do not want to initiate the negotiation, set this\n" -"to on. The default value is off. It is useful for a\n" -"server." -msgstr "" - -#: standalone/drakvpn:1081 -#, c-format -msgid "Certificate type" -msgstr "" - -#: standalone/drakvpn:1083 -#, c-format -msgid "My certfile" -msgstr "" - -#: standalone/drakvpn:1084 -#, c-format -msgid "Name of the certificate" -msgstr "" - -#: standalone/drakvpn:1085 +#: standalone/drakvpn:957 #, c-format -msgid "My private key" +msgid "exchange_mode" msgstr "" -#: standalone/drakvpn:1086 +#: standalone/drakvpn:958 #, c-format -msgid "Name of the private key" +msgid "generate_policy" msgstr "" -#: standalone/drakvpn:1087 +#: standalone/drakvpn:959 #, c-format -msgid "Peers certfile" +msgid "passive" msgstr "" -#: standalone/drakvpn:1088 +#: standalone/drakvpn:960 #, c-format -msgid "Name of the peers certificate" +msgid "certificate_type" msgstr "" -#: standalone/drakvpn:1089 +#: standalone/drakvpn:961 #, c-format -msgid "Verify cert" +msgid "my_certfile" msgstr "" -#: standalone/drakvpn:1091 +#: standalone/drakvpn:962 #, c-format -msgid "" -"If you do not want to verify the peer's certificate for\n" -"some reason, set this to off. The default is on." +msgid "my_private_key" msgstr "" -#: standalone/drakvpn:1093 +#: standalone/drakvpn:963 #, c-format -msgid "My identifier" +msgid "peers_certfile" msgstr "" -#: standalone/drakvpn:1094 +#: standalone/drakvpn:964 #, c-format -msgid "" -"specifies the identifier sent to the remote host and the\n" -"type to use in the phase 1 negotiation. address, fqdn,\n" -"user_fqdn, keyid and asn1dn can be used as an idtype.\n" -"they are used like:\n" -"\tmy_identifier address [address];\n" -"\t\tthe type is the IP address. This is the default\n" -"\t\ttype if you do not specify an identifier to use.\n" -"\tmy_identifier user_fqdn string;\n" -"\t\tthe type is a USER_FQDN (user fully-qualified\n" -"\t\tdomain name).\n" -"\tmy_identifier fqdn string;\n" -"\t\tthe type is a FQDN (fully-qualified domain name).\n" -"\tmy_identifier keyid file;\n" -"\t\tthe type is a KEY_ID.\n" -"\tmy_identifier asn1dn [string];\n" -"\t\tthe type is an ASN.1 distinguished name. If\n" -"\t\tstring is omitted, racoon(8) will get DN from\n" -"\t\tSubject field in the certificate.\n" -"\n" -"Examples : \n" -"\n" -"my_identifier user_fqdn \"myemail@mydomain.com\"" +msgid "verify_cert" msgstr "" -#: standalone/drakvpn:1114 +#: standalone/drakvpn:965 #, c-format -msgid "Peers identifier" +msgid "my_identifier" msgstr "" -#: standalone/drakvpn:1115 +#: standalone/drakvpn:966 #, c-format -msgid "Proposal" +msgid "peers_identifier" msgstr "" -#: standalone/drakvpn:1117 +#: standalone/drakvpn:967 #, c-format -msgid "" -"specify the encryption algorithm used for the\n" -"phase 1 negotiation. This directive must be defined. \n" -"algorithm is one of following: \n" -"\n" -"des, 3des, blowfish, cast128 for oakley.\n" -"\n" -"For other transforms, this statement should not be used." +msgid "proposal" msgstr "" -#: standalone/drakvpn:1124 +#: standalone/drakvpn:969 #, c-format msgid "Hash algorithm" msgstr "" -#: standalone/drakvpn:1125 +#: standalone/drakvpn:970 #, c-format msgid "Authentication method" msgstr "" -#: standalone/drakvpn:1126 +#: standalone/drakvpn:971 #, c-format msgid "DH group" msgstr "" -#: standalone/drakvpn:1133 -#, c-format -msgid "Command" -msgstr "" - -#: standalone/drakvpn:1134 -#, c-format -msgid "Source IP range" -msgstr "" - -#: standalone/drakvpn:1135 -#, c-format -msgid "Destination IP range" -msgstr "" - -#: standalone/drakvpn:1136 -#, c-format -msgid "Upper-layer protocol" -msgstr "" - -#: standalone/drakvpn:1136 standalone/drakvpn:1143 -#, c-format -msgid "any" -msgstr "" - -#: standalone/drakvpn:1138 -#, c-format -msgid "Flag" -msgstr "" - -#: standalone/drakvpn:1139 -#, c-format -msgid "Direction" -msgstr "" - -#: standalone/drakvpn:1140 -#, c-format -msgid "IPsec policy" -msgstr "" - -#: standalone/drakvpn:1140 -#, c-format -msgid "ipsec" -msgstr "" - -#: standalone/drakvpn:1140 -#, c-format -msgid "discard" -msgstr "" - -#: standalone/drakvpn:1143 -#, c-format -msgid "Mode" -msgstr "" - -#: standalone/drakvpn:1143 -#, c-format -msgid "tunnel" -msgstr "" - -#: standalone/drakvpn:1143 -#, c-format -msgid "transport" -msgstr "" - -#: standalone/drakvpn:1145 -#, c-format -msgid "Source/destination" -msgstr "" - -#: standalone/drakvpn:1146 -#, c-format -msgid "require" -msgstr "" - -#: standalone/drakvpn:1146 -#, c-format -msgid "use" -msgstr "" - -#: standalone/drakvpn:1146 -#, c-format -msgid "unique" -msgstr "" - -#: standalone/drakxtv:43 +#: standalone/drakxtv:46 #, c-format msgid "USA (broadcast)" msgstr "" -#: standalone/drakxtv:43 +#: standalone/drakxtv:46 #, c-format msgid "USA (cable)" msgstr "" -#: standalone/drakxtv:43 +#: standalone/drakxtv:46 #, c-format msgid "USA (cable-hrc)" msgstr "" -#: standalone/drakxtv:43 +#: standalone/drakxtv:46 #, c-format msgid "Canada (cable)" msgstr "" -#: standalone/drakxtv:44 +#: standalone/drakxtv:47 #, c-format msgid "Japan (broadcast)" msgstr "" -#: standalone/drakxtv:44 +#: standalone/drakxtv:47 #, c-format msgid "Japan (cable)" msgstr "" -#: standalone/drakxtv:44 +#: standalone/drakxtv:47 #, c-format msgid "China (broadcast)" msgstr "" -#: standalone/drakxtv:45 +#: standalone/drakxtv:48 #, c-format msgid "West Europe" msgstr "" -#: standalone/drakxtv:45 +#: standalone/drakxtv:48 #, c-format msgid "East Europe" msgstr "" -#: standalone/drakxtv:45 +#: standalone/drakxtv:48 #, c-format msgid "France [SECAM]" msgstr "" -#: standalone/drakxtv:46 +#: standalone/drakxtv:49 #, c-format msgid "Newzealand" msgstr "" -#: standalone/drakxtv:49 +#: standalone/drakxtv:52 #, c-format msgid "Australian Optus cable TV" msgstr "" -#: standalone/drakxtv:83 +#: standalone/drakxtv:84 #, c-format msgid "" "Please,\n" "type in your tv norm and country" msgstr "" -#: standalone/drakxtv:85 +#: standalone/drakxtv:86 #, c-format msgid "TV norm:" msgstr "" -#: standalone/drakxtv:86 +#: standalone/drakxtv:87 #, c-format msgid "Area:" msgstr "" @@ -18547,24 +17988,29 @@ msgstr "" msgid "There was an error while scanning for TV channels" msgstr "" -#: standalone/drakxtv:108 +#: standalone/drakxtv:106 #, c-format -msgid "Have a nice day!" +msgid "XawTV isn't installed!" msgstr "" #: standalone/drakxtv:109 #, c-format +msgid "Have a nice day!" +msgstr "" + +#: standalone/drakxtv:110 +#, c-format msgid "" "Now, you can run xawtv (under X Window!) !\n" "" msgstr "" -#: standalone/drakxtv:132 +#: standalone/drakxtv:131 #, c-format msgid "No TV Card detected!" msgstr "" -#: standalone/drakxtv:133 +#: standalone/drakxtv:132 #, c-format msgid "" "No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in.\n" @@ -18841,6 +18287,11 @@ msgstr "" #: standalone/harddrake2:63 #, c-format +msgid "Name" +msgstr "" + +#: standalone/harddrake2:63 +#, c-format msgid "the name of the CPU" msgstr "" @@ -18894,12 +18345,12 @@ msgstr "" msgid "the WP flag in the CR0 register of the cpu enforce write proctection at the memory page level, thus enabling the processor to prevent unchecked kernel accesses to user memory (aka this is a bug guard)" msgstr "" -#: standalone/harddrake2:84 standalone/logdrake:78 standalone/printerdrake:146 standalone/printerdrake:159 +#: standalone/harddrake2:84 standalone/logdrake:77 standalone/printerdrake:146 standalone/printerdrake:159 #, c-format msgid "/_Options" msgstr "" -#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:80 standalone/printerdrake:171 standalone/printerdrake:172 standalone/printerdrake:172 standalone/printerdrake:173 standalone/printerdrake:174 +#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:79 standalone/printerdrake:171 standalone/printerdrake:172 standalone/printerdrake:172 standalone/printerdrake:173 standalone/printerdrake:174 #, c-format msgid "/_Help" msgstr "" @@ -18944,6 +18395,11 @@ msgstr "" #: standalone/harddrake2:115 #, c-format +msgid "Select a device !" +msgstr "" + +#: standalone/harddrake2:115 +#, c-format msgid "Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")" msgstr "" @@ -18972,57 +18428,62 @@ msgid "" "" msgstr "" -#: standalone/harddrake2:141 +#: standalone/harddrake2:133 +#, c-format +msgid "Detection in progress" +msgstr "" + +#: standalone/harddrake2:140 #, c-format msgid "Harddrake2 version %s" msgstr "" -#: standalone/harddrake2:157 +#: standalone/harddrake2:156 #, c-format msgid "Detected hardware" msgstr "" -#: standalone/harddrake2:162 +#: standalone/harddrake2:161 #, c-format msgid "Configure module" msgstr "" -#: standalone/harddrake2:169 +#: standalone/harddrake2:168 #, c-format msgid "Run config tool" msgstr "" -#: standalone/harddrake2:216 +#: standalone/harddrake2:209 #, c-format msgid "unknown" msgstr "" -#: standalone/harddrake2:217 +#: standalone/harddrake2:210 #, c-format msgid "Unknown" msgstr "" -#: standalone/harddrake2:235 +#: standalone/harddrake2:228 #, c-format msgid "Click on a device in the left tree in order to display its information here." msgstr "" -#: standalone/harddrake2:286 +#: standalone/harddrake2:276 #, c-format msgid "secondary" msgstr "" -#: standalone/harddrake2:286 +#: standalone/harddrake2:276 #, c-format msgid "primary" msgstr "" -#: standalone/harddrake2:294 +#: standalone/harddrake2:284 #, c-format msgid "burner" msgstr "" -#: standalone/harddrake2:294 +#: standalone/harddrake2:284 #, c-format msgid "DVD" msgstr "" @@ -19042,210 +18503,210 @@ msgstr "" msgid "The change is done, but to be effective you must logout" msgstr "" -#: standalone/logdrake:51 +#: standalone/logdrake:50 #, c-format -msgid "Mandrake Tools Logs" +msgid "Mandrake Tools Explanation" msgstr "" -#: standalone/logdrake:52 +#: standalone/logdrake:51 #, c-format msgid "Logdrake" msgstr "" -#: standalone/logdrake:65 +#: standalone/logdrake:64 #, c-format msgid "Show only for the selected day" msgstr "" -#: standalone/logdrake:72 +#: standalone/logdrake:71 #, c-format msgid "/File/_New" msgstr "" -#: standalone/logdrake:72 +#: standalone/logdrake:71 #, c-format msgid "<control>N" msgstr "" -#: standalone/logdrake:73 +#: standalone/logdrake:72 #, c-format msgid "/File/_Open" msgstr "" -#: standalone/logdrake:73 +#: standalone/logdrake:72 #, c-format msgid "<control>O" msgstr "" -#: standalone/logdrake:74 +#: standalone/logdrake:73 #, c-format msgid "/File/_Save" msgstr "" -#: standalone/logdrake:74 +#: standalone/logdrake:73 #, c-format msgid "<control>S" msgstr "" -#: standalone/logdrake:75 +#: standalone/logdrake:74 #, c-format msgid "/File/Save _As" msgstr "" -#: standalone/logdrake:76 +#: standalone/logdrake:75 #, c-format msgid "/File/-" msgstr "" -#: standalone/logdrake:79 +#: standalone/logdrake:78 #, c-format msgid "/Options/Test" msgstr "" -#: standalone/logdrake:81 +#: standalone/logdrake:80 #, c-format msgid "/Help/_About..." msgstr "" -#: standalone/logdrake:110 +#: standalone/logdrake:111 #, c-format msgid "" "_:this is the auth.log log file\n" "Authentication" msgstr "" -#: standalone/logdrake:111 +#: standalone/logdrake:112 #, c-format msgid "" "_:this is the user.log log file\n" "User" msgstr "" -#: standalone/logdrake:112 +#: standalone/logdrake:113 #, c-format msgid "" "_:this is the /var/log/messages log file\n" "Messages" msgstr "" -#: standalone/logdrake:113 +#: standalone/logdrake:114 #, c-format msgid "" "_:this is the /var/log/syslog log file\n" "Syslog" msgstr "" -#: standalone/logdrake:117 +#: standalone/logdrake:118 #, c-format msgid "search" msgstr "" -#: standalone/logdrake:129 +#: standalone/logdrake:130 #, c-format msgid "A tool to monitor your logs" msgstr "" -#: standalone/logdrake:130 standalone/net_monitor:85 +#: standalone/logdrake:131 standalone/net_monitor:85 #, c-format msgid "Settings" msgstr "" -#: standalone/logdrake:135 +#: standalone/logdrake:136 #, c-format msgid "Matching" msgstr "" -#: standalone/logdrake:136 +#: standalone/logdrake:137 #, c-format msgid "but not matching" msgstr "" -#: standalone/logdrake:140 +#: standalone/logdrake:141 #, c-format msgid "Choose file" msgstr "" -#: standalone/logdrake:149 +#: standalone/logdrake:150 #, c-format msgid "Calendar" msgstr "" -#: standalone/logdrake:159 +#: standalone/logdrake:160 #, c-format msgid "Content of the file" msgstr "" -#: standalone/logdrake:163 standalone/logdrake:429 +#: standalone/logdrake:164 standalone/logdrake:377 #, c-format msgid "Mail alert" msgstr "" -#: standalone/logdrake:170 +#: standalone/logdrake:171 #, c-format msgid "The alert wizard had unexpectly failled:" msgstr "" -#: standalone/logdrake:221 +#: standalone/logdrake:219 #, c-format msgid "please wait, parsing file: %s" msgstr "" -#: standalone/logdrake:406 +#: standalone/logdrake:355 #, c-format msgid "Apache World Wide Web Server" msgstr "" -#: standalone/logdrake:407 +#: standalone/logdrake:356 #, c-format msgid "Domain Name Resolver" msgstr "" -#: standalone/logdrake:408 +#: standalone/logdrake:357 #, c-format msgid "Ftp Server" msgstr "" -#: standalone/logdrake:409 +#: standalone/logdrake:358 #, c-format msgid "Postfix Mail Server" msgstr "" -#: standalone/logdrake:410 +#: standalone/logdrake:359 #, c-format msgid "Samba Server" msgstr "" -#: standalone/logdrake:411 +#: standalone/logdrake:360 #, c-format msgid "SSH Server" msgstr "" -#: standalone/logdrake:412 +#: standalone/logdrake:361 #, c-format msgid "Webmin Service" msgstr "" -#: standalone/logdrake:413 +#: standalone/logdrake:362 #, c-format msgid "Xinetd Service" msgstr "" -#: standalone/logdrake:424 +#: standalone/logdrake:372 #, c-format msgid "Configure the mail alert system" msgstr "" -#: standalone/logdrake:425 +#: standalone/logdrake:373 #, c-format msgid "Stop the mail alert system" msgstr "" -#: standalone/logdrake:432 +#: standalone/logdrake:380 #, c-format msgid "Mail alert configuration" msgstr "" -#: standalone/logdrake:433 +#: standalone/logdrake:381 #, c-format msgid "" "Welcome to the mail configuration utility.\n" @@ -19254,64 +18715,69 @@ msgid "" "" msgstr "" -#: standalone/logdrake:436 +#: standalone/logdrake:384 #, c-format msgid "What do you want to do?" msgstr "" -#: standalone/logdrake:443 +#: standalone/logdrake:391 #, c-format msgid "Services settings" msgstr "" -#: standalone/logdrake:444 +#: standalone/logdrake:392 #, c-format msgid "You will receive an alert if one of the selected services is no longer running" msgstr "" -#: standalone/logdrake:451 +#: standalone/logdrake:399 #, c-format msgid "Load setting" msgstr "" -#: standalone/logdrake:452 +#: standalone/logdrake:400 #, c-format msgid "You will receive an alert if the load is higher than this value" msgstr "" -#: standalone/logdrake:453 +#: standalone/logdrake:401 #, c-format msgid "" "_: load here is a noun, the load of the system\n" "Load" msgstr "" -#: standalone/logdrake:458 +#: standalone/logdrake:406 #, c-format msgid "Alert configuration" msgstr "" -#: standalone/logdrake:459 +#: standalone/logdrake:407 #, c-format msgid "Please enter your email address below " msgstr "" -#: standalone/logdrake:460 +#: standalone/logdrake:408 #, c-format msgid "and enter the name (or the IP) of the SMTP server you whish to use" msgstr "" -#: standalone/logdrake:479 +#: standalone/logdrake:427 standalone/logdrake:433 +#, c-format +msgid "Congratulations" +msgstr "" + +#: standalone/logdrake:427 #, c-format msgid "The wizard successfully configured the mail alert." msgstr "" -#: standalone/logdrake:485 +#: standalone/logdrake:433 #, c-format msgid "The wizard successfully disabled the mail alert." msgstr "" -#: standalone/logdrake:544 +#: standalone/logdrake:492 #, c-format msgid "Save as.." msgstr "" @@ -19616,204 +19082,191 @@ msgid "" "" msgstr "" -#: standalone/scannerdrake:50 -#, c-format -msgid "" -"SANE packages need to be installed to use scanners.\n" -"\n" -"Do you want to install the SANE packages?" -msgstr "" - -#: standalone/scannerdrake:54 -#, c-format -msgid "Aborting Scannerdrake." -msgstr "" - -#: standalone/scannerdrake:59 +#: standalone/scannerdrake:53 #, c-format msgid "Could not install the packages needed to set up a scanner with Scannerdrake." msgstr "" -#: standalone/scannerdrake:60 +#: standalone/scannerdrake:54 #, c-format msgid "Scannerdrake will not be started now." msgstr "" -#: standalone/scannerdrake:66 standalone/scannerdrake:459 +#: standalone/scannerdrake:60 standalone/scannerdrake:452 #, c-format msgid "Searching for configured scanners ..." msgstr "" -#: standalone/scannerdrake:70 standalone/scannerdrake:463 +#: standalone/scannerdrake:64 standalone/scannerdrake:456 #, c-format msgid "Searching for new scanners ..." msgstr "" -#: standalone/scannerdrake:78 standalone/scannerdrake:485 +#: standalone/scannerdrake:72 standalone/scannerdrake:478 #, c-format msgid "Re-generating list of configured scanners ..." msgstr "" -#: standalone/scannerdrake:100 standalone/scannerdrake:141 standalone/scannerdrake:155 +#: standalone/scannerdrake:94 standalone/scannerdrake:135 standalone/scannerdrake:149 #, c-format msgid "The %s is not supported by this version of %s." msgstr "" -#: standalone/scannerdrake:103 +#: standalone/scannerdrake:97 #, c-format msgid "%s found on %s, configure it automatically?" msgstr "" -#: standalone/scannerdrake:115 +#: standalone/scannerdrake:109 #, c-format msgid "%s is not in the scanner database, configure it manually?" msgstr "" -#: standalone/scannerdrake:130 +#: standalone/scannerdrake:124 #, c-format msgid "Select a scanner model" msgstr "" -#: standalone/scannerdrake:131 +#: standalone/scannerdrake:125 #, c-format msgid " (" msgstr "" -#: standalone/scannerdrake:132 +#: standalone/scannerdrake:126 #, c-format msgid "Detected model: %s" msgstr "" -#: standalone/scannerdrake:134 +#: standalone/scannerdrake:128 #, c-format msgid ", " msgstr "" -#: standalone/scannerdrake:135 +#: standalone/scannerdrake:129 #, c-format msgid "Port: %s" msgstr "" -#: standalone/scannerdrake:161 +#: standalone/scannerdrake:155 #, c-format msgid "The %s is not known by this version of Scannerdrake." msgstr "" -#: standalone/scannerdrake:169 standalone/scannerdrake:183 +#: standalone/scannerdrake:163 standalone/scannerdrake:177 #, c-format msgid "Do not install firmware file" msgstr "" -#: standalone/scannerdrake:173 standalone/scannerdrake:225 +#: standalone/scannerdrake:167 standalone/scannerdrake:219 #, c-format msgid "It is possible that your %s needs its firmware to be uploaded everytime when it is turned on." msgstr "" -#: standalone/scannerdrake:174 standalone/scannerdrake:226 +#: standalone/scannerdrake:168 standalone/scannerdrake:220 #, c-format msgid "If this is the case, you can make this be done automatically." msgstr "" -#: standalone/scannerdrake:175 standalone/scannerdrake:229 +#: standalone/scannerdrake:169 standalone/scannerdrake:223 #, c-format msgid "To do so, you need to supply the firmware file for your scanner so that it can be installed." msgstr "" -#: standalone/scannerdrake:176 standalone/scannerdrake:230 +#: standalone/scannerdrake:170 standalone/scannerdrake:224 #, c-format msgid "You find the file on the CD or floppy coming with the scanner, on the manufacturer's home page, or on your Windows partition." msgstr "" -#: standalone/scannerdrake:178 standalone/scannerdrake:237 +#: standalone/scannerdrake:172 standalone/scannerdrake:231 #, c-format msgid "Install firmware file from" msgstr "" -#: standalone/scannerdrake:198 +#: standalone/scannerdrake:192 #, c-format msgid "Select firmware file" msgstr "" -#: standalone/scannerdrake:201 standalone/scannerdrake:260 +#: standalone/scannerdrake:195 standalone/scannerdrake:254 #, c-format msgid "The firmware file %s does not exist or is unreadable!" msgstr "" -#: standalone/scannerdrake:224 +#: standalone/scannerdrake:218 #, c-format msgid "It is possible that your scanners need their firmware to be uploaded everytime when they are turned on." msgstr "" -#: standalone/scannerdrake:228 +#: standalone/scannerdrake:222 #, c-format msgid "To do so, you need to supply the firmware files for your scanners so that it can be installed." msgstr "" -#: standalone/scannerdrake:231 +#: standalone/scannerdrake:225 #, c-format msgid "If you have already installed your scanner's firmware you can update the firmware here by supplying the new firmware file." msgstr "" -#: standalone/scannerdrake:233 +#: standalone/scannerdrake:227 #, c-format msgid "Install firmware for the" msgstr "" -#: standalone/scannerdrake:256 +#: standalone/scannerdrake:250 #, c-format msgid "Select firmware file for the %s" msgstr "" -#: standalone/scannerdrake:282 +#: standalone/scannerdrake:276 #, c-format msgid "The firmware file for your %s was successfully installed." msgstr "" -#: standalone/scannerdrake:292 +#: standalone/scannerdrake:286 #, c-format msgid "The %s is unsupported" msgstr "" -#: standalone/scannerdrake:297 +#: standalone/scannerdrake:291 #, c-format msgid "" "The %s must be configured by printerdrake.\n" "You can launch printerdrake from the %s Control Center in Hardware section." msgstr "" -#: standalone/scannerdrake:301 standalone/scannerdrake:308 standalone/scannerdrake:338 +#: standalone/scannerdrake:295 standalone/scannerdrake:302 standalone/scannerdrake:332 #, c-format msgid "Auto-detect available ports" msgstr "" -#: standalone/scannerdrake:303 standalone/scannerdrake:349 +#: standalone/scannerdrake:297 standalone/scannerdrake:343 #, c-format msgid "Please select the device where your %s is attached" msgstr "" -#: standalone/scannerdrake:304 +#: standalone/scannerdrake:298 #, c-format msgid "(Note: Parallel ports cannot be auto-detected)" msgstr "" -#: standalone/scannerdrake:306 standalone/scannerdrake:351 +#: standalone/scannerdrake:300 standalone/scannerdrake:345 #, c-format msgid "choose device" msgstr "" -#: standalone/scannerdrake:340 +#: standalone/scannerdrake:334 #, c-format msgid "Searching for scanners ..." msgstr "" -#: standalone/scannerdrake:375 +#: standalone/scannerdrake:368 #, c-format msgid "" "Your %s has been configured.\n" -"You may now scan documents using \"XSane\" or \"Kooka\" from Multimedia/Graphics in the applications menu." +"You may now scan documents using \"XSane\" from Multimedia/Graphics in the applications menu." msgstr "" -#: standalone/scannerdrake:399 +#: standalone/scannerdrake:392 #, c-format msgid "" "The following scanners\n" @@ -19823,7 +19276,7 @@ msgid "" "" msgstr "" -#: standalone/scannerdrake:400 +#: standalone/scannerdrake:393 #, c-format msgid "" "The following scanner\n" @@ -19833,188 +19286,156 @@ msgid "" "" msgstr "" -#: standalone/scannerdrake:403 standalone/scannerdrake:406 +#: standalone/scannerdrake:396 standalone/scannerdrake:399 #, c-format msgid "" "There are no scanners found which are available on your system.\n" "" msgstr "" -#: standalone/scannerdrake:420 +#: standalone/scannerdrake:413 #, c-format msgid "Search for new scanners" msgstr "" -#: standalone/scannerdrake:426 +#: standalone/scannerdrake:419 #, c-format msgid "Add a scanner manually" msgstr "" -#: standalone/scannerdrake:433 +#: standalone/scannerdrake:426 #, c-format msgid "Install/Update firmware files" msgstr "" -#: standalone/scannerdrake:439 +#: standalone/scannerdrake:432 #, c-format msgid "Scanner sharing" msgstr "" -#: standalone/scannerdrake:498 standalone/scannerdrake:663 +#: standalone/scannerdrake:491 standalone/scannerdrake:656 #, c-format msgid "All remote machines" msgstr "" -#: standalone/scannerdrake:510 standalone/scannerdrake:813 +#: standalone/scannerdrake:503 standalone/scannerdrake:806 #, c-format msgid "This machine" msgstr "" -#: standalone/scannerdrake:550 +#: standalone/scannerdrake:543 #, c-format -msgid "Here you can choose whether the scanners connected to this machine should be accessible by remote machines and by which remote machines." +msgid "Here you can choose whether the scanners connected to this machine should be accessable by remote machines and by which remote machines." msgstr "" -#: standalone/scannerdrake:551 +#: standalone/scannerdrake:544 #, c-format msgid "You can also decide here whether scanners on remote machines should be made available on this machine." msgstr "" -#: standalone/scannerdrake:554 +#: standalone/scannerdrake:547 #, c-format msgid "The scanners on this machine are available to other computers" msgstr "" -#: standalone/scannerdrake:556 +#: standalone/scannerdrake:549 #, c-format msgid "Scanner sharing to hosts: " msgstr "" -#: standalone/scannerdrake:570 +#: standalone/scannerdrake:563 #, c-format msgid "Use scanners on remote computers" msgstr "" -#: standalone/scannerdrake:573 +#: standalone/scannerdrake:566 #, c-format msgid "Use the scanners on hosts: " msgstr "" -#: standalone/scannerdrake:600 standalone/scannerdrake:672 standalone/scannerdrake:822 +#: standalone/scannerdrake:593 standalone/scannerdrake:665 standalone/scannerdrake:815 #, c-format msgid "Sharing of local scanners" msgstr "" -#: standalone/scannerdrake:601 +#: standalone/scannerdrake:594 #, c-format msgid "These are the machines on which the locally connected scanner(s) should be available:" msgstr "" -#: standalone/scannerdrake:612 standalone/scannerdrake:762 +#: standalone/scannerdrake:605 standalone/scannerdrake:755 #, c-format msgid "Add host" msgstr "" -#: standalone/scannerdrake:618 standalone/scannerdrake:768 +#: standalone/scannerdrake:611 standalone/scannerdrake:761 #, c-format msgid "Edit selected host" msgstr "" -#: standalone/scannerdrake:627 standalone/scannerdrake:777 +#: standalone/scannerdrake:620 standalone/scannerdrake:770 #, c-format msgid "Remove selected host" msgstr "" -#: standalone/scannerdrake:651 standalone/scannerdrake:659 standalone/scannerdrake:664 standalone/scannerdrake:710 standalone/scannerdrake:801 standalone/scannerdrake:809 standalone/scannerdrake:814 standalone/scannerdrake:860 +#: standalone/scannerdrake:644 standalone/scannerdrake:652 standalone/scannerdrake:657 standalone/scannerdrake:703 standalone/scannerdrake:794 standalone/scannerdrake:802 standalone/scannerdrake:807 standalone/scannerdrake:853 #, c-format msgid "Name/IP address of host:" msgstr "" -#: standalone/scannerdrake:673 standalone/scannerdrake:823 +#: standalone/scannerdrake:666 standalone/scannerdrake:816 #, c-format msgid "Choose the host on which the local scanners should be made available:" msgstr "" -#: standalone/scannerdrake:684 standalone/scannerdrake:834 +#: standalone/scannerdrake:677 standalone/scannerdrake:827 #, c-format msgid "" "You must enter a host name or an IP address.\n" "" msgstr "" -#: standalone/scannerdrake:695 standalone/scannerdrake:845 +#: standalone/scannerdrake:688 standalone/scannerdrake:838 #, c-format msgid "" "This host is already in the list, it cannot be added again.\n" "" msgstr "" -#: standalone/scannerdrake:750 +#: standalone/scannerdrake:743 #, c-format msgid "Usage of remote scanners" msgstr "" -#: standalone/scannerdrake:751 +#: standalone/scannerdrake:744 #, c-format msgid "These are the machines from which the scanners should be used:" msgstr "" -#: standalone/scannerdrake:908 -#, c-format -msgid "" -"saned needs to be installed to share the local scanner(s).\n" -"\n" -"Do you want to install the saned package?" -msgstr "" - -#: standalone/scannerdrake:912 standalone/scannerdrake:916 +#: standalone/scannerdrake:904 #, c-format msgid "Your scanner(s) will not be available on the network." msgstr "" -#: standalone/service_harddrake:58 +#: standalone/service_harddrake:49 #, c-format msgid "" "Some devices in the \"%s\" hardware class were removed:\n" "" msgstr "" -#: standalone/service_harddrake:59 -#, c-format -msgid "" -"- %s was removed\n" -"" -msgstr "" - -#: standalone/service_harddrake:62 +#: standalone/service_harddrake:53 #, c-format msgid "" "Some devices were added: %s\n" "" msgstr "" -#: standalone/service_harddrake:63 -#, c-format -msgid "" -"- %s was added\n" -"" -msgstr "" - -#: standalone/service_harddrake:107 +#: standalone/service_harddrake:94 #, c-format msgid "Hardware probing in progress" msgstr "" -#: standalone/service_harddrake_confirm:7 -#, c-format -msgid "Hardware changes in \"%s\" class (%s seconds to answer)" -msgstr "" - -#: standalone/service_harddrake_confirm:8 -#, c-format -msgid "Do you want to run the appropriate config tool ?" -msgstr "" - #: steps.pm:14 #, c-format msgid "Language" @@ -20105,22 +19526,22 @@ msgstr "" msgid "Exit install" msgstr "" -#: ugtk2.pm:1075 +#: ugtk2.pm:1051 #, c-format msgid "Is this correct?" msgstr "" -#: ugtk2.pm:1203 +#: ugtk2.pm:1174 #, c-format msgid "Expand Tree" msgstr "" -#: ugtk2.pm:1204 +#: ugtk2.pm:1175 #, c-format msgid "Collapse Tree" msgstr "" -#: ugtk2.pm:1205 +#: ugtk2.pm:1176 #, c-format msgid "Toggle between flat and group sorted" msgstr "" @@ -20137,147 +19558,3 @@ msgstr "" msgid "Installation failed" msgstr "" - -#: ../../share/compssUsers:999 -msgid "Office Workstation" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Game station" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Amusement programs: arcade, boards, strategy, etc" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Multimedia station" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Sound and video playing/editing programs" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Internet station" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Network Computer (client)" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Clients for different protocols including ssh" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Configuration" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Tools to ease the configuration of your computer" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Console Tools" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Editors, shells, file tools, terminals" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "KDE Workstation" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "GNOME Workstation" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "A graphical environment with user-friendly set of applications and desktop tools" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Other Graphical Desktops" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "C and C++ development libraries, programs and include files" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Documentation" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Books and Howto's on Linux and Free Software" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "LSB" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Linux Standard Base. Third party applications support" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Web/FTP" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Apache, Pro-ftpd" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Mail" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Postfix mail server" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Database" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "PostgreSQL or MySQL database server" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Firewall/Router" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Internet gateway" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Network Computer server" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "NFS server, SMB server, Proxy server, ssh server" -msgstr "" - -#: ../../share/compssUsers:999 -msgid "Set of tools to read and send mail and news and to browse the Web" -msgstr "" diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index f1b76061a..8a603b5e4 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -166,7 +166,7 @@ sub explanations { log::explanations("@_") } our @common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf cp_af touch setVarsInSh setExportedVarsInSh setExportedVarsInCsh update_gnomekderc); our @builtin_functs = qw(chmod chown unlink link symlink rename system); -our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modules::parameters modules mouse my_gtk network network::adsl network::ethernet network::isdn_consts network::isdn network::modem network::netconnect network::network network::nfs network::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall); +our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree Xconfig::xfree3 Xconfig::xfree4 Xconfig::xfreeX any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modules::parameters modules mouse my_gtk network network::adsl network::ethernet network::isdn_consts network::isdn network::modem network::netconnect network::network network::nfs network::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall); $SIG{SEGV} = sub { my $progname = $0; $progname =~ s|.*/||; exec("drakbug --incident $progname") }; diff --git a/tools/ddcprobe/Makefile b/tools/ddcprobe/Makefile deleted file mode 100644 index bcbf1464d..000000000 --- a/tools/ddcprobe/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -CFLAGS=-Wall -O # -g -DDEBUG -LDFLAGS = -lm -TARGETS=ddcxinfos - -ARCH := $(patsubst i%86,i386,$(shell uname -m)) -ARCH := $(patsubst sparc%,sparc,$(ARCH)) - -ifeq (i386,$(ARCH)) - -ddcxinfos: lrmi.o vesamode.o vbe.o ddcxinfos.o - -libvbe.a: lrmi.o vesamode.o vbe.o - $(AR) cru $@ $^ - -#install: $(DESTDIR)/usr/include/vbe.h $(DESTDIR)/usr/lib/libvbe.a - -$(DESTDIR)/usr/include/vbe.h: - install -m 644 vbe.h $(DESTDIR)/usr/include/vbe.h - -$(DESTDIR)/usr/lib/libvbe.a: - install -m 644 libvbe.a $(DESTDIR)/usr/lib/libvbe.a - -else -ddcxinfos: not_handled.c - gcc -o $@ $< -endif - -clean: - $(RM) $(TARGETS) *.o core diff --git a/tools/ddcprobe/ddcxinfos.c b/tools/ddcprobe/ddcxinfos.c deleted file mode 100644 index 22ed653b8..000000000 --- a/tools/ddcprobe/ddcxinfos.c +++ /dev/null @@ -1,73 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <math.h> -#include "vbe.h" -#include "vesamode.h" -#ident "$Id$" - -#define SQR(x) ((x) * (x)) - -int main(int argc, char **argv) -{ - int i, j; - u_int16_t *mode_list; - unsigned char hmin, hmax, vmin, vmax; - struct vbe_info *vbe_info; - struct vbe_edid1_info *edid; - struct vbe_modeline *modelines; - - - if ((vbe_info = vbe_get_vbe_info()) == NULL) return 1; - - printf("%dKB of video ram\n", vbe_info->memory_size * 64); - - /* List supported standard modes. */ - for (mode_list = vbe_info->mode_list.list; *mode_list != 0xffff; mode_list++) - for (i = 0; known_vesa_modes[i].x; i++) - if (known_vesa_modes[i].number == *mode_list) - printf("%d %d %d\n", - known_vesa_modes[i].colors, - known_vesa_modes[i].x, - known_vesa_modes[i].y - ); - printf("\n"); - - if ((edid = vbe_get_edid_info()) == NULL) return 0; - if (edid->version == 255 && edid->revision == 255) return 0; - - vbe_get_edid_ranges(edid, &hmin, &hmax, &vmin, &vmax); - modelines = vbe_get_edid_modelines(edid); - - if (hmin > hmax || vmin > vmax) return 0; - - printf(hmin ? "%d-%d kHz HorizSync\n" : "\n", hmin, hmax); - printf(vmin ? "%d-%d Hz VertRefresh\n" : "\n", vmin, vmax); - - if (edid->max_size_horizontal != 127 && edid->max_size_vertical != 127) { - char manufacturer[4]; - double size = sqrt(SQR(edid->max_size_horizontal) + - SQR(edid->max_size_vertical)) / 2.54; - manufacturer[0] = edid->manufacturer_name.char1 + 'A' - 1; - manufacturer[1] = edid->manufacturer_name.char2 + 'A' - 1; - manufacturer[2] = edid->manufacturer_name.char3 + 'A' - 1; - manufacturer[3] = '\0'; - printf(size ? "%3.2f inches monitor (truly %3.2f') EISA ID=%s%04x\n" : "\n", size * 1.08, size, manufacturer, edid->product_code); - } - - for(j=0; modelines && (modelines[j].refresh != 0); j++){ - printf("# %dx%d, %1.1f%sHz", - modelines[j].width, - modelines[j].height, - modelines[j].refresh, - modelines[j].interlaced?"i":"" - ); - if(modelines[j].modeline) { - printf("; hfreq=%f, vfreq=%f\n%s\n", - modelines[j].hfreq, - modelines[j].vfreq, - modelines[j].modeline); - } else printf("\n"); - } - return 0; -} diff --git a/tools/ddcprobe/vbe.c b/tools/ddcprobe/vbe.c deleted file mode 100644 index a67e56d0b..000000000 --- a/tools/ddcprobe/vbe.c +++ /dev/null @@ -1,709 +0,0 @@ -#include <sys/types.h> -#include <sys/io.h> -#include <sys/mman.h> -#include <netinet/in.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <assert.h> -#include <limits.h> -#include <ctype.h> -#include "lrmi.h" -#include "vesamode.h" -#include "vbe.h" -#ident "$Id$" - -/* Return information about a particular video mode. */ -struct vbe_mode_info *vbe_get_mode_info(u_int16_t mode) -{ - struct LRMI_regs regs; - char *mem; - struct vbe_mode_info *ret = NULL; - - /* Initialize LRMI. */ - if(LRMI_init() == 0) { - return NULL; - } - - /* Allocate a chunk of memory. */ - mem = LRMI_alloc_real(sizeof(struct vbe_mode_info)); - if(mem == NULL) { - return NULL; - } - memset(mem, 0, sizeof(struct vbe_mode_info)); - - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f01; - regs.ecx = mode; - regs.es = ((u_int32_t)mem) >> 4; - regs.edi = ((u_int32_t)mem) & 0x0f; - - /* Do it. */ - iopl(3); - ioperm(0, 0x400, 1); - - if(LRMI_int(0x10, ®s) == 0) { - LRMI_free_real(mem); - return NULL; - } - - /* Check for successful return. */ - if((regs.eax & 0xffff) != 0x004f) { - LRMI_free_real(mem); - return NULL; - } - - /* Get memory for return. */ - ret = malloc(sizeof(struct vbe_mode_info)); - if(ret == NULL) { - LRMI_free_real(mem); - return NULL; - } - - /* Copy the buffer for return. */ - memcpy(ret, mem, sizeof(struct vbe_mode_info)); - - /* Clean up and return. */ - LRMI_free_real(mem); - return ret; -} - -/* Get VBE info. */ -struct vbe_info *vbe_get_vbe_info() -{ - struct LRMI_regs regs; - unsigned char *mem; - struct vbe_info *ret = NULL; - int i; - - /* Initialize LRMI. */ - if(LRMI_init() == 0) { - return NULL; - } - - /* Allocate a chunk of memory. */ - mem = LRMI_alloc_real(sizeof(struct vbe_mode_info)); - if(mem == NULL) { - return NULL; - } - memset(mem, 0, sizeof(struct vbe_mode_info)); - - /* Set up registers for the interrupt call. */ - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f00; - regs.es = ((u_int32_t)mem) >> 4; - regs.edi = ((u_int32_t)mem) & 0x0f; - memcpy(mem, "VBE2", 4); - - /* Do it. */ - iopl(3); - ioperm(0, 0x400, 1); - - if(LRMI_int(0x10, ®s) == 0) { - LRMI_free_real(mem); - return NULL; - } - - /* Check for successful return code. */ - if((regs.eax & 0xffff) != 0x004f) { - LRMI_free_real(mem); - return NULL; - } - - /* Get memory to return the information. */ - ret = malloc(sizeof(struct vbe_info)); - if(ret == NULL) { - LRMI_free_real(mem); - return NULL; - } - memcpy(ret, mem, sizeof(struct vbe_info)); - - /* Set up pointers to usable memory. */ - ret->mode_list.list = (u_int16_t*) ((ret->mode_list.addr.seg << 4) + - (ret->mode_list.addr.ofs)); - ret->oem_name.string = (char*) ((ret->oem_name.addr.seg << 4) + - (ret->oem_name.addr.ofs)); - - /* Snip, snip. */ - mem = strdup(ret->oem_name.string); /* leak */ - while(((i = strlen(mem)) > 0) && isspace(mem[i - 1])) { - mem[i - 1] = '\0'; - } - ret->oem_name.string = mem; - - /* Set up pointers for VESA 3.0+ strings. */ - if(ret->version[1] >= 3) { - - /* Vendor name. */ - ret->vendor_name.string = (char*) - ((ret->vendor_name.addr.seg << 4) - + (ret->vendor_name.addr.ofs)); - - mem = strdup(ret->vendor_name.string); /* leak */ - while(((i = strlen(mem)) > 0) && isspace(mem[i - 1])) { - mem[i - 1] = '\0'; - } - ret->vendor_name.string = mem; - - /* Product name. */ - ret->product_name.string = (char*) - ((ret->product_name.addr.seg << 4) - + (ret->product_name.addr.ofs)); - - mem = strdup(ret->product_name.string); /* leak */ - while(((i = strlen(mem)) > 0) && isspace(mem[i - 1])) { - mem[i - 1] = '\0'; - } - ret->product_name.string = mem; - - /* Product revision. */ - ret->product_revision.string = (char*) - ((ret->product_revision.addr.seg << 4) - + (ret->product_revision.addr.ofs)); - - mem = strdup(ret->product_revision.string); /* leak */ - while(((i = strlen(mem)) > 0) && isspace(mem[i - 1])) { - mem[i - 1] = '\0'; - } - ret->product_revision.string = mem; - } - - /* Cleanup. */ - LRMI_free_real(mem); - return ret; -} - -/* Check if EDID queries are suorted. */ -int vbe_get_edid_supported() -{ - struct LRMI_regs regs; - int ret = 0; - - /* Initialize LRMI. */ - if(LRMI_init() == 0) { - return 0; - } - - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f15; - regs.ebx = 0x0000; - regs.es = 0x3000; - regs.edi = 0x3000; - - /* Do it. */ - iopl(3); - ioperm(0, 0x400, 1); - - if(LRMI_int(0x10, ®s) == 0) { - return 0; - } - - /* Check for successful return. */ - if((regs.eax & 0xff) == 0x4f) { - /* Supported. */ - ret = 1; - } else { - /* Not supported. */ - ret = 0; - } - - /* Clean up and return. */ - return ret; -} - -/* Get EDID info. */ -struct vbe_edid1_info *vbe_get_edid_info() -{ - struct LRMI_regs regs; - unsigned char *mem; - struct vbe_edid1_info *ret = NULL; - u_int16_t man; - - /* Initialize LRMI. */ - if(LRMI_init() == 0) { - return NULL; - } - - /* Allocate a chunk of memory. */ - mem = LRMI_alloc_real(sizeof(struct vbe_edid1_info)); - if(mem == NULL) { - return NULL; - } - memset(mem, 0, sizeof(struct vbe_edid1_info)); - - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f15; - regs.ebx = 0x0001; - regs.es = ((u_int32_t)mem) >> 4; - regs.edi = ((u_int32_t)mem) & 0x0f; - - /* Do it. */ - iopl(3); - ioperm(0, 0x400, 1); - - if(LRMI_int(0x10, ®s) == 0) { - LRMI_free_real(mem); - return NULL; - } - -#if 0 - /* Check for successful return. */ - if((regs.eax & 0xffff) != 0x004f) { - LRMI_free_real(mem); - return NULL; - } -#elseif - /* Check for successful return. */ - if((regs.eax & 0xff) != 0x4f) { - LRMI_free_real(mem); - return NULL; - } -#endif - - /* Get memory for return. */ - ret = malloc(sizeof(struct vbe_edid1_info)); - if(ret == NULL) { - LRMI_free_real(mem); - return NULL; - } - - /* Copy the buffer for return. */ - memcpy(ret, mem, sizeof(struct vbe_edid1_info)); - - memcpy(&man, &ret->manufacturer_name, 2); - man = ntohs(man); - memcpy(&ret->manufacturer_name, &man, 2); - - LRMI_free_real(mem); - return ret; -} - -/* Figure out what the current video mode is. */ -int32_t vbe_get_mode() -{ - struct LRMI_regs regs; - int32_t ret = -1; - - /* Initialize LRMI. */ - if(LRMI_init() == 0) { - return -1; - } - - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f03; - - /* Do it. */ - iopl(3); - ioperm(0, 0x400, 1); - - if(LRMI_int(0x10, ®s) == 0) { - return -1; - } - - /* Save the returned value. */ - if((regs.eax & 0xffff) == 0x004f) { - ret = regs.ebx & 0xffff; - } else { - ret = -1; - } - - /* Clean up and return. */ - return ret; -} - -/* Set the video mode. */ -void vbe_set_mode(u_int16_t mode) -{ - struct LRMI_regs regs; - - /* Initialize LRMI. */ - if(LRMI_init() == 0) { - return; - } - - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f02; - regs.ebx = mode; - - /* Do it. */ - iopl(3); - ioperm(0, 0x400, 1); - LRMI_int(0x10, ®s); - - /* Return. */ - return; -} - -/* Just read ranges from the EDID. */ -void vbe_get_edid_ranges(struct vbe_edid1_info *edid, - unsigned char *hmin, unsigned char *hmax, - unsigned char *vmin, unsigned char *vmax) -{ - struct vbe_edid_monitor_descriptor *monitor; - int i; - - *hmin = *hmax = *vmin = *vmax = 0; - - for(i = 0; i < 4; i++) { - monitor = &edid->monitor_details.monitor_descriptor[i]; - if(monitor->type == vbe_edid_monitor_descriptor_range) { - *hmin = monitor->data.range_data.horizontal_min; - *hmax = monitor->data.range_data.horizontal_max; - *vmin = monitor->data.range_data.vertical_min; - *vmax = monitor->data.range_data.vertical_max; - } - } -} - -static int compare_vbe_modelines(const void *m1, const void *m2) -{ - const struct vbe_modeline *M1 = (const struct vbe_modeline*) m1; - const struct vbe_modeline *M2 = (const struct vbe_modeline*) m2; - if(M1->width < M2->width) return -1; - if(M1->width > M2->width) return 1; - return 0; -} - -struct vbe_modeline *vbe_get_edid_modelines() -{ - struct vbe_edid1_info *edid; - struct vbe_modeline *ret; - char buf[LINE_MAX]; - int modeline_count = 0, i, j; - - if((edid = vbe_get_edid_info()) == NULL) { - return NULL; - } - - memcpy(buf, &edid->established_timings, - sizeof(edid->established_timings)); - for(i = 0; i < (8 * sizeof(edid->established_timings)); i++) { - if(buf[i / 8] & (1 << (i % 8))) { - modeline_count++; - } - } - - /* Count the number of standard timings. */ - for(i = 0; i < 8; i++) { - int x, v; - x = edid->standard_timing[i].xresolution; - v = edid->standard_timing[i].vfreq; - if(((edid->standard_timing[i].xresolution & 0x01) != x) && - ((edid->standard_timing[i].vfreq & 0x01) != v)) { - modeline_count++; - } - } - - ret = malloc(sizeof(struct vbe_modeline) * (modeline_count + 1)); - if(ret == NULL) { - return NULL; - } - memset(ret, 0, sizeof(struct vbe_modeline) * (modeline_count + 1)); - - modeline_count = 0; - - /* Fill out established timings. */ - if(edid->established_timings.timing_720x400_70) { - ret[modeline_count].width = 720; - ret[modeline_count].height = 400; - ret[modeline_count].refresh = 70; - modeline_count++; - } - if(edid->established_timings.timing_720x400_88) { - ret[modeline_count].width = 720; - ret[modeline_count].height = 400; - ret[modeline_count].refresh = 88; - modeline_count++; - } - if(edid->established_timings.timing_640x480_60) { - ret[modeline_count].width = 640; - ret[modeline_count].height = 480; - ret[modeline_count].refresh = 60; - modeline_count++; - } - if(edid->established_timings.timing_640x480_67) { - ret[modeline_count].width = 640; - ret[modeline_count].height = 480; - ret[modeline_count].refresh = 67; - modeline_count++; - } - if(edid->established_timings.timing_640x480_72) { - ret[modeline_count].width = 640; - ret[modeline_count].height = 480; - ret[modeline_count].refresh = 72; - modeline_count++; - } - if(edid->established_timings.timing_640x480_75) { - ret[modeline_count].width = 640; - ret[modeline_count].height = 480; - ret[modeline_count].refresh = 75; - modeline_count++; - } - if(edid->established_timings.timing_800x600_56) { - ret[modeline_count].width = 800; - ret[modeline_count].height = 600; - ret[modeline_count].refresh = 56; - modeline_count++; - } - if(edid->established_timings.timing_800x600_60) { - ret[modeline_count].width = 800; - ret[modeline_count].height = 600; - ret[modeline_count].refresh = 60; - modeline_count++; - } - if(edid->established_timings.timing_800x600_72) { - ret[modeline_count].width = 800; - ret[modeline_count].height = 600; - ret[modeline_count].refresh = 72; - modeline_count++; - } - if(edid->established_timings.timing_800x600_75) { - ret[modeline_count].width = 800; - ret[modeline_count].height = 600; - ret[modeline_count].refresh = 75; - modeline_count++; - } - if(edid->established_timings.timing_832x624_75) { - ret[modeline_count].width = 832; - ret[modeline_count].height = 624; - ret[modeline_count].refresh = 75; - modeline_count++; - } - if(edid->established_timings.timing_1024x768_87i) { - ret[modeline_count].width = 1024; - ret[modeline_count].height = 768; - ret[modeline_count].refresh = 87; - ret[modeline_count].interlaced = 1; - modeline_count++; - } - if(edid->established_timings.timing_1024x768_60){ - ret[modeline_count].width = 1024; - ret[modeline_count].height = 768; - ret[modeline_count].refresh = 60; - modeline_count++; - } - if(edid->established_timings.timing_1024x768_70){ - ret[modeline_count].width = 1024; - ret[modeline_count].height = 768; - ret[modeline_count].refresh = 70; - modeline_count++; - } - if(edid->established_timings.timing_1024x768_75){ - ret[modeline_count].width = 1024; - ret[modeline_count].height = 768; - ret[modeline_count].refresh = 75; - modeline_count++; - } - if(edid->established_timings.timing_1280x1024_75) { - ret[modeline_count].width = 1280; - ret[modeline_count].height = 1024; - ret[modeline_count].refresh = 75; - modeline_count++; - } - - /* Add in standard timings. */ - for(i = 0; i < 8; i++) { - float aspect = 1; - int x, v; - x = edid->standard_timing[i].xresolution; - v = edid->standard_timing[i].vfreq; - if(((edid->standard_timing[i].xresolution & 0x01) != x) && - ((edid->standard_timing[i].vfreq & 0x01) != v)) { - switch(edid->standard_timing[i].aspect) { - case aspect_75: aspect = 0.7500; break; - case aspect_8: aspect = 0.8000; break; - case aspect_5625: aspect = 0.5625; break; - default: aspect = 1; break; - } - x = (edid->standard_timing[i].xresolution + 31) * 8; - ret[modeline_count].width = x; - ret[modeline_count].height = x * aspect; - ret[modeline_count].refresh = - edid->standard_timing[i].vfreq + 60; - modeline_count++; - } - } - - /* Now tack on any matching modelines. */ - for(i = 0; ret[i].refresh != 0; i++) { - struct vesa_timing_t *t = NULL; - for(j = 0; known_vesa_timings[j].refresh != 0; j++) { - t = &known_vesa_timings[j]; - if(ret[i].width == t->x) - if(ret[i].height == t->y) - if(ret[i].refresh == t->refresh) { - snprintf(buf, sizeof(buf), - "ModeLine \"%dx%d\"\t%6.2f " - "%4d %4d %4d %4d %4d %4d %4d %4d %s %s" - , t->x, t->y, t->dotclock, - t->timings[0], - t->timings[0] + t->timings[1], - t->timings[0] + t->timings[1] + - t->timings[2], - t->timings[0] + t->timings[1] + - t->timings[2] + t->timings[3], - t->timings[4], - t->timings[4] + t->timings[5], - t->timings[4] + t->timings[5] + - t->timings[6], - t->timings[4] + t->timings[5] + - t->timings[6] + t->timings[7], - t->hsync == hsync_pos ? - "+hsync" : "-hsync", - t->vsync == vsync_pos ? - "+vsync" : "-vsync"); - ret[i].modeline = strdup(buf); - ret[i].hfreq = t->hfreq; - ret[i].vfreq = t->vfreq; - } - } - } - - modeline_count = 0; - for(i = 0; ret[i].refresh != 0; i++) { - modeline_count++; - } - qsort(ret, modeline_count, sizeof(ret[0]), compare_vbe_modelines); - - return ret; -} - -const void *vbe_save_svga_state() -{ - struct LRMI_regs regs; - unsigned char *mem; - u_int16_t block_size; - void *data; - - /* Initialize LRMI. */ - if(LRMI_init() == 0) { - return NULL; - } - - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f04; - regs.ecx = 0xffff; - regs.edx = 0; - - iopl(3); - ioperm(0, 0x400, 1); - - if(LRMI_int(0x10, ®s) == 0) { - return NULL; - } - - if((regs.eax & 0xff) != 0x4f) { - fprintf(stderr, "Get SuperVGA Video State not supported.\n"); - return NULL; - } - - if((regs.eax & 0xffff) != 0x004f) { - fprintf(stderr, "Get SuperVGA Video State Info failed.\n"); - return NULL; - } - - block_size = 64 * (regs.ebx & 0xffff); - - /* Allocate a chunk of memory. */ - mem = LRMI_alloc_real(block_size); - if(mem == NULL) { - return NULL; - } - memset(mem, 0, sizeof(block_size)); - - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f04; - regs.ecx = 0x000f; - regs.edx = 0x0001; - regs.es = ((u_int32_t)mem) >> 4; - regs.ebx = ((u_int32_t)mem) & 0x0f; - memset(mem, 0, block_size); - iopl(3); - ioperm(0, 0x400, 1); - - if(LRMI_int(0x10, ®s) == 0) { - LRMI_free_real(mem); - return NULL; - } - - if((regs.eax & 0xffff) != 0x004f) { - fprintf(stderr, "Get SuperVGA Video State Save failed.\n"); - return NULL; - } - - data = malloc(block_size); - if(data == NULL) { - LRMI_free_real(mem); - return NULL; - } - - /* Clean up and return. */ - memcpy(data, mem, block_size); - LRMI_free_real(mem); - return data; -} - -void vbe_restore_svga_state(const void *state) -{ - struct LRMI_regs regs; - unsigned char *mem; - u_int16_t block_size; - - /* Initialize LRMI. */ - if(LRMI_init() == 0) { - return; - } - - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f04; - regs.ecx = 0x000f; - regs.edx = 0; - - /* Find out how much memory we need. */ - iopl(3); - ioperm(0, 0x400, 1); - - if(LRMI_int(0x10, ®s) == 0) { - return; - } - - if((regs.eax & 0xff) != 0x4f) { - fprintf(stderr, "Get SuperVGA Video State not supported.\n"); - return; - } - - if((regs.eax & 0xffff) != 0x004f) { - fprintf(stderr, "Get SuperVGA Video State Info failed.\n"); - return; - } - - block_size = 64 * (regs.ebx & 0xffff); - - /* Allocate a chunk of memory. */ - mem = LRMI_alloc_real(block_size); - if(mem == NULL) { - return; - } - memset(mem, 0, sizeof(block_size)); - - memset(®s, 0, sizeof(regs)); - regs.eax = 0x4f04; - regs.ecx = 0x000f; - regs.edx = 0x0002; - regs.es = 0x2000; - regs.ebx = 0x0000; - memcpy(mem, state, block_size); - - iopl(3); - ioperm(0, 0x400, 1); - - if(LRMI_int(0x10, ®s) == 0) { - LRMI_free_real(mem); - return; - } - - if((regs.eax & 0xffff) != 0x004f) { - fprintf(stderr, "Get SuperVGA Video State Restore failed.\n"); - return; - } -} diff --git a/tools/ddcprobe/vbe.h b/tools/ddcprobe/vbe.h deleted file mode 100644 index 338d3bd88..000000000 --- a/tools/ddcprobe/vbe.h +++ /dev/null @@ -1,312 +0,0 @@ -#ifndef vbe_h -#define vbe_h -#ident "$Id$" -#include <sys/types.h> - -/* Record returned by int 0x10, function 0x4f, subfunction 0x00. */ -struct vbe_info { - unsigned char signature[4]; - unsigned char version[2]; - union { - struct { - u_int16_t ofs; - u_int16_t seg; - } addr; - const char *string; - } oem_name; - u_int32_t capabilities; - union { - struct { - u_int16_t ofs; - u_int16_t seg; - } addr; - u_int16_t *list; - } mode_list; - u_int16_t memory_size; - /* VESA 3.0+ */ - u_int16_t vbe_revision; - union { - struct { - u_int16_t ofs; - u_int16_t seg; - } addr; - const char *string; - } vendor_name; - union { - struct { - u_int16_t ofs; - u_int16_t seg; - } addr; - const char *string; - } product_name; - union { - struct { - u_int16_t ofs; - u_int16_t seg; - } addr; - const char *string; - } product_revision; - char reserved1[222]; - char reserved2[256]; -} __attribute__ ((packed)); - -/* Stuff returned by int 0x10, function 0x4f, subfunction 0x01. */ -struct vbe_mode_info { - /* required for all VESA versions */ - struct { - /* VBE 1.0+ */ - u_int16_t supported: 1; - u_int16_t optional_info_available: 1; - u_int16_t bios_output_supported: 1; - u_int16_t color: 1; - u_int16_t graphics: 1; - /* VBE 2.0+ */ - u_int16_t not_vga_compatible: 1; - u_int16_t not_bank_switched: 1; - u_int16_t lfb: 1; - /* VBE 1.0+ */ - u_int16_t unknown: 1; - u_int16_t must_enable_directaccess_in_10: 1; - } mode_attributes; - struct { - unsigned char exists: 1; - unsigned char readable: 1; - unsigned char writeable: 1; - unsigned char reserved: 5; - } windowa_attributes, windowb_attributes; - u_int16_t window_granularity; - u_int16_t window_size; - u_int16_t windowa_start_segment, windowb_start_segment; - u_int16_t window_positioning_seg, window_positioning_ofs; - u_int16_t bytes_per_scanline; - /* optional for VESA 1.0/1.1, required for OEM modes */ - u_int16_t w, h; - unsigned char cell_width, cell_height; - unsigned char memory_planes; - unsigned char bpp; - unsigned char banks; - enum { - memory_model_text = 0, - memory_model_cga = 1, - memory_model_hgc = 2, - memory_model_ega16 = 3, - memory_model_packed_pixel = 4, - memory_model_sequ256 = 5, - memory_model_direct_color = 6, - memory_model_yuv = 7, - } memory_model: 8; - unsigned char bank_size; - unsigned char image_pages; - unsigned char reserved1; - /* required for VESA 1.2+ */ - unsigned char red_mask, red_field; - unsigned char green_mask, green_field; - unsigned char blue_mask, blue_field; - unsigned char reserved_mask, reserved_field; - unsigned char direct_color_mode_info; - /* VESA 2.0+ */ - u_int32_t linear_buffer_address; - u_int32_t offscreen_memory_address; - u_int16_t offscreen_memory_size; - unsigned char reserved2[206]; -} __attribute__ ((packed)); - -/* Modeline information used by XFree86. */ -struct vbe_modeline { - u_int16_t width, height; - unsigned char interlaced; - float refresh; - char *modeline; - float hfreq, vfreq, pixel_clock; -}; - -/* Aspect ratios used in EDID info. */ -enum vbe_edid_aspect { - aspect_unknown = 0, - aspect_75, - aspect_8, - aspect_5625, -}; - -/* Detailed timing information used in EDID v1.x */ -struct vbe_edid_detailed_timing { - u_int16_t pixel_clock; -#define VBE_EDID_DETAILED_TIMING_PIXEL_CLOCK(_x) \ - ((_x).pixel_clock * 10000) - unsigned char horizontal_active; - unsigned char horizontal_blanking; - unsigned char horizontal_active_hi: 4; - unsigned char horizontal_blanking_hi: 4; -#define VBE_EDID_DETAILED_TIMING_HORIZONTAL_ACTIVE(_x) \ - (((_x).horizontal_active_hi << 8) + (_x).horizontal_active) -#define VBE_EDID_DETAILED_TIMING_HORIZONTAL_BLANKING(_x) \ - (((_x).horizontal_blanking_hi << 8) + (_x).horizontal_blanking) - unsigned char vertical_active; - unsigned char vertical_blanking; - unsigned char vertical_active_hi: 4; - unsigned char vertical_blanking_hi: 4; -#define VBE_EDID_DETAILED_TIMING_VERTICAL_ACTIVE(_x) \ - (((_x).vertical_active_hi << 8) + (_x).vertical_active) -#define VBE_EDID_DETAILED_TIMING_VERTICAL_BLANKING(_x) \ - (((_x).vertical_blanking_hi << 8) + (_x).vertical_blanking) - unsigned char hsync_offset; - unsigned char hsync_pulse_width; - unsigned char vsync_offset: 4; - unsigned char vsync_pulse_width: 4; - unsigned char hsync_offset_hi: 2; - unsigned char hsync_pulse_width_hi: 2; - unsigned char vsync_offset_hi: 2; - unsigned char vsync_pulse_width_hi: 2; -#define VBE_EDID_DETAILED_TIMING_HSYNC_OFFSET(_x) \ - (((_x).hsync_offset_hi << 8) + (_x).hsync_offset) -#define VBE_EDID_DETAILED_TIMING_HSYNC_PULSE_WIDTH(_x) \ - (((_x).hsync_pulse_width_hi << 8) + (_x).hsync_pulse_width) -#define VBE_EDID_DETAILED_TIMING_VSYNC_OFFSET(_x) \ - (((_x).vsync_offset_hi << 4) + (_x).vsync_offset) -#define VBE_EDID_DETAILED_TIMING_VSYNC_PULSE_WIDTH(_x) \ - (((_x).vsync_pulse_width_hi << 4) + (_x).vsync_pulse_width) - unsigned char himage_size; - unsigned char vimage_size; - unsigned char himage_size_hi: 4; - unsigned char vimage_size_hi: 4; -#define VBE_EDID_DETAILED_TIMING_HIMAGE_SIZE(_x) \ - (((_x).himage_size_hi << 8) + (_x).himage_size) -#define VBE_EDID_DETAILED_TIMING_VIMAGE_SIZE(_x) \ - (((_x).vimage_size_hi << 8) + (_x).vimage_size) - unsigned char hborder; - unsigned char vborder; - struct { - unsigned char interlaced: 1; - unsigned char stereo: 2; - unsigned char digital_composite: 2; - unsigned char variant: 2; - unsigned char zero: 1; - } flags __attribute__ ((packed)); -} __attribute__ ((packed)); - -enum { - vbe_edid_monitor_descriptor_serial = 0xff, - vbe_edid_monitor_descriptor_ascii = 0xfe, - vbe_edid_monitor_descriptor_range = 0xfd, - vbe_edid_monitor_descriptor_name = 0xfc, -} vbe_edid_monitor_descriptor_types; - -struct vbe_edid_monitor_descriptor { - u_int16_t zero_flag_1; - unsigned char zero_flag_2; - unsigned char type; - unsigned char zero_flag_3; - union { - char string[13]; - struct { - unsigned char vertical_min; - unsigned char vertical_max; - unsigned char horizontal_min; - unsigned char horizontal_max; - unsigned char pixel_clock_max; - unsigned char gtf_data[8]; - } range_data; - } data; -} __attribute__ ((packed)); - -struct vbe_edid1_info { - unsigned char header[8]; - struct { - u_int16_t char3: 5; - u_int16_t char2: 5; - u_int16_t char1: 5; - u_int16_t zero: 1; - } manufacturer_name __attribute__ ((packed)); - u_int16_t product_code; - u_int32_t serial_number; - unsigned char week; - unsigned char year; - unsigned char version; - unsigned char revision; - struct { - unsigned char separate_sync: 1; - unsigned char composite_sync: 1; - unsigned char sync_on_green: 1; - unsigned char unused: 2; - unsigned char voltage_level: 2; - unsigned char digital: 1; - } video_input_definition __attribute__ ((packed)); - unsigned char max_size_horizontal; - unsigned char max_size_vertical; - unsigned char gamma; - struct { - unsigned char unused1: 3; - unsigned char rgb: 1; - unsigned char unused2: 1; - unsigned char active_off: 1; - unsigned char suspend: 1; - unsigned char standby: 1; - } feature_support __attribute__ ((packed)); - unsigned char color_characteristics[10]; - struct { - unsigned char timing_720x400_70: 1; - unsigned char timing_720x400_88: 1; - unsigned char timing_640x480_60: 1; - unsigned char timing_640x480_67: 1; - unsigned char timing_640x480_72: 1; - unsigned char timing_640x480_75: 1; - unsigned char timing_800x600_56: 1; - unsigned char timing_800x600_60: 1; - unsigned char timing_800x600_72: 1; - unsigned char timing_800x600_75: 1; - unsigned char timing_832x624_75: 1; - unsigned char timing_1024x768_87i: 1; - unsigned char timing_1024x768_60: 1; - unsigned char timing_1024x768_70: 1; - unsigned char timing_1024x768_75: 1; - unsigned char timing_1280x1024_75: 1; - } established_timings __attribute__ ((packed)); - struct { - unsigned char timing_1152x870_75: 1; - unsigned char reserved: 7; - } manufacturer_timings __attribute__ ((packed)); - struct { - u_int16_t xresolution: 8; - u_int16_t vfreq: 6; - u_int16_t aspect: 2; - } standard_timing[8] __attribute__ ((packed)); - union { - struct vbe_edid_detailed_timing detailed_timing[4]; - struct vbe_edid_monitor_descriptor monitor_descriptor[4]; - } monitor_details __attribute__ ((packed)); - unsigned char extension_flag; - unsigned char checksum; - unsigned char padding[128]; -} __attribute__ ((packed)); - -#define VBE_LINEAR_FRAMEBUFFER 0x4000 - -/* Get VESA information. */ -struct vbe_info *vbe_get_vbe_info(); - -/* Get information about a particular video mode, bitwise or with - VBE_LINEAR_FRAMEBUFFER to check if LFB version is supported. */ -struct vbe_mode_info *vbe_get_mode_info(u_int16_t mode); - -/* Check if EDID reads are supported, and do them. */ -int vbe_get_edid_supported(); -struct vbe_edid1_info *vbe_get_edid_info(); - -/* Get the current video mode, -1 on error. */ -int32_t vbe_get_mode(); -/* Set a new video mode, bitwise or with VBE_LINEAR_FRAMEBUFFER. */ -void vbe_set_mode(u_int16_t mode); - -/* Save/restore the SVGA state. Call free() on the state record when done. */ -const void *vbe_save_svga_state(); -void vbe_restore_svga_state(const void *state); - -/* Get the ranges of values suitable for the attached monitor. */ -void vbe_get_edid_ranges(struct vbe_edid1_info *edid, - unsigned char *hmin, unsigned char *hmax, - unsigned char *vmin, unsigned char *vmax); - -/* Get a list of modelines that will work with this monitor. */ -struct vbe_modeline *vbe_get_edid_modelines(); - -#endif |