let interactive uses stock items on x11 and old drak translated items in

other backends

5 files changed, 35 insertions, 4 deletions

diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 8af325cfa..321f8cebe 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -137,7 +137,7 @@ sub ask_okcancel {
 
 sub ask_warn_ {
     my ($o, $common) = @_;
-    ask_from_listf_raw_no_check($o, $common, undef, [ N("Ok") ]);
+    ask_from_listf_raw_no_check($o, $common, undef, [ $o->ok ]);
 }
 
 sub ask_yesorno_ {
@@ -154,7 +154,7 @@ sub ask_okcancel_ {
 	$common->{focus_cancel} = !$b_def;
     	ask_from_no_check($o, $common, []);
     } else {
-	ask_from_listf_raw($o, $common, sub { translate($_[0]) }, [ N_("Ok"), N_("Cancel") ], $b_def ? "Ok" : "Cancel") eq "Ok";
+	ask_from_listf_raw($o, $common, sub { translate($_[0]) }, [ $o->ok, $o->cancel ], $b_def ? "Ok" : "Cancel") eq "Ok";
     }
 }
 
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 90c2d4e48..adfc66ac7 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -751,4 +751,12 @@ sub kill {
     $o->{before_killing} = @interactive::objects;
 }
 
+sub ok {
+    'gtk-ok'
+}
+
+sub cancel {
+    'gtk-cancel'
+}
+
 1;
diff --git a/perl-install/interactive/http.pm b/perl-install/interactive/http.pm
index 3fef66fcb..ea2ae1311 100644
--- a/perl-install/interactive/http.pm
+++ b/perl-install/interactive/http.pm
@@ -154,6 +154,13 @@ sub wait_message_endW {
     print "\n" . CGI::p();
 }
 
+sub ok {
+    N("Ok");
+}
+
+sub cancel {
+    N("Cancel");
+}
 
 
 1;
diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm
index 86c6ea4b2..861e3b6c3 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 ? 'gtk-go-back"' : 'gtk-cancel' if !defined $cancel && !defined $ok;
-    $ok ||= $::isWizard ? ($::Wizard_finished ? N("Finish") : '"gtk-go-forward') : 'gtk-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;
@@ -398,4 +398,12 @@ sub simplify_string {
     $s;
 }
 
+sub ok {
+    N("Ok");
+}
+
+sub cancel {
+    N("Cancel");
+}
+
 1;
diff --git a/perl-install/interactive/stdio.pm b/perl-install/interactive/stdio.pm
index 209310339..d8971c795 100644
--- a/perl-install/interactive/stdio.pm
+++ b/perl-install/interactive/stdio.pm
@@ -169,5 +169,13 @@ sub wait_message_nextW {
 }
 sub wait_message_endW { print "\nDone\n" }
 
+sub ok {
+    N("Ok");
+}
+
+sub cancel {
+    N("Cancel");
+}
+
 1;