From bce4e569acbe751f79b5442b5838314013124efc Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 5 Mar 2007 16:46:41 +0000
Subject: merge some strings (thus giving more control to translators for the
 second occurence)

---
 gurpmi2 | 2 +-
 urpmi   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gurpmi2 b/gurpmi2
index 21a13910..17815d59 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -336,7 +336,7 @@ sub do_install_3 () {
     add_button_box($vbox, $quit_button);
     change_mainw($vbox);
     if (@errors) {
-	$progress_label->set_label(N("Installation failed") . ":\n" . join("\n",  map { "\t$_" } @errors));
+	$progress_label->set_label(N("Installation failed:") . "\n" . join("\n",  map { "\t$_" } @errors));
     } elsif (values %error_sources) {
 	$progress_label->set_label(N("Installation failed, some files are missing:\n%s\nYou may want to update your urpmi database",
 		join "\n", map { s|([^:]*://[^/:\@]*:)[^/:\@]*(\@.*)|$1xxxx$2|; "    $_" } values %error_sources));
diff --git a/urpmi b/urpmi
index 2a12ed4e..aa5a6c86 100755
--- a/urpmi
+++ b/urpmi
@@ -390,7 +390,7 @@ exists $urpm->{options}{'split-length'} or $urpm->{options}{'split-length'} = $s
 # comma-separated list of packages that should be installed first,
 # and that trigger an urpmi restart
 exists $urpm->{options}{'priority-upgrade'}
-    or $urpm->{options}{'priority-upgrade'} = 'rpm,perl-URPM,urpmi,glibc';
+    or $urpm->{options}{'priority-upgrade'} = 'rpm,perl-URPM,perl-MDV-Distribconf,urpmi,glibc';
 
 my $state = {};
 my %requested = $urpm->register_rpms(@files, @src_files);
@@ -625,8 +625,7 @@ urpm::removable::copy_packages_of_removable_media($urpm,
 	    #- probably run from a drak tool
 	    (my $gmessage) = grep { -x $_ } '/usr/X11R6/bin/gmessage', '/usr/bin/gmessage';
 	    if ($gmessage) {
-		my $m = to_utf8("\n$msg\n");
-		return system($gmessage, '-buttons', N("Ok") . ':1,' . N("Cancel") . ':0', $m);
+		return system($gmessage, '-buttons', N("Ok") . ':1,' . N("Cancel") . ':0', "\n$msg\n");
 	    }
 	}
 	return defined message_input("$msg\n$msg2 ");
@@ -777,7 +776,7 @@ foreach my $set (@{$state->{transaction} || []}) {
 		    );
 		    if (@l) {
 			#- Warning : the following message is parsed in urpm::parallel_*
-			print N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l), "\n";
+			print N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l), "\n";
 			if (!$urpm->{options}{'allow-force'}) {
 			    ++$nok;
 			    ++$urpm->{logger_id};
@@ -794,7 +793,7 @@ foreach my $set (@{$state->{transaction} || []}) {
 			    );
 			    if (@l) {
 				#- Warning : the following message is parsed in urpm::parallel_*
-				print N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l), "\n";
+				print N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l), "\n";
 				++$nok;
 				++$urpm->{logger_id};
 				push @errors, @l;
-- 
cgit v1.2.1