summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/drakxtools.spec2
-rw-r--r--perl-install/help.pm10
-rw-r--r--perl-install/install_steps_gtk.pm4
-rw-r--r--perl-install/interactive.pm4
-rw-r--r--perl-install/interactive/newt.pm4
-rw-r--r--perl-install/printer/printerdrake.pm4
-rw-r--r--perl-install/share/po/DrakX.pot4
-rw-r--r--perl-install/share/po/uz@Cyrl.po10
-rwxr-xr-xperl-install/standalone/drakbackup26
9 files changed, 34 insertions, 34 deletions
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index 7e6123027..4598821b3 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -317,7 +317,7 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak
%changelog
* Thu Jan 15 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.3-21mdk
-- prevent spurious top window to appears when embedded in mcc
+- prevent spurious top windows to appears when embedded in mcc
* Thu Jan 15 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.3-20mdk
- diskdrake:
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 46c2bbde4..eeb588d65 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -48,7 +48,7 @@ When you have finished adding users, you will be asked to choose a user
that can automatically log into the system when the computer boots up. If
you are interested in that feature (and do not care much about local
security), choose the desired user and window manager, then click \"%s\".
-If you are not interested in this feature, uncheck the \"%s\" box.", N("User name"), N("Accept user"), N("Next ->"), N("Advanced"), N("Next ->"), N("Do you want to use this feature?"));
+If you are not interested in this feature, uncheck the \"%s\" box.", N("User name"), N("Accept user"), N("Next"), N("Advanced"), N("Next"), N("Do you want to use this feature?"));
}
sub ask_mntpoint_s() {
N("Listed here are the existing Linux partitions detected on your hard drive.
@@ -189,7 +189,7 @@ from your Internet Service Provider or system administrator.
You can consult the ``Starter Guide'' chapter about Internet connections
for details about the configuration, or simply wait until your system is
-installed and use the program described there to configure your connection.", N("Next ->"), N("Use auto detection"), N("Cancel"));
+installed and use the program described there to configure your connection.", N("Next"), N("Use auto detection"), N("Cancel"));
}
sub configurePrinter() {
N("\"%s\": clicking on the \"%s\" button will open the printer configuration
@@ -437,7 +437,7 @@ Click on \"%s\" if you want to choose another partition for your new
Mandrake Linux operating system installation.
Click on \"%s\" if you wish to select partitions that will be checked for
-bad blocks on the disk.", N("Next ->"), N("<- Previous"), N("Advanced"));
+bad blocks on the disk.", N("Next"), N("Previous"), N("Advanced"));
}
sub installUpdates() {
N("At the time you are installing Mandrake Linux, it is likely that some
@@ -657,7 +657,7 @@ pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll
the mouse wheel to ensure that it is activated correctly. Once you see the
on-screen scroll wheel moving as you scroll your mouse wheel, test the
buttons and check that the mouse pointer moves on-screen as you move your
-mouse.", N("Next ->"));
+mouse.", N("Next"));
}
sub selectSerialPort() {
N("Please select the correct port. For example, the \"COM1\" port under
@@ -962,5 +962,5 @@ to recover any data and partitions present on this hard drive, including
any Windows data.
Click on \"%s\" to stop this operation without losing any data and
-partitions present on this hard drive.", N("Next ->"), N("Next ->"), N("<- Previous"));
+partitions present on this hard drive.", N("Next"), N("Next"), N("Previous"));
}
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 77ad68020..4214b5c4a 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -283,7 +283,7 @@ sub reallyChooseGroups {
$check->signal_connect(clicked => sub { $$individual = $check->get_active });
$check;
}),
- gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub { Gtk2->main_quit }),
+ gtksignal_connect(Gtk2::Button->new(N("Next")), clicked => sub { Gtk2->main_quit }),
),
),
);
@@ -440,7 +440,7 @@ sub choosePackagesTree {
auto_deps => N("Show automatically selected packages"),
interactive_help_id => 'choosePackagesTree',
ok => N("Install"),
- cancel => N("<- Previous"),
+ cancel => N("Previous"),
icons => [ { icon => 'floppy',
help => N("Load/Save on floppy"),
wait_message => N("Updating package selection"),
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index b1d3c8034..b24898350 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -400,8 +400,8 @@ sub ask_from_real {
sub ask_browse_tree_info {
my ($o, $title, $message, $common) = @_;
$common->{interactive_help} ||= $common->{interactive_help_id} && $o->interactive_help_sub_get_id($common->{interactive_help_id});
- add2hash_($common, { ok => $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next ->")) : N("Ok"),
- cancel => $::isWizard ? N("<- Previous") : N("Cancel") });
+ add2hash_($common, { ok => $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok"),
+ cancel => $::isWizard ? N("Previous") : N("Cancel") });
add2hash_($common, { title => $title, message => $message });
add2hash_($common, { grep_allowed_to_toggle => sub { @_ },
grep_unselected => sub { grep { $common->{node_state}($_) eq 'unselected' } @_ },
diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm
index 861e3b6c3..79dd93eba 100644
--- a/perl-install/interactive/newt.pm
+++ b/perl-install/interactive/newt.pm
@@ -296,8 +296,8 @@ sub ask_fromW_real {
};
my ($ok, $cancel) = ($common->{ok}, $common->{cancel});
- $cancel = $::isWizard ? N("<- Previous") : N("Cancel") if !defined $cancel && !defined $ok;
- $ok ||= $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next ->")) : N("Ok");
+ $cancel = $::isWizard ? N("Previous") : N("Cancel") if !defined $cancel && !defined $ok;
+ $ok ||= $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok");
my @okcancel = grep { $_ } $ok, $cancel;
@okcancel = reverse(@okcancel) if $::isWizard;
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 90c97105e..296c80f5d 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -2903,9 +2903,9 @@ sub print_testpages {
messages => N("Please select the test pages you want to print.
Note: the photo test page can take a rather long time to get printed and on laser printers with too low memory it can even not come out. In most cases it is enough to print the standard test page."),
cancel => (!$printer->{NEW} ?
- N("Cancel") : ($::isWizard ? N("<- Previous") :
+ N("Cancel") : ($::isWizard ? N("Previous") :
N("No test pages"))),
- ok => ($::isWizard ? N("Next ->") : N("Print")),
+ ok => ($::isWizard ? N("Next") : N("Print")),
callbacks => {
changed => sub {
if ($oldres2 ne $res2) {
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 087b71bf6..d108178fb 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -2944,7 +2944,7 @@ msgstr ""
#: help.pm:51 help.pm:51 help.pm:192 help.pm:440 help.pm:660 help.pm:965 help.pm:965 install_steps_gtk.pm:286 interactive.pm:403 interactive/newt.pm:300 printer/printerdrake.pm:2908 standalone/drakbackup:4587 standalone/drakbackup:4613 standalone/drakbackup:4643 standalone/drakbackup:4667
#, c-format
-msgid "Next ->"
+msgid "Next"
msgstr ""
#: help.pm:51 help.pm:414 help.pm:440 help.pm:634 help.pm:702 help.pm:729 interactive.pm:371
@@ -3519,7 +3519,7 @@ msgstr ""
#: help.pm:440 help.pm:965 install_steps_gtk.pm:444 interactive.pm:404 interactive/newt.pm:299 printer/printerdrake.pm:2906 standalone/drakbackup:4387 standalone/drakbackup:4415 standalone/drakbackup:4473 standalone/drakbackup:4499 standalone/drakbackup:4525 standalone/drakbackup:4583 standalone/drakbackup:4609 standalone/drakbackup:4639 standalone/drakbackup:4663
#, c-format
-msgid "<- Previous"
+msgid "Previous"
msgstr ""
#: help.pm:443
diff --git a/perl-install/share/po/uz@Cyrl.po b/perl-install/share/po/uz@Cyrl.po
index 0e8898e95..98188339f 100644
--- a/perl-install/share/po/uz@Cyrl.po
+++ b/perl-install/share/po/uz@Cyrl.po
@@ -3095,8 +3095,8 @@ msgstr ""
#: standalone/drakbackup:4613 standalone/drakbackup:4643
#: standalone/drakbackup:4667
#, c-format
-msgid "Next ->"
-msgstr "Кейингиси ->"
+msgid "Next"
+msgstr "Кейингиси"
#: help.pm:51 help.pm:414 help.pm:440 help.pm:634 help.pm:702 help.pm:729
#: interactive.pm:371
@@ -3692,8 +3692,8 @@ msgstr ""
#: standalone/drakbackup:4609 standalone/drakbackup:4639
#: standalone/drakbackup:4663
#, c-format
-msgid "<- Previous"
-msgstr "<- Олдингиси"
+msgid "Previous"
+msgstr "Олдингиси"
#: help.pm:443
#, c-format
@@ -19307,7 +19307,7 @@ msgstr "Ўрнатишдан чиқиш"
#: ugtk2.pm:492
#, fuzzy, c-format
msgid "Previous"
-msgstr "<- Олдингиси"
+msgstr "Олдингиси"
#: ugtk2.pm:897
#, c-format
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 3c2a40e5b..bf1b64802 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -4222,7 +4222,7 @@ sub button_box_adv() {
interactive_mode_box();
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub {
+ 0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
@@ -4250,7 +4250,7 @@ sub button_box_restore_main() {
interactive_mode_box();
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub {
+ 0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub {
destroy_widget();
interactive_mode_box()
}),
@@ -4308,7 +4308,7 @@ sub button_box_backup_end() {
interactive_mode_box()
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub {
+ 0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->()
}),
@@ -4334,7 +4334,7 @@ sub button_box_wizard_end() {
interactive_mode_box();
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub {
+ 0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
@@ -4360,7 +4360,7 @@ sub button_box_restore_end() {
interactive_mode_box();
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub {
+ 0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
@@ -4417,11 +4417,11 @@ sub button_box_build_backup() {
interactive_mode_box();
}),
1, new Gtk2::HBox(0, 0),
- 0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub {
+ 0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
- 1, gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub {
+ 1, gtksignal_connect(Gtk2::Button->new(N("Next")), clicked => sub {
destroy_widget();
$next_widget->();
}),
@@ -4443,11 +4443,11 @@ sub button_box_restore() {
interactive_mode_box();
}),
1, new Gtk2::HBox(0, 0),
- 0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub {
+ 0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
- 1, gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub {
+ 1, gtksignal_connect(Gtk2::Button->new(N("Next")), clicked => sub {
destroy_widget();
$next_widget->();
}),
@@ -4473,11 +4473,11 @@ sub button_box_find_media {
interactive_mode_box();
}),
1, new Gtk2::HBox(0, 0),
- 0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub {
+ 0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub {
$central_widget = \$box2;
interactive_mode_box();
}),
- 1, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub {
+ 1, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("Next")), clicked => sub {
interactive_mode_box("restore");
}), $mount_media),
),
@@ -4497,11 +4497,11 @@ sub button_box_wizard() {
interactive_mode_box()
}),
1, new Gtk2::HBox(0, 0),
- 0, gtksignal_connect(Gtk2::Button->new($next_widget ? N("<- Previous") : N("Ok")), clicked => sub {
+ 0, gtksignal_connect(Gtk2::Button->new($next_widget ? N("Previous") : N("Ok")), clicked => sub {
destroy_widget();
$previous_widget ? $previous_widget->() : $next_widget->();
}),
- if_($next_widget, 1, gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub {
+ if_($next_widget, 1, gtksignal_connect(Gtk2::Button->new(N("Next")), clicked => sub {
destroy_widget();
$next_widget ? $next_widget->() : $previous_widget->();
})),