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/bin/tl-update-messages | 13 ++++++------- Master/tlpkg/installer/install-menu-perltk.pl | 13 ++++++------- Master/tlpkg/installer/install-menu-wizard.pl | 9 +++++++-- 3 files changed, 19 insertions(+), 16 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/bin/tl-update-messages b/Master/tlpkg/bin/tl-update-messages index e95800ded94..ab1ce79cdc6 100755 --- a/Master/tlpkg/bin/tl-update-messages +++ b/Master/tlpkg/bin/tl-update-messages @@ -5,26 +5,25 @@ # update the master messages.pot catalog and merge the result into the # respective .po files. -PATH=/usr/bin:/bin # force system gettext tools for now (14jun10) - mydir=`cd \`dirname $0\` && /bin/pwd` Master=`cd $mydir/../.. && /bin/pwd` transdir=$Master/tlpkg/translations cd $Master || exit 1 cp $transdir/messages.pot $transdir/messages.prev -xgettext -o tlpkg/translations/messages.pot -L Perl \ +xgettext -o tlpkg/translations/messages.pot \ + -L Perl \ --copyright-holder="TeX Live Team" \ --msgid-bugs-address=tex-live@tug.org \ - -k__ -k\$__ -k%__ -k__x -k__n:1,2 -k__nx:1,2 -k__xn:1,2 -kN__ -k \ + --package-version=2010 \ + --package-name="TeX Live" \ + -k__ -k\$__ -k%__ -k__x -k__n:1,2 -k__nx:1,2 -k__xn:1,2 -kN__ -k \ tlpkg/installer/install-menu-wizard.pl \ tlpkg/installer/install-menu-perltk.pl \ texmf/scripts/texlive/tlmgrgui.pl \ texmf/scripts/texlive/tlmgrgui/*.pl -# --package-version=2010 \ -# --package-name="TeX Live" \ - +exit 0 cd $transdir || exit 1 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: # - -- cgit v1.2.3