diff options
| -rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 22 | ||||
| -rw-r--r-- | Master/tlpkg/installer/lang/perltk-de | 5 | ||||
| -rw-r--r-- | Master/tlpkg/installer/lang/perltk-en.sample | 6 | ||||
| -rw-r--r-- | Master/tlpkg/installer/lang/perltk-fr | 6 | ||||
| -rw-r--r-- | Master/tlpkg/installer/lang/perltk-nl | 6 | ||||
| -rw-r--r-- | Master/tlpkg/installer/lang/perltk-pl | 6 | ||||
| -rw-r--r-- | Master/tlpkg/installer/lang/perltk-sl | 6 |
7 files changed, 46 insertions, 11 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 73e77f7550b..4fc6dde709e 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -32,6 +32,7 @@ my $return = $MENU_INSTALL; require Tk; require Tk::Dialog; +require Tk::DialogBox; require Tk::PNG; use utf8; no utf8; @@ -84,10 +85,10 @@ push @::start_install_hook, sub { update_statusbar("Starting Installation"); Tk::DoOneEvent(Tk::Event::DONT_WAIT); Tk::DoOneEvent(Tk::Event::DONT_WAIT); }; push @::start_postinst_hook, sub { update_statusbar("Starting Post Installation Jobs"); Tk::DoOneEvent(Tk::Event::DONT_WAIT); Tk::DoOneEvent(Tk::Event::DONT_WAIT); }; + push @::end_install_hook, sub { update_statusbar("Installation finished"); Tk::DoOneEvent(Tk::Event::DONT_WAIT); Tk::DoOneEvent(Tk::Event::DONT_WAIT); }; - push @::install_packages_hook, \&update_statusbar; # no idea how many of those are necessary, 1 is definitely not enough! push @::install_packages_hook, sub { Tk::DoOneEvent(Tk::Event::DONT_WAIT); }; @@ -121,7 +122,6 @@ my %text = ( title => 'TeX Live 2008 Installation', change => 'Change', toggle => 'Toggle', install => 'Install TeX Live', - finished => 'Installation finished', finbut => 'Finish', quit => 'Quit', ok => 'Ok', @@ -150,6 +150,9 @@ my %text = ( title => 'TeX Live 2008 Installation', notwritable => '(default not writable - please change!)', changetexdir => '(please change TEXDIR first!)', nolangcol => '(no language col selected!)', + finished => 'See ./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!', ); @@ -183,7 +186,7 @@ if (($::lang ne "en") && ($::lang ne "C")) { chomp; next if m/^\s*#/; next if m/^\s*$/; - my ($a,$b) = split(/:/,$_); + my ($a,$b) = split(/:/,$_,2); $b =~ s/^\s*([^\s])/$1/; $b =~ s/\s*$//; if (!utf8::decode($b)) { @@ -361,7 +364,18 @@ sub run_menu { -text => $text{'install'}, -command => sub { do_installation(); $return = $MENU_ALREADYDONE; - $fr->Dialog(-text => $text{'finished'}, -buttons => [ $text{'finbut'} ])->Show; + my $t = $text{'finished'}; + if (!win32()) { + $t .= "\n\n$text{'finishedpath'}"; + } + $t .= "\n\n$text{'welcome'}"; + $t =~ s/TEXDIR/$::vars{'TEXDIR'}/g; + $t =~ s/PLATFORM/$::vars{'this_platform'}/g; + $t =~ s/\\n/\n/g; + my $sw = $mainwindow->DialogBox(-title => $text{'finbut'}, -buttons => [ $text{'finbut'} ]); + $sw->add("Label", -text => $t)->pack; + $sw->Show; + #$fr->Dialog(-text => $t, -buttons => [ $text{'finbut'} ])->Show; $mainwindow->destroy }, )->pack(-side => 'left'); my $quitbutton = $f3->Button( diff --git a/Master/tlpkg/installer/lang/perltk-de b/Master/tlpkg/installer/lang/perltk-de index 9d9ddab63fe..7b710d5a82b 100644 --- a/Master/tlpkg/installer/lang/perltk-de +++ b/Master/tlpkg/installer/lang/perltk-de @@ -11,7 +11,6 @@ text.sysint: Systemintegration text.change: Ändern text.toggle: Ändern text.install: TeX Live installieren -text.finished: Installation beendet text.finbut: Ende text.quit: Abbruch text.ok: Ok @@ -39,6 +38,10 @@ text.no: Nein text.notwritable: (Vorgabe ohne Schreibberechtigung - bitte ändern!) text.changetexdir: (Bitte zuerst TEXDIR ändern!) text.nolangcol: (keine Sprackkollektion ausgewählt!) +text.finished: See ./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: Willkomen bei TeX Live! + label.scheme: Ausgewähltes Schema label.stdcoll: Kollektionen von Makro-Paketen diff --git a/Master/tlpkg/installer/lang/perltk-en.sample b/Master/tlpkg/installer/lang/perltk-en.sample index 52097c698f8..e25bc9dda88 100644 --- a/Master/tlpkg/installer/lang/perltk-en.sample +++ b/Master/tlpkg/installer/lang/perltk-en.sample @@ -14,7 +14,6 @@ text.sysint: System Integration text.change: Change text.toggle: Toggle text.install: Install TeX Live -text.finished: Installation finished text.finbut: Finish text.quit: Quit text.ok: Ok @@ -42,6 +41,9 @@ text.no: No text.notwritable: (default not writable - please change!) text.changetexdir: (please change TEXDIR first!) text.nolangcol: (no language col selected!) +text.finished: See ./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! label.binsys: Binary System(s) label.scheme: Selected Scheme @@ -61,4 +63,4 @@ label.symlink: Install symlinks to system directories # Local Variables: # coding: utf-8 # End: -# vim:set encoding=utf-8 fileencoding=utf-8: # +# vim:set fileencoding=utf-8: # diff --git a/Master/tlpkg/installer/lang/perltk-fr b/Master/tlpkg/installer/lang/perltk-fr index 27fbc8a2bdf..d2e41c10615 100644 --- a/Master/tlpkg/installer/lang/perltk-fr +++ b/Master/tlpkg/installer/lang/perltk-fr @@ -11,7 +11,6 @@ text.sysint: Intégration du système text.change: Changer text.toggle: (Dé)sélectionner text.install: Installer TeX Live -text.finished: Installation terminée text.finbut: Terminer text.quit: Quitter text.ok: OK @@ -41,6 +40,11 @@ text.no: Non text.notwritable: (écriture impossible - changer l'emplacement !) text.changetexdir: (changer d'abord TEXDIR !) text.nolangcol: (aucune collection de langue sélectionnée !) +text.changetexdir: (please change TEXDIR first!) +text.nolangcol: (no language col selected!) +text.finished: See ./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! label.binsys: Plateforme des binaires label.scheme: Schéma sélectionné diff --git a/Master/tlpkg/installer/lang/perltk-nl b/Master/tlpkg/installer/lang/perltk-nl index ca9732d5b45..75b3a23ec4f 100644 --- a/Master/tlpkg/installer/lang/perltk-nl +++ b/Master/tlpkg/installer/lang/perltk-nl @@ -11,7 +11,6 @@ text.sysint: Systeem-integratie text.change: Wijzig text.toggle: Wijzig text.install: Installeer TeX Live -text.finished: Installatie beeindigd text.finbut: Klaar text.quit: Afbreken text.ok: Ok @@ -38,6 +37,11 @@ text.yes: Ja text.no: Nee text.notwritable: (geen schrijf-toegang - wijzig!) text.changetexdir: (TEXDIR eerst veranderen!) +text.changetexdir: (please change TEXDIR first!) +text.nolangcol: (no language col selected!) +text.finished: See ./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! label.binsys: Platform(s) label.scheme: Gekozen schema diff --git a/Master/tlpkg/installer/lang/perltk-pl b/Master/tlpkg/installer/lang/perltk-pl index 085d51fc0c3..dd16ebffe1f 100644 --- a/Master/tlpkg/installer/lang/perltk-pl +++ b/Master/tlpkg/installer/lang/perltk-pl @@ -10,7 +10,6 @@ text.sysint: Integracja systemu text.change: Zmień text.toggle: Zmień text.install: Zainstaluj TeX Live -text.finished: Instalacja zakończona text.finbut: Zakończ text.quit: Anuluj text.ok: Ok @@ -38,6 +37,11 @@ text.no: Nie text.notwritable: (domyślnie nie do zapisu - proszę zmienić!) text.changetexdir: (proszę zmienić najpierw TEXDIR!) text.nolangcol: (nie zaznaczono żadnej kolekcji językowej!) +text.changetexdir: (please change TEXDIR first!) +text.nolangcol: (no language col selected!) +text.finished: See ./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! label.binsys: Pakiet(y) programów label.scheme: Wybrany schemat instalacji diff --git a/Master/tlpkg/installer/lang/perltk-sl b/Master/tlpkg/installer/lang/perltk-sl index ce2afe3c56e..91b69797779 100644 --- a/Master/tlpkg/installer/lang/perltk-sl +++ b/Master/tlpkg/installer/lang/perltk-sl @@ -12,7 +12,6 @@ text.sysint: Integracija v sistem text.change: Spremeni text.toggle: Vključi/Izključi text.install: Namesti TeX Live -text.finished: Namestitev končana text.finbut: Konec text.quit: Izhod text.ok: V redu @@ -40,6 +39,11 @@ text.no: Ne text.notwritable: (Spremenite imenik - pisanje v izbrani imenik je zaščiteno!) text.changetexdir: (Spremenite TEXDIR!) text.nolangcol: (Nobena jezikovna zbirka ni izbrana!) +text.changetexdir: (please change TEXDIR first!) +text.nolangcol: (no language col selected!) +text.finished: See ./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! label.binsys: Izbrane platforme label.scheme: Izbrana shema |