From 5024ed6eafe006078e61c8a5c6a9d59bb209f051 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Tue, 27 Apr 2010 12:37:15 +0000
Subject: 13.21 + reuse existing strings

---
 perl-install/Makefile.config          | 2 +-
 perl-install/NEWS                     | 3 +++
 perl-install/diskdrake/interactive.pm | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 87e44523d..7040f4636 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
 # -*- Makefile -*-
-VERSION:=13.20
+VERSION:=13.21
 
 SUDO        = sudo
 TMPDIR      = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ea8df631b..d663f5f65 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+Version 13.21 - 27 April 2010
+
 - finish-install:
   o wait for network-up before trying to configure it (blino)
 - diskdrake:
@@ -8,6 +10,7 @@
   o fix loading of dmcrypt info now that /dev/mapper/* are symlinks
   o fix creating encrypted LVM
   o fix display of non unlocked encrypted partitions
+  o re-use existing strings
 
 Version 13.20 - 21 April 2010
 
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 4c4432012..06205c24f 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -506,7 +506,7 @@ sub Create {
            ),
 	 { label => N("Encrypt partition"), type => 'bool', val => \$use_dmcrypt },
 	 { label => N("Encryption key "), val => \$part->{dmcrypt_key}, disabled => sub { !$use_dmcrypt }, hidden => 1, weakness_check => 1 },
-	 { label => N("Type again encryption key "), val => \$part->{dmcrypt_key2}, disabled => sub { !$use_dmcrypt }, hidden => 1 },
+	 { label => N("Encryption key (again)"), val => \$part->{dmcrypt_key2}, disabled => sub { !$use_dmcrypt }, hidden => 1 },
         ], complete => sub {
 	    $part->{size} = from_Mb($mb_size, min_partition_size($hd), $max - $part->{start}); #- need this to be able to get back the approximation of using MB
 	    $do_suggest_mount_point = 0 if !$part->{mntpoint};
@@ -517,7 +517,7 @@ sub Create {
 	    # if user asked to encrypt the partition, use dm-crypt and create requested fs inside
 	    if ($use_dmcrypt) {
 		my $err;
-		$err = N("Encryption keys differ") unless ($part->{dmcrypt_key} eq $part->{dmcrypt_key2});
+		$err = N("The encryption keys do not match") unless ($part->{dmcrypt_key} eq $part->{dmcrypt_key2});
 		$err = N("Missing encryption key") unless ($part->{dmcrypt_key});
 		if ($err) {
 		    $in->ask_warn(N("Error"), $err);
-- 
cgit v1.2.1