summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/diskdrake/interactive.pm3
-rw-r--r--perl-install/help.pm2
-rw-r--r--perl-install/install_interactive.pm4
3 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 934cfa561..c9bf9b701 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -2,6 +2,7 @@ package diskdrake::interactive; # $Id$
use diagnostics;
use strict;
+use utf8;
use common;
use fs::type;
@@ -808,7 +809,7 @@ sub Resize {
$nice_resize{ntfs}->resize($part->{size});
$wait = undef;
$in->ask_warn('', N("To ensure data integrity after resizing the partition(s),
-filesystem checks will be run on your next boot into Windows(TM)"));
+filesystem checks will be run on your next boot into Microsoft Windows®"));
} elsif ($nice_resize{reiserfs}) {
log::l("reiser resize to $part->{size} sectors");
run_program::run('resize_reiserfs', '-f', '-q', '-s' . int($part->{size}/2) . 'K', devices::make($part->{device}));
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 5642e2350..481f0969c 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -371,7 +371,7 @@ drive. Be careful -- it is a powerful but dangerous choice and you can very
easily lose all your data. That's why this option is really only
recommended if you have done something like this before and have some
experience. For more instructions on how to use the DiskDrake utility,
-refer to the ``Managing Your Partitions'' section in the ``Starter Guide''.", N("Use free space"), N("Use existing partition"), N("Use the free space on the Windows partition"), N("Erase entire disk"), N("Remove Windows"), N("Custom disk partitioning"));
+refer to the ``Managing Your Partitions'' section in the ``Starter Guide''.", N("Use free space"), N("Use existing partition"), N("Use the free space on the Microsoft Windows® partition"), N("Erase entire disk"), N("Remove Windows"), N("Custom disk partitioning"));
}
sub exitInstall() {
N("There you are. Installation is now complete and your GNU/Linux system is
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index 90399361d..00be04908 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -166,14 +166,14 @@ the following error occurred: %s", formatError($@));
#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
N("WARNING!
-
+
Your Microsoft Windows® partition will be now resized.
Be careful: this operation is dangerous. If you have not already done so, you first need to exit the installation, run \"chkdsk c:\" from a Command Prompt under Microsoft Windows® (beware, running graphical program \"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), optionally run defrag, then restart the installation. You should also backup your data.
-When sure, press Next."))) or return;
+When sure, press %s.",N("Next")))) or return;
my $mb_size = $part->{size} >> 11;
$o->ask_from('', N("Which size do you want to keep for Microsoft Windows® on"), [