tinker with wording per denis, 23 Jan 2014 11:30:22

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

2 files changed, 12 insertions, 5 deletions

diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 846777bed59..c3403dcc7ef 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5892,14 +5892,14 @@ sub check_for_critical_updates
 
 sub critical_updates_warning {
   tlwarn("=" x 79, "\n");
-  tlwarn("Updates for tlmgr itself are present.\n");
-  tlwarn("So, please update the package manager first, via either\n");
+  tlwarn("tlmgr itself needs to be updated.\n");
+  tlwarn("Please do this via either\n");
   tlwarn("  tlmgr update --self\n");
   tlwarn("or by getting the latest updater for Unix-ish systems:\n");
   tlwarn("  $TeXLiveURL/update-tlmgr-latest.sh\n");
   tlwarn("and/or Windows systems:\n");
   tlwarn("  $TeXLiveURL/update-tlmgr-latest.exe\n");
-  tlwarn("Then continue with other updates.\n");
+  tlwarn("Then continue with other updates as usual.\n");
   tlwarn("=" x 79, "\n");
 }
 
diff --git a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
index 55a5b78deea..1304098a087 100644
--- a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
@@ -2285,9 +2285,16 @@ sub update_list_remote {
     # create the warning dialog
     #
     my $sw = $mw->DialogBox(-title => __("Warning"), -buttons => [ __("Ok") ]);
-    my $t = __("Updates for the tlmgr are present.\nInstallation and upgrades won't work without being forced.\nPlease select \"Update all installed\" button after dismissing this dialogue.\n\nThe program will terminate after the update.\nThen you can restart the program for further updates.");
+    my $t = __("The TeX Live manager (the software you're currently running)
+needs to be updated before any other updates can be done.
+
+Please do this by clicking the \"Update all installed\" button,
+after dismissing this dialogue.
+
+After the update, the TeX Live manager will terminate.
+You can then restart it to proceed with further updates."); 
     if ($min_action) {
-      $t .= "\n\n" . __("At least %s further updates are available after tlmgr has been updated.", $min_action);
+      $t .= "\n\n" . __("(At least %s further updates are available after tlmgr has been updated.)", $min_action);
     }
     $t .= "\n\n" . __("Please wait a bit after the program has terminated so that the update can be completed.") if win32();
     $sw->add("Label", -text => $t)->pack(-padx => "3m", -pady => "3m");