summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/share/compssUsers.desktop2
-rwxr-xr-xperl-install/standalone/drakperm4
-rwxr-xr-xperl-install/standalone/draksec4
-rwxr-xr-xperl-install/standalone/draksplash10
-rwxr-xr-xperl-install/standalone/harddrake216
-rwxr-xr-xperl-install/standalone/logdrake4
-rwxr-xr-xperl-install/standalone/mousedrake2
-rwxr-xr-xperl-install/standalone/net_monitor8
-rwxr-xr-xperl-install/standalone/scannerdrake2
9 files changed, 26 insertions, 26 deletions
diff --git a/perl-install/share/compssUsers.desktop b/perl-install/share/compssUsers.desktop
index f836d6731..575e45888 100644
--- a/perl-install/share/compssUsers.desktop
+++ b/perl-install/share/compssUsers.desktop
@@ -33,7 +33,7 @@ Personal Information Management [icon=remote_access] [descr=Tools for your Palm
+gnome-pim
+gnome-pim-conduits
-Personal Finance [icon=sciences] [descr=Programs to manage your finance, such as gnucash]
+Personal Finance [icon=sciences] [descr=Programs to manage your finances, such as gnucash]
+gnucash
+MoneyDance
diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm
index 83cc4630d..b054a6e59 100755
--- a/perl-install/standalone/drakperm
+++ b/perl-install/standalone/drakperm
@@ -68,8 +68,8 @@ $combo_perm->set_popdown_strings(sort(keys %perm));
$tips->set_tip($B_add, N("Add a new rule at the end"));
$tips->set_tip($B_edit, N("Edit current rule"));
-$tips->set_tip($B_up, N("Up selected rule one level"));
-$tips->set_tip($B_down, N("Down selected rule one level"));
+$tips->set_tip($B_up, N("Move selected rule up one level"));
+$tips->set_tip($B_down, N("Move selected rule down one level"));
$tips->set_tip($B_del, N("Delete selected rule"));
#- signal management
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 23fa9c78c..33be1e531 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -155,7 +155,7 @@ foreach ([ 'network', N("Network Options") ], [ 'system', N("System Options") ])
my ($domain, $label) = @$_;
my %values;
$notebook->append_page(gtkshow(create_scrolled_window(gtkpack(new Gtk2::VBox(0, 0),
- new Gtk2::Label(N("The following options can be set to customize your\nsystem security. If you need explanations, click on Help.\n")),
+ new Gtk2::Label(N("The following options can be set to customize your\nsystem security. If you need an explanation, click on Help.\n")),
create_packtable($common_opts,
map {
my $i = $_;
@@ -186,7 +186,7 @@ foreach ([ 'network', N("Network Options") ], [ 'system', N("System Options") ])
my %security_checks_value;
$notebook->append_page(gtkshow(create_scrolled_window(gtkpack(new Gtk2::VBox(0, 0),
- new Gtk2::Label(N("The following options can be set to customize your\nsystem security. If you need explanations, click on Help.\n")),
+ new Gtk2::Label(N("The following options can be set to customize your\nsystem security. If you need an explanation, click on Help.\n")),
create_packtable($common_opts,
map {
unless (member(qw(MAIL_WARN MAIL_USER), $_)) {
diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash
index c1d7cd46c..b0d731877 100755
--- a/perl-install/standalone/draksplash
+++ b/perl-install/standalone/draksplash
@@ -18,7 +18,7 @@ $window->{rwindow}->signal_connect(delete_event => \&CloseAppWindow);
#- verification of package image magik
unless ($in->do_pkgs->is_installed('ImageMagick')) {
- $in->ask_okcancel(N("Error"), N("package 'ImageMagick' is required for correct working.\nClick \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"))
+ $in->ask_okcancel(N("Error"), N("package 'ImageMagick' is required to be able to complete configuration.\nClick \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"))
and $in->do_pkgs->install('ImageMagick')
or &CloseAppWindow;
}
@@ -94,7 +94,7 @@ my %boot_conf_frame = ('frame' => new Gtk2::Frame(N("Configure bootsplash pictur
'px' => N("the progress bar x coordinate\nof its upper left corner"),
'py' => N("the progress bar y coordinate\nof its upper left corner"),
'pw' => N("the width of the progress bar"),
- 'ph' => N("the heigth of the progress bar"),
+ 'ph' => N("the height of the progress bar"),
'pc' => N("the color of the progress bar")
},
#- must set scale values to true to get them created by mk_frame
@@ -153,7 +153,7 @@ $first{widgets}{combo}{res}->entry->signal_connect(changed => sub {
$boot_conf_frame{frame} = new Gtk2::Frame(N("Configure bootsplash picture"));
&make_boot_frame;
$first_vbox->add($boot_conf_frame{frame});
- member($theme{name}, &giv_exist_thm) and &thm_in_this_res and &get_this_thm_res_conf or $in->ask_warn(N("Notice"), N("This theme haven't yet any bootsplash in %s !", $theme{res}{res}));
+ member($theme{name}, &giv_exist_thm) and &thm_in_this_res and &get_this_thm_res_conf or $in->ask_warn(N("Notice"), N("This theme does not yet have a bootsplash in %s !", $theme{res}{res}));
});
#- go to bootsplash configuration step 2
#$first{widgets}{button}{boot_conf}->signal_connect(clicked => sub{show_act(\%boot_conf_frame) } );
@@ -246,7 +246,7 @@ py='.$theme{boot_conf}{py}.'
# pw is the with of the progress bar
pw='.$theme{boot_conf}{pw}.'
-# ph is the heigth of the progress bar
+# ph is the height of the progress bar
ph='.$theme{boot_conf}{ph}.'
# pc is the color of the progress bar
@@ -317,7 +317,7 @@ sub which_res_exist {
and last;
}
- $is_ok == 1 or $in->ask_warn(N("Notice"), N("This theme haven't yet any bootsplash in %s !", $theme{res}{res})) and return 0;
+ $is_ok == 1 or $in->ask_warn(N("Notice"), N("This theme does not yet have a bootsplash in %s !", $theme{res}{res})) and return 0;
return 1;
}
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 7e1a150dc..48cffaded 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -20,10 +20,10 @@ my %fields =
[ N("Bus"),
N("this is the physical bus on which the device is plugged (eg: PCI, USB, ...)") ],
"channel" => [ N("Channel"), N("EIDE/SCSI channel") ],
- "bogomips" => [ N("Bogomips"), N("The GNU/Linux kernel needs to do run a calculation loop at boot time to initialize a timer counter. Its result is stored as bogomips as a way to \"benchmark\" the cpu.") ],
+ "bogomips" => [ N("Bogomips"), N("The GNU/Linux kernel needs to run a calculation loop at boot time to initialize a timer counter. Its result is stored as bogomips as a way to \"benchmark\" the cpu.") ],
"bus_id" =>
[ N("Bus identification"),
- N("- PCI and USB devices: this list the vendor, device, subvendor and subdevice PCI/USB ids") ],
+ N("- PCI and USB devices: this lists the vendor, device, subvendor and subdevice PCI/USB ids") ],
"bus_location" =>
[ N("Location on the bus"),
N("- pci devices: this gives the PCI slot, device and function of this card
@@ -38,16 +38,16 @@ my %fields =
"device" => [ N("Old device file"),
N("old static device name used in dev package") ],
"devfs_device" => [ N("New devfs device"),
- N("new dinamic device name generated by incore kernel devfs") ],
- "driver" => [ N("Module"), N("the module of the GNU/Linux kernel that handle that device") ],
+ N("new dinamic device name generated by core kernel devfs") ],
+ "driver" => [ N("Module"), N("the module of the GNU/Linux kernel that handles the device") ],
"flags" => [ N("Flags"), N("CPU flags reported by the kernel") ],
"fdiv_bug" => [ N("Fdiv bug"),
- N("Early Intel Pentium chips manufactured have a bug in their floating point processor which did not achieve the attended precision when performing a Floating point DIVision (FDIV)") ],
+ N("Early Intel Pentium chips manufactured have a bug in their floating point processor which did not achieve the required precision when performing a Floating point DIVision (FDIV)") ],
"fpu" => [ N("Is FPU present"), N("yes means the processor has an arithmetic coprocessor") ],
"fpu_exception" => [ N("Whether the FPU has an irq vector"), N("yes means the arithmetic coprocessor has an exception vector attached") ],
- "f00f_bug" => [N("F00f bug"), N("Early pentium were buggy and freezed when decoding the F00F bytecode")],
+ "f00f_bug" => [N("F00f bug"), N("Early pentiums were buggy and freezed when decoding the F00F bytecode")],
"hlt_bug" => [ N("Halt bug"),
N("Some of the early i486DX-100 chips cannot reliably return to operating mode after the \"halt\" instruction is used") ],
@@ -94,7 +94,7 @@ my @menu_items =
N("Description of the fields:\n\n")
. join("\n\n", map { if_($fields{$_}[0], "$fields{$_}[0]: $fields{$_}[1]") } sort keys %$current_device))
} else {
- $in->ask_warn(N("Select a device !"), N("Once you've selected a device, you'll be able to see explanations on fields displayed on the right frame (\"Information\")"))
+ $in->ask_warn(N("Select a device !"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"))
}
}
},
@@ -190,7 +190,7 @@ my $selection = gtksignal_connect($tree->get_selection(), 'changed' => sub {
return 1;
}
}
- $text->get_buffer->set_text(N_("Click on a device in the left tree in order to get its information displayed here."), -1);
+ $text->get_buffer->set_text(N_("Click on a device in the left tree in order to display its information here."), -1);
$config_button->hide;
$module_cfg_button->hide;
});
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 3daa9d5dc..6bb2de941 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -145,7 +145,7 @@ my %files = (
"user" => { file => "/var/log/user.log", desc => N("User") },
"messages" => { file => "/var/log/messages", desc => N("Messages") },
"syslog" => { file => "/var/log/syslog", desc => N("Syslog") },
- "explanations" => { file => "/var/log/explanations", desc => N("Mandrake Tools Explanations") }
+ "explanations" => { file => "/var/log/explanations", desc => N("Mandrake Tools Explanation") }
);
my $yy = gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N("search")) , clicked => \&search),0);
@@ -414,7 +414,7 @@ my $initdir = "/etc/init.d";
}
$in->ask_from(N("service setting"),
- N("You will receive an alert if one of the selected services is no more running"),
+ N("You will receive an alert if one of the selected services is no longer running"),
[ map { { label => $_, val => \${ $_ }, type => "bool", text => "$service->{ $_ }" } } @installed_d
]) or goto begin;
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 12789fef1..602f28db0 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -34,7 +34,7 @@ if (!$mouse || !$::auto) {
0;
});
}
- my $name = $in->ask_from_treelistf('mousedrake', N("Please, choose the type of your mouse."), '|',
+ my $name = $in->ask_from_treelistf('mousedrake', N("Please choose your mouse type."), '|',
sub { join '|', map { translate($_) } split '\|', $_[0] },
[ mouse::fullnames ],
$mouse->{type} . '|' . $mouse->{name});
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index bd3a9ea9e..6dff839f8 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -175,7 +175,7 @@ sub connection {
$button_connect->set_sensitive(0);
$button_close->set_sensitive(0);
$statusbar->pop(1);
- $statusbar->push(1, $wasconnected ? N("Disconnecting from Internet ") : N("Connecting to Internet "));
+ $statusbar->push(1, $wasconnected ? N("Disconnecting from the Internet ") : N("Connecting to the Internet "));
if ($wasconnected == 1) {
$c_time = time();
$ct_tag = Gtk->timeout_add(1000, sub {
@@ -188,7 +188,7 @@ sub connection {
my $tag = Gtk->timeout_add(1000, sub {
$statusbar->pop(1);
- $statusbar->push(1, ($wasconnected == 1 ? N("Disconnecting from Internet ") : N("Connecting to Internet "))
+ $statusbar->push(1, ($wasconnected == 1 ? N("Disconnecting from the Internet ") : N("Connecting to the Internet "))
. join('', map { "." } (1..$nb_point)));
$nb_point++;
if ($nb_point < 4) { return 1 }
@@ -219,8 +219,8 @@ sub connection {
$ret = 0;
$statusbar->pop(1);
$statusbar->push(1, $wasconnected ? ($isconnected ?
- N("Disconnection from Internet failed.") :
- N("Disconnection from Internet complete.")) :
+ N("Disconnection from the Internet failed.") :
+ N("Disconnection from the Internet complete.")) :
($isconnected ?
N("Connection complete.") :
N("Connection failed.\nVerify your configuration in the Mandrake Control Center."))
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 810382d37..60f9ec48f 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -102,7 +102,7 @@ sub tryConfScanner {
if ($scanner::scannerDB->{$model}{ask} =~ /DEVICE/) {
$port = '/dev/sg0';
$in->ask_from('scannerdrake',
- N("Scannerdrake was not able to detect your %s scanner.\nPlease select the device where your scanner is plugged", $model),
+ N("Scannerdrake was not able to detect your %s scanner.\nPlease select the device where your scanner is attached", $model),
[
{ label => N("choose device"), val => \$port, list => ['/dev/sg0', '/dev/sg1', '/dev/sg2', '/dev/sg3', '/dev/sg4' ], not_edit => 0, sort => 1 },
],