aboutsummaryrefslogtreecommitdiffstats
path: root/po/cy.po
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-02-28 15:18:33 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-02-28 15:18:33 +0000
commit9c218d546ab5b5876fecb4e402a9ddfa8bf26cae (patch)
tree336aa0232b766c14550625ce11d5c6591ffe6dbc /po/cy.po
parent687df4d2faf70ecaf5ef3bd1f05e9607ed6ee1c6 (diff)
downloadrpmdrake-9c218d546ab5b5876fecb4e402a9ddfa8bf26cae.tar
rpmdrake-9c218d546ab5b5876fecb4e402a9ddfa8bf26cae.tar.gz
rpmdrake-9c218d546ab5b5876fecb4e402a9ddfa8bf26cae.tar.bz2
rpmdrake-9c218d546ab5b5876fecb4e402a9ddfa8bf26cae.tar.xz
rpmdrake-9c218d546ab5b5876fecb4e402a9ddfa8bf26cae.zip
finish using urpmi callbacks when updating sources
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po25
1 files changed, 19 insertions, 6 deletions
diff --git a/po/cy.po b/po/cy.po
index ab12aeb0..2f19a61d 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-12-05 19:52+0100\n"
+"POT-Creation-Date: 2003-02-28 16:12+0100\n"
"PO-Revision-Date: 2003-02-23 22:10-0000\n"
"Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
"Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -1000,6 +1000,11 @@ msgstr "Arhoswch, diweddaru cyfrwng..."
#: ../rpmdrake.pm:1
#, c-format
+msgid " done."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
msgid "Download of `%s', speed:%s"
msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
@@ -1010,17 +1015,22 @@ msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
#: ../rpmdrake.pm:1
#, c-format
-msgid "Local file `%s' already up to date"
-msgstr "Ffeil lleol '%s' wedi ei ddiweddaru"
+msgid "Starting download of `%s'..."
+msgstr "Cychwyn llwytho '%s' i lawr..."
#: ../rpmdrake.pm:1
#, c-format
-msgid "Starting download of `%s'..."
-msgstr "Cychwyn llwytho '%s' i lawr..."
+msgid "Examining distant file of source `%s'..."
+msgstr ""
#: ../rpmdrake.pm:1
#, c-format
-msgid "Copying local file `%s'..."
+msgid "Examining file of source `%s'..."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for source `%s'..."
msgstr "Copïo ffeil leol '%s'..."
#: ../rpmdrake.pm:1
@@ -1248,3 +1258,6 @@ msgstr "Tynnu Meddalwedd"
#: data/rpmdrake-sources.desktop.in.h:1
msgid "Software Sources Manager"
msgstr "Rheolwr Ffynhonnell Meddalwedd"
+
+#~ msgid "Local file `%s' already up to date"
+#~ msgstr "Ffeil lleol '%s' wedi ei ddiweddaru"
generated by cgit v1.2.1 (git 2.21.0) at 2024-12-01 10:13:50 +0000
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/pkgs.pm2
-rw-r--r--perl-install/share/list1
-rw-r--r--perl-install/share/list.sparc1
-rwxr-xr-xperl-install/standalone/mousedrake7
-rwxr-xr-xupdate_kernel2
12 files changed, 26 insertions, 12 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 52169605a..78337e540 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-09 Pixel <pixel@mandrakesoft.com>
+
+ * standalone/mousedrake: add handling of XF86Config-4
+
+ * any.pm (setupBootloader): fix bug (was adding 2 glob_'s)
+
2000-05-08 Pixel <pixel@mandrakesoft.com>
* install2.pm (main): move the touch of some files here to please linuxconf
diff --git a/perl-install/any.pm b/perl-install/any.pm
index f4133399c..2afc3b251 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -139,10 +139,10 @@ You can add some more or change the existing ones."),
my @l;
if ($e->{type} eq "image") {
@l = (
-_("Image") => { val => \$e->{kernel_or_dev}, list => [ eval { map { s/$prefix// } glob_("$prefix/boot/vmlinuz*") } ] },
+_("Image") => { val => \$e->{kernel_or_dev}, list => [ eval { map { s/$prefix//; $_ } glob_("$prefix/boot/vmlinuz*") } ] },
_("Root") => { val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert },
_("Append") => \$e->{append},
-_("Initrd") => { val => \$e->{initrd}, list => [ eval { map { s/$prefix// } glob_("$prefix/boot/initrd*") } ] },
+_("Initrd") => { val => \$e->{initrd}, list => [ eval { map { s/$prefix//; $_ } glob_("$prefix/boot/initrd*") } ] },
_("Read-write") => { val => \$e->{'read-write'}, type => 'bool' }
);
@l = @l[0..5] unless $::expert;
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 1b2289f4d..2a0c048a4 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -63,7 +63,7 @@ sub entry {
'c' => [22,0], 'd' => [22,64],
'e' => [33,0], 'f' => [33,64],
'g' => [34,0], 'h' => [34,64],
- }}{$1} or die "unknown device $_" };
+ }}{$1} or die "unknown device $_ (caller is " . caller . ")" };
$minor += $2 || 0;
} elsif (/^ram(.*)/) {
$type = c::S_IFBLK();
@@ -111,8 +111,8 @@ sub entry {
"sbpcd" => [ c::S_IFBLK(), 25, 0 ],
"sjcd" => [ c::S_IFBLK(), 18, 0 ],
"tty" => [ c::S_IFCHR(), 5, 0 ],
- "usbmouse"=> [ c::S_IFCHR(), 10, 32], #- aka hidbp-mse-0
-# "usbmouse"=> [ c::S_IFCHR(), 13, 32], #- aka /dev/usb/usbmouse0
+# "usbmouse"=> [ c::S_IFCHR(), 10, 32], #- aka hidbp-mse-0
+ "usbmouse"=> [ c::S_IFCHR(), 13, 32], #- aka /dev/usb/usbmouse0
"zero" => [ c::S_IFCHR(), 1, 5 ],
}}{$_} or die "unknown device $_" };
}
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index c787561a8..230db934d 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -247,6 +247,7 @@ sub mount_part($;$$) {
$mntpoint = "/initrd/loopfs";
}
mount(devices::make($dev), $mntpoint, type2fs($part->{type}), $rdonly);
+ rmdir "$mntpoint/lost+found";
}
}
$part->{isMounted} = $part->{isFormatted} = 1; #- assume that if mount works, partition is formatted
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 89205de2a..ef54c8dcd 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -232,7 +232,7 @@ sub getAvailableSpace {
#- 50mb may be a good choice to avoid almost all problem of insuficient space left...
my $minAvailableSize = 50 * sqr(1024);
- int (getAvailableSpace_mounted($o->{prefix}) || getAvailableSpace_raw($o->{fstab})) * 512 / 1.07 - $minAvailableSize;
+ int ((getAvailableSpace_mounted($o->{prefix}) || getAvailableSpace_raw($o->{fstab}) * 512 / 1.07) - $minAvailableSize);
}
sub getAvailableSpace_mounted {
@@ -240,7 +240,7 @@ sub getAvailableSpace_mounted {
my $buf = ' ' x 20000;
syscall_('statfs', "$prefix/usr", $buf) or return;
my (undef, $blocksize, $size, undef, $free, undef) = unpack "L2L4", $buf;
- ($free || 1) * $blocksize / 512;
+ ($free || 1) * $blocksize;
}
sub getAvailableSpace_raw {
my ($fstab) = @_;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index f299af08d..bdc99a1d1 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -240,7 +240,7 @@ sub choosePackages {
pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || next) foreach @{$o->{default_packages}};
add2hash_($o, { compssListLevel => $::expert ? 90 : 80 }) unless $::auto_install;
- pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $o->{compssListLevel}, $available, $o->{installClass}) if exists $o->{compssListLevel};
+ pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $o->{compssListLevel}, $availableCorrected, $o->{installClass}) if exists $o->{compssListLevel};
$availableCorrected;
}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 97618c1d6..8da8c32b5 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -970,7 +970,7 @@ _("Removable media automounting") => { val => \$o->{useSupermount}, type => 'boo
$::expert ? (
_("Clean /tmp at each boot") => { val => \$u->{CLEAN_TMP}, type => 'bool' },
) : (),
- $o->{pcmcia} ? (
+ $o->{pcmcia} && $::expert ? (
_("Enable multi profiles") => { val => \$u->{profiles}, type => 'bool' },
) : (
_("Enable num lock at startup") => { val => \$u->{numlock}, type => 'bool' },
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 2560bcaf2..f591e9bbb 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -171,7 +171,7 @@ sub extractHeaders($$$) {
#- size and correction size functions for packages.
my $A = -1.922e-05;
my $B = 1.18411;
-my $C = 33.2 + 18; #- 18 added cuz of hdlist's
+my $C = 23.2; #- doesn't take hdlist's into account as getAvailableSpace will do it.
sub correctSize { max($_[0], ($A * $_[0] + $B) * $_[0] + $C) } #- size correction in MB.
sub invCorrectSize { min($_[0], (sqrt(sqr($B) + 4 * $A * ($_[0] - $C)) - $B) / 2 / $A) } #- size correction in MB.
diff --git a/perl-install/share/list b/perl-install/share/list
index 5a966b940..f99a16d82 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -17,6 +17,7 @@
/sbin/mkreiserfs
/sbin/raidstart
/usr/X11R6/lib/X11/Cards
+/usr/X11R6/lib/modules/xf86Wacom.so
/usr/bin/bzip2
/usr/bin/extract_archive
/usr/bin/perl
diff --git a/perl-install/share/list.sparc b/perl-install/share/list.sparc
index d35feefa2..45fd1d34b 100644
--- a/perl-install/share/list.sparc
+++ b/perl-install/share/list.sparc
@@ -70,4 +70,3 @@
/usr/X11R6/bin/XF86_FBDev
/usr/X11R6/bin/XF86_Mach64
/usr/X11R6/bin/xmodmap
-/usr/X11R6/lib/modules/xf86Wacom.so
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index c05ad5d99..7ac3b927d 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -43,11 +43,18 @@ mouse::write('', $mouse);
modules::write_conf("/etc/conf.modules") if $mouse->{device} eq "usbmouse" && !$::testing;
my $f = "/etc/X11/XF86Config";
+my $g = "/etc/X11/XF86Config-4";
substInFile {
if (/^Section "Pointer"/ .. /^EndSection/) {
s|^(\s*Protocol\s+).*|$1"$mouse->{XMOUSETYPE}"|;
s|^(\s*Device\s+).*|$1"/dev/mouse"|;
}
} $f if -e $f && !$::testing;
+substInFile {
+ if (/^Identifier "Mouse1"/ .. /^EndSection/) {
+ s|^(\s*Option\s+"Protocol"\s+).*|$1"$mouse->{XMOUSETYPE}"|;
+ s|^(\s*Option\s+"Device"\s+).*|$1"/dev/mouse"|;
+ }
+} $g if -e $g && !$::testing;
$in->exit(0);
diff --git a/update_kernel b/update_kernel
index 7b8eb2d71..28f959cf8 100755
--- a/update_kernel
+++ b/update_kernel
@@ -18,7 +18,7 @@ f "pcmcia|network" ; PCMCIA_DRIVERS=$v
NETWORK_MODULES="$FSMODULES $NETWORK_DRIVERS"
CDROM_MODULES=" $FSMODULES $CD_DRIVERS"
HD_MODULES=" $FSMODULES $SCSI_DRIVERS"
-PCMCIA_MODULES=" $FSMODULES $PCMCIA_DRIVERS af_packet.o isofs.o scsi_mod.o sr_mod.o sd_mod.o cdrom.o ide-cd.o ide-mod.o ide-probe.o ide-disk.o"
+PCMCIA_MODULES=" $FSMODULES $PCMCIA_DRIVERS af_packet.o isofs.o scsi_mod.o sr_mod.o sd_mod.o cdrom.o ide-cd.o ide-mod.o ide-probe.o ide-disk.o serial.o"
NOT_USEFULL_IN_STAGE1="nls_*.o parport_probe.o raid*.o serial.o smbfs.o usb-*.o"
PCMCIA_INSTALLMODULES="pcmcia_core.o tcic.o ds.o i82365.o"
generated by cgit v1.2.1 (git 2.21.0) at 2024-12-01 10:13:50 +0000