make sure that the wizard uses the same setting names as the perltk

installer, and make sure that the strings are also translated


git-svn-id: svn://tug.org/texlive/trunk@23003 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 8 insertions, 8 deletions

diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index 82f106ad28d..7411792a331 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -339,11 +339,11 @@ sub callback_change_texdir {
 ################## OPTIONS SCREEN ################################
 
 my %opts_to_str = (
-  "letter" => "Default paper size",
-  "desktop_integration" => "Add shortcuts to menu and desktop",
-  "file_assocs" => "Change file associations",
-  "path" => "Adjust PATH setting in registry",
-  "w32_multi_user" => "Installation for all users",
+  "letter" => __("Default paper size"),
+  "desktop_integration" => __("Add menu shortcuts"),
+  "file_assocs" => __("Change file associations"),
+  "path" => __("Adjust PATH setting in registry"),
+  "w32_multi_user" => __("Installation for all users"),
 );
 
 # options choices: if there is an entry, use radio buttons,
@@ -392,7 +392,7 @@ sub ask_options {
     if (exists($opts_choices{$o})) {
       my $fopt = $fmain->Frame()->place(-x => 0, -y => $ytmp);
       $fopt->Label(
-        -text => __($opts_to_str{$o}) . ":\t"
+        -text => $opts_to_str{$o} . ":\t"
       )->pack(-side => 'left');
       for (my $i = 0; $i < @{$opts_choices{$o}}; $i++) {
         $fopt->Radiobutton(
@@ -402,7 +402,7 @@ sub ask_options {
         )->pack(-side => 'left');
       }
     } else {
-      $fmain->Checkbutton(-text => __($opts_to_str{$o}),
+      $fmain->Checkbutton(-text => $opts_to_str{$o},
         -variable => \$vars{"option_$o"})->place(-x => 0, -y => $ytmp);
     }
     $ytmp += 50;
@@ -438,7 +438,7 @@ sub ask_go {
   $ytmp += 20;
 
   for my $o (@opts_list) {
-    my $text = __($opts_to_str{$o}) . ":\t";
+    my $text = $opts_to_str{$o} . ":\t";
     if (exists ($opts_choices{$o})) {
       $text .= $opts_choices{$o}->[$vars{"option_$o"}];
     } else {