This commit was manufactured by cvs2svn to create tag 'MDK-10_2'.MDK-10_2

5 files changed, 402 insertions, 312 deletions

diff --git a/globetrotter/fix-broken-hd.diff b/globetrotter/fix-broken-hd.diff
new file mode 100644
index 000000000..6ae7fa491
--- /dev/null
+++ b/globetrotter/fix-broken-hd.diff
@@ -0,0 +1,127 @@
+--- make_live	2005-05-25 17:42:35.000000000 +0200
++++ make_live	2005-05-25 17:46:41.000000000 +0200
+@@ -8,6 +8,7 @@
+ use standalone;
+ use interactive;
+ use common;
++use detect_devices;
+ use partition_table;
+ use fsedit;
+ use fs;
+@@ -321,8 +322,116 @@
+ 
+ $::prefix = $ARGV[0] || '/tmp/live_tree';
+ 
++#===========================================================================
++# Fix disk if it's a bogus one:
++
++my @packages2delete = qw(
++	Mandrake/RPMS/uqm-data-0.3-1mdk.noarch.rpm
++
++	Mandrake/RPMS2/kernel24-tmb-2.4.25-6.tmb.1mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel24-tmb-2.4.25-7.tmb.1mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel24-tmb-2.4.25-7.tmb.2mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel24-tmb-enterprise-2.4.25-6.tmb.1mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel24-tmb-enterprise-2.4.25-7.tmb.1mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel24-tmb-enterprise-2.4.25-7.tmb.2mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel24-tmb-i686-up-4GB-2.4.25-6.tmb.1mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel24-tmb-i686-up-4GB-2.4.25-7.tmb.1mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel24-tmb-i686-up-4GB-2.4.25-7.tmb.2mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel24-tmb-source-2.4.25-7.tmb.2mdk.i586.rpm
++
++	Mandrake/RPMS2/kernel-tmb-2.6.4-1.tmb.8mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel-tmb-enterprise-2.6.4-1.tmb.8mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel-tmb-i686-up-4GB-2.6.4-1.tmb.8mdk-1-1mdk.i586.rpm
++	Mandrake/RPMS2/kernel-tmb-source-2.6.4-1.tmb.8mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-2.4.25.5mdk-3-7mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-2.6.3.15mdk-3-8mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-enterprise-2.4.25.5mdk-3-7mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-enterprise-2.6.3.15mdk-3-8mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-i686-up-4GB-2.4.25.5mdk-3-7mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-i686-up-4GB-2.6.3.15mdk-3-8mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-p3-smp-64GB-2.4.25.5mdk-3-7mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-p3-smp-64GB-2.6.3.15mdk-3-8mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-smp-2.4.25.5mdk-3-7mdk.i586.rpm
++	Mandrake/RPMS2/kernel-win4lin-smp-2.6.3.15mdk-3-8mdk.i586.rpm
++	);
++
++# misc paths;
++my $pkgs_mount_path = "/mnt/mdk_pkgs";
++my $rescue_path = "/rescue-glob";
++my $cd_mount_path = "/mnt/cdrom-glob";
++
++# enable to retry fixing partitions if fixing failed:
++my $__need2befixed_mark = "Mandrake/RPMS/NEED_TO_BE_FIXED";
++my $need2befixed_mark = "$pkgs_mount_path/__need2befixed_mark";
++
++{
++    mkdir_p($pkgs_mount_path);
++
++    my $cleaner = before_leaving {
++	if (my $err = $@) {
++	    print "\n>> an error happened: $err\n";
++	}
++	print "Cleaning on end of fixing\n";
++	eval { fs::umount($_) } foreach $pkgs_mount_path, $cd_mount_path;
++	undef $@; # do not propagate fs::umount exceptions
++    };
++
++    print "Checking if the packages partition needs to be fixed\n";
++    # system("mount /dev/$pkg_dev->{device} $pkgs_mount_path");
++    fs::mount($pkg_dev->{device}, $pkgs_mount_path, 'ext3');
++    # my $pkgs_mount_path = "/home/qa/broken"; # FIXME: TESTING
++
++    if (any { -e "$pkgs_mount_path/$_" } @packages2delete, $__need2befixed_mark) {
++	print "Preparing to fixing the partition packages...\n";
++	touch($need2befixed_mark);
++
++	# Cleaning the packages so that we get back some free space:
++	unlink("$pkgs_mount_path/$_") foreach @packages2delete;
++
++
++	# Lookup rescue CD:
++
++	my $cdrom_path;
++
++	my @cdroms = map { $_->{device} } detect_devices::cdroms();
++
++	mkdir_p($cd_mount_path);
++
++	my ($found, $cdrom_dev);
++
++	foreach my $cdrom (@cdroms) {
++	    eval { fs::mount($cdrom, $cd_mount_path, 'iso9660', 1) } or next; # nicely handle empty drives
++	      if (-d "$cd_mount_path/$rescue_path") {
++		  $cdrom_dev = $cdrom;
++		  $found = 1;
++		  last;
++	      }
++	    fs:umount($cd_mount_path);
++	  }
++	undef $@; # do not propagate fs::mount exceptions
++
++	if ($found) {
++	    warn "Found rescue CDROM on $cdrom_dev\n";
++	} else {
++	    warn "I failed to found the rescue CDROM\nPress enter to return to the menu";
++	    <STDIN>;
++	    # TODO : replace by sg else if merged within make_live
++	    exit(0);
++	}
++
++
++	print "Fixing the partition packages... in progress\n";
++	# Copy Mandrake/base with the newly generated hdlists from the old repositery;
++	cp_af($_, "$pkgs_mount_path/Mandrake/base") foreach glob_("$cd_mount_path/$rescue_path/Mandrake/base/*");
++	cp_af($_, "$pkgs_mount_path/Mandrake/RPMS") foreach glob_("$cd_mount_path/$rescue_path/Mandrake/pkgs/*");
++	unlink($need2befixed_mark);
++	print "Fixing the partition packages... done\n";
++    }
++}
++
++
+ #===========================================================================
+ # Building the disk:
+ -d $::prefix or mkdir $::prefix;
+ print "Making live in $::prefix directory.\n";
+ 
diff --git a/globetrotter/make_live b/globetrotter/make_live
index e06960d3f..0752165e7 100755
--- a/globetrotter/make_live
+++ b/globetrotter/make_live
@@ -59,7 +59,7 @@ sub get_hds() {
 	my $all_hds = fsedit::get_hds();
      my $other;
 	($all_hds->{hds}, $other) = partition { $_->{usb_description} eq 'LaCie|LaCie Hard Drive USB' } @{$all_hds->{hds}};
-	die "I did not found any LaCie disk\n" if !$all_hds->{hds}[0];
+     my_exit("Your disk cannot be restored because it cannot be found!") if !$all_hds->{hds}[0];
 	$all_hds, $all_hds->{hds}[0]; # $other
 }
 
@@ -103,6 +103,21 @@ sub formatdisk {
         run_program::get_stdout('service', 'usb', 'start');
     }
 
+sub my_exit {
+    my ($msg) = @_;
+    print "\n\n==============================================================\n\n";
+    print $msg;
+    print "\n\nPress <RETURN> to return back to menu\n\n";
+    print "==============================================================\n\n";
+    <STDIN>;
+    exit(0);
+}
+
+sub find_partition {
+  my ($label, @parts) = @_;
+  find { member(fs::type2fs($_), qw(ext2 ext3)) && chomp_(`e2label /dev/$_->{device} 2>/dev/root`) eq $label } @parts;
+}
+
 my $pkg_dev;
 if ($rescue) {
     system("mount -t tmpfs none /tmp");
@@ -116,15 +131,23 @@ if ($rescue) {
     my ($all_hds, $hd, $other) = get_hds();
     print "Looking for the package partition\n";
     my @parts = partition_table::get_normal_parts($hd);
-    my $pkg_dev = find { member(fs::type2fs($_), qw(ext2 ext3)) && chomp_(`e2label /dev/$_->{device} 2>/dev/root`) eq "MDK-PKGS" } @parts;
-    die "I cannot find the package partition which is needed in order to restore the system!" if is_empty_hash_ref($pkg_dev) || !$pkg_dev->{device};
-    my $root = find { member(fs::type2fs($_), qw(ext2 ext3)) && chomp_(`e2label /dev/$_->{device} 2>/dev/root`) eq "MDK-ROOT" } @parts;
+    $pkg_dev = find_partition("MDK-PKGS", @parts);
+    #die "I cannot find the package partition which is needed in order to restore the system!"
+    my_exit("Your disk cannot be restored because there is no more a restore partition!") if is_empty_hash_ref($pkg_dev) || !$pkg_dev->{device};
+    print "Packages partition was found on $pkg_dev->{device}\n";
+    my $root = find_partition("MDK-ROOT", @parts);
     $root = find { $_->{device} eq "sda1" } @parts if is_empty_hash_ref($root);
-    die "I cannot find any hard disk to restore!" if is_empty_hash_ref($root) || !$root->{device};
+    #my_exit("I cannot find any hard disk to restore!") if is_empty_hash_ref($root) || !$root->{device};
+    my_exit("Your disk cannot be restored because there is no more a root partition!") if is_empty_hash_ref($root) || !$root->{device};
+    print "\nPlease wait, disk is being checked, this can take quite some time\n\n";
+    run_program::run("e2fsck -C0 -y $_") foreach map {
+      my $p = find_partition($_, @parts);
+      if_($p, $p->{device}); # handle lost labels
+    } "MDK-PKGS", "MDK-HOME"; # MDK-ROOT"
     print "Please wait, disk reinstallation is in progress, this can take quite some time\n";
     print "Formating $root->{device}\n";
     system("mkfs.ext2 -j /dev/$root->{device} > /dev/null\n");
-
+    run_program::run('tune2fs', '-L', "MDK-ROOT", "/dev/$root->{device}"); # prevent lost label if restore aborts before the end
 }
 
 sub installPackages() {
@@ -166,8 +189,8 @@ sub installPackages() {
 	#my @l = glob_('/export/Mandrake/RPMS/kernel-enterprise-2.6*');
 	my @l = glob_('/export/Mandrake/RPMS/kernel-2.6*');
 	@l >= 1 or die  "can't find kernel";
-	@l <= 1 or die "too many kernels";
-	first(`rpm -qp --qf '%{name}' $l[0]` =~ /kernel-(.*)/);
+	@l <= 1 or warn "too many kernels";
+	first(`rpm -qp --qf '%{name}' $l[-1]` =~ /kernel-(.*)/);
     };
 
     my $kernel_version = c::kernel_version();
@@ -275,6 +298,27 @@ sub config_X_proprietary_drivers() {
     substInFile { $_ = '' if $_ eq 'nvidia' } "$::prefix/etc/modules";
 }
 
+my $fstab;
+
+my $cleaner = before_leaving {
+  if (my $err = $@) {
+	  print "\n>> an error happened: $err\n";
+  }
+  print "Cleaning on exiting\n";
+  print "- Umounting partitions:\n";
+  print "\tumounting /proc\n";
+  eval { fs::umount("$::prefix/proc") };
+  # fs::umount("$::prefix/$_") foreach 'mnt/packages', 'mnt/share', 'home', '';
+  if ($fstab) {
+    print "\tumounting everything else\n";
+      eval { fs::umount_all($fstab, $::prefix) } or system("umount $::prefix"); 
+  }
+  print "\tumounting /tmp\n";
+  eval { fs::umount("/tmp") } if $rescue;
+  print "Cleaning done\n";
+};
+
+
 $::prefix = $ARGV[0] || '/tmp/live_tree';
 
 -d $::prefix or mkdir $::prefix;
@@ -299,7 +343,7 @@ my ($root) = grep { $_->{mntpoint} eq "/" } @parts;
 print "Root is $root->{device}\n";
 run_program::run('tune2fs', '-L', "MDK-ROOT", "/dev/$root->{device}");
 # fs::mount_part($root, $::prefix);
-my $fstab = [ fsedit::get_all_fstab($all_hds) ];
+$fstab = [ fsedit::get_all_fstab($all_hds) ];
 
 # we need to mount every fs we want to see into /etc/fstab !!!
 fs::mount_part($_, $::prefix) foreach sort { $a->{mntpoint} cmp $b->{mntpoint} } @$fstab;
@@ -457,5 +501,4 @@ run_program::rooted($::prefix, 'urpmi.addmedia', '-h', 'contrib', 'file:///mnt/p
 # for fast test replaying:
 run_program::rooted($::prefix, 'tar', 'cfj', '/root/etc.tar.bz2', '/etc');
 
-system("umount $::prefix/proc");
-eval { fs::umount_all($fstab, $::prefix) } or system("umount $::prefix"); 
+my_exit("Your disk was succesfully restored!\nYou can now reboot your machine.");
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index 87a68935c..afc482346 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -150,7 +150,7 @@ drakx11: menu-driven program which walks you through setting up
 your X server; it autodetects both monitor and video card if
 possible
 
-drakxservices: SysV services and dameaons configurator
+drakxservices: SysV services and daemons configurator
 
 drakxtv: auto configure tv card for xawtv grabber
 
@@ -453,7 +453,8 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak
   o fix sagem modem config
   o try to use the country specific CMV for sagem modems
 - harddrake:
-  o do not list hardware controllers in unknown section
+  o list hardware RAID controllers in their own section (so that they do not
+    appear in the unknown one)
   o ensure we detect all known SATA controllers and all known sound cards
   o fix optical mice detection (#15082)
 - net_applet: really load network configuration at start (blino)
diff --git a/perl-install/list.sparc b/perl-install/list.sparc
deleted file mode 100644
index 448e0b63e..000000000
--- a/perl-install/list.sparc
+++ /dev/null
@@ -1,74 +0,0 @@
-/bin/ash
-/bin/cpio
-/lib/libnss_nis.so.2
-/lib/libnss_files.so.2
-/lib/libnss_dns.so.2
-/lib/libresolv.so.2
-/etc/protocols
-/sbin/fdisk
-/sbin/ifport
-/sbin/insmod
-/sbin/mkraid
-/sbin/rmmod
-/sbin/mkdosfs
-/sbin/mke2fs
-/sbin/raidstart
-/usr/bin/bzip2
-/usr/bin/perl
-/usr/lib/libimlib-png.so
-/usr/lib/gtk/themes/engines/libpixmap.so
-/usr/lib/gtk/themes/engines/libpixmap.la
-/usr/lib/libimlib-png.so
-/usr/lib/perl5/5.00503/AutoLoader.pm
-/usr/lib/perl5/5.00503/Carp.pm
-/usr/lib/perl5/5.00503/Data/Dumper.pm
-/usr/lib/perl5/5.00503/Exporter.pm
-/usr/lib/perl5/5.00503/FileHandle.pm
-/usr/lib/perl5/5.00503/SelectSaver.pm
-/usr/lib/perl5/5.00503/SelfLoader.pm
-/usr/lib/perl5/5.00503/Symbol.pm
-/usr/lib/perl5/5.00503/Time/Local.pm
-/usr/lib/perl5/5.00503/dumpvar.pl
-/usr/lib/perl5/5.00503/sparc-linux/Config.pm
-/usr/lib/perl5/5.00503/sparc-linux/DynaLoader.pm
-/usr/lib/perl5/5.00503/sparc-linux/Fcntl.pm
-/usr/lib/perl5/5.00503/sparc-linux/auto/Fcntl/Fcntl.bs
-/usr/lib/perl5/5.00503/sparc-linux/auto/Fcntl/Fcntl.so
-/usr/lib/perl5/5.00503/sparc-linux/IO/File.pm
-/usr/lib/perl5/5.00503/sparc-linux/IO/Handle.pm
-/usr/lib/perl5/5.00503/sparc-linux/IO/Seekable.pm
-/usr/lib/perl5/5.00503/sparc-linux/IO/Socket.pm
-/usr/lib/perl5/5.00503/sparc-linux/Socket.pm
-/usr/lib/perl5/5.00503/sparc-linux/_h2ph_pre.ph
-/usr/lib/perl5/5.00503/sparc-linux/asm/unistd.ph
-/usr/lib/perl5/5.00503/sparc-linux/asm-sparc/unistd.ph
-/usr/lib/perl5/5.00503/sparc-linux/asm-sparc64/unistd.ph
-/usr/lib/perl5/5.00503/sparc-linux/auto/Data/Dumper/Dumper.bs
-/usr/lib/perl5/5.00503/sparc-linux/auto/Data/Dumper/Dumper.so
-/usr/lib/perl5/5.00503/sparc-linux/auto/IO/IO.so
-/usr/lib/perl5/5.00503/sparc-linux/auto/Socket/Socket.bs
-/usr/lib/perl5/5.00503/sparc-linux/auto/Socket/Socket.so
-/usr/lib/perl5/5.00503/sparc-linux/bits/syscall.ph
-/usr/lib/perl5/5.00503/sparc-linux/sys/syscall.ph
-/usr/lib/perl5/5.00503/sparc-linux/syscall.ph
-/usr/lib/perl5/5.00503/lib.pm
-/usr/lib/perl5/5.00503/overload.pm
-/usr/lib/perl5/5.00503/strict.pm
-/usr/lib/perl5/5.00503/vars.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Gtk.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Gtk/Types.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/Cmd.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/Config.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP/A.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP/I.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP/dataconn.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/Netrc.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/auto/Gtk/Gtk.bs
-/usr/lib/perl5/site_perl/5.005/sparc-linux/auto/Gtk/Gtk.so
-/usr/lib/rpm/rpmrc
-/usr/X11R6/bin/XF86_FBDev
-/usr/X11R6/bin/XF86_Mach64
-/usr/X11R6/bin/Xsun
-/usr/X11R6/bin/xmodmap
-/usr/X11R6/lib/modules/xf86Wacom.so
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index 914d8f659..8992788f8 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX 9.2\n"
+"Project-Id-Version: DrakX 10.2\n"
 "POT-Creation-Date: 2005-02-24 14:10+0100\n"
-"PO-Revision-Date: 2005-04-12 12:16+0200\n"
+"PO-Revision-Date: 2005-04-14 18:49+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
 "MIME-Version: 1.0\n"
@@ -4835,9 +4835,9 @@ msgid "File already exists. Overwrite it?"
 msgstr "Ar restr a zo endeo. Rasklañ anezhañ ?"
 
 #: install_any.pm:1627
-#, fuzzy, c-format
+#, c-format
 msgid "Can not make screenshots before partitioning"
-msgstr "N'hellan ouzpennañ parzhadur ebet ken"
+msgstr "N'hellan ket sevel skrammpakeroù a-raok parzhañ"
 
 #: install_any.pm:1634
 #, fuzzy, c-format
@@ -5363,11 +5363,11 @@ msgid "in order to keep %s"
 msgstr ""
 
 #: install_steps_gtk.pm:344
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
 "it"
-msgstr "N'hellit ket dibab ar pakad-mañ peogwir n'eus ket a-walc'h a egor"
+msgstr "N'hellit ket dibab ar pakad-mañ peogwir n'eus ket a-walc'h a egor evit staliañ anezhañ"
 
 #: install_steps_gtk.pm:347
 #, c-format
@@ -5532,9 +5532,9 @@ msgid "License agreement"
 msgstr "Emglev an aotre"
 
 #: install_steps_interactive.pm:89
-#, fuzzy, c-format
+#, c-format
 msgid "Release Notes"
-msgstr "Gortozit mar plij"
+msgstr ""
 
 #: install_steps_interactive.pm:119
 #, c-format
@@ -5811,10 +5811,10 @@ msgid ""
 msgstr ""
 
 #: install_steps_interactive.pm:820
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "O taremprediñ ar melezour evit kaout roll ar pakadoù hegerz"
+msgstr "O taremprediñ al lec'hienn Mandrakelinux evit kaout roll ar pakadoù hegerz ..."
 
 #: install_steps_interactive.pm:839
 #, c-format
@@ -5824,7 +5824,7 @@ msgstr "O taremprediñ ar melezour evit kaout roll ar pakadoù hegerz ..."
 #: install_steps_interactive.pm:843
 #, c-format
 msgid "Unable to contact mirror %s"
-msgstr ""
+msgstr "Ne m'eus ket daremprediñ ar melezour %s"
 
 #: install_steps_interactive.pm:843
 #, c-format
@@ -6434,11 +6434,11 @@ msgid ""
 msgstr "Estoniek"
 
 #: keyboard.pm:226
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
-msgstr "Gresianek"
+msgstr "Faroesek"
 
 #: keyboard.pm:228
 #, c-format
@@ -8543,9 +8543,9 @@ msgid "Please test the mouse"
 msgstr "Testan ak logodenn, mar plij"
 
 #: mouse.pm:548
-#, fuzzy, c-format
+#, c-format
 msgid "To activate the mouse,"
-msgstr "Dibabit seurt ho logodenn, mar plij."
+msgstr "Da bevaat al logodenn,"
 
 #: mouse.pm:549
 #, c-format
@@ -9184,11 +9184,13 @@ msgid "Protocol"
 msgstr "Komenad"
 
 #: network/netconnect.pm:487
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Select your provider.\n"
 "If it is not listed, choose Unlisted."
-msgstr "Dibabit hor pourchaser.\n"
+msgstr ""
+"Dibabit hor pourchaser.\n"
+"Ma n'eo ket e-barzh ar roll, dibabit Unlisted."
 
 #: network/netconnect.pm:489 network/netconnect.pm:601
 #: network/netconnect.pm:757
@@ -9366,9 +9368,9 @@ msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
 #: network/netconnect.pm:893
-#, fuzzy, c-format
+#, c-format
 msgid "Encapsulation:"
-msgstr "Brav !"
+msgstr ""
 
 #: network/netconnect.pm:910
 #, c-format
@@ -9437,9 +9439,9 @@ msgstr ""
 "sifroù dekvel pikoù etrezo (da skouer 1.2.3.4)."
 
 #: network/netconnect.pm:1013
-#, fuzzy, c-format
+#, c-format
 msgid "Assign host name from DHCP address"
-msgstr "Dibabit seurt ho logodenn, mar plij."
+msgstr "Adtapout an anv ostiz eus ar chomlec'h DHCP"
 
 #: network/netconnect.pm:1014
 #, c-format
@@ -9613,9 +9615,9 @@ msgid ""
 msgstr ""
 
 #: network/netconnect.pm:1166 standalone/drakconnect:399
-#, fuzzy, c-format
+#, c-format
 msgid "Fragmentation"
-msgstr "Teuliadur"
+msgstr ""
 
 #: network/netconnect.pm:1167 standalone/drakconnect:400
 #, c-format
@@ -9779,9 +9781,9 @@ msgid "Internet connection"
 msgstr "Kevreadenn ouzh an internet"
 
 #: network/netconnect.pm:1326
-#, fuzzy, c-format
+#, c-format
 msgid "Configuration is complete, do you want to apply settings?"
-msgstr "Pe seurt enmont a vennit ouzhpennañ"
+msgstr "Echu eo ar gefluniadur, Ha fellout a ra deoc'h da arloañ ar gefluniadur-mañ ?"
 
 #: network/netconnect.pm:1336
 #, fuzzy, c-format
@@ -9954,9 +9956,9 @@ msgid ""
 msgstr "Lakait ur bladennig el lenner %s"
 
 #: network/tools.pm:187
-#, fuzzy, c-format
+#, c-format
 msgid "Floppy access error, unable to mount device %s"
-msgstr "Pelec'h e mennit marc'hañ an drobarzhell %s ?"
+msgstr "Fazi moned ouzh ar bladennig, ne m'eus ket mountañ an drobarzhell %s"
 
 #: partition_table.pm:397
 #, c-format
@@ -10326,9 +10328,9 @@ msgid "Multi-function device"
 msgstr ""
 
 #: printer/main.pm:457
-#, fuzzy, c-format
+#, c-format
 msgid "Prints into %s"
-msgstr "Fazi en ur skrivañ er restr %s"
+msgstr "Moulañ a ra da %s"
 
 #: printer/main.pm:460
 #, c-format
@@ -10351,9 +10353,9 @@ msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Servijer Novell « %s », moullerez « %s »"
 
 #: printer/main.pm:476
-#, fuzzy, c-format
+#, c-format
 msgid "Uses command %s"
-msgstr "Paour"
+msgstr "Implij a ra an urzhiad %s"
 
 #: printer/main.pm:478
 #, c-format
@@ -10364,7 +10366,7 @@ msgstr "URI : %s"
 #: printer/printerdrake.pm:2861
 #, c-format
 msgid "Raw printer (No driver)"
-msgstr ""
+msgstr "Moullerez diaoz (sturier ebet)"
 
 #: printer/main.pm:1176 printer/printerdrake.pm:205
 #: printer/printerdrake.pm:217
@@ -10885,9 +10887,9 @@ msgid ")"
 msgstr ")"
 
 #: printer/printerdrake.pm:858 printer/printerdrake.pm:2868
-#, fuzzy, c-format
+#, c-format
 msgid "Printer model selection"
-msgstr "Lugerezh ar voullerez"
+msgstr "Choaz gobari ar voullerez"
 
 #: printer/printerdrake.pm:859 printer/printerdrake.pm:2869
 #, c-format
@@ -11018,9 +11020,9 @@ msgid ""
 msgstr ""
 
 #: printer/printerdrake.pm:1085
-#, fuzzy, c-format
+#, c-format
 msgid "Auto-detect printers connected to this machine"
-msgstr "Dibarzhoù ar voullerez lpd a-bell"
+msgstr "Dinoiñ ent emgefreek ar moullerezioù hag a zo kevreet ouzh an ostiz-mañ"
 
 #: printer/printerdrake.pm:1088
 #, c-format
@@ -11033,9 +11035,9 @@ msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 
 #: printer/printerdrake.pm:1108
-#, fuzzy, c-format
+#, c-format
 msgid "No auto-detection"
-msgstr "Dinoiñ dre ardivink"
+msgstr "Ne dinoit dre ardivink ket"
 
 #: printer/printerdrake.pm:1173
 #, c-format
@@ -11206,7 +11208,7 @@ msgstr ""
 #: printer/printerdrake.pm:1326
 #, fuzzy, c-format
 msgid "Please choose the printer to which the print jobs should go."
-msgstr "Dibabit ouzh pe borzh a-steud eo luget ho modem, mar plij."
+msgstr "Dibabit ouzh pe voullerez a-steud eo luget ho modem, mar plij."
 
 #: printer/printerdrake.pm:1328
 #, c-format
@@ -11214,11 +11216,13 @@ msgid ""
 "Please choose the port that your printer is connected to or enter a device "
 "name/file name in the input line"
 msgstr ""
+"Dibabit ouzh pe borzh a-steud eo luget ho voullerez, mar plij pe roit an anv "
+"drobarzhell pe an anv restr e-barzh al linenn urzhiañ"
 
 #: printer/printerdrake.pm:1329
-#, fuzzy, c-format
+#, c-format
 msgid "Please choose the port that your printer is connected to."
-msgstr "Dibabit ouzh pe borzh a-steud eo luget ho modem, mar plij."
+msgstr "Dibabit ouzh pe borzh a-steud eo luget ho voullerez, mar plij."
 
 #: printer/printerdrake.pm:1331
 #, c-format
@@ -11247,14 +11251,13 @@ msgid "Remote lpd Printer Options"
 msgstr "Dibarzhoù ar voullerez lpd a-bell"
 
 #: printer/printerdrake.pm:1411
-#, fuzzy, c-format
+#, 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 ""
-"A-benn implijout ur steud moulañ lpd a-bell, ret eo deoc'h\n"
-"pourvezañ anv ostiz ar servijer moullañ hag anv as steud\n"
-"war ar servijer-se ma zlefe bezañ kaset an dleadoù moullañ."
+"A-benn implijout ur servijer moulañ lpd a-bell, ret eo deoc'h "
+"pourvezañ anv ostiz ar servijer moullañ hag anv ar voullerez ouzh ar servijer-mañ."
 
 #: printer/printerdrake.pm:1412
 #, c-format
@@ -11495,9 +11498,9 @@ msgid "Printer host name or IP"
 msgstr "Anv pe IP an oztiz ar voullerez"
 
 #: printer/printerdrake.pm:1927
-#, fuzzy, c-format
+#, c-format
 msgid "Refreshing Device URI list..."
-msgstr "O furmadiñ ar restr saveteiñ %s"
+msgstr "O adtresañ roll URI an trobarzhelloù ..."
 
 #: printer/printerdrake.pm:1930 printer/printerdrake.pm:1932
 #, c-format
@@ -11663,9 +11666,9 @@ msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
 #: printer/printerdrake.pm:2421
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring device..."
-msgstr "Kefluskañ a ra ..."
+msgstr "O kefluniañ an drobarzhell ..."
 
 #: printer/printerdrake.pm:2455
 #, c-format
@@ -11681,7 +11684,7 @@ msgstr "O lenn stlennvon ar voullerezioù ..."
 #: printer/printerdrake.pm:2674
 #, c-format
 msgid "Enter Printer Name and Comments"
-msgstr ""
+msgstr "Roit anv hag askelenn ar voullerez"
 
 #: printer/printerdrake.pm:2678 printer/printerdrake.pm:3965
 #, c-format
@@ -11952,9 +11955,9 @@ msgid ""
 msgstr ""
 
 #: printer/printerdrake.pm:3494
-#, fuzzy, c-format
+#, c-format
 msgid "Printer default settings"
-msgstr "Lugerezh ar voullerez"
+msgstr "Kefluniadur dre ziouer ar voullerez"
 
 #: printer/printerdrake.pm:3501
 #, c-format
@@ -13386,7 +13389,7 @@ msgstr ""
 #: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
-msgstr ""
+msgstr "Gwiriekaat checksum ar restroù SUID/SGID"
 
 #: security/l10n.pm:53
 #, c-format
@@ -15871,7 +15874,7 @@ msgstr "Maskl rannrouedad :"
 #: standalone/drakTermServ:1232
 #, c-format
 msgid "Broadcast Address:"
-msgstr ""
+msgstr "Chomlec'h skignañ :"
 
 #: standalone/drakTermServ:1239
 #, c-format
@@ -15886,12 +15889,12 @@ msgstr "Anv servijerioù"
 #: standalone/drakTermServ:1258
 #, c-format
 msgid "IP Range Start:"
-msgstr ""
+msgstr "Ar skeul IP kentañ :"
 
 #: standalone/drakTermServ:1259
 #, c-format
 msgid "IP Range End:"
-msgstr ""
+msgstr "Ar skeul IP diwezhañ :"
 
 #: standalone/drakTermServ:1301
 #, c-format
@@ -15899,9 +15902,9 @@ msgid "Append TS Includes To Existing Config"
 msgstr ""
 
 #: standalone/drakTermServ:1303
-#, fuzzy, c-format
+#, c-format
 msgid "Write Config"
-msgstr "Kefluniañ X"
+msgstr "Skrivañ ar gefluniadur"
 
 #: standalone/drakTermServ:1319
 #, c-format
@@ -15929,7 +15932,7 @@ msgstr "Lakait ur bladennig el lenner map plij :"
 #: standalone/drakTermServ:1478
 #, c-format
 msgid "Could not access the floppy!"
-msgstr ""
+msgstr "N'hellan ket tizhout ar bladennig !"
 
 #: standalone/drakTermServ:1480
 #, c-format
@@ -15944,17 +15947,17 @@ msgstr "Lenner pladennig hegerz ebet !"
 #: standalone/drakTermServ:1488
 #, c-format
 msgid "PXE image is %s/%s"
-msgstr ""
+msgstr "Ar skeudenn PXE zo %s/%s"
 
 #: standalone/drakTermServ:1490
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing %s/%s"
-msgstr "Fazi en ur skrivañ er restr %s"
+msgstr "Fazi en ur skrivañ %s/%s"
 
 #: standalone/drakTermServ:1500
 #, c-format
 msgid "Etherboot ISO image is %s"
-msgstr ""
+msgstr "Ar skeudenn ISO Etherboot a zo %s"
 
 #: standalone/drakTermServ:1502
 #, c-format
@@ -15964,7 +15967,7 @@ msgstr ""
 #: standalone/drakTermServ:1523
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
-msgstr ""
+msgstr "Ezhomm m'eus krouiñ  /etc/dhcpd.conf da gentañ !"
 
 #: standalone/drakTermServ:1683
 #, c-format
@@ -15989,7 +15992,7 @@ msgstr ""
 #: standalone/drakTermServ:1701
 #, c-format
 msgid "%s added to Terminal Server\n"
-msgstr ""
+msgstr "%s e oa ouzphenn ouzh ar servijer termenell\n"
 
 #: standalone/drakTermServ:1718
 #, c-format
@@ -16022,9 +16025,9 @@ msgid "I can not find needed image file `%s'."
 msgstr ""
 
 #: standalone/drakautoinst:41
-#, fuzzy, c-format
+#, c-format
 msgid "Auto Install Configurator"
-msgstr "Kefluniadur goude staliañ"
+msgstr "Keflunier ar staliadur emgefreek"
 
 #: standalone/drakautoinst:42
 #, c-format
@@ -16310,9 +16313,9 @@ msgid "Permission denied transferring %s to %s"
 msgstr ""
 
 #: standalone/drakbackup:645
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find %s on %s"
-msgstr "Fazi en ur zigeriñ %s evit skrivañ : %s"
+msgstr "Ne m'eus ket bet kavout %s e-barzh %s"
 
 #: standalone/drakbackup:649
 #, c-format
@@ -16400,7 +16403,7 @@ msgstr "Gwareziñ restroù all ..."
 #: standalone/drakbackup:1094
 #, c-format
 msgid "Hard Disk Backup Progress..."
-msgstr ""
+msgstr "Emaon o wareziñ ar bladenn ..."
 
 #: standalone/drakbackup:1099
 #, fuzzy, c-format
@@ -16456,14 +16459,14 @@ msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 
 #: standalone/drakbackup:1161
-#, fuzzy, c-format
+#, c-format
 msgid " Error while sending mail. \n"
-msgstr "Fazi en ur lenn ar restr %s"
+msgstr "Fazi en ur kas ar postel. \n"
 
 #: standalone/drakbackup:1191
 #, c-format
 msgid "Can not create catalog!"
-msgstr ""
+msgstr "Ne m'eus ket krouiñ ar c'hatalog !"
 
 #: standalone/drakbackup:1420
 #, c-format
@@ -16539,9 +16542,9 @@ msgid "Users"
 msgstr "Arveriadioù"
 
 #: standalone/drakbackup:1624
-#, fuzzy, c-format
+#, c-format
 msgid "Use network connection to backup"
-msgstr "Restr gwareziñ siek"
+msgstr "Implijit ur gevreadenn evit gwareziñ"
 
 #: standalone/drakbackup:1626
 #, c-format
@@ -16561,7 +16564,7 @@ msgstr ""
 #: standalone/drakbackup:1633
 #, c-format
 msgid "Transfer Now"
-msgstr ""
+msgstr "Kas bremañ"
 
 #: standalone/drakbackup:1635
 #, c-format
@@ -16579,9 +16582,9 @@ msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 
 #: standalone/drakbackup:1655
-#, fuzzy, c-format
+#, c-format
 msgid "Remember this password"
-msgstr "Tremenger ebet"
+msgstr "Enrollañ an tremenger-mañ"
 
 #: standalone/drakbackup:1671
 #, c-format
@@ -16591,17 +16594,17 @@ msgstr ""
 #: standalone/drakbackup:1762
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
-msgstr ""
+msgstr "Implijit ur CD-R/DVD-R evit gwareziñ"
 
 #: standalone/drakbackup:1765
-#, fuzzy, c-format
+#, c-format
 msgid "Choose your CD/DVD device"
-msgstr "Dibabit reizhadur ho stokellaoueg, mar plij."
+msgstr "Dibabit ment ho drobarzhell CD/DVD"
 
 #: standalone/drakbackup:1770
-#, fuzzy, c-format
+#, c-format
 msgid "Choose your CD/DVD media size"
-msgstr "Dibabit reizhadur ho stokellaoueg, mar plij."
+msgstr "Dibabit ment ho vedia CD/DVD"
 
 #: standalone/drakbackup:1777
 #, fuzzy, c-format
@@ -16615,14 +16618,14 @@ msgstr "Media CDRW"
 
 #
 #: standalone/drakbackup:1785
-#, fuzzy, c-format
+#, c-format
 msgid "Erase your RW media (1st Session)"
-msgstr "Klikit ouzh ur parzhadur mar plij"
+msgstr "Chetanñ ho vedia LS (Dalc'h kentañ)"
 
 #: standalone/drakbackup:1786
 #, c-format
 msgid " Erase Now "
-msgstr "Chetanñ bremañ"
+msgstr " Chetanñ bremañ "
 
 #: standalone/drakbackup:1792
 #, c-format
@@ -16640,19 +16643,19 @@ msgid "DVDRAM device"
 msgstr "Media DVDRAM"
 
 #: standalone/drakbackup:1827
-#, fuzzy, c-format
+#, c-format
 msgid "No CD device defined!"
-msgstr "Diuzit ar restr"
+msgstr "N'eus trobarzhell CD dibabet ebet !"
 
 #: standalone/drakbackup:1869
-#, fuzzy, c-format
+#, c-format
 msgid "Use tape to backup"
-msgstr "Restr gwareziñ siek"
+msgstr "Implijit ar seizenn evit gwareziñ"
 
 #: standalone/drakbackup:1872
 #, c-format
 msgid "Device name to use for backup"
-msgstr ""
+msgstr "Anv an drobarzhell da implij evit gwareziñ"
 
 #: standalone/drakbackup:1878
 #, c-format
@@ -16670,9 +16673,9 @@ msgid "Erase tape before backup"
 msgstr "Restr gwareziñ siek"
 
 #: standalone/drakbackup:1896
-#, fuzzy, c-format
+#, c-format
 msgid "Eject tape after the backup"
-msgstr "Restr gwareziñ siek"
+msgstr "Stlepel ar seizenn pa vez echu ar gwareziñ"
 
 #: standalone/drakbackup:1968
 #, fuzzy, c-format
@@ -16727,9 +16730,9 @@ msgstr "miziek"
 
 #: standalone/drakbackup:2061 standalone/drakbackup:2066
 #: standalone/drakbackup:2071
-#, fuzzy, c-format
+#, c-format
 msgid "custom"
-msgstr "Personelañ"
+msgstr "diouzhoc'h"
 
 #: standalone/drakbackup:2075
 #, c-format
@@ -16827,9 +16830,9 @@ msgid "Saturday"
 msgstr "Sadorn"
 
 #: standalone/drakbackup:2113
-#, fuzzy, c-format
+#, c-format
 msgid "Use daemon"
-msgstr "Anv arveriad"
+msgstr "Implij un diaoul"
 
 #: standalone/drakbackup:2117
 #, fuzzy, c-format
@@ -16867,9 +16870,9 @@ msgid "Weekday"
 msgstr "Deiz ar sizhun"
 
 #: standalone/drakbackup:2150
-#, fuzzy, c-format
+#, c-format
 msgid "Please choose the media for backup."
-msgstr "Diuzit ar yezh da implijout, mar plij."
+msgstr "Dibabit ar vedia evit gwareziñ, mar plij."
 
 #: standalone/drakbackup:2156
 #, fuzzy, c-format
@@ -16903,9 +16906,9 @@ msgid "Send mail report after each backup to:"
 msgstr ""
 
 #: standalone/drakbackup:2217
-#, fuzzy, c-format
+#, c-format
 msgid "SMTP server for mail:"
-msgstr "Ostiz ar servijer SMB"
+msgstr "Servijer SMTP evit ar posteloù :"
 
 #: standalone/drakbackup:2222
 #, c-format
@@ -16978,9 +16981,9 @@ msgid " (Default is all users)"
 msgstr "Moullerez lec'hel"
 
 #: standalone/drakbackup:2389
-#, fuzzy, c-format
+#, c-format
 msgid "Please choose what you want to backup"
-msgstr "Dibabit ar pakadoù a vennit staliañ, mar plij."
+msgstr "Dibabit petra'zo da wareziñ, mar plij"
 
 #: standalone/drakbackup:2390
 #, c-format
@@ -17140,7 +17143,7 @@ msgstr "\tImplijit ar restroù .backupignore\n"
 #: standalone/drakbackup:2528
 #, c-format
 msgid "\tSend mail to %s\n"
-msgstr ""
+msgstr "\tKas ur postel da %s\n"
 
 #: standalone/drakbackup:2529
 #, c-format
@@ -17152,7 +17155,7 @@ msgstr "\tOc'h implij ar servijer SMTP %s\n"
 msgid ""
 "\n"
 "- Daemon, %s via:\n"
-msgstr ""
+msgstr "\n- Diaoul, %s dre :\n"
 
 #: standalone/drakbackup:2532
 #, c-format
@@ -17167,7 +17170,7 @@ msgstr "\t-CD-R.\n"
 #: standalone/drakbackup:2534
 #, c-format
 msgid "\t-Tape \n"
-msgstr ""
+msgstr "\t- Bandenn\n"
 
 #: standalone/drakbackup:2535
 #, c-format
@@ -17210,7 +17213,7 @@ msgstr "- Assevel restroù ar reizhiad.\n"
 #: standalone/drakbackup:2549 standalone/drakbackup:2559
 #, c-format
 msgid "   - from date: %s %s\n"
-msgstr ""
+msgstr "   - eus an deizad : %s %s\n"
 
 #: standalone/drakbackup:2552
 #, c-format
@@ -17237,7 +17240,7 @@ msgstr "Dibabit ouzh pe borzh a-steud eo luget ho modem, mar plij."
 #: standalone/drakbackup:2748
 #, c-format
 msgid "Backup files are corrupted"
-msgstr ""
+msgstr "Siek eo ar restroù gwareziñ"
 
 #: standalone/drakbackup:2769
 #, c-format
@@ -17375,7 +17378,7 @@ msgstr ""
 #: standalone/drakbackup:3453
 #, c-format
 msgid "Backup files not found at %s."
-msgstr ""
+msgstr "N'eo ket bet kavet ar restr gwareziñ ouzh %s."
 
 #: standalone/drakbackup:3466
 #, c-format
@@ -17449,7 +17452,7 @@ msgstr "Red eo reuñ un anv ostiz"
 #: standalone/drakbackup:3514
 #, c-format
 msgid "Path or Module required"
-msgstr ""
+msgstr "Red eo reuñ un hent pe ur mollad"
 
 #: standalone/drakbackup:3527
 #, c-format
@@ -17482,9 +17485,9 @@ msgid "Custom Restore"
 msgstr "Neuziet"
 
 #: standalone/drakbackup:3786 standalone/drakbackup:3835
-#, fuzzy, c-format
+#, c-format
 msgid "Restore From Catalog"
-msgstr "Taolenn barzhañ saveteerezh"
+msgstr "Assevel eus ar c'hatalog"
 
 #: standalone/drakbackup:3807
 #, c-format
@@ -17504,7 +17507,7 @@ msgstr " hag emañ ar CD e-barzh an unvez"
 #: standalone/drakbackup:3811
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
-msgstr ""
+msgstr "Red eo reuñ"
 
 #: standalone/drakbackup:3827
 #, c-format
@@ -17527,9 +17530,9 @@ msgid "Restore Progress"
 msgstr "Adaozañ adalek ar restr"
 
 #: standalone/drakbackup:3980
-#, fuzzy, c-format
+#, c-format
 msgid "Build Backup"
-msgstr "Restr gwareziñ siek"
+msgstr "Sevel an diell"
 
 #: standalone/drakbackup:4013 standalone/drakbackup:4333
 #, c-format
@@ -17859,9 +17862,9 @@ msgid "DrakClock"
 msgstr "DrakClock"
 
 #: standalone/drakclock:39
-#, fuzzy, c-format
+#, c-format
 msgid "not defined"
-msgstr "n'eo ket kefluniet"
+msgstr "n'eo ket lakaet"
 
 #: standalone/drakclock:41
 #, c-format
@@ -17916,15 +17919,17 @@ msgid "Reset"
 msgstr "Deraouekaat"
 
 #: standalone/drakclock:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "We need to install ntp package\n"
 " to enable Network Time Protocol\n"
 "\n"
 "Do you want to install ntp?"
 msgstr ""
-"Bremanaet e tle bezañ ar pabak-mañ\n"
-"Ha sur oc'h e mennit e ziuzañ ?"
+"Ezhomm 'peus staliañ ar pabak ntp\n"
+" evit bevaat NTP\n"
+"\n"
+"Ha sur oc'h e staliit ntp ?"
 
 #: standalone/drakconnect:85
 #, c-format
@@ -17989,9 +17994,9 @@ msgid "Manage connections"
 msgstr "Meran liammoù"
 
 #: standalone/drakconnect:224
-#, fuzzy, c-format
+#, c-format
 msgid "Device selected"
-msgstr "Lemel ar steudad"
+msgstr "Trobarzhell dibabet"
 
 #: standalone/drakconnect:305
 #, c-format
@@ -18019,9 +18024,9 @@ msgid "DHCP"
 msgstr "DHCP"
 
 #: standalone/drakconnect:470
-#, fuzzy, c-format
+#, c-format
 msgid "Metric"
-msgstr "strishaat"
+msgstr "Metrik"
 
 #: standalone/drakconnect:493
 #, c-format
@@ -18044,9 +18049,9 @@ msgid "Use lock file"
 msgstr "Implijit ur restr prennañ"
 
 #: standalone/drakconnect:511
-#, fuzzy, c-format
+#, c-format
 msgid "Wait for dialup tone before dialing"
-msgstr "Gortoz e-pad an ton galv pa sifrenn"
+msgstr "Gortoz e-pad an ton galv goude sifrenn"
 
 #: standalone/drakconnect:514
 #, fuzzy, c-format
@@ -18650,7 +18655,7 @@ msgstr "Dibabit restr pe renkell ar nodrezh ha klikit ouzh « Ouzhpennañ »"
 #: standalone/drakfont:588
 #, c-format
 msgid "File Selection"
-msgstr "Diuzadenn ar restr"
+msgstr "Choazh ar restr"
 
 #: standalone/drakfont:604
 #, c-format
@@ -18713,9 +18718,9 @@ msgid "Install & convert Fonts"
 msgstr ""
 
 #: standalone/drakfont:762
-#, fuzzy, c-format
+#, c-format
 msgid "Post Install"
-msgstr "Staliañ"
+msgstr "Pa vez echu ar staliadur"
 
 #: standalone/drakfont:780
 #, c-format
@@ -18723,9 +18728,9 @@ msgid "Remove fonts on your system"
 msgstr "Lemel an nodrezhoù eus ho reizhiad"
 
 #: standalone/drakfont:781
-#, fuzzy, c-format
+#, c-format
 msgid "Post Uninstall"
-msgstr "Dilezel ar staliadur"
+msgstr "Goude an distaliadur"
 
 #: standalone/drakgw:58 standalone/drakgw:191
 #, fuzzy, c-format
@@ -18798,9 +18803,9 @@ msgid "disable"
 msgstr "marvaat"
 
 #: standalone/drakgw:157
-#, fuzzy, c-format
+#, c-format
 msgid "Disabling servers..."
-msgstr "O tinoiñ trobarzhelloù ..."
+msgstr "O varvaat ar servijerien ..."
 
 #: standalone/drakgw:172
 #, fuzzy, c-format
@@ -18824,7 +18829,7 @@ msgstr ""
 #: standalone/drakgw:236
 #, c-format
 msgid "Interface %s (using module %s)"
-msgstr ""
+msgstr "Etrefas %s (gant ar mollad %s)"
 
 #: standalone/drakgw:237
 #, c-format
@@ -18931,13 +18936,13 @@ msgid "Local Network adress"
 msgstr "Chomlec'h ar rouedad lec'hel"
 
 #: standalone/drakgw:323
-#, c-format
+#, c-format, fuzzy
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
 "Here you can select different options for the DHCP server configuration.\n"
 "If you do not know the meaning of an option, simply leave it as it is."
-msgstr ""
+msgstr "Kefluniadur ar servijer DHCP.\n\n"
 
 #: standalone/drakgw:327
 #, c-format
@@ -18957,12 +18962,12 @@ msgstr "Moullerez lec'hel"
 #: standalone/drakgw:330
 #, c-format
 msgid "The DHCP start range"
-msgstr ""
+msgstr "Ar skeul DHCP kentañ"
 
 #: standalone/drakgw:331
 #, c-format
 msgid "The DHCP end range"
-msgstr ""
+msgstr "Ar skeul DHCP diwezhañ"
 
 #: standalone/drakgw:332
 #, c-format
@@ -18977,7 +18982,7 @@ msgstr ""
 #: standalone/drakgw:334
 #, c-format
 msgid "Re-configure interface and DHCP server"
-msgstr ""
+msgstr "Adgefluniañ an etrefas hag ar servijer DHCP"
 
 #: standalone/drakgw:341
 #, c-format
@@ -18992,7 +18997,7 @@ msgstr ""
 #: standalone/drakgw:361
 #, c-format
 msgid "Configuring..."
-msgstr "Kefluskañ a ra ..."
+msgstr "O kefluskañ ..."
 
 #: standalone/drakgw:362
 #, c-format
@@ -19155,7 +19160,7 @@ msgstr "Kemmañ"
 #: standalone/drakperm:125
 #, c-format
 msgid "Edit current rule"
-msgstr ""
+msgstr "Aozañ ar reollen red"
 
 #: standalone/drakperm:242
 #, c-format
@@ -19299,9 +19304,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakpxe:143
-#, fuzzy, c-format
+#, c-format
 msgid "Please choose which network interface will be used for the dhcp server."
-msgstr "Dibabit ar porzh a-steud m'eo luget ho logodenn outañ, mar plij."
+msgstr "Dibabit an etrefas rouedad m'eo implijet ar servijer dhcp outañ, mar plij."
 
 #: standalone/drakpxe:144
 #, c-format
@@ -19321,12 +19326,12 @@ msgstr ""
 #: standalone/drakpxe:173
 #, c-format
 msgid "The DHCP start ip"
-msgstr ""
+msgstr "An IP DHCP kentañ"
 
 #: standalone/drakpxe:174
 #, c-format
 msgid "The DHCP end ip"
-msgstr ""
+msgstr "An IP DHCP diwezhañ"
 
 #: standalone/drakpxe:187
 #, c-format
@@ -19339,9 +19344,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakpxe:192
-#, fuzzy, c-format
+#, c-format
 msgid "Installation image directory"
-msgstr "Kefluniadur"
+msgstr "Renkell ar skeudennoù staliadur"
 
 #: standalone/drakpxe:196
 #, c-format
@@ -19364,9 +19369,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakpxe:215
-#, fuzzy, c-format
+#, c-format
 msgid "Location of auto_install.cfg file"
-msgstr "O krouiñ ur bladennig staliañ emgefreek"
+msgstr "Lec'hiadur ar restr auto_install.cfg"
 
 #: standalone/drakroam:137
 #, c-format
@@ -19627,9 +19632,9 @@ msgid "first step creation"
 msgstr "Dibarzhoù ar voullerez lpd a-bell"
 
 #: standalone/draksplash:71
-#, fuzzy, c-format
+#, c-format
 msgid "final resolution"
-msgstr "Spister"
+msgstr "spister diwezhañ"
 
 #: standalone/draksplash:72
 #, c-format
@@ -19647,9 +19652,9 @@ msgid "Browse"
 msgstr "Ergerzhet"
 
 #: standalone/draksplash:93 standalone/draksplash:158
-#, fuzzy, c-format
+#, c-format
 msgid "Configure bootsplash picture"
-msgstr "Kefluniañ servijoù"
+msgstr "Kefluniañ ho skeudenn loc'hañ"
 
 #: standalone/draksplash:96
 #, c-format
@@ -19876,9 +19881,9 @@ msgid "Port:"
 msgstr "Porzh :"
 
 #: standalone/drakups:149
-#, fuzzy, c-format
+#, c-format
 msgid "The port on which is connected your ups"
-msgstr "Dibabit ar porzh a-steud m'eo luget ho logodenn outañ, mar plij."
+msgstr "Ar porzh a-steud m'eo luget ho ups outañ"
 
 #: standalone/drakups:156
 #, c-format
@@ -19963,9 +19968,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakvpn:105
-#, fuzzy, c-format
+#, c-format
 msgid "Disabling VPN..."
-msgstr "O tinoiñ trobarzhelloù ..."
+msgstr "O varvaat ar VPN ..."
 
 #: standalone/drakvpn:114
 #, c-format
@@ -19975,7 +19980,7 @@ msgstr "Marv eo ar gevreadenn VPN bremañ."
 #: standalone/drakvpn:121
 #, c-format
 msgid "VPN connection currently disabled"
-msgstr ""
+msgstr "Marv eo ar gevreadenn VPN bremañ."
 
 #: standalone/drakvpn:122
 #, c-format
@@ -20086,9 +20091,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakvpn:325 standalone/drakvpn:685
-#, fuzzy, c-format
+#, c-format
 msgid "%s entries"
-msgstr ", %s rann"
+msgstr "%s bouetadur"
 
 #: standalone/drakvpn:326
 #, c-format
@@ -20170,9 +20175,9 @@ msgid "normal conn"
 msgstr "Boas"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
-#, fuzzy, c-format
+#, c-format
 msgid "Exists!"
-msgstr "Kuitaat"
+msgstr "Endeo eo !"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
 #, c-format
@@ -20294,9 +20299,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakvpn:491
-#, fuzzy, c-format
+#, c-format
 msgid "section name"
-msgstr "Anv ar gevreadenn"
+msgstr "anv an dachenn"
 
 #: standalone/drakvpn:492
 #, c-format
@@ -20354,9 +20359,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakvpn:576 standalone/drakvpn:826
-#, fuzzy, c-format
+#, c-format
 msgid "Edit section"
-msgstr "Diuz pakadoù unan hag unan"
+msgstr "Aozañ an dachenn"
 
 #: standalone/drakvpn:577
 #, c-format
@@ -20369,14 +20374,14 @@ msgstr ""
 
 #: standalone/drakvpn:580 standalone/drakvpn:660 standalone/drakvpn:831
 #: standalone/drakvpn:877
-#, fuzzy, c-format
+#, c-format
 msgid "Section names"
-msgstr "Anv ar gevreadenn"
+msgstr "Anvioù an tachennoù"
 
 #: standalone/drakvpn:590
-#, fuzzy, c-format
+#, c-format
 msgid "Can not edit!"
-msgstr "Fazi en ur zigeriñ %s evit skrivañ : %s"
+msgstr "N'hellan ket aozañ !"
 
 #: standalone/drakvpn:591
 #, c-format
@@ -20428,9 +20433,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakvpn:656 standalone/drakvpn:873
-#, fuzzy, c-format
+#, c-format
 msgid "Remove section"
-msgstr "Dibarzhoù ar voullerez lpd a-bell"
+msgstr "Lemel an dachenn"
 
 #: standalone/drakvpn:657 standalone/drakvpn:874
 #, c-format
@@ -20494,9 +20499,9 @@ msgid "remote"
 msgstr "a-bell"
 
 #: standalone/drakvpn:735
-#, fuzzy, c-format
+#, c-format
 msgid "sainfo"
-msgstr "Spagnoleg"
+msgstr "sainfo"
 
 #: standalone/drakvpn:743
 #, c-format
@@ -20538,9 +20543,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakvpn:770 standalone/drakvpn:863
-#, fuzzy, c-format
+#, c-format
 msgid "real file"
-msgstr "Diuzit ar restr"
+msgstr "gwir restr"
 
 #: standalone/drakvpn:793
 #, c-format
@@ -20854,9 +20859,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakvpn:1060
-#, fuzzy, c-format
+#, c-format
 msgid "Generate policy"
-msgstr "Diogelroez"
+msgstr "Krouiñ ar politikerez"
 
 #: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
 #, c-format
@@ -20903,27 +20908,27 @@ msgstr ""
 #: standalone/drakvpn:1081
 #, c-format
 msgid "Certificate type"
-msgstr ""
+msgstr "Seurt an testeni"
 
 #: standalone/drakvpn:1083
-#, fuzzy, c-format
+#, c-format
 msgid "My certfile"
-msgstr "Diuzit ar restr"
+msgstr "Ma restr testeni"
 
 #: standalone/drakvpn:1084
-#, fuzzy, c-format
+#, c-format
 msgid "Name of the certificate"
-msgstr "Anv ar voullerez"
+msgstr "Anv an testeni"
 
 #: standalone/drakvpn:1085
 #, c-format
 msgid "My private key"
-msgstr ""
+msgstr "Ma alc'hwez sekred"
 
 #: standalone/drakvpn:1086
-#, fuzzy, c-format
+#, c-format
 msgid "Name of the private key"
-msgstr "Anv ar voullerez"
+msgstr "Anv an alc'hwez sekred"
 
 #: standalone/drakvpn:1087
 #, fuzzy, c-format
@@ -20936,9 +20941,9 @@ msgid "Name of the peers certificate"
 msgstr ""
 
 #: standalone/drakvpn:1089
-#, fuzzy, c-format
+#, c-format
 msgid "Verify cert"
-msgstr "brav-tre"
+msgstr "Gwiriekaat an testeni"
 
 #: standalone/drakvpn:1091
 #, c-format
@@ -20950,7 +20955,7 @@ msgstr ""
 #: standalone/drakvpn:1093
 #, c-format
 msgid "My identifier"
-msgstr ""
+msgstr "Ma niverenn"
 
 #: standalone/drakvpn:1094
 #, c-format
@@ -21067,9 +21072,9 @@ msgid "Mode"
 msgstr "Mod"
 
 #: standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
 msgid "tunnel"
-msgstr "Nullañ"
+msgstr "tunnel"
 
 #: standalone/drakvpn:1143
 #, fuzzy, c-format
@@ -21104,17 +21109,17 @@ msgstr "dieil"
 #: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
-msgstr ""
+msgstr "SUA (skignañ)"
 
 #: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
-msgstr "USA (fun)"
+msgstr "SUA (fun)"
 
 #: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
-msgstr "USA (cable-hrc)"
+msgstr "SUA (cable-hrc)"
 
 #: standalone/drakxtv:45
 #, c-format
@@ -21124,7 +21129,7 @@ msgstr "Kanada (fun)"
 #: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
-msgstr ""
+msgstr "Japon (skignañ)"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -21134,7 +21139,7 @@ msgstr "Japon (fun)"
 #: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
-msgstr ""
+msgstr "Sina (skignañ)"
 
 #: standalone/drakxtv:47
 #, c-format
@@ -21181,17 +21186,17 @@ msgstr "Bro :"
 #: standalone/drakxtv:93
 #, c-format
 msgid "Scanning for TV channels in progress..."
-msgstr ""
+msgstr "Emaon o klask kanolioù ar skinwell"
 
 #: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
-msgstr ""
+msgstr "O klask kanolioù ar skinwell"
 
 #: standalone/drakxtv:107
-#, fuzzy, c-format
+#, c-format
 msgid "There was an error while scanning for TV channels"
-msgstr "Ur fazi a zo bet en ur staliañ ar pakadoù :"
+msgstr "Degouezhet ez eus ur fazi en ur klask kanolioù ar skinwell"
 
 #: standalone/drakxtv:110
 #, c-format
@@ -21330,9 +21335,9 @@ msgid "Disk controller"
 msgstr "Kontroller pladenn"
 
 #: standalone/harddrake2:47
-#, fuzzy, c-format
+#, c-format
 msgid "the disk controller on the host side"
-msgstr "ar gontroller pladenn"
+msgstr "ar gontroller pladenn ouzh an ostiz"
 
 #: standalone/harddrake2:48
 #, c-format
@@ -21373,7 +21378,7 @@ msgstr "anv gwerzher an drobarzhell"
 #: standalone/harddrake2:53
 #, c-format
 msgid "Bus PCI #"
-msgstr ""
+msgstr "Bus PCI #"
 
 #: standalone/harddrake2:53
 #, fuzzy, c-format
@@ -21381,9 +21386,9 @@ msgid "the PCI bus on which the device is plugged"
 msgstr "Dibabit ar porzh a-steud m'eo luget ho logodenn outañ, mar plij."
 
 #: standalone/harddrake2:54
-#, fuzzy, c-format
+#, c-format
 msgid "PCI device #"
-msgstr "trobarzhell"
+msgstr "Trobarzhell PCI #"
 
 #: standalone/harddrake2:54
 #, c-format
@@ -22265,9 +22270,9 @@ msgid "Alert configuration"
 msgstr "Kefluniañ ar proksioù"
 
 #: standalone/logdrake:429
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter your email address below "
-msgstr "Klaskit adarre mar plij"
+msgstr "Roit ho chomlec'h postel mar plij"
 
 #: standalone/logdrake:430
 #, c-format
@@ -22575,9 +22580,9 @@ msgid "No internet connection configured"
 msgstr "Kevreadenn Internet ebet"
 
 #: standalone/printerdrake:68
-#, fuzzy, c-format
+#, c-format
 msgid "Reading data of installed printers..."
-msgstr "Pakadoù hegerz"
+msgstr "O lenn roadoù diwar-benn ar moullerezioù staliet ..."
 
 #: standalone/printerdrake:116
 #, c-format
@@ -22598,9 +22603,9 @@ msgid "/_Add Printer"
 msgstr "/_Ouzhpennañ ur voullerez"
 
 #: standalone/printerdrake:131
-#, fuzzy, c-format
+#, c-format
 msgid "/Set as _Default"
-msgstr " (Dre ziouer)"
+msgstr "/Lakaat dre _ziouer"
 
 #: standalone/printerdrake:132
 #, c-format
@@ -22753,9 +22758,9 @@ msgid "Scannerdrake will not be started now."
 msgstr ""
 
 #: standalone/scannerdrake:67 standalone/scannerdrake:491
-#, fuzzy, c-format
+#, c-format
 msgid "Searching for configured scanners..."
-msgstr "Pakadoù hegerz"
+msgstr "O klask an eiltreseroù kefluniet ..."
 
 #: standalone/scannerdrake:71 standalone/scannerdrake:495
 #, c-format
@@ -23350,18 +23355,6 @@ msgstr " Sac'het eo ar staliadur"
 #~ msgid "No browser available! Please install one"
 #~ msgstr "N'eus furcher da gaout ebet ! Stalit unan mar plij"
 
-#, fuzzy
-#~ msgid "Get YP server from DHCP"
-#~ msgstr "Adtapout ar servijerien YP eus DHCP"
-
-#, fuzzy
-#~ msgid "Get NTPD server from DHCP"
-#~ msgstr "Adtapout ar servijerien NTPD eus DHCP"
-
-#, fuzzy
-#~ msgid "Upload the system configuration"
-#~ msgstr "Kefluniañ ar reizhiad"
-
 #~ msgid ""
 #~ "Insert a floppy in drive\n"
 #~ "All data on this floppy will be lost"