fix the translation chaos, hopefully now it works

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

4 files changed, 3 insertions, 2 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
index c910c7cf5c4..fbbbee95924 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
@@ -54,7 +54,7 @@ my $opt_screen = $::guiscreen;
 # prepare for loading of lang.pl which expects $::lang and $::opt_lang
 $::opt_lang = $opts{"gui-lang"} if (defined($opts{"gui-lang"}));
 
-require("translations/trans.pl");
+require("TeXLive/trans.pl");
 
 our @update_function_list;
 
diff --git a/Master/tlpkg/translations/trans.pl b/Master/tlpkg/TeXLive/trans.pl
index 6f4055eb9d0..dbfcef3b43a 100644
--- a/Master/tlpkg/translations/trans.pl
+++ b/Master/tlpkg/TeXLive/trans.pl
@@ -103,6 +103,7 @@ sub __ ($@) {
 if (($::lang ne "en") && ($::lang ne "C")) {
   if (! -r "$::installerdir/tlpkg/translations/$::lang.po") {
     tlwarn ("\n  Sorry, no translations available for $::lang; falling back to English.
+  Make sure that you have the package \"texlive-msg-translations\" installed.
   (If you'd like to help translate the installer's messages, please see
   http://tug.org/texlive/doc.html#install-tl-xlate for information.)\n\n");
   } else {
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index fc033b45c24..bc916eea138 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -36,6 +36,7 @@ depend tcdialog
 depend tetex
 depend tex
 depend texconfig
+depend texlive-msg-translations
 depend texlive-scripts
 depend texlive.infra
 depend xdvi
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index d8b5e1e7f1f..cb85b202be4 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -14,7 +14,6 @@ runpattern d texmf/scripts/texlive/tlmgrgui
 runpattern d tlpkg/TeXLive
 # we move the translations out of the main package to make updates easier
 # runpattern d tlpkg/translations
-depend texlive-msg-translations
 runpattern f LICENSE*
 runpattern f README
 runpattern f README*