diff options
author | Karl Berry <karl@freefriends.org> | 2010-06-21 18:58:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-06-21 18:58:24 +0000 |
commit | 8da1d72196b845ee41bcb18ac6f72e3552b280db (patch) | |
tree | c49879903ea031dc2f6e6050fa0e18038adf1477 /Master/tlpkg/installer | |
parent | 170a532d50aa247d71effcbe642d75c7d3e14d66 (diff) |
* 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
Diffstat (limited to 'Master/tlpkg/installer')
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 13 | ||||
-rw-r--r-- | Master/tlpkg/installer/install-menu-wizard.pl | 9 |
2 files changed, 13 insertions, 9 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 9f0af3eb03c..6ac0f7f5349 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -1,14 +1,14 @@ #!/usr/bin/env perl # $Id$ # -# Copyright 2008, 2009 Norbert Preining +# Copyright 2008, 2009, 2010 Norbert Preining # Copyright 2008 Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 # or any later version. # # TODO: # - make the fancy selector the default, at least on unix -# - for win32 find out the necessary files for the fancy selector and move +# - for w32 find out the necessary files for the fancy selector and move # them to the installer perl package use strict; @@ -274,8 +274,8 @@ sub run_menu_perltk { } $row++; - $fr->Label(-text => (win32() ? __('Adjust PATH setting in registry') : - __('Create symlinks in system directories')), + $fr->Label(-text => (win32()) ? __('Adjust PATH setting in registry') : + __('Create symlinks in system directories'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); $fr->Label(-anchor => 'w', -textvariable => \$pathadjyesno)->grid(-row => $row, -column => 2, -padx => "2m"); if (unix()) { @@ -837,13 +837,13 @@ sub menu_update_texts { sub callback_select_scheme { my $s = shift; select_scheme($s); - $editoryesno = ( $vars{'collection-texworks'} ? __("Yes") : __("No") ); + $editoryesno = ($vars{'collection-texworks'} ? __("Yes") : __("No")); menu_update_texts(); } sub callback_select_collection { # special case for collection-texworks: - $editoryesno = ( $vars{'collection-texworks'} ? __("Yes") : __("No") ); + $editoryesno = ($vars{'collection-texworks'} ? __("Yes") : __("No")); calc_depends(); update_numbers(); menu_update_texts(); @@ -921,4 +921,3 @@ __END__ ### indent-tabs-mode: nil ### End: # vim:set tabstop=2 expandtab: # - 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: # - |