aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-02-13 23:19:40 +0000
committerThierry Vignaud <tv@mandriva.org>2009-02-13 23:19:40 +0000
commit2d6c53b2a976e0529cfc1a55c5dab73f4f66404e (patch)
treeb99f22a45153f401b54fdf5f47842d2a6b03063d /Rpmdrake
parent3a13c49a9b0b30a66c51b876c02dbdf7936abe2c (diff)
downloadrpmdrake-2d6c53b2a976e0529cfc1a55c5dab73f4f66404e.tar
rpmdrake-2d6c53b2a976e0529cfc1a55c5dab73f4f66404e.tar.gz
rpmdrake-2d6c53b2a976e0529cfc1a55c5dab73f4f66404e.tar.bz2
rpmdrake-2d6c53b2a976e0529cfc1a55c5dab73f4f66404e.tar.xz
rpmdrake-2d6c53b2a976e0529cfc1a55c5dab73f4f66404e.zip
(toggle_nodes) add a titles when warning about conflicting package
Diffstat (limited to 'Rpmdrake')
-rw-r--r--Rpmdrake/gui.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index ddc9857c..e3a73cb25 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -696,7 +696,7 @@ sub toggle_nodes {
}
if (my $conflicting_msg = urpm::select::conflicting_packages_msg($urpm, $urpm->{state})) {
- if (!interactive_msg('', $conflicting_msg, yesno => 1, scroll => 1)) {
+ if (!interactive_msg(N("Conflicting Packages"), $conflicting_msg, yesno => 1, scroll => 1)) {
@nodes_with_deps = ();
$urpm->disable_selected(open_rpm_db(), $urpm->{state}, @requested);
goto packages_selection_ok;
9dc9139c879b6aadb8985374ea52d88'>Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index a8bc64046..90a451541 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -1040,8 +1040,8 @@ notation (for example, 1.2.3.4).")),
list => \@network::ethernet::dhcp_clients, advanced => 1 },
{ label => N("DHCP timeout (in seconds)"), val => \$ethntf->{DHCP_TIMEOUT}, advanced => 1 },
{ text => N("Get DNS servers from DHCP"), val => \$peerdns, type => "bool", advanced => 1 },
- { text => N("Get YP server from DHCP"), val => \$peeryp, type => "bool", advanced => 1 },
- { text => N("Get NTPD server from DHCP"), val => \$peerntpd, type => "bool", advanced => 1 },
+ { text => N("Get YP servers from DHCP"), val => \$peeryp, type => "bool", advanced => 1 },
+ { text => N("Get NTPD servers from DHCP"), val => \$peerntpd, type => "bool", advanced => 1 },
),
];
},