summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-02-05 11:57:58 +0000
committerNorbert Preining <preining@logic.at>2009-02-05 11:57:58 +0000
commite7399656eac0ee225d3de9e0704fa310d05c387f (patch)
treea1d0d01488dc784b19c78fcaac1c4cdaf1e8ce77 /Master
parenta4dedfcdb3afa877d3f8b32a328a119716f0ec97 (diff)
installer stuff work:
- factor out the translations initialization to install-translations.pl - update the perltk-en.sample and german translations for wizard - make wizard translatable git-svn-id: svn://tug.org/texlive/trunk@12093 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl174
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl191
-rw-r--r--Master/tlpkg/installer/install-translations.pl165
-rw-r--r--Master/tlpkg/installer/lang/perltk-de3
-rw-r--r--Master/tlpkg/installer/lang/perltk-en.sample125
5 files changed, 284 insertions, 374 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 798610b1c54..fc7a35a5f8b 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -17,6 +17,19 @@ my $svnrev = '$Revision$';
$svnrev =~ m/: ([0-9]+) /;
$::menurevision = $1;
+require Tk;
+require Tk::Dialog;
+require Tk::DialogBox;
+require Tk::PNG;
+require Tk::ROText;
+require Tk::ProgressBar;
+
+if ($::alternative_selector) {
+ require Tk::DirTree;
+}
+
+use utf8;
+no utf8;
our %vars;
our $tlpdb;
@@ -32,62 +45,14 @@ our $MENU_ALREADYDONE = 3;
my $return = $MENU_INSTALL;
-require Tk;
-require Tk::Dialog;
-require Tk::DialogBox;
-require Tk::PNG;
-require Tk::ROText;
-require Tk::ProgressBar;
+our %text;
+our %labels;
+require("installer/install-translations.pl");
-if ($::alternative_selector) {
- require Tk::DirTree;
-}
-use utf8;
-no utf8;
-
-if (defined($::opt_lang)) {
- $::lang = $::opt_lang;
- if ($::lang eq "zh") {
- # set language to simplified chinese
- $::lang = "zh-cn";
- }
-} else {
- if ($^O =~ /^MSWin(32|64)$/i) {
- # trying to deduce automatically the country code
- my $foo = TeXLive::TLWinGoo::reg_country();
- if ($foo) {
- $::lang = $foo;
- } else {
- debug("Didn't get any usuful code from reg_country: $foo...\n");
- }
- } else {
- # we load POSIX and locale stuff
- require POSIX;
- import POSIX qw/locale_h/;
- # now we try to deduce $::lang
- my $loc = setlocale(&POSIX::LC_MESSAGES);
- my ($lang,$area,$codeset);
- if ($loc =~ m/^([^_.]*)(_([^.]*))?(\.([^@]*))?(@.*)?$/) {
- $lang = defined($1)?$1:"";
- $area = defined($3)?$3:"";
- if ($lang eq "zh") {
- if ($area =~ m/^(TW|HK)$/i) {
- $lang = "zh-tw";
- } else {
- # fallback to zh-cn for anything else, that is
- # zh-cn, zh-sg, zh, and maybe something else
- $lang = "zh-cn";
- }
- }
- }
- $::lang = $lang if ($lang);
- }
-}
my $mw;
my $subframe;
my $mainwindow;
-
my $bintextbutton;
my $schemebutton;
my $collectionstext;
@@ -102,6 +67,18 @@ my $optletterstate;
my $optfmtstate;
my $optsrcstate;
my $optdocstate;
+my $letteryesno = ( $vars{'option_letter'} ? $text{'yes'} : $text{'no'} );
+my $fmtyesno = ( $vars{'option_fmt'} ? $text{'yes'} : $text{'no'} );
+my $srcyesno = ( $vars{'option_src'} ? $text{'yes'} : $text{'no'} );
+my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} );
+
+$::run_menu = \&run_menu_perltk;
+
+
+####################################################################
+# From here on only function definitions
+# ##################################################################
+
sub setup_hooks_perltk {
push @::info_hook,
@@ -140,100 +117,6 @@ sub update_progressbar {
}
}
-my %text = ( title => 'TeX Live 2008 Installation',
- basicinfo => 'Basic Information',
- custom => 'Further Customization',
- dirsetup => "Directory setup",
- options => 'Options',
- sysint => 'System Integration',
- change => 'Change',
- toggle => 'Toggle',
- install => 'Install TeX Live',
- finbut => 'Finish',
- quit => 'Quit',
- ok => 'Ok',
- cancel => 'Cancel',
- status => 'Status output',
- changevar => 'Change variable value',
- enterpath => 'Enter path for',
- hinthome => '(use ~ for %%%)',
- selectscheme => 'Select a scheme',
- selectstdcol => 'Select the collections to be installed',
- selectall => 'Select All',
- selectnone => 'Deselect All',
- selectlang => 'Select language support',
- selectdoc => 'Select language-specific documentation',
- createsym => 'create symlinks in standard directories',
- binto => 'binaries to',
- manto => 'manpages to',
- infoto => 'info to',
- selectsys => 'Select arch-os',
- outof => 'out of',
- collof => 'collections out of',
- diskreq => 'disk space required',
- yes => 'Yes',
- no => 'No',
- notwritable => '(default not writable - please change!)',
- changetexdir => '(please change TEXDIR first!)',
- nolangcol => '(no language collection selected!)',
- finished => 'See TEXDIR/index.html for links to documentation.\nThe TeX Live web site\n(http://tug.org/texlive/) contains any updates and corrections.\nTeX Live is a joint project of the TeX user groups around the world;\nplease consider supporting it by joining the group best for you. The\nlist of groups is available on the web at http://tug.org/usergroups.html.',
- finishedpath => '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.',
- welcome => 'Welcome to TeX Live!',
- wizard => 'Go to Wizard',
- );
-
-
-my %labels = ( binsys => 'Binary System(s)',
- scheme => 'Selected Scheme',
- stdcoll => 'Standard Collections',
- langcoll => 'Language Collections',
- texdir => 'TEXDIR (the main TeX directory)',
- localdir => 'TEXMFLOCAL (directory for site-wide local files)',
- sysvardir => 'TEXMFSYSVAR (directory for autogenerated data)',
- sysconfigdir => 'TEXMFSYSCONFIG (directory for local config)',
- texmfhome => 'TEXMFHOME (directory for user-specific files)',
- optletter => 'Use letter-size paper by default, instead of A4',
- optfmt => 'Create all format files',
- optdoc => 'Install font/macro doc tree',
- optsrc => 'Install font/macro source tree',
- symlink => 'Create symlinks in system directories',
- );
-
-if (($::lang ne "en") && ($::lang ne "C")) {
- if (! -r "$::installerdir/tlpkg/installer/lang/perltk-$::lang") {
- tlwarn ("\n Sorry, no translations available for $::lang; falling back to English.
- (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 {
- # merge the translated strings into the text string
- open(LANG, "<$::installerdir/tlpkg/installer/lang/perltk-$::lang");
- my %trans;
- while (<LANG>) {
- chomp;
- next if m/^\s*#/;
- next if m/^\s*$/;
- my ($a,$b) = split(/:/,$_,2);
- $b =~ s/^\s*([^\s])/$1/;
- $b =~ s/\s*$//;
- if (!utf8::decode($b)) {
- warn("decoding string to utf8 didn't work:$b\n");
- }
- $trans{"$a"} = "$b";
- }
- close(LANG);
- foreach my $k (keys %text) {
- $text{$k} = $trans{"text.$k"} if defined($trans{"text.$k"});
- }
- foreach my $k (keys %labels) {
- $labels{$k} = $trans{"label.$k"} if defined($trans{"label.$k"});
- }
- }
-}
-
-my $letteryesno = ( $vars{'option_letter'} ? $text{'yes'} : $text{'no'} );
-my $fmtyesno = ( $vars{'option_fmt'} ? $text{'yes'} : $text{'no'} );
-my $srcyesno = ( $vars{'option_src'} ? $text{'yes'} : $text{'no'} );
-my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} );
sub run_menu_perltk {
calc_depends();
@@ -427,7 +310,6 @@ sub run_menu_perltk {
Tk::MainLoop();
return($return);
}
-$::run_menu = \&run_menu_perltk;
sub installation_window {
# create a progress bar window
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index 4a931130718..86cbd66416c 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -40,58 +40,42 @@ no utf8;
#
#
my $tit;
-
my $can;
my $prv;
my $nxt;
-
my $img;
-
-if (defined($::opt_lang)) {
- $::lang = $::opt_lang;
- if ($::lang eq "zh") {
- # set language to simplified chinese
- $::lang = "zh-cn";
- }
-} else {
- if ($^O =~ /^MSWin(32|64)$/i) {
- # trying to deduce automatically the country code
- my $foo = TeXLive::TLWinGoo::reg_country();
- if ($foo) {
- $::lang = $foo;
- } else {
- debug("Didn't get any usuful code from reg_country: $foo...\n");
- }
- } else {
- # we load POSIX and locale stuff
- require POSIX;
- import POSIX qw/locale_h/;
- # now we try to deduce $::lang
- my $loc = setlocale(&POSIX::LC_MESSAGES);
- my ($lang,$area,$codeset);
- if ($loc =~ m/^([^_.]*)(_([^.]*))?(\.([^@]*))?(@.*)?$/) {
- $lang = defined($1)?$1:"";
- $area = defined($3)?$3:"";
- if ($lang eq "zh") {
- if ($area =~ m/^(TW|HK)$/i) {
- $lang = "zh-tw";
- } else {
- # fallback to zh-cn for anything else, that is
- # zh-cn, zh-sg, zh, and maybe something else
- $lang = "zh-cn";
- }
- }
- }
- $::lang = $lang if ($lang);
- }
-}
-
-
my $dest;
+my $warning;
my $mw;
my $usedfont;
+my $fmain;
+my $fbuttons;
+my $ftitle;
+my $counter;
+my $lineskip;
+
+my $LEFT = 130;
+my $RIGHT = 50;
+my $TOP = 50;
+my $BOTTOM = 50;
+my $INF = 300;
+my $MWIDTH = 730;
+my $MHEIGHT = 480;
+my $TITLEHEIGHT = 30;
+my $BUTTONSHEIGHT = 50;
+my $INNERWIDTH = ($MWIDTH - $LEFT - $RIGHT);
+my $INNERHEIGHT = ($MHEIGHT - $TOP - $TITLEHEIGHT - $BOTTOM - $BUTTONSHEIGHT);
+
+our %text;
+our %labels;
+require("installer/install-translations.pl");
+
+# the main installer runs %{$::run_menu}
+$::run_menu = \&run_menu_wizard;
######################################################################
+# From here on only function definitions
+# ####################################################################
sub setup_hooks_wizard {
push @::info_hook,
@@ -122,122 +106,6 @@ sub wizard_update_progressbar {
}
}
-my %text = ( title => 'TeX Live 2008 Installation',
- basicinfo => 'Basic Information',
- custom => 'Further Customization',
- dirsetup => "Directory setup",
- options => 'Options',
- sysint => 'System Integration',
- change => 'Change',
- toggle => 'Toggle',
- install => 'Install TeX Live',
- finbut => 'Finish',
- quit => 'Quit',
- ok => 'Ok',
- cancel => 'Cancel',
- status => 'Status output',
- changevar => 'Change variable value',
- enterpath => 'Enter path for',
- hinthome => '(use ~ for %%%)',
- selectscheme => 'Select a scheme',
- selectstdcol => 'Select the collections to be installed',
- selectall => 'Select All',
- selectnone => 'Deselect All',
- selectlang => 'Select language support',
- selectdoc => 'Select language-specific documentation',
- createsym => 'create symlinks in standard directories',
- binto => 'binaries to',
- manto => 'manpages to',
- infoto => 'info to',
- selectsys => 'Select arch-os',
- outof => 'out of',
- collof => 'collections out of',
- diskreq => 'disk space required',
- yes => 'Yes',
- no => 'No',
- notwritable => '(default not writable - please change!)',
- changetexdir => '(please change TEXDIR first!)',
- nolangcol => '(no language collection selected!)',
- finished => '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.',
- finishedpath => '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.',
- welcome => 'Welcome to TeX Live!',
- next => 'Next >',
- prev => '< Back',
- wizhello => "Welcome to the installation of TeX Live 2008\nhttp://tug.org/texlive\n\nThis wizard will guide you through the installation.",
- destfolder => 'Destination folder:',
- advcustom => 'Advanced customization',
- pathinfo => "The destination folder will contain the installation.\nIt is strongly recommended to keep the year as the last component.",
- readyinst => "We are ready to install TeX Live 2008.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.",
- instshort => 'Install',
- );
-
-
-my %labels = ( binsys => 'Binary System(s)',
- scheme => 'Selected Scheme',
- stdcoll => 'Standard Collections',
- langcoll => 'Language Collections',
- texdir => 'TEXDIR (the main TeX directory)',
- localdir => 'TEXMFLOCAL (directory for site-wide local files)',
- sysvardir => 'TEXMFSYSVAR (directory for autogenerated data)',
- sysconfigdir => 'TEXMFSYSCONFIG (directory for local config)',
- texmfhome => 'TEXMFHOME (directory for user-specific files)',
- optletter => 'Use letter size instead of A4 by default',
- optfmt => 'Create all format files',
- optdoc => 'Install font/macro doc tree',
- optsrc => 'Install font/macro source tree',
- symlink => 'Create symlinks in system directories',
- );
-
-if (($::lang ne "en") && ($::lang ne "C")) {
- if (! -r "$::installerdir/tlpkg/installer/lang/perltk-$::lang") {
- tlwarn ("\n Sorry, no translations available for $::lang; falling back to English.
- (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 {
- # merge the translated strings into the text string
- open(LANG, "<$::installerdir/tlpkg/installer/lang/perltk-$::lang");
- my %trans;
- while (<LANG>) {
- chomp;
- next if m/^\s*#/;
- next if m/^\s*$/;
- my ($a,$b) = split(/:/,$_,2);
- $b =~ s/^\s*([^\s])/$1/;
- $b =~ s/\s*$//;
- if (!utf8::decode($b)) {
- warn("decoding string to utf8 didn't work:$b\n");
- }
- $b =~ s/\\n/\n/g;
- $trans{"$a"} = "$b";
- }
- close(LANG);
- foreach my $k (keys %text) {
- $text{$k} = $trans{"text.$k"} if defined($trans{"text.$k"});
- }
- foreach my $k (keys %labels) {
- $labels{$k} = $trans{"label.$k"} if defined($trans{"label.$k"});
- }
- }
-}
-
-
-my $LEFT = 130;
-my $RIGHT = 50;
-my $TOP = 50;
-my $BOTTOM = 50;
-my $INF = 300;
-my $MWIDTH = 730;
-my $MHEIGHT = 480;
-my $TITLEHEIGHT = 30;
-my $BUTTONSHEIGHT = 50;
-my $INNERWIDTH = ($MWIDTH - $LEFT - $RIGHT);
-my $INNERHEIGHT = ($MHEIGHT - $TOP - $TITLEHEIGHT - $BOTTOM - $BUTTONSHEIGHT);
-
-my $fmain;
-my $fbuttons;
-my $ftitle;
-my $counter;
-my $lineskip;
################# WELCOME SCREEN ######################################
sub run_menu_wizard {
@@ -284,7 +152,6 @@ sub run_menu_wizard {
Tk::MainLoop();
return($return);
}
-$::run_menu = \&run_menu_wizard;
sub reset_start {
for ($fmain->children) {
@@ -302,8 +169,6 @@ sub reset_start {
################## PATH SCREEN ################################
-my $warning;
-
sub ask_path {
for ($fmain->children) {
$_->destroy;
@@ -478,8 +343,6 @@ sub wizard_installation_window {
$can->placeForget;
$nxt->configure(-text => $text{'cancel'},
-command => sub { $return = $MENU_ABORT; $mw->destroy; });
-
-# set the vars
calc_depends();
do_installation();
$::progress->value(110);
diff --git a/Master/tlpkg/installer/install-translations.pl b/Master/tlpkg/installer/install-translations.pl
new file mode 100644
index 00000000000..6dcaf87c9be
--- /dev/null
+++ b/Master/tlpkg/installer/install-translations.pl
@@ -0,0 +1,165 @@
+#!/usr/bin/env perl
+# $Id$
+#
+# Copyright 2009 Norbert Preining
+# This file is licensed under the GNU General Public License version 2
+# or any later version.
+#
+
+use strict;
+$^W = 1;
+
+use utf8;
+no utf8;
+
+if (defined($::opt_lang)) {
+ $::lang = $::opt_lang;
+ if ($::lang eq "zh") {
+ # set language to simplified chinese
+ $::lang = "zh-cn";
+ }
+} else {
+ if ($^O =~ /^MSWin(32|64)$/i) {
+ # trying to deduce automatically the country code
+ my $foo = TeXLive::TLWinGoo::reg_country();
+ if ($foo) {
+ $::lang = $foo;
+ } else {
+ debug("Didn't get any usuful code from reg_country: $foo...\n");
+ }
+ } else {
+ # we load POSIX and locale stuff
+ require POSIX;
+ import POSIX qw/locale_h/;
+ # now we try to deduce $::lang
+ my $loc = setlocale(&POSIX::LC_MESSAGES);
+ my ($lang,$area,$codeset);
+ if ($loc =~ m/^([^_.]*)(_([^.]*))?(\.([^@]*))?(@.*)?$/) {
+ $lang = defined($1)?$1:"";
+ $area = defined($3)?$3:"";
+ if ($lang eq "zh") {
+ if ($area =~ m/^(TW|HK)$/i) {
+ $lang = "zh-tw";
+ } else {
+ # fallback to zh-cn for anything else, that is
+ # zh-cn, zh-sg, zh, and maybe something else
+ $lang = "zh-cn";
+ }
+ }
+ }
+ $::lang = $lang if ($lang);
+ }
+}
+
+
+our %text = (title => 'TeX Live 2008 Installation',
+ basicinfo => 'Basic Information',
+ custom => 'Further Customization',
+ dirsetup => "Directory setup",
+ options => 'Options',
+ sysint => 'System Integration',
+ change => 'Change',
+ toggle => 'Toggle',
+ install => 'Install TeX Live',
+ finbut => 'Finish',
+ quit => 'Quit',
+ ok => 'Ok',
+ cancel => 'Cancel',
+ status => 'Status output',
+ changevar => 'Change variable value',
+ enterpath => 'Enter path for',
+ hinthome => '(use ~ for %%%)',
+ selectscheme => 'Select a scheme',
+ selectstdcol => 'Select the collections to be installed',
+ selectall => 'Select All',
+ selectnone => 'Deselect All',
+ selectlang => 'Select language support',
+ selectdoc => 'Select language-specific documentation',
+ createsym => 'create symlinks in standard directories',
+ binto => 'binaries to',
+ manto => 'manpages to',
+ infoto => 'info to',
+ selectsys => 'Select arch-os',
+ outof => 'out of',
+ collof => 'collections out of',
+ diskreq => 'disk space required',
+ yes => 'Yes',
+ no => 'No',
+ notwritable => '(default not writable - please change!)',
+ changetexdir => '(please change TEXDIR first!)',
+ nolangcol => '(no language collection selected!)',
+ finished => '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.',
+ finishedpath => '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.',
+ welcome => 'Welcome to TeX Live!',
+ next => 'Next >',
+ prev => '< Back',
+ wizhello => "Welcome to the installation of TeX Live 2008\nhttp://tug.org/texlive\n\nThis wizard will guide you through the installation.",
+ destfolder => 'Destination folder:',
+ advcustom => 'Advanced customization',
+ pathinfo => "The destination folder will contain the installation.\nIt is strongly recommended to keep the year as the last component.",
+ readyinst => "We are ready to install TeX Live 2008.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.",
+ instshort => 'Install',
+ wizard => 'Go to Wizard',
+ );
+
+
+our %labels = (binsys => 'Binary System(s)',
+ scheme => 'Selected Scheme',
+ stdcoll => 'Standard Collections',
+ langcoll => 'Language Collections',
+ texdir => 'TEXDIR (the main TeX directory)',
+ localdir => 'TEXMFLOCAL (directory for site-wide local files)',
+ sysvardir => 'TEXMFSYSVAR (directory for autogenerated data)',
+ sysconfigdir => 'TEXMFSYSCONFIG (directory for local config)',
+ texmfhome => 'TEXMFHOME (directory for user-specific files)',
+ optletter => 'Use letter size instead of A4 by default',
+ optfmt => 'Create all format files',
+ optdoc => 'Install font/macro doc tree',
+ optsrc => 'Install font/macro source tree',
+ symlink => 'Create symlinks in system directories',
+ );
+
+if (($::lang ne "en") && ($::lang ne "C")) {
+ if (! -r "$::installerdir/tlpkg/installer/lang/perltk-$::lang") {
+ tlwarn ("\n Sorry, no translations available for $::lang; falling back to English.
+ (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 {
+ # merge the translated strings into the text string
+ open(LANG, "<$::installerdir/tlpkg/installer/lang/perltk-$::lang");
+ my %trans;
+ while (<LANG>) {
+ chomp;
+ next if m/^\s*#/;
+ next if m/^\s*$/;
+ my ($a,$b) = split(/:/,$_,2);
+ $b =~ s/^\s*([^\s])/$1/;
+ $b =~ s/\s*$//;
+ if (!utf8::decode($b)) {
+ warn("decoding string to utf8 didn't work:$b\n");
+ }
+ $b =~ s/\\n/\n/g;
+ $trans{"$a"} = "$b";
+ }
+ close(LANG);
+ foreach my $k (keys %text) {
+ $text{$k} = $trans{"text.$k"} if defined($trans{"text.$k"});
+ }
+ foreach my $k (keys %labels) {
+ $labels{$k} = $trans{"label.$k"} if defined($trans{"label.$k"});
+ }
+ }
+}
+
+
+1;
+
+__END__
+
+### Local Variables:
+### perl-indent-level: 2
+### tab-width: 2
+### indent-tabs-mode: nil
+### End:
+# vim:set tabstop=2 expandtab: #
+
diff --git a/Master/tlpkg/installer/lang/perltk-de b/Master/tlpkg/installer/lang/perltk-de
index f24d9f4fe4c..90f36040dad 100644
--- a/Master/tlpkg/installer/lang/perltk-de
+++ b/Master/tlpkg/installer/lang/perltk-de
@@ -44,12 +44,13 @@ text.welcome: Willkomen bei TeX Live!
text.hinthome: (~ steht für %%%)
text.next: Weiter >
text.prev: < Zurück
-text.wizhello: Wolkommen zur Installation von TeX Live 2008.\nhttp://tug.org/texlive\n\nDieser Wizard wird Sie durch die Installation führen.'
+text.wizhello: Wolkommen zur Installation von TeX Live 2008.\nhttp://tug.org/texlive\n\nDieser Wizard wird Sie durch die Installation führen.
text.destfolder: Installationsverzeichnis:
text.advcustom: Erweiterte Einstellungen
text.pathinfo: Das Installationsverzeichnis enthält die TeX Live installation.\nWie empfehlen das Jahr als letzten Ordner beizubehalten.
text.readyinst: Der Wizard ist nun bereit TeX Live 2008 zu installieren.\nDie folgenden Einstellungen werden benutzt.\nWenn Sie etwas ändern möchten gehen Sie bitte zurück,\nandernfalls drücken Sie auf "Installation".
text.instshort: Installation
+text.wizard: Zum Wizard
label.scheme: Ausgewähltes Schema
diff --git a/Master/tlpkg/installer/lang/perltk-en.sample b/Master/tlpkg/installer/lang/perltk-en.sample
index f9fe2804df4..857edfef7a8 100644
--- a/Master/tlpkg/installer/lang/perltk-en.sample
+++ b/Master/tlpkg/installer/lang/perltk-en.sample
@@ -4,71 +4,70 @@
# make a copy of this file, name it
# perltk-XX
# where XX is a language code, and translate the strings
-
-text.title: TeX Live 2008 Installation
-text.basicinfo: Basic Information
-text.custom: Further Customization
-text.dirsetup: Directories' setup
-text.options: Options
-text.sysint: System Integration
-text.change: Change
-text.toggle: Toggle
-text.install: Install TeX Live
-text.finbut: Finish
-text.quit: Quit
-text.ok: Ok
-text.cancel: Cancel
-text.status: Status output
-text.changevar: Change variable value
-text.enterpath: Enter path for
-# below, `%%%' will be replaced by home directory.
-text.hinthome: (use ~ for %%%)
-text.selectscheme: Select a Scheme
-text.selectstdcol: Select the collections to be installed
-text.selectall: Select All
-text.selectnone: Deselect All
-text.selectlang: Select language support
-text.selectdoc: Select language-specific documentation
-text.createsym: create symlinks in standard directories
-text.binto: binaries to
-text.manto: manpages to
-text.infoto: info to
-text.selectsys: Select arch-os
-text.clicknetbin: Click for net bins
-text.outof: out of
-text.collof: collections out of
-text.diskreq: disk space required
-text.yes: Yes
-text.no: No
-text.notwritable: (default not writable - please change!)
+#
+text.advcustom: Advanced customization
+text.basicinfo: Basic Information
+text.binto: binaries to
+text.cancel: Cancel
+text.change: Change
text.changetexdir: (please change TEXDIR first!)
-text.nolangcol: (no language col selected!)
-text.finished: See TEXDIR/index.html for links to documentation. The TeX Live web site\n(http://tug.org/texlive/) contains any updates and corrections.\nTeX Live is a joint project of the TeX user groups around the world;\nplease consider supporting it by joining the group best for you. The\nlist of groups is available on the web at http://tug.org/usergroups.html.
-text.finishedpath: 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.
-text.welcome: Welcome to TeX Live!
-text.next: Next >
-text.prev: < Back',
-text.wizhello: Welcome to the installation of TeX Live 2008\nhttp://tug.org/texlive\n\nThis wizard will guide you through the installation.
-text.destfolder: Destination folder:
-text.advcustom: Advanced customization
-text.pathinfo: The destination folder will contain the installation.\nIt is strongly recommended to keep the year as the last component.
-text.readyinst: We are ready to install TeX Live 2008.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the "Install" button.
-text.instshort: Install
+text.changevar: Change variable value
+text.collof: collections out of
+text.createsym: create symlinks in standard directories
+text.custom: Further Customization
+text.destfolder: Destination folder:
+text.dirsetup: Directory setup
+text.diskreq: disk space required
+text.enterpath: Enter path for
+text.finbut: Finish
+text.finished: 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.
+text.finishedpath: 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.
+text.hinthome: (use ~ for %%%)
+text.infoto: info to
+text.install: Install TeX Live
+text.instshort: Install
+text.manto: manpages to
+text.next: Next >
+text.no: No
+text.nolangcol: (no language collection selected!)
+text.notwritable: (default not writable - please change!)
+text.ok: Ok
+text.options: Options
+text.outof: out of
+text.pathinfo: The destination folder will contain the installation.\nIt is strongly recommended to keep the year as the last component.
+text.prev: < Back
+text.quit: Quit
+text.readyinst: We are ready to install TeX Live 2008.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the "Install" button.
+text.selectall: Select All
+text.selectdoc: Select language-specific documentation
+text.selectlang: Select language support
+text.selectnone: Deselect All
+text.selectscheme: Select a scheme
+text.selectstdcol: Select the collections to be installed
+text.selectsys: Select arch-os
+text.status: Status output
+text.sysint: System Integration
+text.title: TeX Live 2008 Installation
+text.toggle: Toggle
+text.welcome: Welcome to TeX Live!
+text.wizard: Go to Wizard
+text.wizhello: Welcome to the installation of TeX Live 2008\nhttp://tug.org/texlive\n\nThis wizard will guide you through the installation.
+text.yes: Yes
-label.binsys: Binary System(s)
-label.scheme: Selected Scheme
-label.stdcoll: Standard Collections
-label.langcoll: Language Collections
-label.texdir: TEXDIR (main TeX directory)
-label.localdir: TEXMFLOCAL (local styles etc)
-label.sysvardir: TEXMFSYSVAR (local config)
-label.sysconfigdir: TEXMFSYSCONFIG (local config)
-latel.texmfhome: TEXMFHOME (user styles)
-label.optletter: Use letter-size paper by default, instead of A4
-label.optfmt: Create all format files
-label.optdoc: Install font/macro doc tree
-label.optsrc: Install font/macro source tree
-label.symlink: Install symlinks to system directories
+label.binsys: Binary System(s)
+label.langcoll: Language Collections
+label.localdir: TEXMFLOCAL (directory for site-wide local files)
+label.optdoc: Install font/macro doc tree
+label.optfmt: Create all format files
+label.optletter: Use letter size instead of A4 by default
+label.optsrc: Install font/macro source tree
+label.scheme: Selected Scheme
+label.stdcoll: Standard Collections
+label.symlink: Create symlinks in system directories
+label.sysconfigdir: TEXMFSYSCONFIG (directory for local config)
+label.sysvardir: TEXMFSYSVAR (directory for autogenerated data)
+label.texdir: TEXDIR (the main TeX directory)
+label.texmfhome: TEXMFHOME (directory for user-specific files)
# Local Variables:
# coding: utf-8