tlmgrgui: decent strings handling. new format of the language files

git-svn-id: svn://tug.org/texlive/trunk@8477 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 408 insertions, 205 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl b/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl
index f6f037bae9d..797b767a493 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl
@@ -93,7 +93,7 @@ sub update_info_window {
     }
   }
   if ($text eq "") {
-    $text = _"(no description available)";
+    $text = _"nodescription";
   }
   $iw->delete("0.0", "end");
   $iw->insert("0.0", "$text");
@@ -109,14 +109,14 @@ sub do_listframe {
                    -foreground => "blue", 
                    -font => "helvetica 10 bold"
                  )->pack(-side => "top");
-  $f_title->Label( -text => _"Use Ctrl or Shift or drag to select more"
+  $f_title->Label( -text => _"ctrlshift"
                  )->pack(-side => "top");
   $f_title->grid( -row => 1, -column => 1, -columnspan => 2,
                   -padx => "2m", -pady => "2m", -sticky => "we");
 
   # column 1, row 2-3
 
-  my $f_listf = $f->Labelframe(-text => _"Select packages");
+  my $f_listf = $f->Labelframe(-text => _"selpkg");
   $f_listf->grid( -row => 2, -column => 1, -rowspan => 2,
                   -sticky => "nswe", -padx => "2m", -pady => "1m");
 
@@ -125,7 +125,7 @@ sub do_listframe {
   my $f_listf_searchf = $f_listf->Frame;
   $f_listf_searchf->pack(-pady => "1m");
   my $f_listf_searchf_label = 
-    $f_listf_searchf->Label(-text => _"Search")->pack( -anchor => "w", 
+    $f_listf_searchf->Label(-text => _"search")->pack( -anchor => "w", 
                                                       -side => "left", 
                                                       -padx => "1m", 
                                                       -pady => "1m");
@@ -135,7 +135,7 @@ sub do_listframe {
                                   $f_textf_text, 
                                   $_[0], 
                                   @$listref); });
-  my $f_listf_searchf_button = $f_listf_searchf->Button(-text => _"Next", 
+  my $f_listf_searchf_button = $f_listf_searchf->Button(-text => _"next", 
       -command => sub { find_next_search_match($f_listf_lb, 
                                                $f_listf_searchf_entry, 
                                                $f_textf_text, 
@@ -155,7 +155,7 @@ sub do_listframe {
   $f_listf_lb->pack(-fill => "both", -expand => 1);
 
   # row 2 column 2
-  my $f_textf = $f->Labelframe(-text => _"Info on the selected item");
+  my $f_textf = $f->Labelframe(-text => _"infoitem");
   $f_textf->grid(-row => 2, -column => 2, -sticky => "nswe", 
                  -padx => "2m", -pady => "1m");
 
@@ -167,7 +167,7 @@ sub do_listframe {
   $f_textf_text = $f_textf->Scrolled("ROText", 
     -scrollbars => "e",
     -width => 45, -wrap => "word");
-  $f_textf_text->insert("end", _"\nAttention.\nPlease check using \"Change\" button if a DVD drive with the TeX Live DVD\nor the correct network address is properly selected,\nthen press \"Load\" button.");
+  $f_textf_text->insert("end", _"warningtxt");
 
   $f_textf_text->pack(-expand => 1, -fill => "both");
 
@@ -181,13 +181,13 @@ sub do_listframe {
     my $foo = $f_buttonf_optionsf->Checkbutton(-text => _"force", 
                                      -variable => \$opt_force
                                     )->pack(-side => 'left');
-    $balloon->attach($foo,-balloonmsg => _"Force the removal of a package even if it is referenced in a collection.");
+    $balloon->attach($foo,-balloonmsg => _"forceballoon");
   }
   if ($with_deps) {
-    my $foo = $f_buttonf_optionsf->Checkbutton(-text => _"without depends", 
+    my $foo = $f_buttonf_optionsf->Checkbutton(-text => _"withoutdep", 
                                    -variable => \$opt_nodepends
                                   )->pack(-side => 'left');
-    $balloon->attach($foo,-balloonmsg => _"For collections: install or remove will not install/remove the dependencies");
+    $balloon->attach($foo,-balloonmsg => _"nodepballoon");
   }
   $f_buttonf_optionsf->pack;
   foreach my $k (keys %$buttonsref) {
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl
index a9e833556f8..8b79e83f960 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl
@@ -7,7 +7,7 @@
 #
 
 
-our $back_arch = $back->add("arch",-label => _"Architectures");
+our $back_arch = $back->add("arch",-label => _"archs");
 $screens{"arch"} = $back_arch;
 
 # this will be loaded only on unix systems!
@@ -22,7 +22,7 @@ our $arch_frame;
 
 push @update_function_list, \&init_archs;
 
-$back_arch->Label(-text => _"Select architectures to be added (removal not possible)")->pack(-padx => "5m", -pady => "5m");
+$back_arch->Label(-text => _"remarchnotpos")->pack(-padx => "5m", -pady => "5m");
 
 
 sub init_archs {
@@ -51,8 +51,8 @@ sub init_archs {
   }
   $arch_frame = $back_arch->Frame;
   $arch_frame->pack(-padx => "10m", -pady => "5m");
-  $arch_frame->Button(-text => _"Apply changes", -command => sub { apply_changes(); })->pack(-side => 'left', -padx => "3m");
-  $arch_frame->Button(-text => _"Reset changes", -command => sub { init_archs(); })->pack(-side => 'left', -padx => "3m");
+  $arch_frame->Button(-text => _"applychanges", -command => sub { apply_changes(); })->pack(-side => 'left', -padx => "3m");
+  $arch_frame->Button(-text => _"resetchanges", -command => sub { init_archs(); })->pack(-side => 'left', -padx => "3m");
 }
 
 sub check_on_removal {
@@ -60,9 +60,9 @@ sub check_on_removal {
   if (!$archs{$a} && grep(/^$a$/,@archsinstalled)) {
     # removal not supported
     $archs{$a} = 1;
-    $arch_frame->Dialog(-title => _"info",
-                        -text => _"Removals of archs currently not supported!",
-                        -buttons => [ _"Ok" ])->Show;
+    $arch_frame->Dialog(-title => "info",
+                        -text => _"remarchinfo",
+                        -buttons => [ _"ok" ])->Show;
   }
 }
 
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl
index 0848f447526..046dd94ea27 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl
@@ -6,38 +6,38 @@
 # GUI for tlmgr
 #
 
-our $back_config = $back->add("config",-label => _"Configuration");
+our $back_config = $back->add("config",-label => _"config");
 $screens{"config"} = $back_config;
 
 my $default_location = $localtlpdb->option_location;
-my $default_formats = ($localtlpdb->option_create_formats ? _"Yes" : _"No");
-my $default_docfiles = ($localtlpdb->option_install_docfiles ? _"Yes" : _"No");
-my $default_srcfiles = ($localtlpdb->option_install_srcfiles ? _"Yes" : _"No");
+my $default_formats = ($localtlpdb->option_create_formats ? _"yes" : _"no");
+my $default_docfiles = ($localtlpdb->option_install_docfiles ? _"yes" : _"no");
+my $default_srcfiles = ($localtlpdb->option_install_srcfiles ? _"yes" : _"no");
 
 # this will be loaded only on unix systems!
 #
 
-my $back_config_set = $back_config->Labelframe(-text => _"Default settings");
+my $back_config_set = $back_config->Labelframe(-text => _"defaultsettings");
 $back_config_set->pack;
 
-my $back_config_set_l1 = $back_config_set->Label(-text => _"Default installation source", -anchor => "w");
+my $back_config_set_l1 = $back_config_set->Label(-text => _"defaultsource", -anchor => "w");
 my $back_config_set_m1 = $back_config_set->Label(-textvariable => \$default_location);
-my $back_config_set_r1 = $back_config_set->Button(-text => _"Change",
+my $back_config_set_r1 = $back_config_set->Button(-text => _"change",
      -command => sub { menu_default_location(); });
 
-my $back_config_set_l2 = $back_config_set->Label(-text => _"Create formats on installation", -anchor => "w");
+my $back_config_set_l2 = $back_config_set->Label(-text => _"createformats", -anchor => "w");
 my $back_config_set_m2 = $back_config_set->Label(-textvariable => \$default_formats);
-my $back_config_set_r2 = $back_config_set->Button(-text => _"Toggle",
+my $back_config_set_r2 = $back_config_set->Button(-text => _"toggle",
      -command => sub { toggle_setting("formats"); });
 
-my $back_config_set_l3 = $back_config_set->Label(-text => _"Install macro/font docs", -anchor => "w");
+my $back_config_set_l3 = $back_config_set->Label(-text => _"installdoc", -anchor => "w");
 my $back_config_set_m3 = $back_config_set->Label(-textvariable => \$default_docfiles);
-my $back_config_set_r3 = $back_config_set->Button(-text => _"Toggle",
+my $back_config_set_r3 = $back_config_set->Button(-text => _"toggle",
      -command => sub { toggle_setting("docfiles"); });
 
-my $back_config_set_l4 = $back_config_set->Label(-text => _"Install macro/font sources", -anchor => "w");
+my $back_config_set_l4 = $back_config_set->Label(-text => _"installsrc", -anchor => "w");
 my $back_config_set_m4 = $back_config_set->Label(-textvariable => \$default_srcfiles);
-my $back_config_set_r4 = $back_config_set->Button(-text => _"Toggle",
+my $back_config_set_r4 = $back_config_set->Button(-text => _"toggle",
      -command => sub { toggle_setting("srcfiles"); });
 
 
@@ -68,10 +68,10 @@ $back_config_set_r4->grid(-row => 4, -column => 3,
 
 #############
 
-my $back_config_pap = $back_config->Labelframe(-text => _"Paper settings");
+my $back_config_pap = $back_config->Labelframe(-text => _"papersettings");
 
 
-my $back_config_pap_l1 = $back_config_pap->Label(-text => _"Default paper for all", -anchor => "w");
+my $back_config_pap_l1 = $back_config_pap->Label(-text => _"defaultpaperall", -anchor => "w");
 my $back_config_pap_m1 = $back_config_pap->Button(-text => "A4",
       -command => sub { change_paper("all", "a4"); });
 my $back_config_pap_r1 = $back_config_pap->Button(-text => "letter",
@@ -102,9 +102,9 @@ my (%l,%m,%r);
 foreach my $p (sort keys %papers) {
   my @pap = @{$papers{$p}};
   $defaultpaper{$p} = $pap[0];
-  $l{$p} = $back_config_pap->Label(-text => _("Default paper for") . " $p", -anchor => "w");
+  $l{$p} = $back_config_pap->Label(-text => _("defaultpaperfor") . " $p", -anchor => "w");
   $m{$p} = $back_config_pap->Label(-textvariable => \$defaultpaper{$p}, -anchor => "w");
-  $r{$p} = $back_config_pap->Button(-text => _"Change",
+  $r{$p} = $back_config_pap->Button(-text => _"change",
             -command => sub { select_paper($p); }, -anchor => "w");
   $l{$p}->grid(-row => $row, -column => 1,
            -padx => "2m", -pady => "2m", -sticky => "nsw");
@@ -119,8 +119,8 @@ $back_config_pap->pack;
 
 sub menu_default_location {
   my $val = $default_location;
-  my $sw = $mw->Toplevel(-title => _"Change default installation source");
-  $sw->Label(-text => _"New default installation source: ")->pack;
+  my $sw = $mw->Toplevel(-title => _"changedefaultsrc");
+  $sw->Label(-text => _"newdefaultsrc")->pack;
   my $entry = $sw->Entry(-text => $location, -width => 30);
   $entry->pack;
   my $f = $sw->Frame;
@@ -140,15 +140,15 @@ sub toggle_setting() {
   if ($key eq "formats") { 
     my $new = ($localtlpdb->option_create_formats ? 0 : 1);
     $localtlpdb->option_create_formats($new);
-    $default_formats = ($new ? _"Yes" : _"No");
+    $default_formats = ($new ? _"yes" : _"no");
   } elsif ($key eq "srcfiles") {
     my $new = ($localtlpdb->option_install_srcfiles ? 0 : 1);
     $localtlpdb->option_install_srcfiles($new);
-    $default_srcfiles = ($new ? _"Yes" : _"No");
+    $default_srcfiles = ($new ? _"yes" : _"no");
   } elsif ($key eq "docfiles") {
     my $new = ($localtlpdb->option_install_docfiles ? 0 : 1);
     $localtlpdb->option_install_docfiles($new);
-    $default_docfiles = ($new ? _"Yes" : _"No");
+    $default_docfiles = ($new ? _"yes" : _"no");
   }
   $localtlpdb->save;
 }
@@ -169,16 +169,16 @@ sub change_paper {
 
 sub select_paper {
   my $prog = shift;
-  my $foo = $back_config->Toplevel(-title => _("paper select for") . " $prog");
+  my $foo = $back_config->Toplevel(-title => _("paperfor") . " $prog");
   my $var = $defaultpaper{$prog};
-  my $opt = $foo->BrowseEntry(-label => _("Default paper for") . " $prog", -variable => \$var);
+  my $opt = $foo->BrowseEntry(-label => _("defaultpaperfor") . " $prog", -variable => \$var);
   foreach my $p (sort @{$papers{$prog}}) {
     $opt->insert("end",$p);
   }
   $opt->pack;
   my $f = $foo->Frame;
-  $f->Button(-text => _"Ok", -command => sub { change_paper($prog,$var); $foo->destroy; })->pack(-side => "left");
-  $f->Button(-text => _"Cancel", -command => sub { $foo->destroy; })->pack(-side => "left");
+  $f->Button(-text => _"ok", -command => sub { change_paper($prog,$var); $foo->destroy; })->pack(-side => "left");
+  $f->Button(-text => _"cancel", -command => sub { $foo->destroy; })->pack(-side => "left");
   $f->pack;
 }
 
@@ -186,7 +186,7 @@ sub select_paper {
 
 sub old_select_paper {
   my $prog = shift;
-  my $foo = $back_config->Toplevel(-title => _("paper select for") . " $prog");
+  my $foo = $back_config->Toplevel(-title => _("paperfor") . " $prog");
   my $var = $defaultpaper{$prog};
   my @lop = @{$papers{$prog}};
   my $nrpercols = 15;
@@ -200,8 +200,8 @@ sub old_select_paper {
       $row = 1;
     } 
   }
-  $foo->Button(-text => _"Ok", -command => sub { change_paper($prog,$var); $foo->destroy; })->grid(-row => $nrpercols+1, -column => 1);
-  $foo->Button(-text => _"Cancel", -command => sub { $foo->destroy; })->grid(-row => $nrpercols+1, -column => 2);
+  $foo->Button(-text => _"ok", -command => sub { change_paper($prog,$var); $foo->destroy; })->grid(-row => $nrpercols+1, -column => 1);
+  $foo->Button(-text => _"cancel", -command => sub { $foo->destroy; })->grid(-row => $nrpercols+1, -column => 2);
 }
 
 1;
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl
index 1210baf2694..d942e8ae0c9 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl
@@ -6,27 +6,27 @@
 # GUI for tlmgr
 #
 
-our $back_f3 = $back->add("uninstall", -label => _"Uninstallation");
+our $back_f3 = $back->add("uninstall", -label => _"removaltab");
 $screens{"uninstall"} = $back_f3;
 
 if ($^O=~/^MSWin(32|64)$/i) {
   my $lab = $back_f3->Label(-justify    => 'left', 
-           -text => _"Please use the \"Add/Remove Programs\" from the Control Panel!");
+           -text => _"pleaseuse");
 
   $lab->pack(-padx => "10m", -pady => "5m");
 } else {
   my $lab = $back_f3->Label(-justify    => 'left', 
-           -text => _"Really remove the complete TeX Live 2008 installation?\nNo more confirmation will be asked!");
+           -text => _"reallyremove");
 
   $lab->pack(-padx => "10m", -pady => "5m");
 
   my $f = $back_f3->Frame;
   $f->pack(-padx => "10m", -pady => "5m");
 
-  my $ok = $f->Button(-text => _"Remove TeX Live 2008", 
+  my $ok = $f->Button(-text => _"removetl", 
           -command => sub { 
                             system("tlmgr", "uninstall", "--force");
-                            $mw->Dialog(-text => _"Complete removal completed", -buttons => [ "Bye" ])->Show;
+                            $mw->Dialog(-text => _"completerem", -buttons => [ _"ok" ])->Show;
                             $mw->destroy; 
                             exit(0); 
                           });
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/lang/de b/Master/texmf/scripts/texlive/tlmgrgui/lang/de
index 2ee31a4c071..c478b20747e 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/lang/de
+++ b/Master/texmf/scripts/texlive/tlmgrgui/lang/de
@@ -1,57 +1,73 @@
-About===Über
-Adding packages===Pakete hinzufügen
-Architectures===Architekturen
-Cancel===Abbruch
-Change===Ändern
-Change Location===Ändern der Quelle
-Change the installation source===Ändern der Installationsquelle
-Choose Directory===Auswahl eines Ordners
-Configuration===Konfiguration
-Create formats on installation===Erstellen von Formaten bei der Installation
-Current installation source: ===Aktuelle Installationsquelle
-debug===debug
-Default installation source===Voreingestellte Installationsquelle
-Default Net Location===Voreingestellte Netzwerkquelle
-Default paper for===Voreingestelles Papierformat für
-Default paper for all===Voreingestelltes Papierformat für alle Programme
-Default settings===Voreinstellungen
-force===erzwinge
-Force the removal of a package even if it is referenced in a collection.===Erzwinge das Entfernen von Paketen selbst wenn sie von Kollektionen referenziert werden.
-For collections: install or remove will not install/remove the dependencies===Bei Kollektionen werden abhängige Pakete  installiert oder entfernt
-Info on the selected item===Information für den selektierten Eintrag
-Installation===Installation
-Install macro/font docs===Installation der font/macro Dokumentation
-Install macro/font sources===Installation der font/macro Quellen
-Install selected===Installation der selektierten Pakete
-Load===Lade
-\nAttention.\nPlease check using "Change" button if a DVD drive with the TeX Live DVD\nor the correct network address is properly selected,\nthen press "Load" button.===
-New location: ===Neue Quelle
-Next===Nächster
-Ok===Ok
-paper select for===
-Paper settings===Papierformat-Einstellungen
-Press this button to load the database from the specified location.===
-Quit===Beenden
-Really remove the complete TeX Live 2008 installation?\nNo more confirmation will be asked!===Wollen Sie TeX Live 2008 wirklich komplett entfernen?\nEs werden keine weiteren Rückfragen gestellt werden!
-Remove===Entfernen
-Remove selected===Entfernen der selektierten Pakete
-Remove TeX Live 2008===TeX Live 2008 entfernen
-Removing packages===Entfernen von Paketen
-Search===Suche
-Select architectures to be added (removal not possible)===
-Select packages===Auswählen von Paketen
-Toggle===Ändern
-Turn on debug mode when calling tlmgr.===
-Uninstallation===Entfernen von TL2008
-Update===Update
-Update all===Update aller Pakete
-Update selected===Update der selektierten Pakete
-Updating packages===Update von Paketen
-Use Ctrl or Shift or drag to select more===
-without depends===ohne Abhängigkeiten
-Yes===Ja
+#
+# German strings for texlive manager gui
+# Norbert Preining
+#
+about:			Über
+addpkg:			Pakete hinzufügen
+archs:			Architekturen
+cancel:			Abbruch
+change:			Ändern
+changesrc:		Ändern der Installationsquelle
+changesrclong:		Ändern der Installationsquelle
+changedefaultsrc:	Change default installation source
+newdefaultsrc:		New default installation source
+choosedir:		Auswahl eines Ordners
+config:			Konfiguration
+createformats:		Erstellen von Formaten bei der Installation
+currentsource:		Aktuelle Installationsquelle
+debug:			debug
+defaultsource:		Voreingestellte Installationsquelle
+defaultnet:		Voreingestellte Netzwerkquelle
+defaultpaperfor:	Voreingestelles Papierformat für
+defaultpaperall:	Voreingestelltes Papierformat für alle Programme
+defaultsettings:	Voreinstellungen
+force:			erzwinge
+forceballoon:		Erzwinge das Entfernen von Paketen selbst wenn sie von Kollektionen referenziert werden.
+nodepballoon:		Bei Kollektionen werden abhängige Pakete  installiert oder entfernt
+infoitem:		Information für den selektierten Eintrag
+install:		Installation
+installdoc:		Installation der font/macro Dokumentation
+installsrc:		Installation der font/macro Quellen
+installsel:		Installation der selektierten Pakete
+load:			Lade
+warningtxt:		
+newsource:		Neue Quelle
+next:			Nächster
+ok:			Ok
+paperfor:		paper select for
+papersettings:		Papierformat-Einstellungen
+pressbutton:		Press this button to load the database from the specified location.
+quit:			Beenden
+reallyremove:		Wollen Sie TeX Live 2008 wirklich komplett entfernen?\nEs werden keine weiteren Rückfragen gestellt werden!
+remove:			Entfernen
+removesel:		Entfernen der selektierten Pakete
+removetl:		TeX Live 2008 entfernen
+rempkg:			Entfernen von Paketen
+search:			Suche
+remarchnotpos:		Select architectures to be added (removal not possible)
+selpkg:			Auswählen von Paketen
+toggle:			Ändern
+debugballoon:		Turn on debug mode when calling tlmgr.
+removaltab:		Entfernen von TL2008
+update:			Update
+updateall:		Update aller Pakete
+updatesel:		Update der selektierten Pakete
+updatepkg:		Updating von Paketen
+ctrlshift:		Use Ctrl or Shift or drag to select more
+withoutdep:		ohne Abhängigkeiten
+yes:			Ja
+starting:		Starting
+maytaketime:		Der Prozess kann einige Zeit laufen.\nBitte warten Sie, die Ausgabe wird am Ende hier angezeigt.\n
+completed:		Fertig
+loaderrortxt:		Could not load the TeX Live Database from $newroot\nIf you want to install or update packages, please try with a different installation source/location!\n\nFor configuration and removal you don\'t have to do anything.
+changeme:		...bitte ändern...
+nodescription:		(keine Beschreibung vorhanden)
+applychanges:		Änderungen anwenden
+resetchanges:		Änderungen rücksetzten
+remarchinfo:		Entfernen von Architekturen derzeit nicht unterstützt!
+pleaseuse:		Please use the \"Add/Remove Programs\" from the Control Panel!
+completerem:		Vollständige Entfernung durchgeführt
 # Local Variables:
 # coding: utf-8
 # End:
 # vim:set termencoding=iso8859-15 encoding=utf-8 fileencoding=utf-8: #
-
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/lang/en.sample b/Master/texmf/scripts/texlive/tlmgrgui/lang/en.sample
new file mode 100644
index 00000000000..df6620b7ccb
--- /dev/null
+++ b/Master/texmf/scripts/texlive/tlmgrgui/lang/en.sample
@@ -0,0 +1,77 @@
+#
+# Translations of the TeX Live Manager GUI
+# please translate the strings on the right and send the translated file
+# saved with filename of the respective two-letter code tex-live@tug.org
+#
+# For not translated strings it is best to either leave them empty or comment
+# since for not defined translations the english one will be used
+#
+about:			About
+addpkg:			Adding packages
+archs:			Architectures
+cancel:			Cancel
+change:			Change
+changesrc:		Change Location
+changesrclong:		Change the installation source
+changedefaultsrc:	Change default installation source
+newdefaultsrc:		New default installation source
+choosedir:		Choose Directory
+config:			Configuration
+createformats:		Create formats on installation
+currentsource:		Current installation source: 
+debug:			debug
+defaultsource:		Default installation source
+defaultnet:		Default Net Location
+defaultpaperfor:	Default paper for
+defaultpaperall:	Default paper for all
+defaultsettings:	Default settings
+force:			force
+forceballoon:		Force the removal of a package even if it is referenced in a collection.
+nodepballoon:		For collections: install or remove will not install/remove the dependencies
+infoitem:		Info on the selected item
+install:		Installation
+installdoc:		Install macro/font docs
+installsrc:		Install macro/font sources
+installsel:		Install selected
+load:			Load
+warningtxt:		\nAttention.\nPlease check using \"Change\" button if a DVD drive with the TeX Live DVD\nor the correct network address is properly selected,\nthen press \"Load\" button.
+newsource:		New location: 
+next:			Next
+ok:			Ok
+paperfor:		paper select for
+papersettings:		Paper settings
+pressbutton:		Press this button to load the database from the specified location.
+quit:			Quit
+reallyremove:		Really remove the complete TeX Live 2008 installation?\nNo more confirmation will be asked!
+remove:			Remove
+removesel:		Remove selected
+removetl:		Remove TeX Live 2008
+rempkg:			Removing packages
+search:			Search
+remarchnotpos:		Select architectures to be added (removal not possible)
+selpkg:			Select packages
+toggle:			Toggle
+debugballoon:		Turn on debug mode when calling tlmgr.
+removaltab:		Uninstallation
+update:			Update
+updateall:		Update all
+updatesel:		Update selected
+updatepkg:		Updating packages
+ctrlshift:		Use Ctrl or Shift or drag to select more
+withoutdep:		without depends
+yes:			Yes
+starting:		Starting
+maytaketime:		This may take some time!\nPlease wait, the output will appear here when ready.\n
+completed:		Completed
+loaderrortxt:		Could not load the TeX Live Database from $newroot\nIf you want to install or update packages, please try with a different installation source/location!\n\nFor configuration and removal you don\'t have to do anything.
+changeme:		...please change me...
+nodescription:		(no description available)
+applychanges:		Apply changes
+resetchanges:		Reset changes
+remarchinfo:		Removals of archs currently not supported!
+pleaseuse:		Please use the \"Add/Remove Programs\" from the Control Panel!
+completerem:		Complete removal completed
+# Local Variables:
+# coding: utf-8
+# End:
+# vim:set termencoding=iso8859-15 encoding=utf-8 fileencoding=utf-8: #
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/lang/pl b/Master/texmf/scripts/texlive/tlmgrgui/lang/pl
index f845720f0ea..ed51f7e5f5a 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/lang/pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/lang/pl
@@ -1,54 +1,73 @@
-About===O programie
-Adding packages===Dodawanie pakietów
-Architectures===Systemy operacyjne
-Cancel===Anuluj
-Change===Zmień
-Change Location===Zmień położenie
-Change the installation source===Zmień źródło instalacji
-Choose Directory===Wybierz katalog
-Configuration===Konfiguracja
-Create formats on installation===Utwórz formaty podczas instalacji
-Current installation source: ===Aktualne źródło instalacji
-debug===debug
-Default installation source===Domyślne źródło instalacji
-Default Net Location===Domyślne źródło w sieci
-Default paper for===Domyślny format papieru
-Default paper for all===Domyślny format papieru dla wszystkich programów
-Default settings===Ustawienia domyślne
-force===wymuś
-Force the removal of a package even if it is referenced in a collection.===Wymuś usuwanie pakietu nawet gdy jest składnikiem kolekcji.
-For collections: install or remove will not install/remove the dependencies===Dla kolekcji: instalacja lub usuwanie nie zainstaluje/usunie pakietów zależnych
-Info on the selected item===Informacja o zaznaczonym pakiecie
-Installation===Instalacja
-Install macro/font docs===Instalacja dokumentacji fontu/makr
-Install macro/font sources===Instalacja źródeł fontu/makr
-Install selected===Instacja zaznaczonych pakietów
-Load===Wczytaj
-\nAttention.\nPlease check using "Change" button if a DVD drive with the TeX Live DVD\nor the correct network address is properly selected,\nthen press "Load" button.===Uwaga!\nPrzyciskiem "Zmień" wybierz najpierw napęd DVD z TeX Live\nlub prawidłowy adres sieciowy,\nnastępnie naciśnij "Wczytaj"
-New location: ===Nowa lokalizacja
-Next===Następne
-Ok===Ok
-paper select for===wybór formatu papieru dla
-Paper settings===Ustawienie formatu papieru
-Press this button to load the database from the specified location.===Naciśnij ten przycisk, aby wczytać bazę danych z wyspecyfikowanej lokalizacji.
-Quit===Zakończ
-Really remove the complete TeX Live 2008 installation?\nNo more confirmation will be asked!===Naprawdę usunąć całą instalację TeX Live 2008?\nNie będzie więcej zapytań!
-Remove===Usuń
-Remove selected===Usuń zaznaczone
-Remove TeX Live 2008===Usuwanie TeX Live 2008
-Removing packages===Usuwanie pakietów
-Search===Szukaj
-Select architectures to be added (removal not possible)===Zaznacz systemy do dodania (usuwanie niemożliwe)
-Select packages===Zaznacz pakiety
-Toggle===Zmień
-Turn on debug mode when calling tlmgr.===Przełącz tryb debug dla uruchamiania tlmgr
-Uninstallation===Odistalowanie TL2008
-Update===Aktualizacja
-Update all===Aktualizuj wszystko
-Update selected===Aktualizuj wybrane
-Updating packages===Aktualizuj pakiety
-Use Ctrl or Shift or drag to select more===Użyj Ctrl, Shift lub przeciągnij mysz aby zaznaczyć więcej
-without depends===bez zależności
-Yes===Tak
+#
+# Polish strings for texlive manager gui
+# StaW
+#
+about:			O programie
+addpkg:			Dodawanie pakietów
+archs:			Systemy operacyjne
+cancel:			Anuluj
+change:			Zmień
+changesrc:		Zmień położenie
+changesrclong:		Zmień źródło instalacji
+changedefaultsrc:	Change default installation source
+newdefaultsrc:		New default installation source
+choosedir:		Wybierz katalog
+config:			Konfiguracja
+createformats:		Utwórz formaty podczas instalacji
+currentsource:		Current installation source: 
+debug:			debug
+defaultsource:		Domyślne źródło instalacji
+defaultnet:		Domyślne źródło w sieci
+defaultpaperfor:	Domyślny format papieru
+defaultpaperall:	Domyślny format papieru dla wszystkich programów
+defaultsettings:	Ustawienia domyślne
+force:			wymuś
+forceballoon:		Wymuś usuwanie pakietu nawet gdy jest składnikiem kolekcji.
+nodepballoon:		Dla kolekcji: instalacja lub usuwanie nie zainstaluje/usunie pakietów zależnych
+infoitem:		Informacja o zaznaczonym pakiecie
+install:		Instalacja
+installdoc:		Instalacja dokumentacji fontu/makr
+installsrc:		Instalacja źródeł fontu/makr
+installsel:		Instacja zaznaczonych pakietów
+load:			Wczytaj
+warningtxt:		\nUwaga!\nPrzyciskiem "Zmień" wybierz najpierw napęd DVD z TeX Live\nlub prawidłowy adres sieciowy,\nnastępnie naciśnij "Wczytaj"
+newsource:		Nowa lokalizacja
+next:			Następne
+ok:			Ok
+paperfor:		wybór formatu papieru dla
+papersettings:		Ustawienie formatu papieru
+pressbutton:		=Naciśnij ten przycisk, aby wczytać bazę danych z wyspecyfikowanej lokalizacji.
+quit:			Zakończ
+reallyremove:		Naprawdę usunąć całą instalację TeX Live 2008?\nNie będzie więcej zapytań!
+remove:			Usuń
+removesel:		Usuń zaznaczone
+removetl:		Usuwanie TeX Live 2008
+rempkg:			Usuwanie pakietów
+search:			Szukaj
+remarchnotpos:		Zaznacz systemy do dodania (usuwanie niemożliwe)
+selpkg:			Zaznacz pakiety
+toggle:			Zmień
+debugballoon:		Przełącz tryb debug dla uruchamiania tlmgr
+removaltab:		Odistalowanie TL2008
+update:			Aktualizacja
+updateall:		Aktualizuj wszystko
+updatesel:		Aktualizuj wybrane
+updatepkg:		Aktualizuj pakiety
+ctrlshift:		Użyj Ctrl, Shift lub przeciągnij mysz aby zaznaczyć więcej
+withoutdep:		bez zależności
+yes:			Tak
+starting:		Starting
+maytaketime:		This may take some time!\nPlease wait, the output will appear here when ready.\n
+completed:		Completed
+loaderrortxt:		Could not load the TeX Live Database from $newroot\nIf you want to install or update packages, please try with a different installation source/location!\n\nFor configuration and removal you don\'t have to do anything.
+changeme:		...please change me...
+nodescription:		(no description available)
+applychanges:		Apply changes
+resetchanges:		Reset changes
+remarchinfo:		Removals of archs currently not supported!
+pleaseuse:		Please use the \"Add/Remove Programs\" from the Control Panel!
+completerem:		Complete removal completed
 # Local Variables:
 # coding: utf-8
+# End:
+# vim:set termencoding=iso8859-15 encoding=utf-8 fileencoding=utf-8: #
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
index 1f425619ae4..fcfff2a890b 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
@@ -35,23 +35,86 @@ use Getopt::Long qw(:config no_autoabbrev require_order);
 #
 our %TRANS;
 our $LANG;
-$TRANS{'de'}{'foo'} = 1;
+
+$TRANS{'en'} = {
+  about         => "About",
+  addpkg        => "Adding packages",
+  archs         => "Architectures",
+  cancel        => "Cancel",
+  change        => "Change",
+  changesrc     => "Change Location",
+  changesrclong => "Change the installation source",
+  changedefaultsrc => "Change default installation source",
+  newdefaultsrc => "New default installation source",
+  choosedir     => "Choose Directory",
+  config        => "Configuration",
+  createformats => "Create formats on installation",
+  currentsource => "Current installation source: ",
+  debug         => "debug",
+  defaultsource => "Default installation source",
+  defaultnet    => "Default Net Location",
+  defaultpaperfor => "Default paper for",
+  defaultpaperall => "Default paper for all",
+  defaultsettings => "Default settings",
+  force         => "force",
+  forceballoon  => "Force the removal of a package even if it is referenced in a collection.",
+  nodepballoon  => "For collections: install or remove will not install/remove the dependencies",
+  infoitem      => "Info on the selected item",
+  install       => "Installation",
+  installdoc    => "Install macro/font docs",
+  installsrc    => "Install macro/font sources",
+  installsel    => "Install selected",
+  load          => "Load",
+  warningtxt    => "\nAttention.\nPlease check using \"Change\" button if a DVD drive with the TeX Live DVD\nor the correct network address is properly selected,\nthen press \"Load\" button.",
+  newsource     => "New location: ",
+  next          => "Next",
+  ok            => "Ok",
+  paperfor      => "paper select for",
+  papersettings => "Paper settings",
+  pressbutton   => "Press this button to load the database from the specified location.",
+  quit          => "Quit",
+  reallyremove  => "Really remove the complete TeX Live 2008 installation?\nNo more confirmation will be asked!",
+  remove        => "Remove",
+  removesel     => "Remove selected",
+  removetl      => "Remove TeX Live 2008",
+  rempkg        => "Removing packages",
+  search        => "Search",
+  remarchnotpos => "Select architectures to be added (removal not possible)",
+  selpkg        => "Select packages",
+  toggle        => "Toggle",
+  debugballoon  => "Turn on debug mode when calling tlmgr.",
+  removaltab    => "Uninstallation",
+  update        => "Update",
+  updateall     => "Update all",
+  updatesel     => "Update selected",
+  updatepkg     => "Updating packages",
+  ctrlshift     => "Use Ctrl or Shift or drag to select more",
+  withoutdep    => "without depends",
+  yes           => "Yes",
+  starting      => "Starting",
+  maytaketime   => "This may take some time!\nPlease wait, the output will appear here when ready.\n",
+  completed     => "Completed",
+  loaderrortxt  => 'Could not load the TeX Live Database from $newroot\nIf you want to install or update packages, please try with a different installation source/location!\n\nFor configuration and removal you don\'t have to do anything.',
+  changeme      => "...please change me...",
+  nodescription => "(no description available)",
+  applychanges  => "Apply changes",
+  resetchanges  => "Reset changes",
+  remarchinfo   => "Removals of archs currently not supported!",
+  pleaseuse     => "Please use the \"Add/Remove Programs\" from the Control Panel!",
+  completerem   => "Complete removal completed",
+};
+
+
+#
+# we keep the translations in different arrays since we MAY add the feature
+# to switch language on the fly
 sub _ ($) {
   my $s = shift;
-  my $ss = $s;
-  $ss =~ s/\n/\\n/g;
   # if no $LANG is set just return without anything
-  return $s if !defined($LANG);
-  # if $LANG is set but no translation print $s, and warn
-  if (!defined($TRANS{$LANG})) {
-    printf STDERR "===$ss===MISSING\n";
-    return $s;
-  }
+  return $TRANS{"en"}->{$s} if !defined($LANG);
   # if the translation is defined return it
-  return $TRANS{$LANG}{"$ss"} if defined($TRANS{$LANG}{"$ss"});
-  # otherwise warn about missing translation and return untranslated string
-  printf STDERR "===$ss===MISSING\n";
-  return $s;
+  return $TRANS{$LANG}->{"$s"} if defined($TRANS{$LANG}->{"$s"});
+  return $TRANS{"en"}->{$s};
 }
 
 my $opt_location;
@@ -61,16 +124,43 @@ my $opt_diskarchive;
 my $opt_screen;
 our $opt_force = 0;
 our $opt_nodepends = 0;
+my $opt_lang;
 
 GetOptions("location=s" => \$opt_location,
            "netarchive=s" => \$NetArchive,
            "diskarchive=s" => \$DiskArchive,
            "screen=s" => \$opt_screen,
            "force" => \$opt_force,
-           "lang=s" => \$LANG,
+           "lang=s" => \$opt_lang,
            "no-depends" => \$opt_nodepends,
            "debug!" => \$opt_debug) or die("Unsupported argument!");
 
+if (defined($opt_lang)) {
+  $LANG = $opt_lang;
+} 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:"";
+    }
+    $LANG = $lang if ($lang);
+  }
+}
+
+
 #
 # try loading the lang file
 #
@@ -80,7 +170,9 @@ if (defined($LANG) && (-r "$Master/texmf/scripts/texlive/tlmgrgui/lang/$LANG"))
     chomp;
     next if m/^\s*#/;
     next if m/^\s*$/;
-    my ($a,$b) = split(/===/,$_);
+    my ($a,$b) = split(/:/,$_);
+    $b =~ s/^\s*([^\s])/$1/;
+    $b =~ s/\s*$//;
     next if ($b =~ m/^\s*$/);
     if (!utf8::decode($b)) {
       warn("decoding string to utf8 didn't work:$b\n");
@@ -159,37 +251,37 @@ push @update_function_list, \&create_update_list;
 # frame .top
 our $top = $mw->Frame;
 
-our $quit = $top->Button(-text => _"Quit",
+our $quit = $top->Button(-text => _"quit",
                          -command => sub { $mw->destroy; exit(0); });
 
-our $about = $top->Button(-text => _"About",
+our $about = $top->Button(-text => _"about",
   -command => sub {
-    $mw->Dialog(-title => _"About", 
-      -text => _"TeX Live Manager GUI
+    $mw->Dialog(-title => _"about", 
+      -text => "TeX Live Manager GUI
 Copyright 2008 Tomasz Luczak, Norbert Preining
 License under the GNU General Public License version 2 or higher
 In case of problems, please contact: texlive\@tug.org",
-      -buttons => [ _"Ok" ])->Show;
+      -buttons => [ _"ok" ])->Show;
     });
                                                  
 $about->pack(-side => 'right');
 $quit->pack(-side => 'right');
 
-$top->Label(-text => _"Current installation source: ")->pack(-side => 'left');
+$top->Label(-text => _"currentsource" . " ")->pack(-side => 'left');
 $top->Label(-textvariable => \$location,  -relief => "sunken")->pack(-side => 'left');
 
 $balloon->attach(
-  $top->Button(-text => _"Load", -command => sub { run_update_functions(); })->pack(-side => 'left'),
-  -balloonmsg => _"Press this button to load the database from the specified location.");
+  $top->Button(-text => _"load", -command => sub { run_update_functions(); })->pack(-side => 'left'),
+  -balloonmsg => _"pressbutton");
 
 $balloon->attach(
-  $top->Button(-text => _"Change", -command => sub { menu_edit_location(); })->pack(-side => 'left'),
-  -balloonmsg => _"Change the installation source");
+  $top->Button(-text => _"change", -command => sub { menu_edit_location(); })->pack(-side => 'left'),
+  -balloonmsg => _"changesrclong");
 
 $balloon->attach(
   $top->Checkbutton(-text => _"debug", 
                     -variable => \$debugmode)->pack(-side => 'left'),
-  -balloonmsg => _"Turn on debug mode when calling tlmgr.");
+  -balloonmsg => _"debugballoon");
 
 # frame .back -borderwidth 2
 our $back = $mw->NoteBook(-borderwidth => 2, -dynamicgeometry => 1);
@@ -201,37 +293,37 @@ $back->pack(-side => 'top', -fill => 'both', -expand => 1);
 
 require ("do_listframe.pl");
 # install screen
-our $back_f1 = $back->add("install",-label => _"Installation");
+our $back_f1 = $back->add("install",-label => _"install");
 $screens{"install"} = $back_f1;
 do_listframe($back_f1,
-             _"Adding packages", 
+             _"addpkg", 
              \@allpackages,
-             { install => { -text => _"Install selected", 
+             { install => { -text => _"installsel", 
                             -command => \&install_selected_packages}},
              0,1
             );
 # update screen
-our $back_up = $back->add("update", -label => _"Update");
+our $back_up = $back->add("update", -label => _"update");
 $screens{"update"} = $back_up;
 do_listframe($back_up,
-             _"Updating packages", 
+             _"updatepkg", 
              \@updatepackages,
-             { updateall => { -text => _"Update all", 
+             { updateall => { -text => _"updateall", 
                               -command => \&update_selected_packages,
                               -args => [ "--all" ]
                             },
-               updatesel => { -text => _"Update selected",
+               updatesel => { -text => _"updatesel",
                               -command => \&update_selected_packages
                             }},
              0,0
             );
 # remove screen
-our $back_f2 = $back->add("remove", -label => _"Remove");
+our $back_f2 = $back->add("remove", -label => _"remove");
 $screens{"remove"} = $back_f2;
 do_listframe($back_f2,
-             _"Removing packages",
+             _"rempkg",
              \@alllocalpackages,
-             { remove => { -text => _"Remove selected",
+             { remove => { -text => _"removesel",
                            -command => \&remove_selected_packages}},
              1,1
             );
@@ -261,10 +353,10 @@ sub init_install_media {
     $tlmediasrc = TeXLive::TLMedia->new($newroot);
     if (!defined($tlmediasrc)) {
       # something went badly wrong, maybe the newroot is wrong?
-      $mw->Dialog(-title => _"warning",
-                 -text => _"Could not load the TeX Live Database from $newroot\nIf you want to install or update packages, please try with a different installation source/location!\n\nFor configuration and removal you don't have to do anything.",
-                        -buttons => [ _"Ok" ])->Show;
-      $location = _"...please change me...";
+      $mw->Dialog(-title => "warning",
+                 -text => _"loaderrortxt",
+                        -buttons => [ _"ok" ])->Show;
+      $location = _"changeme";
       @allpackages = ();
     } else {
       $tlmediatlpdb = $tlmediasrc->tlpdb;
@@ -280,7 +372,7 @@ sub run_program_show_output {
                                    -wrap => "none",
                          -scrollbars => "ose"
                         )->pack(-expand => 1, -fill => "both");
-  my $ok = $td->Button(-text => _"OK", -padx => "3m", -pady => "3m",
+  my $ok = $td->Button(-text => _"ok", -padx => "3m", -pady => "3m",
                        -command => sub { $td->destroy; });
   # start the installation, read the output
   for (my $i = 0; $i < 100; $i++) {
@@ -290,13 +382,12 @@ sub run_program_show_output {
   # ok, that stupid perl for windows does not have fork, why? no idea
   # we have to deal with that
   if ($^O=~/^MSWin(32|64)$/i) {
-    $tf->insert("end", _("Starting ") . "@_\n\n" . _"This may take some time!
-Please wait, the output will appear here when ready.\n");
+    $tf->insert("end", _("starting") . " @_\n\n" . _"maytaketime");
     for (my $i = 0; $i < 100; $i++) {
       Tk::DoOneEvent(Tk::Event::DONT_WAIT);
     }
     my $ret = `@_`;
-    $tf->insert("end", "$ret\n\n" . _"COMPLETED\n");
+    $tf->insert("end", "$ret\n\n" . _("completed") . "\n");
     $tf->see("end");
     $ok->pack;
     for (my $i = 0; $i < 100; $i++) {
@@ -320,7 +411,7 @@ Please wait, the output will appear here when ready.\n");
       # do not buffer lines ...
       $| = 1;
       open STDERR, '>&STDOUT';
-      print _("Starting ") . "@_\n";
+      print _("starting") . " @_\n";
       exec(@_)
         || die "can't exec program: $!";
       # NOTREACHED
@@ -453,12 +544,12 @@ sub setup_list {
 sub menu_edit_location {
   my $key = shift;
   my $val;
-  my $sw = $mw->Toplevel(-title => _"Change Location");
+  my $sw = $mw->Toplevel(-title => _"changesrc");
   my $f1 = $sw->Frame;
-  $f1->Label(-text => _"New location: ")->pack(-side => "left");
+  $f1->Label(-text => _"newsource")->pack(-side => "left");
   my $entry = $f1->Entry(-text => $location, -width => 30);
   $entry->pack(-side => "left");
-  $f1->Button(-text => _"Choose Directory", 
+  $f1->Button(-text => _"choosedir", 
     -command => sub {
                       my $var = $sw->chooseDirectory;
                       if (defined($var)) {
@@ -466,7 +557,7 @@ sub menu_edit_location {
                         $entry->insert(0,$var);
                       }
                     })->pack(-side => "left");
-  $f1->Button(-text => _"Default Net Location",
+  $f1->Button(-text => _"defaultnet",
     -command => sub {
                       $entry->delete(0,"end");
                       $entry->insert(0,$TeXLiveURL);