diff options
author | Norbert Preining <preining@logic.at> | 2009-09-03 07:39:21 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2009-09-03 07:39:21 +0000 |
commit | 354d95800a0aeff3779b0511cdcdf3beb801dcbb (patch) | |
tree | d2aa38b30561fdf527a2287e1302d21c9fcffa39 /Master/tlpkg/installer/install-menu-wizard.pl | |
parent | 75dd6c4cf9d482c52035776ec4363b1dc7c1fe69 (diff) |
use sprintf on the translated string with the rest of the arguments,
replace 2009 in many places by %s and added arguemtn TL:TLC:ReleaseYear
git-svn-id: svn://tug.org/texlive/trunk@15017 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-wizard.pl')
-rw-r--r-- | Master/tlpkg/installer/install-menu-wizard.pl | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index f0f9c1c571f..34d2c9dfdbc 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -140,7 +140,7 @@ sub run_menu_wizard { $ftitle->update; $ftitle->place(-x => $LEFT, -y => $TOP); - $tit = $ftitle->Label(-text => __('TeX Live 2009 Installation')); + $tit = $ftitle->Label(-text => __('TeX Live %s Installation', $TeXLive::TLConfig::ReleaseYear)); $usedfont= $tit->cget("-font"); $lineskip = $usedfont->metrics("-linespace"); @@ -179,7 +179,7 @@ sub reset_start { $counter->configure(-text => "1/5"); $prv->placeForget; - my $inf = $fmain->Label(-text => __("Welcome to the installation of TeX Live 2009\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.") . "\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 ); @@ -383,7 +383,7 @@ sub ask_go { $_->destroy; } $counter->configure(-text => "4/5"); - my $inf = $fmain->Label(-justify => "left", -text => __("We are ready to install TeX Live 2009.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.")); + my $inf = $fmain->Label(-justify => "left", -text => __("We are ready to install TeX Live %s.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.", $TeXLive::TLConfig::ReleaseYear)); $inf->place(-x => 0, -y => 80); @@ -456,14 +456,12 @@ sub wizard_installation_window { do_installation(); $::progress->value(110); $return = $MENU_ALREADYDONE; - my $t = __("See TEXDIR/index.html for links to documentation.\nThe TeX Live web site (http://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; please consider supporting it by joining the group best for you. The list of groups is available on the web at http://tug.org/usergroups.html."); + my $t = __("See %s/index.html for links to documentation.\nThe TeX Live web site (http://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; please consider supporting it by joining the group best for you. The list of groups is available on the web at http://tug.org/usergroups.html.", $::vars{'TEXDIR'}); if (!win32()) { - $t .= "\n\n" . __("Add TEXDIR/texmf/doc/man to MANPATH.\nAdd TEXDIR/texmf/doc/info to INFOPATH.\nMost importantly, add TEXDIR/bin/PLATFORM\nto your PATH for current and future sessions."); + $t .= "\n\n" . __("Add %s/texmf/doc/man to MANPATH.\nAdd %s/texmf/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.", $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'this_platform'}); } $t .= "\n\n" . __('Welcome to TeX Live!'); - $t =~ s/TEXDIR/$::vars{'TEXDIR'}/g; - $t =~ s/PLATFORM/$::vars{'this_platform'}/g; - $t =~ s/\\n/\n/g; + #$t =~ s/\\n/\n/g; my $linechar = $::progressw->index("end"); $::progressw->markSet("finaltext", $linechar); $::progressw->markGravity("finaltext", "left"); |