tlmgrgui: fix clash of _ sub with the one imported from Tk.

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

5 files changed, 85 insertions, 85 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl b/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl
index 797b767a493..6fb678b187c 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl
@@ -93,7 +93,7 @@ sub update_info_window {
     }
   }
   if ($text eq "") {
-    $text = _"nodescription";
+    $text = ___"nodescription";
   }
   $iw->delete("0.0", "end");
   $iw->insert("0.0", "$text");
@@ -109,14 +109,14 @@ sub do_listframe {
                    -foreground => "blue", 
                    -font => "helvetica 10 bold"
                  )->pack(-side => "top");
-  $f_title->Label( -text => _"ctrlshift"
+  $f_title->Label( -text => ___"ctrlshift"
                  )->pack(-side => "top");
   $f_title->grid( -row => 1, -column => 1, -columnspan => 2,
                   -padx => "2m", -pady => "2m", -sticky => "we");
 
   # column 1, row 2-3
 
-  my $f_listf = $f->Labelframe(-text => _"selpkg");
+  my $f_listf = $f->Labelframe(-text => ___"selpkg");
   $f_listf->grid( -row => 2, -column => 1, -rowspan => 2,
                   -sticky => "nswe", -padx => "2m", -pady => "1m");
 
@@ -125,7 +125,7 @@ sub do_listframe {
   my $f_listf_searchf = $f_listf->Frame;
   $f_listf_searchf->pack(-pady => "1m");
   my $f_listf_searchf_label = 
-    $f_listf_searchf->Label(-text => _"search")->pack( -anchor => "w", 
+    $f_listf_searchf->Label(-text => ___"search")->pack( -anchor => "w", 
                                                       -side => "left", 
                                                       -padx => "1m", 
                                                       -pady => "1m");
@@ -135,7 +135,7 @@ sub do_listframe {
                                   $f_textf_text, 
                                   $_[0], 
                                   @$listref); });
-  my $f_listf_searchf_button = $f_listf_searchf->Button(-text => _"next", 
+  my $f_listf_searchf_button = $f_listf_searchf->Button(-text => ___"next", 
       -command => sub { find_next_search_match($f_listf_lb, 
                                                $f_listf_searchf_entry, 
                                                $f_textf_text, 
@@ -155,7 +155,7 @@ sub do_listframe {
   $f_listf_lb->pack(-fill => "both", -expand => 1);
 
   # row 2 column 2
-  my $f_textf = $f->Labelframe(-text => _"infoitem");
+  my $f_textf = $f->Labelframe(-text => ___"infoitem");
   $f_textf->grid(-row => 2, -column => 2, -sticky => "nswe", 
                  -padx => "2m", -pady => "1m");
 
@@ -167,7 +167,7 @@ sub do_listframe {
   $f_textf_text = $f_textf->Scrolled("ROText", 
     -scrollbars => "e",
     -width => 45, -wrap => "word");
-  $f_textf_text->insert("end", _"warningtxt");
+  $f_textf_text->insert("end", ___"warningtxt");
 
   $f_textf_text->pack(-expand => 1, -fill => "both");
 
@@ -178,16 +178,16 @@ sub do_listframe {
 
   my $f_buttonf_optionsf = $f_buttonf->Frame();
   if ($with_force) {
-    my $foo = $f_buttonf_optionsf->Checkbutton(-text => _"force", 
+    my $foo = $f_buttonf_optionsf->Checkbutton(-text => ___"force", 
                                      -variable => \$opt_force
                                     )->pack(-side => 'left');
-    $balloon->attach($foo,-balloonmsg => _"forceballoon");
+    $balloon->attach($foo,-balloonmsg => ___"forceballoon");
   }
   if ($with_deps) {
-    my $foo = $f_buttonf_optionsf->Checkbutton(-text => _"withoutdep", 
+    my $foo = $f_buttonf_optionsf->Checkbutton(-text => ___"withoutdep", 
                                    -variable => \$opt_nodepends
                                   )->pack(-side => 'left');
-    $balloon->attach($foo,-balloonmsg => _"nodepballoon");
+    $balloon->attach($foo,-balloonmsg => ___"nodepballoon");
   }
   $f_buttonf_optionsf->pack;
   foreach my $k (keys %$buttonsref) {
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl
index 8b79e83f960..c54c9625e13 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl
@@ -7,7 +7,7 @@
 #
 
 
-our $back_arch = $back->add("arch",-label => _"archs");
+our $back_arch = $back->add("arch",-label => ___"archs");
 $screens{"arch"} = $back_arch;
 
 # this will be loaded only on unix systems!
@@ -22,7 +22,7 @@ our $arch_frame;
 
 push @update_function_list, \&init_archs;
 
-$back_arch->Label(-text => _"remarchnotpos")->pack(-padx => "5m", -pady => "5m");
+$back_arch->Label(-text => ___"remarchnotpos")->pack(-padx => "5m", -pady => "5m");
 
 
 sub init_archs {
@@ -51,8 +51,8 @@ sub init_archs {
   }
   $arch_frame = $back_arch->Frame;
   $arch_frame->pack(-padx => "10m", -pady => "5m");
-  $arch_frame->Button(-text => _"applychanges", -command => sub { apply_changes(); })->pack(-side => 'left', -padx => "3m");
-  $arch_frame->Button(-text => _"resetchanges", -command => sub { init_archs(); })->pack(-side => 'left', -padx => "3m");
+  $arch_frame->Button(-text => ___"applychanges", -command => sub { apply_changes(); })->pack(-side => 'left', -padx => "3m");
+  $arch_frame->Button(-text => ___"resetchanges", -command => sub { init_archs(); })->pack(-side => 'left', -padx => "3m");
 }
 
 sub check_on_removal {
@@ -61,8 +61,8 @@ sub check_on_removal {
     # removal not supported
     $archs{$a} = 1;
     $arch_frame->Dialog(-title => "info",
-                        -text => _"remarchinfo",
-                        -buttons => [ _"ok" ])->Show;
+                        -text => ___"remarchinfo",
+                        -buttons => [ ___"ok" ])->Show;
   }
 }
 
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl
index 046dd94ea27..d4fd1554ebb 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl
@@ -6,38 +6,38 @@
 # GUI for tlmgr
 #
 
-our $back_config = $back->add("config",-label => _"config");
+our $back_config = $back->add("config",-label => ___"config");
 $screens{"config"} = $back_config;
 
 my $default_location = $localtlpdb->option_location;
-my $default_formats = ($localtlpdb->option_create_formats ? _"yes" : _"no");
-my $default_docfiles = ($localtlpdb->option_install_docfiles ? _"yes" : _"no");
-my $default_srcfiles = ($localtlpdb->option_install_srcfiles ? _"yes" : _"no");
+my $default_formats = ($localtlpdb->option_create_formats ? ___"yes" : ___"no");
+my $default_docfiles = ($localtlpdb->option_install_docfiles ? ___"yes" : ___"no");
+my $default_srcfiles = ($localtlpdb->option_install_srcfiles ? ___"yes" : ___"no");
 
 # this will be loaded only on unix systems!
 #
 
-my $back_config_set = $back_config->Labelframe(-text => _"defaultsettings");
+my $back_config_set = $back_config->Labelframe(-text => ___"defaultsettings");
 $back_config_set->pack;
 
-my $back_config_set_l1 = $back_config_set->Label(-text => _"defaultsource", -anchor => "w");
+my $back_config_set_l1 = $back_config_set->Label(-text => ___"defaultsource", -anchor => "w");
 my $back_config_set_m1 = $back_config_set->Label(-textvariable => \$default_location);
-my $back_config_set_r1 = $back_config_set->Button(-text => _"change",
+my $back_config_set_r1 = $back_config_set->Button(-text => ___"change",
      -command => sub { menu_default_location(); });
 
-my $back_config_set_l2 = $back_config_set->Label(-text => _"createformats", -anchor => "w");
+my $back_config_set_l2 = $back_config_set->Label(-text => ___"createformats", -anchor => "w");
 my $back_config_set_m2 = $back_config_set->Label(-textvariable => \$default_formats);
-my $back_config_set_r2 = $back_config_set->Button(-text => _"toggle",
+my $back_config_set_r2 = $back_config_set->Button(-text => ___"toggle",
      -command => sub { toggle_setting("formats"); });
 
-my $back_config_set_l3 = $back_config_set->Label(-text => _"installdoc", -anchor => "w");
+my $back_config_set_l3 = $back_config_set->Label(-text => ___"installdoc", -anchor => "w");
 my $back_config_set_m3 = $back_config_set->Label(-textvariable => \$default_docfiles);
-my $back_config_set_r3 = $back_config_set->Button(-text => _"toggle",
+my $back_config_set_r3 = $back_config_set->Button(-text => ___"toggle",
      -command => sub { toggle_setting("docfiles"); });
 
-my $back_config_set_l4 = $back_config_set->Label(-text => _"installsrc", -anchor => "w");
+my $back_config_set_l4 = $back_config_set->Label(-text => ___"installsrc", -anchor => "w");
 my $back_config_set_m4 = $back_config_set->Label(-textvariable => \$default_srcfiles);
-my $back_config_set_r4 = $back_config_set->Button(-text => _"toggle",
+my $back_config_set_r4 = $back_config_set->Button(-text => ___"toggle",
      -command => sub { toggle_setting("srcfiles"); });
 
 
@@ -68,10 +68,10 @@ $back_config_set_r4->grid(-row => 4, -column => 3,
 
 #############
 
-my $back_config_pap = $back_config->Labelframe(-text => _"papersettings");
+my $back_config_pap = $back_config->Labelframe(-text => ___"papersettings");
 
 
-my $back_config_pap_l1 = $back_config_pap->Label(-text => _"defaultpaperall", -anchor => "w");
+my $back_config_pap_l1 = $back_config_pap->Label(-text => ___"defaultpaperall", -anchor => "w");
 my $back_config_pap_m1 = $back_config_pap->Button(-text => "A4",
       -command => sub { change_paper("all", "a4"); });
 my $back_config_pap_r1 = $back_config_pap->Button(-text => "letter",
@@ -102,9 +102,9 @@ my (%l,%m,%r);
 foreach my $p (sort keys %papers) {
   my @pap = @{$papers{$p}};
   $defaultpaper{$p} = $pap[0];
-  $l{$p} = $back_config_pap->Label(-text => _("defaultpaperfor") . " $p", -anchor => "w");
+  $l{$p} = $back_config_pap->Label(-text => ___("defaultpaperfor") . " $p", -anchor => "w");
   $m{$p} = $back_config_pap->Label(-textvariable => \$defaultpaper{$p}, -anchor => "w");
-  $r{$p} = $back_config_pap->Button(-text => _"change",
+  $r{$p} = $back_config_pap->Button(-text => ___"change",
             -command => sub { select_paper($p); }, -anchor => "w");
   $l{$p}->grid(-row => $row, -column => 1,
            -padx => "2m", -pady => "2m", -sticky => "nsw");
@@ -119,8 +119,8 @@ $back_config_pap->pack;
 
 sub menu_default_location {
   my $val = $default_location;
-  my $sw = $mw->Toplevel(-title => _"changedefaultsrc");
-  $sw->Label(-text => _"newdefaultsrc")->pack;
+  my $sw = $mw->Toplevel(-title => ___"changedefaultsrc");
+  $sw->Label(-text => ___"newdefaultsrc")->pack;
   my $entry = $sw->Entry(-text => $location, -width => 30);
   $entry->pack;
   my $f = $sw->Frame;
@@ -140,15 +140,15 @@ sub toggle_setting() {
   if ($key eq "formats") { 
     my $new = ($localtlpdb->option_create_formats ? 0 : 1);
     $localtlpdb->option_create_formats($new);
-    $default_formats = ($new ? _"yes" : _"no");
+    $default_formats = ($new ? ___"yes" : ___"no");
   } elsif ($key eq "srcfiles") {
     my $new = ($localtlpdb->option_install_srcfiles ? 0 : 1);
     $localtlpdb->option_install_srcfiles($new);
-    $default_srcfiles = ($new ? _"yes" : _"no");
+    $default_srcfiles = ($new ? ___"yes" : ___"no");
   } elsif ($key eq "docfiles") {
     my $new = ($localtlpdb->option_install_docfiles ? 0 : 1);
     $localtlpdb->option_install_docfiles($new);
-    $default_docfiles = ($new ? _"yes" : _"no");
+    $default_docfiles = ($new ? ___"yes" : ___"no");
   }
   $localtlpdb->save;
 }
@@ -169,16 +169,16 @@ sub change_paper {
 
 sub select_paper {
   my $prog = shift;
-  my $foo = $back_config->Toplevel(-title => _("paperfor") . " $prog");
+  my $foo = $back_config->Toplevel(-title => ___("paperfor") . " $prog");
   my $var = $defaultpaper{$prog};
-  my $opt = $foo->BrowseEntry(-label => _("defaultpaperfor") . " $prog", -variable => \$var);
+  my $opt = $foo->BrowseEntry(-label => ___("defaultpaperfor") . " $prog", -variable => \$var);
   foreach my $p (sort @{$papers{$prog}}) {
     $opt->insert("end",$p);
   }
   $opt->pack;
   my $f = $foo->Frame;
-  $f->Button(-text => _"ok", -command => sub { change_paper($prog,$var); $foo->destroy; })->pack(-side => "left");
-  $f->Button(-text => _"cancel", -command => sub { $foo->destroy; })->pack(-side => "left");
+  $f->Button(-text => ___"ok", -command => sub { change_paper($prog,$var); $foo->destroy; })->pack(-side => "left");
+  $f->Button(-text => ___"cancel", -command => sub { $foo->destroy; })->pack(-side => "left");
   $f->pack;
 }
 
@@ -186,7 +186,7 @@ sub select_paper {
 
 sub old_select_paper {
   my $prog = shift;
-  my $foo = $back_config->Toplevel(-title => _("paperfor") . " $prog");
+  my $foo = $back_config->Toplevel(-title => ___("paperfor") . " $prog");
   my $var = $defaultpaper{$prog};
   my @lop = @{$papers{$prog}};
   my $nrpercols = 15;
@@ -200,8 +200,8 @@ sub old_select_paper {
       $row = 1;
     } 
   }
-  $foo->Button(-text => _"ok", -command => sub { change_paper($prog,$var); $foo->destroy; })->grid(-row => $nrpercols+1, -column => 1);
-  $foo->Button(-text => _"cancel", -command => sub { $foo->destroy; })->grid(-row => $nrpercols+1, -column => 2);
+  $foo->Button(-text => ___"ok", -command => sub { change_paper($prog,$var); $foo->destroy; })->grid(-row => $nrpercols+1, -column => 1);
+  $foo->Button(-text => ___"cancel", -command => sub { $foo->destroy; })->grid(-row => $nrpercols+1, -column => 2);
 }
 
 1;
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl
index d942e8ae0c9..76caa2d4c75 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl
@@ -6,27 +6,27 @@
 # GUI for tlmgr
 #
 
-our $back_f3 = $back->add("uninstall", -label => _"removaltab");
+our $back_f3 = $back->add("uninstall", -label => ___"removaltab");
 $screens{"uninstall"} = $back_f3;
 
 if ($^O=~/^MSWin(32|64)$/i) {
   my $lab = $back_f3->Label(-justify    => 'left', 
-           -text => _"pleaseuse");
+           -text => ___"pleaseuse");
 
   $lab->pack(-padx => "10m", -pady => "5m");
 } else {
   my $lab = $back_f3->Label(-justify    => 'left', 
-           -text => _"reallyremove");
+           -text => ___"reallyremove");
 
   $lab->pack(-padx => "10m", -pady => "5m");
 
   my $f = $back_f3->Frame;
   $f->pack(-padx => "10m", -pady => "5m");
 
-  my $ok = $f->Button(-text => _"removetl", 
+  my $ok = $f->Button(-text => ___"removetl", 
           -command => sub { 
                             system("tlmgr", "uninstall", "--force");
-                            $mw->Dialog(-text => _"completerem", -buttons => [ _"ok" ])->Show;
+                            $mw->Dialog(-text => ___"completerem", -buttons => [ ___"ok" ])->Show;
                             $mw->destroy; 
                             exit(0); 
                           });
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
index fcfff2a890b..123a89f80a0 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
@@ -108,7 +108,7 @@ $TRANS{'en'} = {
 #
 # we keep the translations in different arrays since we MAY add the feature
 # to switch language on the fly
-sub _ ($) {
+sub ___ ($) {
   my $s = shift;
   # if no $LANG is set just return without anything
   return $TRANS{"en"}->{$s} if !defined($LANG);
@@ -251,37 +251,37 @@ push @update_function_list, \&create_update_list;
 # frame .top
 our $top = $mw->Frame;
 
-our $quit = $top->Button(-text => _"quit",
+our $quit = $top->Button(-text => ___"quit",
                          -command => sub { $mw->destroy; exit(0); });
 
-our $about = $top->Button(-text => _"about",
+our $about = $top->Button(-text => ___"about",
   -command => sub {
-    $mw->Dialog(-title => _"about", 
+    $mw->Dialog(-title => ___"about", 
       -text => "TeX Live Manager GUI
 Copyright 2008 Tomasz Luczak, Norbert Preining
 License under the GNU General Public License version 2 or higher
 In case of problems, please contact: texlive\@tug.org",
-      -buttons => [ _"ok" ])->Show;
+      -buttons => [ ___"ok" ])->Show;
     });
                                                  
 $about->pack(-side => 'right');
 $quit->pack(-side => 'right');
 
-$top->Label(-text => _"currentsource" . " ")->pack(-side => 'left');
+$top->Label(-text => ___"currentsource" . " ")->pack(-side => 'left');
 $top->Label(-textvariable => \$location,  -relief => "sunken")->pack(-side => 'left');
 
 $balloon->attach(
-  $top->Button(-text => _"load", -command => sub { run_update_functions(); })->pack(-side => 'left'),
-  -balloonmsg => _"pressbutton");
+  $top->Button(-text => ___"load", -command => sub { run_update_functions(); })->pack(-side => 'left'),
+  -balloonmsg => ___"pressbutton");
 
 $balloon->attach(
-  $top->Button(-text => _"change", -command => sub { menu_edit_location(); })->pack(-side => 'left'),
-  -balloonmsg => _"changesrclong");
+  $top->Button(-text => ___"change", -command => sub { menu_edit_location(); })->pack(-side => 'left'),
+  -balloonmsg => ___"changesrclong");
 
 $balloon->attach(
-  $top->Checkbutton(-text => _"debug", 
+  $top->Checkbutton(-text => ___"debug", 
                     -variable => \$debugmode)->pack(-side => 'left'),
-  -balloonmsg => _"debugballoon");
+  -balloonmsg => ___"debugballoon");
 
 # frame .back -borderwidth 2
 our $back = $mw->NoteBook(-borderwidth => 2, -dynamicgeometry => 1);
@@ -293,37 +293,37 @@ $back->pack(-side => 'top', -fill => 'both', -expand => 1);
 
 require ("do_listframe.pl");
 # install screen
-our $back_f1 = $back->add("install",-label => _"install");
+our $back_f1 = $back->add("install",-label => ___"install");
 $screens{"install"} = $back_f1;
 do_listframe($back_f1,
-             _"addpkg", 
+             ___"addpkg", 
              \@allpackages,
-             { install => { -text => _"installsel", 
+             { install => { -text => ___"installsel", 
                             -command => \&install_selected_packages}},
              0,1
             );
 # update screen
-our $back_up = $back->add("update", -label => _"update");
+our $back_up = $back->add("update", -label => ___"update");
 $screens{"update"} = $back_up;
 do_listframe($back_up,
-             _"updatepkg", 
+             ___"updatepkg", 
              \@updatepackages,
-             { updateall => { -text => _"updateall", 
+             { updateall => { -text => ___"updateall", 
                               -command => \&update_selected_packages,
                               -args => [ "--all" ]
                             },
-               updatesel => { -text => _"updatesel",
+               updatesel => { -text => ___"updatesel",
                               -command => \&update_selected_packages
                             }},
              0,0
             );
 # remove screen
-our $back_f2 = $back->add("remove", -label => _"remove");
+our $back_f2 = $back->add("remove", -label => ___"remove");
 $screens{"remove"} = $back_f2;
 do_listframe($back_f2,
-             _"rempkg",
+             ___"rempkg",
              \@alllocalpackages,
-             { remove => { -text => _"removesel",
+             { remove => { -text => ___"removesel",
                            -command => \&remove_selected_packages}},
              1,1
             );
@@ -354,9 +354,9 @@ sub init_install_media {
     if (!defined($tlmediasrc)) {
       # something went badly wrong, maybe the newroot is wrong?
       $mw->Dialog(-title => "warning",
-                 -text => _"loaderrortxt",
-                        -buttons => [ _"ok" ])->Show;
-      $location = _"changeme";
+                 -text => ___"loaderrortxt",
+                        -buttons => [ ___"ok" ])->Show;
+      $location = ___"changeme";
       @allpackages = ();
     } else {
       $tlmediatlpdb = $tlmediasrc->tlpdb;
@@ -366,13 +366,13 @@ sub init_install_media {
 }
 
 sub run_program_show_output {
-  my $td = $mw->Toplevel(-title => _"tlmgr process");
+  my $td = $mw->Toplevel(-title => ___"tlmgr process");
   my $tf = $td->Scrolled("ROText", -width => 80, 
                                    -height => 10,
                                    -wrap => "none",
                          -scrollbars => "ose"
                         )->pack(-expand => 1, -fill => "both");
-  my $ok = $td->Button(-text => _"ok", -padx => "3m", -pady => "3m",
+  my $ok = $td->Button(-text => ___"ok", -padx => "3m", -pady => "3m",
                        -command => sub { $td->destroy; });
   # start the installation, read the output
   for (my $i = 0; $i < 100; $i++) {
@@ -382,12 +382,12 @@ sub run_program_show_output {
   # ok, that stupid perl for windows does not have fork, why? no idea
   # we have to deal with that
   if ($^O=~/^MSWin(32|64)$/i) {
-    $tf->insert("end", _("starting") . " @_\n\n" . _"maytaketime");
+    $tf->insert("end", ___("starting") . " @_\n\n" . ___"maytaketime");
     for (my $i = 0; $i < 100; $i++) {
       Tk::DoOneEvent(Tk::Event::DONT_WAIT);
     }
     my $ret = `@_`;
-    $tf->insert("end", "$ret\n\n" . _("completed") . "\n");
+    $tf->insert("end", "$ret\n\n" . ___("completed") . "\n");
     $tf->see("end");
     $ok->pack;
     for (my $i = 0; $i < 100; $i++) {
@@ -411,7 +411,7 @@ sub run_program_show_output {
       # do not buffer lines ...
       $| = 1;
       open STDERR, '>&STDOUT';
-      print _("starting") . " @_\n";
+      print ___("starting") . " @_\n";
       exec(@_)
         || die "can't exec program: $!";
       # NOTREACHED
@@ -544,12 +544,12 @@ sub setup_list {
 sub menu_edit_location {
   my $key = shift;
   my $val;
-  my $sw = $mw->Toplevel(-title => _"changesrc");
+  my $sw = $mw->Toplevel(-title => ___"changesrc");
   my $f1 = $sw->Frame;
-  $f1->Label(-text => _"newsource")->pack(-side => "left");
+  $f1->Label(-text => ___"newsource")->pack(-side => "left");
   my $entry = $f1->Entry(-text => $location, -width => 30);
   $entry->pack(-side => "left");
-  $f1->Button(-text => _"choosedir", 
+  $f1->Button(-text => ___"choosedir", 
     -command => sub {
                       my $var = $sw->chooseDirectory;
                       if (defined($var)) {
@@ -557,7 +557,7 @@ sub menu_edit_location {
                         $entry->insert(0,$var);
                       }
                     })->pack(-side => "left");
-  $f1->Button(-text => _"defaultnet",
+  $f1->Button(-text => ___"defaultnet",
     -command => sub {
                       $entry->delete(0,"end");
                       $entry->insert(0,$TeXLiveURL);