suggestions from Tomek and Manuel

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

1 files changed, 16 insertions, 10 deletions

diff --git a/Master/tlpkg/dev/tlmgrgui2.pl b/Master/tlpkg/dev/tlmgrgui2.pl
index 1e683d8f255..a8f5a300e9b 100644
--- a/Master/tlpkg/dev/tlmgrgui2.pl
+++ b/Master/tlpkg/dev/tlmgrgui2.pl
@@ -12,6 +12,12 @@
 #       to here!!
 # TODO: center checkbuttons vertically
 # TODO: double click on one line should pop up a window with tlmgr show info
+# TODO: if repo is changed on Options->General, the File->Load default shoul
+#       change, too
+# TODO: warning window from execute_action_gui if something failed, and also
+#       from some other commands that have been run
+# TODO: remove the "all <-> matching" and activate it as soon as the
+#       match string is not empty.
 
 $^W = 1;
 use strict;
@@ -183,7 +189,7 @@ $menu_file->add('command', -label => "Load default net repository: $TeXLiveURL",
                      update_loaded_location_string();
                      run_update_functions(); 
                   });
-$menu_file->add('command', -label => "Load other repository",
+$menu_file->add('command', -label => "Load other repository ...",
   -command => sub { menu_edit_location(); });
 $menu_file->add('separator');
 $menu_file->add('command', -label => __("Quit"),
@@ -192,11 +198,11 @@ $menu_file->add('command', -label => __("Quit"),
 #
 # OPTIONS MENU
 #
-$menu_options->add('command', -label => __("General settings"),
+$menu_options->add('command', -label => __("General ..."),
   -command => sub { do_general_settings(); });
-$menu_options->add('command', -label => __("Paper settings"),
+$menu_options->add('command', -label => __("Paper ..."),
   -command => sub { do_paper_settings(); });
-$menu_options->add('command', -label => __("Arch settings"),
+$menu_options->add('command', -label => __("Architectures ..."),
   -command => sub { do_arch_settings(); });
 $menu_options->add('separator');
 $menu_options->add('checkbutton', -label => __("Debug"),
@@ -251,7 +257,7 @@ if (!win32()) {
 }
 if (!win32()) {
   $menu_actions->add('separator');
-  $menu_actions->add('command', -label => __("Remove TeX Live %s", $TeXLive::TLConfig::ReleaseYear),
+  $menu_actions->add('command', -label => __("Remove TeX Live %s ...", $TeXLive::TLConfig::ReleaseYear),
     -state => $::action_button_state,
     -command => sub { 
       my $sw = $mw->DialogBox(-title => __("Remove TeX Live %s", $TeXLive::TLConfig::ReleaseYear),
@@ -582,7 +588,7 @@ $with_sel_frame->Button(-text => 'Install',
                         -state => $::action_button_state,
                         -command => sub { install_selected_packages(); }
   )->pack(@left, @p_ii);
-$with_sel_frame->Button(-text => 'Upgrade',
+$with_sel_frame->Button(-text => 'Update',
                         -state => $::action_button_state,
                         -command => sub { update_selected_packages(); }
   )->pack(@left, @p_ii);
@@ -707,7 +713,7 @@ sub init_defaults_setting {
 }
 
 sub do_general_settings {
-  my $sw = $mw->Toplevel(-title => __("Default settings"));
+  my $sw = $mw->Toplevel(-title => __("Default options"));
   $sw->transient($mw);
   $sw->grab();
   init_defaults_setting();
@@ -729,7 +735,7 @@ sub do_general_settings {
   my @config_set_m;
   my @config_set_r;
 
-  my $back_config_set = $sw->Labelframe(-text => __("Default settings"));
+  my $back_config_set = $sw->Labelframe(-text => __("Default options"));
   my $back_config_buttons = $sw->Frame();
   $back_config_set->pack(-fill => "both", -padx => "2m", -pady => "2m");
 
@@ -938,7 +944,7 @@ sub init_all_papers {
 
 sub do_paper_settings {
   init_all_papers();
-  my $sw = $mw->Toplevel(-title => __("Paper settings"));
+  my $sw = $mw->Toplevel(-title => __("Paper options"));
   $sw->transient($mw);
   $sw->grab();
   
@@ -947,7 +953,7 @@ sub do_paper_settings {
   my $lower = $sw->Frame;
   $lower->pack(-fill => "both");
 
-  my $back_config_pap = $lower->Labelframe(-text => __("Paper settings"));
+  my $back_config_pap = $lower->Labelframe(-text => __("Paper options"));
   my $back_config_buttons = $sw->Frame();