diff options
| -rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 28 | ||||
| -rw-r--r-- | Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl | 8 | ||||
| -rwxr-xr-x | Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl | 116 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 2 |
4 files changed, 29 insertions, 125 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 197df381139..c3eb22c4810 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -117,7 +117,7 @@ sub main { "gui" => 1, "gui-lang" => "=s", "debug-translation" => 1, - "location" => "=s", + "location|repository|repo" => "=s", "machine-readable" => 1, "package-logfiles" => "=s", "pause" => 1, @@ -3751,12 +3751,14 @@ name and its value. =over 4 -=item B<--location> I<location> +=item B<--repo[sitory]> I<url|path> -Specifies the location from which packages should be installed or -updated, overriding the location found in the installation's TeX Live -Package Database (TLPDB). The documentation for C<install-tl> has more -details about this. +=item B<--location> I<url|path> + +Specifies the package repository from which packages should be +installed or updated, overriding the default package repository +found in the installation's TeX Live Package Database (TLPDB). +The documentation for C<install-tl> has more details about this. =item B<--gui> [I<action>] @@ -4144,7 +4146,7 @@ displayed. If I<value> is present, I<key> is set to I<value>. Possible values for I<key> are (but see B<tlmgr option showall> for the definitive list): - location (default installation source), + location (default package repository), formats (create formats at installation time), docfiles (install documentation files), srcfiles (install source files), @@ -4281,7 +4283,7 @@ those extra settings at present. =head2 arch list|add|remove I<arch>... C<arch list> lists the TeX Live names of all the architectures -(C<i386-linux>, ...) available at the default install location. +(C<i386-linux>, ...) available at the package repository. C<arch add> I<arch>... adds the executables for each given architecture I<arch> to the installation. @@ -4341,8 +4343,8 @@ outputs their dependencies in a similar way. =head2 list [--only-installed] [collections|schemes|I<pkg>...] -With no argument, lists all packages available at the default install -location, prefixing those already installed with C<i>. +With no argument, lists all packages available at the package repository, +prefixing those already installed with C<i>. With the single word C<collections> or C<schemes> as the argument, lists the request type. @@ -4544,7 +4546,7 @@ repository source from which updates are being drawn), and C<total-bytes> (the total number of bytes to be downloaded). The I<localrev> and I<serverrev> fields for each package are the -revision numbers in the location installation and server repository, +revision numbers in the local installation and server repository, respectively. The I<size> field is the number of bytes to be downloaded, i.e., the size of the compressed tar file for a network installation, not the unpacked size. The estrem and esttot fields @@ -4558,8 +4560,8 @@ Line endings may be either LF or CRLF depending on the current platform. =item C<location-url> I<location> The I<location> may be a url (including C<file:///foo/bar/...>), or a -directory name (C</foo/bar>). It is the server repository from which -the new package information was drawn. +directory name (C</foo/bar>). It is the use package repository +from which the new package information was drawn. =item C<total-bytes> I<count> diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl index 2fe9bacc729..da0af876d89 100644 --- a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl @@ -38,7 +38,7 @@ my $back_config_set = $back_config->Labelframe(-text => __("Default settings")); $back_config_set->pack(-fill => "both", -padx => "2m", -pady => "2m"); push @config_set_l, - $back_config_set->Label(-text => __("Default installation source"), -anchor => "w"); + $back_config_set->Label(-text => __("Default package repository"), -anchor => "w"); push @config_set_m, $back_config_set->Label(-textvariable => \$defaults{"location"}); push @config_set_r, @@ -313,10 +313,10 @@ $back_config_act->pack(-side => 'right', -fill => "both", -padx => "2m", -pady = sub menu_default_location { my $val = $default_location; - my $sw = $mw->Toplevel(-title => __("Change default installation source")); + my $sw = $mw->Toplevel(-title => __("Change default package repository")); $sw->transient($mw); $sw->grab(); - $sw->Label(-text => __("New default installation source"))->pack(-padx => "2m", -pady => "2m"); + $sw->Label(-text => __("New default package repository"))->pack(-padx => "2m", -pady => "2m"); my $f1 = $sw->Frame; my $entry = $f1->Entry(-text => $val, -width => 50); @@ -331,7 +331,7 @@ sub menu_default_location { $entry->insert(0,$var); } })->pack(-side => "left",-padx => "2m", -pady => "2m"); - $f2->Button(-text => __("Default net location"), + $f2->Button(-text => __("Default net package repository"), -command => sub { $entry->delete(0,"end"); $entry->insert(0,$TeXLiveURL); diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl index d16c189fc26..f3b5fef0212 100755 --- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl @@ -26,106 +26,8 @@ our $location; # # translation facility, not fully functional by now # -our %TRANS; -our $LANG; our %opts; -$TRANS{'en'} = { - about => "About", - addpkg => "Adding packages", - archs => "Architectures", - cancel => "Cancel", - change => "Change", - changesrc => "Change Location", - changesrclong => "Change source from where packages are fetched at installation and update time.", - changedefaultsrc => "Change default installation source", - newdefaultsrc => "New default installation source", - choosedir => "Choose Directory", - config => "Configuration", - create_formats => "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 => "Information on the selected item", - install => "Installation", - install_docfiles => "Install macro/font docs", - install_srcfiles => "Install macro/font sources", - sys_bin => "Link destination for programs", - sys_man => "Link destination for man pages", - sys_info => "Link destination for info docs", - updatesymlinks => "Update symbolic links", - removesymlinks => "Remove symbolic links", - installsel => "Install selected", - load => "Load", - warningtxt => "The database of the installation source has not been loaded.\n\nPlease use the \"Load\" (and possibly \"Change\") button to do so.", - newsource => "New location: ", - next => "Next", - ok => "Ok", - paperfor => "Select paper format 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 $TeXLive::TLConfig::ReleaseYear installation?\nYour last chance to change your mind!", - remove => "Remove", - removesel => "Remove selected", - removetl => "Remove TeX Live $TeXLive::TLConfig::ReleaseYear", - 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", - no => "No", - 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 binary systems currently not supported!", - pleaseuse => "Please use the \"Add/Remove Programs\" from the Control Panel!", - completerem => "Complete removal completed", - loadtlpdbwait => "Loading local TeX Live Database\nThis may take some time, please wait!", - loadremotetlpdbwait => "Loading remote TeX Live Database\nThis may take some time, please wait!", - runupdater => "Some package will only be updated after you have terminated the GUI!\nPlease do so and after a short time restart the GUI.", - actions => "Actions", - reinitlsr => "Re-initialize file database", - recreateformats => "Re-create all formats", - updatemaps => "Update font map database", - warningnonetupdate => "No updates found.\n\nYour installation is set up to look on the disk for updates.\n\nIf you want to install from the Internet for this one time only, click on the \"Change\" button above and select \"Default Net Location\" (or any other network location you know to be working).\n\nIf you want to change it permanently, go to the \"Configuration\" Tab and change the default installation source.", - pleaseclick => "Please click on an item on the left for details", - alluptodate => "Everything up-to-date!", - # new ones - backupdir => "Default backup directory", - autobackup => "Auto backup setting", - critupdates => "Updates for the tlmgr are present.\nInstallation and upgrades won't work without being forced.\nPlease go to the update screen and press the \"update all\" button.\nThe program will terminate after the update.\nThen you can restart the program for further updates.", - critupdw32 => "Please wait a bit after the program has terminated so that the update can be completed.", - fileassocs => 'Change file associations', - fa_dontchange => "None", - fa_onlynew => "Only new", - fa_all => 'All', - w32_multi_user => 'Install for all users', - desktop_integration => 'Create shortcuts in menu and on desktop', -}; - - sub update_status_window { update_status(join(" ", @_)); $mw->update; @@ -228,16 +130,16 @@ $quit->pack(-side => 'right'); $mw->bind('<Escape>', [ $quit, 'Invoke' ]); -$top->Label(-text => __("Current installation source:") . " ")->pack(-side => 'left'); +$top->Label(-text => __("Current package repository:") . " ")->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.")); + -balloonmsg => __("Press this button to load the database from the package repository.")); $balloon->attach( $top->Button(-text => __("Change"), -command => sub { menu_edit_location(); })->pack(-side => 'left'), - -balloonmsg => __("Change source from where packages are fetched at installation and update time.")); + -balloonmsg => __("Change package repository from where packages are fetched at installation and update time.")); # here we add a bit of trickery to make sure that the verbosity level # as set on the cmd line (-v or -v -v) is kept during pressing the @@ -269,7 +171,7 @@ my ($install_win, $install_lb) = do_listframe($back_f1, -command => \&install_selected_packages}}, 1,1 ); -set_text_win($install_win, __("The database of the installation source has not been loaded.\n\nPlease use the \"Load\" (and possibly \"Change\") button to do so.")); +set_text_win($install_win, __("The database of the package repository has not been loaded.\n\nPlease use the \"Load\" (and possibly \"Change\") button to do so.")); # update screen our $back_up = $back->add("update", -label => __("Update")); $screens{"update"} = $back_up; @@ -286,7 +188,7 @@ my ($update_win, $update_lb) = do_listframe($back_up, }}, 1,0 ); -set_text_win($update_win, __("The database of the installation source has not been loaded.\n\nPlease use the \"Load\" (and possibly \"Change\") button to do so.")); +set_text_win($update_win, __("The database of the package repository has not been loaded.\n\nPlease use the \"Load\" (and possibly \"Change\") button to do so.")); # remove screen our $back_f2 = $back->add("remove", -label => __("Remove")); $screens{"remove"} = $back_f2; @@ -337,7 +239,7 @@ sub init_install_media { 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."), + -text => __("Could not load the TeX Live Database from \$newroot\nIf you want to install or update packages, please try with a different package repository!\n\nFor configuration and removal you don\'t have to do anything."), -buttons => [ __("Ok") ])->Show; $location = __("...please change me..."); @allpackages = (); @@ -476,7 +378,7 @@ sub create_update_list { # and is not from the net if ($#ret < 0) { if ($tlmediasrc->media ne "NET") { - set_text_win($update_win, __("No updates found.\n\nYour installation is set up to look on the disk for updates.\n\nIf you want to install from the Internet for this one time only, click on the \"Change\" button above and select \"Default Net Location\" (or any other network location you know to be working).\n\nIf you want to change it permanently, go to the \"Configuration\" Tab and change the default installation source.")); + set_text_win($update_win, __("No updates found.\n\nYour installation is set up to look on the disk for updates.\n\nIf you want to install from the Internet for this one time only, click on the \"Change\" button above and select \"Default Net Location\" (or any other package repository you know to be working).\n\nIf you want to change it permanently, go to the \"Configuration\" Tab and change the default package repository.")); } else { set_text_win($update_win, __("Everything up-to-date!")); } @@ -551,7 +453,7 @@ sub menu_edit_location { my $sw = $mw->Toplevel(-title => __("Change Location")); $sw->transient($mw); $sw->grab(); - $sw->Label(-text => __("New location:"))->pack(-padx => "2m", -pady => "2m"); + $sw->Label(-text => __("New package repository:"))->pack(-padx => "2m", -pady => "2m"); my $entry = $sw->Entry(-text => $location, -width => 30); $entry->pack(); my $f1 = $sw->Frame; @@ -563,7 +465,7 @@ sub menu_edit_location { $entry->insert(0,$var); } })->pack(-side => "left", -padx => "2m", -pady => "2m"); - $f1->Button(-text => __("Default net location"), + $f1->Button(-text => __("Default net package repository"), -command => sub { $entry->delete(0,"end"); $entry->insert(0,$TeXLiveURL); diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 796b71175d3..e90c000629e 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -126,7 +126,7 @@ our %TLPDBConfigs = ( our %TLPDBOptions = ( "location" => [ "u", "__MASTER__", "location", - "Default installation location" ], + "Default package repository" ], "create_formats" => [ "b", 1, "formats", "Create formats on installation" ], |