From 8da1d72196b845ee41bcb18ac6f72e3552b280db Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Jun 2010 18:58:24 +0000 Subject: * install/install-menu-perltk.pl, * install/install-menu-wizard.pl: gettext no longer supports (x ? y : z), despite the current examples at the end of: http://www.gnu.org/software/gettext/manual/html_node/General-Problems.html. Rewrite as (x) : y : z. No actual string changes. * tl-update-messages: revert to using current gettext. git-svn-id: svn://tug.org/texlive/trunk@19095 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/installer/install-menu-wizard.pl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Master/tlpkg/installer/install-menu-wizard.pl') diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index 252da1f3e9c..8e92cf77e0e 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -177,7 +177,13 @@ sub reset_start { $counter->configure(-text => "1/5"); $prv->placeForget; - my $inf = $fmain->Label(-text => __("Welcome to the installation of TeX Live %s\nhttp://tug.org/texlive\n\nThis wizard will guide you through the installation.\n\nFor an advanced, customizable installation, please consult\nthe web pages or installation guide.", $TeXLive::TLConfig::ReleaseYear) . "\n" . (win32() ? __("Or use install-tl-advanced.bat") : __("Or use the argument --gui perltk to install-tl.")), -justify => "left"); + my $inf = $fmain->Label( + -text => __("Welcome to the installation of TeX Live %s\nhttp://tug.org/texlive\n\nThis wizard will guide you through the installation.\n\nFor an advanced, customizable installation, please consult\nthe web pages or installation guide.", $TeXLive::TLConfig::ReleaseYear) + . "\n" + . (win32()) + ? __("Or use install-tl-advanced.bat") + : __("Or use the argument --gui perltk to install-tl."), + -justify => "left"); $inf->place(-x => 0, -y => 100); $nxt->configure(-text => __("Next >") , -command => \&ask_path ); @@ -483,4 +489,3 @@ __END__ ### indent-tabs-mode: nil ### End: # vim:set tabstop=2 expandtab: # - -- cgit v1.2.3